diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fdfd35b6b..f93278d02 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,64 +8,105 @@ These are mostly guidelines, not rules. Use your best judgment, and feel free to ## Guidelines - Make sure you're editing the latest version. -- If you propose changes, make sure they don't break anything else in the guides. +- If you propose changes, ensure they don't break anything else in the guides. - Make sure that after the changes, you don't get any [markdownlint](https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md) errors - If the `metadata.json` and `metadata.schema.json` needs changes, announce it first in the Discord `#development` channel and ping `voidpointer` and `nitsua` so the 3rd party apps don't break :bangbang: ## Branch naming -We're trying to be as consistent as possible to automate the changelog. +> [!IMPORTANT] +> We're trying to be as consistent as possible because of the automation of the changelog. -- **feat/xxx** Commits, which adds a new feature -- **fix/xxx** Commits, that fixes a bug/issue -- **style/xxx** Commits, that do not affect the meaning (white-space, formatting, missing semi-colons, etc) -- **chore/xxx** Miscellaneous commits (administrative / cleanup / backend) +- **feat/xxx** Commits that adds a new feature +- **fix/xxx** Commits that fixes a bug/issue +- **style/xxx** Commits that do not affect the meaning (white-space, formatting, missing semi-colons, grammar, etc.) +- **chore/xxx** Miscellaneous commits (administrative, cleanup, backend, etc) -Where 'xxx' can stand for Starr/Sonarr/Radarr/Guide etc +> [!note] +> Where `xxx` can stand for the main [Guide Categories](#guide-categories) in the guide. _Examples:_ - `feat/Starr-ELEANOR-to-Scene-CF` -- `feat/Radarr-CiNEPHiLES-to-Remux-Tier-02` -- `feat/maintenance` -- `fix/dv-hdr10-cf-should-match-dv-hdr10+` - -[Source](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13#types) +- `feat/radarr-CiNEPHiLES-to-Remux-Tier-02` +- `style/radarr minor-grammar corrections` +- `fix/starr-dv-hdr10-cf-should-match-dv-hdr10+` ## Pull Request naming -We're trying to be as consistent as possible to automate the changelog. +> [!IMPORTANT] +> Because the changelog is created automatically, we want to make the PR name as clear and consistent as possible. -- **feat(xxx):** Commits, that adds a new feature -- **fix(xxx):** Commits, that fixes a bug/issue -- **style(xxx):** Commits, that do not affect the meaning (white-space, formatting, missing semi-colons, etc) -- **chore(xxx):** Miscellaneous commits (administrative / cleanup / backend) +The PR naming consists of 3 parts. -Where 'xxx' can stand for Starr/Sonarr/Radarr/Guide etc +part1(part2): part3 => type(guide category): short detailed descriptions -_Examples:_ - -- `feat(starr): add ELEANOR to Scene CF` -- `feat(radarr): add CiNEPHiLES to Remux Tier 02` -- `feat(maintenance): various changes to the Starr CFs` -- `fix(starr): DV HDR10 CF should match DV HDR10+` +### Types [Source](https://gist.github.com/qoomon/5dfcdf8eec66a051ecd85625518cfd13#types) +- **feat(xxx):** Commits that adds a new feature +- **fix(xxx):** Commits that fixes a bug/issue +- **style(xxx):** Commits that do not affect the meaning (white-space, formatting, missing semi-colons, grammar, etc) +- **chore(xxx):** Miscellaneous commits (administrative, cleanup, backend, etc) + +> [!note] +> Where `xxx` can stand for the main [Guide Categories](#guide-categories) in the guide. + +### Guide categories + +The following Guide categories can be used for the PR name. + +```yml +- type(radarr): #Radarr related +- type(radarr-german): #Radarr related but for the German guides +- type(radarr-french): #Radarr related but for the French guides +- type(radarr-anime): #Radarr related but for the Anime guides +- type(sonarr): #Sonarr related +- type(sonarr-german): #Sonarr related but for the German guides +- type(sonarr-french): #Sonarr related but for the French guides +- type(sonarr-anime): #Sonarr related but for the Anime guides +- type(starr): #Sonarr and Radarr related +- type(starr-german): #Sonarr and Radarr related but for the German guides +- type(starr-french): #Sonarr and Radarr related but for the French guides +- type(starr-anime): #Sonarr and Radarr related but for the Anime guides +- type(prowlarr): #Prowlarr related +- type(lidarr): #Lidarr related +- type(bazarr): #Bazarr related +- type(hardlinks): #Hardlinks/File and Folder Structure related +- type(downloaders): #Downloaders related +- type(plex): #Plex related +- type(guide-sync): # Officially supported third-party party Guide Sync Tools related +- type(misc): #Miscellaneous guides that do not fit in any other categories but are still related to Radarr/Sonarr, etc +- type(glossary): #Any additions/changes to the glossary page +``` + +_Examples:_ + +- feat(guide-sync): Add more groups to give the user more personal options +- feat(guide-sync): Add new Quality Profiles for Radarr/Sonarr +- feat(starr): [NEW Guide] How does the current rank logic work +- feat(downloaders): [NZBGet] Updated the guide to reflect the recent changes with v24.5 + ## When doing a PR that is WIP -When doing a PR that is in progress and not yet complete/ready for review or not yet done fully, please ensure it is a **DRAFT Pull Request** +> [!TIP] +> When doing a PR that is in progress and not yet complete/ready for review or not yet done fully, please ensure it is a **DRAFT Pull Request** ## Radarr/Sonarr Custom Format (JSON) ### Release Group Reclassifications, Removals, or Additions -- When adding a release group to a Custom Format for whatever reason, please explain why it's added/removed/moved in the PR. +> [!WARNING] +> **When adding a release group to a Custom Format, please explain why it's added/removed/moved in the PR.** ### General Guidelines -- Custom Format name needs to match JSON name :bangbang: -- No hashcode can exist multiple times :bangbang: +> [!CAUTION] +> +> - Custom Format name needs to match JSON name :bangbang: +> - No hashcode can exist multiple times :bangbang: +> - Tiers only hold release groups that have at least done several dozen objectively high-quality releases or are added for a specific reason. (If they do mainly niche stuff and/or foreign stuff, they won't be added) - All Tier Groups must use retail sources. Fanres and upscaled groups are forbidden. This is due to the high effort required and the near impossibility of systematically guaranteeing quality without manually checking every single movie. - JSON file format shall consist of the following TRaSH-specific data appended to the JSON exported from Starr @@ -92,11 +133,12 @@ General Structure ### File Naming -- JSON file names are always written in lowercase, spaces are replaced by a dash, and no spaces or special characters except a dash :bangbang: +> [!CAUTION] +> JSON file names are always written in lowercase, spaces are replaced by a dash, and no spaces or special characters except a dash :bangbang: ### Hashcode -- When adding the hashcode for **Radarr**, use the following naming convention: `CF_name` e.g. the Custom Format `BR-DISK` would be the hash of [`BR-DISK`](https://md5.gromweb.com/?string=BR-DISK) +- When adding the hashcode for **Radarr**, use the following naming convention: `CF_name` e.g., the Custom Format `BR-DISK` would be the hash of [`BR-DISK`](https://md5.gromweb.com/?string=BR-DISK) When adding the hashcode for **Radarr Anime**, use the following naming convention: `Radarr Anime CF_name`. For example, the Custom Format `BR-DISK` would be the hash of [`Radarr Anime BR-DISK`](https://md5.gromweb.com/?string=Radarr+Anime+BR-DISK). - When adding the hashcode for **Sonarr**, use the following naming convention: `Sonarr CF_name` e.g. the Custom Format `BR-DISK` would be the hash of [`Sonarr BR-DISK`](https://md5.gromweb.com/?string=Sonarr+BR-DISK). - When adding the hashcode for **Sonarr Anime**, use the following naming convention: `Sonarr Anime CF_name` e.g. the Custom Format `BR-DISK` would be the hash of [`Sonarr Anime BR-DISK`](https://md5.gromweb.com/?string=Sonarr+Anime+BR-DISK). @@ -133,17 +175,21 @@ When updating or adding a new CF, the test case URL (`trash_regex`) needs to be ``` - This allows for Custom Formats to be assigned different scores for different profiles -- Default Scores of 0 (e.g. as in `trash_scores.default`) are FORBIDDEN +- Default Scores of 0 (e.g., as in `trash_scores.default`) are FORBIDDEN ## YAML file naming -- If a hashcode is needed **No** hashcode can exist multiple times :bangbang: +> [!CAUTION] +> +> - If a hashcode is needed **No** hashcode can exist multiple times :bangbang: +> - Use [this website](https://md5.gromweb.com) to generate an md5 hash - YAML file names are always written in small letters, spaces are replaced by a dash, and no spaces or special characters except a dash :bangbang: ## Quality Profiles and 3rd party sync apps -When creating a new quality profile or editing an existing one, it's mandatory to ensure that these settings are also updated/added to the following locations for the third-party sync apps. +> [!IMPORTANT] +> When creating a new quality profile or editing an existing one, it's mandatory to ensure that these settings are updated/added to the following locations for the third-party sync apps. - Radarr: `docs/json/radarr/quality-profiles` - `docs/json/radarr/cf-groups` @@ -169,7 +215,7 @@ These prerequisites are taken from the [mkdocs installation instructions][mkdoci [mkdocinstall]: https://www.mkdocs.org/user-guide/installation/ -Alternatively you can check out the docker container and instructions maintained by [zakkarry](https://github.com/zakkarry) specifically for development of the guides [here](https://gist.github.com/zakkarry/1305f713539c9fee22bdeeddcff3a263). The documentation in the README explains the installation process. +Alternatively, you can check out the docker container and instructions maintained by [zakkarry](https://github.com/zakkarry) specifically for developing the guides [here](https://gist.github.com/zakkarry/1305f713539c9fee22bdeeddcff3a263). The documentation in the README explains the installation process. ### Mkdocs Installation @@ -179,8 +225,8 @@ First, install mkdocs: pip install mkdocs ``` -Then, install dependent modules using the command below. This command should be run in the repository's root directory (i.e., where the `requirements.txt` file is). If the `pip` command does -If it does not work, refer to the mkdocs installation page linked in the Prerequisite section above. +Then, you can install dependent modules using the command below. This command should be run in the repository's root directory (i.e., where the `requirements.txt` file is). If the `pip` command does +If it doesn't work, please check the mkdocs installation page linked in the Prerequisite section above. ```bash pip install -r docs/requirements.txt diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d902217d2..b4eff94e9 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -104,40 +104,35 @@
austinwbest -
- userdocs -
- userdocs -
SeiyaGame
SeiyaGame
- calvinbui + userdocs
- calvinbui + userdocs
- doob187 + calvinbui
- doob187 + calvinbui
thatbritguy
thatbritguy
-
- Roxedus +
+ doob187
- Roxedus + doob187
- keliansb + foux
- keliansb + foux
jasonla @@ -145,29 +140,34 @@ jasonla
- foux + keliansb
- foux + keliansb
- 8a8al00ey + Roxedus
- 8a8al00ey + Roxedus +
+
+ saltydk +
+ saltydk
- brettpetch + mizz141
- brettpetch + mizz141
- Davo1624 + Opt6
- Davo1624 + Opt6
- fabricionaweb + Kuredant
- fabricionaweb + Kuredant
jsatk @@ -175,24 +175,24 @@ jsatk
- Kuredant + fabricionaweb
- Kuredant + fabricionaweb
- Opt6 + Davo1624
- Opt6 + Davo1624
- mizz141 + brettpetch
- mizz141 + brettpetch
- saltydk + 8a8al00ey
- saltydk + 8a8al00ey
voltron4lyfe diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 4706530ed..e7fe868e6 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -95,36 +95,40 @@ We've made 3 guides related to this. --- -| Miscellaneous | Language profiles | -| -------------------------------------- | ------------------------------------------------------------------ | -| [Bad Dual Groups](#bad-dual-groups) | [Language: German](#language-german) | -| [Dutch Groups](#dutch-groups) | [Language: German DL](#language-german-dl) | -| [DV (Disk)](#dv-disk) | [Language: German DL (undefined)](#language-german-dl-undefined) | -| [DV (WEBDL)](#dv-webdl) | [Language: Not English (English Only)](#language-not-english) | -| [DV HDR10+ Boost](#dv-hdr10plus-boost) | [Language: Not French (French Only)](#language-not-french) | -| [EVO (no WEBDL)](#evo-no-webdl) | [Language: Not Original (Original Only)](#language-not-original) | -| [FreeLeech](#freeleech) | [Language: Original + French](#language-original-plus-french) | -| [HDR10+ Boost](#hdr10plus-boost) | [Language: Not German or English](#language-not-german-or-english) | -| [HFR](#hfr) | | -| [Internal](#internal) | | -| [Line/Mic Dubbed](#linemic-dubbed) | | -| [MPEG2](#mpeg2) | | -| [Multi](#multi) | | -| [No-RlsGroup](#no-rlsgroup) | | -| [Obfuscated](#obfuscated) | | -| [Repack/Proper](#repackproper) | | -| [Repack2](#repack2) | | -| [Repack3](#repack3) | | -| [Retags](#retags) | | -| [Scene](#scene) | | -| [SDR (no WEBDL)](#sdr-no-webdl) | | -| [SDR](#sdr) | | -| [VC-1](#vc-1) | | -| [VP9](#vp9) | | -| [x264](#x264) | | -| [x265 (no HDR/DV)](#x265-no-hdrdv) | | -| [x265](#x265) | | -| [x266](#x266) | | +| Miscellaneous | Language profiles | +| ------------------------------------------------------ | ------------------------------------------------------------------ | +| [720p](#720p) | [Language: German](#language-german) | +| [1080p](#1080p) | [Language: German DL](#language-german-dl) | +| [2160p](#2160p) | [Language: German DL (undefined)](#language-german-dl-undefined) | +| [Bad Dual Groups](#bad-dual-groups) | [Language: Not English (English Only)](#language-not-english) | +| [Black and White Editions] (#black-and-white-editions) | [Language: Not French (French Only)](#language-not-french) | +| [Dutch Groups](#dutch-groups) | [Language: Not Original (Original Only)](#language-not-original) | +| [DV (Disk)](#dv-disk) | [Language: Original + French](#language-original-plus-french) | +| [DV (WEBDL)](#dv-webdl) | [Language: Not German or English](#language-not-german-or-english) | +| [DV HDR10+ Boost](#dv-hdr10plus-boost) | | +| [EVO (no WEBDL)](#evo-no-webdl) | | +| [FreeLeech](#freeleech) | | +| [HDR10+ Boost](#hdr10plus-boost) | | +| [HFR](#hfr) | | +| [Internal](#internal) | | +| [Line/Mic Dubbed](#linemic-dubbed) | | +| [MPEG2](#mpeg2) | | +| [Multi](#multi) | | +| [No-RlsGroup](#no-rlsgroup) | | +| [Obfuscated](#obfuscated) | | +| [Repack/Proper](#repackproper) | | +| [Repack2](#repack2) | | +| [Repack3](#repack3) | | +| [Retags](#retags) | | +| [Scene](#scene) | | +| [SDR (no WEBDL)](#sdr-no-webdl) | | +| [SDR](#sdr) | | +| [VC-1](#vc-1) | | +| [VP9](#vp9) | | +| [x264](#x264) | | +| [x265 (no HDR/DV)](#x265-no-hdrdv) | | +| [x265](#x265) | | +| [x266](#x266) | | --- @@ -1096,6 +1100,54 @@ We've made 3 guides related to this. --- +### 720p + +??? question "720p - [Click to show/hide]" + + {! include-markdown "../../includes/cf-descriptions/720p.md" !} + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/720p.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + +### 1080p + +??? question "1080p - [Click to show/hide]" + + {! include-markdown "../../includes/cf-descriptions/1080p.md" !} + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/1080p.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + +### 2160p + +??? question "2160p - [Click to show/hide]" + + {! include-markdown "../../includes/cf-descriptions/2160p.md" !} + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/2160p.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + ### Bad Dual Groups ??? question "Bad dual groups - [Click to show/hide]" @@ -1113,6 +1165,22 @@ We've made 3 guides related to this. --- +### Black and White Editions + +??? question "Black and White Editions - [Click to show/hide]" + + Some movies get an additional release version in monochrome/black and white. This custom format matches some of the more common occurrences of these. + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/cf/black-and-white-editions.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + ### DV (WEBDL) DV = DoVi = Dolby Vision diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index d9312c2f6..9f0c2e837 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -94,14 +94,17 @@ We've made 3 guides related to this. | Miscellaneous | Language profiles | | -------------------------------------- | ------------------------------------------------------------------ | -| [Bad Dual Groups](#bad-dual-groups) | [Language: German](#language-german) | -| [DV (Disk)](#dv-disk) | [Language: German DL](#language-german-dl) | -| [DV (WEBDL)](#dv-webdl) | [Language: German DL (undefined)](#language-german-dl-undefined) | -| [DV HDR10+ Boost](#dv-hdr10plus-boost) | [Language: Not English (English Only)](#language-not-english) | -| [FreeLeech](#freeleech) | [Language: Not French (French Only)](#language-not-french) | -| [HDR10+ Boost](#hdr10plus-boost) | [Language: Not Original (Original Only)](#language-not-original) | -| [HFR](#hfr) | [Language: Original + French](#language-original-plus-french) | -| [Internal](#internal) | [Language: Not German or English](#language-not-german-or-english) | +| [720p](#720p) | [Language: German](#language-german) | +| [1080p](#1080p) | [Language: German DL](#language-german-dl) | +| [2160p](#2160p) | [Language: German DL (undefined)](#language-german-dl-undefined) | +| [Bad Dual Groups](#bad-dual-groups) | [Language: Not English (English Only)](#language-not-english) | +| [DV (Disk)](#dv-disk) | [Language: Not French (French Only)](#language-not-french) | +| [DV (WEBDL)](#dv-webdl) | [Language: Not Original (Original Only)](#language-not-original) | +| [DV HDR10+ Boost](#dv-hdr10plus-boost) | [Language: Original + French](#language-original-plus-french) | +| [FreeLeech](#freeleech) | [Language: Not German or English](#language-not-german-or-english) | +| [HDR10+ Boost](#hdr10plus-boost) | | +| [HFR](#hfr) | | +| [Internal](#internal) | | | [MPEG2](#mpeg2) | | | [Multi](#multi) | | | [No-RlsGroup](#no-rlsgroup) | | @@ -888,6 +891,54 @@ We've made 3 guides related to this. --- +### 720p + +??? question "720p - [Click to show/hide]" + + {! include-markdown "../../includes/cf-descriptions/720p.md" !} + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/720p.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + +### 1080p + +??? question "1080p - [Click to show/hide]" + + {! include-markdown "../../includes/cf-descriptions/1080p.md" !} + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/1080p.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + +### 2160p + +??? question "2160p - [Click to show/hide]" + + {! include-markdown "../../includes/cf-descriptions/2160p.md" !} + +??? example "JSON - [Click to show/hide]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/2160p.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +--- + ### Repack/Proper ??? example "JSON - [Click to show/hide]" diff --git a/docs/json/radarr/cf/black-and-white-editions.json b/docs/json/radarr/cf/black-and-white-editions.json new file mode 100644 index 000000000..3e846c427 --- /dev/null +++ b/docs/json/radarr/cf/black-and-white-editions.json @@ -0,0 +1,73 @@ +{ + "trash_id": "cc444569854e9de0b084ab2b8b1532b2", + "trash_scores": { + "default": -10000 + }, + "name": "Black and White Editions", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "Blackout/B&W/Black&Chrome", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b((B(lack)?[ ._-]?(out|(and|[n&])[ ._-]?(W(hite)?|Chrome))))\\b(?!$)" + } + }, + { + "name": "Monochrome", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Monochrome)\\b(?!$)" + } + }, + { + "name": "Noir", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "(?<=\\b[12]\\d{3}\\b).*\\b(Noir)\\b(?!$)" + } + }, + { + "name": "Shush Cut", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Shush[ ._-]?Cut)\\b(?!$)" + } + }, + { + "name": "No/Minus Color", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b((No|Minus)[ ._-]?Colou?r)\\b(?!$)" + } + }, + { + "name": "Grayscale", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "(?<=\\b[12]\\d{3}\\b).*\\b(Gr[ae]y([ ._-]?(scale))?)\\b(?!$)" + } + }, + { + "name": "Darkness and Light", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Darkness?[ ._-]?(and|&)[ ._-]?(Light))\\b(?!$)" + } + } + ] +} diff --git a/docs/json/radarr/cf/scene.json b/docs/json/radarr/cf/scene.json index b0760f839..d6b7484fe 100644 --- a/docs/json/radarr/cf/scene.json +++ b/docs/json/radarr/cf/scene.json @@ -2,7 +2,7 @@ "trash_id": "f537cf427b64c38c8e36298f657e4828", "trash_scores": { "default": -10000, - "german": -35000 + "german": 0 }, "trash_regex": "https://regex101.com/r/BoIGFA/1", "name": "Scene", diff --git a/docs/json/sonarr/cf/french-anime-fansub.json b/docs/json/sonarr/cf/french-anime-fansub.json index 6c9e386ea..3aa06963d 100644 --- a/docs/json/sonarr/cf/french-anime-fansub.json +++ b/docs/json/sonarr/cf/french-anime-fansub.json @@ -97,6 +97,15 @@ "fields": { "value": "\\b(Yarashii)\\b" } + }, + { + "name": "Yangire-Raws", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Yangire[ .-]?Raws)\\b" + } } ] } diff --git a/docs/json/sonarr/cf/no-rlsgroup.json b/docs/json/sonarr/cf/no-rlsgroup.json index 739fa82ab..319800c47 100644 --- a/docs/json/sonarr/cf/no-rlsgroup.json +++ b/docs/json/sonarr/cf/no-rlsgroup.json @@ -1,7 +1,8 @@ { "trash_id": "82d40da2bc6923f41e14394075dd4b03", "trash_scores": { - "default": -10000 + "default": -10000, + "german": -35000 }, "name": "No-RlsGroup", "includeCustomFormatWhenRenaming": false, diff --git a/docs/json/sonarr/cf/obfuscated.json b/docs/json/sonarr/cf/obfuscated.json index 3274e832d..910c2af56 100644 --- a/docs/json/sonarr/cf/obfuscated.json +++ b/docs/json/sonarr/cf/obfuscated.json @@ -1,7 +1,8 @@ { "trash_id": "e1a997ddb54e3ecbfe06341ad323c458", "trash_scores": { - "default": -10000 + "default": -10000, + "german": -35000 }, "name": "Obfuscated", "includeCustomFormatWhenRenaming": false, diff --git a/docs/json/sonarr/cf/retags.json b/docs/json/sonarr/cf/retags.json index 435814cf0..619a2fba0 100644 --- a/docs/json/sonarr/cf/retags.json +++ b/docs/json/sonarr/cf/retags.json @@ -1,7 +1,8 @@ { "trash_id": "06d66ab109d4d2eddb2794d21526d140", "trash_scores": { - "default": -10000 + "default": -10000, + "german": -35000 }, "name": "Retags", "includeCustomFormatWhenRenaming": false, diff --git a/docs/json/sonarr/cf/scene.json b/docs/json/sonarr/cf/scene.json index 716fc40ca..13ee7e717 100644 --- a/docs/json/sonarr/cf/scene.json +++ b/docs/json/sonarr/cf/scene.json @@ -2,7 +2,7 @@ "trash_id": "1b3994c551cbb92a2c781af061f4ab44", "trash_scores": { "default": -10000, - "german": -35000 + "german": 0 }, "trash_regex": "https://regex101.com/r/BoIGFA/1", "name": "Scene", diff --git a/docs/updates.txt b/docs/updates.txt index 96d6da8e8..1196b33e8 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,11 @@ +# 2025-01-26 01:24 +- [feat(starr): Added Custom Format to boost 720p, 1080p and/or 2160p releases](https://github.com/TRaSH-Guides/Guides/pull/2237) +- [chore(backend): Added PR naming information to the CONTRIBUTING.md](https://github.com/TRaSH-Guides/Guides/pull/2236) +- [feat(sonarr-anime): Add Yangire-Raws to FR anime fansub](https://github.com/TRaSH-Guides/Guides/pull/2235) +- [fix(sonarr-german): Add missing German scores to some CFs](https://github.com/TRaSH-Guides/Guides/pull/2232) +- [feat(starr-anime): Enhance Bilibili Streaming Service and Remux Tier CFs](https://github.com/TRaSH-Guides/Guides/pull/2230) +- [fix(german-guide): Scoring Adjustments](https://github.com/TRaSH-Guides/Guides/pull/2225) + # 2025-01-19 01:27 - [chore(backend): Added mandatory todo for `Quality Profiles` to `CONTIBUTING.md`](https://github.com/TRaSH-Guides/Guides/pull/2226) - [fix(starr): Increase the max custom format score of the german guide to be more than whats really actually possible](https://github.com/TRaSH-Guides/Guides/pull/2224) diff --git a/includes/cf-descriptions/1080p.md b/includes/cf-descriptions/1080p.md new file mode 100644 index 000000000..f972c3e3b --- /dev/null +++ b/includes/cf-descriptions/1080p.md @@ -0,0 +1,3 @@ + +This Custom Format can boost 1080p releases. It is only useful if you use [Merge Qualities](/Radarr/Tips/Merge-quality/){:target="\_blank" rel="noopener noreferrer"} in your Quality Profile. + diff --git a/includes/cf-descriptions/2160p.md b/includes/cf-descriptions/2160p.md new file mode 100644 index 000000000..814132547 --- /dev/null +++ b/includes/cf-descriptions/2160p.md @@ -0,0 +1,3 @@ + +This Custom Format can boost 2160p releases. It is only useful if you use [Merge Qualities](/Radarr/Tips/Merge-quality/){:target="\_blank" rel="noopener noreferrer"} in your Quality Profile. + diff --git a/includes/cf-descriptions/720p.md b/includes/cf-descriptions/720p.md new file mode 100644 index 000000000..c360aab66 --- /dev/null +++ b/includes/cf-descriptions/720p.md @@ -0,0 +1,3 @@ + +This Custom Format can boost 720p releases. It is only useful if you use [Merge Qualities](/Radarr/Tips/Merge-quality/){:target="\_blank" rel="noopener noreferrer"} in your Quality Profile. + diff --git a/includes/cf/radarr-misc-optional.md b/includes/cf/radarr-misc-optional.md index 7f482bc18..b629d0888 100644 --- a/includes/cf/radarr-misc-optional.md +++ b/includes/cf/radarr-misc-optional.md @@ -1,13 +1,14 @@ ??? abstract "Miscellaneous (Optional) - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------: | ------------------------------------------------- | - | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | - | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | - | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_scores']['default'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | - | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | - | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_scores']['default'] }} | {{ radarr['cf']['retags']['trash_id'] }} | - | [{{ radarr['cf']['scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#scene) | {{ radarr['cf']['scene']['trash_scores']['default'] }} | {{ radarr['cf']['scene']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ------------------------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------------------: | ---------------------------------------------------------- | + | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | + | [{{ radarr['cf']['black-and-white-editions']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#black-and-white-editions) | {{ radarr['cf']['black-and-white-editions']['trash_scores']['default'] }} | {{ radarr['cf']['black-and-white-editions']['trash_id'] }} | + | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | + | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_scores']['default'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | + | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | + | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_scores']['default'] }} | {{ radarr['cf']['retags']['trash_id'] }} | + | [{{ radarr['cf']['scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#scene) | {{ radarr['cf']['scene']['trash_scores']['default'] }} | {{ radarr['cf']['scene']['trash_id'] }} | --- @@ -15,6 +16,7 @@ - **{{ radarr['cf']['bad-dual-groups']['name'] }}:** [*Optional*] These groups take the original release and add their own language track (e.g. AAC 2.0 Portuguese) as the first track. Afterward, FFprobe would determine that the media file is Portuguese. It's a common rule that you only add the best audio as the main track. Also they often even rename the release name into Portuguese. + - **{{ radarr['cf']['black-and-white-editions']['name'] }}:** [*Optional*] Some movies get an additional release version in monochrome/black and white. This custom format matches some of the more common occurrences of these. - **{{ radarr['cf']['evo-no-webdl']['name'] }}:** This group is often banned for low-quality Blu-ray releases, but their WEB-DLs are okay. - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group which could result in LQ groups being scored incorrectly. For example, a lot of EVO releases end up with a stripped group name. These releases would appear as "upgrades" and could end up getting a decent score after other CFs are scored. - **{{ radarr['cf']['obfuscated']['name'] }}:** [*Optional*] Use these only if you wish to avoid renamed releases. diff --git a/includes/german-guide/radarr-cf-german-resolution-scoring-en.md b/includes/german-guide/radarr-cf-german-resolution-scoring-en.md index c6e674b55..6138450ed 100644 --- a/includes/german-guide/radarr-cf-german-resolution-scoring-en.md +++ b/includes/german-guide/radarr-cf-german-resolution-scoring-en.md @@ -1,13 +1,13 @@ ??? abstract "German Resolution - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ---------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | - | [{{ radarr['cf']['german-1080p-booster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#german-1080p-booster) | {{ radarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ radarr['cf']['german-1080p-booster']['trash_id'] }} | - | [{{ radarr['cf']['german-2160p-booster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#german-2160p-booster) | {{ radarr['cf']['german-2160p-booster']['trash_scores']['default'] }} | {{ radarr['cf']['german-2160p-booster']['trash_id'] }} | - | [{{ radarr['cf']['720p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/720p.json) | {{ radarr['cf']['720p']['trash_scores']['default'] }} | {{ radarr['cf']['720p']['trash_id'] }} | - | [{{ radarr['cf']['1080p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/1080p.json) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | - | [{{ radarr['cf']['2160p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/2160p.json) | {{ radarr['cf']['2160p']['trash_scores']['default'] }} | {{ radarr['cf']['2160p']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | + | [{{ radarr['cf']['german-1080p-booster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#german-1080p-booster) | {{ radarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ radarr['cf']['german-1080p-booster']['trash_id'] }} | + | [{{ radarr['cf']['german-2160p-booster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#german-2160p-booster) | {{ radarr['cf']['german-2160p-booster']['trash_scores']['default'] }} | {{ radarr['cf']['german-2160p-booster']['trash_id'] }} | + | [{{ radarr['cf']['720p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#720p) | {{ radarr['cf']['720p']['trash_scores']['default'] }} | {{ radarr['cf']['720p']['trash_id'] }} | + | [{{ radarr['cf']['1080p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#1080p) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | + | [{{ radarr['cf']['2160p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#2160p) | {{ radarr['cf']['2160p']['trash_scores']['default'] }} | {{ radarr['cf']['2160p']['trash_id'] }} | --- diff --git a/includes/german-guide/radarr-cf-german-resolution-scoring-hd-only-en.md b/includes/german-guide/radarr-cf-german-resolution-scoring-hd-only-en.md index 528f7e267..721a46563 100644 --- a/includes/german-guide/radarr-cf-german-resolution-scoring-hd-only-en.md +++ b/includes/german-guide/radarr-cf-german-resolution-scoring-hd-only-en.md @@ -1,11 +1,11 @@ ??? abstract "German Resolution - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ---------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | - | [{{ radarr['cf']['german-1080p-booster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#german-1080p-booster) | {{ radarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ radarr['cf']['german-1080p-booster']['trash_id'] }} | - | [{{ radarr['cf']['720p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/720p.json) | {{ radarr['cf']['720p']['trash_scores']['default'] }} | {{ radarr['cf']['720p']['trash_id'] }} | - | [{{ radarr['cf']['1080p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/1080p.json) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | + | [{{ radarr['cf']['german-1080p-booster']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#german-1080p-booster) | {{ radarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ radarr['cf']['german-1080p-booster']['trash_id'] }} | + | [{{ radarr['cf']['720p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#720p) | {{ radarr['cf']['720p']['trash_scores']['default'] }} | {{ radarr['cf']['720p']['trash_id'] }} | + | [{{ radarr['cf']['1080p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#1080p) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | --- diff --git a/includes/german-guide/radarr-german-misc-optional.md b/includes/german-guide/radarr-german-misc-optional.md index ed402d7c0..3c5e109bd 100644 --- a/includes/german-guide/radarr-german-misc-optional.md +++ b/includes/german-guide/radarr-german-misc-optional.md @@ -20,5 +20,5 @@ - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group which could result in LQ groups being scored incorrectly. For example, a lot of EVO releases end up with a stripped group name. These releases would appear as "upgrades" and could end up getting a decent score after other CFs are scored. - **{{ radarr['cf']['obfuscated']['name'] }}:** [*Optional*] Use these only if you wish to avoid renamed releases. - **{{ radarr['cf']['retags']['name'] }}:** [*Optional*] Use this if you want to avoid retagged releases. Retagged releases often are not consistent with the quality of the original group's release. - - **{{ radarr['cf']['scene']['name'] }}:** [*Optional*] Use this only if you want to avoid SCENE releases. + - :warning: **{{ radarr['cf']['scene']['name'] }}:** [*Optional*] We recommend not using this CF in the German Guide, as it often matches incorrectly due to the German release naming. diff --git a/includes/german-guide/sonarr-cf-german-resolution-scoring-en.md b/includes/german-guide/sonarr-cf-german-resolution-scoring-en.md index d70a80f99..a77da4711 100644 --- a/includes/german-guide/sonarr-cf-german-resolution-scoring-en.md +++ b/includes/german-guide/sonarr-cf-german-resolution-scoring-en.md @@ -1,13 +1,13 @@ ??? abstract "German Resolution - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ---------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | - | [{{ sonarr['cf']['german-1080p-booster']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#german-1080p-booster) | {{ sonarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ sonarr['cf']['german-1080p-booster']['trash_id'] }} | - | [{{ sonarr['cf']['german-2160p-booster']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#german-2160p-booster) | {{ sonarr['cf']['german-2160p-booster']['trash_scores']['default'] }} | {{ sonarr['cf']['german-2160p-booster']['trash_id'] }} | - | [{{ sonarr['cf']['720p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/sonarr/cf/720p.json) | {{ sonarr['cf']['720p']['trash_scores']['default'] }} | {{ sonarr['cf']['720p']['trash_id'] }} | - | [{{ sonarr['cf']['1080p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/sonarr/cf/1080p.json) | {{ sonarr['cf']['1080p']['trash_scores']['default'] }} | {{ sonarr['cf']['1080p']['trash_id'] }} | - | [{{ sonarr['cf']['2160p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/sonarr/cf/2160p.json) | {{ sonarr['cf']['2160p']['trash_scores']['default'] }} | {{ sonarr['cf']['2160p']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | + | [{{ sonarr['cf']['german-1080p-booster']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#german-1080p-booster) | {{ sonarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ sonarr['cf']['german-1080p-booster']['trash_id'] }} | + | [{{ sonarr['cf']['german-2160p-booster']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#german-2160p-booster) | {{ sonarr['cf']['german-2160p-booster']['trash_scores']['default'] }} | {{ sonarr['cf']['german-2160p-booster']['trash_id'] }} | + | [{{ sonarr['cf']['720p']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#720p) | {{ sonarr['cf']['720p']['trash_scores']['default'] }} | {{ sonarr['cf']['720p']['trash_id'] }} | + | [{{ sonarr['cf']['1080p']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#1080p) | {{ sonarr['cf']['1080p']['trash_scores']['default'] }} | {{ sonarr['cf']['1080p']['trash_id'] }} | + | [{{ sonarr['cf']['2160p']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#2160p) | {{ sonarr['cf']['2160p']['trash_scores']['default'] }} | {{ sonarr['cf']['2160p']['trash_id'] }} | --- diff --git a/includes/german-guide/sonarr-cf-german-resolution-scoring-hd-only-en.md b/includes/german-guide/sonarr-cf-german-resolution-scoring-hd-only-en.md index ce2e11d5c..f31e85da2 100644 --- a/includes/german-guide/sonarr-cf-german-resolution-scoring-hd-only-en.md +++ b/includes/german-guide/sonarr-cf-german-resolution-scoring-hd-only-en.md @@ -1,11 +1,11 @@ ??? abstract "German Resolution - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ---------------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | - | [{{ sonarr['cf']['german-1080p-booster']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#german-1080p-booster) | {{ sonarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ sonarr['cf']['german-1080p-booster']['trash_id'] }} | - | [{{ sonarr['cf']['720p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/sonarr/cf/720p.json) | {{ sonarr['cf']['720p']['trash_scores']['default'] }} | {{ sonarr['cf']['720p']['trash_id'] }} | - | [{{ sonarr['cf']['1080p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/sonarr/cf/1080p.json) | {{ sonarr['cf']['1080p']['trash_scores']['default'] }} | {{ sonarr['cf']['1080p']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------: | ------------------------------------------------------ | + | [{{ sonarr['cf']['german-1080p-booster']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#german-1080p-booster) | {{ sonarr['cf']['german-1080p-booster']['trash_scores']['default'] }} | {{ sonarr['cf']['german-1080p-booster']['trash_id'] }} | + | [{{ sonarr['cf']['720p']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#720p) | {{ sonarr['cf']['720p']['trash_scores']['default'] }} | {{ sonarr['cf']['720p']['trash_id'] }} | + | [{{ sonarr['cf']['1080p']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#1080p) | {{ sonarr['cf']['1080p']['trash_scores']['default'] }} | {{ sonarr['cf']['1080p']['trash_id'] }} | --- diff --git a/includes/german-guide/sonarr-german-misc-optional.md b/includes/german-guide/sonarr-german-misc-optional.md index 4aa8a823b..67993d9c3 100644 --- a/includes/german-guide/sonarr-german-misc-optional.md +++ b/includes/german-guide/sonarr-german-misc-optional.md @@ -18,5 +18,5 @@ - **{{ sonarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group which could result in LQ groups being scored incorrectly. For example, a lot of EVO releases end up with a stripped group name. These releases would appear as "upgrades" and could end up getting a decent score after other CFs are scored. - **{{ sonarr['cf']['obfuscated']['name'] }}:** [*Optional*] Use these only if you wish to avoid renamed releases. - **{{ sonarr['cf']['retags']['name'] }}:** [*Optional*] Use this if you wish to avoid retagged releases. Retagged releases often are not consistent with the quality of the original group's release (e.g. TGx downsampling an NTb release from 5.1 audio to 2.0 audio, yet maintaining the NTb naming). - - **{{ sonarr['cf']['scene']['name'] }}:** [*Optional*] Use this only if you want to avoid SCENE releases. + - :warning: **{{ sonarr['cf']['scene']['name'] }}:** [*Optional*] We recommend not using this CF in the German Guide, as it often matches incorrectly due to the German release naming. diff --git a/includes/sqp/1-4k-cf-scoring-sqp1.md b/includes/sqp/1-4k-cf-scoring-sqp1.md index 5334497bf..1e79f96a7 100644 --- a/includes/sqp/1-4k-cf-scoring-sqp1.md +++ b/includes/sqp/1-4k-cf-scoring-sqp1.md @@ -96,16 +96,17 @@ !!! danger "Adding any of the `HDR10+ Boosts` could result in less streaming optimized releases :warning:" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------------: | ---------------------------------------------------- | - | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | - | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | - | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_scores']['default'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | - | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | - | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_scores']['default'] }} | {{ radarr['cf']['retags']['trash_id'] }} | - | [{{ radarr['cf']['scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#scene) | {{ radarr['cf']['scene']['trash_scores']['default'] }} | {{ radarr['cf']['scene']['trash_id'] }} | - | [{{ radarr['cf']['hdr10plus-boost']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hdr10plus-boost) | {{ radarr['cf']['hdr10plus-boost']['trash_scores']['default'] }} | {{ radarr['cf']['hdr10plus-boost']['trash_id'] }} | - | [{{ radarr['cf']['dv-hdr10plus-boost']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-hdr10plus-boost) | {{ radarr['cf']['dv-hdr10plus-boost']['trash_scores']['default'] }} | {{ radarr['cf']['dv-hdr10plus-boost']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ------------------------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------------------: | ---------------------------------------------------------- | + | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | + | [{{ radarr['cf']['black-and-white-editions']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#black-and-white-editions) | {{ radarr['cf']['black-and-white-editions']['trash_scores']['default'] }} | {{ radarr['cf']['black-and-white-editions']['trash_id'] }} | + | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | + | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_scores']['default'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | + | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | + | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_scores']['default'] }} | {{ radarr['cf']['retags']['trash_id'] }} | + | [{{ radarr['cf']['scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#scene) | {{ radarr['cf']['scene']['trash_scores']['default'] }} | {{ radarr['cf']['scene']['trash_id'] }} | + | [{{ radarr['cf']['hdr10plus-boost']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#hdr10plus-boost) | {{ radarr['cf']['hdr10plus-boost']['trash_scores']['default'] }} | {{ radarr['cf']['hdr10plus-boost']['trash_id'] }} | + | [{{ radarr['cf']['dv-hdr10plus-boost']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-hdr10plus-boost) | {{ radarr['cf']['dv-hdr10plus-boost']['trash_scores']['default'] }} | {{ radarr['cf']['dv-hdr10plus-boost']['trash_id'] }} | --- @@ -113,6 +114,7 @@ - **{{ radarr['cf']['bad-dual-groups']['name'] }}:** [*Optional*] These groups take the original release and add their own language track (e.g. AAC 2.0 Portuguese) as the first track. Afterward, FFprobe would determine that the media file is Portuguese. It's a common rule that you only add the best audio as the main track. Also they often even rename the release name into Portuguese. + - **{{ radarr['cf']['black-and-white-editions']['name'] }}:** [*Optional*] Some movies get an additional release version in monochrome/black and white. This custom format matches some of the more common occurrences of these. - **{{ radarr['cf']['evo-no-webdl']['name'] }}:** This group is often banned for low-quality Blu-ray releases, but their WEB-DLs are okay. - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group which could result in LQ groups being scored incorrectly. For example, a lot of EVO releases end up with a stripped group name. These releases would appear as "upgrades" and could end up getting a decent score after other CFs are scored. - **{{ radarr['cf']['obfuscated']['name'] }}:** [*Optional*] Use these only if you wish to avoid renamed releases. diff --git a/includes/sqp/hd-radarr-misc-optional.md b/includes/sqp/hd-radarr-misc-optional.md index c050cd985..f77997a3c 100644 --- a/includes/sqp/hd-radarr-misc-optional.md +++ b/includes/sqp/hd-radarr-misc-optional.md @@ -1,13 +1,14 @@ ??? abstract "Miscellaneous (Optional) - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------: | ------------------------------------------------- | - | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | - | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | - | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_scores']['default'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | - | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | - | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_scores']['default'] }} | {{ radarr['cf']['retags']['trash_id'] }} | - | [{{ radarr['cf']['scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#scene) | {{ radarr['cf']['scene']['trash_scores']['default'] }} | {{ radarr['cf']['scene']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ------------------------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------------------: | ---------------------------------------------------------- | + | [{{ radarr['cf']['bad-dual-groups']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#bad-dual-groups) | {{ radarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ radarr['cf']['bad-dual-groups']['trash_id'] }} | + | [{{ radarr['cf']['black-and-white-editions']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#black-and-white-editions) | {{ radarr['cf']['black-and-white-editions']['trash_scores']['default'] }} | {{ radarr['cf']['black-and-white-editions']['trash_id'] }} | + | [{{ radarr['cf']['evo-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#evo-no-webdl) | {{ radarr['cf']['evo-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['evo-no-webdl']['trash_id'] }} | + | [{{ radarr['cf']['no-rlsgroup']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup) | {{ radarr['cf']['no-rlsgroup']['trash_scores']['default'] }} | {{ radarr['cf']['no-rlsgroup']['trash_id'] }} | + | [{{ radarr['cf']['obfuscated']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#obfuscated) | {{ radarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ radarr['cf']['obfuscated']['trash_id'] }} | + | [{{ radarr['cf']['retags']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#retags) | {{ radarr['cf']['retags']['trash_scores']['default'] }} | {{ radarr['cf']['retags']['trash_id'] }} | + | [{{ radarr['cf']['scene']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#scene) | {{ radarr['cf']['scene']['trash_scores']['default'] }} | {{ radarr['cf']['scene']['trash_id'] }} | --- @@ -15,6 +16,7 @@ - **{{ radarr['cf']['bad-dual-groups']['name'] }}:** [*Optional*] These groups take the original release, then they add their own preferred language (ex. Portuguese) as the main audio track (AAC 2.0), What results after renaming and FFprobe that the media file will be recognized as Portuguese AAC audio. It's a common rule that you add the best audio as the first track. Also they often even rename the release name into Portuguese. + - **{{ radarr['cf']['black-and-white-editions']['name'] }}:** [*Optional*] Some movies get an additional release version in monochrome/black and white. This custom format matches some of the more common occurrences of these. - **{{ radarr['cf']['evo-no-webdl']['name'] }}:** This group is often banned for low-quality Blu-ray releases, but their WEB-DL is okay. - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group which could result in LQ groups getting a higher score. For example, a lot of EVO releases end up stripping the group name, so they appear as "upgrades", and they end up getting a decent score if other things match. - **{{ radarr['cf']['obfuscated']['name'] }}:** [*Optional*] (use these only if you dislike renamed releases) diff --git a/includes/sqp/hd-radarr-resolution.md b/includes/sqp/hd-radarr-resolution.md index 7cf94d57c..cbaf2fe7e 100644 --- a/includes/sqp/hd-radarr-resolution.md +++ b/includes/sqp/hd-radarr-resolution.md @@ -1,6 +1,8 @@ + ??? abstract "Resolution - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ---------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------: | --------------------------------------- | - | [{{ radarr['cf']['1080p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/1080p.json) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | - | [{{ radarr['cf']['720p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/720p.json) | {{ radarr['cf']['720p']['trash_scores']['default'] }} | {{ radarr['cf']['720p']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------- | :----------------------------------------------------: | --------------------------------------- | + | [{{ radarr['cf']['1080p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#1080p) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | + | [{{ radarr['cf']['720p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#720p) | {{ radarr['cf']['720p']['trash_scores']['default'] }} | {{ radarr['cf']['720p']['trash_id'] }} | + diff --git a/includes/sqp/uhd-radarr-resolution.md b/includes/sqp/uhd-radarr-resolution.md index 88738e7d8..3bcfeb6d5 100644 --- a/includes/sqp/uhd-radarr-resolution.md +++ b/includes/sqp/uhd-radarr-resolution.md @@ -1,8 +1,10 @@ + ??? abstract "Resolution - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ---------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------: | --------------------------------------- | - | [{{ radarr['cf']['1080p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/1080p.json) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | - | [{{ radarr['cf']['2160p']['name'] }}](https://raw.githubusercontent.com/TRaSH-/Guides/master/docs/json/radarr/cf/2160p.json) | :warning: {{ radarr['cf']['2160p']['trash_scores']['sqp-2'] }} :warning: | {{ radarr['cf']['2160p']['trash_id'] }} | + | Custom Format | Score | Trash ID | + | ----------------------------------------------------------------------------------------- | :----------------------------------------------------------------------: | --------------------------------------- | + | [{{ radarr['cf']['1080p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#1080p) | {{ radarr['cf']['1080p']['trash_scores']['default'] }} | {{ radarr['cf']['1080p']['trash_id'] }} | + | [{{ radarr['cf']['2160p']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#2160p) | :warning: {{ radarr['cf']['2160p']['trash_scores']['sqp-2'] }} :warning: | {{ radarr['cf']['2160p']['trash_id'] }} | !!! warning "Scores marked with a :warning: warning :warning: are different to those used in the main guide" +