Improved CLI handling

vlcclient.py

@@ -169,17 +169,25 @@ class OldServerVersion(Exception):
     pass
 
 def main():
-    vlc = VLCClient("ubuntu.local")
-    vlc.connect()
-    print "Connected to VLC {0}".format(vlc.server_version)
-
+    """Run any commands via CLI interface"""
     try:
-        command = getattr(vlc, sys.argv[1])
+        server = sys.argv[1]
+        if ':' in server:
+            server, port = server.split(':')
+        else:
+            port = 4212
+
+        command_name = sys.argv[2]
     except IndexError:
-        print "usage: vlcclient.py command [argument]"
+        print "usage: vlcclient.py server[:port] command [argument]"
         sys.exit(1)
 
+    vlc = VLCClient(server, int(port))
+    vlc.connect()
+    print "Connected to VLC {0}".format(vlc.server_version)
+
     try:
+        command = getattr(vlc, command_name)
         attr = sys.argv[2] if len(sys.argv) > 2 else None
         try:
             print command(attr)