diff --git a/CHANGES.md b/CHANGES.md index 4797e458..008170b6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,11 +20,12 @@ * Add Unknown status query to Episode Status Management * Fix Episode Status Management error popup from coming up when show is selected without expanding * Add BET network logo -* Change redirect from home to showlistView on changing Layout on showlistView +* Remove unused force variable from code and PEP8 [develop changelog] * Fix traceback error when using the menu item Manage/Update Kodi * Change BET network logo filename to lower case +* Change redirect from home to showlistView on changing Layout on showlistView ### 0.7.0 (2015-02-23 11:02:00 UTC) diff --git a/sickbeard/autoPostProcesser.py b/sickbeard/autoPostProcesser.py index 689d3c15..b043fb4e 100644 --- a/sickbeard/autoPostProcesser.py +++ b/sickbeard/autoPostProcesser.py @@ -19,26 +19,21 @@ import os.path import sickbeard - -from sickbeard import logger +from sickbeard import logger, processTV from sickbeard import encodingKludge as ek -from sickbeard import processTV class PostProcesser(): - def run(self, force=False): + @staticmethod + def run(): if not ek.ek(os.path.isdir, sickbeard.TV_DOWNLOAD_DIR): - logger.log(u"Automatic post-processing attempted but dir " + sickbeard.TV_DOWNLOAD_DIR + " doesn't exist", + logger.log(u"Automatic post-processing attempted but dir %s doesn't exist" % sickbeard.TV_DOWNLOAD_DIR, logger.ERROR) return if not ek.ek(os.path.isabs, sickbeard.TV_DOWNLOAD_DIR): - logger.log( - u"Automatic post-processing attempted but dir " + sickbeard.TV_DOWNLOAD_DIR + " is relative (and probably not what you really want to process)", - logger.ERROR) + logger.log(u'Automatic post-processing attempted but dir %s is relative ' + '(and probably not what you really want to process)' % sickbeard.TV_DOWNLOAD_DIR, logger.ERROR) return - processTV.processDir(sickbeard.TV_DOWNLOAD_DIR) - - def __del__(self): - pass + processTV.processDir(sickbeard.TV_DOWNLOAD_DIR) \ No newline at end of file diff --git a/sickbeard/properFinder.py b/sickbeard/properFinder.py index 926e0657..f72a6d2f 100644 --- a/sickbeard/properFinder.py +++ b/sickbeard/properFinder.py @@ -39,7 +39,7 @@ class ProperFinder(): def __init__(self): self.amActive = False - def run(self, force=False): + def run(self): if not sickbeard.DOWNLOAD_PROPERS: return diff --git a/sickbeard/scheduler.py b/sickbeard/scheduler.py index ccf5bbfc..3e3e70b0 100644 --- a/sickbeard/scheduler.py +++ b/sickbeard/scheduler.py @@ -77,7 +77,7 @@ class Scheduler(threading.Thread): if not self.silent: logger.log(u"Starting new thread: " + self.name, logger.DEBUG) - self.action.run(self.force) + self.action.run() except Exception, e: logger.log(u"Exception generated in thread " + self.name + ": " + ex(e), logger.ERROR) logger.log(repr(traceback.format_exc()), logger.DEBUG) diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py index 335ae34b..bc5c06c2 100644 --- a/sickbeard/searchBacklog.py +++ b/sickbeard/searchBacklog.py @@ -187,7 +187,7 @@ class BacklogSearcher: myDB.action("UPDATE info SET last_backlog=" + str(when)) - def run(self, force=False): + def run(self): try: self.searchBacklog() except: diff --git a/sickbeard/searchRecent.py b/sickbeard/searchRecent.py index dcaf1315..eb05fe3a 100644 --- a/sickbeard/searchRecent.py +++ b/sickbeard/searchRecent.py @@ -37,7 +37,7 @@ class RecentSearcher(): self.lock = threading.Lock() self.amActive = False - def run(self, force=False): + def run(self): self.amActive = True