From 661947d46c454214485d3c10bc105d61cae29202 Mon Sep 17 00:00:00 2001 From: clinton-hall Date: Sat, 16 Aug 2014 18:08:36 +0930 Subject: [PATCH] allow nzbget or sabnzbd to report failure. --- nzbtomedia/autoProcess/autoProcessMovie.py | 2 +- nzbtomedia/autoProcess/autoProcessTV.py | 2 +- nzbtomedia/nzbToMediaUtil.py | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/nzbtomedia/autoProcess/autoProcessMovie.py b/nzbtomedia/autoProcess/autoProcessMovie.py index bb039f7c..de251076 100644 --- a/nzbtomedia/autoProcess/autoProcessMovie.py +++ b/nzbtomedia/autoProcess/autoProcessMovie.py @@ -251,7 +251,7 @@ class autoProcessMovie: else: logger.postprocess("FAILED DOWNLOAD DETECTED FOR %s" % (inputName), section) if failureLink: - reportNzb(failureLink) + reportNzb(failureLink, clientAgent) if delete_failed and os.path.isdir(dirName) and not os.path.dirname(dirName) == dirName: logger.postprocess("Deleting failed files and folder %s" % dirName, section) diff --git a/nzbtomedia/autoProcess/autoProcessTV.py b/nzbtomedia/autoProcess/autoProcessTV.py index e10e893a..c8602a56 100644 --- a/nzbtomedia/autoProcess/autoProcessTV.py +++ b/nzbtomedia/autoProcess/autoProcessTV.py @@ -205,7 +205,7 @@ class autoProcessTV: logger.postprocess("SUCCESS: The download succeeded, sending a post-process request", section) else: if failureLink: - reportNzb(failureLink) + reportNzb(failureLink, clientAgent) if fork in nzbtomedia.SICKBEARD_FAILED or section == "NzbDrone": logger.postprocess("FAILED: The download failed. Sending 'failed' process request to %s branch" % (fork), section) else: diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index c21145bd..f709c804 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -22,12 +22,16 @@ from nzbtomedia.utorrent.client import UTorrentClient from nzbtomedia.transmissionrpc.client import Client as TransmissionClient from nzbtomedia import logger, nzbToMediaDB -def reportNzb(failure_link): +def reportNzb(failure_link, clientAgent): # Contact indexer site logger.info("Sending failure notification to indexer site") - headers = None - try: + if clientAgent == 'nzbget': headers = {'User-Agent' : 'NZBGet / nzbToMedia.py'} + elif clientAgent == 'sabnzbd': + headers = {'User-Agent' : 'SABnzbd / nzbToMedia.py'} + else: + return + try: r = requests.post(failure_link, headers=headers) except requests.ConnectionError: logger.error("Unable to open URL %s" % failure_link)