X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=efd8474a56215fbb96a1ab756ec829aaefa481f7;hp=e4a5be35aabd091204209eff379a542f206c7e4e;hb=61948f17eafecaae17078d916ba2193983eaa339;hpb=61a573d1cb2165c5aa7a00b999b9b5bda81caaaa;ds=sidebyside diff --git a/plomlombot.py b/plomlombot.py index e4a5be3..efd8474 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 = 240 -username = "plomlombot" -nickname = username -channel = "#zrolaps-test" +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,59 +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 -def url_check(msg): - matches = re.findall("(https?://[^\s]+)", msg) - for i in range(len(matches)): - url = matches[i] - webpage = urllib.request.urlopen(url, timeout=15) - content_type = webpage.info().get_content_type() - charset = webpage.info().get_content_charset() - if not charset: - charset="utf-8" - if not content_type in ('text/html', 'text/xml', - 'application/xhtml+xml'): - print("TROUBLE INTERPRETING URL: bad content_type " + content_type) - continue - content = webpage.read().decode(charset) - title = str(content).split('