mirror of
https://github.com/fergalmoran/dss.radio.git
synced 2025-12-22 01:37:58 +00:00
Added shuffle handler
This commit is contained in:
@@ -119,9 +119,14 @@ class IceRelay(Thread):
|
|||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
def shuffle_queue(self):
|
||||||
|
self._ended = True
|
||||||
|
time.sleep(10)
|
||||||
|
|
||||||
def set_audio_queue(self, queue):
|
def set_audio_queue(self, queue):
|
||||||
self.audio_queue = queue
|
self.audio_queue = queue
|
||||||
self._ended = True
|
self._ended = True
|
||||||
|
time.sleep(10)
|
||||||
|
|
||||||
def get_next_play_item(self):
|
def get_next_play_item(self):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -18,6 +18,13 @@ class MainHandler(tornado.web.RequestHandler):
|
|||||||
self.render("index.html")
|
self.render("index.html")
|
||||||
|
|
||||||
|
|
||||||
|
class ShuffleAudioHandler(tornado.web.RequestHandler):
|
||||||
|
def post(self, *args, **kwargs):
|
||||||
|
try:
|
||||||
|
relay.shuffle_queue()
|
||||||
|
except Exception, ex:
|
||||||
|
raise tornado.web.HTTPError(500, ex.message)
|
||||||
|
|
||||||
class PlayAudioHandler(tornado.web.RequestHandler):
|
class PlayAudioHandler(tornado.web.RequestHandler):
|
||||||
def post(self, *args, **kwargs):
|
def post(self, *args, **kwargs):
|
||||||
try:
|
try:
|
||||||
@@ -25,7 +32,6 @@ class PlayAudioHandler(tornado.web.RequestHandler):
|
|||||||
in_file = data.get('audio_file')
|
in_file = data.get('audio_file')
|
||||||
if in_file is not None:
|
if in_file is not None:
|
||||||
relay.set_audio_queue([in_file])
|
relay.set_audio_queue([in_file])
|
||||||
time.sleep(10)
|
|
||||||
except Exception, ex:
|
except Exception, ex:
|
||||||
raise tornado.web.HTTPError(500, ex.message)
|
raise tornado.web.HTTPError(500, ex.message)
|
||||||
|
|
||||||
@@ -82,6 +88,7 @@ def main():
|
|||||||
(r"/", MainHandler),
|
(r"/", MainHandler),
|
||||||
(r"/a/play", PlayAudioHandler),
|
(r"/a/play", PlayAudioHandler),
|
||||||
(r"/a/stop", StopAudioHandler),
|
(r"/a/stop", StopAudioHandler),
|
||||||
|
(r"/a/shuffle", ShuffleAudioHandler),
|
||||||
],
|
],
|
||||||
cookie_secret="6f294734-215d-4f98-82e9-8e6ca500f524",
|
cookie_secret="6f294734-215d-4f98-82e9-8e6ca500f524",
|
||||||
template_path=os.path.join(os.path.dirname(__file__), "templates"),
|
template_path=os.path.join(os.path.dirname(__file__), "templates"),
|
||||||
|
|||||||
Reference in New Issue
Block a user