X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html_beautifulsoup.py;h=d73e4c313a62a67570eb190dac14d5198499ef1b;hb=ed19085cc0b63b3a8021f3c97de1d1a72649b099;hp=e0129fd1d4cb3c7b34f69f8c772946c04afab645;hpb=66ef97e93d66c741926db216c29dad6047c5d7f4;p=bookmarks_db.git

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index e0129fd..d73e4c3 100644
--- a/Robots/parse_html_beautifulsoup.py
+++ b/Robots/parse_html_beautifulsoup.py
@@ -4,8 +4,10 @@
    Written by BroytMann. Copyright (C) 2007 PhiloSoft Design
 """
 
+import re
+from sgmllib import SGMLParser, SGMLParseError
 from HTMLParser import HTMLParser
-from BeautifulSoup import BeautifulSoup
+from BeautifulSoup import BeautifulSoup, CData
 
 
 class BSoupParser(HTMLParser):
@@ -18,39 +20,63 @@ class BSoupParser(HTMLParser):
       self.icon = icon
 
 
+# http://groups.google.com/group/beautifulsoup/browse_thread/thread/69093cb0d3a3cf63
+class BadDeclParser(BeautifulSoup):
+    def parse_declaration(self, i):
+         """Treat a bogus SGML declaration as raw data. Treat a CDATA
+         declaration as a CData object."""
+         j = None
+         if self.rawdata[i:i+9] == '<![CDATA[':
+              k = self.rawdata.find(']]>', i)
+              if k == -1:
+                  k = len(self.rawdata)
+              data = self.rawdata[i+9:k]
+              j = k+3
+              self._toStringSubclass(data, CData)
+         else:
+             try:
+                 j = SGMLParser.parse_declaration(self, i)
+             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)
+                 if match:
+                     toHandle = self.rawdata[i:match.end()]
+                 else:
+                     toHandle = self.rawdata[i:]
+                 self.handle_data(toHandle)
+                 j = i + len(toHandle)
+         return j
+
+
 def parse_html(filename, charset=None):
    infile = open(filename, 'r')
-   root = BeautifulSoup(infile, fromEncoding=charset)
-   infile.close()
-
-   charset = root.originalEncoding
    try:
-      title = root.html.head.title.string.encode(charset)
-   except AttributeError:
-      title = ''
+      root = BadDeclParser(infile, fromEncoding=charset)
+   except TypeError:
+      return None
+   finally:
+      infile.close()
 
+   _charset = root.originalEncoding
    try:
-      meta = root.html.head.find(_find_refresh, recursive=False)
+      title = root.html.head.title.string.encode(_charset)
    except AttributeError:
-      refresh = None
+      return None
+
+   meta = root.html.head.find(_find_refresh, recursive=False)
+   if meta:
+      refresh = meta.get("content")
    else:
-      if meta:
-         refresh = meta.get("content")
-      else:
-         refresh = None
+      refresh = None
 
-   try:
-      meta = root.html.head.find(_find_icon, recursive=False)
-   except AttributeError:
-      icon = None
+   meta = root.html.head.find(_find_icon, recursive=False)
+   if meta:
+      icon = meta.get("href")
    else:
-      if meta:
-         icon = meta.get("href")
-      else:
-         icon = None
+      icon = None
 
-   parser = BSoupParser(charset, False, title, refresh, icon)
-   return parser
+   return BSoupParser(_charset, _charset != charset, title, refresh, icon)
 
 def _find_refresh(Tag):
    return (Tag.name == "meta") and \