Fix(Robots/bkmk_robot_base): Pass query part

[bookmarks_db.git] / Robots / bkmk_robot_base.py

diff --git a/Robots/bkmk_robot_base.py b/Robots/bkmk_robot_base.py
index df33a26bd43162d92252e04df933bcb378abaffe..3fd567cda2f0c232017d910e4a66526efcec9d75 100644 (file)
--- a/Robots/bkmk_robot_base.py
+++ b/Robots/bkmk_robot_base.py
@@ -82,7 +82,10 @@ class robot_base(Robot):
             url_type, netloc, url_path, query, url_tag = split_results
             url_host = split_results.hostname
 
-            url = "%s://%s%s" % (url_type, url_host, url_path)
+            if query:
+                url = "%s://%s%s?%s" % (url_type, url_host, url_path, query)
+            else:
+                url = "%s://%s%s" % (url_type, url_host, url_path)
             error, redirect_code, redirect_to, headers, content = \
                 self.get(bookmark, url, True)
 
@@ -179,9 +182,16 @@ class robot_base(Robot):
                             if icons[icon_url]:
                                 bookmark.icon_href = icon_url
                                 content_type, bookmark.icon = icons[icon_url]
-                                self.log("   cached icon: %s" % content_type)
+                                self.log("   cached icon    : %s"
+                                         % content_type)
                             else:
-                                self.log("   cached icon: no icon")
+                                self.log("   cached icon    : no icon")
+                        elif icon_url.startswith('data:'):
+                            content_type, icon_data = \
+                                icon_url[len('data:'):].split(',', 1)
+                            bookmark.icon_href = bookmark.icon = icon_url
+                            self.log("   got data icon  : %s" % content_type)
+                            icons[icon_url] = (content_type, icon_url)
                         else:
                             try:
                                 _icon_url = icon_url