X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=17d05095c7d619a2ba7c3d741636fe22591dd9e8;hb=7fd1132c4ab530b7b34e846ca45f99b8737dd127;hp=2cb46007e1416ecbf73a455790bc765ed1a197be;hpb=fb5c3b2b91aeeb615d6d6d890491af3fdff69556;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 2cb4600..17d0509 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,21 +1,22 @@
 """
    Objects to represent bookmarks.html structure
 
-   Written by BroytMann, Mar 2000 - Jul 2002. Copyright (C) 2000-2002 PhiloSoft Design
+   Written by Oleg Broytman. Copyright (C) 2000-2010 PhiloSoft Design.
 """
 
+import os, cgi
+BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
-from UserList import UserList
 
-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 +28,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 +43,17 @@ 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):
       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 +99,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 +162,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("'", "'")
+   return title
+
+def unquote_title(title):
+   if BKMK_FORMAT == "MOZILLA":
+      from HTMLParser import HTMLParser
+      title = HTMLParser().unescape(title.replace("&", '&'))
+      title = title.replace("'", "'")
+   return title