X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=137ebfad9809d369712483bfa63b97744f7c6f1a;hb=284b0935fc4237bda2e51229860c771f78887be2;hp=9f924c49597a3f4436fd477363ee7cd1fe1b5c32;hpb=f84aa81f636d43180118cd3e9470d3d57f9c539e;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index 9f924c4..137ebfa 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -2,41 +2,51 @@
 """
    HTML Parsers wrapper
 
-   Written by BroytMann. Copyright (C) 1997-2007 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 1997-2008 PhiloSoft Design
 """
 
 import codecs
 
-from m_lib.defenc import default_encoding
-current_charset = default_encoding.replace("windows-", "cp")
+universal_charset = "utf-8"
 DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 
 parsers = []
 try:
-   from parse_html_beautifulsoup import parse_html
+   import parse_html_beautifulsoup
+   parse_html_beautifulsoup.DEFAULT_CHARSET = DEFAULT_CHARSET
 except ImportError:
    pass
 else:
-   parsers.append(parse_html)
+   parsers.append(parse_html_beautifulsoup.parse_html)
 
 from parse_html_htmlparser import parse_html
 parsers.append(parse_html)
 
 
 import re
-entity_re = re.compile("(&#[0-9]+;)")
+from htmlentitydefs import entitydefs
+
+entity_re = re.compile("(&\w+;)")
+num_entity_re = re.compile("(&#[0-9]+;)")
 
 def recode_entities(title, charset):
    output = []
    for part in entity_re.split(title):
       if entity_re.match(part):
+         if part not in ("&", "<", ">", "&quote;", " "):
+            part = entitydefs.get(part[1:-1], part)
+      output.append(part)
+
+   output2 = []
+   for part in num_entity_re.split(''.join(output)):
+      if num_entity_re.match(part):
          try:
             part = unichr(int(part[2:-1])).encode(charset)
          except UnicodeEncodeError:
             pass # Leave the entity as is
-      output.append(part)
+      output2.append(part)
 
-   return ''.join(output)
+   return ''.join(output2)
 
 
 def parse_html(filename, charset=None, log=None):
@@ -47,7 +57,16 @@ def parse_html(filename, charset=None, log=None):
          charset = None         # ...try charset from HTML
 
    for p in parsers:
-      parser = p(filename, charset)
+      charsets = [universal_charset, DEFAULT_CHARSET]
+      if charset not in charsets:
+         charsets.insert(0, charset)
+      parser = None
+      for c in charsets:
+         try:
+            parser = p(filename, c)
+            break
+         except UnicodeEncodeError:
+            pass
       if parser:
          break
       else:
@@ -63,32 +82,27 @@ def parse_html(filename, charset=None, log=None):
    if parser.charset:
       parser.charset = parser.charset.replace("windows-", "cp").lower()
 
-   if parser.charset and (parser.charset <> current_charset):
+   if parser.charset and (parser.charset <> universal_charset):
       try:
          if parser.meta_charset:
             if log: log("   META charset   : %s" % parser.charset)
          else:
-            if log: log("   HTTP charset   : %s" % parser.charset)
-         if log: log("   current charset: %s" % current_charset)
+            if log: log("   guessed charset: %s" % parser.charset)
+         if log: log("   current charset: %s" % universal_charset)
          if log: log("   title          : %s" % title)
-         save_title = title
          try:
-            converted_title = unicode(title, parser.charset).encode(current_charset)
+            converted_title = unicode(title, parser.charset).encode(universal_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: 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, current_charset))
+         if log: log("   unknown charset: `%s' or `%s'" % (parser.charset, universal_charset))
    else:
       if log: log("   title          : %s" % title)
 
-   final_title = recode_entities(converted_title, current_charset)
+   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)
@@ -98,8 +112,10 @@ def parse_html(filename, charset=None, log=None):
 
 if __name__ == '__main__':
    import sys
-   parser = parse_html(sys.argv[1], current_charset)
-   print parser.charset
-   print parser.title
-   print parser.refresh
-   print parser.icon
+   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'))
+   print "   refresh:", parser.refresh
+   print "   icon   :", parser.icon