X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=inline;f=bkmk_parser.py;h=41df9ef30bd78b15f34bdb28f223b0f72f40c9db;hb=2c2e369574d8be5edffe54d3b9758bab0cc7f46b;hp=dfe7ce2f463ef783079dd996b739075dce6ae073;hpb=33c634db52c188f2d531dc896079f0370c40583d;p=bookmarks_db.git
diff --git a/bkmk_parser.py b/bkmk_parser.py
old mode 100755
new mode 100644
index dfe7ce2..41df9ef
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -1,7 +1,7 @@
"""
Parser for Netscape Navigator's and Mozilla's bookmarks.html
- Written by BroytMann. Copyright (C) 1997-2004 PhiloSoft Design
+ Written by BroytMann. Copyright (C) 1997-2007 PhiloSoft Design
"""
@@ -70,9 +70,18 @@ class BkmkParser(HTMLParser):
else:
global DEFAULT_CHARSET
DEFAULT_CHARSET = sys.getdefaultencoding()
+ if DEFAULT_CHARSET == "ascii":
+ try:
+ import locale
+ except ImportError:
+ pass
+ else:
+ DEFAULT_CHARSET = locale.getpreferredencoding()
def start_title(self, attrs):
+ if DEFAULT_CHARSET:
+ self.accumulator += '\n' % DEFAULT_CHARSET
self.accumulator += "
"
def end_title(self):
@@ -100,13 +109,16 @@ class BkmkParser(HTMLParser):
# Start a folder
def start_h3(self, attrs):
+ last_modified = None
for attrname, value in attrs:
value = value.strip()
if attrname == 'add_date':
add_date = value
+ elif attrname == 'last_modified':
+ last_modified = value
debug("New folder...")
- folder = Folder(add_date)
+ folder = Folder(add_date, last_modified=last_modified)
self.current_object = folder
self.current_folder.append(folder)
self.folder_stack.append(folder) # push new folder
@@ -126,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()
@@ -139,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