X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Writers%2Fbkmk_whtml.py;h=1e933faf0904a3a4314e2ce4f836da47ad76f295;hb=5a17d1ea6aea7592d0fb3db5df19919cf2b1163e;hp=b4c4dab5c59ff3c0a28a7698376757e39efb542a;hpb=d9f2f4316537aea2cf87b2f77bf7d78eb54978a4;p=bookmarks_db.git

diff --git a/Writers/bkmk_whtml.py b/Writers/bkmk_whtml.py
index b4c4dab..1e933fa 100644
--- a/Writers/bkmk_whtml.py
+++ b/Writers/bkmk_whtml.py
@@ -1,9 +1,19 @@
-"""
-   Convert a bkmk database back to bookmarks.html
+"""Convert a bkmk database back to bookmarks.html
 
-   Written by Broytman. Copyright (C) 2000-2010 PhiloSoft Design
+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"
+__license__ = "GNU GPL"
+
+__all__ = ['writer_html']
+
+
+from m_lib.defenc import default_encoding
 from bkmk_objects import Writer, BKMK_FORMAT, quote_title
 
 
@@ -13,6 +23,11 @@ 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
 
@@ -30,8 +45,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"' % f.add_date)
-      if (BKMK_FORMAT == "MOZILLA") and f.last_modified: self.outfile.write(' LAST_MODIFIED="%s"' % f.last_modified)
+      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('>%s</H3>\n' % quote_title(f.name))
       self._folder(f, level)
 
@@ -39,7 +54,9 @@ 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" LAST_VISIT="%s" LAST_MODIFIED="%s"' % (b.href, b.add_date, b.last_visit, b.last_modified))
+      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))
       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)