From 9cd95762328d5125dc346fb4d1bdfdb966b10304 Mon Sep 17 00:00:00 2001 From: echel0n Date: Wed, 21 May 2014 20:12:15 -0700 Subject: [PATCH] Fix for Next Ep airdates. Added check for hidden folders in post-processing. Cleaned up daily search function. --- gui/slick/images/sickrage.png | Bin 6601 -> 6434 bytes sickbeard/dailysearcher.py | 27 ++++++--------------------- sickbeard/processTV.py | 5 ++++- sickbeard/search.py | 2 ++ sickbeard/tv.py | 14 +++++--------- 5 files changed, 17 insertions(+), 31 deletions(-) diff --git a/gui/slick/images/sickrage.png b/gui/slick/images/sickrage.png index b8375544b7bfd479258587877cc195b67ef41644..35ec830e28b1e2e6a2255516b1775e3892f6f8a9 100644 GIT binary patch delta 5652 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 ? AND airdate < ?", - [common.UNAIRED, common.WANTED, fromDate.toordinal(), toDate.toordinal()]) + sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE status in (?,?) AND airdate >= ? AND airdate <= ?", + [common.UNAIRED, common.WANTED, fromDate.toordinal(), curDate.toordinal()]) todaysEps = {} for sqlEp in sqlResults: @@ -87,6 +74,7 @@ class DailySearcher(): ep.status = common.SKIPPED else: if ep.status == common.UNAIRED: + logger.log(u"New episode " + ep.prettyName() + " airs today, setting status to WANTED") ep.status = common.WANTED ep.saveToDB() @@ -97,13 +85,10 @@ class DailySearcher(): else: todaysEps[show].append(ep) - # reset thread name back to original - threading.currentThread().name = origThreadName - if len(todaysEps): for show in todaysEps: segment = todaysEps[show] dailysearch_queue_item = sickbeard.search_queue.DailySearchQueueItem(show, segment) sickbeard.searchQueueScheduler.action.add_item(dailysearch_queue_item) #@UndefinedVariable else: - logger.log(u"Could not find any wanted show episodes going back 1 week at this current time ...") \ No newline at end of file + logger.log(u"Could not find any needed episodes to search for ...") \ No newline at end of file diff --git a/sickbeard/processTV.py b/sickbeard/processTV.py index d1946b43..e4a86375 100644 --- a/sickbeard/processTV.py +++ b/sickbeard/processTV.py @@ -179,6 +179,10 @@ def validateDir(path, dirName, nzbNameOriginal, failed): process_failed(os.path.join(path, dirName), nzbNameOriginal) return False + if helpers.is_hidden_folder(dirName): + returnStr += logHelper(u"Ignoring hidden folder: " + dirName, logger.DEBUG) + return False + # make sure the dir isn't inside a show dir myDB = db.DBConnection() sqlResults = myDB.select("SELECT * FROM tv_shows") @@ -229,7 +233,6 @@ def validateDir(path, dirName, nzbNameOriginal, failed): return False - def unRAR(path, rarFiles, force): global process_result, returnStr diff --git a/sickbeard/search.py b/sickbeard/search.py index f4fcc8e6..af7d8b05 100644 --- a/sickbeard/search.py +++ b/sickbeard/search.py @@ -328,6 +328,8 @@ def searchForNeededEpisodes(episodes): threading.currentThread().name = origThreadName + " :: [" + curProvider.name + "]" try: + logger.log(u"Updating RSS cache ...") + curProvider.cache.updateCache() logger.log(u"Searching RSS cache ...") curFoundResults = curProvider.searchRSS(episodes) except exceptions.AuthException, e: diff --git a/sickbeard/tv.py b/sickbeard/tv.py index a874a0a4..3f3942b4 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -18,15 +18,12 @@ from __future__ import with_statement -import time import os.path import datetime import threading import re import glob -from time import sleep import traceback -import shutil import sickbeard @@ -54,7 +51,6 @@ from common import DOWNLOADED, SNATCHED, SNATCHED_PROPER, SNATCHED_BEST, ARCHIVE UNKNOWN, FAILED from common import NAMING_DUPLICATE, NAMING_EXTEND, NAMING_LIMITED_EXTEND, NAMING_SEPARATED_REPEAT, \ NAMING_LIMITED_EXTEND_E_PREFIXED -from common import cpu_presets class TVShow(object): def __init__(self, indexer, indexerid, lang=""): @@ -858,7 +854,7 @@ class TVShow(object): #Rename dict keys without spaces for DB upsert self.imdb_info = dict( - (k.replace(' ', '_'), f(v) if hasattr(v, 'keys') else v) for k, v in imdb_info.items()) + (k.replace(' ', '_'), k(v) if hasattr(v, 'keys') else v) for k, v in imdb_info.items()) logger.log(str(self.indexerid) + u": Obtained info from IMDb ->" + str(self.imdb_info), logger.DEBUG) def nextEpisode(self): @@ -866,10 +862,10 @@ class TVShow(object): logger.log(str(self.indexerid) + ": Finding the episode which airs next", logger.DEBUG) myDB = db.DBConnection() - innerQuery = "SELECT airdate FROM tv_episodes WHERE showid = ? AND airdate >= ? AND status = ? ORDER BY airdate ASC LIMIT 1" - innerParams = [self.indexerid, datetime.date.today().toordinal(), UNAIRED] - query = "SELECT * FROM tv_episodes WHERE showid = ? AND airdate >= ? AND airdate <= (" + innerQuery + ") and status = ?" - params = [self.indexerid, datetime.date.today().toordinal()] + innerParams + [UNAIRED] + innerQuery = "SELECT airdate FROM tv_episodes WHERE showid = ? AND airdate >= ? AND status in (?,?) ORDER BY airdate ASC LIMIT 1" + innerParams = [self.indexerid, datetime.date.today().toordinal(), UNAIRED, WANTED] + query = "SELECT * FROM tv_episodes WHERE showid = ? AND airdate >= ? AND airdate <= (" + innerQuery + ") and status in (?,?)" + params = [self.indexerid, datetime.date.today().toordinal()] + innerParams + [UNAIRED, WANTED] sqlResults = myDB.select(query, params) if sqlResults == None or len(sqlResults) == 0: