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

only set failed if we can verify corrupt. only try install if make exists.

Browse source
This commit is contained in:
clinton-hall 2014-04-21 21:05:21 +09:30
parent eec3134bdb
commit e24dcade19
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nzbtomedia/__init__.py
View file

@ -284,7 +284,7 @@ def initialize(section=None):
if not (FFMPEG or FFPROBE): if not (FFMPEG or FFPROBE):
# Auto-install FFMPEG and FFPROBE # Auto-install FFMPEG and FFPROBE
if transcoder.install_ffmpeg(): if subprocess.Popen(['which', 'make'], stdout=subprocess.PIPE).communicate()[0].strip() and transcoder.install_ffmpeg():
FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0].strip() FFMPEG = subprocess.Popen(['which', 'ffmpeg'], stdout=subprocess.PIPE).communicate()[0].strip()
FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0].strip() FFPROBE = subprocess.Popen(['which', 'ffprobe'], stdout=subprocess.PIPE).communicate()[0].strip()
else: else:

2
nzbtomedia/transcoder/transcoder.py
View file

@ -20,7 +20,7 @@ def isVideoGood(videofile):
if not nzbtomedia.FFPROBE: if not nzbtomedia.FFPROBE:
logger.error("Cannot detect corrupt video files!, set your ffmpeg_path in your autoProcessMedia.cfg ...", 'TRANSCODER') logger.error("Cannot detect corrupt video files!, set your ffmpeg_path in your autoProcessMedia.cfg ...", 'TRANSCODER')
return False return True
command = [nzbtomedia.FFPROBE, videofile] command = [nzbtomedia.FFPROBE, videofile]
try: try: