X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=3e4734fa2ec2403aa093768623e1ca9b189d5cd8;hp=b99468857704b1417855544e91df9a2d3e9bad9a;hb=d66da409aaafb766eae1e0af1a9c16ae8520510c;hpb=12695b212e2e4d7150ebb72d3f63d5bcd38d445e diff --git a/plomlombot.py b/plomlombot.py old mode 100644 new mode 100755 index b994688..3e4734f --- a/plomlombot.py +++ b/plomlombot.py @@ -1,11 +1,13 @@ +#!/usr/bin/python3 + import argparse import socket import datetime import select import time import re -import urllib.request -import html +import requests +import bs4 # Defaults, may be overwritten by command line arguments. SERVER = "irc.freenode.net" @@ -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 @@ -62,11 +66,15 @@ 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 - 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 +85,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,33 +97,31 @@ 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): def url_check(msg): - matches = re.findall("(https?://[^\s]+)", 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] try: - webpage = urllib.request.urlopen(url, timeout=15) - except urllib.error.HTTPError as error: - print("TROUBLE FOLLOWING URL: " + str(error)) + r = requests.get(url, timeout=15) + except (requests.exceptions.TooManyRedirects, + requests.exceptions.ConnectionError, + requests.exceptions.InvalidSchema) as error: + notice("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'): - print("TROUBLE INTERPRETING URL: bad content type " - + content_type) - continue - content = webpage.read().decode(charset) - title = str(content).split('')[1].split('')[0] - title = html.unescape(title) - io.send_line("PRIVMSG " + target + " :page title for url: " - + title) + title = bs4.BeautifulSoup(r.text).title + if title: + notice("PAGE TITLE FOR URL: " + title.string) + else: + notice("PAGE HAS NO TITLE TAG") sender = "" for rune in tokens[0]: @@ -134,7 +141,7 @@ def lineparser_loop(io, nickname): msg = str.join(" ", tokens[3:])[1:] url_check(msg) - while 1: + while True: line = io.recv_line() if not line: continue @@ -145,34 +152,35 @@ def lineparser_loop(io, nickname): if tokens[0] == "PING": io.send_line("PONG " + tokens[1]) + def parse_command_line_arguments(): parser = argparse.ArgumentParser() parser.add_argument("-s, --server", action="store", dest="server", - default=SERVER, - help="server or server net to connect to (default: " + SERVER + - ")") + default=SERVER, + help="server or server net to connect to (default: " + + SERVER + ")") parser.add_argument("-p, --port", action="store", dest="port", type=int, - default=PORT, help="port to connect to (default : " + str(PORT) + - ")") + default=PORT, help="port to connect to (default : " + + str(PORT) + ")") parser.add_argument("-t, --timeout", action="store", dest="timeout", - type=int, default=TIMEOUT, - help="timeout in seconds after which to attempt reconnect " + - "(default: " + str(TIMEOUT) + ")") + type=int, default=TIMEOUT, + help="timeout in seconds after which to attempt " + + "reconnect (default: " + str(TIMEOUT) + ")") parser.add_argument("-u, --username", action="store", dest="username", - default=USERNAME, help="username to use (default: " + USERNAME + - ")") + default=USERNAME, help="username to use (default: " + + USERNAME + ")") parser.add_argument("-n, --nickname", action="store", dest="nickname", - default=NICKNAME, help="nickname to use (default: " + NICKNAME + - ")") + default=NICKNAME, help="nickname to use (default: " + + NICKNAME + ")") parser.add_argument("CHANNEL", action="store", help="channel to join") opts, unknown = parser.parse_known_args() return opts opts = parse_command_line_arguments() -while 1: +while True: try: io = init_session(opts.server, opts.port, opts.timeout, opts.nickname, - opts.username, opts.CHANNEL) + opts.username, opts.CHANNEL) lineparser_loop(io, opts.nickname) except ExceptionForRestart: io.socket.close()