X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=35d3c2fbded5a454f974df98ac24dcec362a8ed0;hp=b5db868f7bcba32a561a9f63fdcfe9dfd0f091ac;hb=406dc83c2b15e8ca0a58b244dc7eaeee42d2bbb4;hpb=40440315a169a69f79ef2eccaca6e407f9a2929a diff --git a/plomlombot.py b/plomlombot.py index b5db868..35d3c2f 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -55,9 +55,59 @@ class Line: self.receiver += rune +class Log: + + def __init__(self, chandir, nickname, username, channel, rmlogs): + self.nickname = nickname + self.username = username + self.channel = channel + self.chandir = chandir + self.rmlogcycle = rmlogs + self.rawlogdir = chandir + "raw_logs/" + self.logdir = chandir + "logs/" + if not os.path.exists(self.logdir): + os.makedirs(self.logdir) + if not os.path.exists(self.rawlogdir): + os.makedirs(self.rawlogdir) + + def log(self, line, sent=False): + identity = "" + separator = " > " + if sent: + separator = " " + line = Line("< " + line) + line.sender = self.nickname + identity = self.username + "@localhost" + else: + if type(line) == str: + line = Line(line) + now = datetime.datetime.utcnow() + form = "%Y-%m-%d %H:%M:%S UTC" + write_to_file(self.rawlogdir + now.strftime("%Y-%m-%d") + ".txt", "a", + now.strftime(form) + separator + line.line + "\n") + to_log = irclog.format_logline(line, self.channel, identity) + if to_log != None: + write_to_file(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a", + now.strftime(form) + " " + to_log + "\n") + + def rmlogs(self): + if self.rmlogcycle > 0: + for f in os.listdir(self.logdir): + f = os.path.join(self.logdir, f) + if os.path.isfile(f) and \ + os.stat(f).st_mtime < time.time() - self.rmlogcycle: + os.remove(f) + + def separator_line(self): + now = datetime.datetime.utcnow() + write_to_file(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a", + "-----------------------\n") + + class IO: def __init__(self, server, port, timeout): + self.log = None self.timeout = timeout self.socket = socket.socket() try: @@ -84,6 +134,8 @@ class IO: print("NOT SENT LINE TO SERVER (too long): " + msg) print("LINE TO SERVER: " + str(datetime.datetime.now()) + ": " + msg) + if self.log != None: + self.log.log(msg, True) msg = msg + "\r\n" msg_len = len(msg) total_sent_len = 0 @@ -121,6 +173,8 @@ class IO: def recv_line(self, send_ping=True): line = self._recv_line_wrapped(send_ping) if line: + if self.log != None: + self.log.log(line) print("LINE FROM SERVER " + str(datetime.datetime.now()) + ": " + line) return line @@ -192,9 +246,9 @@ def handle_command(command, argument, notice, target, session): notice("quote #" + str(i + 1) + ": " + lines[i][:-1]) def markov(): - from random import choice, shuffle - select_length = 2 - selections = [] + + def help(): + notice("syntax: !markov [integer from 1 to infinite]") def markov(snippet): usable_selections = [] @@ -215,8 +269,26 @@ def handle_command(command, argument, notice, target, session): selection = choice(usable_selections) return selection[select_length] + if "" == argument: + tokens = [] + else: + tokens = argument.split(" ") + if (len(tokens) > 1 or (len(tokens) == 1 and not tokens[0].isdigit())): + help() + return + + from random import choice, shuffle + select_length = 2 + if len(tokens) == 1: + n = int(tokens[0]) + if n > 0: + select_length = n + else: + notice("bad value, using default: " + str(select_length)) + selections = [] + if not os.access(session.markovfile, os.F_OK): - notice("not enough text to markov") + notice("not enough text to markov for selection length") return # Lowercase incoming lines, ensure they end in a sentence end mark. @@ -230,7 +302,7 @@ def handle_command(command, argument, notice, target, session): if line[-1] not in sentence_end_markers: line += "." tokens += line.split() - if len(tokens) <= select_length: + if len(tokens) - 1 <= select_length: notice("not enough text to markov") return @@ -266,8 +338,8 @@ def handle_command(command, argument, notice, target, session): shuffle(selections) for i in range(len(selections)): if selections[i][0][-1] in sentence_end_markers: - for i in range(select_length): - snippet[i] = selections[i][i + 1] + for j in range(select_length): + snippet[j] = selections[j][j + 1] break msg = "" malkovich = "malkovich" @@ -382,47 +454,26 @@ class Session: def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs): self.io = io self.nickname = nickname - self.username = username - self.channel = channel self.users_in_chan = [] self.twtfile = twtfile - self.dbdir = dbdir - self.rmlogs = rmlogs + hash_channel = hashlib.md5(channel.encode("utf-8")).hexdigest() + chandir = dbdir + "/" + hash_channel + "/" + self.markovfile = chandir + "markovfeed" + self.quotesfile = chandir + "quotes" + self.log = Log(chandir, self.nickname, username, channel, rmlogs) self.io.send_line("NICK " + self.nickname) - self.io.send_line("USER " + self.username + " 0 * : ") - self.io.send_line("JOIN " + self.channel) - 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" + self.io.send_line("USER " + username + " 0 * : ") + self.io.send_line("JOIN " + channel) + self.io.log = self.log + self.log.separator_line() def loop(self): - def log(line): - if type(line) == str: - line = Line(":" + self.nickname + "!~" + self.username + - "@localhost" + " " + line) - now = datetime.datetime.utcnow() - form = "%Y-%m-%d %H:%M:%S UTC\t" - write_to_file(self.rawlogdir + now.strftime("%Y-%m-%d") + ".txt", - "a", now.strftime(form) + " " + line.line + "\n") - to_log = irclog.format_logline(line, self.channel) - if to_log != None: - write_to_file(self.logdir + now.strftime("%Y-%m-%d") + ".txt", - "a", now.strftime(form) + " " + to_log + "\n") - 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: @@ -444,21 +495,12 @@ class Session: return write_to_file(self.markovfile, "a", msg + "\n") - now = datetime.datetime.utcnow() - write_to_file(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a", - "-----------------------\n") while True: - if self.rmlogs > 0: - for f in os.listdir(self.logdir): - f = os.path.join(self.logdir, f) - if os.path.isfile(f) and \ - os.stat(f).st_mtime < time.time() - self.rmlogs: - os.remove(f) + self.log.rmlogs() line = self.io.recv_line() if not line: continue line = Line(line) - log(line) if len(line.tokens) > 1: if line.tokens[0] == "PING": self.io.send_line("PONG " + line.tokens[1])