moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-11 03:45:01 -05:00
Code Issues Releases Wiki Activity

Merge pull request #728 from rogierhelmer/dev

Browse Source 
Scene exception list not updated, Double show names in scene excep list after manual scan
This commit is contained in:
echel0n 2014-08-17 17:59:31 -07:00
commit 69b5b3a251
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sickbeard/scene_exceptions.py
View File

@ -256,11 +256,17 @@ def update_scene_exceptions(indexer_id, scene_exceptions, season=-1):
""" """
Given a indexer_id, and a list of all show scene exceptions, update the db. Given a indexer_id, and a list of all show scene exceptions, update the db.
""" """
global exceptionsCache
myDB = db.DBConnection('cache.db') myDB = db.DBConnection('cache.db')
myDB.action('DELETE FROM scene_exceptions WHERE indexer_id=?', [indexer_id]) myDB.action('DELETE FROM scene_exceptions WHERE indexer_id=?', [indexer_id])
logger.log(u"Updating scene exceptions", logger.MESSAGE) logger.log(u"Updating scene exceptions", logger.MESSAGE)
# A change has been made to the scene exception list. Let's clear the cache, to make this visible
if indexer_id in exceptionsCache:
exceptionsCache[indexer_id] = {}
exceptionsCache[indexer_id][season] = scene_exceptions
for cur_exception in scene_exceptions: for cur_exception in scene_exceptions:
if not isinstance(cur_exception, unicode): if not isinstance(cur_exception, unicode):
@ -316,7 +322,7 @@ def _xem_exceptions_fetcher():
def getSceneSeasons(indexer_id): def getSceneSeasons(indexer_id):
"""get a list of season numbers that have scene excpetions """get a list of season numbers that have scene exceptions
""" """
myDB = db.DBConnection('cache.db') myDB = db.DBConnection('cache.db')
seasons = myDB.select("SELECT DISTINCT season FROM scene_exceptions WHERE indexer_id = ?", [indexer_id]) seasons = myDB.select("SELECT DISTINCT season FROM scene_exceptions WHERE indexer_id = ?", [indexer_id])

4
sickbeard/show_name_helpers.py
View File

@ -259,10 +259,10 @@ def allPossibleShowNames(show, season=-1):
Returns: a list of all the possible show names Returns: a list of all the possible show names
""" """
showNames = get_scene_exceptions(show.indexerid, season=season) showNames = get_scene_exceptions(show.indexerid, season=season)[:]
if not showNames: # if we dont have any season specific exceptions fallback to generic exceptions if not showNames: # if we dont have any season specific exceptions fallback to generic exceptions
season = -1 season = -1
showNames = get_scene_exceptions(show.indexerid, season=season) showNames = get_scene_exceptions(show.indexerid, season=season)[:]
if season in [-1, 1]: if season in [-1, 1]:
showNames.append(show.name) showNames.append(show.name)

2
sickbeard/webserve.py
View File

@ -556,7 +556,7 @@ def _getEpisode(show, season=None, episode=None, absolute=None):
return "Invalid show paramaters" return "Invalid show paramaters"
if absolute: if absolute:
epObj = showObj.getEpisode(absolute=int(absolute)) epObj = showObj.getEpisode(absolute_number=int(absolute))
elif season and episode: elif season and episode:
epObj = showObj.getEpisode(int(season), int(episode)) epObj = showObj.getEpisode(int(season), int(episode))
else: else: