X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=Storage%2Fbkmk_stflad.py;h=9bd8751c278b9fa6becbee0d552455a43049c8de;hb=92f5d0b12ed82b7ac51acfa074de7bfad14c1084;hp=3c017fa12c5768546c5a5504c70b2456a82b8ada;hpb=5a3a639d28368406ca2e02584ee7924cb0ae8089;p=bookmarks_db.git

diff --git a/Storage/bkmk_stflad.py b/Storage/bkmk_stflad.py
index 3c017fa..9bd8751 100644
--- 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 - Aug 2004. Copyright (C) 2000-2004 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2000-2010 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("""
@@ -45,7 +45,12 @@ LastVisit: %s
 LastModified: %s
 Keyword: %s
 Comment: %s
-""" % (level+1, b.name, b.href, b.add_date, b.last_visit, b.last_modified, b.keyword, b.comment))
+IconURI: %s
+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_href or '', b.icon or '', b.charset or ''))
 
 
    def ruler(self, r, level):
@@ -104,12 +109,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["Keyword"], 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)