X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=check_urls.py;h=305458028b38fb51caee8b747bf60041943584a3;hb=832eb757ef7f81abf1e431ce16f368c10dd57962;hp=82d4af6946aef502fe25e80298aa6e4dec6c6fdf;hpb=a1b7edb2f925e22c9ad843496e13c687ce395e44;p=bookmarks_db.git

diff --git a/check_urls.py b/check_urls.py
index 82d4af6..3054580 100755
--- a/check_urls.py
+++ b/check_urls.py
@@ -1,13 +1,17 @@
 #! /usr/bin/env python
-"""
-   Robot interface - check URLs from bookmarks database
+"""Robot interface - check URLs from bookmarks database
 
-   Written by BroytMann. Copyright (C) 2000-2007 PhiloSoft Design.
+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"
+__license__ = "GNU GPL"
 
-import sys, os, tempfile
-tempfname = "check_urls" + tempfile.gettempprefix() + "tmp"
+import sys, os
 
 
 def run():
@@ -31,7 +35,7 @@ def run():
       pass
 
    if report_stats:
-      print "BroytMann check_urls, Copyright (C) 1997-2007 PhiloSoft Design"
+      print "Broytman check_urls, Copyright (C) 1997-2010 PhiloSoft Design"
 
    if args:
       sys.stderr.write("check_urls: too many arguments\n")
@@ -63,7 +67,7 @@ def run():
    storage = storage()
 
    from robots import robot
-   robot = robot(tempfname, log)
+   robot = robot(log)
 
    if report_stats:
       sys.stdout.write("Loading %s: " % storage.filename)
@@ -103,6 +107,10 @@ def run():
       object_count = object_count + 1
 
       if object.isBookmark:
+         if object.href.startswith('place:'): # Firefox SmartBookmarks
+            log("Skipped %s" % object.href)
+            continue
+
          if only_errors:
             if hasattr(object, "error"):
                delattr(object, "error")
@@ -114,7 +122,7 @@ 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:
@@ -149,11 +157,6 @@ def run():
       log("check_urls finished ok")
    log.close()
 
-   try:
-      os.unlink(tempfname)
-   except os.error:
-      pass
-
 
 if __name__ == '__main__':
    run()