Relax record schema requirements

[bookmarks_db.git] / Storage / bkmk_stjson.py

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index 1a7ee16c4f8c48e0ede0ab56f25ebe7b2d107bdb..53eae9b81c14b9a316ed6a46dc738cf81b5b7a5f 100644 (file)
--- a/Storage/bkmk_stjson.py
+++ b/Storage/bkmk_stjson.py
@@ -3,11 +3,8 @@
 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 <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010, 2011 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['storage_json']
@@ -75,20 +72,13 @@ class storage_json(Walker):
         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'):
+            if 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'):
+            elif uri.startswith('place:sort=8') or \
+                    uri.startswith('place:redirectsMode'):
+                value = 'Most Visited'
+            elif uri.startswith('place:sort=14') or \
+                    uri.startswith('place:type=6'):
                 value = 'Recent Tags'
             else:
                 raise ValueError('UNKNOWN place URI: %s' % uri)
@@ -130,12 +120,14 @@ 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 = bookmarks_dict["children"][0]
         self.load_folder(root_folder, bookmarks_dict)
         if self.folder_stack:
             raise RuntimeError('Excessive folder stack: %s' % self.folder_stack)
@@ -155,9 +147,9 @@ 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["dateAdded"]),
+                    add_date=convert_date_from_json(record.get("dateAdded")),
                     comment=get_comment(record.get("annos")),
-                    last_modified=convert_date_from_json(record["lastModified"]))
+                    last_modified=convert_date_from_json(record.get("lastModified")))
                 self.current_folder.append(folder)
                 self.folder_stack.append(folder)
                 self.current_folder = folder
@@ -173,17 +165,17 @@ class storage_json(Walker):
                     charset=get_str(record, "charset"))
                 bookmark.id = record["id"]
                 bookmark.index = record.get("index")
-                bookmark.parent_idx = record["parent"]
+                bookmark.parent_idx = record.get("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.add_date = convert_date_from_json(record.get("dateAdded"))
                 ruler.id = record["id"]
                 ruler.index = record["index"]
-                ruler.last_modified = convert_date_from_json(record["lastModified"])
-                ruler.parent_idx = record["parent"]
+                ruler.last_modified = convert_date_from_json(record.get("lastModified"))
+                ruler.parent_idx = record.get("parent")
                 ruler.name = encode_title(record["title"])
                 ruler.comment = get_comment(record.get("annos"))
                 self.current_folder.append(ruler)
@@ -223,8 +215,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 ''