monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed tornado async features, testing to see if this resolves blank page and other related possible issues.

Browse source 
Removed double call to get_scene_exceptions when displaying shows.
This commit is contained in:
echel0n 2014-06-20 16:49:57 -07:00
parent a2a44eae85
commit 2f73ab1e41
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sickbeard/webserve.py
View file

@ -160,7 +160,7 @@ class MainHandler(RequestHandler):
if status_code == 404: if status_code == 404:
self.redirect('/home/') self.redirect('/home/')
elif status_code == 401: elif status_code == 401:
self.finish(self.http_error_401_handler()) self.write(self.http_error_401_handler())
else: else:
super(MainHandler, self).write_error(status_code, **kwargs) super(MainHandler, self).write_error(status_code, **kwargs)
@ -211,21 +211,13 @@ class MainHandler(RequestHandler):
self._transforms = [] self._transforms = []
super(MainHandler, self).redirect(sickbeard.WEB_ROOT + url, permanent, status) super(MainHandler, self).redirect(sickbeard.WEB_ROOT + url, permanent, status)
@asynchronous
@gen.engine
def get(self, *args, **kwargs): def get(self, *args, **kwargs):
response = yield gen.Task(self.getresponse, self._dispatch) response = self._dispatch()
self.finish(response) self.write(response)
@asynchronous
@gen.engine
def post(self, *args, **kwargs): def post(self, *args, **kwargs):
response = yield gen.Task(self.getresponse, self._dispatch) response = self._dispatch()
self.finish(response) self.write(response)
def getresponse(self, func, callback):
response = func()
callback(response)
def robots_txt(self, *args, **kwargs): def robots_txt(self, *args, **kwargs):
""" Keep web crawlers out """ """ Keep web crawlers out """
@ -3363,8 +3355,6 @@ class Home(MainHandler):
if showObj is None: if showObj is None:
return _genericMessage("Error", "Show not in show list") return _genericMessage("Error", "Show not in show list")
showObj.exceptions = scene_exceptions.get_scene_exceptions(showObj.indexerid)
with db.DBConnection() as myDB: with db.DBConnection() as myDB:
seasonResults = myDB.select( seasonResults = myDB.select(
"SELECT DISTINCT season FROM tv_episodes WHERE showid = ? ORDER BY season desc", "SELECT DISTINCT season FROM tv_episodes WHERE showid = ? ORDER BY season desc",
@ -3472,9 +3462,11 @@ class Home(MainHandler):
t.epCounts = epCounts t.epCounts = epCounts
t.epCats = epCats t.epCats = epCats
showObj.exceptions = scene_exceptions.get_scene_exceptions(showObj.indexerid)
indexerid = int(showObj.indexerid) indexerid = int(showObj.indexerid)
indexer = int(showObj.indexer) indexer = int(showObj.indexer)
t.all_scene_exceptions = get_scene_exceptions(indexerid) t.all_scene_exceptions = showObj.exceptions
t.scene_numbering = get_scene_numbering_for_show(indexerid, indexer) t.scene_numbering = get_scene_numbering_for_show(indexerid, indexer)
t.xem_numbering = get_xem_numbering_for_show(indexerid, indexer) t.xem_numbering = get_xem_numbering_for_show(indexerid, indexer)
t.scene_absolute_numbering = get_scene_absolute_numbering_for_show(indexerid, indexer) t.scene_absolute_numbering = get_scene_absolute_numbering_for_show(indexerid, indexer)