X-Git-Url: https://git.phdru.name/?p=bookmarks_db.git;a=blobdiff_plain;f=bkmk_objects.py;h=dce981190c217b7602bcd600b53055dd47c13488;hp=00e186c794b8f1a32220c94b69fd7424bc25aeb4;hb=53d4a2383cfef1310871eefcc14e6e1950b96853;hpb=5e1a9df44e5fece3e3453f91d1dc0aea8ca0f8b8

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 00e186c..dce9811 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,22 +1,20 @@
 """Objects to represent bookmarks.html structure
 
 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-2014 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
     'InverseLinker', 'Linear', 'make_linear', 'make_tree', 'break_tree',
-    'quote_title', 'unquote_title',
+    'quote_title', 'unquote_title', 'parse_params', 'set_params',
 ]
 
 
-import os
+import os, urllib
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -51,19 +49,39 @@ class Folder(list):
          walker.end_folder(self, level)
 
 
-class Bookmark:
+class Bookmark(object):
    isFolder = 0
    isBookmark = 1
 
    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))
+         keyword=None, comment='', icon_href=None, icon=None,
+         charset=None, parser_charset=None):
+      protocol, request = urllib.splittype(href)
+      user, password, port = None, None, None
+      host, path = urllib.splithost(request)
+      if host:
+         user, host = urllib.splituser(host)
+         if user:
+            user, password = urllib.splitpasswd(user)
+         host, port = urllib.splitport(host)
+         if port: port = int(port)
+
+      if protocol == 'place':
+         href = protocol + ":"
+      else:
+         href = protocol + "://"
+      if user:
+         href += urllib.quote(user)
+         if password:
+            href += ':' + urllib.quote(password)
+         href += '@'
+      if host:
+         href += host.decode(parser_charset or 'utf-8').encode('idna')
+         if port:
+            href += ':%d' % port
+      if path:
+         href += path
+
       self.href = href
       self.add_date = add_date
       self.last_visit = last_visit
@@ -75,12 +93,12 @@ class Bookmark:
       self.charset = charset
 
 
-class Ruler:
+class Ruler(object):
    isFolder = 0
    isBookmark = 0
 
 
-class Walker:
+class Walker(object):
    """
       Interface class. Any instance that will be passed to Folder.walk_depth
       may be derived from this class. It is not mandatory - unlike Java
@@ -117,7 +135,7 @@ class Writer(Walker):
       return self.prune == folder.name
 
 
-class Robot:
+class Robot(object):
    def __init__(self, log):
       self.log = log
 
@@ -197,6 +215,22 @@ def quote_title(title):
 def unquote_title(title):
    if BKMK_FORMAT == "MOZILLA":
       from HTMLParser import HTMLParser
-      title = HTMLParser().unescape(title.replace("&amp;", '&'))
-      title = title.replace("&#39;", "'")
+      title = HTMLParser().unescape(title.replace("&amp;", '&').decode('utf-8'))
+      title = title.encode('utf-8').replace("&#39;", "'")
    return title
+
+
+def parse_params(param_str):
+    params = param_str.split(':')
+    main_param = params.pop(0)
+    param_list = {}
+    for param in params:
+        key, value = param.split('=', 1)
+        param_list[key] = value
+    return main_param, param_list
+
+def set_params(obj, params):
+    if hasattr(params, "items"):
+        params = params.items()
+    for key, value in params:
+        setattr(obj, key, value)