From d56dc05372c308c86dcf8a2547563bed02949670 Mon Sep 17 00:00:00 2001 From: Ian Egerton Date: Tue, 2 Jan 2024 13:22:23 +0000 Subject: [PATCH 1/2] Commit c8910efc7db0da8d9ab4909614fdcfd9316ab583 regressed EAC3.Atmos matching Example of string that was previously matched: Movie.2023.2160p.WEB-DL.HEVC.DV.HDR10Plus.EAC3.Atmos.7.1.mkv --- defaults/overlays/audio_codec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/overlays/audio_codec.yml b/defaults/overlays/audio_codec.yml index 4eaaf2f1..3d6993e0 100644 --- a/defaults/overlays/audio_codec.yml +++ b/defaults/overlays/audio_codec.yml @@ -66,7 +66,7 @@ templates: - key: dtsx value: '(?i)\bdts[ ._-]?x\b' - key: plus_atmos - value: '(?i)^(?=.*\b(dd[p+])|(dolby[ ._-]digital[ ._-]plus)|(e[ ._-]?ac3)\b)(?=.*\batmos(\b|\d))' + value: '(?i)^(?=.*\b((dd[p+])|(dolby[ ._-]digital[ ._-]plus)|(e[ ._-]?ac3)\b))(?=.*\batmos(\b|\d))' - key: dolby_atmos value: '(?i)\batmos(\b|\d)' - key: truehd From 4910ae99af282157c36558dc8c8f081e0a9afe9d Mon Sep 17 00:00:00 2001 From: Ian Egerton Date: Tue, 2 Jan 2024 13:46:16 +0000 Subject: [PATCH 2/2] Allow DV/HDR10Plus hybrid matching. Example: Movie.2023.2160p.WEB-DL.HEVC.DV.HDR10Plus.EAC3.Atmos.7.1.mkv matches the HDR10+ Overlay even though Dolby Vision is higher weighed. --- defaults/overlays/resolution.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml index 69eaaa23..7d98270a 100644 --- a/defaults/overlays/resolution.yml +++ b/defaults/overlays/resolution.yml @@ -208,7 +208,7 @@ templates: - alt: plus value: '(?i)\bhdr10(\+|p(lus)?\b)' - alt: dvhdr - value: '(?i)\bdv(.hdr10?\b)' + value: '(?i)\bdv((\.hdr10?\b)|(\.hdr10(\+|p(lus)?\b)))' optional: - all - use_<>