0x2620/python-ox
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

decode stdout

Browse source
This commit is contained in:
j 2016-08-23 18:11:20 +02:00
parent f54cb4160e
commit 164a71ed51
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ox/file.py
View file

@ -168,11 +168,11 @@ def avinfo(filename, cached=True):
p = subprocess.Popen([ffmpeg2theora, '--info', filename], p = subprocess.Popen([ffmpeg2theora, '--info', filename],
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, error = p.communicate() stdout, error = p.communicate()
stdout = stdout.decode('utf-8')
try: try:
info = json.loads(stdout) info = json.loads(stdout)
except: except:
# remove metadata, can be broken # remove metadata, can be broken
stdout = stdout.decode('utf-8')
reg = re.compile('"metadata": {.*?},', re.DOTALL) reg = re.compile('"metadata": {.*?},', re.DOTALL)
stdout = re.sub(reg, '', stdout) stdout = re.sub(reg, '', stdout)
info = json.loads(stdout) info = json.loads(stdout)
@ -214,6 +214,7 @@ def ffprobe(filename):
], stdout=subprocess.PIPE, stderr=subprocess.PIPE) ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
info, error = p.communicate() info, error = p.communicate()
info = info.decode('utf-8')
ffinfo = json.loads(info) ffinfo = json.loads(info)
def fix_value(key, value): def fix_value(key, value):