X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=61da87140fca80d902042d933b0b235fe25dcd0c;hp=2662429b0884fb2292db2b0616dc6d1ec7556135;hb=f20d4f8eadfece1714f40e74541902488887ed34;hpb=7857469891a657c06da6a259ca95661bfaad6c8b diff --git a/plomlombot.py b/plomlombot.py index 2662429..61da871 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -12,6 +12,7 @@ import random import hashlib import os import plomsearch +import irclog # Defaults, may be overwritten by command line arguments. SERVER = "irc.freenode.net" @@ -27,12 +28,35 @@ class ExceptionForRestart(Exception): pass +class Line: + + def __init__(self, line): + self.line = line + self.tokens = line.split(" ") + self.sender = "" + if self.tokens[0][0] == ":": + for rune in self.tokens[0][1:]: + if rune in {"!", "@"}: + break + self.sender += rune + self.receiver = "" + if len(self.tokens) > 2: + for rune in self.tokens[2]: + if rune in {"!", "@"}: + break + if rune != ":": + self.receiver += rune + + class IO: def __init__(self, server, port, timeout): self.timeout = timeout self.socket = socket.socket() - self.socket.connect((server, port)) + try: + self.socket.connect((server, port)) + except TimeoutError: + raise ExceptionForRestart self.socket.setblocking(0) self.line_buffer = [] self.rune_buffer = "" @@ -96,18 +120,16 @@ class IO: def handle_command(command, argument, notice, target, session): - hash_string = hashlib.md5(target.encode("utf-8")).hexdigest() - quotesfile_name = session.dbdir + "/quotes_" + hash_string def addquote(): - if not os.access(quotesfile_name, os.F_OK): - quotesfile = open(quotesfile_name, "w") + if not os.access(session.quotesfile, os.F_OK): + quotesfile = open(session.quotesfile, "w") quotesfile.write("QUOTES FOR " + target + ":\n") quotesfile.close() - quotesfile = open(quotesfile_name, "a") + quotesfile = open(session.quotesfile, "a") quotesfile.write(argument + "\n") quotesfile.close() - quotesfile = open(quotesfile_name, "r") + quotesfile = open(session.quotesfile, "r") lines = quotesfile.readlines() quotesfile.close() notice("ADDED QUOTE #" + str(len(lines) - 1)) @@ -132,10 +154,10 @@ def handle_command(command, argument, notice, target, session): (tokens[0] == "search" or not tokens[0].isdigit())): help() return - if not os.access(quotesfile_name, os.F_OK): + if not os.access(session.quotesfile, os.F_OK): notice("NO QUOTES AVAILABLE") return - quotesfile = open(quotesfile_name, "r") + quotesfile = open(session.quotesfile, "r") lines = quotesfile.readlines() quotesfile.close() lines = lines[1:] @@ -156,11 +178,12 @@ def handle_command(command, argument, notice, target, session): notice("NO QUOTES MATCHING QUERY") else: for result in results: - notice("QUOTE #" + str(result[0] + 1) + " : " + result[1]) + notice("QUOTE #" + str(result[0] + 1) + " : " + + result[1][-1]) return else: i = random.randrange(len(lines)) - notice("QUOTE #" + str(i + 1) + ": " + lines[i]) + notice("QUOTE #" + str(i + 1) + ": " + lines[i][:-1]) def markov(): from random import choice, shuffle @@ -186,14 +209,12 @@ def handle_command(command, argument, notice, target, session): selection = choice(usable_selections) return selection[select_length] - hash_string = hashlib.md5(target.encode("utf-8")).hexdigest() - markovfeed_name = session.dbdir + "/markovfeed_" + hash_string - if not os.access(markovfeed_name, os.F_OK): + if not os.access(session.markovfile, os.F_OK): notice("NOT ENOUGH TEXT TO MARKOV.") return # Lowercase incoming lines, ensure they end in a sentence end mark. - file = open(markovfeed_name, "r") + file = open(session.markovfile, "r") lines = file.readlines() file.close() tokens = [] @@ -338,104 +359,89 @@ class Session: def __init__(self, io, username, nickname, channel, twtfile, dbdir): self.io = io self.nickname = nickname + self.username = username self.channel = channel self.users_in_chan = [] self.twtfile = twtfile self.dbdir = dbdir self.io.send_line("NICK " + self.nickname) - self.io.send_line("USER " + username + " 0 * : ") + self.io.send_line("USER " + self.username + " 0 * : ") self.io.send_line("JOIN " + self.channel) - hash_string = hashlib.md5(self.channel.encode("utf-8")).hexdigest() - self.logdir = self.dbdir + "/irclogs_" + hash_string + "/" + hash_channel = hashlib.md5(self.channel.encode("utf-8")).hexdigest() + self.chandir = self.dbdir + "/" + hash_channel + "/" + self.rawlogdir = self.chandir + "raw_logs/" + self.logdir = self.chandir + "logs/" if not os.path.exists(self.logdir): os.makedirs(self.logdir) + if not os.path.exists(self.rawlogdir): + os.makedirs(self.rawlogdir) + self.markovfile = self.chandir + "markovfeed" + self.quotesfile = self.chandir + "quotes" def loop(self): def log(line): + if type(line) == str: + line = Line(":" + self.nickname + "!~" + self.username + + "@localhost" + " " + line) now = datetime.datetime.utcnow() - logfile = open(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a") + logfile = open(self.rawlogdir + now.strftime("%Y-%m-%d") + ".txt", "a") form = "%Y-%m-%d %H:%M:%S UTC\t" - logfile.write(now.strftime(form) + " " + line + "\n") + logfile.write(now.strftime(form) + " " + line.line + "\n") logfile.close() - - def handle_privmsg(tokens): - - def handle_input(msg, target): - - def notice(msg): - self.io.send_line("NOTICE " + target + " :" + msg) - - matches = re.findall("(https?://[^\s>]+)", msg) - for i in range(len(matches)): - handle_url(matches[i], notice) - if "!" == msg[0]: - tokens = msg[1:].split() - argument = str.join(" ", tokens[1:]) - handle_command(tokens[0], argument, notice, target, self) - return - hash_string = hashlib.md5(target.encode("utf-8")).hexdigest() - markovfeed_name = self.dbdir + "/markovfeed_" + hash_string - file = open(markovfeed_name, "a") - file.write(msg + "\n") - file.close() - - 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 != self.nickname: - target = receiver - msg = str.join(" ", tokens[3:])[1:] - if target == self.channel: - log("<" + sender + "> " + msg) - handle_input(msg, target) - - def name_from_join_or_part(tokens): - token = tokens[0][1:] - index_cut = token.find("@") - index_ex = token.find("!") - if index_ex > 0 and index_ex < index_cut: - index_cut = index_ex - return token[:index_cut] + to_log = irclog.format_logline(line, self.channel) + if to_log != None: + logfile = open(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a") + logfile.write(now.strftime(form) + " " + to_log + "\n") + logfile.close() + + def handle_privmsg(line): + + def notice(msg): + line = "NOTICE " + target + " :" + msg + self.io.send_line(line) + log(line) + + target = line.sender + if line.receiver != self.nickname: + target = line.receiver + msg = str.join(" ", line.tokens[3:])[1:] + matches = re.findall("(https?://[^\s>]+)", msg) + for i in range(len(matches)): + handle_url(matches[i], notice) + if "!" == msg[0]: + tokens = msg[1:].split() + argument = str.join(" ", tokens[1:]) + handle_command(tokens[0], argument, notice, target, self) + return + file = open(self.markovfile, "a") + file.write(msg + "\n") + file.close() while True: line = self.io.recv_line() if not line: continue - tokens = line.split(" ") - if len(tokens) > 1: - if tokens[0] == "PING": - self.io.send_line("PONG " + tokens[1]) - elif tokens[1] == "PRIVMSG": - handle_privmsg(tokens) - elif tokens[1] == "353": - names = tokens[5:] + line = Line(line) + log(line) + if len(line.tokens) > 1: + if line.tokens[0] == "PING": + self.io.send_line("PONG " + line.tokens[1]) + elif line.tokens[1] == "PRIVMSG": + handle_privmsg(line) + elif line.tokens[1] == "353": + names = line.tokens[5:] names[0] = names[0][1:] - log("PRESENT: " + str.join(", ", names)) for i in range(len(names)): names[i] = names[i].replace("@", "").replace("+", "") self.users_in_chan += names - elif tokens[1] == "JOIN": - name = name_from_join_or_part(tokens) - if name != self.nickname: - self.users_in_chan += [name] - log(line) - elif tokens[1] == "PART": - name = name_from_join_or_part(tokens) - del(self.users_in_chan[self.users_in_chan.index(name)]) - log(line) - else: - log(line) + elif line.tokens[1] == "JOIN" and line.sender != self.nickname: + self.users_in_chan += [line.sender] + elif line.tokens[1] == "PART": + del(self.users_in_chan[self.users_in_chan.index(line.sender)]) + elif line.tokens[1] == "NICK": + del(self.users_in_chan[self.users_in_chan.index(line.sender)]) + self.users_in_chan += [line.receiver] def parse_command_line_arguments(): @@ -471,8 +477,10 @@ opts = parse_command_line_arguments() while True: try: io = IO(opts.server, opts.port, opts.timeout) + hash_server = hashlib.md5(opts.server.encode("utf-8")).hexdigest() + dbdir = opts.dbdir + "/" + hash_server session = Session(io, opts.username, opts.nickname, opts.CHANNEL, - opts.twtfile, opts.dbdir) + opts.twtfile, dbdir) session.loop() except ExceptionForRestart: io.socket.close()