moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00
Code Issues Releases Wiki Activity

Fixed issue with facicon.ico file and static link being incorrect causing 404 errors.

Browse Source
This commit is contained in:
echel0n 2014-06-17 09:33:45 -07:00
parent 067438b5d9
commit 18a1681a61
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sickbeard/webserveInit.py
View File

@ -13,6 +13,7 @@ from tornado.ioloop import IOLoop
server = None server = None
class MultiStaticFileHandler(StaticFileHandler): class MultiStaticFileHandler(StaticFileHandler):
def initialize(self, paths, default_filename=None): def initialize(self, paths, default_filename=None):
self.paths = paths self.paths = paths
@ -33,6 +34,7 @@ class MultiStaticFileHandler(StaticFileHandler):
# Oops file not found anywhere! # Oops file not found anywhere!
raise HTTPError(404) raise HTTPError(404)
def initWebServer(options={}): def initWebServer(options={}):
options.setdefault('port', 8081) options.setdefault('port', 8081)
options.setdefault('host', '0.0.0.0') options.setdefault('host', '0.0.0.0')
@ -115,13 +117,15 @@ def initWebServer(options={}):
# Static Path Handler # Static Path Handler
app.add_handlers(".*$", [ app.add_handlers(".*$", [
('%s/%s/(.*)([^/]*)' % (options['web_root'], 'images'), MultiStaticFileHandler, (r'/(favicon\.ico)', MultiStaticFileHandler,
{'paths': '%s/%s' % (options['web_root'], 'images/ico/favicon.ico')}),
(r'%s/%s/(.*)(/?)' % (options['web_root'], 'images'), MultiStaticFileHandler,
{'paths': [os.path.join(options['data_root'], 'images'), {'paths': [os.path.join(options['data_root'], 'images'),
os.path.join(sickbeard.CACHE_DIR, 'images'), os.path.join(sickbeard.CACHE_DIR, 'images'),
os.path.join(sickbeard.CACHE_DIR, 'images', 'thumbnails')]}), os.path.join(sickbeard.CACHE_DIR, 'images', 'thumbnails')]}),
('%s/%s/(.*)([^/]*)' % (options['web_root'], 'css'), MultiStaticFileHandler, (r'%s/%s/(.*)(/?)' % (options['web_root'], 'css'), MultiStaticFileHandler,
{'paths': [os.path.join(options['data_root'], 'css')]}), {'paths': [os.path.join(options['data_root'], 'css')]}),
('%s/%s/(.*)([^/]*)' % (options['web_root'], 'js'), MultiStaticFileHandler, (r'%s/%s/(.*)(/?)' % (options['web_root'], 'js'), MultiStaticFileHandler,
{'paths': [os.path.join(options['data_root'], 'js')]}) {'paths': [os.path.join(options['data_root'], 'js')]})
]) ])
@ -131,7 +135,7 @@ def initWebServer(options={}):
if enable_https: if enable_https:
protocol = "https" protocol = "https"
server = HTTPServer(app, no_keep_alive=True, server = HTTPServer(app, no_keep_alive=True,
ssl_options={"certfile": https_cert, "keyfile": https_key}) ssl_options={"certfile": https_cert, "keyfile": https_key})
else: else:
protocol = "http" protocol = "http"
server = HTTPServer(app, no_keep_alive=True) server = HTTPServer(app, no_keep_alive=True)
@ -144,6 +148,7 @@ def initWebServer(options={}):
except: except:
pass pass
def shutdown(): def shutdown():
global server global server