X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Storage%2Fbkmk_stjson.py;h=0b34ecb079e005c41a4d37f29b0804129401185f;hb=cb9c36b39ed72cd1fa272130d2bcf162a89c3013;hp=1a34e3a1a02658c75dbe3736e207261009893d4a;hpb=b9c8d112b8d8d0f7c726ee7dd07a89b6569c90a1;p=bookmarks_db.git diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py index 1a34e3a..0b34ecb 100644 --- a/Storage/bkmk_stjson.py +++ b/Storage/bkmk_stjson.py @@ -108,9 +108,11 @@ 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 @@ -120,7 +122,8 @@ class storage_json(Walker): 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 @@ -138,9 +141,11 @@ class storage_json(Walker): for record in fdict["children"]: if record["type"] == "text/x-moz-place-container": folder = Folder( - add_date=convert_date_from_json(record.get("dateAdded")), + add_date=convert_date_from_json( + record.get("dateAdded")), comment=get_comment(record.get("annos")), - last_modified=convert_date_from_json(record.get("lastModified"))) + last_modified=convert_date_from_json( + record.get("lastModified"))) folder.guid = record.get("guid") self.current_folder.append(folder) self.folder_stack.append(folder) @@ -150,8 +155,10 @@ class storage_json(Walker): 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")), + 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"), @@ -164,17 +171,20 @@ class storage_json(Walker): elif record["type"] == "text/x-moz-place-separator": ruler = Ruler() - ruler.add_date = convert_date_from_json(record.get("dateAdded")) + 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.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"]) + raise ValueError('Unknown record type "%s"' + % record["type"]) del self.folder_stack[-1] if self.folder_stack: