From d30851121ea1104eba16564ca66e30c61aee514d Mon Sep 17 00:00:00 2001 From: jabemp <40218184+jabemp@users.noreply.github.com> Date: Sat, 2 Mar 2019 23:54:15 +0100 Subject: [PATCH] Regex update for video/audio codec from MediaInfo MediaInfo output has at some point been changed from "Codec" to "Codec ID". This commit will support both existing and newer versions of MediaInfo output --- MediaInfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaInfo.py b/MediaInfo.py index b11ba3d..3f973ab 100644 --- a/MediaInfo.py +++ b/MediaInfo.py @@ -147,7 +147,7 @@ def _mediainfoGetInfoRegex(self, sourceString) : mediaInfo['haveVideo'] = 1 videoInfo = video.group(0) - videoCodec = re.search("Codec\s*:\s*([\w\_\-\\\/\. ]+)\n", videoInfo, re.S) + videoCodec = re.search("Codec(?:\sID)?\s*:\s*([\w\_\-\\\/\. ]+)\n", videoInfo, re.S) videoCodecProfile = re.search("Codec profile\s*:\s*([\w\_\-\\\/\@\. ]+)\n", videoInfo, re.S) videoDuration = re.search("Duration\s*:\s*(\d+)\.?\d*\n", videoInfo, re.S) videoBitrate = re.search("Bit rate\s*:\s*(\d+)\n", videoInfo, re.S) @@ -181,7 +181,7 @@ def _mediainfoGetInfoRegex(self, sourceString) : mediaInfo['haveAudio'] = 1 audioInfo = audio.group(0) - tmpAudioCodec = re.search("Codec\s*:\s*([\w\_\-\\\/ ]+)\n", audioInfo, re.S) + tmpAudioCodec = re.search("Codec(?:\sID)?\s*:\s*([\w\_\-\\\/ ]+)\n", audioInfo, re.S) audioCodec = re.search("\w+", tmpAudioCodec.group(1), re.S) audioCodecProfile = re.search("Codec profile\s*:\s*([\w\_\-\\\/\@\. ]+)\n", audioInfo, re.S) if audioCodecProfile is None :