raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Rework mediainfo fix

Browse Source 
Fixes: https://launchpad.net/bugs/1732348
This commit is contained in:
Phill Ridout 2017-11-16 17:17:47 +00:00
parent 3560b27bfb
commit ab810734d8
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
openlp/core/ui/media/vendor/mediainfoWrapper.py vendored
View File

@ -100,34 +100,12 @@ class MediaInfoWrapper(object):
@staticmethod
def parse(filename, environment=ENV_DICT):
if MediaInfoWrapper._version():
format = 'OLDXML'
else:
format = 'XML'
command = ["mediainfo", "-f", "--Output={format}".format(format=format), filename]
fileno_out, fname_out = mkstemp(suffix=".xml", prefix="media-")
fileno_err, fname_err = mkstemp(suffix=".err", prefix="media-")
fp_out = os.fdopen(fileno_out, 'r+b')
fp_err = os.fdopen(fileno_err, 'r+b')
p = Popen(command, stdout=fp_out, stderr=fp_err, env=environment)
p.wait()
fp_out.seek(0)
xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(fp_out.read())
fp_out.close()
fp_err.close()
os.unlink(fname_out)
os.unlink(fname_err)
xml = check_output(['mediainfo', '-f', '--Output=XML', '--Inform=OLDXML', filename])
if not xml.startswith(b'<?xml'):
xml = check_output(['mediainfo', '-f', '--Output=XML', filename])
xml_dom = MediaInfoWrapper.parse_xml_data_into_dom(xml)
return MediaInfoWrapper(xml_dom)
@staticmethod
def _version():
# For now we're only intrested in knowing the new style version (yy.mm)
version_str = check_output(['mediainfo', '--version'])
return re.search(b'\d\d\.\d\d', version_str)
def _populate_tracks(self):
if self.xml_dom is None:
return