X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=00e186c794b8f1a32220c94b69fd7424bc25aeb4;hb=53961cb13ce4b5d4ce932253db73c78d0620ae2b;hp=2cb46007e1416ecbf73a455790bc765ed1a197be;hpb=fb5c3b2b91aeeb615d6d6d890491af3fdff69556;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 2cb4600..00e186c 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,21 +1,34 @@
-"""
-   Objects to represent bookmarks.html structure
+"""Objects to represent bookmarks.html structure
 
-   Written by BroytMann, Mar 2000 - Jul 2002. Copyright (C) 2000-2002 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__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
+    'InverseLinker', 'Linear', 'make_linear', 'make_tree', 'break_tree',
+    'quote_title', 'unquote_title',
+]
+
+
+import os
 
-from UserList import UserList
+BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
-class Folder(UserList):
+class Folder(list):
    isFolder = 1
    isBookmark = 0
 
-   def __init__(self, add_date = None, comment = ''):
-      UserList.__init__(self)
+   def __init__(self, add_date=None, comment='', last_modified=None):
+      super(Folder, self).__init__()
       self.comment = comment
       self.add_date = add_date
-
+      self.last_modified = last_modified
 
    def walk_depth(self, walker, level=0):
       if hasattr(self, "header"): # root folder
@@ -27,7 +40,7 @@ class Folder(UserList):
             walker.start_folder(self, level)
 
       if not prune:
-         for object in self.data:
+         for object in self:
             if object.isFolder:
                object.walk_depth(walker, level+1)
             elif object.isBookmark:
@@ -42,12 +55,24 @@ class Bookmark:
    isFolder = 0
    isBookmark = 1
 
-   def __init__(self, href, add_date, last_visit, last_modified, comment = ''):
-      self.comment = comment
+   def __init__(self, href, add_date, last_visit=None, last_modified=None,
+         keyword=None, comment='', icon_href=None, icon=None, charset=None):
+      if isinstance(href, str):
+         try:
+            href = href.decode('idna')
+         except UnicodeDecodeError: # Non-ascii href
+            href = href.decode('utf-8')
+      elif not isinstance(href, unicode):
+          raise TypeError("Bookmark's href must be str or unicode, not %r" % type(href))
       self.href = href
       self.add_date = add_date
       self.last_visit = last_visit
       self.last_modified = last_modified
+      self.keyword = keyword
+      self.comment = comment
+      self.icon_href = icon_href
+      self.icon = icon
+      self.charset = charset
 
 
 class Ruler:
@@ -93,8 +118,7 @@ class Writer(Walker):
 
 
 class Robot:
-   def __init__(self, tempfname, log):
-      self.tempfname = tempfname
+   def __init__(self, log):
       self.log = log
 
    def stop(self):
@@ -157,3 +181,22 @@ def make_tree(linear):
       object.parent.append(object)
 
    return root_folder
+
+def break_tree(linear):
+   del linear[0]
+
+   for object in linear:
+      del object.parent
+
+
+def quote_title(title):
+   if BKMK_FORMAT == "MOZILLA":
+      title = title.replace("'", "&#39;")
+   return title
+
+def unquote_title(title):
+   if BKMK_FORMAT == "MOZILLA":
+      from HTMLParser import HTMLParser
+      title = HTMLParser().unescape(title.replace("&amp;", '&'))
+      title = title.replace("&#39;", "'")
+   return title