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

Fixes all SSL issues

Browse source
This commit is contained in:
echel0n 2014-04-23 10:27:14 -07:00
commit 41e0d10e25
8 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

27
nzbtomedia/autoProcess/autoProcessMusic.py
View file

@ -7,22 +7,20 @@ from nzbtomedia.nzbToMediaUtil import convert_to_ascii, joinPath
from nzbtomedia import logger
class autoProcessMusic:
def get_status(self, baseURL, apikey, dirName):
def get_status(self, url, apikey, dirName):
logger.debug("Attempting to get current status for release:%s" % (os.path.basename(dirName)))
url = baseURL
params = {}
params['apikey'] = apikey
params['cmd'] = "getHistory"
logger.debug("Opening URL: %s" % (url))
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params))
try:
r = requests.get(url, params=params)
except requests.ConnectionError:
r = requests.get(url, params=params, verify=False)
except Exception, e:
logger.error("Unable to open URL")
return None, None
return
try:
result = r.json()
@ -80,21 +78,16 @@ class autoProcessMusic:
params['dir'] = joinPath(remote_path, os.path.basename(os.path.dirname(dirName)))
release_status = self.get_status(url, apikey, dirName)
if release_status:
if release_status not in ["unprocessed", "snatched"]:
logger.warning("%s is marked with a status of %s, skipping ..." % (inputName, release_status),section)
return 0
else:
logger.error("Could not find a status for %s" % (inputName),section)
if not release_status:
logger.error("Could not find a status for %s, is it in the wanted list ?" % (inputName),section)
return 1
logger.debug("Opening URL: %s" % (url),section)
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section)
try:
r = requests.get(url, params=params)
r = requests.get(url, params=params, verify=False)
except requests.ConnectionError:
logger.error("Unable to open URL %s" % (url),section)
logger.error("Unable to open URL %s" % (url) ,section)
return 1 # failure
logger.debug("Result: %s" % (r.text),section)