Fix(storage): Adapt to the latest Mozilla format

[bookmarks_db.git] / Storage / bkmk_stjson.py

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index a08f61910a4415d76b8b64c51a0443070d4b3cbf..6053bd1d360f0fda72991ab53b360406df6beba1 100644 (file)
--- 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 <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2014 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
 
@@ -84,7 +84,7 @@ 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.decode('utf-8')
         dict["type"] = "text/x-moz-place-separator"
         self.folder_stack[-1].append(dict)
 
@@ -115,9 +115,9 @@ class storage_json(Walker):
         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)
@@ -134,46 +134,47 @@ class storage_json(Walker):
         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"])
+        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:
@@ -184,7 +185,7 @@ 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):
@@ -195,7 +196,9 @@ def convert_date_from_json(date):
     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: