Added shuffle handler

This commit is contained in:
Fergal Moran
2015-10-11 21:43:31 +01:00
parent c7fc27550a
commit 7de7bee388
2 changed files with 13 additions and 1 deletions

View File

@@ -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:

View File

@@ -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"),