From 7de7bee388b8e2145019f38b7bf85a00fbd01b68 Mon Sep 17 00:00:00 2001 From: Fergal Moran Date: Sun, 11 Oct 2015 21:43:31 +0100 Subject: [PATCH] Added shuffle handler --- ice_relay.py | 5 +++++ server.py | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ice_relay.py b/ice_relay.py index 863036c..539c4a8 100644 --- a/ice_relay.py +++ b/ice_relay.py @@ -119,9 +119,14 @@ class IceRelay(Thread): return ret + def shuffle_queue(self): + self._ended = True + time.sleep(10) + def set_audio_queue(self, queue): self.audio_queue = queue self._ended = True + time.sleep(10) def get_next_play_item(self): try: diff --git a/server.py b/server.py index 145172d..739bc7e 100755 --- a/server.py +++ b/server.py @@ -18,6 +18,13 @@ class MainHandler(tornado.web.RequestHandler): 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): def post(self, *args, **kwargs): try: @@ -25,7 +32,6 @@ class PlayAudioHandler(tornado.web.RequestHandler): in_file = data.get('audio_file') if in_file is not None: relay.set_audio_queue([in_file]) - time.sleep(10) except Exception, ex: raise tornado.web.HTTPError(500, ex.message) @@ -82,6 +88,7 @@ def main(): (r"/", MainHandler), (r"/a/play", PlayAudioHandler), (r"/a/stop", StopAudioHandler), + (r"/a/shuffle", ShuffleAudioHandler), ], cookie_secret="6f294734-215d-4f98-82e9-8e6ca500f524", template_path=os.path.join(os.path.dirname(__file__), "templates"),