Load/store folder's root.

[bookmarks_db.git] / Storage / bkmk_stflad.py

diff --git a/Storage/bkmk_stflad.py b/Storage/bkmk_stflad.py
index 3c89a3e7a35ab4d2b3dda5a84e9dfd64621128d6..6611d97aae5158e2c98c005c0e0f350339dd3c0e 100644 (file)
--- a/Storage/bkmk_stflad.py
+++ b/Storage/bkmk_stflad.py
@@ -2,7 +2,7 @@
    Bookmarks storage module - FLAD (Flat ASCII Database)
       special version for compatibility with old (version 1) bkmk2db
 
-   Written by BroytMann, Feb 2000 - Mar 2000. Copyright (C) 2000 PhiloSoft Design
+   Written by Broytman, Feb 2000 - Sep 2007. Copyright (C) 2000-2007 PhiloSoft Design
 """
 
 
@@ -32,8 +32,8 @@ Level: %d
 Folder: %s
 AddDate: %s
 Comment: %s
-""" % (level, f.name, f.add_date, f.comment))
-
+LastModified: %s
+""" % (level, f.name, f.add_date, f.comment, f.last_modified or ''))
 
    def bookmark(self, b, level):
       self.outfile.write("""
@@ -43,8 +43,12 @@ URL: %s
 AddDate: %s
 LastVisit: %s
 LastModified: %s
+Keyword: %s
 Comment: %s
-""" % (level+1, b.name, b.href, b.add_date, b.last_visit, b.last_modified, b.comment))
+Icon: %s
+Charset: %s
+""" % (level+1, b.name, b.href, b.add_date, b.last_visit, b.last_modified,
+         b.keyword, b.comment.replace('\n', "\\n"), b.icon or '', b.charset or ''))
 
 
    def ruler(self, r, level):
@@ -103,12 +107,15 @@ Comment: %s
          got_folder = record.has_key("Folder") # Test here to save got_folder for next loop
 
          if record.has_key("URL"):
-            bookmark = Bookmark(record["URL"], record["AddDate"], record["LastVisit"], record["LastModified"], record["Comment"])
+            comment = record["Comment"].replace("\\n", '\n')
+            bookmark = Bookmark(record["URL"], record["AddDate"],
+               record["LastVisit"], record["LastModified"],
+               record["Keyword"], comment)
             bookmark.name = record["Title"]
             self.current_folder.append(bookmark)
 
          elif record.has_key("Folder"):
-            folder = Folder(record["AddDate"], record["Comment"])
+            folder = Folder(record["AddDate"], record["Comment"], record["LastModified"])
             folder.name = record["Folder"]
             self.current_folder.append(folder)
             self.folder_stack.append(folder)