Make channel argument unpositional.

diff --git a/plomlombot.py b/plomlombot.py
index 9aa70457548922ada0cb4ee5f3612fcef4795c0b..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"
 
 # Defaults, may be overwritten by command line arguments.
 SERVER = "irc.freenode.net"

+CHANNEL = "#plomlombot-test"

 PORT = 6667
 TIMEOUT = 240
 USERNAME = "plomlombot"
 PORT = 6667
 TIMEOUT = 240
 USERNAME = "plomlombot"


@@ -554,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("-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 "
     parser.add_argument("-w, --wait", action="store", dest="timeout",
                         type=int, default=TIMEOUT,
                         help="timeout in seconds after which to attempt "


@@ -579,7 +582,6 @@ def parse_command_line_arguments():
     parser.add_argument("--no-show-page-titles", action="store_true",
                         dest="no_show_page_titles",
                         help="do not show page titles")
     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
 
     opts, unknown = parser.parse_known_args()
     return opts
 


@@ -590,7 +592,7 @@ 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
         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,
+        session = Session(io, opts.username, opts.nickname, opts.channel,

                           opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
                           opts.no_show_page_titles)
         session.loop()
                           opts.twtfile, dbdir, opts.rmlogs, opts.markov_store,
                           opts.no_show_page_titles)
         session.loop()