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

add sys path config to find executables not in path. Fixes #830

Browse source
This commit is contained in:
clinton-hall 2019-02-25 19:53:54 +13:00
commit 27cfc34577
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autoProcessMedia.cfg.spec
View file

@ -22,6 +22,8 @@
log_env = 0 log_env = 0
# Enable/Disable logging git output to debug nzbtomedia.log (helpful to track down update failures.) # Enable/Disable logging git output to debug nzbtomedia.log (helpful to track down update failures.)
log_git = 0 log_git = 0
# Set to the directory to search for executables if not in default system path
sys_path =
# Set to the directory where your ffmpeg/ffprobe executables are located # Set to the directory where your ffmpeg/ffprobe executables are located
ffmpeg_path = ffmpeg_path =
# Enable/Disable media file checking using ffprobe. # Enable/Disable media file checking using ffprobe.

5
core/__init__.py
View file

@ -191,6 +191,7 @@ GETSUBS = False
TRANSCODE = None TRANSCODE = None
CONCAT = None CONCAT = None
FFMPEG_PATH = None FFMPEG_PATH = None
SYS_PATH = None
DUPLICATE = None DUPLICATE = None
IGNOREEXTENSIONS = [] IGNOREEXTENSIONS = []
VEXTENSION = None VEXTENSION = None
@ -352,6 +353,7 @@ def configure_general():
global GIT_BRANCH global GIT_BRANCH
global FORCE_CLEAN global FORCE_CLEAN
global FFMPEG_PATH global FFMPEG_PATH
global SYS_PATH
global CHECK_MEDIA global CHECK_MEDIA
global SAFE_MODE global SAFE_MODE
global NOEXTRACTFAILED global NOEXTRACTFAILED
@ -364,6 +366,7 @@ def configure_general():
GIT_BRANCH = CFG['General']['git_branch'] or 'master' GIT_BRANCH = CFG['General']['git_branch'] or 'master'
FORCE_CLEAN = int(CFG['General']['force_clean']) FORCE_CLEAN = int(CFG['General']['force_clean'])
FFMPEG_PATH = CFG['General']['ffmpeg_path'] FFMPEG_PATH = CFG['General']['ffmpeg_path']
SYS_PATH = CFG['General']['sys_path']
CHECK_MEDIA = int(CFG['General']['check_media']) CHECK_MEDIA = int(CFG['General']['check_media'])
SAFE_MODE = int(CFG['General']['safe_mode']) SAFE_MODE = int(CFG['General']['safe_mode'])
NOEXTRACTFAILED = int(CFG['General']['no_extract_failed']) NOEXTRACTFAILED = int(CFG['General']['no_extract_failed'])
@ -1016,6 +1019,8 @@ def configure_utility_locations():
logger.warning('Install ffmpeg with x264 support to enable this feature ...') logger.warning('Install ffmpeg with x264 support to enable this feature ...')
else: else:
if SYS_PATH:
sys.path.append(SYS_PATH)
try: try:
SEVENZIP = subprocess.Popen(['which', '7z'], stdout=subprocess.PIPE).communicate()[0].strip().decode() SEVENZIP = subprocess.Popen(['which', '7z'], stdout=subprocess.PIPE).communicate()[0].strip().decode()
except Exception: except Exception: