Do not even open non-image files; report the content type of a non-image file.

[bookmarks_db.git] / Robots / bkmk_rsimple.py

diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index 63c0b4c173b120e13195185ac58450f12d48cec6..50db38843d0fa7cee6e4af5ed48ea51aee69861b 100644 (file)
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -90,6 +90,8 @@ class robot_simple(Robot):
       try:
          try:
             self.start = int(time.time())
+            bookmark.icon = None
+
             url_type, url_rest = urllib.splittype(bookmark.href)
             url_host, url_path = urllib.splithost(url_rest)
             url_path, url_tag  = urllib.splittag(url_path)
@@ -176,15 +178,15 @@ class robot_simple(Robot):
                         emsg = None
                         tb = None
                      else:
-                        icon_file = open(fname, "rb")
-                        icon = icon_file.read()
-                        icon_file.close()
-                        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))
                         else:
-                           bookmark.icon = None
+                           if self.log: self.log("   no icon        : %s" % content_type)
+                        os.remove(fname)
 
                except KeyError:
                   pass