From 651650f83b9128e68a3e8cd008cf060779058806 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Sun, 11 Oct 2015 09:53:03 +1030 Subject: [PATCH] don't update plex on failed. Fixes #846 --- core/__init__.py | 3 ++- core/autoProcess/autoProcessMovie.py | 1 + core/autoProcess/autoProcessTV.py | 1 + core/nzbToMediaUtil.py | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/__init__.py b/core/__init__.py index 8fcfad28..06f170c9 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -73,6 +73,7 @@ LOG_DB = None LOG_ENV = None LOG_GIT = None SYS_ENCODING = None +FAILED = False AUTO_UPDATE = None NZBTOMEDIA_VERSION = None @@ -208,7 +209,7 @@ def initialize(section=None): __INITIALIZED__, AUTO_UPDATE, APP_FILENAME, USER_DELAY, APP_NAME, TRANSCODE, DEFAULTS, GIT_PATH, GIT_USER, \ GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENTAGENT, SABNZBDHOST, SABNZBDPORT, SABNZBDAPIKEY, \ DUPLICATE, IGNOREEXTENSIONS, VEXTENSION, OUTPUTVIDEOPATH, PROCESSOUTPUT, VCODEC, VCODEC_ALLOW, VPRESET, \ - VFRAMERATE, LOG_DB, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, \ + VFRAMERATE, LOG_DB, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, FAILED, \ ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \ SINCLUDE, SUBSDIR, SCODEC, OUTPUTFASTSTART, OUTPUTQUALITYPERCENT, BURN, GETSUBS, HWACCEL, LOG_DIR, LOG_FILE, \ NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS, \ diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index e3b54873..dfab6f32 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -256,6 +256,7 @@ class autoProcessMovie: return [1, "%s: Failed to post-process - Server did not return success" % (section) ] else: + core.FAILED = True logger.postprocess("FAILED DOWNLOAD DETECTED FOR %s" % (inputName), section) if failureLink: reportNzb(failureLink, clientAgent) diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index 67194b9f..f0507365 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -229,6 +229,7 @@ class autoProcessTV: if status == 0: logger.postprocess("SUCCESS: The download succeeded, sending a post-process request", section) else: + core.FAILED = True if failureLink: reportNzb(failureLink, clientAgent) if fork in core.SICKBEARD_FAILED: diff --git a/core/nzbToMediaUtil.py b/core/nzbToMediaUtil.py index c5f3b050..21f76870 100644 --- a/core/nzbToMediaUtil.py +++ b/core/nzbToMediaUtil.py @@ -1062,6 +1062,8 @@ def server_responding(baseURL): return False def plex_update(category): + if core.FAILED: + return if core.PLEXSSL: url = 'https://' else: