X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=ea2decec8b82ee78ebb6d3dedc2cd5ee5b5dd435;hb=f1e0383ad67eae21ccf32ff0c1c3775a6d65b64a;hp=f1d8bb3d646a7b2c927b71aa9d65428abfbb5d60;hpb=3dc28a60e36febe88eefd03dd9254d4623f8aa53;p=bookmarks_db.git

diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index f1d8bb3..ea2dece 100644
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -80,7 +80,7 @@ class myftpwrapper(urllib_ftpwrapper):
    def __init__(self, user, passwd, host, port, dirs):
       urllib_ftpwrapper.__init__(self, user, passwd, host, port, dirs)
       global ftpcache_key
-      ftpcache_key = (user, host, port, tuple(dirs))
+      ftpcache_key = (user, host, port, '/'.join(dirs))
 
 urllib.ftpwrapper = myftpwrapper
 
@@ -92,6 +92,9 @@ def get_welcome():
    return _welcome
 
 
+icons = {} # Icon cache; maps URL to a tuple (content type, data)
+           # or None if there is no icon.
+
 class robot_simple(Robot):
    def check_url(self, bookmark):
       if not self.tempfname:
@@ -182,34 +185,45 @@ class robot_simple(Robot):
                         icon = "/favicon.ico"
                      icon = urljoin("%s://%s%s" % (url_type, url_host, url_path), icon)
                      self.log("   looking for icon at: %s" % icon)
-                     try:
-                        for i in range(8):
-                           try:
-                              fname, headers = urllib.urlretrieve(icon)
-                           except RedirectException, e:
-                              icon = e.url
-                              self.log("       redirect to : %s" % icon)
-                           else:
-                              break
+                     if icon in icons:
+                        if icons[icon]:
+                           content_type, bookmark.icon = icons[icon]
+                           self.log("       cached icon: %s" % content_type)
                         else:
-                           raise IOError("Too many redirects")
-                     except:
-                        etype, emsg, tb = sys.exc_info()
-                        self.log("   no icon        : %s %s" % (etype, emsg))
-                        etype = None
-                        emsg = None
-                        tb = None
+                           self.log("       cached icon: no icon")
                      else:
-                        content_type = headers["Content-Type"]
-                        if content_type.startswith("image/"):
-                           icon_file = open(fname, "rb")
-                           icon = icon_file.read()
-                           icon_file.close()
-                           bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon))
-                           self.log("   got icon       : %s" % content_type)
+                        try:
+                           _icon = icon
+                           for i in range(8):
+                              try:
+                                 fname, headers = urllib.urlretrieve(_icon)
+                              except RedirectException, e:
+                                 _icon = e.url
+                                 self.log("       redirect to : %s" % _icon)
+                              else:
+                                 break
+                           else:
+                              raise IOError("Too many redirects")
+                        except:
+                           etype, emsg, tb = sys.exc_info()
+                           self.log("   no icon        : %s %s" % (etype, emsg))
+                           etype = None
+                           emsg = None
+                           tb = None
+                           icons[icon] = None
                         else:
-                           self.log("   no icon        : bad content type '%s'" % content_type)
-                        os.remove(fname)
+                           content_type = headers["Content-Type"]
+                           if content_type.startswith("image/"):
+                              icon_file = open(fname, "rb")
+                              icon = icon_file.read()
+                              icon_file.close()
+                              bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon))
+                              self.log("   got icon       : %s" % content_type)
+                              icons[icon] = (content_type, bookmark.icon)
+                           else:
+                              self.log("   no icon        : bad content type '%s'" % content_type)
+                              icons[icon] = None
+                           os.remove(fname)
 
                except KeyError:
                   pass