Remove robots based on Twisted

[bookmarks_db.git] / bkmk_objects.py

diff --git a/bkmk_objects.py b/bkmk_objects.py
index d672bcfc7f2850e0e7c98d5fec7adf7148d50b16..b09d81d89d3db6f8751613c1fd5074b753e53b26 100644 (file)
--- a/bkmk_objects.py
+++ b/bkmk_objects.py
@@ -5,8 +5,9 @@ This file is a part of Bookmarks database and Internet robot.
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"
 """
 
 __author__ = "Oleg Broytman <phd@phdru.name>"

-__copyright__ = "Copyright (C) 2000-2024 PhiloSoft Design"
+__copyright__ = "Copyright (C) 2000-2025 PhiloSoft Design"

 __license__ = "GNU GPL"
 __license__ = "GNU GPL"

+__version__ = '6.4.0'

 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
            'InverseLinker', 'Linear', 'make_linear', 'make_tree', 'break_tree',
 
 __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
            'InverseLinker', 'Linear', 'make_linear', 'make_tree', 'break_tree',


@@ -14,7 +15,7 @@ __all__ = ['Folder', 'Bookmark', 'Ruler', 'Walker', 'Writer', 'Robot',
            ]
 
 
            ]
 
 

-from urllib.parse import urlsplit, quote, unquote
+from urllib.parse import unquote

 import os
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")
 import os
 
 BKMK_FORMAT = os.environ.get("BKMK_FORMAT", "MOZILLA")


@@ -58,29 +59,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):
     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):

-        split_results = urlsplit(href)
-        protocol, netloc, path, query, tag = split_results
-        user = split_results.username
-        password = split_results.password
-        host = split_results.hostname
-        port = split_results.port
-
-        if protocol == 'place':
-            href = protocol + ":"
-        else:
-            href = protocol + "://"
-        if user:
-            href += quote(user)
-            if password:
-                href += ':' + quote(password)
-            href += '@'
-        if host:
-            href += host.encode('idna').decode('ascii')
-            if port:
-                href += ':%d' % port
-        if path:
-            href += path
-

         self.href = href
         self.add_date = add_date
         self.last_visit = last_visit
         self.href = href
         self.add_date = add_date
         self.last_visit = last_visit


@@ -92,6 +70,30 @@ class Bookmark(object):
         self.charset = charset
 
 
         self.charset = charset
 
 

+bkmk_attrs = {
+    "charset": "Charset",
+    "error": "Error",
+    "icon": "Icon",
+    "icon_href": "IconURI",
+    "md5": "Md5",
+    "moved": "Moved",
+    "no_error": "NoError",
+    "real_title": "RealTitle",
+    "size": "Size",
+    "test_time": "TestTime",
+}
+
+
+bkmk_attrs_sentinel = object()
+
+
+def copy_bkmk(old_bkmk, new_bkmk):
+    for attr in bkmk_attrs.keys():
+        value = getattr(old_bkmk, attr, bkmk_attrs_sentinel)
+        if value is not bkmk_attrs_sentinel:
+            setattr(new_bkmk, attr, value)
+
+

 class Ruler(object):
     isFolder = 0
     isBookmark = 0
 class Ruler(object):
     isFolder = 0
     isBookmark = 0


@@ -245,3 +247,7 @@ def set_params(obj, params):
         params = params.items()
     for key, value in params:
         setattr(obj, key, value)
         params = params.items()
     for key, value in params:
         setattr(obj, key, value)

+
+
+# Global var to use in robots
+tty_pbar = None