Refactor transcoder configuration

This commit is contained in:
Labrys of Knossos 2019-01-19 12:19:54 -05:00
commit 2d0b5e706b

View file

@ -581,50 +581,49 @@ def configure_containers():
META_CONTAINER = META_CONTAINER.split(',') META_CONTAINER = META_CONTAINER.split(',')
def initialize(section=None): def configure_transcoder():
global NZBGET_POSTPROCESS_ERROR, NZBGET_POSTPROCESS_NONE, NZBGET_POSTPROCESS_PAR_CHECK, NZBGET_POSTPROCESS_SUCCESS, \ global GETSUBS
NZBTOMEDIA_TIMEOUT, FORKS, FORK_DEFAULT, FORK_FAILED_TORRENT, FORK_FAILED, SHOWEXTRACT, \ global TRANSCODE
NZBTOMEDIA_BRANCH, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, SYS_ARGV, \ global DUPLICATE
SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, \ global CONCAT
VLEVEL, \ global IGNOREEXTENSIONS
SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, SEVENZIP, CONCAT, VCRF, \ global OUTPUTFASTSTART
__INITIALIZED__, APP_FILENAME, USER_DELAY, APP_NAME, TRANSCODE, DEFAULTS, \ global GENERALOPTS
SYS_ENCODING, \ global OUTPUTQUALITYPERCENT
DUPLICATE, IGNOREEXTENSIONS, VEXTENSION, OUTPUTVIDEOPATH, PROCESSOUTPUT, VCODEC, VCODEC_ALLOW, VPRESET, \ global OUTPUTVIDEOPATH
VFRAMERATE, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, FAILED, \ global PROCESSOUTPUT
ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \ global ALANGUAGE
SINCLUDE, SUBSDIR, SCODEC, OUTPUTFASTSTART, OUTPUTQUALITYPERCENT, BURN, GETSUBS, HWACCEL, \ global AINCLUDE
FFMPEG, FFPROBE, EXT_CONTAINER, TORRENT_CLASS, \ global SLANGUAGES
PASSWORDS_FILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \ global SINCLUDE
USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOAD_INFO, \ global SEXTRACT
PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \ global SEMBED
PAR2CMD global SUBSDIR
global VEXTENSION
if __INITIALIZED__: global VCODEC
return False global VPRESET
global VFRAMERATE
configure_logging() global VBITRATE
configure_process() global VRESOLUTION
configure_locale() global VCRF
global VLEVEL
# init logging global VCODEC_ALLOW
logger.ntm_log_instance.init_logging() global ACODEC
global ACODEC_ALLOW
configure_migration() global ACHANNELS
configure_logging_part_2() global ABITRATE
global ACODEC2
# initialize the main SB database global ACODEC2_ALLOW
main_db.upgrade_database(main_db.DBConnection(), databases.InitialSchema) global ACHANNELS2
global ABITRATE2
configure_general() global ACODEC3
configure_updates() global ACODEC3_ALLOW
configure_wake_on_lan() global ACHANNELS3
configure_nzbs() global ABITRATE3
configure_torrents() global SCODEC
configure_remote_paths() global BURN
configure_plex() global HWACCEL
configure_niceness() global ALLOWSUBS
configure_containers()
GETSUBS = int(CFG['Transcoder']['getSubs']) GETSUBS = int(CFG['Transcoder']['getSubs'])
TRANSCODE = int(CFG['Transcoder']['transcode']) TRANSCODE = int(CFG['Transcoder']['transcode'])
@ -906,6 +905,49 @@ def initialize(section=None):
extra = [item for item in codec_alias[codec] if item not in ACODEC3_ALLOW] extra = [item for item in codec_alias[codec] if item not in ACODEC3_ALLOW]
ACODEC3_ALLOW.extend(extra) ACODEC3_ALLOW.extend(extra)
def initialize(section=None):
global NZBGET_POSTPROCESS_ERROR, NZBGET_POSTPROCESS_NONE, NZBGET_POSTPROCESS_PAR_CHECK, NZBGET_POSTPROCESS_SUCCESS, \
NZBTOMEDIA_TIMEOUT, FORKS, FORK_DEFAULT, FORK_FAILED_TORRENT, FORK_FAILED, SHOWEXTRACT, \
NZBTOMEDIA_BRANCH, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, SYS_ARGV, \
SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, \
SECTIONS, ALL_FORKS, TEST_FILE, SEVENZIP, \
__INITIALIZED__, APP_FILENAME, USER_DELAY, APP_NAME, DEFAULTS, \
SYS_ENCODING, \
FAILED, \
FFMPEG, FFPROBE, EXT_CONTAINER, TORRENT_CLASS, \
PASSWORDS_FILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \
USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOAD_INFO, \
PID_FILE, MYAPP, \
PAR2CMD
if __INITIALIZED__:
return False
configure_logging()
configure_process()
configure_locale()
# init logging
logger.ntm_log_instance.init_logging()
configure_migration()
configure_logging_part_2()
# initialize the main SB database
main_db.upgrade_database(main_db.DBConnection(), databases.InitialSchema)
configure_general()
configure_updates()
configure_wake_on_lan()
configure_nzbs()
configure_torrents()
configure_remote_paths()
configure_plex()
configure_niceness()
configure_containers()
configure_transcoder()
PASSWORDS_FILE = CFG['passwords']['PassWordFile'] PASSWORDS_FILE = CFG['passwords']['PassWordFile']
# Setup FFMPEG, FFPROBE and SEVENZIP locations # Setup FFMPEG, FFPROBE and SEVENZIP locations