mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-19 21:03:14 -07:00
Bypass for manual execution (#1788)
* no_status_check prevents additional checks. #1192 #1778
This commit is contained in:
parent
de81037d15
commit
bf05f1b4e7
6 changed files with 17 additions and 5 deletions
|
@ -317,6 +317,8 @@ def main(args):
|
||||||
|
|
||||||
if input_directory and input_name and input_hash and input_id:
|
if input_directory and input_name and input_hash and input_id:
|
||||||
result = process_torrent(input_directory, input_name, input_category, input_hash, input_id, client_agent)
|
result = process_torrent(input_directory, input_name, input_category, input_hash, input_id, client_agent)
|
||||||
|
elif core.TORRENT_NO_MANUAL:
|
||||||
|
logger.warning('Invalid number of arguments received from client, and no_manual set')
|
||||||
else:
|
else:
|
||||||
# Perform Manual Post-Processing
|
# Perform Manual Post-Processing
|
||||||
logger.warning('Invalid number of arguments received from client, Switching to manual run mode ...')
|
logger.warning('Invalid number of arguments received from client, Switching to manual run mode ...')
|
||||||
|
|
|
@ -355,6 +355,8 @@
|
||||||
sabnzbd_apikey =
|
sabnzbd_apikey =
|
||||||
###### Enter the default path to your default download directory (non-category downloads). this directory is protected by safe_mode.
|
###### Enter the default path to your default download directory (non-category downloads). this directory is protected by safe_mode.
|
||||||
default_downloadDirectory =
|
default_downloadDirectory =
|
||||||
|
# enable this option to prevent nzbToMedia from running in manual mode and scanning an entire directory.
|
||||||
|
no_manual = 0
|
||||||
|
|
||||||
[Torrent]
|
[Torrent]
|
||||||
###### clientAgent - Supported clients: utorrent, transmission, deluge, rtorrent, vuze, qbittorrent, synods, other
|
###### clientAgent - Supported clients: utorrent, transmission, deluge, rtorrent, vuze, qbittorrent, synods, other
|
||||||
|
@ -398,6 +400,8 @@
|
||||||
chmodDirectory = 0
|
chmodDirectory = 0
|
||||||
resume = 1
|
resume = 1
|
||||||
resumeOnFailure = 1
|
resumeOnFailure = 1
|
||||||
|
# enable this option to prevent TorrentToMedia from running in manual mode and scanning an entire directory.
|
||||||
|
no_manual = 0
|
||||||
|
|
||||||
[Extensions]
|
[Extensions]
|
||||||
compressedExtensions = .zip,.rar,.7z,.gz,.bz,.tar,.arj,.1,.01,.001
|
compressedExtensions = .zip,.rar,.7z,.gz,.bz,.tar,.arj,.1,.01,.001
|
||||||
|
|
|
@ -387,6 +387,12 @@ def process(section, dir_name, input_name=None, status=0, client_agent='manual',
|
||||||
if not release:
|
if not release:
|
||||||
download_id = None # we don't want to filter new releases based on this.
|
download_id = None # we don't want to filter new releases based on this.
|
||||||
|
|
||||||
|
if no_status_check:
|
||||||
|
return ProcessResult(
|
||||||
|
status_code=0,
|
||||||
|
message='{0}: Successfully processed but no change in status confirmed'.format(section),
|
||||||
|
)
|
||||||
|
|
||||||
# we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing.
|
# we will now check to see if CPS has finished renaming before returning to TorrentToMedia and unpausing.
|
||||||
timeout = time.time() + 60 * wait_for
|
timeout = time.time() + 60 * wait_for
|
||||||
while time.time() < timeout: # only wait 2 (default) minutes, then return.
|
while time.time() < timeout: # only wait 2 (default) minutes, then return.
|
||||||
|
@ -466,11 +472,7 @@ def process(section, dir_name, input_name=None, status=0, client_agent='manual',
|
||||||
'{0} does not appear to have changed status after {1} minutes, Please check your logs.'.format(input_name, wait_for),
|
'{0} does not appear to have changed status after {1} minutes, Please check your logs.'.format(input_name, wait_for),
|
||||||
section,
|
section,
|
||||||
)
|
)
|
||||||
if no_status_check:
|
|
||||||
return ProcessResult(
|
|
||||||
status_code=0,
|
|
||||||
message='{0}: Successfully processed but no change in status confirmed'.format(section),
|
|
||||||
)
|
|
||||||
return ProcessResult(
|
return ProcessResult(
|
||||||
status_code=1,
|
status_code=1,
|
||||||
message='{0}: Failed to post-process - No change in status'.format(section),
|
message='{0}: Failed to post-process - No change in status'.format(section),
|
||||||
|
|
|
@ -12,6 +12,7 @@ def configure_nzbs(config):
|
||||||
nzb_config = config['Nzb']
|
nzb_config = config['Nzb']
|
||||||
core.NZB_CLIENT_AGENT = nzb_config['clientAgent'] # sabnzbd
|
core.NZB_CLIENT_AGENT = nzb_config['clientAgent'] # sabnzbd
|
||||||
core.NZB_DEFAULT_DIRECTORY = nzb_config['default_downloadDirectory']
|
core.NZB_DEFAULT_DIRECTORY = nzb_config['default_downloadDirectory']
|
||||||
|
core.NZB_NO_MANUAL = int(nzb_config['no_manual'], 0)
|
||||||
|
|
||||||
configure_sabnzbd(nzb_config)
|
configure_sabnzbd(nzb_config)
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ def configure_torrents(config):
|
||||||
core.TORRENT_CLIENT_AGENT = torrent_config['clientAgent'] # utorrent | deluge | transmission | rtorrent | vuze | qbittorrent | synods | other
|
core.TORRENT_CLIENT_AGENT = torrent_config['clientAgent'] # utorrent | deluge | transmission | rtorrent | vuze | qbittorrent | synods | other
|
||||||
core.OUTPUT_DIRECTORY = torrent_config['outputDirectory'] # /abs/path/to/complete/
|
core.OUTPUT_DIRECTORY = torrent_config['outputDirectory'] # /abs/path/to/complete/
|
||||||
core.TORRENT_DEFAULT_DIRECTORY = torrent_config['default_downloadDirectory']
|
core.TORRENT_DEFAULT_DIRECTORY = torrent_config['default_downloadDirectory']
|
||||||
|
core.TORRENT_NO_MANUAL = int(torrent_config['no_manual'], 0)
|
||||||
|
|
||||||
configure_torrent_linking(torrent_config)
|
configure_torrent_linking(torrent_config)
|
||||||
configure_flattening(torrent_config)
|
configure_flattening(torrent_config)
|
||||||
|
|
|
@ -999,6 +999,8 @@ def main(args, section=None):
|
||||||
elif len(args) > 5 and args[5] == 'generic':
|
elif len(args) > 5 and args[5] == 'generic':
|
||||||
logger.info('Script triggered from generic program')
|
logger.info('Script triggered from generic program')
|
||||||
result = process(args[1], input_name=args[2], input_category=args[3], download_id=args[4])
|
result = process(args[1], input_name=args[2], input_category=args[3], download_id=args[4])
|
||||||
|
elif core.NZB_NO_MANUAL:
|
||||||
|
logger.warning('Invalid number of arguments received from client, and no_manual set')
|
||||||
else:
|
else:
|
||||||
# Perform Manual Post-Processing
|
# Perform Manual Post-Processing
|
||||||
logger.warning('Invalid number of arguments received from client, Switching to manual run mode ...')
|
logger.warning('Invalid number of arguments received from client, Switching to manual run mode ...')
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue