X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_whtml.py;h=b4c4dab5c59ff3c0a28a7698376757e39efb542a;hb=4fd6d1f55e5e5dbcc0bdc1b933d6e14076316437;hp=921dff908645cbbc9b3b07ff137a30104f62df24;hpb=042cfc1c844c147b59fa10d573912322b4fce7f1;p=bookmarks_db.git

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index 921dff9..b4c4dab 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -1,21 +1,21 @@
 """
    Convert a bkmk database back to bookmarks.html
 
-   Written by BroytMann. Copyright (C) 2000-2003 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design
 """
 
-
-import string
+from bkmk_objects import Writer, BKMK_FORMAT, quote_title
 
 
 def dump_comment(comment):
-   return string.replace(comment, "<BR>", "<BR>\n")
+   comment = comment.replace("<BR>\n", "\n")
+   if BKMK_FORMAT == "NETSCAPE":
+      comment = comment.replace("\n", "<BR>\n")
+   return comment
 
 
 ind_s = " "*4
 
-from bkmk_objects import Writer
-
 class writer_html(Writer):
    filename = "bookmarks.html"
 
@@ -24,22 +24,28 @@ class writer_html(Writer):
       self.outfile.write(ind_s*level + "<DL><p>\n")
 
    def root_folder(self, f):
-      header = string.replace(f.header, ".", ".\n")
-      header = string.replace(header, "<T", "\n<T", 3)
       self.outfile.write("<!DOCTYPE NETSCAPE-Bookmark-file-1>\n")
-      self.outfile.write(header + "\n")
-      self.outfile.write('<H1>%s</H1>\n\n' % f.name)
+      self.outfile.write(f.header + "\n")
+      self.outfile.write('<H1>%s</H1>\n\n' % quote_title(f.name))
       self._folder(f, 0)
 
    def start_folder(self, f, level):
-      self.outfile.write(ind_s*level + '<DT><H3 ADD_DATE="%s">%s</H3>\n' % (f.add_date, f.name))
+      self.outfile.write(ind_s*level + '<DT><H3 ADD_DATE="%s"' % f.add_date)
+      if (BKMK_FORMAT == "MOZILLA") and f.last_modified: self.outfile.write(' LAST_MODIFIED="%s"' % f.last_modified)
+      self.outfile.write('>%s</H3>\n' % quote_title(f.name))
       self._folder(f, level)
 
    def end_folder(self, f, level):
       self.outfile.write(ind_s*level + "</DL><p>\n")
 
    def bookmark(self, b, level):
-      self.outfile.write(ind_s*(level+1) + '<DT><A HREF="%s" ADD_DATE="%s" LAST_VISIT="%s" LAST_MODIFIED="%s">%s</A>\n' % (b.href, b.add_date, b.last_visit, b.last_modified, b.name))
+      self.outfile.write(ind_s*(level+1) + '<DT><A HREF="%s" ADD_DATE="%s" LAST_VISIT="%s" LAST_MODIFIED="%s"' % (b.href, b.add_date, b.last_visit, b.last_modified))
+      if BKMK_FORMAT == "MOZILLA":
+         if b.keyword: self.outfile.write(' SHORTCUTURL="%s"' % b.keyword)
+         if b.icon_href: self.outfile.write(' ICON_URI="%s"' % b.icon_href)
+         if b.icon: self.outfile.write(' ICON="%s"' % b.icon)
+         if b.charset: self.outfile.write(' LAST_CHARSET="%s"' % b.charset)
+      self.outfile.write('>%s</A>\n' % quote_title(b.name))
       if b.comment: self.outfile.write('<DD>%s\n' % dump_comment(b.comment))
 
    def ruler(self, r, level):