X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=Robots%2Fbkmk_robot_base.py;h=b5cac691fe9f2842d12184f30de6c6b2271dbb83;hb=9f2e541f950d245198f893936de4ebece69894ba;hp=fb8bb2d6eab923b78f7e0c83c9236a78e1e2750d;hpb=0b78160bb3a7a59d6c91ee41ff273321a4b3d556;p=bookmarks_db.git

diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py
index fb8bb2d..b5cac69 100644
--- a/Robots/bkmk_robot_base.py
+++ b/Robots/bkmk_robot_base.py
@@ -111,15 +111,28 @@ class robot_base(Robot):
 
             md5 = md5wrapper()
             if url_type == "ftp":  # Pass welcome message through MD5
-                md5.update(self.get_ftp_welcome())
+                ftp_welcome = self.get_ftp_welcome()
+                if not isinstance(ftp_welcome, bytes):
+                    ftp_welcome = ftp_welcome.encode('utf-8')
+                md5.update(ftp_welcome)
 
-            md5.update(content)
+            if isinstance(content, bytes):
+                md5.update(content)
+            else:
+                md5.update(content.encode('utf-8'))
             bookmark.md5 = str(md5)
 
             if headers:
                 try:
                     content_type = headers["Content-Type"]
                     self.log("   Content-Type: %s" % content_type)
+                    if content_type is None:
+                        if 'html' in content.lower():
+                            content_type = 'text/html'
+                        else:
+                            content_type = 'text/plain'
+                        self.log("   Set Content-Type to: %s"
+                                 % content_type)
                     try:
                         # extract charset from
                         # "text/html; foo; charset=UTF-8, bar; baz;"
@@ -181,9 +194,11 @@ class robot_base(Robot):
                                 icons[icon_url] = None
                             else:
                                 content_type = icon_headers["Content-Type"]
-                                if content_type.startswith("application/") \
-                                   or content_type.startswith("image/") \
-                                   or content_type.startswith("text/plain"):
+                                if content_type and (
+                                    content_type.startswith("application/")
+                                    or content_type.startswith("image/")
+                                    or content_type.startswith("text/plain")
+                                ):
                                     bookmark.icon_href = icon_url
                                     self.log("   got icon       : %s"
                                              % content_type)
@@ -195,6 +210,8 @@ class robot_base(Robot):
                                         self.log("   non-image content type,"
                                                  " assume x-icon")
                                         content_type = 'image/x-icon'
+                                    if not isinstance(icon_data, bytes):
+                                        icon_data = icon_data.encode('utf-8')
                                     bookmark.icon = "data:%s;base64,%s" \
                                         % (content_type, b64encode(icon_data))
                                     icons[icon_url] = (content_type,