X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Storage%2Fbkmk_stjson.py;h=a748f0e2ffa029270a2774b955495baa67613237;hb=1d9da433dcd7dfa9066cbaae66c6580f44f4b8d9;hp=6053bd1d360f0fda72991ab53b360406df6beba1;hpb=9e3b27b8e808eb8d1453f25ef733efb8cbc41d31;p=bookmarks_db.git

diff --git a/Storage/bkmk_stjson.py b/Storage/bkmk_stjson.py
index 6053bd1..a748f0e 100644
--- a/Storage/bkmk_stjson.py
+++ b/Storage/bkmk_stjson.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2010-2017 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2010-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['storage_json']
@@ -71,7 +71,7 @@ class storage_json(Walker):
         dict["lastModified"] = convert_date_to_json(b.last_modified)
         dict["title"] = b.name.decode('utf-8')
         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):
@@ -97,7 +97,7 @@ class storage_json(Walker):
         del self.dict
 
     def load(self):
-        infile = open(self.filename, 'rb')
+        infile = open(self.filename, 'rt')
         bkmk_s = infile.read()
         infile.close()
 
@@ -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:
@@ -188,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)
@@ -195,16 +206,19 @@ def convert_date_from_json(date):
             date /= 10.0**6
     return date
 
+
 def encode_title(title):
     if title:
         return title.encode("UTF-8", "xmlcharrefreplace")
     return title
 
+
 def get_str(record, name):
     if name in record:
         return record[name].encode('utf-8')
     return ''
 
+
 def get_comment(annos):
     if not annos:
         return ''
@@ -215,6 +229,7 @@ def get_comment(annos):
 
     return ''
 
+
 def make_annos(value, name="bookmarkProperties/description"):
     return [{
         "expires": 4,