Fix clause error.

[plomlombot-irc.git] / plomlombot.py

diff --git a/plomlombot.py b/plomlombot.py
index 0012baffd9a94ced7e54a09073fa606466bc8064..3b480682fc42062d6698f9fbdf9643bd54d55258 100755 (executable)
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -74,8 +74,8 @@ class Log:
         identity = ""
         separator = " > "
         if sent:
-            separator = " < "
-            line = Line(line)
+            separator = " "
+            line = Line("< " + line)
             line.sender = self.nickname
             identity = self.username + "@localhost"
         else:
@@ -118,7 +118,10 @@ class IO:
         self.line_buffer = []
         self.rune_buffer = ""
         self.last_pong = time.time()
-        self.servername = self.recv_line(send_ping=False).split(" ")[0][1:]
+        line = self.recv_line(send_ping=False)
+        if not line or len(line) < 1:
+            raise ExceptionForRestart
+        self.servername = line.split(" ")[0][1:]
 
     def _pingtest(self, send_ping=True):
         if self.last_pong + self.timeout < time.time():
@@ -195,21 +198,27 @@ def handle_command(command, argument, notice, target, session):
     def quote():
 
         def help():
-            notice("syntax: !quote [int] OR !quote search QUERY")
+            notice("syntax: !quote [int] OR !quote search QUERY "
+                   "OR !quote offset-search [int] QUERY")
             notice("QUERY may be a boolean grouping of quoted or unquoted " +
                    "search terms, examples:")
             notice("!quote search foo")
             notice("!quote search foo AND (bar OR NOT baz)")
             notice("!quote search \"foo\\\"bar\" AND ('NOT\"' AND \"'foo'\"" +
                    " OR 'bar\\'baz')")
+            notice("The offset-search int argument defines how many matches "
+                   "to skip (useful if results are above maximum number to "
+                   "display).")
 
         if "" == argument:
             tokens = []
         else:
             tokens = argument.split(" ")
-        if (len(tokens) > 1 and tokens[0] != "search") or \
-            (len(tokens) == 1 and
-                (tokens[0] == "search" or not tokens[0].isdigit())):
+        if (len(tokens) == 1 and not tokens[0].isdigit()) or \
+           (len(tokens) > 1 and
+            (tokens[0] not in {"search", "offset-search"}) or
+            (tokens[0] == "offset-search" and
+             ((not len(tokens) > 2) or (not tokens[1].isdigit())))):
             help()
             return
         if not os.access(session.quotesfile, os.F_OK):
@@ -226,7 +235,12 @@ def handle_command(command, argument, notice, target, session):
                 return
             i = i - 1
         elif len(tokens) > 1:
-            query = str.join(" ", tokens[1:])
+            to_skip = 0
+            if tokens[0] == "search":
+                query = str.join(" ", tokens[1:])
+            elif tokens[0] == "offset-search":
+                to_skip = int(tokens[1])
+                query = str.join(" ", tokens[2:])
             try:
                 results = plomsearch.search(query, lines)
             except plomsearch.LogicParserError as err:
@@ -235,11 +249,16 @@ def handle_command(command, argument, notice, target, session):
             if len(results) == 0:
                 notice("no quotes matching query")
             else:
-                if len(results) > 3:
-                    notice("showing 3 of " + str(len(results)) + " quotes")
-                for result in results[:3]:
-                    notice("quote #" + str(result[0] + 1) + ": "
-                           + result[1][:-1])
+                if to_skip >= len(results):
+                    notice("skipped all quotes matching query")
+                else:
+                    notice("found %s matches, showing max. 3, skipping %s"
+                           % (len(results), to_skip))
+                for i in range(len(results)):
+                    if i >= to_skip and i < to_skip + 3:
+                        result = results[i]
+                        notice("quote #" + str(result[0] + 1) + ": "
+                               + result[1][:-1])
             return
         else:
             i = random.randrange(len(lines))
@@ -451,13 +470,15 @@ def handle_url(url, notice, show_url=False):
 
 class Session:
 
-    def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs):
+    def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs,
+                 markov_input):
         self.io = io
         self.nickname = nickname
         self.users_in_chan = []
         self.twtfile = twtfile
         hash_channel = hashlib.md5(channel.encode("utf-8")).hexdigest()
         chandir = dbdir + "/" + hash_channel + "/"
+        self.markov_input = markov_input
         self.markovfile = chandir + "markovfeed"
         self.quotesfile = chandir + "quotes"
         self.log = Log(chandir, self.nickname, username, channel, rmlogs)
@@ -488,12 +509,13 @@ class Session:
                         notice("maximum number of urls to parse per message "
                                "reached")
                         break
-            if "!" == msg[0]:
+            if "!" == msg[0] and len(msg) > 1:
                 tokens = msg[1:].split()
                 argument = str.join(" ", tokens[1:])
                 handle_command(tokens[0], argument, notice, target, self)
                 return
-            write_to_file(self.markovfile, "a", msg + "\n")
+            if self.markov_input:
+                write_to_file(self.markovfile, "a", msg + "\n")
 
         while True:
             self.log.rmlogs()
@@ -549,6 +571,9 @@ def parse_command_line_arguments():
                         type=int, default=0,
                         help="maximum age in seconds for logfiles in logs/ "
                         "(0 means: never delete, and is default)")
+    parser.add_argument("-m, --markov_store", action="store_true",
+                        dest="markov_store",
+                        help="log channel discussions for !markov input")
     parser.add_argument("CHANNEL", action="store", help="channel to join")
     opts, unknown = parser.parse_known_args()
     return opts
@@ -559,9 +584,9 @@ 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 
+        dbdir = opts.dbdir + "/" + hash_server
         session = Session(io, opts.username, opts.nickname, opts.CHANNEL,
-            opts.twtfile, dbdir, opts.rmlogs)
+                          opts.twtfile, dbdir, opts.rmlogs, opts.markov_store)
         session.loop()
     except ExceptionForRestart:
         io.socket.close()