light9 Changeset - ad5043f70fda

Changeset - ad5043f70fda

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

drewp@bigasterisk.com - 15 years ago 2010-06-15 06:27:52
drewp@bigasterisk.com

bin/curvecalc (with no song choice) defaults to whatever-ascoltami-is-currently-on
Ignore-this: 22a936edc1548675f97fcfc785573457

1 file changed with 9 insertions and 3 deletions:

bin/curvecalc

0 comments (0 inline, 0 general)

bin/curvecalc

➞

Show inline comments

@@ @@ -17,7 +17,7 @@ try: @@
 except ImportError:
     import louie as dispatcher
 from twisted.internet import reactor,tksupport
 import jsonlib
+import jsonlib, restkit
 import twisted
 from twisted.web.client import Agent
 from twisted.internet.protocol import Protocol
@@ @@ -453,10 +453,16 @@ def createHelpLines(root): @@
                         anchor='w')
         line.pack(side='top',fill='x')
 def currentlyPlayingSong():
     """ask the music player what song it's on"""
     t = jsonlib.read(restkit.Resource(networking.musicUrl()).get("time").body)
     if t['song'] is None:
         raise ValueError("music player is not playing any song")
     return URIRef(t['song'])
 def main():
     parser = optparse.OptionParser()
     parser.set_usage("%prog [opts] songURI")
+    parser.set_usage("%prog [opts] [songURI]")
     parser.add_option("--sliders", action='store_true',
                       help='use hardware sliders')
     parser.add_option("--skip-music", action='store_true',
@@ @@ -466,7 +472,7 @@ def main(): @@
     try:
         song = URIRef(args[0])
     except IndexError:
-        raise SystemExit("song URI is required, e.g. 'http://light9.bigasterisk.com/show/dance2008/song3'")
+        song = currentlyPlayingSong()
     log.debug("music")
     music=Music()

0 comments (0 inline, 0 general)