diff --git a/custom_formats/CRAV.yml b/custom_formats/CRAV.yml index 9041504..ee9eddc 100644 --- a/custom_formats/CRAV.yml +++ b/custom_formats/CRAV.yml @@ -7,12 +7,7 @@ conditions: - name: CRAV Regex negate: false pattern: Crave - required: false - type: release_title -- name: CRAV Rename Regex - negate: false - pattern: Crave Rename - required: false + required: true type: release_title - name: WEB-DL negate: false diff --git a/regex_patterns/Crave Rename.yml b/regex_patterns/Crave Rename.yml deleted file mode 100644 index 44c5c16..0000000 --- a/regex_patterns/Crave Rename.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Crave Rename -pattern: \[(CRAV)\b|\b(CRAV)\] -description: Crave (originally CraveTV) is a Canadian subscription video on demand - service. The service competes directly with other subscription-based over-the-top - streaming services operating in Canada, primarily against American-based services. - The service features Bell Media original programming, exclusive Canadian access - to programming acquired from several U.S. television and streaming services, and - various theatrically-released films. Crave's major programming supplier is Warner - Bros. Discovery (HBO / Max and Warner Bros. films). Starz, offered in partnership - with Lionsgate. -tags: -- Streaming Service -- WEB-DL -tests: -- id: 1 - input: The CRAV Accountant 2 2025 2160p CRAV WEB-DL DD+ 5.1 Atmos DV H.265-FLUX - expected: true -- id: 2 - input: The CRAVE Accountant 2 2025 2160p CRAVE WEBRIP DD+ 5.1 Atmos DV H.265-FLUX - expected: true -- id: 3 - input: The.CRAV.Accountant.2.2025.2160p.CRAV.WEBDL.DD+.5.1.Atmos.DV.H.265-FLUX - expected: true -- id: 4 - input: 'Star Trek: Picard CRAV S03 2160p CRAV WEB-DL DTS-HD MA 5.1 H.265-FLUX' - expected: true -- id: 5 - input: 'Star Trek: Picard CRAVE S03 2160p CRAVE WEBRIP DTS-HD MA 5.1 H.265-FLUX' - expected: true -- id: 6 - input: The.Terminal.List.Dark.CRAV.S01E04.THE.SOUND.OF.CRAV.2160p.CRAV.WEB-DL.DDP5.1.HDR.H.265-FLUX.mkv - expected: true -- id: 7 - input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAVE.WEBRIP.DDP5.1.HDR.H.265-FLUX.mkv - expected: true -- id: 8 - input: The.Terminal.List.Dark.CRAV.S01E04.THE.SOUND.OF.CRAV.2160p.CRAVE.WEBDL.DDP5.1.HDR.H.265-FLUX.mkv - expected: true diff --git a/regex_patterns/Crave.yml b/regex_patterns/Crave.yml index b7c2764..b142518 100644 --- a/regex_patterns/Crave.yml +++ b/regex_patterns/Crave.yml @@ -1,5 +1,5 @@ name: Crave -pattern: \b(CRAV(E)?)\b[ ._-]web[ ._-]?(dl|rip)?\b +pattern: \b(?:CRAV|(?:CRAVE)(?=\s*.(?:WEB-?DL|WEBRIP)))\b description: Crave (originally CraveTV) is a Canadian subscription video on demand service. The service competes directly with other subscription-based over-the-top streaming services operating in Canada, primarily against American-based services. @@ -13,26 +13,26 @@ tags: - WEB-DL tests: - id: 1 - input: The CRAV Accountant 2 2025 2160p CRAV WEB-DL DD+ 5.1 Atmos DV H.265-FLUX + input: The CRAVE Accountant 2 2025 2160p CRAV WEB-DL DD+ 5.1 Atmos DV H.265-FLUX expected: true - id: 2 - input: The CRAVE Accountant 2 2025 2160p CRAVE WEBRIP DD+ 5.1 Atmos DV H.265-FLUX + input: The CRAVE Accountant 2 2025 2160p CRAV WEBRIP DD+ 5.1 Atmos DV H.265-FLUX expected: true - id: 3 - input: The.CRAV.Accountant.2.2025.2160p.CRAV.WEBDL.DD+.5.1.Atmos.DV.H.265-FLUX + input: The.CRAVE.Accountant.2.2025.2160p.CRAVE.WEBDL.DD+.5.1.Atmos.DV.H.265-FLUX expected: true - id: 4 - input: 'Star Trek: Picard CRAV S03 2160p CRAV WEB-DL DTS-HD MA 5.1 H.265-FLUX' + input: 'Star Trek: Picard CRAVE S03 2160p CRAV WEB-DL DTS-HD MA 5.1 H.265-FLUX' expected: true - id: 5 input: 'Star Trek: Picard CRAVE S03 2160p CRAVE WEBRIP DTS-HD MA 5.1 H.265-FLUX' expected: true - id: 6 - input: The.Terminal.List.Dark.CRAV.S01E04.THE.SOUND.OF.CRAV.2160p.CRAV.WEB-DL.DDP5.1.HDR.H.265-FLUX.mkv + input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAV.WEB-DL.DDP5.1.HDR.H.265-FLUX.mkv expected: true - id: 7 - input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAVE.WEBRIP.DDP5.1.HDR.H.265-FLUX.mkv + input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAV.WEBRIP.DDP5.1.HDR.H.265-FLUX.mkv expected: true - id: 8 - input: The.Terminal.List.Dark.CRAV.S01E04.THE.SOUND.OF.CRAV.2160p.CRAVE.WEBDL.DDP5.1.HDR.H.265-FLUX.mkv + input: The.Terminal.List.Dark.CRAVE.S01E04.THE.SOUND.OF.CRAVE.2160p.CRAVE.WEBDL.DDP5.1.HDR.H.265-FLUX.mkv expected: true