From eefc646e94a1ae631fcee0503c3b68ea885ef33a Mon Sep 17 00:00:00 2001
From: yammes08 <111231042+yammes08@users.noreply.github.com>
Date: Tue, 21 Nov 2023 21:58:11 +0000
Subject: [PATCH] More updates to missing optionals

- Matched Sonarr optional to Radarr optional, substituting Radarr CFs for Sonarr equivalents
- Removed `Retags` from Sonarr UHD optional as UHD optional include is used in addition to non-UHS optionals
- Removed DV (WEBDL) from all optional includes as this info is now in it's own panel (HDR Formats)
- Added Radarr/Sonarr optionals to Radarr/Sonarr public guide pages
- Unrelated, but added jennaortega to LQ (release title) as this group has risen in prevalence
---
 docs/Radarr/radarr-setup-quality-profiles.md |  8 ++++++
 docs/Sonarr/sonarr-setup-quality-profiles.md |  2 ++
 docs/json/radarr/cf/lq-release-title.json    |  9 ++++++
 includes/cf/radarr-optional-uhd.md           |  2 +-
 includes/cf/radarr-optional.md               | 17 +-----------
 includes/cf/sonarr-optional-uhd.md           |  4 +--
 includes/cf/sonarr-optional.md               | 29 ++++++++++++++++----
 7 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/docs/Radarr/radarr-setup-quality-profiles.md b/docs/Radarr/radarr-setup-quality-profiles.md
index 026937694..39f4b6487 100644
--- a/docs/Radarr/radarr-setup-quality-profiles.md
+++ b/docs/Radarr/radarr-setup-quality-profiles.md
@@ -99,6 +99,8 @@ If you prefer High-Quality HD Encodes (Bluray-720p/1080p)
 
 {! include-markdown "../../includes/cf/radarr-unwanted.md" !}
 
+{! include-markdown "../../includes/cf/radarr-optional.md" !}
+
 {! include-markdown "../../includes/cf/radarr-streaming-services.md" !}
 
 I decided not to add `Audio Advanced` Custom Formats to the encodes profile, You will hardly find HD audio with HD Bluray Encodes. With HD Bluray Encodes I suggest going for quality. If you also want HD audio formats I would suggest going with Remuxes or UHD Encodes.
@@ -145,6 +147,8 @@ If you prefer High-Quality UHD Encodes (Bluray-2160p)
 
 {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !}
 
+{! include-markdown "../../includes/cf/radarr-optional.md" !}
+
 {! include-markdown "../../includes/cf/radarr-optional-uhd.md" !}
 
 {! include-markdown "../../includes/cf/radarr-streaming-services.md" !}
@@ -189,6 +193,8 @@ If you prefer 1080p Remuxes (Remux-1080p)
 
 {! include-markdown "../../includes/cf/radarr-unwanted.md" !}
 
+{! include-markdown "../../includes/cf/radarr-optional.md" !}
+
 {! include-markdown "../../includes/cf/radarr-streaming-services.md" !}
 
 Use the following main settings in your profile.
@@ -233,6 +239,8 @@ If you prefer 2160p Remuxes (Remux-2160p)
 
 {! include-markdown "../../includes/cf/radarr-unwanted-uhd.md" !}
 
+{! include-markdown "../../includes/cf/radarr-optional.md" !}
+
 {! include-markdown "../../includes/cf/radarr-optional-uhd.md" !}
 
 {! include-markdown "../../includes/cf/radarr-streaming-services.md" !}
diff --git a/docs/Sonarr/sonarr-setup-quality-profiles.md b/docs/Sonarr/sonarr-setup-quality-profiles.md
index 6d25f6a69..6a85f090d 100644
--- a/docs/Sonarr/sonarr-setup-quality-profiles.md
+++ b/docs/Sonarr/sonarr-setup-quality-profiles.md
@@ -129,6 +129,8 @@ The only deal breaker with 2160p is when the release includes DV/HDR. 2160p with
 
 {! include-markdown "../../includes/cf/sonarr-unwanted.md" !}
 
