X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=5242d5765a8ae10ecd42cb8dcd02a3a74e031845;hb=61c2651bac82753c783545e633374a747a84c1cc;hp=88f5e16ab2339613b82432af553210685f476e3b;hpb=006dd8fb2ecee5e16b054744e8c1da9afc04c378;p=bookmarks_db.git diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py index 88f5e16..5242d57 100644 --- a/Robots/bkmk_rsimple.py +++ b/Robots/bkmk_rsimple.py @@ -1,9 +1,18 @@ -""" - Simple, strightforward robot +"""Simple, strightforward robot - Written by Oleg Broytman. Copyright (C) 2000-2010 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 " +__copyright__ = "Copyright (C) 2000-2011 PhiloSoft Design" +__license__ = "GNU GPL" + +__all__ = ['robot_simple', 'get_error'] + + import sys, os import time, urllib from base64 import b64encode @@ -187,9 +196,9 @@ class robot_simple(Robot): if icons[icon]: bookmark.icon_href = icon content_type, bookmark.icon = icons[icon] - self.log(" cached icon: %s" % content_type) + self.log(" cached icon: %s" % content_type) else: - self.log(" cached icon: no icon") + self.log(" cached icon: no icon") else: try: _icon = icon @@ -198,7 +207,7 @@ class robot_simple(Robot): icon_fname, headers = urllib.urlretrieve(_icon) except RedirectException, e: _icon = e.url - self.log(" redirect to : %s" % _icon) + self.log(" redirect to : %s" % _icon) else: break else: @@ -220,7 +229,7 @@ class robot_simple(Robot): self.log(" got icon : %s" % content_type) if content_type.startswith("application/") \ or content_type.startswith("text/plain"): - self.log(" non-image content type, assume x-icon") + self.log(" non-image content type, assume x-icon") content_type = 'image/x-icon' bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon_data)) icons[icon] = (content_type, bookmark.icon) @@ -279,7 +288,6 @@ class robot_simple(Robot): # Tested return 1 - def finish_check_url(self, bookmark, fname=None): # Calculate these attributes even in case of an error if fname and os.path.exists(fname):