Fixed bugs in loading folders.

[bookmarks_db.git] / Storage / bkmk_stjson.py

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index fd77d59f0dcfb6db12d68cb21e78427561588f3f..cd6139faa36c66afdaf65c57deb479e13e46b99f 100644 (file)
--- a/Storage/bkmk_stjson.py
+++ b/Storage/bkmk_stjson.py
@@ -29,6 +29,8 @@ class storage_json(Walker):
 
     def start_folder(self, f, level):
         dict = {}
+        comment = getattr(f, 'comment')
+        if comment: dict["annos"] = make_annos(comment)
         dict["children"] = children = []
         dict["dateAdded"] = f.add_date
         dict["id"] = f.id
@@ -47,12 +49,16 @@ class storage_json(Walker):
 
     def bookmark(self, b, level):
         dict = {}
+        comment = getattr(b, 'comment')
+        if comment: dict["annos"] = make_annos(comment)
         charset = getattr(b, 'charset')
         if charset: dict["charset"] = charset
         dict["dateAdded"] = 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["parent"] = b.parent_idx
         dict["title"] = b.name.decode('utf-8')
@@ -62,6 +68,8 @@ class storage_json(Walker):
 
     def ruler(self, r, level):
         dict = {}
+        comment = getattr(r, 'comment')
+        if comment: dict["annos"] = make_annos(comment)
         dict["dateAdded"] = r.add_date
         dict["id"] = r.id
         dict["index"] = r.index
@@ -91,6 +99,9 @@ class storage_json(Walker):
 
         root_folder = Folder()
         root_folder.header = ''
+        root_folder.add_date = bookmarks_dict["dateAdded"]
+        root_folder.comment = ''
+        root_folder.last_modified = bookmarks_dict["lastModified"]
         self.folder_stack = [root_folder]
         self.current_folder = root_folder
 
@@ -100,25 +111,33 @@ class storage_json(Walker):
 
         return root_folder
 
-    def load_folder(self, folder, _dict):
-        if _dict["type"] != "text/x-moz-place-container":
+    def load_folder(self, folder, fdict):
+        if fdict["type"] != "text/x-moz-place-container":
             raise ValueError("Root object is not a Mozilla container")
 
-        folder.id = _dict["id"]
-        folder.index = _dict.get("index")
-        folder.parent_idx = _dict.get("parent")
+        folder.id = fdict["id"]
+        folder.index = fdict.get("index")
+        folder.parent_idx = fdict.get("parent")
+        folder.name = encode(fdict["title"])
 
-        folder.name = encode(_dict["title"])
-        folder.comment = ''
-        folder.add_date = _dict["dateAdded"]
-        folder.last_modified = _dict["lastModified"]
+        for record in fdict["children"]:
+            if record["type"] == "text/x-moz-place-container":
+                folder = Folder(
+                    add_date=record["dateAdded"],
+                    comment=get_comment(record.get("annos")),
+                    last_modified=record["lastModified"])
+                self.current_folder.append(folder)
+                self.folder_stack.append(folder)
+                self.current_folder = folder
+                self.load_folder(folder, record)
 
-        for record in _dict["children"]:
-            if record["type"] == "text/x-moz-place":
+            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"),
+                    comment=get_comment(record.get("annos")),
                     charset=record.get("charset"))
                 bookmark.id = record["id"]
                 bookmark.index = record.get("index")
@@ -126,18 +145,6 @@ class storage_json(Walker):
                 bookmark.name = encode(record["title"])
                 self.current_folder.append(bookmark)
 
-            elif record["type"] == "text/x-moz-place-container":
-                folder = Folder(
-                    add_date=record["dateAdded"], comment=None,
-                    last_modified=record["lastModified"])
-                folder.id = record["id"]
-                folder.parent_idx = record["parent"]
-                folder.name = encode(record["title"])
-                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-separator":
                 ruler = Ruler()
                 ruler.add_date = record["dateAdded"]
@@ -146,6 +153,7 @@ class storage_json(Walker):
                 ruler.last_modified = record["lastModified"]
                 ruler.parent_idx = record["parent"]
                 ruler.name = encode(record["title"])
+                ruler.comment = get_comment(record.get("annos"))
                 self.current_folder.append(ruler)
 
             else:
@@ -159,3 +167,23 @@ class storage_json(Walker):
 
 def encode(title):
     return title.encode("UTF-8", "xmlcharrefreplace")
+
+def get_comment(annos):
+    if not annos:
+        return None
+
+    for a in annos:
+        if a["name"] == "bookmarkProperties/description" and \
+                a["type"] == 3:
+            return a["value"].encode('utf-8')
+
+    return None
+
+def make_annos(comment):
+    return [{
+        "expires": 4,
+        "flags": 0,
+        "mimeType": None,
+        "name": "bookmarkProperties/description",
+        "type": 3,
+        "value": comment.decode('utf-8')}]