X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Storage%2Fbkmk_stjson.py;h=6053bd1d360f0fda72991ab53b360406df6beba1;hb=9e3b27b8e808eb8d1453f25ef733efb8cbc41d31;hp=1a7ee16c4f8c48e0ede0ab56f25ebe7b2d107bdb;hpb=f24b257e8aad65b3375533726e7840666fa422eb;p=bookmarks_db.git diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py index 1a7ee16..6053bd1 100644 --- a/Storage/bkmk_stjson.py +++ b/Storage/bkmk_stjson.py @@ -1,22 +1,20 @@ """Bookmarks storage manager - json This file is a part of Bookmarks database and Internet robot. + """ -__version__ = "$Revision$"[11:-2] -__revision__ = "$Id$"[5:-2] -__date__ = "$Date$"[7:-2] __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2010, 2011 PhiloSoft Design" +__copyright__ = "Copyright (C) 2010-2017 PhiloSoft Design" __license__ = "GNU GPL" __all__ = ['storage_json'] try: - import json + import json except ImportError: - import simplejson as json + import simplejson as json from bkmk_objects import Folder, Bookmark, Ruler, Walker @@ -28,12 +26,6 @@ class storage_json(Walker): self.dict = dict = {} dict["children"] = children = [] self.folder_stack = [children] - dict["dateAdded"] = convert_date_to_json(f.add_date) - dict["id"] = f.id - dict["lastModified"] = convert_date_to_json(f.last_modified) - dict["root"] = "placesRoot" - dict["title"] = "" - dict["type"] = "text/x-moz-place-container" def start_folder(self, f, level): dict = {} @@ -41,17 +33,20 @@ class storage_json(Walker): if comment: dict["annos"] = make_annos(comment) dict["children"] = children = [] dict["dateAdded"] = convert_date_to_json(f.add_date) + guid = getattr(f, 'guid') + if guid: dict["guid"] = guid dict["id"] = f.id index = getattr(f, 'index') - if index: dict["index"] = index + if index is not None: dict["index"] = index 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') if root: dict["root"] = root dict["title"] = f.name.decode('utf-8') dict["type"] = "text/x-moz-place-container" - self.folder_stack[-1].append(dict) + if root: + self.dict["children"].append(dict) + else: + self.folder_stack[-1].append(dict) self.folder_stack.append(children) def end_folder(self, f, level): @@ -64,37 +59,19 @@ class storage_json(Walker): charset = getattr(b, 'charset') if charset: dict["charset"] = charset dict["dateAdded"] = convert_date_to_json(b.add_date) + guid = getattr(b, 'guid') + if guid: dict["guid"] = guid dict["id"] = b.id + iconuri = getattr(b, 'icon_href') + if iconuri: dict["iconuri"] = iconuri index = getattr(b, 'index') - if index: dict["index"] = index + if index is not None: dict["index"] = index keyword = getattr(b, 'keyword') if keyword: dict["keyword"] = keyword 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"] = uri = b.href - if uri.startswith('place:'): - if uri.startswith('place:sort=8') \ - or uri.startswith('place://sort=8'): - value = 'MostVisited' - elif uri.startswith('place://redirectsMode'): - value = 'Most Visited' - elif uri.startswith('place:folder=BOOKMARKS_MENU') \ - or uri.startswith('place://folder=BOOKMARKS_MENU'): - value = 'RecentlyBookmarked' - elif uri.startswith('place://folder'): - value = 'Recently Bookmarked' - elif uri.startswith('place:sort=14') \ - or uri.startswith('place://sort=14'): - value = 'RecentTags' - elif uri.startswith('place://type'): - 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): @@ -103,10 +80,11 @@ class storage_json(Walker): if comment: dict["annos"] = make_annos(comment) dict["dateAdded"] = convert_date_to_json(r.add_date) dict["id"] = r.id + guid = getattr(r, 'guid') + if guid: dict["guid"] = guid dict["index"] = r.index dict["lastModified"] = convert_date_to_json(r.last_modified) - dict["parent"] = r.parent_idx - dict["title"] = r.name.decode('utf-8') + if r.name: dict["title"] = r.name.decode('utf-8') dict["type"] = "text/x-moz-place-separator" self.folder_stack[-1].append(dict) @@ -130,12 +108,16 @@ class storage_json(Walker): root_folder = Folder() root_folder.header = '' - root_folder.add_date = convert_date_from_json(bookmarks_dict["dateAdded"]) + root_folder.add_date = convert_date_from_json(bookmarks_dict.get("dateAdded")) root_folder.comment = '' - root_folder.last_modified = convert_date_from_json(bookmarks_dict["lastModified"]) + root_folder.last_modified = convert_date_from_json(bookmarks_dict.get("lastModified")) self.folder_stack = [root_folder] self.current_folder = root_folder + if "type" not in bookmarks_dict: + bookmarks_dict["id"] = "0" + bookmarks_dict["title"] = "" + bookmarks_dict["type"] = "text/x-moz-place-container" self.load_folder(root_folder, bookmarks_dict) if self.folder_stack: raise RuntimeError('Excessive folder stack: %s' % self.folder_stack) @@ -147,49 +129,52 @@ class storage_json(Walker): raise ValueError("The object is not a Mozilla container") folder.id = fdict["id"] + folder.guid = fdict.get("guid") folder.index = fdict.get("index") - folder.parent_idx = fdict.get("parent") folder.root = fdict.get("root") folder.name = encode_title(fdict["title"]) - for record in fdict["children"]: - if record["type"] == "text/x-moz-place-container": - folder = Folder( - add_date=convert_date_from_json(record["dateAdded"]), - comment=get_comment(record.get("annos")), - last_modified=convert_date_from_json(record["lastModified"])) - self.current_folder.append(folder) - self.folder_stack.append(folder) - self.current_folder = folder - self.load_folder(folder, record) - - elif record["type"] == "text/x-moz-place": - bookmark = Bookmark( - 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=get_str(record, "charset")) - bookmark.id = record["id"] - bookmark.index = record.get("index") - bookmark.parent_idx = record["parent"] - bookmark.name = encode_title(record["title"]) - self.current_folder.append(bookmark) - - elif record["type"] == "text/x-moz-place-separator": - ruler = Ruler() - ruler.add_date = convert_date_from_json(record["dateAdded"]) - ruler.id = record["id"] - ruler.index = record["index"] - ruler.last_modified = convert_date_from_json(record["lastModified"]) - ruler.parent_idx = record["parent"] - ruler.name = encode_title(record["title"]) - ruler.comment = get_comment(record.get("annos")) - self.current_folder.append(ruler) - - else: - raise ValueError('Unknown record type "%s"' % record["type"]) + if "children" in fdict: + for record in fdict["children"]: + if record["type"] == "text/x-moz-place-container": + folder = Folder( + add_date=convert_date_from_json(record.get("dateAdded")), + comment=get_comment(record.get("annos")), + last_modified=convert_date_from_json(record.get("lastModified"))) + folder.guid = record.get("guid") + self.current_folder.append(folder) + self.folder_stack.append(folder) + self.current_folder = folder + self.load_folder(folder, record) + + elif record["type"] == "text/x-moz-place": + bookmark = Bookmark( + 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")), + icon_href=record.get("iconuri"), + charset=get_str(record, "charset")) + bookmark.guid = record.get("guid") + bookmark.id = record["id"] + bookmark.index = record.get("index") + bookmark.name = encode_title(record["title"]) + self.current_folder.append(bookmark) + + elif record["type"] == "text/x-moz-place-separator": + ruler = Ruler() + ruler.add_date = convert_date_from_json(record.get("dateAdded")) + ruler.guid = record.get("guid") + ruler.id = record["id"] + ruler.index = record["index"] + ruler.last_modified = convert_date_from_json(record.get("lastModified")) + ruler.name = encode_title(record.get("title")) + ruler.comment = get_comment(record.get("annos")) + self.current_folder.append(ruler) + + else: + raise ValueError('Unknown record type "%s"' % record["type"]) del self.folder_stack[-1] if self.folder_stack: @@ -200,18 +185,20 @@ class storage_json(Walker): def convert_date_to_json(date): if date: - date = int(date) * 10**6 + date = int(float(date) * 10**6) return date def convert_date_from_json(date): if date: - date = int(date) + date = float(date) if date > 10**10: - date /= 10**6 + date /= 10.0**6 return date def encode_title(title): - return title.encode("UTF-8", "xmlcharrefreplace") + if title: + return title.encode("UTF-8", "xmlcharrefreplace") + return title def get_str(record, name): if name in record: @@ -223,8 +210,7 @@ def get_comment(annos): 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 '' @@ -233,7 +219,5 @@ def make_annos(value, name="bookmarkProperties/description"): return [{ "expires": 4, "flags": 0, - "mimeType": None, "name": name, - "type": 3, "value": value.decode('utf-8')}]