From 93806b0cd4cdfc610c4ab3646019dc860ac2f4e8 Mon Sep 17 00:00:00 2001 From: yammes08 <111231042+yammes08@users.noreply.github.com> Date: Sun, 25 Jun 2023 20:07:31 +0100 Subject: [PATCH] Add new Criterion Channel Streaming Service - Add new Criterion Channel Streaming Service CF - Add new Criterion Channel Streaming Service CF to relevant guides and tables - Modify existing Criterion Collection CF to only apply to Bluray and Remux releases, and also add an exclusion for the `Criterion` release group --- .../Radarr-collection-of-custom-formats.md | 41 ++++++++---- docs/json/radarr/cf/crit.json | 44 +++++++++++++ docs/json/radarr/cf/criterion-collection.json | 62 ++++++++++++++----- includes/cf/radarr-streaming-services.md | 6 +- 4 files changed, 122 insertions(+), 31 deletions(-) create mode 100644 docs/json/radarr/cf/crit.json diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index a62cf3694..a0ebcb721 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -51,18 +51,19 @@ I also made 3 guides related to this one. |-----------------------------------------------|-----------------------|-------------------------------------------|------------------------| | [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [Remux Tier 01](#remux-tier-01) | [Amazon](#amzn) | | [Remaster](#remaster) | [LQ](#lq) | [Remux Tier 02](#remux-tier-02) | [Apple TV+](#atvp) | -| [4K Remaster](#4k-remaster) | [3D](#3d) | [Remux Tier 03](#remux-tier-03) | [Disney+](#dsnp) | -| [Special Edition](#special-edition) | [x265 (HD)](#x265-hd) | [UHD Bluray Tier 01](#uhd-bluray-tier-01) | [HBO](#hbo) | -| [Criterion Collection](#criterion-collection) | [Upscaled](#upscaled) | [UHD Bluray Tier 02](#uhd-bluray-tier-02) | [HBO Max](#hmax) | -| [Masters of Cinema](#masters-of-cinema) | | [UHD Bluray Tier 03](#uhd-bluray-tier-03) | [Max](#max) | -| [Vinegar Syndrome](#vinegar-syndrome) | | [HD Bluray Tier 01](#hd-bluray-tier-01) | [Hulu](#hulu) | -| [Theatrical Cut](#theatrical-cut) | | [HD Bluray Tier 02](#hd-bluray-tier-02) | [Netflix](#nf) | -| [IMAX](#imax) | | [HD Bluray Tier 03](#hd-bluray-tier-03) | [Peacock TV](#pcok) | -| [IMAX Enhanced](#imax-enhanced) | | [WEB Tier 01](#web-tier-01) | [Paramount+](#pmtp) | -| [Open Matte](#open-matte) | | [WEB Tier 02](#web-tier-02) | [Movies Anywhere](#ma) | -| | | [WEB Tier 03](#web-tier-03) | [Pathe Thuis](#pathe) | +| [4K Remaster](#4k-remaster) | [3D](#3d) | [Remux Tier 03](#remux-tier-03) | [Criterion Channel](#crit) | +| [Special Edition](#special-edition) | [x265 (HD)](#x265-hd) | [UHD Bluray Tier 01](#uhd-bluray-tier-01) | [Disney+](#dsnp) | +| [Criterion Collection](#criterion-collection) | [Upscaled](#upscaled) | [UHD Bluray Tier 02](#uhd-bluray-tier-02) | [HBO](#hbo) | +| [Masters of Cinema](#masters-of-cinema) | | [UHD Bluray Tier 03](#uhd-bluray-tier-03) | [HBO Max](#hmax) | +| [Vinegar Syndrome](#vinegar-syndrome) | | [HD Bluray Tier 01](#hd-bluray-tier-01) | [Max](#max) | +| [Theatrical Cut](#theatrical-cut) | | [HD Bluray Tier 02](#hd-bluray-tier-02) | [Hulu](#hulu) | +| [IMAX](#imax) | | [HD Bluray Tier 03](#hd-bluray-tier-03) | [Netflix](#nf) | +| [IMAX Enhanced](#imax-enhanced) | | [WEB Tier 01](#web-tier-01) | [Peacock TV](#pcok) | +| [Open Matte](#open-matte) | | [WEB Tier 02](#web-tier-02) | [Paramount+](#pmtp) | +| | | [WEB Tier 03](#web-tier-03) | [Movies Anywhere](#ma) | +| | | | [Pathe Thuis](#pathe) | | | | | [Bravia Core](#bcore) | -| | | | [Stan](#stan) | +| | | | [Stan](#stan) | ------ @@ -1665,6 +1666,24 @@ I also made 3 guides related to this one. ------ +### CRiT + +Criterion Channel + +??? question "Criterion Channel - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://en.wikipedia.org/wiki/The_Criterion_Collection#Streaming_as_The_Criterion_Channel){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/crit.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### DSNP Disney+ diff --git a/docs/json/radarr/cf/crit.json b/docs/json/radarr/cf/crit.json new file mode 100644 index 000000000..504430f97 --- /dev/null +++ b/docs/json/radarr/cf/crit.json @@ -0,0 +1,44 @@ +{ + "trash_id": "16622a6911d1ab5d5b8b713d5b0036d4", + "trash_score": "20", + "name": "CRiT", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "CRiT", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": true, + "fields": { + "value": "\\b(CRiT)\\b" + } + }, + { + "name": "WEBDL", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 7 + } + }, + { + "name": "WEBRIP", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 8 + } + }, + { + "name": "Not Criterion RlsGrp", + "implementation": "ReleaseGroupSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(Criterion)$" + } + } + ] +} \ No newline at end of file diff --git a/docs/json/radarr/cf/criterion-collection.json b/docs/json/radarr/cf/criterion-collection.json index 24c679cf0..4e1d51fed 100644 --- a/docs/json/radarr/cf/criterion-collection.json +++ b/docs/json/radarr/cf/criterion-collection.json @@ -3,23 +3,51 @@ "trash_score": "25", "name": "Criterion Collection", "includeCustomFormatWhenRenaming": true, - "specifications": [{ - "name": "Criterion", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "criterion" - } - }, - { - "name": "CC", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\bCC\\b" - } + "specifications": [ + { + "name": "Bluray", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 9 } + }, + { + "name": "DVD", + "implementation": "SourceSpecification", + "negate": false, + "required": false, + "fields": { + "value": 5 + } + }, + { + "name": "Criterion", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Criterion)\\b" + } + }, + { + "name": "CC", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(CC)\\b" + } + }, + { + "name": "Not Criterion RlsGrp", + "implementation": "ReleaseGroupSpecification", + "negate": true, + "required": true, + "fields": { + "value": "^(Criterion)$" + } + } ] } diff --git a/includes/cf/radarr-streaming-services.md b/includes/cf/radarr-streaming-services.md index 66f077f4b..4f73f23c8 100644 --- a/includes/cf/radarr-streaming-services.md +++ b/includes/cf/radarr-streaming-services.md @@ -4,10 +4,11 @@ | [{{ radarr['cf']['amzn']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#amzn) | 0 | {{ radarr['cf']['amzn']['trash_id'] }} | | [{{ radarr['cf']['atvp']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#atvp) | 0 | {{ radarr['cf']['atvp']['trash_id'] }} | | [{{ radarr['cf']['bcore']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bcore) | {{ radarr['cf']['bcore']['trash_score'] }} | {{ radarr['cf']['bcore']['trash_id'] }} | + | [{{ radarr['cf']['crit']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#crit) | {{ radarr['cf']['crit']['trash_score'] }} | {{ radarr['cf']['crit']['trash_id'] }} | | [{{ radarr['cf']['dsnp']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dsnp) | 0 | {{ radarr['cf']['dsnp']['trash_id'] }} | | [{{ radarr['cf']['hbo']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hbo) | 0 | {{ radarr['cf']['hbo']['trash_id'] }} | | [{{ radarr['cf']['hmax']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hmax) | 0 | {{ radarr['cf']['hmax']['trash_id'] }} | - | [{{ radarr['cf']['max']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#max) | 0 | {{ radarr['cf']['max']['trash_id'] }} | + | [{{ radarr['cf']['max']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#max) | 0 | {{ radarr['cf']['max']['trash_id'] }} | | [{{ radarr['cf']['hulu']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hulu) | 0 | {{ radarr['cf']['hulu']['trash_id'] }} | | [{{ radarr['cf']['ma']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#ma) | {{ radarr['cf']['ma']['trash_score'] }} | {{ radarr['cf']['ma']['trash_id'] }} | | [{{ radarr['cf']['nf']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#nf) | 0 | {{ radarr['cf']['nf']['trash_id'] }} | @@ -20,5 +21,4 @@ Breakdown and Why - These reason why these Custom Formats have a score of `0` is because they are mainly used for the naming scheme and other variables should decide for movies if a certain release if preferred. - - `MA` is the only one with a score because of their higher bitrate and quality compared to other streaming services. - - `BCore` are very rare and they have the highest bitrate at the moment. + - `BCore`, `CRiT` and `MA` are the only ones with a score because of their better source material, or higher bitrate and quality compared to other streaming services.