X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html_beautifulsoup.py;h=11db56371b0df277dd957484f782e54624721e40;hb=426a3f8ad53f09372d167c14f3bff8f917a9ea40;hp=3d5c44a3f4464c699bd2b2f6090963d936944ae6;hpb=276cd9e51625c346acb375fcc1be52ea6bbc11b1;p=bookmarks_db.git

diff --git a/Robots/parse_html_beautifulsoup.py b/Robots/parse_html_beautifulsoup.py
index 3d5c44a..11db563 100644
--- a/Robots/parse_html_beautifulsoup.py
+++ b/Robots/parse_html_beautifulsoup.py
@@ -1,7 +1,7 @@
 """
    HTML Parser using BeautifulSoup
 
-   Written by BroytMann. Copyright (C) 2007 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 2007, 2008 PhiloSoft Design
 """
 
 import re
@@ -67,18 +67,32 @@ def parse_html(filename, charset=None):
       head = root.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:
-      head = root.html # Some sites put TITLE in HTML outside of HEAD
+   if (not title) and (head is not root.html):
+      # Some sites put TITLE in HTML outside of HEAD
 
-   try:
-      title = head.title.string.encode(_charset)
-   except AttributeError:
-      title = '' # HEAD but no TITLE
+      try:
+         title = root.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:
@@ -92,7 +106,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 \