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

Load script before returning. Fixes #475

Browse source
This commit is contained in:
Clinton Hall 2014-07-11 06:01:27 +09:30
commit 984aeb77bc
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nzbtomedia/nzbToMediaUserScript.py
View file

@ -6,8 +6,6 @@ from nzbtomedia.nzbToMediaUtil import import_subs, listMediaFiles
from nzbtomedia import logger from nzbtomedia import logger
def external_script(outputDestination, torrentName, torrentLabel, settings): def external_script(outputDestination, torrentName, torrentLabel, settings):
if nzbtomedia.USER_SCRIPT is None or nzbtomedia.USER_SCRIPT == "None": # do nothing and return success.
return 0
final_result = 0 # start at 0. final_result = 0 # start at 0.
num_files = 0 num_files = 0
try: try:
@ -19,6 +17,8 @@ def external_script(outputDestination, torrentName, torrentLabel, settings):
nzbtomedia.USER_SCRIPT = settings["user_script_path"] nzbtomedia.USER_SCRIPT = settings["user_script_path"]
except: except:
nzbtomedia.USER_SCRIPT = None nzbtomedia.USER_SCRIPT = None
if nzbtomedia.USER_SCRIPT is None or nzbtomedia.USER_SCRIPT == "None": # do nothing and return success.
return 0
try: try:
nzbtomedia.USER_SCRIPT_PARAM = settings["user_script_param"] nzbtomedia.USER_SCRIPT_PARAM = settings["user_script_param"]
if isinstance(nzbtomedia.USER_SCRIPT_PARAM, str): nzbtomedia.USER_SCRIPT_PARAM = nzbtomedia.USER_SCRIPT_PARAM.split(',') if isinstance(nzbtomedia.USER_SCRIPT_PARAM, str): nzbtomedia.USER_SCRIPT_PARAM = nzbtomedia.USER_SCRIPT_PARAM.split(',')