X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=c32b6dd3c0c42b79f86bb00c96d6f8b7d9017fd2;hp=a1ef7f8c3e2b60f9a61a4c2db1e8485e1b5ec5ae;hb=7bbd08d498b289f2f3cad8b85c8582aa6ceffc04;hpb=2623ca2bdf9d23e08c539ae68ad8521291bf2264

diff --git a/plomlombot.py b/plomlombot.py
index a1ef7f8..c32b6dd 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -11,6 +11,7 @@ import bs4
 import random
 import hashlib
 import os
+import plomsearch
 
 # Defaults, may be overwritten by command line arguments.
 SERVER = "irc.freenode.net"
@@ -114,7 +115,8 @@ def lineparser_loop(io, nickname):
 
                 def mobile_twitter_hack(url):
                     re1 = 'https?://(mobile.twitter.com/)[^/]+(/status/)'
-                    re2 = 'https?://mobile.twitter.com/([^/]+)/status/([^\?]+)'
+                    re2 = 'https?://mobile.twitter.com/([^/]+)/status/' \
+                        + '([^\?/]+)'
                     m = re.search(re1, url)
                     if m and m.group(1) == 'mobile.twitter.com/' \
                             and m.group(2) == '/status/':
@@ -166,9 +168,16 @@ def lineparser_loop(io, nickname):
                 quotesfile.close()
                 notice("ADDED QUOTE #" + str(len(lines) - 1))
             elif tokens[0] == "quote":
-                if len(tokens) > 2 or \
+                if (len(tokens) > 2 and tokens[1] != "search") or \
+                    (len(tokens) < 3 and tokens[1] == "search") or \
                     (len(tokens) == 2 and not tokens[1].isdigit()):
-                    notice("SYNTAX: !quote [int]")
+                    notice("SYNTAX: !quote [int] OR !quote search 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')")
                     return
                 if not os.access(quotesfile_name, os.F_OK):
                     notice("NO QUOTES AVAILABLE")
@@ -183,6 +192,20 @@ def lineparser_loop(io, nickname):
                         notice("THERE'S NO QUOTE OF THAT INDEX")
                         return
                     i = i - 1
+                elif len(tokens) > 2:
+                    query = str.join(" ", tokens[2:])
+                    try:
+                        results = plomsearch.search(query, lines)
+                    except plomsearch.LogicParserError as err:
+                        notice("FAILED QUERY PARSING: " + str(err))
+                        return
+                    if len(results) == 0:
+                        notice("NO QUOTES MATCHING QUERY")
+                    else:
+                        for result in results:
+                            notice("QUOTE #" + str(result[0] + 1) + " : "
+                                + result[1])
+                    return
                 else:
                     i = random.randrange(len(lines))
                 notice("QUOTE #" + str(i + 1) + ": " + lines[i])