From 088e32b11702af62ab27d3ee006eb48d53054be9 Mon Sep 17 00:00:00 2001 From: echel0n Date: Sun, 15 Jun 2014 23:19:14 -0700 Subject: [PATCH] Fixed Web API to work with new tornado code! --- sickbeard/webserve.py | 5 +++++ sickbeard/webserveInit.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 36086585..33ce3d48 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -177,7 +177,12 @@ class IndexHandler(RedirectHandler): """ args = None path = self.request.uri.split('?')[0] + method = path.strip('/').split('/')[-1] + if path.startswith('/api'): + apikey = path.strip('/').split('/')[-1] + method = path.strip('/').split('/')[0] + self.request.arguments.update({'apikey':[apikey]}) def pred(c): return inspect.isclass(c) and c.__module__ == pred.__module__ diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py index 8f070cda..f6e2ec30 100644 --- a/sickbeard/webserveInit.py +++ b/sickbeard/webserveInit.py @@ -107,7 +107,7 @@ def initWebServer(options={}): app.add_handlers(".*$", [ (r"/", RedirectHandler, {'url': '/home/'}), (r'/login', webserve.LoginHandler), - (r'/api', webapi.Api), + (r'/api/(.*)(/?)', webapi.Api), (r'%s(.*)(/?)' % options['web_root'], webserve.IndexHandler) ])