From: Oleg Broytman <phd@phdru.name>
Date: Fri, 19 Oct 2007 22:14:43 +0000 (+0000)
Subject: Do not even open non-image files; report the content type of a non-image file.
X-Git-Tag: v4.5.3~275
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=0274654a95196ee2b70720b4708a4dd76107a2ba;p=bookmarks_db.git

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


git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@101 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23
---

diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py
index 1842b4d..50db388 100644
--- a/Robots/bkmk_rsimple.py
+++ b/Robots/bkmk_rsimple.py
@@ -178,13 +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:
+                           if self.log: self.log("   no icon        : %s" % content_type)
+                        os.remove(fname)
 
                except KeyError:
                   pass