X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=plomlombot.py;h=5fcd517a95f563cfba7a00146d1e6359780a0472;hb=20c385a79d109d1da623c517c9458d02e79c343c;hp=b99468857704b1417855544e91df9a2d3e9bad9a;hpb=12695b212e2e4d7150ebb72d3f63d5bcd38d445e;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py old mode 100644 new mode 100755 index b994688..5fcd517 --- a/plomlombot.py +++ b/plomlombot.py @@ -1,3 +1,5 @@ +#!/usr/bin/python3 + import argparse import socket import datetime @@ -14,9 +16,11 @@ TIMEOUT = 240 USERNAME = "plomlombot" NICKNAME = USERNAME + class ExceptionForRestart(Exception): pass + class IO: def __init__(self, server, port, timeout): @@ -42,7 +46,7 @@ class IO: if len(msg.encode("utf-8")) > 510: print("NOT SENT LINE TO SERVER (too long): " + msg) print("LINE TO SERVER: " - + str(datetime.datetime.now()) + ": " + msg) + + str(datetime.datetime.now()) + ": " + msg) msg = msg + "\r\n" msg_len = len(msg) total_sent_len = 0 @@ -66,7 +70,7 @@ class IO: if len(received_runes) == 0: print("SOCKET CONNECTION BROKEN") raise ExceptionForRestart - self.rune_buffer += received_runes + self.rune_buffer += received_runes lines_split = str.split(self.rune_buffer, "\r\n") self.line_buffer += lines_split[:-1] self.rune_buffer = lines_split[-1] @@ -77,9 +81,10 @@ class IO: line = self._recv_line_wrapped(send_ping) if line: print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " + - line) + line) return line + def init_session(server, port, timeout, nickname, username, channel): print("CONNECTING TO " + server) io = IO(server, port, timeout) @@ -88,6 +93,7 @@ def init_session(server, port, timeout, nickname, username, channel): io.send_line("JOIN " + channel) return io + def lineparser_loop(io, nickname): def act_on_privmsg(tokens): @@ -98,23 +104,24 @@ def lineparser_loop(io, nickname): url = matches[i] try: webpage = urllib.request.urlopen(url, timeout=15) - except urllib.error.HTTPError as error: + except (urllib.error.HTTPError, urllib.error.URLError, + UnicodeError) as error: print("TROUBLE FOLLOWING URL: " + str(error)) continue charset = webpage.info().get_content_charset() if not charset: - charset="utf-8" + charset = "utf-8" content_type = webpage.info().get_content_type() - if not content_type in ('text/html', 'text/xml', - 'application/xhtml+xml'): + if content_type not in ('text/html', 'text/xml', + 'application/xhtml+xml'): print("TROUBLE INTERPRETING URL: bad content type " - + content_type) + + content_type) continue content = webpage.read().decode(charset) title = str(content).split('