From 99f70f4f4b93150bc0aaceb6ee9edff42872aa13 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sat, 3 Sep 2011 17:30:03 +0200
Subject: [PATCH] Added SSL support, argparse for arguments.

---
 README   | 17 ++++++++++++++++-
 snurr.py | 43 ++++++++++++++++++++++++++-----------------
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/README b/README
index dffe56d..66d342c 100644
--- a/README
+++ b/README
@@ -1 +1,16 @@
-Usage: python snurr.py <IRC_SERVER> <IRC_CHANNEL> <MEDIAWIKI_PORT>
+Requirements: python-twisted
+
+$ python snurr.py -h
+usage: snurr.py [-h] [-s] SERVER PORT CHANNEL LISTEN_PORT
+
+Pipes UDP-messages to an IRC-channel.
+
+positional arguments:
+  SERVER       IRC server
+  PORT         IRC server port
+  CHANNEL      IRC channel (without the '#')
+  LISTEN_PORT  UDP listener port
+
+optional arguments:
+  -h, --help   show this help message and exit
+  -s, --ssl    connect with SSL
diff --git a/snurr.py b/snurr.py
index a53f02a..81f2341 100644
--- a/snurr.py
+++ b/snurr.py
@@ -1,7 +1,7 @@
-import sys
-from twisted.words.protocols import irc
-from twisted.internet import protocol, reactor
+import argparse
 from datetime import datetime
+from twisted.words.protocols import irc
+from twisted.internet import protocol, reactor, ssl
 
 class SnurrBot(irc.IRCClient):
 
@@ -47,7 +47,7 @@ class SnurrBotFactory(protocol.ClientFactory):
         connector.connect()
 
     def clientConnectionFailed(self, connector, reason):
-        log("Could not connect: %s" % (reason,))
+        log("Could not connect: (%s), retrying." % (reason,))
 
 class UDPListener(protocol.DatagramProtocol):
 
@@ -74,19 +74,28 @@ def log(message):
 
 
 if __name__ == "__main__":
-    if len(sys.argv) == 4:
-        chan = sys.argv[2]
-        listen_port = int(sys.argv[3])
+    parser = argparse.ArgumentParser(description='Pipes UDP-messages to an IRC-channel.')
+    parser.add_argument('-s', '--ssl', action='store_true',
+                        help='connect with SSL')
+    parser.add_argument('server', metavar='SERVER',
+                        help='IRC server')
+    parser.add_argument('port', metavar='PORT', type=int,
+                        help='IRC server port')
+    parser.add_argument('channel', metavar='CHANNEL',
+                        help='IRC channel (without the \'#\')')
+    parser.add_argument('listen_port', metavar='LISTEN_PORT', type=int,
+                        help='UDP listener port')
+    args = parser.parse_args()
+    
+    snurr = SnurrBotFactory('#' + args.channel)
+    listener = UDPListener(snurr)
 
-        snurr = SnurrBotFactory('#' + chan)
-        listener = UDPListener(snurr)
+    # Start the listener.
+    reactor.listenUDP(args.listen_port, listener)
 
-        # Start the listener.
-        reactor.listenUDP(listen_port, listener)
-
-        # Start IRC-bot on IRCNet.
-        reactor.connectTCP(sys.argv[1], 6667, snurr)
-
-        reactor.run()
+    # Start IRC-bot on specified server and port.
+    if args.ssl:
+        reactor.connectSSL(args.server, args.port, snurr, ssl.ClientContextFactory())
     else:
-        print "Usage: python %s <IRC_SERVER> <IRC_CHANNEL> <UDP_PORT>" % (sys.argv[0],)
+        reactor.connectTCP(args.server, args.port, snurr)
+    reactor.run()