+{! include-markdown "../../includes/cf/sonarr-optional.md" !}
+
 {! include-markdown "../../includes/cf/sonarr-optional-uhd.md" !}
 
 {! include-markdown "../../includes/cf/sonarr-misc.md" !}
diff --git a/docs/json/radarr/cf/lq-release-title.json b/docs/json/radarr/cf/lq-release-title.json
index 051e65113..f2d5b7cc8 100644
--- a/docs/json/radarr/cf/lq-release-title.json
+++ b/docs/json/radarr/cf/lq-release-title.json
@@ -23,6 +23,15 @@
       "fields": {
         "value": "(?=.*?(\\b2160p\\b))(?=.*?(\\bBiTOR\\b))"
       }
+    },
+    {
+      "name": "jennaortega",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": false,
+      "required": false,
+      "fields": {
+        "value": "(?<!-)\\b(jennaortega(UHD)?)\\b"
+      }
     }
   ]
 }
diff --git a/includes/cf/radarr-optional-uhd.md b/includes/cf/radarr-optional-uhd.md
index 0c029bed9..3a3b0dc98 100644
--- a/includes/cf/radarr-optional-uhd.md
+++ b/includes/cf/radarr-optional-uhd.md
@@ -7,4 +7,4 @@
 
     Breakdown and Why
 
-    - **{{ radarr['cf']['sdr']['name'] }}:** This will help to prevent to grab UHD/4k releases without HDR Formats.
+    - **{{ radarr['cf']['sdr']['name'] }}:** This will prevent grabbing UHD/4k releases without HDR Formats.
diff --git a/includes/cf/radarr-optional.md b/includes/cf/radarr-optional.md
index c9d191227..e1b02cd29 100644
--- a/includes/cf/radarr-optional.md
+++ b/includes/cf/radarr-optional.md
@@ -2,7 +2,6 @@
     | 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']['dv-webdl']['name'] }}](/Radarr/Radarr-collection-of-custom-formats/#dv-webdl)                     |                          :interrobang:                           | {{ radarr['cf']['dv-webdl']['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'] }}      |
