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

Merge pull request #1074 from clinton-hall/issue-1071

Browse source 
Apply fix #1071 to TorrentToMedia as well
This commit is contained in:
Labrys of Knossos 2016-06-22 01:48:23 -04:00 • committed by GitHub
commit 7ea8f3b848
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TorrentToMedia.py
View file

@ -318,18 +318,20 @@ def main(args):
(os.path.basename(dirName))) (os.path.basename(dirName)))
core.DOWNLOADINFO = core.get_downloadInfo(os.path.basename(dirName), 0) core.DOWNLOADINFO = core.get_downloadInfo(os.path.basename(dirName), 0)
if core.DOWNLOADINFO: if core.DOWNLOADINFO:
clientAgent = text_type(core.DOWNLOADINFO[0].get('client_agent', 'manual'))
inputHash = text_type(core.DOWNLOADINFO[0].get('input_hash', ''))
inputID = text_type(core.DOWNLOADINFO[0].get('input_id', ''))
logger.info("Found download info for {0}, " logger.info("Found download info for {0}, "
"setting variables now ...".format(os.path.basename(dirName))) "setting variables now ...".format(os.path.basename(dirName)))
else: else:
logger.info('Unable to locate download info for {0}, ' logger.info('Unable to locate download info for {0}, '
'continuing to try and process this release ...'.format 'continuing to try and process this release ...'.format
(os.path.basename(dirName))) (os.path.basename(dirName)))
clientAgent = 'manual'
inputHash = ''
inputID = ''
clientAgent = text_type(core.DOWNLOADINFO[0].get('client_agent', '')) if clientAgent.lower() not in core.TORRENT_CLIENTS:
inputHash = text_type(core.DOWNLOADINFO[0].get('input_hash', ''))
inputID = text_type(core.DOWNLOADINFO[0].get('input_id', ''))
if clientAgent and clientAgent.lower() not in core.TORRENT_CLIENTS:
continue continue
try: try:
@ -343,7 +345,7 @@ def main(args):
pass pass
results = processTorrent(dirName, inputName, subsection, inputHash or None, inputID or None, results = processTorrent(dirName, inputName, subsection, inputHash or None, inputID or None,
clientAgent or 'manual') clientAgent)
if results[0] != 0: if results[0] != 0:
logger.error("A problem was reported when trying to perform a manual run for {0}:{1}.".format logger.error("A problem was reported when trying to perform a manual run for {0}:{1}.".format
(section, subsection)) (section, subsection))

6
nzbToMedia.py
View file

@ -753,13 +753,13 @@ def main(args, section=None):
logger.info("Found download info for {0}, " logger.info("Found download info for {0}, "
"setting variables now ...".format "setting variables now ...".format
(os.path.basename(dirName))) (os.path.basename(dirName)))
clientAgent = text_type(core.DOWNLOADINFO[0].get('client_agent', '')) clientAgent = text_type(core.DOWNLOADINFO[0].get('client_agent', 'manual'))
download_id = text_type(core.DOWNLOADINFO[0].get('input_id', '')) download_id = text_type(core.DOWNLOADINFO[0].get('input_id', ''))
else: else:
logger.info('Unable to locate download info for {0}, ' logger.info('Unable to locate download info for {0}, '
'continuing to try and process this release ...'.format 'continuing to try and process this release ...'.format
(os.path.basename(dirName))) (os.path.basename(dirName)))
clientAgent = '' clientAgent = 'manual'
download_id = '' download_id = ''
if clientAgent and clientAgent.lower() not in core.NZB_CLIENTS: if clientAgent and clientAgent.lower() not in core.NZB_CLIENTS:
@ -775,7 +775,7 @@ def main(args, section=None):
except UnicodeError: except UnicodeError:
pass pass
results = process(dirName, inputName, 0, clientAgent=clientAgent or 'manual', results = process(dirName, inputName, 0, clientAgent=clientAgent,
download_id=download_id or None, inputCategory=subsection) download_id=download_id or None, inputCategory=subsection)
if results[0] != 0: if results[0] != 0:
logger.error("A problem was reported when trying to perform a manual run for {0}:{1}.".format logger.error("A problem was reported when trying to perform a manual run for {0}:{1}.".format