From c039568253c7049844884b7874eee0b881a0110e Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Sat, 28 Jun 2014 14:07:48 +0930 Subject: [PATCH] catch subliminal errors and ruturn success when no new downloads found. --- nzbtomedia/autoProcess/autoProcessMovie.py | 6 +++--- nzbtomedia/nzbToMediaUtil.py | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py index 8507d21b..2022b361 100644 --- a/nzbtomedia/autoProcess/autoProcessMovie.py +++ b/nzbtomedia/autoProcess/autoProcessMovie.py @@ -279,9 +279,9 @@ class autoProcessMovie: logger.postprocess("SUCCESS: Snatched the next highest release ...", section) return 0 else: - logger.postprocess("FAILED: Unable to find a higher ranked release then %s to snatch!" % (inputName), - section) - return 1 + logger.postprocess("SUCCESS: Unable to find a higher ranked release then %s to snatch now. CP will keep searching!" + % (inputName), section) + return 0 # # Added a releease that was not in the wanted list so confirm rename successful by finding this movie media.list. if not release: diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index b4996c17..5b4e04ce 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -881,10 +881,12 @@ def import_subs(filename): return logger.debug("Attempting to download subtitles for %s" %(filename), 'SUBTITLES') - - video = subliminal.scan_video(filename, subtitles=True, embedded_subtitles=True) - subtitles = subliminal.download_best_subtitles([video], languages, hearing_impaired=False) - subliminal.save_subtitles(subtitles) + try: + video = subliminal.scan_video(filename, subtitles=True, embedded_subtitles=True) + subtitles = subliminal.download_best_subtitles([video], languages, hearing_impaired=False) + subliminal.save_subtitles(subtitles) + except: + logger.error("Failed to download subtitles for %s" %(filename), 'SUBTITLES') def backupVersionedFile(old_file, version): numTries = 0