moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-08-13 16:53:54 -04:00
Code Issues Releases Wiki Activity

Fix for sickragetv/sickrage-issues#157 - force redirect to home if 404 http error.

Browse Source
This commit is contained in:
echel0n 2014-12-18 14:48:55 -08:00
parent c65b17d09b
commit 3060757381
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sickbeard/webserve.py
View File

@ -155,7 +155,7 @@ class BaseHandler(RequestHandler):
# handle 404 http errors
if status_code == 404:
url = self.request.uri
if self.request.uri.startswith(sickbeard.WEB_ROOT):
if sickbeard.WEB_ROOT and self.request.uri.startswith(sickbeard.WEB_ROOT):
url = url[len(sickbeard.WEB_ROOT) + 1:]
if url[:3] != 'api':
@ -209,8 +209,8 @@ class WebHandler(BaseHandler):
def get(self, route, *args, **kwargs):
try:
# route -> method obj
route = route.strip('/').replace('.', '_') or 'index'
method = getattr(self, route)
route = route.strip('/').replace('.', '_')
method = getattr(self, route, self.index)
# process request async
self.async_call(method, callback=self.async_done)

2
sickbeard/webserveInit.py
View File

@ -26,7 +26,7 @@ class SRWebServer(threading.Thread):
self.options.setdefault('log_dir', None)
self.options.setdefault('username', '')
self.options.setdefault('password', '')
self.options.setdefault('web_root', None)
self.options.setdefault('web_root', '/')
assert isinstance(self.options['port'], int)
assert 'data_root' in self.options

3
tornado/web.py
View File

@ -2017,6 +2017,9 @@ class RedirectHandler(RequestHandler):
(r"/oldpath", web.RedirectHandler, {"url": "/newpath"}),
])
"""
def __init__(self, *args, **kwargs):
super(RedirectHandler, self).__init__(*args, **kwargs)
def initialize(self, url, permanent=True):
self._url = url
self._permanent = permanent