X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_parser.py;h=4cc8897e23f7b5737f9203e5664ef988b459acb3;hb=6e5a5beb79984efbb54ae8611283108b91ac1fed;hp=02cce680747e054a698f79b4ccd175b8f04b0e96;hpb=bcf579e3311f0d9f968338dc419e9a43b48414ba;p=bookmarks_db.git

diff --git a/bkmk_parser.py b/bkmk_parser.py
old mode 100755
new mode 100644
index 02cce68..4cc8897
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -45,7 +45,7 @@ class BkmkParser(HTMLParser):
    def handle_data(self, data):
       if data:
          if DEFAULT_CHARSET:
-            data = unicode(data, self.charset, "replace").encode(DEFAULT_CHARSET, "replace")
+            data = unicode(data, self.charset, "replace").encode(DEFAULT_CHARSET, "xmlcharrefreplace")
          self.accumulator += data
 
 
@@ -138,6 +138,8 @@ class BkmkParser(HTMLParser):
       last_visit = None
       last_modified = None
       keyword = None
+      icon = None
+      charset = None
 
       for attrname, value in attrs:
          value = value.strip()
@@ -151,9 +153,14 @@ class BkmkParser(HTMLParser):
             last_modified = value
          elif attrname == "shortcuturl":
             keyword = value
+         elif attrname == "icon":
+            icon = value
+         elif attrname == "last_charset":
+            charset = value
 
       debug("Bookmark points to: `%s'" % href)
-      bookmark = Bookmark(href, add_date, last_visit, last_modified, keyword or '')
+      bookmark = Bookmark(href, add_date, last_visit, last_modified,
+         keyword or '', '', icon, charset)
       self.current_object = bookmark
       self.current_folder.append(bookmark)
       self.urls += 1