monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-01 00:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for daily searches and high cpu usage plus increases search speed

Browse source
This commit is contained in:
echel0n 2014-09-15 01:28:11 -07:00
parent 442631105b
commit 67bd1a9e98
6 changed files with 108 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/tvdb_api/tvdb_api.py
View file

@ -815,7 +815,7 @@ class Tvdb:
self._setShowData(sid, '_actors', cur_actors)
def _getShowData(self, sid, language, seriesSearch=False):
def _getShowData(self, sid, language, getEpInfo=False):
"""Takes a series ID, gets the epInfo URL and parses the TVDB
XML file into the shows dict in layout:
shows[series_id][season_number][episode_number]
@ -854,9 +854,7 @@ class Tvdb:
self._setShowData(sid, k, v)
if seriesSearch:
return True
if getEpInfo:
# Parse banners
if self.config['banners_enabled']:
self._parseBanners(sid)
@ -927,7 +925,7 @@ class Tvdb:
if isinstance(selected_series, dict):
selected_series = [selected_series]
sids = list(int(x['id']) for x in selected_series if
self._getShowData(int(x['id']), self.config['language'], seriesSearch=True))
self._getShowData(int(x['id']), self.config['language']))
self.corrections.update(dict((x['seriesname'], int(x['id'])) for x in selected_series))
return sids
@ -938,7 +936,7 @@ class Tvdb:
if isinstance(key, (int, long)):
# Item is integer, treat as show id
if key not in self.shows:
self._getShowData(key, self.config['language'])
self._getShowData(key, self.config['language'], True)
return self.shows[key]
key = str(key).lower()

10
lib/tvrage_api/tvrage_api.py
View file

@ -577,7 +577,7 @@ class TVRage:
return ui.selectSeries(allSeries)
def _getShowData(self, sid, seriesSearch=False):
def _getShowData(self, sid, getEpInfo=False):
"""Takes a series ID, gets the epInfo URL and parses the TVRAGE
XML file into the shows dict in layout:
shows[series_id][season_number][episode_number]
@ -602,9 +602,7 @@ class TVRage:
self._setShowData(sid, k, v)
# series search ends here
if seriesSearch:
return True
if getEpInfo:
# Parse episode data
log().debug('Getting all episodes of %s' % (sid))
@ -652,7 +650,7 @@ class TVRage:
selected_series = self._getSeries(name)
if isinstance(selected_series, dict):
selected_series = [selected_series]
sids = list(int(x['id']) for x in selected_series if self._getShowData(int(x['id']), seriesSearch=True))
sids = list(int(x['id']) for x in selected_series if self._getShowData(int(x['id'])))
self.corrections.update(dict((x['seriesname'], int(x['id'])) for x in selected_series))
return sids
@ -663,7 +661,7 @@ class TVRage:
if isinstance(key, (int, long)):
# Item is integer, treat as show id
if key not in self.shows:
self._getShowData(key)
self._getShowData(key, True)
return self.shows[key]
key = str(key).lower()

12
sickbeard/dailysearcher.py
View file

@ -50,15 +50,13 @@ class DailySearcher():
sql_l = []
show = None
wantedEp = {}
for sqlEp in sqlResults:
try:
if not show or (show and int(sqlEp["showid"]) != show.indexerid):
if not show or int(sqlEp["showid"]) != show.indexerid:
show = helpers.findCertainShow(sickbeard.showList, int(sqlEp["showid"]))
# build name cache for show
sickbeard.name_cache.buildNameCache(show)
wantedEp[show] = []
except exceptions.MultipleShowObjectsException:
logger.log(u"ERROR: expected to find a single show matching " + sqlEp["showid"])
@ -70,6 +68,7 @@ class DailySearcher():
ep.status = common.SKIPPED
else:
ep.status = common.WANTED
wantedEp[show].append(ep)
sql_l.append(ep.get_sql())
@ -77,8 +76,9 @@ class DailySearcher():
myDB = db.DBConnection()
myDB.mass_action(sql_l)
for show, episode in wantedEp.items():
# queue episode for daily search
dailysearch_queue_item = sickbeard.search_queue.DailySearchQueueItem()
dailysearch_queue_item = sickbeard.search_queue.DailySearchQueueItem(show, episode)
sickbeard.searchQueueScheduler.action.add_item(dailysearch_queue_item)
self.amActive = False

9
sickbeard/providers/generic.py
View file