@@ -16,24 +15,10 @@
 
     - **{{ 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 first.
     Also they often even rename the release name in to Portuguese.
-    - **{{ radarr['cf']['dv-webdl']['name'] }}:** This is a special Custom Format that Block WEBDL with Dolby Vision but without HDR10 fallback.
-
-        This Custom Format works together with the normal DV Custom Format that you can use to prefer Dolby Vision.
-
-        Most WEBDL from Streaming Services don't have the fallback to HDR10, What can results in playback issues like weird colors if you want to play it on a not Dolby Vision compatible setup.
-
-        Remuxes and Bluray have a fallback to HDR10.
-
-        !!! tip
-            `[DV WEBDL]` = This custom format you need to score depending of your personal use and setup.
-
-            - If you only watch your movies on a setup that completely supports Dolby Vision from start to end then give it a score of `0` or just don't add it.
-            - If you (or family members you share your collection with) have a setup that doesn't support Dolby Vision then you should add this with a score of `{{ radarr['cf']['dv-webdl']['trash_scores']['default'] }}`.
-
     - **{{ radarr['cf']['evo-no-webdl']['name'] }}:** This group is often banned for the low quality Blu-ray releases, but their WEB-DL are okay.
     - **{{ radarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group what 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)
-    - **{{ radarr['cf']['retags']['name'] }}:** [*Optional*] (use these only if you dislike retagged releases)
+    - **{{ radarr['cf']['retags']['name'] }}:** [*Optional*] Use this only if you dislike retagged releases. This will help avoid retagged releases that may no longer meet the quality of the original group
     - **{{ radarr['cf']['scene']['name'] }}:** [*Optional*] (use these only if you dislike 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"}.
 
diff --git a/includes/cf/sonarr-optional-uhd.md b/includes/cf/sonarr-optional-uhd.md
index db7e83732..988958b1d 100644
--- a/includes/cf/sonarr-optional-uhd.md
+++ b/includes/cf/sonarr-optional-uhd.md
@@ -2,11 +2,9 @@
     | 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']['retags']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#retags) | {{ sonarr['cf']['retags']['trash_scores']['default'] }} | {{ sonarr['cf']['retags']['trash_id'] }} |
 
     ------
 
     Breakdown and Why
 
-    - **{{ sonarr['cf']['sdr']['name'] }}:** This will help to prevent to grab UHD/4k releases without HDR Formats.
-    - **{{ sonarr['cf']['retags']['name'] }}:** This will help avoid retagged releases that may no longer meet the quality of the original group (e.g. TGx downsampling a NTb release from 5.1 audio to 2.0 audio yet maintain the NTb naming)
+    - **{{ sonarr['cf']['sdr']['name'] }}:** This will prevent grabbing UHD/4k releases without HDR Formats.
diff --git a/includes/cf/sonarr-optional.md b/includes/cf/sonarr-optional.md
index d2365d48a..55e8f1bdb 100644
--- a/includes/cf/sonarr-optional.md
+++ b/includes/cf/sonarr-optional.md
@@ -1,10 +1,29 @@
-??? abstract "Optional (UHD) - [Click to show/hide]"
-    | Custom Format                                                                               |                          Score                          | Trash ID                                 |
-    | ------------------------------------------------------------------------------------------- | :-----------------------------------------------------: | ---------------------------------------- |
-    | [{{ sonarr['cf']['retags']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#retags) | {{ sonarr['cf']['retags']['trash_scores']['default'] }} | {{ sonarr['cf']['retags']['trash_id'] }} |
+??? abstract "Optional - [Click to show/hide]"
+    | Custom Format                                                                                                       |                              Score                               | Trash ID                                          |
+    | ------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------: | ------------------------------------------------- |
+    | [{{ sonarr['cf']['bad-dual-groups']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#bad-dual-groups)       | {{ sonarr['cf']['bad-dual-groups']['trash_scores']['default'] }} | {{ sonarr['cf']['bad-dual-groups']['trash_id'] }} |
+    | [{{ sonarr['cf']['no-rlsgroup']['name'] }}](/Sonarr/Sonarr-collection-of-custom-formats/#no-rlsgroup)               |   {{ sonarr['cf']['no-rlsgroup']['trash_scores']['default'] }}   | {{ sonarr['cf']['no-rlsgroup']['trash_id'] }}     |
+    | [{{ 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'] }}   |
 
     ------
 
     Breakdown and Why
 
-    - **{{ sonarr['cf']['retags']['name'] }}:** This will help avoid retagged releases that may no longer meet the quality of the original group (e.g. TGx downsampling a NTb release from 5.1 audio to 2.0 audio yet maintain the NTb naming)
+    - **{{ sonarr['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 first.
+    Also they often even rename the release name in to Portuguese.
+    - **{{ sonarr['cf']['no-rlsgroup']['name'] }}:** [*Optional*] Some indexers strip out the release group what 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.
+    - **{{ sonarr['cf']['obfuscated']['name'] }}:** [*Optional*] (use these only if you dislike renamed releases)
+    - **{{ sonarr['cf']['retags']['name'] }}:** [*Optional*] Use this only if you dislike retagged releases. This will help avoid retagged releases that may no longer meet the quality of the original group (e.g. TGx downsampling a NTb release from 5.1 audio to 2.0 audio yet maintain the NTb naming)
+    - **{{ sonarr['cf']['scene']['name'] }}:** [*Optional*] (use these only if you dislike 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"}.
+
+        **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: `{{ 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:"