monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-03-01 18:35:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted episode cache changes

Browse source
This commit is contained in:
echel0n 2014-06-11 07:16:24 -07:00
parent 013f9a2134
commit 44358ef601
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sickbeard/tv.py
View file

@ -24,7 +24,6 @@ import threading
import re import re
import glob import glob
import traceback import traceback
import weakref
import sickbeard import sickbeard
@ -53,7 +52,7 @@ from common import DOWNLOADED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, ARCHIVE
from common import NAMING_DUPLICATE, NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_SEPARATED_REPEAT, \ from common import NAMING_DUPLICATE, NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_SEPARATED_REPEAT, \
NAMING_LIMITED_EXTEND_E_PREFIXED NAMING_LIMITED_EXTEND_E_PREFIXED
episodeCache = {}
class TVShow(object): class TVShow(object):
def __init__(self, indexer, indexerid, lang=""): def __init__(self, indexer, indexerid, lang=""):
@ -90,7 +89,7 @@ class TVShow(object):
self.lock = threading.Lock() self.lock = threading.Lock()
self._isDirGood = False self._isDirGood = False
#self.episodes = {} self.episodes = {}
otherShow = helpers.findCertainShow(sickbeard.showList, self.indexerid) otherShow = helpers.findCertainShow(sickbeard.showList, self.indexerid)
if otherShow != None: if otherShow != None:
@ -145,12 +144,11 @@ class TVShow(object):
# delete references to anything that's not in the internal lists # delete references to anything that's not in the internal lists
def flushEpisodes(self): def flushEpisodes(self):
global episodeCache
for curSeason in episodeCache: for curSeason in self.episodes:
for curEp in episodeCache[curSeason]: for curEp in self.episodes[curSeason]:
myEp = episodeCache[curSeason][curEp] myEp = self.episodes[curSeason][curEp]
episodeCache[curSeason][curEp] = None self.episodes[curSeason][curEp] = None
del myEp del myEp
def getAllEpisodes(self, season=None, has_location=False): def getAllEpisodes(self, season=None, has_location=False):
@ -223,10 +221,10 @@ class TVShow(object):
logger.DEBUG) logger.DEBUG)
return None return None
if not season in episodeCache: if not season in self.episodes:
episodeCache[season] = {} self.episodes[season] = {}
if not episode in episodeCache[season] or episodeCache[season][episode] is None: if not episode in self.episodes[season] or self.episodes[season][episode] is None:
if noCreate: if noCreate:
return None return None
@ -249,9 +247,9 @@ class TVShow(object):
season, episode) season, episode)
if ep != None: if ep != None:
episodeCache[season][episode] = ep self.episodes[season][episode] = ep
epObj = episodeCache[season][episode] epObj = self.episodes[season][episode]
return epObj return epObj
def should_update(self, update_date=datetime.date.today()): def should_update(self, update_date=datetime.date.today()):
@ -1818,7 +1816,6 @@ class TVEpisode(object):
return result return result
def deleteEpisode(self): def deleteEpisode(self):
global episodeCache
logger.log(u"Deleting " + self.show.name + " " + str(self.season) + "x" + str(self.episode) + " from the DB", logger.log(u"Deleting " + self.show.name + " " + str(self.season) + "x" + str(self.episode) + " from the DB",
logger.DEBUG) logger.DEBUG)
@ -1826,7 +1823,7 @@ class TVEpisode(object):
# remove myself from the show dictionary # remove myself from the show dictionary
if self.show.getEpisode(self.season, self.episode, noCreate=True) == self: if self.show.getEpisode(self.season, self.episode, noCreate=True) == self:
logger.log(u"Removing myself from my show's list", logger.DEBUG) logger.log(u"Removing myself from my show's list", logger.DEBUG)
del episodeCache[self.season][self.episode] del self.show.episodes[self.season][self.episode]
# delete myself from the DB # delete myself from the DB
logger.log(u"Deleting myself from the database", logger.DEBUG) logger.log(u"Deleting myself from the database", logger.DEBUG)