Switch to SPDX headers

[sid.git] / sid / feeds.py

diff --git a/sid/feeds.py b/sid/feeds.py
index 490d89de5816b230b5f3b91dc0f2afb5ffb5c548..466aaece82ee6f0554bd81fb3883b946f1796fd2 100644 (file)
--- a/sid/feeds.py
+++ b/sid/feeds.py
@@ -1,18 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Copyright (C) 2011, 2014, 2020 kaliko <kaliko@azylum.org>
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 only.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2011, 2014, 2020 kaliko <kaliko@azylum.org>
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 import datetime
 import threading
@@ -20,6 +8,7 @@ import time
 import traceback
 
 from urllib.error import URLError
+from urllib.parse import urlparse
 
 from feedparser import parse as feed_parse
 
@@ -125,9 +114,9 @@ class FeedMonitor(threading.Thread):
                 try:
                     self.new_posts(feed)
                 except ConnectionError as err:  # Non fatal exception
-                    self.plugin.log.error(f'connection error on {feed}: {err}')
+                    self.plugin.log.error('connection error on %s: %s', feed, err)
                 except URLError as err:  # Non fatal exception
-                    self.plugin.log.error(f'error for {feed}: {err.reason}')
+                    self.plugin.log.error('error for "%s": %s', feed, err.reason)
                 except Exception as err:  # Unknown execption, killing thread anyway
                     self.plugin.log.error('feeds thread crashed: %s', err)
                     self.plugin.log.error(''.join(traceback.format_exc()))
@@ -174,11 +163,13 @@ class Feeds(Plugin):
         * ``!feeds``      : registred feeds list
         * ``!feeds last`` : last check time"""
         if 'last' in args:
-            self.reply(rcv, 'Last feeds check: %s' % self.th_mon.last_check)
+            date = '{:%Y-%m-%d %H:%M} (utc)'.format(self.th_mon.last_check)
+            self.reply(rcv, f'Last feeds check: {date}')
             return
-        html = ['<a href="{0}">{1}</a>'.format(html_escape(u),
-                                               html_escape(u[7:])
-                                              ) for u in Feeds.FEEDS]
+        html = ['<a href="{0}">{1}</a>'.format(
+                                     html_escape(u),
+                                     html_escape('{1}{2}'.format(*urlparse(u)))
+                                     ) for u in Feeds.FEEDS]
         msg = {'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS),
                'mhtml': 'Feeds:<br />' + '<br />'.join(html)}
         self.reply(rcv, msg)