From 32c3815475da2aff4a3408ab6254512f83679abc Mon Sep 17 00:00:00 2001 From: santiagosayshey Date: Sat, 11 Jan 2025 23:36:41 +1050 Subject: [PATCH] tweak(regex): Optional seperator between TrueHDA and 7.1 --- custom_formats/Atmos (Missing).yml | 34 ++++++++++++++++++++++++++++-- custom_formats/Atmos.yml | 22 +++++++++++++++++-- regex_patterns/BTN Atmos.yml | 20 +++++++++++++----- 3 files changed, 67 insertions(+), 9 deletions(-) diff --git a/custom_formats/Atmos (Missing).yml b/custom_formats/Atmos (Missing).yml index 7888c55..1a385b7 100644 --- a/custom_formats/Atmos (Missing).yml +++ b/custom_formats/Atmos (Missing).yml @@ -55,7 +55,7 @@ tests: expected: false id: 1 input: House.of.the.Dragon.S01.DV.2160p.BluRay.Remux.TrueHDA7.1.H.265-TekMUX - lastRun: '2025-01-11T22:46:33.711966' + lastRun: '2025-01-11T23:15:56.334239' passes: true - conditionResults: - matches: true @@ -85,5 +85,35 @@ tests: expected: false id: 2 input: House of the Dragon S01 UHD BluRay 2160p TrueHD Atmos 7.1 DV HEVC REMUX-FraMeSToR - lastRun: '2025-01-11T22:46:33.711966' + lastRun: '2025-01-11T23:15:56.334239' + passes: true +- conditionResults: + - matches: false + name: Not Atmos + negate: true + pattern: Atmos + required: true + type: release_title + - matches: true + name: 7.1 Surround + negate: false + pattern: 7.1 Surround + required: true + type: release_title + - matches: true + name: TrueHD + negate: false + pattern: TrueHD + required: true + type: release_title + - matches: true + name: Not Atmos (BTN) + negate: true + pattern: BTN Atmos + required: true + type: release_title + expected: false + id: 3 + input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI + lastRun: '2025-01-11T23:15:56.334239' passes: true diff --git a/custom_formats/Atmos.yml b/custom_formats/Atmos.yml index e332eae..0f2a0e5 100644 --- a/custom_formats/Atmos.yml +++ b/custom_formats/Atmos.yml @@ -32,7 +32,7 @@ tests: expected: true id: 1 input: House.of.the.Dragon.S01.DV.2160p.BluRay.Remux.TrueHDA7.1.H.265-TekMUX - lastRun: '2025-01-11T22:46:02.520761' + lastRun: '2025-01-11T23:15:49.211241' passes: true - conditionResults: - matches: true @@ -50,5 +50,23 @@ tests: expected: true id: 2 input: "\t House of the Dragon S01 UHD BluRay 2160p TrueHD Atmos 7.1 DV HEVC REMUX-FraMeSToR" - lastRun: '2025-01-11T22:46:02.520761' + lastRun: '2025-01-11T23:15:49.211241' + passes: true +- conditionResults: + - matches: false + name: Atmos + negate: false + pattern: Atmos + required: false + type: release_title + - matches: true + name: Atmos (BTN Standard) + negate: false + pattern: BTN Atmos + required: false + type: release_title + expected: true + id: 3 + input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI + lastRun: '2025-01-11T23:15:49.211241' passes: true diff --git a/regex_patterns/BTN Atmos.yml b/regex_patterns/BTN Atmos.yml index 6f9d42a..3f89665 100644 --- a/regex_patterns/BTN Atmos.yml +++ b/regex_patterns/BTN Atmos.yml @@ -1,12 +1,12 @@ name: BTN Atmos -pattern: \bTrue[ .-]?HDA[57].1|DDPA[57].1\b +pattern: \bTrue[ .-]?HDA[ .-]?[57]\.1|DDPA[57]\.1\b description: Matches BroadcastTheNet Atmos naming convention tags: [] tests: - expected: true id: 1 input: The.Last.of.Us.S01.2160p.UHD.BluRay.Remux.TrueHDA7.1.H.265-PmP - lastRun: '2025-01-06T15:05:19.738290' + lastRun: '2025-01-11T23:15:36.540509' matchSpan: end: 52 start: 42 @@ -16,7 +16,7 @@ tests: - expected: false id: 2 input: The.Last.of.Us.S01.UHD.BluRay.2160p.TrueHD.Atmos.7.1.DV.HEVC.REMUX-FraMeSToR - lastRun: '2025-01-06T15:05:19.738290' + lastRun: '2025-01-11T23:15:36.540509' matchSpan: null matchedContent: null matchedGroups: [] @@ -24,7 +24,7 @@ tests: - expected: false id: 3 input: The Last of Us S01 2160p MAX WEB-DL DDP 5.1 Atmos DV HDR H.265-FLUX - lastRun: '2025-01-06T15:05:19.738290' + lastRun: '2025-01-11T23:15:36.540509' matchSpan: null matchedContent: null matchedGroups: [] @@ -32,10 +32,20 @@ tests: - expected: true id: 4 input: The.Last.of.Us.S01.DV.HDR.2160p.MAX.WEB-DL.DDPA5.1.H.265-FLUX - lastRun: '2025-01-06T15:05:19.738290' + lastRun: '2025-01-11T23:15:36.540509' matchSpan: end: 50 start: 43 matchedContent: DDPA5.1 matchedGroups: [] passes: true +- expected: true + id: 5 + input: Loki.S01.2160p.UHD.BluRay.Remux.TrueHDA.7.1.H.265-SiCFoI + lastRun: '2025-01-11T23:15:36.540509' + matchSpan: + end: 43 + start: 32 + matchedContent: TrueHDA.7.1 + matchedGroups: [] + passes: true