Fix: convert unicode icon URLs to utf-8

[bookmarks_db.git] / Writers / bkmk_whtml.py

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index 1e933faf0904a3a4314e2ce4f836da47ad76f295..707b52a68becf5bb00db6181fa3645bf2f247aa9 100644 (file)
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -3,11 +3,8 @@
 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-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['writer_html']
@@ -23,12 +20,6 @@ def dump_comment(comment):
       comment = comment.replace("\n", "<BR>\n")
    return comment
 
-def netscape_date(date):
-   if not date or (BKMK_FORMAT == "MOZILLA"):
-      return date
-   else:
-      return int(date)/(10**6)
-
 ind_s = " "*4
 
 class writer_html(Writer):
@@ -45,8 +36,8 @@ class writer_html(Writer):
       self._folder(f, 0)
 
    def start_folder(self, f, level):
-      self.outfile.write(ind_s*level + '<DT><H3 ADD_DATE="%s"' % netscape_date(f.add_date))
-      if (BKMK_FORMAT == "MOZILLA") and f.last_modified: self.outfile.write(' LAST_MODIFIED="%s"' % netscape_date(f.last_modified))
+      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)
 
@@ -54,12 +45,17 @@ class writer_html(Writer):
       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, netscape_date(b.add_date)))
-      if b.last_visit: self.outfile.write(' LAST_VISIT="%s"' % netscape_date(b.last_visit))
-      self.outfile.write(' LAST_MODIFIED="%s"' % netscape_date(b.last_modified))
+      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: self.outfile.write(' ICON_URI="%s"' % b.icon_href)
+         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))