From 858ac3af1821990fdf1577c9e64f5e18a17d58d3 Mon Sep 17 00:00:00 2001 From: echel0n Date: Mon, 12 May 2014 11:57:26 -0700 Subject: [PATCH] Test #2000 for season pack fix for BTN --- sickbeard/providers/btn.py | 2 +- sickbeard/search.py | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/sickbeard/providers/btn.py b/sickbeard/providers/btn.py index 2630fdad..d226d657 100644 --- a/sickbeard/providers/btn.py +++ b/sickbeard/providers/btn.py @@ -311,7 +311,7 @@ class BTNCache(tvcache.TVCache): def __init__(self, provider): tvcache.TVCache.__init__(self, provider) - # At least 15 minutes between queries + # At least 15 minutes between queries self.minTime = 15 def updateCache(self): diff --git a/sickbeard/search.py b/sickbeard/search.py index 9ffdd89a..337112a9 100644 --- a/sickbeard/search.py +++ b/sickbeard/search.py @@ -314,6 +314,11 @@ def searchProviders(queueItem, show, season, episodes, seasonSearch=False, manua providers = [x for x in sickbeard.providers.sortedProviderList() if x.isActive()] + if not len(providers): + logger.log(u"No NZB/Torrent providers found or enabled in the sickrage config. Please check your settings.", + logger.ERROR) + return [] + for provider in providers: foundResults = {provider.name:{}} @@ -321,22 +326,16 @@ def searchProviders(queueItem, show, season, episodes, seasonSearch=False, manua curResults = provider.findSearchResults(show, season, episodes, seasonSearch, manualSearch) except exceptions.AuthException, e: logger.log(u"Authentication error: " + ex(e), logger.ERROR) - return [] + continue except Exception, e: logger.log(u"Error while searching " + provider.name + ", skipping: " + ex(e), logger.ERROR) logger.log(traceback.format_exc(), logger.DEBUG) - return [] - - didSearch = True + continue if not len(curResults): continue - curResults = filterSearchResults(show, curResults) - if len(curResults): - foundResults[provider.name] = curResults - logger.log(u"Provider search results: " + repr(foundResults), logger.DEBUG) - + foundResults[provider.name] = filterSearchResults(show, curResults) if not len(foundResults[provider.name]): continue