X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_whtml.py;h=b4c4dab5c59ff3c0a28a7698376757e39efb542a;hb=ab815a37e54d51b330eb1c8a756f9d52bba859ad;hp=3fe863719d94851385d7f8b4e544fb4376e9ff90;hpb=41abc4fec1e2e2c659c97934b43f358da33ca922;p=bookmarks_db.git

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index 3fe8637..b4c4dab 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -1,29 +1,21 @@
 """
    Convert a bkmk database back to bookmarks.html
 
-   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design
 """
 
-
-import os
-MZFORMAT = os.environ.has_key("BKMK_MZFORMAT")
-if MZFORMAT:
-   NSFORMAT = True
-else:
-   NSFORMAT = os.environ.has_key("BKMK_NSFORMAT")
+from bkmk_objects import Writer, BKMK_FORMAT, quote_title
 
 
 def dump_comment(comment):
    comment = comment.replace("<BR>\n", "\n")
-   if NSFORMAT:
+   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"
 
@@ -34,13 +26,13 @@ class writer_html(Writer):
    def root_folder(self, f):
       self.outfile.write("<!DOCTYPE NETSCAPE-Bookmark-file-1>\n")
       self.outfile.write(f.header + "\n")
-      self.outfile.write('<H1>%s</H1>\n\n' % f.name)
+      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"' % f.add_date)
-      if MZFORMAT and f.last_modified: self.outfile.write(' LAST_MODIFIED="%s"' % f.last_modified)
-      self.outfile.write('>%s</H3>\n' % f.name)
+      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):
@@ -48,11 +40,12 @@ class writer_html(Writer):
 
    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"' % (b.href, b.add_date, b.last_visit, b.last_modified))
-      if MZFORMAT:
+      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' % b.name)
+      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):