X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=3250a0de5980c43a00c6cce8ff5e91a9e5b5471c;hb=daa40d9fc61a15fe51955d97b5711af5973a64d3;hp=c6a72f62fcff0f4987357830372b38aae03dd17a;hpb=a6dd530445b282c35407f40bf83160bb6cf8dfb3;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index c6a72f6..3250a0d 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 """
-   HTML Parser
+   HTML Parsers wrapper
 
    Written by BroytMann. Copyright (C) 1997-2007 PhiloSoft Design
 """
@@ -11,73 +11,10 @@ from m_lib.defenc import default_encoding
 current_charset = default_encoding.replace("windows-", "cp")
 DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 
-from HTMLParser import HTMLParseError
-from m_lib.net.www.html import HTMLParser as _HTMLParser
-
-
-class HTMLHeadDone(Exception): pass
-
-
-class HTMLParser(_HTMLParser):
-   def __init__(self, charset=None):
-      _HTMLParser.__init__(self)
-      self.charset = charset
-      self.meta_charset = 0
-      self.title = ''
-      self.refresh = ''
-      self.icon = None
-
-   def end_head(self):
-      raise HTMLHeadDone()
-
-
-   def do_meta(self, attrs):
-      http_equiv = ""
-      content = ""
-
-      for attrname, value in attrs:
-         if value:
-            value = value.strip()
-            if attrname == 'http-equiv':
-               http_equiv = value.lower()
-            elif attrname == 'content':
-               content = value
-
-      if (not self.charset) and (http_equiv == "content-type"):
-         try:
-            # extract charset from "text/html; foo; charset=UTF-8; bar;"
-            self.charset = content.lower().split('charset=')[1].split(';')[0]
-            self.meta_charset = 1 # Remember that the charset was retrieved from
-                                  # META tag, not from the Content-Type header
-         except IndexError:
-            pass
-
-      if http_equiv == "refresh":
-         self.refresh = content
-
-
-   def start_title(self, attrs):
-      self.accumulator = ''
-
-   def end_title(self):
-      if not self.title: # use only the first title
-         self.title = self.accumulator
-
-
-   def do_link(self, attrs):
-      has_icon = False
-      href = None
-
-      for attrname, value in attrs:
-         if value:
-            value = value.strip().lower()
-            if (attrname == 'rel') and (value.lower() in ('icon', 'shortcut icon')):
-               has_icon = True
-            elif attrname == 'href':
-               href = value
-
-      if has_icon:
-         self.icon = href
+try:
+   from parse_html_beautifulsoup import parse_html as _parse_html
+except ImportError:
+   from parse_html_htmlparser import parse_html as _parse_html
 
 
 import re
@@ -100,22 +37,7 @@ def parse_html(filename, charset=None, log=None):
       except (ValueError, LookupError):
          charset = None         # ...try charset from HTML
 
-   infile = open(filename, 'r')
-   parser = HTMLParser(charset)
-
-   for line in infile:
-      try:
-         parser.feed(line)
-      except (HTMLParseError, HTMLHeadDone):
-         break
-
-   infile.close()
-
-   try:
-      parser.close()
-   except (HTMLParseError, HTMLHeadDone):
-      pass
-
+   parser = _parse_html(filename, charset)
    title = parser.title
 
    if not parser.charset:
@@ -132,10 +54,20 @@ 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("   title          : %s" % title)
+         save_title = title
+         try:
+            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)
+               title = unicode(save_title, DEFAULT_CHARSET, "replace").encode(current_charset, "replace")
+            else:
+               title = unicode(title, parser.charset, "replace").encode(current_charset, "replace")
          if log: log("   converted title: %s" % title)
       except LookupError:
          if log: log("   unknown charset: `%s' or `%s'" % (parser.charset, current_charset))
@@ -145,7 +77,8 @@ def parse_html(filename, charset=None, log=None):
 
 
 if __name__ == '__main__':
-   parser = parse_html(sys.argv[1])
+   import sys
+   parser = parse_html(sys.argv[1], current_charset)
    print parser.charset
    print parser.title
    print parser.refresh