diff --git a/sickbeard/dailysearcher.py b/sickbeard/dailysearcher.py index 2b30b9488299f949ace1f31a91bbd3fce15484f1..5d5d3d27b39a8a5968345b7fba24a1b2dad66f21 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 b99984e46bedad4a1f206613c874874627a3da7d..5f735e679bff2b312216c087d52651fb96b43e80 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() diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 86117ceb446838a86a1730fb3847fb25332334b9..b6d1d11bcfd9f9e2fe27cce515b8e23adddd1786 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -2206,7 +2206,7 @@ class HomeNews(Home): t.title = "News" t.header = "News" t.topmenu = "news" - t.data = markdown2.markdown(news) + t.data = markdown2.markdown(news if news else "The was a problem connecting to github, please refresh and try again") return t.respond() @@ -2227,7 +2227,7 @@ class HomeChangeLog(Home): t.title = "Changelog" t.header = "Changelog" t.topmenu = "changes" - t.data = markdown2.markdown(changes) + t.data = markdown2.markdown(changes if changes else "The was a problem connecting to github, please refresh and try again") return t.respond()