X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=f7c7e32899704b705baf8b8ca49ea16c0fd7ccb3;hp=81be31fdb5f438349469e7d63afac9b4b20b1a7e;hb=a7db2ddce21f684abf6d835e9450fcf370caa5f2;hpb=3b3ac1e18357e60525a6be9b5665c504e0ec4e6c

diff --git a/plomlombot.py b/plomlombot.py
index 81be31f..f7c7e32 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -6,9 +6,9 @@ import datetime
 import select
 import time
 import re
-import urllib.request
-import http.client
+import requests
 import html
+import html.parser
 
 # Defaults, may be overwritten by command line arguments.
 SERVER = "irc.freenode.net"
@@ -18,6 +18,23 @@ USERNAME = "plomlombot"
 NICKNAME = USERNAME
 
 
+class HTMLParser(html.parser.HTMLParser):
+    def __init__(self, html, tag):
+        super().__init__()
+        self._tag_to_check = tag
+        self._tag = ""
+        self.data = ""
+        self.feed(html)
+    def handle_starttag(self, tag, attrs):
+        if self.data == "" and tag == self._tag_to_check:
+            self._tag = tag
+    def handle_endtag(self, tag):
+        self._tag = ""
+    def handle_data(self, data):
+        if self._tag != "":
+            self.data = data
+
+
 class ExceptionForRestart(Exception):
     pass
 
@@ -67,7 +84,11 @@ class IO:
                 self._pingtest(send_ping)
                 return None
             self.last_pong = time.time()
-            received_runes = self.socket.recv(1024).decode("UTF-8")
+            received_bytes = self.socket.recv(1024)
+            try:
+                received_runes = received_bytes.decode("UTF-8")
+            except UnicodeDecodeError:
+                received_runes = received_bytes.decode("latin1")
             if len(received_runes) == 0:
                 print("SOCKET CONNECTION BROKEN")
                 raise ExceptionForRestart
@@ -107,26 +128,15 @@ def lineparser_loop(io, nickname):
             matches = re.findall("(https?://[^\s>]+)", msg)
             for i in range(len(matches)):
                 url = matches[i]
-                request = urllib.request.Request(url, headers={
-                    "User-Agent": "plomlombot"
-                })
                 try:
-                    webpage = urllib.request.urlopen(request, timeout=15)
-                except (urllib.error.HTTPError, urllib.error.URLError,
-                        UnicodeError, http.client.BadStatusLine) as error:
+                    r = requests.get(url, timeout=15)
+                except (requests.exceptions.TooManyRedirects,
+                        requests.exceptions.ConnectionError,
+                        requests.exceptions.InvalidSchema) as error:
                     notice("TROUBLE FOLLOWING URL: " + str(error))
                     continue
-                charset = webpage.info().get_content_charset()
-                if not charset:
-                    charset = "utf-8"
-                content_type = webpage.info().get_content_type()
-                if content_type not in ('text/html', 'text/xml',
-                                        'application/xhtml+xml'):
-                    notice("TROUBLE READING PAGE TITLE: bad content type "
-                           + content_type)
-                    continue
-                content = webpage.read().decode(charset)
-                title = str(content).split('<title>')[1].split('</title>')[0]
+                content = r.text
+                title = HTMLParser(content, "title").data
                 title = html.unescape(title)
                 notice("PAGE TITLE FOR URL: " + title)