X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=9f924c49597a3f4436fd477363ee7cd1fe1b5c32;hb=a334a6e43f36642f4ffff7ebf0aec085a8545b2f;hp=3e20a5516a775eb8e425bdf932831bbcb559641f;hpb=d2499bf060be42a28feebde2e8bded52504ced95;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index 3e20a55..9f924c4 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -11,10 +11,16 @@ from m_lib.defenc import default_encoding
 current_charset = default_encoding.replace("windows-", "cp")
 DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 
+parsers = []
 try:
-   from parse_html_beautifulsoup import parse_html as _parse_html
+   from parse_html_beautifulsoup import parse_html
 except ImportError:
-   from parse_html_htmlparser import parse_html as _parse_html
+   pass
+else:
+   parsers.append(parse_html)
+
+from parse_html_htmlparser import parse_html
+parsers.append(parse_html)
 
 
 import re
@@ -24,7 +30,10 @@ def recode_entities(title, charset):
    output = []
    for part in entity_re.split(title):
       if entity_re.match(part):
-         part = unichr(int(part[2:-1])).encode(charset, "replace")
+         try:
+            part = unichr(int(part[2:-1])).encode(charset)
+         except UnicodeEncodeError:
+            pass # Leave the entity as is
       output.append(part)
 
    return ''.join(output)
@@ -37,9 +46,14 @@ def parse_html(filename, charset=None, log=None):
       except (ValueError, LookupError):
          charset = None         # ...try charset from HTML
 
-   parser = _parse_html(filename, charset)
-   title = parser.title
+   for p in parsers:
+      parser = p(filename, charset)
+      if parser:
+         break
+      else:
+         if log: log("Parser %s.%s failed, trying next one." % (p.__module__, p.__name__))
 
+   converted_title = title = parser.title
    if not parser.charset:
       try:
          unicode(title, "ascii")
@@ -54,15 +68,31 @@ def parse_html(filename, charset=None, log=None):
          if parser.meta_charset:
             if log: log("   META charset   : %s" % parser.charset)
          else:
-            if log: log("   charset        : %s" % parser.charset)
-         if log: log("   title          : %s" % title)
-         title = unicode(title, parser.charset, "replace").encode(current_charset, "replace")
+            if log: log("   HTTP charset   : %s" % parser.charset)
          if log: log("   current charset: %s" % current_charset)
-         if log: log("   converted title: %s" % title)
+         if log: log("   title          : %s" % title)
+         save_title = title
+         try:
+            converted_title = unicode(title, parser.charset).encode(current_charset)
+         except UnicodeError:
+            if parser.meta_charset and parser.charset.endswith("1252") and \
+                  not DEFAULT_CHARSET.endswith("1252") and (DEFAULT_CHARSET <> current_charset):
+               parser.charset = DEFAULT_CHARSET
+               if log: log("   incorrect conversion from cp1252, converting from %s" % DEFAULT_CHARSET)
+               converted_title = unicode(save_title, DEFAULT_CHARSET, "replace").encode(current_charset, "replace")
+            else:
+               converted_title = unicode(title, parser.charset, "replace").encode(current_charset, "replace")
+         if log and (converted_title <> title): log("   converted title: %s" % converted_title)
       except LookupError:
          if log: log("   unknown charset: `%s' or `%s'" % (parser.charset, current_charset))
-
-   parser.title = recode_entities(title, current_charset)
+   else:
+      if log: log("   title          : %s" % title)
+
+   final_title = recode_entities(converted_title, current_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