Fix(Robot): Stop splitting and un-splitting URLs

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index 4850261ef529c854708b5eb0437323720ed9d41e..bf5904b3287d2872dd6e871398751bc3118c6700 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -5,7 +5,7 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
-__copyright__ = "Copyright (C) 2000-2023 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2024 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
@@ -14,15 +14,8 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
            ]
 
 
+from urllib.parse import unquote
 import os
-try:
-    from urllib.parse import quote, \
-        splittype, splithost, splituser, splitpasswd, \
-        splitport
-except ImportError:
-    from urllib import quote, \
-        splittype, splithost, splituser, splitpasswd, \
-        splitport
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 
@@ -65,32 +58,6 @@ class Bookmark(object):
     def __init__(self, href, add_date, last_visit=None, last_modified=None,
                  keyword=None, comment='', icon_href=None, icon=None,
                  charset=None, parser_charset=None):
-        protocol, request = splittype(href)
-        user, password, port = None, None, None
-        host, path = splithost(request)
-        if host:
-            user, host = splituser(host)
-            if user:
-                user, password = splitpasswd(user)
-            host, port = splitport(host)
-            if port: port = int(port)
-
-        if protocol == 'place':
-            href = protocol + ":"
-        else:
-            href = protocol + "://"
-        if user:
-            href += quote(user)
-            if password:
-                href += ':' + 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
@@ -228,10 +195,15 @@ def quote_title(title):
 
 def unquote_title(title):
     if BKMK_FORMAT == "MOZILLA":
-        from HTMLParser import HTMLParser
-        title = HTMLParser().unescape(
-            title.replace("&amp;", '&').decode('utf-8'))
-        title = title.encode('utf-8').replace("&#39;", "'")
+        try:
+            from HTMLParser import HTMLParser
+        except ImportError:
+            from html import unescape
+        else:
+            unescape = HTMLParser().unescape
+        title = unescape(
+            title.replace("&amp;", '&'))
+        title = title.replace("&#39;", "'")
     return title
 
 
@@ -241,7 +213,7 @@ def parse_params(param_str):
     param_list = {}
     for param in params:
         key, value = param.split('=', 1)
-        param_list[key] = value
+        param_list[key] = unquote(value)
     return main_param, param_list