X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=plomlombot.py;h=5fcd517a95f563cfba7a00146d1e6359780a0472;hb=20c385a79d109d1da623c517c9458d02e79c343c;hp=bea14223adea1ef355512111f804bc92338d9561;hpb=f57e401a07b83296f255c1b3b672d7bf8241b357;p=plomlombot-irc.git diff --git a/plomlombot.py b/plomlombot.py old mode 100644 new mode 100755 index bea1422..5fcd517 --- a/plomlombot.py +++ b/plomlombot.py @@ -1,3 +1,6 @@ +#!/usr/bin/python3 + +import argparse import socket import datetime import select @@ -6,22 +9,24 @@ import re import urllib.request import html -servernet = "irc.freenode.net" -port = 6667 -servername = "" -timeout = 240 -username = "plomlombot" -nickname = username -channel = "#zrolaps" +# Defaults, may be overwritten by command line arguments. +SERVER = "irc.freenode.net" +PORT = 6667 +TIMEOUT = 240 +USERNAME = "plomlombot" +NICKNAME = USERNAME + class ExceptionForRestart(Exception): pass + class IO: - def __init__(self, servernet, port): + def __init__(self, server, port, timeout): + self.timeout = timeout self.socket = socket.socket() - self.socket.connect((servernet, port)) + self.socket.connect((server, port)) self.socket.setblocking(0) self.line_buffer = [] self.rune_buffer = "" @@ -29,11 +34,11 @@ class IO: self.servername = self.recv_line(send_ping=False).split(" ")[0][1:] def _pingtest(self, send_ping=True): - if self.last_pong + timeout < time.time(): + if self.last_pong + self.timeout < time.time(): print("SERVER NOT ANSWERING") raise ExceptionForRestart if send_ping: - self.send_line("PING " + nickname + " " + self.servername) + self.send_line("PING " + self.servername) def send_line(self, msg): msg = msg.replace("\r", " ") @@ -41,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 @@ -56,7 +61,7 @@ class IO: 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(send_ping) return None @@ -65,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] @@ -76,18 +81,20 @@ 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_connection(): - print("CONNECTING TO " + servernet) - io = IO(servernet, port) + +def init_session(server, port, timeout, nickname, username, channel): + print("CONNECTING TO " + server) + io = IO(server, port, timeout) io.send_line("NICK " + nickname) io.send_line("USER " + username + " 0 * : ") io.send_line("JOIN " + channel) return io -def lineparser_loop(): + +def lineparser_loop(io, nickname): def act_on_privmsg(tokens): @@ -97,23 +104,24 @@ def lineparser_loop(): 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('