[Librefm-commits] [1470] Moved parser creation into gobble.py.

[Daniel Watkins]

Revision: 1470
          http://svn.sv.gnu.org/viewvc/?view=rev&root=librefm&revision=1470
Author:   odd_bloke
Date:     2009-05-10 14:57:52 +0000 (Sun, 10 May 2009)
Log Message:
-----------
Moved parser creation into gobble.py.

Modified Paths:
--------------
    trunk/scripts/gobble.py
    trunk/scripts/offline-submit.py

Modified: trunk/scripts/gobble.py
===================================================================
--- trunk/scripts/gobble.py     2009-05-10 14:48:55 UTC (rev 1469)
+++ trunk/scripts/gobble.py     2009-05-10 14:57:52 UTC (rev 1470)
@@ -4,6 +4,7 @@
 except ImportError:
     import md5
     md5hash = md5.new
+from optparse import OptionParser
 import time
 from urllib import urlencode
 from urllib2 import urlopen
@@ -94,3 +95,12 @@
         if self.mbid is not None:
             data.append(('m[%d]' % i, self.mbid))
         return data
+
+
+def get_parser(usage):
+    parser = OptionParser(usage=usage)
+    parser.add_option('-s', '--server',
+                      help="Server to submit to.  Defaults to"
+                           " 'turtle.libre.fm'.")
+    parser.set_defaults(server='turtle.libre.fm')
+    return parser

Modified: trunk/scripts/offline-submit.py
===================================================================
--- trunk/scripts/offline-submit.py     2009-05-10 14:48:55 UTC (rev 1469)
+++ trunk/scripts/offline-submit.py     2009-05-10 14:57:52 UTC (rev 1470)
@@ -9,7 +9,7 @@
 import mutagen
 from mutagen import easyid3
 
-from gobble import GobbleServer, GobbleTrack
+from gobble import get_parser, GobbleServer, GobbleTrack
 
 
 def _parse_date(string):
@@ -21,11 +21,7 @@
 
 if __name__ == '__main__':
     usage = "%prog [--server <SERVER>] <USERNAME> <START TIME> <MEDIA FILES>"
-    parser = OptionParser(usage=usage)
-    parser.add_option('-s', '--server',
-                      help="Server to submit to.  Defaults to"
-                           " 'turtle.libre.fm'.")
-    parser.set_defaults(server='turtle.libre.fm')
+    parser = get_parser(usage=usage)
     opts,args = parser.parse_args()
     if len(args) < 3:
         parser.error("All arguments are required.")