X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=bkmk_objects.py;h=23fb816ee180100100722ee2b7ac9818cf63390d;hb=404e33f61c2b32c805a9dc39f25f8782b017f41e;hp=d15c38e52d440c2a7bc29a827b75e86953917d3a;hpb=832eb757ef7f81abf1e431ce16f368c10dd57962;p=bookmarks_db.git

diff --git a/bkmk_objects.py b/bkmk_objects.py
index d15c38e..23fb816 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,19 +1,23 @@
 """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-2012 PhiloSoft Design"
 __license__ = "GNU GPL"
 
-import os, cgi
-BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
+__all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
+    'InverseLinker', 'Linear', 'make_linear', 'make_tree', 'break_tree',
+    'quote_title', 'unquote_title',
+]
 
 
+import os, urllib
+
+BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
+
 class Folder(list):
    isFolder = 1
    isBookmark = 0
@@ -50,7 +54,34 @@ class Bookmark:
    isBookmark = 1
 
    def __init__(self, href, add_date, last_visit=None, last_modified=None,
-         keyword=None, comment='', icon_href=None, icon=None, charset=None):
+         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
@@ -184,6 +215,6 @@ 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