3 files changed, 197 insertions, 15 deletions

diff --git a/streams/relaxxapi.py b/streams/relaxxapi.py
index 9ef738d0..f367caef 100755
--- a/streams/relaxxapi.py
+++ b/streams/relaxxapi.py
@@ -20,13 +20,12 @@ class relaxx:
         url=self.baseurl+"include/controller-ping.php?value=%s"%value
         return self.r.post(url,data="json=null").text
 
-    def _action(self,action,value="",json="null",method="get"):
+    def _playlist(self,action,value="",json="null",method="get"):
         """
         This function is the interface to the controller-playlist api
             use it if you dare
         Possible actions:
             clear
-            play
             addSong url_encoded_path
             moveSong 1:2
             getPlaylists
@@ -42,37 +41,100 @@ class relaxx:
             return r.post(url).text
         else:
             raise Exception("unknown method %s")
-    def add_radio(self,playlist=""):
+
+    def _playback(self,action,value="",json="null",method="get"):
+        """
+        play
+        continue
+        stop
+        setCrossfade
+        """
+        url=self.baseurl+"include/controller-playback.php?action=%s&value=%s&json=%s"%(action,value,json)
+        # probably obsolete because everything is "get"
+        if method== "get":
+            return self.r.get(url).text
+        elif method == "post":
+            return r.post(url).text
+        else:
+            raise Exception("unknown method %s")
+
+    def _radio(self,playlist=""):
         """
         both, post and get the url seem to work here...
         """
-        url=self.baseurl+"include/controller-netradio.php?playlist=%s"%playlist
-        print self.r.post(url).text
-        resolved_url= json.loads(self.r.get(url).text[1:-1])["url"]
+        url=self.baseurl+"include/controller-netradio.php?playlist=%s"%quote(playlist)
+        return self.r.get(url).text
+
+    def add_radio(self,playlist=""):
+        print playlist
+        print self._radio(playlist)
+        print json.loads(self._radio(playlist)) #[1:-1])["url"]
+        resolved_url= json.loads(self._radio(playlist)[1:-1])["url"]
         self.add_song(resolved_url)
 
     def add_song(self,path):
-        return self._action("addSong",quote(path))
+        return self._playlist("addSong",path)
+
+    def get_first(self):
+        return json.loads(self._playlist("getPlaylistInfo","0",""))[0]
+
+    def get_first(self):
+        return json.loads(self._playlist("getPlaylistInfo","0",""))[-1]
 
     def clear(self):
-        return self._action("clear")
+        return self._playlist("clear")
+    
+    def crossfade(self,ident="0"):
+        """
+        default: no crossfade
+        """
+        return self._playback("setCrossfade",ident)
+
+    def repeat(self,ident="1"):
+        """
+        default: do repeat
+        """
+        return self._playback("repeat",ident)
 
     def play(self,ident):
-        return self._action("play",ident)
+        return self._playback("play",ident)
 
     def stop(self):
-        return self._action("stop")
-    def get_first(self):
-        return json.loads(self._action("getPlaylistInfo","0",""))[0]
+        return self._playback("stop")
+
+    def cont(self,ident):
+        return self._playback("continue",ident)
 
     def play_first(self):
         return self.play(self.get_first()["Id"])
 
+    def play_last(self):
+        return self.play(self.get_last()["Id"])
+
     def state(self):
-        return self._action(
+        return json.loads(self._status())
+
+    def is_running(self):
+        return self.state()["status"]["state"] == "play"
+
+    def playing(self):
+        """ returns "" if not running
+        """
+        state = self.state()
+        if state["status"]["state"] == "play" :
+            ident = state["status"]["song"]
+            current = state["playlist"]["file"][int(ident)]
+            return current.get("Name",current.get("Artist")) + " - " + current["Title"]
+        else:
+            return ""
 
 if __name__ == "__main__":
     r = relaxx()
-    r.stop()
-    print r.play_first()
+    print r.state()
+    print r.playing()
+    print r.add_radio("http://deluxetelevision.com/livestreams/radio/DELUXE_RADIO.pls")
+    #print r.clear()
+    #print r.add_radio("http://somafm.com/lush.pls")
+    #print r.get_first()["Id"]
+    #print r.play_first()
     #print r.add_radio("http://somafm.com/lush.pls")
diff --git a/streams/relaxxplayer.api b/streams/relaxxplayer.api
new file mode 100644
index 00000000..6e8af577
--- /dev/null
+++ b/streams/relaxxplayer.api
@@ -0,0 +1,13 @@
+http://lounge.mpd.shack/include/controller-playback.php?action=setCrossfade&value=5&json=null
+http://lounge.mpd.shack/include/controller-playback.php?action=repeat&value=1&json=null
+http://lounge.mpd.shack/include/controller-playlist.php?action=clear&value=&json=null
+http://lounge.mpd.shack/include/controller-playlist.php?action=addSong&value=http%3A%2F%2F212.7.194.133%3A8128&json=null
+http://lounge.mpd.shack/include/controller- playlist.php?action=getPlaylistInfo&value=0&json=
+[{                                                                 
+  "file": "http:\/\/212.7.194.133:8128",
+  "Title": "Max & Dima - Sapovnela Studio: Batut",
+  "Name": "Deep Mix Moscow Radio: deepmix.ru",
+  "Pos": "0",
+  "Id": "606"
+}] 
+http://lounge.mpd.shack/include/controller-playlist.php?action=continue&value={Id}&json=null
diff --git a/streams/relaxxstreams b/streams/relaxxstreams
new file mode 100755
index 00000000..57cfb05b
--- /dev/null
+++ b/streams/relaxxstreams
@@ -0,0 +1,107 @@
+#!/usr/bin/python2
+
+# this version cannot tell if a stream is running or just ordinary music
+import os
+import sys
+import json
+from urllib import quote
+from relaxxapi import relaxx 
+
+try:
+    import requests
+except:
+    print ("you are missing the `requests` dependency, please do a `pip install requests`")
+from subprocess import Popen, PIPE
+
+os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
+pidfile = "/tmp/krebs.stream.pid"
+baseurl="http://elab.mpd.shack/"
+url=baseurl+"include/controller-playlist.php?action=%s&value=%s&json=%s"
+url_file = os.environ.get("STREAM_DB", "direct.db")
+urls = []
+
+for line in open(url_file):
+    urls.append(line.split())
+#print urls
+mybin = sys.argv[0]
+cmd = sys.argv[1] if len(sys.argv) > 1 else "you-are-made-of-stupid"
+stream = sys.argv[2] if len(sys.argv) == 3 else "groove"
+pipe_silent = open("/dev/null","w")
+api = relaxx(baseurl)
+
+def urlForStream(stream):
+    for url, s in urls:
+        if s == stream:
+            return url
+
+def streamForUrl(url):
+    for u, s in urls:
+        if u == url:
+            return stream 
+
+def startStream(stream_url):
+    print api.crossfade("5")
+    print api.repeat("1")
+    print api.clear()
+    print api.add_song(stream_url)
+    print api.play_first()
+
+def start(stream):
+    ret = api.playing()
+    if ret:
+        print "!! Stream `%s` already running !" % \
+                (ret)
+    else:
+        startStream(urlForStream(stream))
+        print "** Starting `%s`."% stream
+
+
+def stop():
+    ret = api.playing()
+    if not ret:
+        print "!! No Stream running!"
+    else:
+        print "** Stopping `%s`" % ret
+        api.stop()
+
+def slist():
+    for url, name in urls:
+        print "%s : %s" % (name, url)
+
+def shorthelp():
+    print "start|stop|restart|status|list [audio stream]"
+
+
+def longhelp():
+    print "Usage: %s" % mybin,
+    shorthelp
+    print """ get all available streams with '/%(fil)s list'
+    Examples:
+    %(fil)s list
+    %(fil)s start groove
+    %(fil)s switch deepmix
+    %(fil)s status
+    %(fil)s stop""" % {'fil': mybin}
+
+if cmd == "start":
+    start(stream)
+elif cmd == "stop":
+    stop()
+elif cmd == "switch" or cmd == "restart":
+    stop()
+    start(stream)
+elif cmd == "status":
+    ret = api.playing()
+    if not ret:
+        print "** nothing running"  # , e
+    else:
+        print "Now Playing: %s" % ret
+elif cmd == "list":
+    slist()
+elif cmd == "--help":
+    longhelp()
+elif cmd == "-h":
+    shorthelp()
+else:
+    print "unknown command `%s`" % cmd
+    print "try `%s` --help" % os.path.basename(mybin)