X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_whtml.py;h=f7a1d654a2274780cb2284cf64040926e10f8a27;hb=c88cb7a75e7caf1d67466cfa107981d95115fa0c;hp=8b3cd13ebfd53229608b6610b6e5936978348e12;hpb=7374ff35481e6d92fa38e0e2dc84f40886777293;p=bookmarks_db.git

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index 8b3cd13..f7a1d65 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -3,61 +3,63 @@
 This file is a part of Bookmarks database and Internet robot.
 """
 
-__version__ = "$Revision$"[11:-2]
-__revision__ = "$Id$"[5:-2]
-__date__ = "$Date$"[7:-2]
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2017 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['writer_html']
 
 
+from m_lib.defenc import default_encoding
 from bkmk_objects import Writer, BKMK_FORMAT, quote_title
 
 
 def dump_comment(comment):
-   comment = comment.replace("<BR>\n", "\n")
-   if BKMK_FORMAT == "NETSCAPE":
-      comment = comment.replace("\n", "<BR>\n")
-   return comment
-
+    comment = comment.replace("<BR>\n", "\n")
+    if BKMK_FORMAT == "NETSCAPE":
+        comment = comment.replace("\n", "<BR>\n")
+    return comment
 
 ind_s = " "*4
 
 class writer_html(Writer):
-   filename = "bookmarks.html"
-
-   def _folder(self, f, level):
-      if f.comment: self.outfile.write('<DD>%s\n' % dump_comment(f.comment))
-      self.outfile.write(ind_s*level + "<DL><p>\n")
-
-   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' % 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 (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"' % (b.href, b.add_date))
-      if b.last_visit: self.outfile.write('LAST_VISIT="%s"' % b.last_visit)
-      self.outfile.write('LAST_MODIFIED="%s"' % 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):
-      self.outfile.write(ind_s*(level+1) + "<HR>\n")
+    filename = "bookmarks.html"
+
+    def _folder(self, f, level):
+        if f.comment: self.outfile.write('<DD>%s\n' % dump_comment(f.comment))
+        self.outfile.write(ind_s*level + "<DL><p>\n")
+
+    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' % 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 (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"' % (b.href, b.add_date))
+        if b.last_visit: self.outfile.write(' LAST_VISIT="%s"' % b.last_visit)
+        if b.last_modified:
+            self.outfile.write(' LAST_MODIFIED="%s"' % b.last_modified)
+        if BKMK_FORMAT == "MOZILLA":
+            if b.keyword: self.outfile.write(' SHORTCUTURL="%s"' % b.keyword)
+            if b.icon_href:
+                value = b.icon_href
+                if isinstance(value, unicode):
+                    value = value.encode('utf-8')
+                self.outfile.write(' ICON_URI="%s"' % value)
+            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):
+        self.outfile.write(ind_s*(level+1) + "<HR>\n")