X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=Robots%2Fparse_html_beautifulsoup.py;h=dc61a3305a3c0509562cfa9df56ccb88d550dc60;hb=dcad728f7b334f67f4f883add324de805b0b1e40;hp=9b0faded06ab92cb951b844421555776690118ff;hpb=0b76120991af955d34a9376d44e1df719f7ac16c;p=bookmarks_db.git

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index 9b0fade..dc61a33 100644
--- a/Robots/parse_html_beautifulsoup.py
+++ b/Robots/parse_html_beautifulsoup.py
@@ -39,7 +39,7 @@ class BadDeclParser(BeautifulSoup):
              except SGMLParseError:
                  # Could not parse the DOCTYPE declaration
                  # Try to just skip the actual declaration
-                 match = re.search(r'<!DOCTYPE([^>]*?)>', self.rawdata[i:], re.MULTILINE)
+                 match = re.search(r'<!DOCTYPE([^>]*?)>', self.rawdata[i:], re.MULTILINE|re.IGNORECASE)
                  if match:
                      toHandle = self.rawdata[i:match.end()]
                  else:
@@ -49,37 +49,69 @@ class BadDeclParser(BeautifulSoup):
          return j
 
 
-def parse_html(filename, charset=None):
+def _parse_html(filename, charset):
    infile = open(filename, 'r')
    try:
-      root = BadDeclParser(infile, fromEncoding=charset)
+      return BadDeclParser(infile, fromEncoding=charset)
    except TypeError:
       return None
    finally:
       infile.close()
 
+def parse_html(filename, charset=None, log=None):
+   root = _parse_html(filename, charset)
+   if root is None:
+      return None
+
+   _charset = root.originalEncoding
+   if _charset in ("ISO-8859-2", "windows-1252", "MacCyrillic"): # Replace default
+      _charset = DEFAULT_CHARSET
+      root = _parse_html(filename, _charset)
+      if root is None:
+         return None
+
    try:
-      head = root.html.head
+      html = root.html
    except AttributeError:
-      return None
+      if log: log("No HTML in root")
+      html = root
+
+   if html is None:
+      html = root
+
+   try:
+      head = html.head
+   except AttributeError:
+      if log: log("No HEAD in HTML")
+      head = html
 
    if head is None:
-      head = root.html # Some sites put TITLE in HTML without HEAD
+      head = html # Some sites put TITLE in HTML without HEAD
 
-   _charset = root.originalEncoding
    try:
       title = head.title.string.encode(_charset)
    except AttributeError:
       title = '' # HEAD but no TITLE
 
-   if (not title) and (head is not root.html):
+   if (not title) and (head is not html):
       # Some sites put TITLE in HTML outside of HEAD
 
       try:
-         title = root.html.title.string.encode(_charset)
+         title = html.title.string.encode(_charset)
       except AttributeError:
          title = '' # no TITLE in HTML too
 
+   meta = head.find(_find_contenttype, recursive=False)
+   if meta:
+      try:
+         __charset = meta.get("content").lower().split('charset=')[1].split(';')[0]
+      except IndexError: # No charset in the META Content-Type
+         meta_charset = False
+      else:
+         meta_charset = _charset == __charset
+   else:
+      meta_charset = False
+
    meta = head.find(_find_refresh, recursive=False)
    if meta:
       refresh = meta.get("content")
@@ -92,7 +124,11 @@ def parse_html(filename, charset=None):
    else:
       icon = None
 
-   return BSoupParser(_charset, _charset != charset, title, refresh, icon)
+   return BSoupParser(_charset, meta_charset, title, refresh, icon)
+
+def _find_contenttype(Tag):
+   return (Tag.name == "meta") and \
+      (Tag.get("http-equiv", '').lower() == "content-type")
 
 def _find_refresh(Tag):
    return (Tag.name == "meta") and \