diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 9f2b5bb1d3..84bb4bb135 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -984,15 +984,7 @@ We've made 3 guides related to this. ??? question "x265 (HD) - [Click to show/hide]" - This blocks all 720/1080p (HD) releases that are encoded in x265. - - In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-hd']['trash_scores']['default'] }}` - - !!! failure "" - - --8<-- "includes/docker/x265.md" - - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-radarr.md" !} ??? example "JSON - [Click to show/hide]" @@ -1206,15 +1198,7 @@ We've made 3 guides related to this. ??? question "x265 (no HDR/DV) - [Click to show/hide]" - This blocks most 720/1080p (HD) releases that are encoded in x265. - - **But it will allow 720/1080p x265 releases if they have HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` - - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-no-hdrdv-radarr.md" !} ??? example "JSON - [Click to show/hide]" @@ -1301,7 +1285,7 @@ We've made 3 guides related to this. ??? question "SDR (no WEBDL) - [Click to show/hide]" - {! include-markdown "../../includes/cf-descriptions/sdr-no-webdl.md" !} + {! include-markdown "../../includes/cf-descriptions/sdr-no-webdl-radarr.md" !} ??? example "JSON - [Click to show/hide]" diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 24caf6a8f1..80f9955c78 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -813,15 +813,7 @@ We've made 3 guides related to this. ??? question "x265 (HD) - [Click to show/hide]" - This blocks/ignores 720/1080p(HD) releases that are encoded in x265 - - In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-hd']['trash_scores']['default'] }}` - - !!! failure "" - - --8<-- "includes/docker/x265.md" - - !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-sonarr.md" !} ??? example "JSON - [Click to show/hide]" @@ -1212,15 +1204,7 @@ We've made 3 guides related to this. ??? question "x265 (no HDR/DV) - [Click to show/hide]" - This blocks most 720/1080p (HD) releases that are encoded in x265. - - **But it will allow 720/1080p x265 releases if they have HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` - - !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-no-hdrdv-sonarr.md" !} ??? example "JSON - [Click to show/hide]" @@ -1307,7 +1291,7 @@ We've made 3 guides related to this. ??? question "SDR (no WEBDL) - [Click to show/hide]" - {! include-markdown "../../includes/cf-descriptions/sdr-no-webdl.md" !} + {! include-markdown "../../includes/cf-descriptions/sdr-no-webdl-sonarr.md" !} ??? example "JSON - [Click to show/hide]" diff --git a/includes/cf-descriptions/dv-hdr10.md b/includes/cf-descriptions/dv-hdr10.md index 8597c91efb..8b9760302f 100644 --- a/includes/cf-descriptions/dv-hdr10.md +++ b/includes/cf-descriptions/dv-hdr10.md @@ -1,4 +1,4 @@ -_This Custom Format will only match on_ `DV HDR10` +This Custom Format will only match on `DV HDR10` This format provides Dolby Vision _with_ HDR10 fallback. You will find this mainly with: diff --git a/includes/cf-descriptions/sdr-no-webdl-radarr-warning.md b/includes/cf-descriptions/sdr-no-webdl-radarr-warning.md new file mode 100644 index 0000000000..33eeb06c07 --- /dev/null +++ b/includes/cf-descriptions/sdr-no-webdl-radarr-warning.md @@ -0,0 +1 @@ +!!! Danger "If you have also added [{{ radarr['cf']['sdr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#sdr){:target="\_blank" rel="noopener noreferrer"} to your Radarr,
then one of them should be scored as `0` in your quality profile." diff --git a/includes/cf-descriptions/sdr-no-webdl.md b/includes/cf-descriptions/sdr-no-webdl-radarr.md similarity index 72% rename from includes/cf-descriptions/sdr-no-webdl.md rename to includes/cf-descriptions/sdr-no-webdl-radarr.md index 449da01b81..3b6b88c6b2 100644 --- a/includes/cf-descriptions/sdr-no-webdl.md +++ b/includes/cf-descriptions/sdr-no-webdl-radarr.md @@ -1 +1,3 @@ This will prevent grabbing UHD/4k Remux and Bluray encode releases without HDR Formats. - i.e., SDR WEB releases will still be allowed since 4K SDR WEB releases can often look better than the 1080p version due to the improved bitrate. + +{! include-markdown "../../includes/cf-descriptions/sdr-no-webdl-radarr-warning.md" !} diff --git a/includes/cf-descriptions/sdr-no-webdl-sonarr-warning.md b/includes/cf-descriptions/sdr-no-webdl-sonarr-warning.md new file mode 100644 index 0000000000..f502d4f20e --- /dev/null +++ b/includes/cf-descriptions/sdr-no-webdl-sonarr-warning.md @@ -0,0 +1 @@ +!!! Danger "If you have also added [{{ sonarr['cf']['sdr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr){:target="\_blank" rel="noopener noreferrer"} to your Sonarr,
then one of them should be scored as `0` in your quality profile." diff --git a/includes/cf-descriptions/sdr-no-webdl-sonarr.md b/includes/cf-descriptions/sdr-no-webdl-sonarr.md new file mode 100644 index 0000000000..87dfa29047 --- /dev/null +++ b/includes/cf-descriptions/sdr-no-webdl-sonarr.md @@ -0,0 +1,3 @@ +This will prevent grabbing UHD/4k Remux and Bluray encode releases without HDR Formats. - i.e., SDR WEB releases will still be allowed since 4K SDR WEB releases can often look better than the 1080p version due to the improved bitrate. + +{! include-markdown "../../includes/cf-descriptions/sdr-no-webdl-sonarr-warning.md" !} diff --git a/includes/cf-descriptions/x265-hd-radarr-warning.md b/includes/cf-descriptions/x265-hd-radarr-warning.md new file mode 100644 index 0000000000..fecc4ba2c8 --- /dev/null +++ b/includes/cf-descriptions/x265-hd-radarr-warning.md @@ -0,0 +1 @@ +!!! Danger "If you have also added [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv){:target="\_blank" rel="noopener noreferrer"} to your Radarr,
then one of them should be scored as `0` in your quality profile." diff --git a/includes/cf-descriptions/x265-hd-radarr.md b/includes/cf-descriptions/x265-hd-radarr.md new file mode 100644 index 0000000000..c16a4c8bbc --- /dev/null +++ b/includes/cf-descriptions/x265-hd-radarr.md @@ -0,0 +1,9 @@ +This blocks all 720/1080p (HD) releases that are encoded in x265. + +In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-hd']['trash_scores']['default'] }}` + +??? question "Why block 720/1080p encodes in x265? - [Click to show/hide]" + + --8<-- "includes/docker/x265.md" + +{! include-markdown "../../includes/cf-descriptions/x265-hd-radarr-warning.md" !} diff --git a/includes/cf-descriptions/x265-hd-sonarr-warning.md b/includes/cf-descriptions/x265-hd-sonarr-warning.md new file mode 100644 index 0000000000..515f673a5e --- /dev/null +++ b/includes/cf-descriptions/x265-hd-sonarr-warning.md @@ -0,0 +1 @@ +!!! Danger "If you have also added [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv){:target="\_blank" rel="noopener noreferrer"} to your Sonarr,
then one of them should be scored as `0` in your quality profile." diff --git a/includes/cf-descriptions/x265-hd-sonarr.md b/includes/cf-descriptions/x265-hd-sonarr.md new file mode 100644 index 0000000000..d59639613a --- /dev/null +++ b/includes/cf-descriptions/x265-hd-sonarr.md @@ -0,0 +1,9 @@ +This blocks all 720/1080p (HD) releases that are encoded in x265. + +In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-hd']['trash_scores']['default'] }}` + +??? question "Why block 720/1080p encodes in x265? - [Click to show/hide]" + + --8<-- "includes/docker/x265.md" + +{! include-markdown "../../includes/cf-descriptions/x265-hd-sonarr-warning.md" !} diff --git a/includes/cf-descriptions/x265-no-hdrdv-radarr-warning.md b/includes/cf-descriptions/x265-no-hdrdv-radarr-warning.md new file mode 100644 index 0000000000..3c583a9382 --- /dev/null +++ b/includes/cf-descriptions/x265-no-hdrdv-radarr-warning.md @@ -0,0 +1 @@ +!!! Danger "If you have also added [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd){:target="\_blank" rel="noopener noreferrer"} to your Radarr,
then one of them should be scored as `0` in your quality profile." diff --git a/includes/cf-descriptions/x265-no-hdrdv-radarr.md b/includes/cf-descriptions/x265-no-hdrdv-radarr.md new file mode 100644 index 0000000000..a89ec1c6c9 --- /dev/null +++ b/includes/cf-descriptions/x265-no-hdrdv-radarr.md @@ -0,0 +1,11 @@ +This blocks most 720/1080p (HD) releases that are encoded in x265, **But it will allow 720/1080p x265 releases if they have HDR and/or DV** + +*Since some NF releases won't be released as 4k, this allows you to still have the DV/HDR releases.* + +In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` + +??? question "Why block 720/1080p encodes in x265? - [Click to show/hide]" + + --8<-- "includes/docker/x265.md" + +{! include-markdown "../../includes/cf-descriptions/x265-no-hdrdv-radarr-warning.md" !} diff --git a/includes/cf-descriptions/x265-no-hdrdv-sonarr-warning.md b/includes/cf-descriptions/x265-no-hdrdv-sonarr-warning.md new file mode 100644 index 0000000000..258bcfc2cc --- /dev/null +++ b/includes/cf-descriptions/x265-no-hdrdv-sonarr-warning.md @@ -0,0 +1 @@ +!!! Danger "If you have also added [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd){:target="\_blank" rel="noopener noreferrer"} to your Sonarr,
then one of them should be scored as `0` in your quality profile." diff --git a/includes/cf-descriptions/x265-no-hdrdv-sonarr.md b/includes/cf-descriptions/x265-no-hdrdv-sonarr.md new file mode 100644 index 0000000000..fda724f0ae --- /dev/null +++ b/includes/cf-descriptions/x265-no-hdrdv-sonarr.md @@ -0,0 +1,11 @@ +This blocks most 720/1080p (HD) releases that are encoded in x265, **But it will allow 720/1080p x265 releases if they have HDR and/or DV** + +*Since some NF releases won't be released as 4k, this allows you to still have the DV/HDR releases.* + +In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` + +??? question "Why block 720/1080p encodes in x265? - [Click to show/hide]" + + --8<-- "includes/docker/x265.md" + +{! include-markdown "../../includes/cf-descriptions/x265-no-hdrdv-sonarr-warning.md" !} diff --git a/includes/cf/radarr-optional-uhd.md b/includes/cf/radarr-optional-uhd.md index 098e46f850..fdfead5ee4 100644 --- a/includes/cf/radarr-optional-uhd.md +++ b/includes/cf/radarr-optional-uhd.md @@ -1,9 +1,16 @@ ??? abstract "Optional UHD - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ----------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------: | ---------------------------------------------- | - | [{{ radarr['cf']['sdr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#sdr) | {{ radarr['cf']['sdr']['trash_scores']['default'] }} | {{ radarr['cf']['sdr']['trash_id'] }} | - | [{{ radarr['cf']['sdr-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#sdr-no-webdl) :warning: | {{ radarr['cf']['sdr-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['sdr-no-webdl']['trash_id'] }} | + !!! tip "I recommend using the following Custom Formats" + + - **For details on "Why" and a potential warning :warning: please see the notes below.** + - `x265 (no HDR/DV)` over the `x265 (HD)` + - `SDR (no WEBDL)` over the `SDR` + + | Custom Format | Score | Trash ID | + | ------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------: | ----------------------------------------------- | + | [{{ radarr['cf']['sdr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#sdr) | {{ radarr['cf']['sdr']['trash_scores']['default'] }} | {{ radarr['cf']['sdr']['trash_id'] }} | + | [{{ radarr['cf']['sdr-no-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#sdr-no-webdl) :warning: | {{ radarr['cf']['sdr-no-webdl']['trash_scores']['default'] }} | {{ radarr['cf']['sdr-no-webdl']['trash_id'] }} | + | [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }} | {{ radarr['cf']['x265-no-hdrdv']['trash_id'] }} | --- @@ -12,4 +19,8 @@ - **{{ radarr['cf']['sdr']['name'] }}:** This will prevent grabbing UHD/4k releases without HDR Formats. - **{{ radarr['cf']['sdr-no-webdl']['name'] }}:** This will prevent grabbing UHD/4k Remux and Bluray encode releases without HDR Formats. - i.e., SDR WEB releases will still be allowed since 4K SDR WEB releases can often look better than the 1080p version due to the improved bitrate. - !!! Danger "Don't use this together with [{{ radarr['cf']['sdr']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#sdr), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/sdr-no-webdl-radarr-warning.md" !} + + - **{{ radarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265, **But it will allow x265 releases if they have HDR and/or DV** + + {! include-markdown "../../includes/cf-descriptions/x265-no-hdrdv-radarr-warning.md" !} diff --git a/includes/cf/radarr-optional.md b/includes/cf/radarr-optional.md index e698bba02e..851aa8a0e1 100644 --- a/includes/cf/radarr-optional.md +++ b/includes/cf/radarr-optional.md @@ -8,7 +8,6 @@ | [{{ 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']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }} | {{ radarr['cf']['x265-no-hdrdv']['trash_id'] }} | --- @@ -21,12 +20,3 @@ - **{{ 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. - - **{{ radarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - - **But it will allow x265 releases if they have HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` - - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" diff --git a/includes/cf/radarr-unwanted-uhd.md b/includes/cf/radarr-unwanted-uhd.md index b06aa4b86c..3859f17d26 100644 --- a/includes/cf/radarr-unwanted-uhd.md +++ b/includes/cf/radarr-unwanted-uhd.md @@ -17,9 +17,9 @@ - **{{ radarr['cf']['br-disk']['name'] }} :** This is a custom format to help Radarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ radarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - **{{ radarr['cf']['lq-release-title']['name'] }}:** A collection of terms seen in the titles of Low Quality releases that are not captured by using a release group name. - - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-radarr-warning.md" !} - **{{ radarr['cf']['3d']['name'] }}:** Is 3D still a thing for home use ? - **{{ radarr['cf']['upscaled']['name'] }}:** A custom format to prevent Radarr from grabbing upscaled releases. diff --git a/includes/cf/radarr-unwanted.md b/includes/cf/radarr-unwanted.md index 3b972d0809..2f291d2ff6 100644 --- a/includes/cf/radarr-unwanted.md +++ b/includes/cf/radarr-unwanted.md @@ -16,9 +16,9 @@ - **{{ radarr['cf']['br-disk']['name'] }} :** This is a custom format to help Radarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ radarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - **{{ radarr['cf']['lq-release-title']['name'] }}:** A collection of terms seen in the titles of Low Quality releases that are not captured by using a release group name. - - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-radarr-warning.md" !} - **{{ radarr['cf']['3d']['name'] }}:** Is 3D still a thing for home use ? - **{{ radarr['cf']['extras']['name'] }}:** Blocks releases that only contain extras diff --git a/includes/cf/sonarr-optional-uhd.md b/includes/cf/sonarr-optional-uhd.md index bdc3555ea7..b7e3553c33 100644 --- a/includes/cf/sonarr-optional-uhd.md +++ b/includes/cf/sonarr-optional-uhd.md @@ -1,13 +1,16 @@ ??? abstract "Optional (UHD) - [Click to show/hide]" - | Custom Format | Score | Trash ID | - | ----------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------: | ---------------------------------------------- | - | [{{ sonarr['cf']['sdr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr) | {{ sonarr['cf']['sdr']['trash_scores']['default'] }} | {{ sonarr['cf']['sdr']['trash_id'] }} | - | [{{ sonarr['cf']['sdr-no-webdl']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr-no-webdl) :warning: | {{ sonarr['cf']['sdr-no-webdl']['trash_scores']['default'] }} | {{ sonarr['cf']['sdr-no-webdl']['trash_id'] }} | + !!! tip "I recommend using the following Custom Formats" - | Custom Format | Score | Trash ID | - | ------------------------------------------------------------------------------------- | :--------------------------------------------------: | ------------------------------------- | - | [{{ sonarr['cf']['sdr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr) | {{ sonarr['cf']['sdr']['trash_scores']['default'] }} | {{ sonarr['cf']['sdr']['trash_id'] }} | + - **For details on "Why" and a potential warning :warning: please see the notes below.** + - `x265 (no HDR/DV)` over the `x265 (HD)` + - `SDR (no WEBDL)` over the `SDR` + + | Custom Format | Score | Trash ID | + | ------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------: | ----------------------------------------------- | + | [{{ sonarr['cf']['sdr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr) | {{ sonarr['cf']['sdr']['trash_scores']['default'] }} | {{ sonarr['cf']['sdr']['trash_id'] }} | + | [{{ sonarr['cf']['sdr-no-webdl']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr-no-webdl) :warning: | {{ sonarr['cf']['sdr-no-webdl']['trash_scores']['default'] }} | {{ sonarr['cf']['sdr-no-webdl']['trash_id'] }} | + | [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ sonarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }} | {{ sonarr['cf']['x265-no-hdrdv']['trash_id'] }} | --- @@ -16,4 +19,8 @@ - **{{ sonarr['cf']['sdr']['name'] }}:** This will prevent grabbing UHD/4k releases without HDR Formats. - **{{ sonarr['cf']['sdr-no-webdl']['name'] }}:** This will prevent grabbing UHD/4k Remux and Bluray encode releases without HDR Formats. - i.e., SDR WEB releases will still be allowed since 4K SDR WEB releases can often look better than the 1080p version due to the improved bitrate. - !!! Danger "Don't use this together with [{{ sonarr['cf']['sdr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#sdr), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/sdr-no-webdl-sonarr-warning.md" !} + + - **{{ sonarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265, **But it will allow x265 releases if they have HDR and/or DV** + + {! include-markdown "../../includes/cf-descriptions/x265-no-hdrdv-sonarr-warning.md" !} diff --git a/includes/cf/sonarr-optional.md b/includes/cf/sonarr-optional.md index d5e74b9e34..73252a2781 100644 --- a/includes/cf/sonarr-optional.md +++ b/includes/cf/sonarr-optional.md @@ -7,7 +7,6 @@ | [{{ sonarr['cf']['obfuscated']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#obfuscated) | {{ sonarr['cf']['obfuscated']['trash_scores']['default'] }} | {{ sonarr['cf']['obfuscated']['trash_id'] }} | | [{{ sonarr['cf']['retags']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#retags) | {{ sonarr['cf']['retags']['trash_scores']['default'] }} | {{ sonarr['cf']['retags']['trash_id'] }} | | [{{ sonarr['cf']['scene']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#scene) | {{ sonarr['cf']['scene']['trash_scores']['default'] }} | {{ sonarr['cf']['scene']['trash_id'] }} | - | [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ sonarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }} | {{ sonarr['cf']['x265-no-hdrdv']['trash_id'] }} | --- @@ -19,12 +18,3 @@ - **{{ 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. - - **{{ sonarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - - **This will allow x265 releases if they have HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ sonarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` - - !!! Danger "Don't use this combined with [{{ sonarr['cf']['x265-hd']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-hd), Only ever apply one of them. :warning:" diff --git a/includes/cf/sonarr-unwanted.md b/includes/cf/sonarr-unwanted.md index a33079a912..0769b766e0 100644 --- a/includes/cf/sonarr-unwanted.md +++ b/includes/cf/sonarr-unwanted.md @@ -15,8 +15,8 @@ - **{{ sonarr['cf']['br-disk']['name'] }} :** This is a custom format to help Sonarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ sonarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - **{{ sonarr['cf']['lq-release-title']['name'] }}:** A collection of terms seen in the titles of Low Quality releases that are not captured by using a release group name. - - **{{ sonarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ sonarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - !!! Danger "Don't use this together with [{{ sonarr['cf']['x265-no-hdrdv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-sonarr-warning.md" !} - **{{ sonarr['cf']['extras']['name'] }}:** This blocks/ignores extras diff --git a/includes/sqp/1-4k-cf-scoring-sqp1.md b/includes/sqp/1-4k-cf-scoring-sqp1.md index 469f12a769..aa8b608cf9 100644 --- a/includes/sqp/1-4k-cf-scoring-sqp1.md +++ b/includes/sqp/1-4k-cf-scoring-sqp1.md @@ -105,20 +105,19 @@ !!! tip "I recommend using the following Custom Formats" - - `x265 (no HDR/DV)` over the `x265 (HD)`, Read the Why below and don't forget to read the warning,
:warning: Only ever include one of them :warning: - `AV1` This will prevent grabbing AV1 releases. !!! danger "Adding any of the `HDR10+ Boosts` could result in less streaming optimized releases :warning:" | Custom Format | Score | Trash ID | | ------------------------------------------------------------------------------------------------------------------- | :-----------------------------------------------------------------: | ---------------------------------------------------- | + | [{{ radarr['cf']['av1']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#av1) | {{ radarr['cf']['av1']['trash_scores']['default'] }} | {{ radarr['cf']['av1']['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']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }} | {{ radarr['cf']['x265-no-hdrdv']['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'] }} | @@ -126,6 +125,7 @@ Breakdown and Why + - **{{ radarr['cf']['av1']['name'] }}**: This will prevent grabbing AV1 releases. - **{{ 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']['evo-no-webdl']['name'] }}:** This group is often banned for low-quality Blu-ray releases, but their WEB-DLs are okay. @@ -133,16 +133,6 @@ - **{{ 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. - - **{{ radarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - - **But it will allow x265 releases if they have HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` - - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:" - - **{{ radarr['cf']['hdr10plus-boost']['name'] }}:** [*Optional*] (use this one only if you have a (Samsung) TV that supports HDR10+ and don't mind the chance to get less streaming optimized releases) - **{{ radarr['cf']['dv-hdr10plus-boost']['name'] }}:** [*Optional*] (use this one only if you don't mind the chance to get less streaming optimized releases) diff --git a/includes/sqp/2-cf-scoring.md b/includes/sqp/2-cf-scoring.md index e72f76d16d..1805bad3fa 100644 --- a/includes/sqp/2-cf-scoring.md +++ b/includes/sqp/2-cf-scoring.md @@ -26,7 +26,7 @@ {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !} -{! include-markdown "../../includes/sqp/sqp-uhd-radarr-optional.md" !} +{! include-markdown "../../includes/cf/radarr-optional.md" !} {! include-markdown "../../includes/cf/radarr-optional-uhd.md" !} diff --git a/includes/sqp/3-cf-scoring.md b/includes/sqp/3-cf-scoring.md index a42e6785e3..b8f7ed0049 100644 --- a/includes/sqp/3-cf-scoring.md +++ b/includes/sqp/3-cf-scoring.md @@ -12,7 +12,7 @@ {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !} -{! include-markdown "../../includes/sqp/sqp-uhd-radarr-optional.md" !} +{! include-markdown "../../includes/cf/radarr-optional.md" !} {! include-markdown "../../includes/cf/radarr-optional-uhd.md" !} diff --git a/includes/sqp/4-cf-scoring.md b/includes/sqp/4-cf-scoring.md index a42e6785e3..b8f7ed0049 100644 --- a/includes/sqp/4-cf-scoring.md +++ b/includes/sqp/4-cf-scoring.md @@ -12,7 +12,7 @@ {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !} -{! include-markdown "../../includes/sqp/sqp-uhd-radarr-optional.md" !} +{! include-markdown "../../includes/cf/radarr-optional.md" !} {! include-markdown "../../includes/cf/radarr-optional-uhd.md" !} diff --git a/includes/sqp/5-cf-scoring.md b/includes/sqp/5-cf-scoring.md index 0ce9ae884c..e24f827d90 100644 --- a/includes/sqp/5-cf-scoring.md +++ b/includes/sqp/5-cf-scoring.md @@ -26,7 +26,7 @@ {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !} -{! include-markdown "../../includes/sqp/sqp-uhd-radarr-optional.md" !} +{! include-markdown "../../includes/cf/radarr-optional.md" !} {! include-markdown "../../includes/cf/radarr-optional-uhd.md" !} diff --git a/includes/sqp/radarr-unwanted-sqp1.md b/includes/sqp/radarr-unwanted-sqp1.md index d9f535b773..155eb8f396 100644 --- a/includes/sqp/radarr-unwanted-sqp1.md +++ b/includes/sqp/radarr-unwanted-sqp1.md @@ -17,9 +17,9 @@ - **{{ radarr['cf']['br-disk']['name'] }} :** This is a custom format to help Radarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ radarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - **{{ radarr['cf']['lq-release-title']['name'] }}:** A collection of terms seen in the titles of Low Quality releases that are not captured by using a release group name. - - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-radarr-warning.md" !} - **{{ radarr['cf']['3d']['name'] }}:** Is 3D still a thing for home use ? - **{{ radarr['cf']['extras']['name'] }}:** Blocks releases that only contain extras diff --git a/includes/sqp/radarr-unwanted-uhd-sqp1.md b/includes/sqp/radarr-unwanted-uhd-sqp1.md index fca5ddec29..5aba1b3697 100644 --- a/includes/sqp/radarr-unwanted-uhd-sqp1.md +++ b/includes/sqp/radarr-unwanted-uhd-sqp1.md @@ -18,9 +18,9 @@ - **{{ radarr['cf']['br-disk']['name'] }} :** This is a custom format to help Radarr recognize & ignore BR-DISK (ISO's and Blu-ray folder structure) in addition to the standard BR-DISK quality. - **{{ radarr['cf']['lq']['name'] }}:** A collection of known Low Quality groups that are often banned from the the top trackers because the lack of quality or other reasons. - **{{ radarr['cf']['lq-release-title']['name'] }}:** A collection of terms seen in the titles of Low Quality releases that are not captured by using a release group name. - - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. + - **{{ radarr['cf']['x265-hd']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv), Only ever include one of them :warning:" + {! include-markdown "../../includes/cf-descriptions/x265-hd-radarr-warning.md" !} - **{{ radarr['cf']['3d']['name'] }}:** Is 3D still a thing for home use ? - **{{ radarr['cf']['upscaled']['name'] }}:** A custom format to prevent Radarr from grabbing upscaled releases. diff --git a/includes/sqp/sqp-uhd-radarr-optional.md b/includes/sqp/sqp-uhd-radarr-optional.md deleted file mode 100644 index ea40453fd7..0000000000 --- a/includes/sqp/sqp-uhd-radarr-optional.md +++ /dev/null @@ -1,34 +0,0 @@ -??? abstract "Optional - [Click to show/hide]" - - !!! tip "**I recommend to use the `x265 (no HDR/DV)` over the `x265 (HD)`, Read the Why below and don't forget to read the warning, :warning: Only ever include one of them :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']['x265-no-hdrdv']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-no-hdrdv) :warning: | {{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }} | {{ radarr['cf']['x265-no-hdrdv']['trash_id'] }} | - - --- - - Breakdown and Why - - - **{{ 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']['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. - - **{{ 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. - - **{{ radarr['cf']['x265-no-hdrdv']['name'] }}:** This blocks 720/1080p (HD) releases that are encoded in x265. - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - - **But it will allow x265 releases if they have HDR and/or DV** - - *Being that some NF releases won't be released as 4k, but you want to have DV/HDR releases.* - - In your quality profile use the following score for this Custom Format: `{{ radarr['cf']['x265-no-hdrdv']['trash_scores']['default'] }}` - - !!! Danger "Don't use this together with [{{ radarr['cf']['x265-hd']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#x265-hd), Only ever include one of them :warning:"