moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2025-01-11 22:08:02 -05:00
Code Issues Releases Wiki Activity

Fixes issue #327

Browse Source
This commit is contained in:
echel0n 2014-05-03 17:22:33 -07:00
parent a2a608ed85
commit b4627af3d2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sickbeard/tv.py
View File

@ -385,6 +385,7 @@ class TVShow(object):
curSeason = int(curResult["season"]) curSeason = int(curResult["season"])
curEpisode = int(curResult["episode"]) curEpisode = int(curResult["episode"])
if curSeason not in cachedSeasons: if curSeason not in cachedSeasons:
try: try:
cachedSeasons[curSeason] = cachedShow[curSeason] cachedSeasons[curSeason] = cachedShow[curSeason]
@ -1301,9 +1302,9 @@ class TVEpisode(object):
# if either setting has changed return true, if not return false # if either setting has changed return true, if not return false
return oldhasnfo != self.hasnfo or oldhastbn != self.hastbn return oldhasnfo != self.hasnfo or oldhastbn != self.hastbn
def specifyEpisode(self, season, episode, scene_season, scene_episode): def specifyEpisode(self, season, episode, scene_season=None, scene_episode=None):
sqlResult = self.loadFromDB(season, episode, scene_season, scene_episode) sqlResult = self.loadFromDB(season, episode)
if not sqlResult: if not sqlResult:
# only load from NFO if we didn't load from DB # only load from NFO if we didn't load from DB
@ -1346,7 +1347,7 @@ class TVEpisode(object):
self.season, self.season,
self.episode) self.episode)
def loadFromDB(self, season, episode, scene_season, scene_episode): def loadFromDB(self, season, episode):
logger.log( logger.log(
str(self.show.indexerid) + u": Loading episode details from DB for episode " + str(season) + "x" + str( str(self.show.indexerid) + u": Loading episode details from DB for episode " + str(season) + "x" + str(
@ -1369,8 +1370,8 @@ class TVEpisode(object):
self.season = season self.season = season
self.episode = episode self.episode = episode
self.scene_season = scene_season self.scene_season = sqlResults[0]["scene_season"]
self.scene_episode = scene_episode self.scene_episode = sqlResults[0]["scene_episode"]
self.description = sqlResults[0]["description"] self.description = sqlResults[0]["description"]
if not self.description: if not self.description:
self.description = "" self.description = ""