X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fbkmk_rsimple.py;h=42975d29a729d26ad4838cd64791acef0ca34d9a;hb=d4e41686948360cf605081b602302750e61699fe;hp=228899629fb507e94a7877da50ca698c078bc666;hpb=a58c2f2c09fffa02089ddeb564f5224f1eea5d9c;p=bookmarks_db.git diff --git a/Robots/bkmk_rsimple.py b/Robots/bkmk_rsimple.py index 2288996..42975d2 100644 --- a/Robots/bkmk_rsimple.py +++ b/Robots/bkmk_rsimple.py @@ -158,6 +158,7 @@ class robot_simple(Robot): if headers: try: content_type = headers["Content-Type"] + self.log(" Content-Type: %s" % content_type) try: # extract charset from "text/html; foo; charset=UTF-8, bar; baz;" content_type, charset = content_type.split(';', 1) @@ -167,7 +168,13 @@ class robot_simple(Robot): except (ValueError, IndexError): charset = None self.log(" no charset in Content-Type header") - if content_type in ("text/html", "application/xhtml+xml"): + for ctype in ("text/html", "application/xhtml+xml"): + if content_type.startswith(ctype): + html = True + break + else: + html = False + if html: parser = parse_html(fname, charset, self.log) bookmark.real_title = parser.title if parser.refresh: @@ -233,8 +240,8 @@ class robot_simple(Robot): icons[icon] = None os.remove(fname) - except KeyError: - pass + except KeyError, key: + self.log(" no header: %s" % key) except IOError, msg: if (msg[0] == "http error") and (msg[1] == -1):