X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Robots%2Fparse_html.py;h=b30c66458eaa32960b5badce9bc849a2082213d7;hb=55ee943b3ef63d03826318d36fd964d182c3c322;hp=a534e21fa3a13379c9ef85801b027dbfec8669d4;hpb=7b0fdb70fab014eb5bc58131ed3c31ecbf646145;p=bookmarks_db.git

diff --git a/Robots/parse_html.py b/Robots/parse_html.py
index a534e21..b30c664 100755
--- a/Robots/parse_html.py
+++ b/Robots/parse_html.py
@@ -1,18 +1,18 @@
-#! /usr/local/bin/python -O
+#! /usr/bin/env python
 """
    HTML Parser
 
-   Written by BroytMann, Jun 2002 - May 2003. Copyright (C) 1997-2003 PhiloSoft Design
+   Written by BroytMann. Copyright (C) 1997-2007 PhiloSoft Design
 """
 
+import codecs
 
-import sys
-current_charset = sys.getdefaultencoding()
-DEFAULT_CHARSET = "windows-1251" # Stupid default for Russian Cyrillic
-
+from m_lib.defenc import default_encoding
+current_charset = default_encoding.replace("windows-", "cp")
+DEFAULT_CHARSET = "cp1251" # Stupid default for Russian Cyrillic
 
 from HTMLParser import HTMLParseError
-from m_lib.www.html import HTMLParser as _HTMLParser
+from m_lib.net.www.html import HTMLParser as _HTMLParser
 
 
 class HTMLHeadDone(Exception): pass
@@ -25,6 +25,7 @@ class HTMLParser(_HTMLParser):
       self.meta_charset = 0
       self.title = ''
       self.refresh = ''
+      self.icon = None
 
    def end_head(self):
       raise HTMLHeadDone()
@@ -63,6 +64,22 @@ class HTMLParser(_HTMLParser):
          self.title = self.accumulator
 
 
+   def do_link(self, attrs):
+      has_icon = False
+      href = None
+
+      for attrname, value in attrs:
+         if value:
+            value = value.strip().lower()
+            if (attrname == 'rel') and (value.lower() in ('icon', 'shortcut icon')):
+               has_icon = True
+            elif attrname == 'href':
+               href = value
+
+      if has_icon:
+         self.icon = href
+
+
 import re
 entity_re = re.compile("(&#[0-9]+;)")
 
@@ -77,6 +94,12 @@ def recode_entities(title, charset):
 
 
 def parse_html(filename, charset=None, log=None):
+   if charset:
+      try:
+         codecs.lookup(charset) # In case of unknown charset...
+      except (ValueError, LookupError):
+         charset = None         # ...try charset from HTML
+
    infile = open(filename, 'r')
    parser = HTMLParser(charset)
 
@@ -96,14 +119,14 @@ def parse_html(filename, charset=None, log=None):
    title = parser.title
 
    if not parser.charset:
-      ascii = 1
-      for c in title:
-         if not (32 <= ord(c) <= 127): # non-ASCII character
-            ascii = 0
-            break
-      if not ascii:
+      try:
+         unicode(title, "ascii")
+      except UnicodeDecodeError:
          parser.charset = DEFAULT_CHARSET
 
+   if parser.charset:
+      parser.charset = parser.charset.replace("windows-", "cp").lower()
+
    if parser.charset and (parser.charset <> current_charset):
       try:
          if parser.meta_charset:
@@ -127,3 +150,4 @@ if __name__ == '__main__':
    print parser.charset
    print parser.title
    print parser.refresh
+   print parser.icon