X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=228a3ceaddff6c0fe1acc8af64a374f348c5bb27;hb=ab815a37e54d51b330eb1c8a756f9d52bba859ad;hp=b2ef61b53ce348ba73851d779942053775526ce6;hpb=8e3453660b31d58dab53b49fa6764f7badb9b352;p=bookmarks_db.git diff --git a/Robots/parse_html.py b/Robots/parse_html.py index b2ef61b..228a3ce 100755 --- a/Robots/parse_html.py +++ b/Robots/parse_html.py @@ -2,7 +2,7 @@ """ HTML Parsers wrapper - Written by BroytMann. Copyright (C) 1997-2008 PhiloSoft Design + Written by Broytman. Copyright (C) 1997-2010 PhiloSoft Design """ import codecs @@ -11,6 +11,7 @@ universal_charset = "utf-8" DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic parsers = [] + try: import parse_html_beautifulsoup parse_html_beautifulsoup.DEFAULT_CHARSET = DEFAULT_CHARSET @@ -19,8 +20,26 @@ except ImportError: else: parsers.append(parse_html_beautifulsoup.parse_html) -from parse_html_htmlparser import parse_html -parsers.append(parse_html) +try: + from parse_html_lxml import parse_html +except ImportError: + pass +else: + parsers.append(parse_html) + +try: + from parse_html_htmlparser import parse_html +except ImportError: + pass +else: + parsers.append(parse_html) + +try: + import parse_html_html5 +except ImportError: + pass +else: + parsers.append(parse_html_html5.parse_html) import re @@ -32,9 +51,11 @@ num_entity_re = re.compile("(&#[0-9]+;)") def recode_entities(title, charset): output = [] for part in entity_re.split(title): - if part not in ("&", "<", ">", ""e;") and \ + if part not in ("&", "<", ">", """) and \ entity_re.match(part): - part = unichr(name2codepoint.get(part[1:-1], part)).encode(charset) + _part = name2codepoint.get(part[1:-1], None) + if _part is not None: + part = unichr(_part).encode(charset) output.append(part) title = ''.join(output) @@ -51,6 +72,9 @@ def recode_entities(title, charset): def parse_html(filename, charset=None, log=None): + if not parsers: + return None + if charset: try: codecs.lookup(charset) # In case of unknown charset... @@ -59,15 +83,16 @@ def parse_html(filename, charset=None, log=None): charsets = [universal_charset, DEFAULT_CHARSET] if charset: - charset = charset.lower() - if charset not in charsets: - charsets.insert(0, charset) + charset = charset.lower().replace("windows-", "cp") + if charset in charsets: + charsets.remove(charset) + charsets.insert(0, charset) for p in parsers: parser = None for c in charsets: try: - parser = p(filename, c) + parser = p(filename, c, log) break except UnicodeEncodeError: pass @@ -76,50 +101,64 @@ def parse_html(filename, charset=None, log=None): else: if log: log("Parser %s.%s failed, trying next one." % (p.__module__, p.__name__)) + if not parser: + return None + converted_title = title = parser.title - if not parser.charset: + if title and (not parser.charset): try: unicode(title, "ascii") except UnicodeDecodeError: parser.charset = DEFAULT_CHARSET if parser.charset: - parser.charset = parser.charset.replace("windows-", "cp").lower() + parser.charset = parser.charset.lower().replace("windows-", "cp") - if parser.charset and (parser.charset <> universal_charset): + if title and parser.charset and ( + (parser.charset <> universal_charset) or + ((not charset) or (charset <> parser.charset))): try: if parser.meta_charset: if log: log(" META charset : %s" % parser.charset) - else: + elif (not charset) or (charset <> parser.charset): if log: log(" guessed charset: %s" % parser.charset) if log: log(" current charset: %s" % universal_charset) if log: log(" title : %s" % title) - try: - converted_title = unicode(title, parser.charset).encode(universal_charset) - except UnicodeError: - if log: log(" incorrect conversion from %s, converting from %s" % (parser.charset, DEFAULT_CHARSET)) - converted_title = unicode(title, DEFAULT_CHARSET, "replace").encode(universal_charset, "replace") - parser.charset = DEFAULT_CHARSET + if parser.charset <> universal_charset: + try: + converted_title = unicode(title, parser.charset).encode(universal_charset) + except UnicodeError: + if log: log(" incorrect conversion from %s, converting from %s" % (parser.charset, DEFAULT_CHARSET)) + converted_title = unicode(title, DEFAULT_CHARSET, "replace").encode(universal_charset, "replace") + parser.charset = DEFAULT_CHARSET if log and (converted_title <> title): log(" converted title: %s" % converted_title) except LookupError: - if log: log(" unknown charset: `%s' or `%s'" % (parser.charset, universal_charset)) + if log: log(" unknown charset: '%s'" % parser.charset) else: if log: log(" title : %s" % title) - final_title = recode_entities(converted_title, universal_charset) - parts = [s.strip() for s in final_title.replace('\r', '').split('\n')] - final_title = ' '.join([s for s in parts if s]) - if log and (final_title <> converted_title): log(" final title : %s" % final_title) - parser.title = final_title + if title: + final_title = recode_entities(converted_title, universal_charset) + parts = [s.strip() for s in final_title.replace('\r', '').split('\n')] + final_title = ' '.join([s for s in parts if s]) + if log and (final_title <> converted_title): log(" final title : %s" % final_title) + parser.title = final_title return parser if __name__ == '__main__': import sys - from m_lib.defenc import default_encoding - current_charset = default_encoding.replace("windows-", "cp") - parser = parse_html(sys.argv[1], universal_charset, - log=lambda s: sys.stdout.write(s + '\n')) + l = len(sys.argv) + if l == 3: + filename = sys.argv[1] + charset = sys.argv[2] + elif l == 2: + filename = sys.argv[1] + charset = universal_charset + else: + sys.exit("Usage: %s filename [charset]" % sys.argv[0]) + + parser = parse_html(filename, charset, log=lambda s: sys.stdout.write(s + '\n')) print " refresh:", parser.refresh print " icon :", parser.icon