X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Storage%2Fbkmk_stjson.py;h=04414f3276631fb0b0acb0bbeaada1ea2f4f0690;hb=ff7bf8d52beff0156f82cd4447768ebef4898b41;hp=00daa60361710e5c330cb51b62bc952c279bc757;hpb=b3939ade7f545a07b93188543761ada36e996d11;p=bookmarks_db.git diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py index 00daa60..04414f3 100644 --- a/Storage/bkmk_stjson.py +++ b/Storage/bkmk_stjson.py @@ -1,9 +1,14 @@ -""" - Bookmarks storage manager - json. +"""Bookmarks storage manager - json - Written by Broytman, Jul 2010. Copyright (C) 2010 PhiloSoft Design +This file is a part of Bookmarks database and Internet robot. """ +__author__ = "Oleg Broytman " +__copyright__ = "Copyright (C) 2010-2012 PhiloSoft Design" +__license__ = "GNU GPL" + +__all__ = ['storage_json'] + try: import json @@ -20,9 +25,9 @@ class storage_json(Walker): self.dict = dict = {} dict["children"] = children = [] self.folder_stack = [children] - dict["dateAdded"] = f.add_date + dict["dateAdded"] = convert_date_to_json(f.add_date) dict["id"] = f.id - dict["lastModified"] = f.last_modified + dict["lastModified"] = convert_date_to_json(f.last_modified) dict["root"] = "placesRoot" dict["title"] = "" dict["type"] = "text/x-moz-place-container" @@ -32,11 +37,11 @@ class storage_json(Walker): comment = getattr(f, 'comment') if comment: dict["annos"] = make_annos(comment) dict["children"] = children = [] - dict["dateAdded"] = f.add_date + dict["dateAdded"] = convert_date_to_json(f.add_date) dict["id"] = f.id index = getattr(f, 'index') if index: dict["index"] = index - dict["lastModified"] = f.last_modified + dict["lastModified"] = convert_date_to_json(f.last_modified) parent_idx = getattr(f, 'parent_idx') if parent_idx: dict["parent"] = parent_idx root = getattr(f, 'root') @@ -55,27 +60,41 @@ class storage_json(Walker): if comment: dict["annos"] = make_annos(comment) charset = getattr(b, 'charset') if charset: dict["charset"] = charset - dict["dateAdded"] = b.add_date + dict["dateAdded"] = convert_date_to_json(b.add_date) dict["id"] = b.id index = getattr(b, 'index') if index: dict["index"] = index keyword = getattr(b, 'keyword') if keyword: dict["keyword"] = keyword - dict["lastModified"] = b.last_modified + dict["lastModified"] = convert_date_to_json(b.last_modified) dict["parent"] = b.parent_idx dict["title"] = b.name.decode('utf-8') dict["type"] = "text/x-moz-place" - dict["uri"] = b.href + dict["uri"] = uri = b.href + if uri.startswith('place:'): + if uri.startswith('place:folder'): + value = 'Recently Bookmarked' + elif uri.startswith('place:sort=8') or \ + uri.startswith('place:redirectsMode'): + value = 'Most Visited' + elif uri.startswith('place:sort=14') or \ + uri.startswith('place:type=6'): + value = 'Recent Tags' + else: + raise ValueError('UNKNOWN place URI: %s' % uri) + dict["annos"] = make_annos(value, name='Places/SmartBookmark') + del dict["dateAdded"] + del dict["lastModified"] self.folder_stack[-1].append(dict) def ruler(self, r, level): dict = {} comment = getattr(r, 'comment') if comment: dict["annos"] = make_annos(comment) - dict["dateAdded"] = r.add_date + dict["dateAdded"] = convert_date_to_json(r.add_date) dict["id"] = r.id dict["index"] = r.index - dict["lastModified"] = r.last_modified + dict["lastModified"] = convert_date_to_json(r.last_modified) dict["parent"] = r.parent_idx dict["title"] = r.name.decode('utf-8') dict["type"] = "text/x-moz-place-separator" @@ -89,7 +108,6 @@ class storage_json(Walker): outfile.close() del self.dict - def load(self): infile = open(self.filename, 'rb') bkmk_s = infile.read() @@ -98,12 +116,13 @@ class storage_json(Walker): # Work around a bug in Mozilla - remove the trailing comma bkmk_s = bkmk_s.strip().replace(',]', ']') bookmarks_dict = json.loads(bkmk_s) + del bkmk_s root_folder = Folder() root_folder.header = '' - root_folder.add_date = bookmarks_dict["dateAdded"] + root_folder.add_date = convert_date_from_json(bookmarks_dict["dateAdded"]) root_folder.comment = '' - root_folder.last_modified = bookmarks_dict["lastModified"] + root_folder.last_modified = convert_date_from_json(bookmarks_dict["lastModified"]) self.folder_stack = [root_folder] self.current_folder = root_folder @@ -115,20 +134,20 @@ class storage_json(Walker): def load_folder(self, folder, fdict): if fdict["type"] != "text/x-moz-place-container": - raise ValueError("Root object is not a Mozilla container") + raise ValueError("The object is not a Mozilla container") folder.id = fdict["id"] folder.index = fdict.get("index") folder.parent_idx = fdict.get("parent") folder.root = fdict.get("root") - folder.name = encode(fdict["title"]) + folder.name = encode_title(fdict["title"]) for record in fdict["children"]: if record["type"] == "text/x-moz-place-container": folder = Folder( - add_date=record["dateAdded"], + add_date=convert_date_from_json(record["dateAdded"]), comment=get_comment(record.get("annos")), - last_modified=record["lastModified"]) + last_modified=convert_date_from_json(record["lastModified"])) self.current_folder.append(folder) self.folder_stack.append(folder) self.current_folder = folder @@ -136,26 +155,26 @@ class storage_json(Walker): elif record["type"] == "text/x-moz-place": bookmark = Bookmark( - href=record["uri"], - add_date=record.get("dateAdded"), - last_modified=record.get("lastModified"), - keyword=record.get("keyword"), + href=record["uri"].encode('utf-8'), + add_date=convert_date_from_json(record.get("dateAdded")), + last_modified=convert_date_from_json(record.get("lastModified")), + keyword=get_str(record, "keyword"), comment=get_comment(record.get("annos")), - charset=record.get("charset")) + charset=get_str(record, "charset")) bookmark.id = record["id"] bookmark.index = record.get("index") bookmark.parent_idx = record["parent"] - bookmark.name = encode(record["title"]) + bookmark.name = encode_title(record["title"]) self.current_folder.append(bookmark) elif record["type"] == "text/x-moz-place-separator": ruler = Ruler() - ruler.add_date = record["dateAdded"] + ruler.add_date = convert_date_from_json(record["dateAdded"]) ruler.id = record["id"] ruler.index = record["index"] - ruler.last_modified = record["lastModified"] + ruler.last_modified = convert_date_from_json(record["lastModified"]) ruler.parent_idx = record["parent"] - ruler.name = encode(record["title"]) + ruler.name = encode_title(record["title"]) ruler.comment = get_comment(record.get("annos")) self.current_folder.append(ruler) @@ -168,25 +187,42 @@ class storage_json(Walker): else: self.current_folder = None -def encode(title): + +def convert_date_to_json(date): + if date: + date = int(date) * 10**6 + return date + +def convert_date_from_json(date): + if date: + date = int(date) + if date > 10**10: + date /= 10**6 + return date + +def encode_title(title): return title.encode("UTF-8", "xmlcharrefreplace") +def get_str(record, name): + if name in record: + return record[name].encode('utf-8') + return '' + def get_comment(annos): if not annos: - return None + return '' for a in annos: - if a["name"] == "bookmarkProperties/description" and \ - a["type"] == 3: + if a["name"] == "bookmarkProperties/description": return a["value"].encode('utf-8') - return None + return '' -def make_annos(comment): +def make_annos(value, name="bookmarkProperties/description"): return [{ "expires": 4, "flags": 0, "mimeType": None, - "name": "bookmarkProperties/description", + "name": name, "type": 3, - "value": comment.decode('utf-8')}] + "value": value.decode('utf-8')}]