X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=check_url.py;h=a43d00765372b5e13f6e220546d91f55a0f2e4df;hb=a23c3efc90dd6a038d11f5892510a93e09593a70;hp=0d40ba9672e9c01a986c2cfcf0f9ce7bffb4a0d8;hpb=90f66cf9ebfa461d9c1d3163d69f345b20fb8d03;p=bookmarks_db.git

diff --git a/check_url.py b/check_url.py
index 0d40ba9..a43d007 100755
--- a/check_url.py
+++ b/check_url.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Robot interface - check URLs from the command line
 
 This file is a part of Bookmarks database and Internet robot.
@@ -9,21 +9,23 @@ __copyright__ = "Copyright (C) 2010-2023 PhiloSoft Design"
 __license__ = "GNU GPL"
 
 import sys
-import httplib
 
-HTTP = httplib.HTTP
-
-
-class MyHTTP(HTTP):
-    def _setup(self, conn):
-        HTTP._setup(self, conn)
-        self.set_debuglevel(1)
+from bkmk_objects import Bookmark
+from Writers.bkmk_wflad import strftime
 
+try:
+    import httplib
+except ImportError:
+    pass
+else:
+    HTTP = httplib.HTTP
 
-httplib.HTTP = MyHTTP
+    class MyHTTP(HTTP):
+        def _setup(self, conn):
+            HTTP._setup(self, conn)
+            self.set_debuglevel(1)
 
-from bkmk_objects import Bookmark
-from Writers.bkmk_wflad import strftime
+    httplib.HTTP = MyHTTP
 
 
 def run():
@@ -35,6 +37,8 @@ def run():
 
     from m_lib.flog import makelog
     log = makelog("check.log")
+    log.outfile.reconfigure(encoding='utf-8')
+    sys.stdout.reconfigure(encoding='utf-8')
 
     from robots import robot
     robot = robot(log)
@@ -51,12 +55,26 @@ def run():
 
         else:
             print("""\
-  URL: %s
   Title: %s
+  URL: %s
   LastModified: %s
+  Moved: %s
+  Size: %s
+  Md5: %s
   IconURI: %s
   Icon: %s
-  """ % (bookmark.href, getattr(bookmark, 'real_title', ''), strftime(bookmark.last_modified), bookmark.icon_href, bookmark.icon))
+  Charset: %s
+  """ % (
+              getattr(bookmark, 'real_title', None)
+              or getattr(bookmark, 'title', None),
+              bookmark.href,
+              strftime(bookmark.last_modified),
+              getattr(bookmark, 'moved', None),
+              getattr(bookmark, 'size', None),
+              getattr(bookmark, 'md5', None),
+              bookmark.icon_href, bookmark.icon, bookmark.charset,
+              )
+            )
 
     robot.stop()
     log.close()