X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Storage%2Fbkmk_stjson.py;h=9f7fed78202d319658aa199047069f979a8c18e0;hb=0e18686c1c670ac23133769e72a109ec4523d71a;hp=43f5881183ba14cb12e54ed18b96b9bd267f3a7c;hpb=7b4f6fff272251803445b2a10efc461786132f12;p=bookmarks_db.git diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py index 43f5881..9f7fed7 100644 --- a/Storage/bkmk_stjson.py +++ b/Storage/bkmk_stjson.py @@ -5,16 +5,16 @@ This file is a part of Bookmarks database and Internet robot. """ __author__ = "Oleg Broytman " -__copyright__ = "Copyright (C) 2010-2014 PhiloSoft Design" +__copyright__ = "Copyright (C) 2010-2023 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 @@ -41,7 +41,7 @@ class storage_json(Walker): dict["lastModified"] = convert_date_to_json(f.last_modified) root = getattr(f, 'root') if root: dict["root"] = root - dict["title"] = f.name.decode('utf-8') + dict["title"] = f.name dict["type"] = "text/x-moz-place-container" if root: self.dict["children"].append(dict) @@ -69,9 +69,9 @@ class storage_json(Walker): keyword = getattr(b, 'keyword') if keyword: dict["keyword"] = keyword dict["lastModified"] = convert_date_to_json(b.last_modified) - dict["title"] = b.name.decode('utf-8') + dict["title"] = b.name dict["type"] = "text/x-moz-place" - dict["uri"] = uri = b.href + dict["uri"] = b.href self.folder_stack[-1].append(dict) def ruler(self, r, level): @@ -84,20 +84,20 @@ class storage_json(Walker): if guid: dict["guid"] = guid dict["index"] = r.index dict["lastModified"] = convert_date_to_json(r.last_modified) - dict["title"] = r.name.decode('utf-8') + if r.name: dict["title"] = r.name dict["type"] = "text/x-moz-place-separator" self.folder_stack[-1].append(dict) def store(self, root_folder): root_folder.walk_depth(self) - outfile = open(self.filename, 'wb') + outfile = open(self.filename, 'wt') json.dump(self.dict, outfile) outfile.close() del self.dict def load(self): - infile = open(self.filename, 'rb') + infile = open(self.filename, 'rt') bkmk_s = infile.read() infile.close() @@ -108,19 +108,22 @@ class storage_json(Walker): root_folder = Folder() root_folder.header = '' - root_folder.add_date = convert_date_from_json(bookmarks_dict.get("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.get("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" + 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) + raise RuntimeError('Excessive folder stack: %s' + % self.folder_stack) return root_folder @@ -132,48 +135,56 @@ class storage_json(Walker): folder.guid = fdict.get("guid") folder.index = fdict.get("index") 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.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["title"]) - ruler.comment = get_comment(record.get("annos")) - self.current_folder.append(ruler) - - else: - raise ValueError('Unknown record type "%s"' % record["type"]) + folder.name = fdict["title"] + + 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"], + 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 = 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 = 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: @@ -187,6 +198,7 @@ def convert_date_to_json(date): date = int(float(date) * 10**6) return date + def convert_date_from_json(date): if date: date = float(date) @@ -194,27 +206,28 @@ def convert_date_from_json(date): date /= 10.0**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 record[name] return '' + def get_comment(annos): if not annos: return '' for a in annos: if a["name"] == "bookmarkProperties/description": - return a["value"].encode('utf-8') + return a["value"] return '' + def make_annos(value, name="bookmarkProperties/description"): return [{ "expires": 4, "flags": 0, "name": name, - "value": value.decode('utf-8')}] + "value": value, + }]