from parse_html import parse_html
-class RedirectException(Exception):
- reloc_dict = {
- 301: "perm.",
- 302: "temp2.",
- 303: "temp3.",
- 307: "temp7.",
- "html": "html"
- }
- def __init__(self, errcode, newurl):
- Exception.__init__(self, "(%s) to %s" % (self.reloc_dict[errcode], newurl))
- self.url = newurl
+reloc_dict = {
+ 301: "perm.",
+ 302: "temp2.",
+ 303: "temp3.",
+ 307: "temp7.",
+ "html": "html"
+}
def get_error(msg):
url_path, url_tag = urllib.splittag(url_path)
url = "%s://%s%s" % (url_type, url_host, url_path)
- error, headers, content = self.get(bookmark, url, True)
+ error, redirect_code, redirect_to, headers, content = self.get(bookmark, url, True)
if error:
bookmark.error = error
return 1
+ if redirect_code:
+ self.set_redirect(bookmark, redirect_code, redirect_to)
+ return 1
+
size = 0
last_modified = None
bookmark.last_modified = last_modified
md5 = md5wrapper()
- if urllib._urlopener.type == "ftp": # Pass welcome message through MD5
+ if url_type == "ftp": # Pass welcome message through MD5
md5.update(self.get_ftp_welcome())
md5.update(content)
try:
_icon_url = icon_url
for i in range(8):
- try:
- error, icon_headers, icon_data = self.get(bookmark, _icon_url)
- except RedirectException, e:
- _icon_url = e.url
+ error, icon_redirect_code, icon_redirect_to, \
+ icon_headers, icon_data = \
+ self.get(bookmark, _icon_url)
+ if icon_redirect_code:
+ _icon_url = icon_redirect_to
self.log(" redirect to : %s" % _icon_url)
else:
if icon_data is None:
try:
timeout = float(refresh.split(';')[0])
except (IndexError, ValueError):
- raise RedirectException("html", "Bad redirect to %s (%s)" % (url, refresh))
+ self.set_redirect(bookmark, "html", "Bad redirect to %s (%s)" % (url, refresh))
else:
try:
timeout = int(refresh.split(';')[0])
except ValueError:
pass # float timeout
- raise RedirectException("html", "%s (%s sec)" % (url, timeout))
+ self.set_redirect(bookmark, "html", "%s (%s sec)" % (url, timeout))
except KeyError, key:
self.log(" no header: %s" % key)
bookmark.error = "Unexpected EOF (FTP server closed connection)"
self.log(' EOF: %s' % bookmark.error)
- except RedirectException, msg:
- bookmark.moved = str(msg)
- self.log(' Moved: %s' % bookmark.moved)
-
except KeyboardInterrupt:
self.log("Keyboard interrupt (^C)")
return 0
# Tested
return 1
+ def set_redirect(self, bookmark, errcode, newurl):
+ bookmark.moved = "(%s) to %s" % (reloc_dict[errcode], newurl)
+ self.log(' Moved: %s' % bookmark.moved)
+
def finish_check_url(self, bookmark):
start = self.start
bookmark.last_tested = str(start)
-
now = int(time.time())
bookmark.test_time = str(now - start)
-
- self.cleanup()