X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=228a3ceaddff6c0fe1acc8af64a374f348c5bb27;hb=1666eb3f5d14ca9b798782ae1de99e9f2c0ae611;hp=66400b5fd4b711106d9f44a866ecaceece972f8d;hpb=d34baee8262c0e74ea3aaf142f9f570449e9787e;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index 66400b5..228a3ce 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -2,7 +2,7 @@
 """
    HTML Parsers wrapper
 
-   Written by Broytman. 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
@@ -53,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...
@@ -62,8 +84,9 @@ def parse_html(filename, charset=None, log=None):
    charsets = [universal_charset, DEFAULT_CHARSET]
    if charset:
       charset = charset.lower().replace("windows-", "cp")
-      if charset not in charsets:
-         charsets.insert(0, charset)
+      if charset in charsets:
+         charsets.remove(charset)
+      charsets.insert(0, charset)
 
    for p in parsers:
       parser = None
@@ -78,6 +101,9 @@ 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 title and (not parser.charset):
       try: