X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=41fa2b33a607fe1db2e1a322520d47abd2cb6d46;hb=c79561dfd3ff2e2a69b542211bfb7c692210776d;hp=63f96027c2f5d2458b22d697c6aad34797ce90ff;hpb=9f53b96dd2db15b055cc64e2615a5a49ef56b372;p=bookmarks_db.git diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py index 63f9602..41fa2b3 100644 --- a/Robots/bkmk_rsimple.py +++ b/Robots/bkmk_rsimple.py @@ -176,24 +176,6 @@ class robot_simple(Robot): parser = parse_html(fname, charset, self.log) if parser: bookmark.real_title = parser.title - if parser.refresh: - refresh = parser.refresh - try: - url = refresh.split('=', 1)[1] - except IndexError: - url = "self" - try: - timeout = float(refresh.split(';')[0]) - except (IndexError, ValueError): - raise RedirectException("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)) - - # Get favicon.ico icon = parser.icon else: icon = None @@ -241,6 +223,22 @@ class robot_simple(Robot): else: self.log(" no icon : bad content type '%s'" % content_type) icons[icon] = None + if parser and parser.refresh: + refresh = parser.refresh + try: + url = refresh.split('=', 1)[1] + except IndexError: + url = "self" + try: + timeout = float(refresh.split(';')[0]) + except (IndexError, ValueError): + raise RedirectException("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)) except KeyError, key: self.log(" no header: %s" % key)