From b478b0af0256a14123008a1e0b6271a062fc25bf Mon Sep 17 00:00:00 2001 From: Deluan Date: Mon, 3 May 2021 21:26:44 -0400 Subject: [PATCH] FIx ffmpeg output regex too rigid --- scanner/metadata/ffmpeg.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scanner/metadata/ffmpeg.go b/scanner/metadata/ffmpeg.go index 810e7aeb..2d84bb3d 100644 --- a/scanner/metadata/ffmpeg.go +++ b/scanner/metadata/ffmpeg.go @@ -67,10 +67,10 @@ var ( durationRx = regexp.MustCompile(`^\s\sDuration: ([\d.:]+).*bitrate: (\d+)`) // Stream #0:0: Audio: mp3, 44100 Hz, stereo, fltp, 192 kb/s - bitRateRx = regexp.MustCompile(`^\s{2,4}Stream #0:0: (Audio):.*, (\d+) kb/s`) + bitRateRx = regexp.MustCompile(`^\s{2,4}Stream #\d+:\d+: (Audio):.*, (\d+) kb/s`) // Stream #0:1: Video: mjpeg, yuvj444p(pc, bt470bg/unknown/unknown), 600x600 [SAR 1:1 DAR 1:1], 90k tbr, 90k tbn, 90k tbc` - coverRx = regexp.MustCompile(`^\s{2,4}Stream #0:1: (Video):.*`) + coverRx = regexp.MustCompile(`^\s{2,4}Stream #\d+:\d+: (Video):.*`) ) func (e *ffmpegExtractor) parseOutput(output string) map[string]string {