[Librefm-commits] [1471] Make libre.fm server default for import.py.

[Daniel Watkins]

Revision: 1471
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1471
Author:   odd_bloke
Date:     2009-05-10 14:57:58 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Make libre.fm server default for import.py.

Modified Paths:
--------------
    trunk/lastscrape/import.py

Modified: trunk/lastscrape/import.py
===================================================================
--- trunk/lastscrape/import.py  2009-05-10 14:57:52 UTC (rev 1470)
+++ trunk/lastscrape/import.py  2009-05-10 14:57:58 UTC (rev 1471)
@@ -6,21 +6,21 @@
 
 from datetime import datetime
 import getpass
-from gobble import GobbleServer, GobbleTrack
-from optparse import OptionParser
+from gobble import get_parser, GobbleServer, GobbleTrack
 import time
 from urllib import urlencode
 from urllib2 import urlopen
 
 
 if __name__ == '__main__':
-    usage = "%prog <USERNAME> <SERVER> <SCROBBLE DUMP>"
-    parser = OptionParser(usage=usage)
+    usage = "%prog [-s <SERVER>] <USERNAME> <SCROBBLE DUMP>"
+    parser = get_parser(usage=usage)
     opts,args = parser.parse_args()
-    if len(args) != 3:
+    if len(args) != 2:
         parser.error("All arguments are required.")
 
-    username,server,data = args
+    username,data = args
+    server = opts.server
     password = getpass.getpass()
     gobbler = GobbleServer(server, username, password)