github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 21:33:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

check for CHD in NZBDrone and return. Fixes #485, Fixes #572, Fixes #568

Browse source
This commit is contained in:
clinton-hall 2014-09-25 16:29:57 +09:30
commit c00975e3cc
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
nzbtomedia/autoProcess/autoProcessTV.py
View file

@ -31,6 +31,23 @@ class autoProcessTV:
pass pass
return missing return missing
def CDH(self, url2, headers):
r = None
try:
r = requests.get(url2, params={}, headers=headers, stream=True, verify=False)
except requests.ConnectionError:
logger.error("Unable to open URL: %s" % (url2), section)
return False
if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]:
logger.error("Server returned status %s" % (str(r.status_code)), section)
return False
else:
try:
res = json.loads(r.content)
return res["enableCompletedDownloadHandling"]
except:
return False
def processEpisode(self, section, dirName, inputName=None, failed=False, clientAgent = "manual", inputCategory=None, failureLink=None): def processEpisode(self, section, dirName, inputName=None, failed=False, clientAgent = "manual", inputCategory=None, failureLink=None):
host = nzbtomedia.CFG[section][inputCategory]["host"] host = nzbtomedia.CFG[section][inputCategory]["host"]
port = nzbtomedia.CFG[section][inputCategory]["port"] port = nzbtomedia.CFG[section][inputCategory]["port"]
@ -230,6 +247,7 @@ class autoProcessTV:
elif section == "NzbDrone": elif section == "NzbDrone":
url = "%s%s:%s%s/api/command" % (protocol, host, port, web_root) url = "%s%s:%s%s/api/command" % (protocol, host, port, web_root)
url1 = "%s%s:%s%s/api/missing" % (protocol, host, port, web_root) url1 = "%s%s:%s%s/api/missing" % (protocol, host, port, web_root)
url2 = "%s%s:%s%s/api/config/downloadClient" % (protocol, host, port, web_root)
headers = {"X-Api-Key": apikey} headers = {"X-Api-Key": apikey}
params = {'sortKey': 'series.title', 'page': 1, 'pageSize': 1, 'sortDir': 'asc'} params = {'sortKey': 'series.title', 'page': 1, 'pageSize': 1, 'sortDir': 'asc'}
if remote_path: if remote_path:
@ -245,6 +263,9 @@ class autoProcessTV:
r = None r = None
r = requests.get(url, auth=(username, password), params=fork_params, stream=True, verify=False) r = requests.get(url, auth=(username, password), params=fork_params, stream=True, verify=False)
elif section == "NzbDrone": elif section == "NzbDrone":
if self.CDH(url2, headers) and clientAgent in ['sabnzbd', 'nzbget']:
logger.debug("Complete DownLoad Handling is enabled. Passing back to %s." % (section), section)
return [0, "%s: Complete DownLoad Handling is enabled. Passing back to %s" % (section, section) ]
start_numMissing = self.numMissing(url1, params, headers) # get current number of outstanding eppisodes. start_numMissing = self.numMissing(url1, params, headers) # get current number of outstanding eppisodes.
logger.debug("Opening URL: %s with data: %s" % (url, str(data)), section) logger.debug("Opening URL: %s with data: %s" % (url, str(data)), section)
r = None r = None