Extract html redirect even if ther is no title

[bookmarks_db.git] / parse_html / bkmk_ph_beautifulsoup.py

diff --git a/parse_html/bkmk_ph_beautifulsoup.py b/parse_html/bkmk_ph_beautifulsoup.py
index 437f67b73fba1b511a0a4111cc2557b9e8facfde..a0ef6af76a5c78dc061d24acbf95498b44912cec 100644 (file)
--- a/parse_html/bkmk_ph_beautifulsoup.py
+++ b/parse_html/bkmk_ph_beautifulsoup.py
@@ -84,18 +84,16 @@ def parse_html(filename, charset=None, log=None):
       # Lookup TITLE in the root
       title = root.title
 
-   if title is None:
-      return None
-
-   if title.string:
-      title = title.string
-   else:
-      parts = []
-      for part in title:
-         if not isinstance(part, basestring):
-            part = unicode(part)
-         parts.append(part.strip())
-      title = ''.join(parts)
+   if title is not None:
+       if title.string:
+          title = title.string
+       else:
+          parts = []
+          for part in title:
+             if not isinstance(part, basestring):
+                part = unicode(part)
+             parts.append(part.strip())
+          title = ''.join(parts)
 
    meta = head.find(_find_contenttype, recursive=False)
    if meta:
@@ -112,7 +110,7 @@ def parse_html(filename, charset=None, log=None):
    else:
       meta_charset = False
 
-   if _charset or meta_charset:
+   if title and (_charset or meta_charset):
       title = title.encode(_charset or meta_charset)
 
    meta = head.find(_find_refresh, recursive=False)
@@ -127,6 +125,8 @@ def parse_html(filename, charset=None, log=None):
    else:
       icon = None
 
+   if (title is None) and (refresh is None) and (icon is None):
+      return None
    return HTMLParser(_charset, meta_charset, title, refresh, icon)
 
 def _find_contenttype(Tag):