Changeset 24

Timestamp:

08/12/10 09:23:43 (3 years ago)

Author:

clauz

Message:

slot type checking on reservation, livemount config parameter, notimplemented json response

Location:

trunk

Files:

• JsonAPI.txt (modified) (1 diff)
• radiomate/config.py (modified) (1 diff)
• radiomate/jsonif.py (modified) (6 diffs)
• radiomate/jukebox.py (modified) (1 diff)
• radiomate/jukeslots/base.py (modified) (2 diffs)
• radiomate/jukeslots/simplelive.py (modified) (2 diffs)
• tests/jsontest.py (modified) (2 diffs)

trunk/JsonAPI.txt

@@ -608 +608 @@
 
 {
-    "response": ("ok" | "notallowed" | "dontexists" | "alreadyexists" | "servererror" | "error" | "requesterror"),
-    "responsen": (0 | 101 | 201 | 202 | 301 | 401 | 501),
+    "response": ("ok" | "notallowed" | "dontexists" | "alreadyexists" | "servererror" | "error" | "requesterror", "notimplemented"),
+    "responsen": (0 | 101 | 201 | 202 | 301 | 401 | 501 | 601),
     "requested": <the requested action>,
     "warning": <warning message(s) or null>,

trunk/radiomate/config.py

@@ -37 +37 @@
 TAKEOVERMOUNTURL = "http://%s:%d/takeover.mp3" % (ICECASTSERVER, ICECASTPORT)
 
-# The port used for incoming live streams
+# The mount and port used for incoming live streams
 LIVESTREAMPORT = 8005
+LIVESTREAMMOUNT = "live.mp3"
 
 # The port used internally on the loopback address to communicate between jukeslot istances. 

trunk/radiomate/jsonif.py

@@ -24 +24 @@
 from mate import *
 from dao import *
+from jukeslots.all import *
 
 
@@ -33 +34 @@
 RESPONSE_REQERROR = 401
 RESPONSE_ERROR = 501
+RESPONSE_NOTIMPLEMENTED = 601
 
 ERRORDICT = {
@@ -41 +43 @@
                 RESPONSE_SERVERERROR: "servererror",
                 RESPONSE_REQERROR: "requesterror",
-                RESPONSE_ERROR: "error"
+                RESPONSE_ERROR: "error",
+                RESPONSE_NOTIMPLEMENTED: "notimplemented"
 }
 
@@ -867 +870 @@
                 except Exception, e:
                         return JsonResponse(RESPONSE_REQERROR, str(e), rd)
+                        
+                try:
+                        # check the slot type
+                        jukeslotclass = JUKESLOTTYPEDICT[t.slottype]
+                        tj = jukeslotclass(timeslot=t, mainpassword="")
+                        tj.liquidsoapcode()
+                except:
+                        return JsonResponse(RESPONSE_REQERROR, "Slot type not supported or wrong slot parameters")
 
                 try:
@@ -919 +930 @@
                         t = timeslotdao.getById(id)
                         t.dictupdate(req['timeslot'])
+
+                        try:
+                                # check the slot type
+                                jukeslotclass = JUKESLOTTYPEDICT[t.slottype]
+                                tj = jukeslotclass(timeslot=t, mainpassword="")
+                                tj.liquidsoapcode()
+                        except:
+                                return JsonResponse(RESPONSE_REQERROR, "Slot type not supported or wrong slot parameters")
+
                         newid = timeslotdao.update(t)
                         if newid != id:
@@ -985 +1005 @@
 
         def createtestslot(self, requser, req):
-                pass
+                return JsonResponse(RESPONSE_NOTIMPLEMENTED, "Not yet implemented")
 
         def listnetcasts(self, requser, req):
-                pass
+                return JsonResponse(RESPONSE_NOTIMPLEMENTED, "Not yet implemented")
 
 

trunk/radiomate/jukebox.py

@@ -88 +88 @@
                 
                 # spawn a new process
-                self.currentjukeslot = jukeslotclass(self.currenttimeslot, mainpassword=self.getPassword())
+                self.currentjukeslot = jukeslotclass(timeslot=self.currenttimeslot, mainpassword=self.getPassword())
 
                 self.currentjukeslot.deathtime = time.time() + self.currentjukeslot.duration*60

trunk/radiomate/jukeslots/base.py

@@ -51 +51 @@
                                 stdin=PIPE, stdout=None, stderr=STDOUT)
 
-                time.sleep(1)
                 self.logger = logging.getLogger("radiomate.jukebox")
                 logging.basicConfig(filename=config.LOGFILENAME, level=config.LOGGINGLEVEL)
@@ -86 +85 @@
                         raise JukeSlotException("liquidsoap instance not running (exitcode %d)" % r)
 
+                time.sleep(1)
                 self.stdin.write(liq)
                 self.stdin.close()

trunk/radiomate/jukeslots/simplelive.py

@@ -39 +39 @@
                 transfunction = fun(a,b) -> sequence([fade.final(a, type="sin"), blank(duration=1.), fade.initial(b, type="sin")])
 
-                livestream = input.harbor(password="%s", "live.mp3")
+                livestream = input.harbor(password="%s", "%s")
                 
                 fallbackplaylist = playlist(mode="normal", '%s')
@@ -60 +60 @@
                     description="%s",
                     radio)
-                """ % (config.LIVESTREAMPORT, self.slotparams['livepassword'], self.getFallBackPlayListName(), \
-                                self.title, config.INTERNALJUKEPORT, self.mainpassword, self.title)
+                """ % (config.LIVESTREAMPORT, self.slotparams['livepassword'], config.LIVESTREAMMOUNT,\
+                                self.getFallBackPlayListName(), self.title, config.INTERNALJUKEPORT,\
+                                self.mainpassword, self.title)
                 return liq
 

trunk/tests/jsontest.py

@@ -657 +657 @@
                     "description": "Some Test Tracks Transmission",
                     "fallbackplaylist": %d,
-                    "slottype": "dummy",
+                    "slottype": "simplelive",
                     "beginningtime": {
                         "year": 2010,
@@ -667 +667 @@
                     "duration": 60,
                     "slotparams": {
-                        "par1": 1,
-                        "par2": 2
+                        "livepassword": "buuuu"
                     },
                     "comment": "Bad Music Show",