@ -203,8 +203,13 @@ class GenericProvider:
return True
def searchRSS(self):
return self.cache.findNeededEpisodes()
def searchRSS(self, episode):
results = {}
for ep in episode:
results += self.cache.findNeededEpisodes(ep)
return results
def getQuality(self, item, anime=False):
"""

4
sickbeard/search.py
View file

@ -319,7 +319,7 @@ def isFirstBestMatch(result):
return False
def searchForNeededEpisodes():
def searchForNeededEpisodes(episode):
foundResults = {}
didSearch = False
@ -333,7 +333,7 @@ def searchForNeededEpisodes():
try:
curProvider.cache.updateCache()
curFoundResults = curProvider.searchRSS()
curFoundResults = curProvider.searchRSS(episode)
except exceptions.AuthException, e:
logger.log(u"Authentication error: " + ex(e), logger.ERROR)
continue

29
sickbeard/search_queue.py
View file

@ -92,14 +92,11 @@ class SearchQueue(generic_queue.GenericQueue):
def add_item(self, item):
if isinstance(item, DailySearchQueueItem):
# daily searches
generic_queue.GenericQueue.add_item(self, item)
elif isinstance(item, BacklogQueueItem) and not self.is_in_queue(item.show, item.segment):
if isinstance(item, (DailySearchQueueItem, BacklogQueueItem)) and not self.is_in_queue(item.show, item.segment):
# build name cache for show
sickbeard.name_cache.buildNameCache(item.show)
# backlog searches
# daily and backlog searches
generic_queue.GenericQueue.add_item(self, item)
elif isinstance(item, (ManualSearchQueueItem, FailedQueueItem)) and not self.is_ep_in_queue(item.segment):
# build name cache for show
@ -111,18 +108,20 @@ class SearchQueue(generic_queue.GenericQueue):
logger.log(u"Not adding item, it's already in the queue", logger.DEBUG)
class DailySearchQueueItem(generic_queue.QueueItem):
def __init__(self):
def __init__(self, show, segment):
generic_queue.QueueItem.__init__(self, 'Daily Search', DAILY_SEARCH)
self.show = show
self.segment = segment
def run(self):
generic_queue.QueueItem.run(self)
try:
logger.log("Beginning daily search for new episodes")
foundResults = search.searchForNeededEpisodes()
logger.log("Beginning daily search for: [" + self.show.name + "]")
foundResults = search.searchForNeededEpisodes(segment)
if not len(foundResults):
logger.log(u"No needed episodes found")
logger.log(u"No needed episodes found during daily search for: [" + self.show.name + "]")
else:
for result in foundResults:
# just use the first result for now
@ -152,7 +151,7 @@ class ManualSearchQueueItem(generic_queue.QueueItem):
generic_queue.QueueItem.run(self)
try:
logger.log("Beginning manual search for [" + self.segment.prettyName() + "]")
logger.log("Beginning manual search for: [" + self.segment.prettyName() + "]")
searchResult = search.searchProviders(self.show, [self.segment], True)
if searchResult:
@ -167,7 +166,7 @@ class ManualSearchQueueItem(generic_queue.QueueItem):
ui.notifications.message('No downloads were found',
"Couldn't find a download for <i>%s</i>" % self.segment.prettyName())
logger.log(u"Unable to find a download for " + self.segment.prettyName())
logger.log(u"Unable to find a download for: [" + self.segment.prettyName() + "]")
except Exception:
logger.log(traceback.format_exc(), logger.DEBUG)
@ -191,7 +190,7 @@ class BacklogQueueItem(generic_queue.QueueItem):
generic_queue.QueueItem.run(self)
try:
logger.log("Beginning backlog search for [" + self.show.name + "]")
logger.log("Beginning backlog search for: [" + self.show.name + "]")
searchResult = search.searchProviders(self.show, self.segment, False)
if searchResult:
@ -203,7 +202,7 @@ class BacklogQueueItem(generic_queue.QueueItem):
# give the CPU a break
time.sleep(common.cpu_presets[sickbeard.CPU_PRESET])
else:
logger.log(u"No needed episodes found during backlog search for [" + self.show.name + "]")
logger.log(u"No needed episodes found during backlog search for: [" + self.show.name + "]")
except Exception:
logger.log(traceback.format_exc(), logger.DEBUG)
@ -232,7 +231,7 @@ class FailedQueueItem(generic_queue.QueueItem):
history.logFailed(self.segment, release, provider)
failed_history.revertEpisode(self.segment)
logger.log("Beginning failed download search for [" + self.segment.prettyName() + "]")
logger.log("Beginning failed download search for: [" + self.segment.prettyName() + "]")
searchResult = search.searchProviders(self.show, [self.segment], True)
@ -245,7 +244,7 @@ class FailedQueueItem(generic_queue.QueueItem):
# give the CPU a break
time.sleep(common.cpu_presets[sickbeard.CPU_PRESET])
else:
logger.log(u"No valid episode found to retry for [" + self.segment.prettyName() + "]")
logger.log(u"No valid episode found to retry for: [" + self.segment.prettyName() + "]")
except Exception:
logger.log(traceback.format_exc(), logger.DEBUG)