DEBUG. Used +=.

git-svn-id: file:///home/phd/archive/SVN/bookmarks_db/trunk@21 fdd5c36f-1aea-0310-aeeb-c58d7e2b6c23

diff --git a/bkmk_parser.py b/bkmk_parser.py
index c156cb76cc1b8fab12dcd48d012817a62ac73cbe..37f5f7743d33e0fc48527832559677f8775ba66a 100755 (executable)
--- a/bkmk_parser.py
+++ b/bkmk_parser.py
@@ -1,16 +1,18 @@
 """
-   Parser for Netscape Navigator's bookmarks.html
+   Parser for Netscape Navigator's and Mozilla's bookmarks.html
 
-   Written by BroytMann, Jun 1997 - Jul 2003. Copyright (C) 1997-2003 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 1997-2003 PhiloSoft Design
 """
 
 
-import string
+import os
 from m_lib.net.www.html import HTMLParser
 from bkmk_objects import Folder, Bookmark, Ruler
 
 
-if __debug__:
+DEBUG = os.environ.has_key("BKMK_DEBUG")
+
+if DEBUG:
    def debug(note):
       print note
 
@@ -19,7 +21,7 @@ if __debug__:
       for object in folder_stack:
          if object.isFolder:
             l.append(object.name)
-      return "'" + string.join(l, "' '") + "'"
+      return "'%s'" % "' '".join(l)
 
 else:
    def debug(note):
@@ -42,7 +44,7 @@ class BkmkParser(HTMLParser):
       if data:
          if self.charset:
             data = unicode(data, self.charset).encode()
-         self.accumulator = "%s%s" % (self.accumulator, data)
+         self.accumulator += data
 
 
    # Mozilla - get charset
@@ -51,7 +53,7 @@ class BkmkParser(HTMLParser):
       content = ""
 
       for attrname, value in attrs:
-         value = string.strip(value)
+         value = value.strip()
          if attrname == 'http-equiv':
             http_equiv = value.lower()
          elif attrname == 'content':
@@ -66,10 +68,10 @@ class BkmkParser(HTMLParser):
 
 
    def start_title(self, attrs):
-      self.accumulator = "%s<TITLE>" % self.accumulator
+      self.accumulator += "<TITLE>"
 
    def end_title(self):
-      self.accumulator = "%s</TITLE>" % self.accumulator
+      self.accumulator += "</TITLE>"
 
 
    # Start root folder
@@ -80,7 +82,7 @@ class BkmkParser(HTMLParser):
       self.current_folder = root_folder
       self.folder_stack = [root_folder]
 
-      self.root_folder.header = self.accumulator
+      self.root_folder.header = self.accumulator.strip()
       self.accumulator = ''
 
    def end_h1(self):
@@ -94,7 +96,7 @@ class BkmkParser(HTMLParser):
    # Start next folder
    def start_h3(self, attrs):
       for attrname, value in attrs:
-         value = string.strip(value)
+         value = value.strip()
          if attrname == 'add_date':
             add_date = value
 
@@ -104,7 +106,7 @@ class BkmkParser(HTMLParser):
       self.current_folder.append(folder)
       self.folder_stack.append(folder) # push new folder
       self.current_folder = folder
-      self.objects = self.objects + 1
+      self.objects += 1
 
    def end_h3(self):
       accumulator = self.accumulator
@@ -120,7 +122,7 @@ class BkmkParser(HTMLParser):
       last_modified = None
 
       for attrname, value in attrs:
-         value = string.strip(value)
+         value = value.strip()
          if attrname == 'href':
             href = value
          if attrname == 'add_date':
@@ -134,8 +136,8 @@ class BkmkParser(HTMLParser):
       bookmark = Bookmark(href, add_date, last_visit, last_modified)
       self.current_object = bookmark
       self.current_folder.append(bookmark)
-      self.urls = self.urls + 1
-      self.objects = self.objects + 1
+      self.urls += 1
+      self.objects += 1
 
    def end_a(self):
       accumulator = self.accumulator
@@ -153,8 +155,9 @@ class BkmkParser(HTMLParser):
          self.accumulator = ''
 
          current_object = self.current_object
-         current_object.comment = current_object.comment + accumulator
-         debug("Comment: `%s'" % current_object.comment)
+         if current_object:
+            current_object.comment += accumulator.strip()
+            debug("Comment: `%s'" % current_object.comment)
 
 
    def start_dl(self, attrs):
@@ -197,17 +200,17 @@ class BkmkParser(HTMLParser):
       debug("Ruler")
       self.current_folder.append(Ruler())
       self.current_object = None
-      self.objects = self.objects + 1
+      self.objects += 1
 
 
    # BR in comment
    def do_br(self, attrs):
-      self.accumulator = "%s<BR>" % self.accumulator
+      self.accumulator += "<BR>"
 
 
    # Allow < in the text
    def unknown_starttag(self, tag, attrs):
-      self.accumulator = "%s<%s>" % (self.accumulator, tag)
+      self.accumulator += "<%s>" % tag
 
 
    # Do not allow unknow end tags