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

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 00e186c..23fb816 100644
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -1,13 +1,11 @@
 """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"
 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
@@ -16,7 +14,7 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
 ]
 
 
-import os
+import os, urllib
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -56,14 +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):
-      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
@@ -197,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