X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=89ff51a015700ec067fa88a7e984e3e04a6fc16e;hp=6f6d33994255504e2ac4903cbe254d623db5fbdc;hb=2742522c6041ef70b3f3763bcd50ac2b72eca95a;hpb=93ee629ccea3331cda8ed6f0b7072381c92c626c diff --git a/plomlombot.py b/plomlombot.py index 6f6d339..89ff51a 100755 --- a/plomlombot.py +++ b/plomlombot.py @@ -20,6 +20,7 @@ TIMEOUT = 240 USERNAME = "plomlombot" NICKNAME = USERNAME TWTFILE = "" +DBDIR = os.path.expanduser("~/plomlombot_db") class ExceptionForRestart(Exception): @@ -95,18 +96,16 @@ class IO: def handle_command(command, argument, notice, target, session): - hash_string = hashlib.md5(target.encode("utf-8")).hexdigest() - quotesfile_name = "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)) @@ -131,10 +130,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:] @@ -185,14 +184,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 = "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 = [] @@ -323,7 +320,7 @@ def handle_url(url, notice, show_url=False): if mobile_twitter_hack(url): return title = bs4.BeautifulSoup(r.text, "html5lib").title - if title: + if title and title.string: prefix = "PAGE TITLE: " if show_url: prefix = "PAGE TITLE FOR <" + url + ">: " @@ -334,18 +331,33 @@ def handle_url(url, notice, show_url=False): class Session: - def __init__(self, io, username, nickname, channel, twtfile): + def __init__(self, io, username, nickname, channel, twtfile, dbdir): self.io = io self.nickname = nickname 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("JOIN " + self.channel) + hash_channel = hashlib.md5(self.channel.encode("utf-8")).hexdigest() + self.chandir = self.dbdir + "/" + hash_channel + "/" + self.logdir = self.chandir + "logs/" + if not os.path.exists(self.logdir): + os.makedirs(self.logdir) + self.markovfile = self.chandir + "markovfeed" + self.quotesfile = self.chandir + "quotes" def loop(self): + def log(line): + now = datetime.datetime.utcnow() + logfile = open(self.logdir + now.strftime("%Y-%m-%d") + ".txt", "a") + form = "%Y-%m-%d %H:%M:%S UTC\t" + logfile.write(now.strftime(form) + " " + line + "\n") + logfile.close() + def handle_privmsg(tokens): def handle_input(msg, target): @@ -361,9 +373,7 @@ class Session: 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 = "markovfeed_" + hash_string - file = open(markovfeed_name, "a") + file = open(self.markovfile, "a") file.write(msg + "\n") file.close() @@ -383,6 +393,8 @@ class Session: 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): @@ -406,14 +418,22 @@ class Session: elif tokens[1] == "353": names = tokens[5:] names[0] = names[0][1:] + for i in range(len(names)): + names[i] = names[i].replace("@", "").replace("+", "") self.users_in_chan += names + log(line) 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) + def parse_command_line_arguments(): parser = argparse.ArgumentParser() @@ -434,9 +454,11 @@ def parse_command_line_arguments(): parser.add_argument("-n, --nickname", action="store", dest="nickname", default=NICKNAME, help="nickname to use (default: " + NICKNAME + ")") - parser.add_argument("-t, --twtfile", action="store", dest="twtfile", - default=TWTFILE, help="twtfile to use (default: " + parser.add_argument("-t, --twtxtfile", action="store", dest="twtfile", + default=TWTFILE, help="twtxt file to use (default: " + TWTFILE + ")") + parser.add_argument("-d, --dbdir", action="store", dest="dbdir", + default=DBDIR, help="directory to store DB files in") parser.add_argument("CHANNEL", action="store", help="channel to join") opts, unknown = parser.parse_known_args() return opts @@ -446,8 +468,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.twtfile, dbdir) session.loop() except ExceptionForRestart: io.socket.close()