From 2ecedfa108d4c50274eafd3819cbc6ac34734721 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Tue, 6 Sep 2022 19:47:16 -0500 Subject: [PATCH 1/5] fix missing anchor for v1 anime --- docs/Sonarr/sonarr-collection-of-custom-formats.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 7e4534d26..43e1bfb2e 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -81,7 +81,7 @@ I also made 3 guides related to this one. | --------------------------------------------------------------------------- | --------------------------------------------------------------------- | ------------------------------------- | | [Anime BD Tier 01 (Top SeaDex Muxers)](#anime-bd-tier-01-top-seadex-muxers) | [Anime Web Tier 01 (Muxers)](#anime-web-tier-01-muxers) | [Uncensored](#uncensored) | | [Anime BD Tier 02 (SeaDex Muxers)](#anime-bd-tier-02-seadex-muxers) | [Anime Web Tier 02 (Top FanSubs)](#anime-web-tier-02-top-fansubs) | [v0](#v0) | -| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers) | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease) | [v1](v1) | +| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers) | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease) | [v1](#v1) | | [Anime BD Tier 04 (SeaDex Muxers)](#anime-bd-tier-04-seadex-muxers) | [Anime Web Tier 04 (Official Subs)](#anime-web-tier-04-official-subs) | [v2](#v2) | | [Anime BD Tier 05 (Remuxes)](#anime-bd-tier-05-remuxes) | [Anime Web Tier 05 (FanSubs)](#anime-web-tier-05-fansubs) | [v3](#v3) | | [Anime BD Tier 06 (FanSubs)](#anime-bd-tier-06-fansubs) | [Anime Web Tier 06 (FanSubs)](#anime-web-tier-06-fansubs) | [v4](#v4) | From aca78cb1c852d7e859df0a6be1fdacd844c02bc4 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 7 Sep 2022 21:24:20 +0200 Subject: [PATCH 2/5] [Backend] consistent naming across CF - Changed: link repack-proper to repackproper to be consistent with `/` being removed by markdown --- .../Radarr-collection-of-custom-formats.md | 6 ++--- docs/Radarr/Radarr-setup-custom-formats.md | 2 +- .../sonarr-collection-of-custom-formats.md | 26 +++++++++---------- docs/Sonarr/sonarr-setup-custom-formats.md | 2 +- includes/cf/radarr-misc.md | 4 +-- includes/cf/sonarr-misc.md | 4 +-- .../merge-quality/radarr-current-logic.md | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 6fc01f651..ea059d55b 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -18,7 +18,7 @@ I also made 3 guides related to this one. I also suggest to change the Propers and Repacks settings in Radarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](#repackproper) Custom Format. ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png) @@ -64,7 +64,7 @@ I also made 3 guides related to this one. | Misc | Optional |   |   | | ------------------------------------- | ----------------------------------- | ------ | ------ | -| [Repack/Proper](#repack-proper) | [EVO (no WEBDL)](#evo-no-webdl) |   |   | +| [Repack/Proper](#repackproper) | [EVO (no WEBDL)](#evo-no-webdl) |   |   | | [Repack2](#repack2) | [No-RlsGroup](#no-rlsgroup) |   |   | | [Multi](#multi) | [Obfuscated](#obfuscated) |   |   | | [x264](#x264) | [Retags](#retags) |   |   | @@ -1066,7 +1066,7 @@ I also made 3 guides related to this one. ------ -### Repack Proper +### Repack/Proper ??? example "JSON - [CLICK TO EXPAND]" diff --git a/docs/Radarr/Radarr-setup-custom-formats.md b/docs/Radarr/Radarr-setup-custom-formats.md index f69756353..c13521b9c 100644 --- a/docs/Radarr/Radarr-setup-custom-formats.md +++ b/docs/Radarr/Radarr-setup-custom-formats.md @@ -251,7 +251,7 @@ Use the following main settings in your profile. I also suggest to change the Propers and Repacks settings in Radarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Radarr/Radarr-collection-of-custom-formats/#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Radarr/Radarr-collection-of-custom-formats/#repackproper) Custom Format. ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png) diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 43e1bfb2e..52407b1d8 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -16,7 +16,7 @@ I also made 3 guides related to this one. I also suggest to change the Propers and Repacks settings in Sonarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](#repackproper) Custom Format. ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png) @@ -64,16 +64,16 @@ I also made 3 guides related to this one. ------ -| Misc | Optional |   |   | -| ------------------------------- | ----------------------------------- | ------ | ------ | -| [FreeLeech](#freeleech) | [Season Packs](#season-pack) |   |   | -| [MPEG2](#mpeg2) | [Scene](#scene) |   |   | -| [Multi](#multi) | [No-RlsGroup](#no-rlsgroup) |   |   | -| [Repack/Proper](#repack-proper) | [Obfuscated](#obfuscated) |   |   | -| [Repack v2](#repack-v2) | [Retags](#retags) |   |   | -| [Repack v3](#repack-v3) | [Bad Dual Groups](#bad-dual-groups) |   |   | -| [x264](#x264) | |   |   | -| [x265](#x265) | |   |   | +| Misc | Optional |   |   | +| ------------------------------ | ----------------------------------- | ------ | ------ | +| [FreeLeech](#freeleech) | [Season Packs](#season-pack) |   |   | +| [MPEG2](#mpeg2) | [Scene](#scene) |   |   | +| [Multi](#multi) | [No-RlsGroup](#no-rlsgroup) |   |   | +| [Repack/Proper](#repackproper) | [Obfuscated](#obfuscated) |   |   | +| [Repack v2](#repack-v2) | [Retags](#retags) |   |   | +| [Repack v3](#repack-v3) | [Bad Dual Groups](#bad-dual-groups) |   |   | +| [x264](#x264) | |   |   | +| [x265](#x265) | |   |   | ------ @@ -81,7 +81,7 @@ I also made 3 guides related to this one. | --------------------------------------------------------------------------- | --------------------------------------------------------------------- | ------------------------------------- | | [Anime BD Tier 01 (Top SeaDex Muxers)](#anime-bd-tier-01-top-seadex-muxers) | [Anime Web Tier 01 (Muxers)](#anime-web-tier-01-muxers) | [Uncensored](#uncensored) | | [Anime BD Tier 02 (SeaDex Muxers)](#anime-bd-tier-02-seadex-muxers) | [Anime Web Tier 02 (Top FanSubs)](#anime-web-tier-02-top-fansubs) | [v0](#v0) | -| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers) | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease) | [v1](#v1) | +| [Anime BD Tier 03 (SeaDex Muxers)](#anime-bd-tier-03-seadex-muxers) | [Anime Web Tier 03 (SubsPlease)](#anime-web-tier-03-subsplease) | [v1](#v1) | | [Anime BD Tier 04 (SeaDex Muxers)](#anime-bd-tier-04-seadex-muxers) | [Anime Web Tier 04 (Official Subs)](#anime-web-tier-04-official-subs) | [v2](#v2) | | [Anime BD Tier 05 (Remuxes)](#anime-bd-tier-05-remuxes) | [Anime Web Tier 05 (FanSubs)](#anime-web-tier-05-fansubs) | [v3](#v3) | | [Anime BD Tier 06 (FanSubs)](#anime-bd-tier-06-fansubs) | [Anime Web Tier 06 (FanSubs)](#anime-web-tier-06-fansubs) | [v4](#v4) | @@ -869,7 +869,7 @@ I also made 3 guides related to this one. ------ -### Repack Proper +### Repack/Proper ??? example "JSON - [CLICK TO EXPAND]" diff --git a/docs/Sonarr/sonarr-setup-custom-formats.md b/docs/Sonarr/sonarr-setup-custom-formats.md index 40bb37c4e..5fecd28ad 100644 --- a/docs/Sonarr/sonarr-setup-custom-formats.md +++ b/docs/Sonarr/sonarr-setup-custom-formats.md @@ -179,7 +179,7 @@ Use the following main settings in your profile. I also suggest to change the Propers and Repacks settings in Sonarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/sonarr-collection-of-custom-formats/#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/sonarr-collection-of-custom-formats/#repackproper) Custom Format. ![!cf-mm-propers-repacks-disable](images/cf-mm-propers-repacks-disable.png) diff --git a/includes/cf/radarr-misc.md b/includes/cf/radarr-misc.md index a34103ec7..c9ff99794 100644 --- a/includes/cf/radarr-misc.md +++ b/includes/cf/radarr-misc.md @@ -1,14 +1,14 @@ ??? summary "Misc - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | | --------------------------------------------------------------------------------------------------- | -------------------------------------------- | ----------------------------------------- | - | [{{ radarr['cf']['repack-proper']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repack-proper) | {{ radarr['cf']['repack-proper']['trash_score'] }} | {{ radarr['cf']['repack-proper']['trash_id'] }} | + | [{{ radarr['cf']['repack-proper']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repackproper) | {{ radarr['cf']['repack-proper']['trash_score'] }} | {{ radarr['cf']['repack-proper']['trash_id'] }} | | [{{ radarr['cf']['repack2']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#repack2) | {{ radarr['cf']['repack2']['trash_score'] }} | {{ radarr['cf']['repack2']['trash_id'] }} | ??? tip "Proper and Repacks - [CLICK TO EXPAND]" I also suggest to change the Propers and Repacks settings in Radarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Radarr/Radarr-collection-of-custom-formats/#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Radarr/Radarr-collection-of-custom-formats/#repackproper) Custom Format. ![!cf-mm-propers-repacks-disable](/Radarr/images/cf-mm-propers-repacks-disable.png) diff --git a/includes/cf/sonarr-misc.md b/includes/cf/sonarr-misc.md index 9a421da4b..f152effc1 100644 --- a/includes/cf/sonarr-misc.md +++ b/includes/cf/sonarr-misc.md @@ -1,7 +1,7 @@ ??? summary "Misc - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | | --------------------------------------------------------------------------------------------------------- | -------------------------------------------------- | ----------------------------------------------- | - | [{{ sonarr['cf']['repack-proper']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#repack-proper) | {{ sonarr['cf']['repack-proper']['trash_score'] }} | {{ sonarr['cf']['repack-proper']['trash_id'] }} | + | [{{ sonarr['cf']['repack-proper']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#repackproper) | {{ sonarr['cf']['repack-proper']['trash_score'] }} | {{ sonarr['cf']['repack-proper']['trash_id'] }} | | [{{ sonarr['cf']['repack-v2']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#repack-v2) | {{ sonarr['cf']['repack-v2']['trash_score'] }} | {{ sonarr['cf']['repack-v2']['trash_id'] }} | | [{{ sonarr['cf']['repack-v3']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#repack-v3) | {{ sonarr['cf']['repack-v3']['trash_score'] }} | {{ sonarr['cf']['repack-v3']['trash_id'] }} | @@ -9,7 +9,7 @@ I also suggest to change the Propers and Repacks settings in Sonarr - `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/sonarr-collection-of-custom-formats/#repack-proper) Custom Format. + `Media Management` => `File Management` to `Do Not Prefer` and use the [Repack/Proper](/Sonarr/sonarr-collection-of-custom-formats/#repackproper) Custom Format. ![!cf-mm-propers-repacks-disable](/Sonarr/images/cf-mm-propers-repacks-disable.png) diff --git a/includes/merge-quality/radarr-current-logic.md b/includes/merge-quality/radarr-current-logic.md index e4bfed38e..d74b57aa2 100644 --- a/includes/merge-quality/radarr-current-logic.md +++ b/includes/merge-quality/radarr-current-logic.md @@ -20,4 +20,4 @@ !!! attention "" REPACKS and PROPERs are v2 of Qualities and thus rank above a non-repack of the same quality. - `Settings` => `Media Management` => `File Management` => `Proper & Repacks` Change to `Do Not Prefer` and use the [Repack/Proper Custom Format](/Radarr/Radarr-collection-of-custom-formats/#repack-proper){:target="_blank" rel="noopener noreferrer"} + `Settings` => `Media Management` => `File Management` => `Proper & Repacks` Change to `Do Not Prefer` and use the [Repack/Proper Custom Format](/Radarr/Radarr-collection-of-custom-formats/#repackproper){:target="_blank" rel="noopener noreferrer"} From 5e1bbab12342c281eaf0061b4c0af07cc438b564 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 7 Sep 2022 21:39:49 +0200 Subject: [PATCH 3/5] Radarr CF `[Flights (no IMAX)` - Lowered Score to `0` because it will be removed upcoming weekend, and it's already added to CF `[HQ-Remux]` and `[Remux Tier 02]` --- docs/json/radarr/cf/flights-no-imax.json | 2 +- includes/sqp/1-2-cf-scoring.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/json/radarr/cf/flights-no-imax.json b/docs/json/radarr/cf/flights-no-imax.json index 5d046a847..469d4bc3b 100644 --- a/docs/json/radarr/cf/flights-no-imax.json +++ b/docs/json/radarr/cf/flights-no-imax.json @@ -1,6 +1,6 @@ { "trash_id": "1d433e1e075704f1a8a1ae3e1c371460", - "trash_score": "1850", + "trash_score": "0", "name": "Flights (no IMAX)", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/includes/sqp/1-2-cf-scoring.md b/includes/sqp/1-2-cf-scoring.md index 88c7341e5..a766a219b 100644 --- a/includes/sqp/1-2-cf-scoring.md +++ b/includes/sqp/1-2-cf-scoring.md @@ -10,7 +10,6 @@ | Custom Format | Score | Trash ID | | ------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------- | ------------------------------------------------- | | [{{ radarr['cf']['hq-remux']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-remux) | {{ radarr['cf']['hq-remux']['trash_score'] }} | {{ radarr['cf']['hq-remux']['trash_id'] }} | - | [{{ radarr['cf']['flights-no-imax']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/flights-no-imax.json) | {{ radarr['cf']['flights-no-imax']['trash_score'] }} | {{ radarr['cf']['flights-no-imax']['trash_id'] }} | | [{{ radarr['cf']['hq-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq-webdl) | {{ radarr['cf']['hq-webdl']['trash_score'] }} | {{ radarr['cf']['hq-webdl']['trash_id'] }} | | [{{ radarr['cf']['hq']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hq) | 0 | {{ radarr['cf']['hq']['trash_id'] }} | From 34fdf53b3a06bc0202bf20d3307a8b3925261f40 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 7 Sep 2022 21:59:18 +0200 Subject: [PATCH 4/5] Sonarr CF `[Special Edition]` REMOVED - REMOVED: CF `[Special Edition]` - To prevent matching episode titles and the minimal existing SE for TV Shows. --- docs/json/sonarr/cf/special-edition.json | 25 ------------------------ 1 file changed, 25 deletions(-) delete mode 100644 docs/json/sonarr/cf/special-edition.json diff --git a/docs/json/sonarr/cf/special-edition.json b/docs/json/sonarr/cf/special-edition.json deleted file mode 100644 index 80b3e8716..000000000 --- a/docs/json/sonarr/cf/special-edition.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "trash_id": "d6c088c015e1781c4656e36aba94330c", - "trash_score": "25", - "name": "Special Edition", - "includeCustomFormatWhenRenaming": false, - "specifications": [{ - "name": "Special Edition", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": true, - "fields": { - "value": "(? Date: Wed, 7 Sep 2022 22:11:06 +0200 Subject: [PATCH 5/5] [Sonarr] CF `[WEB Tier 02]` - Added: SMURF - Sorted ASC --- docs/json/sonarr/cf/web-tier-02.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/json/sonarr/cf/web-tier-02.json b/docs/json/sonarr/cf/web-tier-02.json index 8738b9ae5..edf8432bd 100644 --- a/docs/json/sonarr/cf/web-tier-02.json +++ b/docs/json/sonarr/cf/web-tier-02.json @@ -301,6 +301,15 @@ "value": "\\b(SIGMA)\\b" } }, + { + "name": "SMURF", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(SMURF)\\b" + } + }, { "name": "SPiRiT", "implementation": "ReleaseGroupSpecification",