X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_robot_base.py;h=9c9d8c5823543bc442472274068da5acbf8417b0;hb=b2b302b348f0b711557961c70744c818cff664f0;hp=0600e7338d2b71c41492d73858acf72d0818ae84;hpb=c88cb7a75e7caf1d67466cfa107981d95115fa0c;p=bookmarks_db.git diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py index 0600e73..9c9d8c5 100644 --- a/Robots/bkmk_robot_base.py +++ b/Robots/bkmk_robot_base.py @@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot. """ __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design" +__copyright__ = "Copyright (C) 2000-2023 PhiloSoft Design" __license__ = "GNU GPL" __all__ = ['robot_base', 'get_error'] @@ -45,8 +45,10 @@ def get_error(e): return "(%s)" % ' '.join(s) -icons = {} # Icon cache; maps URL to a tuple (content type, data) - # or None if there is no icon. +# Icon cache; maps URL to a tuple (content type, data) +# or None if there is no icon. +icons = {} + class robot_base(Robot): timeout = 60 @@ -62,7 +64,8 @@ class robot_base(Robot): url_type, url_rest = urllib.splittype(bookmark.href) url_host, url_path = urllib.splithost(url_rest) - url_path, url_tag = urllib.splittag(url_path) + url_path, url_tag = urllib.splittag(url_path) # noqa: E221 + # multiple spaces before operator url = "%s://%s%s" % (url_type, url_host, url_path) error, redirect_code, redirect_to, headers, content = self.get(bookmark, url, True) @@ -103,7 +106,7 @@ class robot_base(Robot): bookmark.last_modified = last_modified md5 = md5wrapper() - if url_type == "ftp": # Pass welcome message through MD5 + if url_type == "ftp": # Pass welcome message through MD5 md5.update(self.get_ftp_welcome()) md5.update(content) @@ -151,8 +154,8 @@ class robot_base(Robot): _icon_url = icon_url for i in range(8): error, icon_redirect_code, icon_redirect_to, \ - icon_headers, icon_data = \ - self.get(bookmark, _icon_url) + icon_headers, icon_data = \ + self.get(bookmark, _icon_url) if icon_redirect_code: _icon_url = icon_redirect_to self.log(" redirect to : %s" % _icon_url) @@ -170,12 +173,12 @@ class robot_base(Robot): else: content_type = icon_headers["Content-Type"] if content_type.startswith("application/") \ - or content_type.startswith("image/") \ - or content_type.startswith("text/plain"): + or content_type.startswith("image/") \ + or content_type.startswith("text/plain"): bookmark.icon_href = icon_url self.log(" got icon : %s" % content_type) if content_type.startswith("application/") \ - or content_type.startswith("text/plain"): + or content_type.startswith("text/plain"): self.log(" non-image content type, assume x-icon") content_type = 'image/x-icon' bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon_data)) @@ -197,7 +200,7 @@ class robot_base(Robot): try: timeout = int(refresh.split(';')[0]) except ValueError: - pass # float timeout + pass # float timeout self.set_redirect(bookmark, "html", "%s (%s sec)" % (url, timeout)) except KeyError as key: