X-Git-Url: https://plomlompom.com/repos/?p=plomlombot-irc.git;a=blobdiff_plain;f=plomlombot.py;h=9aa70457548922ada0cb4ee5f3612fcef4795c0b;hp=9a646196e502c42ac450f1a8786229d9bd92b4c4;hb=7d387b03c6841ad7efa790f7b4b1b61c90188d64;hpb=0af61c9c1693c644af87fdcfd7b1869ec28451fe

diff --git a/plomlombot.py b/plomlombot.py
index 9a64619..9aa7045 100755
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -198,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):
@@ -229,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:
@@ -238,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))
@@ -455,7 +471,7 @@ def handle_url(url, notice, show_url=False):
 class Session:
 
     def __init__(self, io, username, nickname, channel, twtfile, dbdir, rmlogs,
-                 markov_input):
+                 markov_input, no_show_page_titles):
         self.io = io
         self.nickname = nickname
         self.users_in_chan = []
@@ -471,6 +487,7 @@ class Session:
         self.io.send_line("JOIN " + channel)
         self.io.log = self.log
         self.log.separator_line()
+        self.show_page_titles = not no_show_page_titles
 
     def loop(self):
 
@@ -484,15 +501,16 @@ class Session:
             if line.receiver != self.nickname:
                 target = line.receiver
             msg = str.join(" ", line.tokens[3:])[1:]
-            matches = re.findall("(https?://[^\s>]+)", msg)
-            url_count = 0
-            for i in range(len(matches)):
-                if handle_url(matches[i], notice):
-                    url_count += 1
-                    if url_count == 3:
-                        notice("maximum number of urls to parse per message "
-                               "reached")
-                        break
+            if self.show_page_titles:
+                matches = re.findall("(https?://[^\s>]+)", msg)
+                url_count = 0
+                for i in range(len(matches)):
+                    if handle_url(matches[i], notice):
+                        url_count += 1
+                        if url_count == 3:
+                            notice("maximum number of urls to parse per "
+                                   "message reached")
+                            break
             if "!" == msg[0] and len(msg) > 1:
                 tokens = msg[1:].split()
                 argument = str.join(" ", tokens[1:])
@@ -558,6 +576,9 @@ def parse_command_line_arguments():
     parser.add_argument("-m, --markov_store", action="store_true",
                         dest="markov_store",
                         help="log channel discussions for !markov input")
+    parser.add_argument("--no-show-page-titles", action="store_true",
+                        dest="no_show_page_titles",
+                        help="do not show page titles")
     parser.add_argument("CHANNEL", action="store", help="channel to join")
     opts, unknown = parser.parse_known_args()
     return opts
@@ -570,7 +591,8 @@ while True:
         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, dbdir, opts.rmlogs, opts.markov_store)
+                          opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
+                          opts.no_show_page_titles)
         session.loop()
     except ExceptionForRestart:
         io.socket.close()