X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=check_urls.py;h=2e9fe83c8a2a72328a7ff7d022e27d7f1edadff0;hb=3de6c8f6da84fdc757f3b4a3355ed502c4a75318;hp=497c081c950ae03ebd133cc1fcf6a6436a2424a0;hpb=fb5c3b2b91aeeb615d6d6d890491af3fdff69556;p=bookmarks_db.git

diff --git a/check_urls.py b/check_urls.py
index 497c081..2e9fe83 100755
--- a/check_urls.py
+++ b/check_urls.py
@@ -1,13 +1,13 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 """
    Robot interface - check URLs from bookmarks database
 
-   Written by BroytMann, Mar 2000 - Aug 2002. Copyright (C) 2000-2002 PhiloSoft Design
+   Written by Broytman. Copyright (C) 2000-2007 PhiloSoft Design.
 """
 
 
-import sys, os, urllib, tempfile
-tempfname = "check_urls" + tempfile.gettempprefix() + "tmp"
+import sys, os
+tempfname = "check_urls.tmp"
 
 
 def run():
@@ -31,7 +31,7 @@ def run():
       pass
 
    if report_stats:
-      print "BroytMann check_urls, Copyright (C) 1997-2002 PhiloSoft Design"
+      print "Broytman check_urls, Copyright (C) 1997-2007 PhiloSoft Design"
 
    if args:
       sys.stderr.write("check_urls: too many arguments\n")
@@ -70,7 +70,7 @@ def run():
       sys.stdout.flush()
 
    root_folder = storage.load()
-   from bkmk_objects import make_linear
+   from bkmk_objects import make_linear, break_tree
    make_linear(root_folder)
    objects = len(root_folder.linear)
 
@@ -114,13 +114,12 @@ def run():
             old_object = root_folder.linear[checked[object.href]]
             for attr_name in ("last_visit", "last_modified",
                   "error", "no_error", "moved", "size", "md5", "real_title",
-                  "last_tested", "test_time"):
+                  "last_tested", "test_time", "icon", "charset"):
                if hasattr(old_object, attr_name):
                   setattr(object, attr_name, getattr(old_object, attr_name))
          else:
-            url_type, url_rest = urllib.splittype(object.href)
-            log("Checking %s:%s" % (url_type, url_rest))
-            rcode = robot.check_url(object, url_type, url_rest)
+            log("Checking %s" % object.href)
+            rcode = robot.check_url(object)
 
             if rcode:
                checked[object.href] = object_no
@@ -143,6 +142,7 @@ def run():
       print urls_no, "URLs checked"
       print size, "bytes eaten"
 
+   break_tree(root_folder.linear)
    storage.store(root_folder)
 
    if rcode: