From 5114b0d81dda307126a7274bf5b87666e2195c6e Mon Sep 17 00:00:00 2001
From: Dustyn Gibson <miigotu@gmail.com>
Date: Fri, 24 Jul 2015 22:51:18 -0700
Subject: [PATCH] Try to fix paused show still downloading
---
sickbeard/dailysearcher.py | 6 ++----
sickbeard/search_queue.py | 33 +++++++++++++++++----------------
2 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/sickbeard/dailysearcher.py b/sickbeard/dailysearcher.py
index 2b30b9488..5d5d3d27b 100644
--- a/sickbeard/dailysearcher.py
+++ b/sickbeard/dailysearcher.py
@@ -70,7 +70,7 @@ class DailySearcher():
show = helpers.findCertainShow(sickbeard.showList, int(sqlEp["showid"]))
# for when there is orphaned series in the database but not loaded into our showlist
- if not show:
+ if not show or show.paused:
continue
except exceptions.MultipleShowObjectsException:
@@ -91,9 +91,7 @@ class DailySearcher():
UpdateWantedList = 0
ep = show.getEpisode(int(sqlEp["season"]), int(sqlEp["episode"]))
with ep.lock:
- if ep.show.paused:
- ep.status = ep.show.default_ep_status
- elif ep.season == 0:
+ if ep.season == 0:
logger.log(u"New episode " + ep.prettyName() + " airs today, setting status to SKIPPED because is a special season")
ep.status = common.SKIPPED
elif sickbeard.TRAKT_USE_ROLLING_DOWNLOAD and sickbeard.USE_TRAKT:
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index b99984e46..5f735e679 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -216,22 +216,23 @@ class BacklogQueueItem(generic_queue.QueueItem):
def run(self):
generic_queue.QueueItem.run(self)
- try:
- logger.log("Beginning backlog search for: [" + self.show.name + "]")
- searchResult = search.searchProviders(self.show, self.segment, False)
-
- if searchResult:
- for result in searchResult:
- # just use the first result for now
- logger.log(u"Downloading " + result.name + " from " + result.provider.name)
- search.snatchEpisode(result)
-
- # 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 + "]")
- except Exception:
- logger.log(traceback.format_exc(), logger.DEBUG)
+ if not self.show.paused:
+ try:
+ logger.log("Beginning backlog search for: [" + self.show.name + "]")
+ searchResult = search.searchProviders(self.show, self.segment, False)
+
+ if searchResult:
+ for result in searchResult:
+ # just use the first result for now
+ logger.log(u"Downloading " + result.name + " from " + result.provider.name)
+ search.snatchEpisode(result)
+
+ # 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 + "]")
+ except Exception:
+ logger.log(traceback.format_exc(), logger.DEBUG)
self.finish()
--
GitLab