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

use avprobe. Fixes #503 and don't link single files for NZB. Fixes #519

Browse source
This commit is contained in:
clinton-hall 2014-08-04 11:10:39 +09:30
parent 924b7e12f2
commit 8006d20df4
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nzbtomedia/transcoder/transcoder.py
View file

@ -44,8 +44,12 @@ def getVideoDetails(videofile):
result = 1
if not nzbtomedia.FFPROBE:
return video_details, result
if 'avprobe' in nzbtomedia.FFPROBE:
print_format = '-of'
else:
print_format = '-print_format'
try:
command = [nzbtomedia.FFPROBE, '-v', 'quiet', '-print_format', 'json', '-show_format', '-show_streams', '-show_error', videofile]
command = [nzbtomedia.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', '-show_error', videofile]
proc = subprocess.Popen(command, stdout=subprocess.PIPE)
out, err = proc.communicate()
result = proc.returncode
@ -53,7 +57,7 @@ def getVideoDetails(videofile):
except: pass
if not video_details:
try:
command = [nzbtomedia.FFPROBE, '-v', 'quiet', '-print_format', 'json', '-show_format', '-show_streams', videofile]
command = [nzbtomedia.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', videofile]
proc = subprocess.Popen(command, stdout=subprocess.PIPE)
out, err = proc.communicate()
result = proc.returncode