From 72dc12e2489d240839a216041ffe47e9dd128b0f Mon Sep 17 00:00:00 2001 From: plotski Date: Sat, 22 Oct 2022 17:11:56 +0200 Subject: [PATCH] fix(audio_codec): detect "E-AC-3" and "AC-3" --- guessit/config/options.json | 4 ++-- guessit/test/rules/audio_codec.yml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/guessit/config/options.json b/guessit/config/options.json index 3539cf9c..a5a00d2d 100644 --- a/guessit/config/options.json +++ b/guessit/config/options.json @@ -55,10 +55,10 @@ "audio_codec": { "MP3": {"string": ["MP3", "LAME"],"regex": ["LAME(?:\\d)+-?(?:\\d)+"]}, "MP2": "MP2", - "Dolby Digital": {"string": ["Dolby", "DolbyDigital"], "regex": ["Dolby-Digital", "DD", "AC3D?"]}, + "Dolby Digital": {"string": ["Dolby", "DolbyDigital"], "regex": ["Dolby-Digital", "DD", "AC-?3D?"]}, "Dolby Atmos": {"string": ["Atmos"], "regex": ["Dolby-?Atmos"]}, "AAC": "AAC", - "Dolby Digital Plus": ["EAC3", "DDP", "DD+"], + "Dolby Digital Plus": {"string": ["DDP", "DD+"], "regex": ["E-?AC-?3"]}, "FLAC": "Flac", "DTS": "DTS", "DTS-HD": {"regex": ["DTS-?HD", "DTS(?=-?MA)"], "conflict_solver": "lambda match, other: other if other.name == 'audio_codec' else '__default__'"}, diff --git a/guessit/test/rules/audio_codec.yml b/guessit/test/rules/audio_codec.yml index 1c78efc5..6c937b83 100644 --- a/guessit/test/rules/audio_codec.yml +++ b/guessit/test/rules/audio_codec.yml @@ -15,11 +15,15 @@ ? +DD ? +Dolby Digital ? +AC3 +? +AC-3 : audio_codec: Dolby Digital ? +DDP ? +DD+ ? +EAC3 +? +EAC-3 +? +E-AC-3 +? +E-AC3 : audio_codec: Dolby Digital Plus ? +DolbyAtmos