X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;ds=inline;f=plomlombot.py;h=0b605e9946b04f79a8f3e843da56eee2b59b0169;hb=0d17c0577b6e816dc1c6e02667fc03f74ef5f4a8;hp=7d0f5355a1f70eb1cc946249d1d5e76154b33b49;hpb=4a2678aba39982c7912a697bf421d1fefb57ac41;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index 7d0f535..0b605e9 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -67,7 +67,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 @@ -100,6 +104,10 @@ def lineparser_loop(io, nickname): def act_on_privmsg(tokens): def url_check(msg): + + def notice(msg): + io.send_line("NOTICE " + target + " :" + msg) + matches = re.findall("(https?://[^\s>]+)", msg) for i in range(len(matches)): url = matches[i] @@ -109,9 +117,8 @@ def lineparser_loop(io, nickname): try: webpage = urllib.request.urlopen(request, timeout=15) except (urllib.error.HTTPError, urllib.error.URLError, - UnicodeError, http.client.BadStatusLine, - UnicodeDecodeError) as error: - print("TROUBLE FOLLOWING URL: " + str(error)) + UnicodeError, http.client.BadStatusLine) as error: + notice("TROUBLE FOLLOWING URL: " + str(error)) continue charset = webpage.info().get_content_charset() if not charset: @@ -119,14 +126,13 @@ def lineparser_loop(io, nickname): content_type = webpage.info().get_content_type() if content_type not in ('text/html', 'text/xml', 'application/xhtml+xml'): - print("TROUBLE INTERPRETING URL: bad content type " - + content_type) + notice("TROUBLE READING PAGE TITLE: bad content type " + + content_type) continue content = webpage.read().decode(charset) title = str(content).split('