Make channel argument unpositional.

[plomlombot-irc.git] / plomlombot.py

diff --git a/plomlombot.py b/plomlombot.py
index c835d56b80581a38a97968ec9806cc6edde7ad89..dc9a46d46b9b3be508ca70862982469fc16cee5a 100755 (executable)
--- a/plomlombot.py
+++ b/plomlombot.py
@@ -17,6 +17,7 @@ import irclog
 
 # Defaults, may be overwritten by command line arguments.
 SERVER = "irc.freenode.net"
+CHANNEL = "#plomlombot-test"
 PORT = 6667
 TIMEOUT = 240
 USERNAME = "plomlombot"
@@ -214,13 +215,13 @@ def handle_command(command, argument, notice, target, session):
             tokens = []
         else:
             tokens = argument.split(" ")
-        if len(tokens) != 0:
-           if (len(tokens) == 1 and not tokens[0].isdigit()) or \
-               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 (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):
             notice("no quotes available")
             return
@@ -253,7 +254,7 @@ def handle_command(command, argument, notice, target, session):
                     notice("skipped all quotes matching query")
                 else:
                     notice("found %s matches, showing max. 3, skipping %s"
-                           %s (len(results), to_skip))
+                           % (len(results), to_skip))
                 for i in range(len(results)):
                     if i >= to_skip and i < to_skip + 3:
                         result = results[i]
@@ -471,7 +472,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 = []
@@ -487,6 +488,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):
 
@@ -500,15 +502,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:])
@@ -552,6 +555,8 @@ def parse_command_line_arguments():
     parser.add_argument("-p, --port", action="store", dest="port", type=int,
                         default=PORT, help="port to connect to (default : "
                         + str(PORT) + ")")
+    parser.add_argument("-c, --channel", action="store", dest="channel",
+                        default=SERVER, help="channel to join")
     parser.add_argument("-w, --wait", action="store", dest="timeout",
                         type=int, default=TIMEOUT,
                         help="timeout in seconds after which to attempt "
@@ -574,7 +579,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("CHANNEL", action="store", help="channel to join")
+    parser.add_argument("--no-show-page-titles", action="store_true",
+                        dest="no_show_page_titles",
+                        help="do not show page titles")
     opts, unknown = parser.parse_known_args()
     return opts
 
@@ -585,8 +592,9 @@ while True:
         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, dbdir, opts.rmlogs, opts.markov_store)
+        session = Session(io, opts.username, opts.nickname, opts.channel,
+                          opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
+                          opts.no_show_page_titles)
         session.loop()
     except ExceptionForRestart:
         io.socket.close()