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

fixes for user-script #1643

Browse source
This commit is contained in:
clinton-hall 2019-08-03 11:56:53 +12:00
commit 1ec83ae98e
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TorrentToMedia.py
View file

@ -111,7 +111,8 @@ def process_torrent(input_directory, input_name, input_category, input_hash, inp
torrent_no_link = int(section.get('Torrent_NoLink', 0)) torrent_no_link = int(section.get('Torrent_NoLink', 0))
keep_archive = int(section.get('keep_archive', 0)) keep_archive = int(section.get('keep_archive', 0))
extract = int(section.get('extract', 0)) extract = int(section.get('extract', 0))
extensions = section.get('user_script_mediaExtensions', '').lower().split(',') extensions = section.get('user_script_mediaExtensions', '')
print(extensions)
unique_path = int(section.get('unique_path', 1)) unique_path = int(section.get('unique_path', 1))
if client_agent != 'manual': if client_agent != 'manual':

14
core/user_scripts.py
View file

@ -14,6 +14,10 @@ import core
from core import logger, transcoder from core import logger, transcoder
from core.plugins.subtitles import import_subs from core.plugins.subtitles import import_subs
from core.utils import list_media_files, remove_dir from core.utils import list_media_files, remove_dir
from core.auto_process.common import (
ProcessResult,
)
def external_script(output_destination, torrent_name, torrent_label, settings): def external_script(output_destination, torrent_name, torrent_label, settings):
@ -29,7 +33,10 @@ def external_script(output_destination, torrent_name, torrent_label, settings):
core.USER_SCRIPT = settings.get('user_script_path') core.USER_SCRIPT = settings.get('user_script_path')
if not core.USER_SCRIPT or core.USER_SCRIPT == 'None': # do nothing and return success. if not core.USER_SCRIPT or core.USER_SCRIPT == 'None': # do nothing and return success.
return [0, ''] return ProcessResult(
status_code=0,
message='',
)
try: try:
core.USER_SCRIPT_PARAM = settings['user_script_param'] core.USER_SCRIPT_PARAM = settings['user_script_param']
if isinstance(core.USER_SCRIPT_PARAM, str): if isinstance(core.USER_SCRIPT_PARAM, str):
@ -122,4 +129,7 @@ def external_script(output_destination, torrent_name, torrent_label, settings):
elif core.USER_SCRIPT_CLEAN == int(1) and num_files_new != 0: elif core.USER_SCRIPT_CLEAN == int(1) and num_files_new != 0:
logger.info('{0} files were processed, but {1} still remain. outputDirectory will not be cleaned.'.format( logger.info('{0} files were processed, but {1} still remain. outputDirectory will not be cleaned.'.format(
num_files, num_files_new)) num_files, num_files_new))
return [final_result, ''] return ProcessResult(
status_code=final_result,
message='',
)