X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html_beautifulsoup.py;h=f5e03b52e96808d7db6a21efd656d0541d3ed976;hb=9ee993e850d08b63d9cc10dd2da8340574e9a6a0;hp=162e7a37dabd218df12aaf14e50c14e70f778177;hpb=d4d9255c90fb65adf5a8d8d03b55d558b77fe756;p=bookmarks_db.git

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index 162e7a3..f5e03b5 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,49 +49,54 @@ class BadDeclParser(BeautifulSoup):
          return j
 
 
-def parse_html(filename, charset=None, log=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()
 
-   try:
-      html = root.html
-   except AttributeError:
-      if log: log("No HTML in root")
-      html = root
+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
+
+   html = root.html
    if html is None:
       html = root
 
-   try:
-      head = html.head
-   except AttributeError:
-      if log: log("No HEAD in HTML")
-      head = html
-
+   head = html.head
    if head is None:
       head = html # Some sites put TITLE in HTML without HEAD
 
-   _charset = root.originalEncoding
-   if _charset == "windows-1252": # Replace default
-      _charset = DEFAULT_CHARSET
-
-   try:
-      title = head.title.string.encode(_charset)
-   except AttributeError:
-      title = '' # HEAD but no TITLE
-
-   if (not title) and (head is not html):
+   title = head.title
+   if (title is None) and (html is not head):
       # Some sites put TITLE in HTML outside of HEAD
+      title = html.title
 
-      try:
-         title = html.title.string.encode(_charset)
-      except AttributeError:
-         title = '' # no TITLE in HTML too
+   if title is None:
+      # Lookup TITLE in the root
+      title = root.title
+
+   if title is not None:
+      if title.string:
+         title = title.string.encode(_charset)
+      else:
+         parts = []
+         for part in title:
+            if not isinstance(part, basestring):
+               part = unicode(part)
+            parts.append(part.strip())
+         title = ''.join(parts).encode(_charset)
 
    meta = head.find(_find_contenttype, recursive=False)
    if meta: