Overhaul DB directory structure.

[plomlombot-irc.git] / plomlombot.py

diff --git a/plomlombot.py b/plomlombot.py
index 9d04830ce92156b028dd809c349a33e112fe7015..89ff51a015700ec067fa88a7e984e3e04a6fc16e 100755 (executable)
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -96,18 +96,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 +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:]
@@ -186,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 = 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 = []
@@ -345,9 +341,23 @@ class Session:
         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):
@@ -363,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 = self.dbdir + "/markovfeed_" + hash_string
-                file = open(markovfeed_name, "a")
+                file = open(self.markovfile, "a")
                 file.write(msg + "\n")
                 file.close()
 
@@ -385,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):
@@ -408,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()
@@ -450,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.dbdir)
+            opts.twtfile, dbdir)
         session.loop()
     except ExceptionForRestart:
         io.socket.close()