def __init__(self, user, passwd, host, port, dirs):
urllib_ftpwrapper.__init__(self, user, passwd, host, port, dirs)
global ftpcache_key
- ftpcache_key = (user, host, port, tuple(dirs))
+ ftpcache_key = (user, host, port, '/'.join(dirs))
urllib.ftpwrapper = myftpwrapper
return _welcome
+icons = {} # Icon cache; maps URL to a tuple (content type, data)
+ # or None if there is no icon.
+
class robot_simple(Robot):
def check_url(self, bookmark):
if not self.tempfname:
url_host, url_path = urllib.splithost(url_rest)
url_path, url_tag = urllib.splittag(url_path)
+ # Set fake referer to the root of the site
urllib._urlopener.addheaders[2] = ('Referer', "%s://%s%s" % (url_type, url_host, url_path))
+
if bookmark.charset: urllib._urlopener.addheader('Accept-Charset', bookmark.charset)
fname, headers = urllib.urlretrieve("%s://%s%s" % (url_type, url_host, url_path), self.tempfname)
if bookmark.charset: del urllib._urlopener.addheaders[-1]
icon = "/favicon.ico"
icon = urljoin("%s://%s%s" % (url_type, url_host, url_path), icon)
self.log(" looking for icon at: %s" % icon)
- try:
- for i in range(8):
- try:
- fname, headers = urllib.urlretrieve(icon)
- except RedirectException, e:
- icon = e.url
- self.log(" redirect to : %s" % icon)
- else:
- break
+ if icon in icons:
+ if icons[icon]:
+ content_type, bookmark.icon = icons[icon]
+ self.log(" cached icon: %s" % content_type)
else:
- raise IOError("Too many redirects")
- except:
- etype, emsg, tb = sys.exc_info()
- self.log(" no icon : %s %s" % (etype, emsg))
- etype = None
- emsg = None
- tb = None
+ self.log(" cached icon: no icon")
else:
- content_type = headers["Content-Type"]
- if content_type.startswith("image/"):
- icon_file = open(fname, "rb")
- icon = icon_file.read()
- icon_file.close()
- bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon))
- self.log(" got icon : %s" % content_type)
+ try:
+ _icon = icon
+ for i in range(8):
+ try:
+ fname, headers = urllib.urlretrieve(_icon)
+ except RedirectException, e:
+ _icon = e.url
+ self.log(" redirect to : %s" % _icon)
+ else:
+ break
+ else:
+ raise IOError("Too many redirects")
+ except:
+ etype, emsg, tb = sys.exc_info()
+ self.log(" no icon : %s %s" % (etype, emsg))
+ etype = None
+ emsg = None
+ tb = None
+ icons[icon] = None
else:
- self.log(" no icon : bad content type '%s'" % content_type)
- os.remove(fname)
+ content_type = headers["Content-Type"]
+ if content_type.startswith("image/"):
+ icon_file = open(fname, "rb")
+ icon = icon_file.read()
+ icon_file.close()
+ bookmark.icon = "data:%s;base64,%s" % (content_type, b64encode(icon))
+ self.log(" got icon : %s" % content_type)
+ icons[icon] = (content_type, bookmark.icon)
+ else:
+ self.log(" no icon : bad content type '%s'" % content_type)
+ icons[icon] = None
+ os.remove(fname)
except KeyError:
pass