X-Git-Url: https://plomlompom.com/repos/%7Broute%7D?a=blobdiff_plain;f=plomlombot.py;h=1e904fa79f1eb9a1ac9b68216b01ba2eabd77206;hb=2a742095cd6c9b506d4a7d0a766bee7e2401b477;hp=7d915dc2f80c79157119089aa2e0dd6e9566d16a;hpb=d074cd51f4378884e977b26490af1c6d1dcc81c8;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py index 7d915dc..1e904fa 100644 --- a/plomlombot.py +++ b/plomlombot.py @@ -6,28 +6,34 @@ import re import urllib.request import html -servernet = "irc.freenode.net" -port = 6667 -servername = "" -timeout = 480 -username = "plomlombot" -nickname = username -channel = "#zrolaps" +SERVERNET = "irc.freenode.net" +PORT = 6667 +TIMEOUT = 240 +USERNAME = "plomlombot" +NICKNAME = USERNAME +CHANNEL = "#zrolaps-test" + +class ExceptionForRestart(Exception): + pass class IO: - def __init__(self, server, port): + def __init__(self, servernet, port, timeout): + self.timeout = timeout self.socket = socket.socket() - self.socket.connect((server, port)) + self.socket.connect((servernet, port)) self.socket.setblocking(0) self.line_buffer = [] self.rune_buffer = "" self.last_pong = time.time() + self.servername = self.recv_line(send_ping=False).split(" ")[0][1:] - def _pingtest(self): - if self.last_pong + timeout < time.time(): - raise RuntimeError("server not answering") - self.send_line("PING " + nickname + " " + servername) + def _pingtest(self, send_ping=True): + if self.last_pong + self.timeout < time.time(): + print("SERVER NOT ANSWERING") + raise ExceptionForRestart + if send_ping: + self.send_line("PING " + self.servername) def send_line(self, msg): msg = msg.replace("\r", " ") @@ -42,21 +48,23 @@ class IO: while total_sent_len < msg_len: sent_len = self.socket.send(bytes(msg[total_sent_len:], "UTF-8")) if sent_len == 0: - raise RuntimeError("socket connection broken") + print("SOCKET CONNECTION BROKEN") + raise ExceptionForRestart total_sent_len += sent_len - def recv_line_wrapped(self): + def _recv_line_wrapped(self, send_ping=True): if len(self.line_buffer) > 0: return self.line_buffer.pop(0) while True: - ready = select.select([self.socket], [], [], int(timeout / 2)) + ready = select.select([self.socket], [], [], int(self.timeout / 2)) if not ready[0]: - self._pingtest() + self._pingtest(send_ping) return None self.last_pong = time.time() received_runes = self.socket.recv(1024).decode("UTF-8") if len(received_runes) == 0: - raise RuntimeError("socket connection broken") + print("SOCKET CONNECTION BROKEN") + raise ExceptionForRestart self.rune_buffer += received_runes lines_split = str.split(self.rune_buffer, "\r\n") self.line_buffer += lines_split[:-1] @@ -64,54 +72,82 @@ class IO: if len(self.line_buffer) > 0: return self.line_buffer.pop(0) - def recv_line(self): - line = self.recv_line_wrapped() + def recv_line(self, send_ping=True): + line = self._recv_line_wrapped(send_ping) if line: print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " + line) return line -io = IO(servernet, port) -io.send_line("NICK " + nickname) -io.send_line("USER " + username + " 0 * : ") -io.send_line("JOIN " + channel) -servername = io.recv_line().split(" ")[0][1:] -while 1: - line = io.recv_line() - if not line: - continue - tokens = line.split(" ") - if len(tokens) > 1: - if tokens[1] == "PRIVMSG": - sender = "" - for rune in tokens[0]: - if rune == "!": - break - if rune != ":": - sender += rune - receiver = "" - for rune in tokens[2]: - if rune == "!": - break - if rune != ":": - receiver += rune - target = sender - if receiver != nickname: - target = receiver - msg = str.join(" ", tokens[3:])[1:] +def init_session(): + print("CONNECTING TO " + SERVERNET) + io = IO(SERVERNET, PORT, TIMEOUT) + io.send_line("NICK " + NICKNAME) + io.send_line("USER " + USERNAME + " 0 * : ") + io.send_line("JOIN " + CHANNEL) + return io + +def lineparser_loop(): + + def act_on_privmsg(tokens): + + def url_check(msg): matches = re.findall("(https?://[^\s]+)", msg) for i in range(len(matches)): url = matches[i] - webpage = urllib.request.urlopen(url) + try: + webpage = urllib.request.urlopen(url, timeout=15) + except urllib.error.HTTPError as error: + print("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 not content_type in ('text/html', 'text/xml', - 'application/xhtml+xml'): + 'application/xhtml+xml'): + print("TROUBLE INTERPRETING URL: bad content type " + + content_type) continue - charset = webpage.info().get_content_charset() content = webpage.read().decode(charset) title = str(content).split('