Merge remote-tracking branch 'upstream/master'

milindpatel63 · Jan 19, 2025 · 75f724a · 75f724a
2 parents 172d99c + fc1086f
commit 75f724a
Show file tree

Hide file tree

Showing 23 changed files with 704 additions and 43 deletions.
diff --git a/includes.json b/includes.json
@@ -286,6 +286,22 @@
       "template": "sonarr/includes/custom-formats/sonarr-v4-custom-formats-bluray-web-2160p-french-multi-vo.yml",
       "id": "sonarr-v4-custom-formats-bluray-web-2160p-french-multi-vo"
     },
+    {
+      "template": "sonarr/includes/custom-formats/sonarr-v4-custom-formats-hd-bluray-web-german.yml",
+      "id": "sonarr-v4-custom-formats-hd-bluray-web-german"
+    },
+    {
+      "template": "sonarr/includes/custom-formats/sonarr-v4-custom-formats-hd-remux-web-german.yml",
+      "id": "sonarr-v4-custom-formats-hd-remux-web-german"
+    },
+    {
+      "template": "sonarr/includes/custom-formats/sonarr-v4-custom-formats-uhd-bluray-web-german.yml",
+      "id": "sonarr-v4-custom-formats-uhd-bluray-web-german"
+    },
+    {
+      "template": "sonarr/includes/custom-formats/sonarr-v4-custom-formats-uhd-remux-web-german.yml",
+      "id": "sonarr-v4-custom-formats-uhd-remux-web-german"
+    },
     {
       "template": "sonarr/includes/quality-definitions/sonarr-quality-definition-anime.yml",
       "id": "sonarr-quality-definition-anime"
@@ -345,6 +361,22 @@
     {
       "template": "sonarr/includes/quality-profiles/sonarr-v4-quality-profile-bluray-web-2160p-french-multi-vo.yml",
       "id": "sonarr-v4-quality-profile-bluray-web-2160p-french-multi-vo"
+    },
+    {
+      "template": "sonarr/includes/quality-profiles/sonarr-v4-quality-profile-hd-bluray-web-german.yml",
+      "id": "sonarr-v4-quality-profile-hd-bluray-web-german"
+    },
+    {
+      "template": "sonarr/includes/quality-profiles/sonarr-v4-quality-profile-hd-remux-web-german.yml",
+      "id": "sonarr-v4-quality-profile-hd-remux-web-german"
+    },
+    {
+      "template": "sonarr/includes/quality-profiles/sonarr-v4-quality-profile-uhd-bluray-web-german.yml",
+      "id": "sonarr-v4-quality-profile-uhd-bluray-web-german"
+    },
+    {
+      "template": "sonarr/includes/quality-profiles/sonarr-v4-quality-profile-uhd-remux-web-german.yml",
+      "id": "sonarr-v4-quality-profile-uhd-remux-web-german"
     }
   ]
 }

diff --git a/radarr/includes/custom-formats/radarr-custom-formats-hd-bluray-web-german.yml b/radarr/includes/custom-formats/radarr-custom-formats-hd-bluray-web-german.yml
@@ -1,15 +1,10 @@
 custom_formats:
-  - trash_ids:
-      # German Audio
-      - f845be10da4f442654c13e1f2c3d6cd5 # German DL
-    assign_scores_to:
-      - name: HD Bluray + WEB (GER)
-        score: 10001
-
   - trash_ids:
       # German Audio
       - 86bc3115eb4e9873ac96904a4a68e19e # German
       - 6aad77771dabe9d3e9d7be86f310b867 # German DL (undefined)
+      - f845be10da4f442654c13e1f2c3d6cd5 # German DL
+      - 4eadb75fb23d09dfc0a8e3f687e72287 # Not German or English
 
       # German HQ Release Groups
       - 54795711b78ea87e56127928c423689b # German Bluray Tier 01

diff --git a/radarr/includes/custom-formats/radarr-custom-formats-uhd-bluray-web-german.yml b/radarr/includes/custom-formats/radarr-custom-formats-uhd-bluray-web-german.yml
@@ -1,15 +1,10 @@
 custom_formats:
-  - trash_ids:
-      # German Audio
-      - f845be10da4f442654c13e1f2c3d6cd5 # German DL
-    assign_scores_to:
-      - name: UHD Bluray + WEB (GER)
-        score: 10001
-
   - trash_ids:
       # German Audio
       - 86bc3115eb4e9873ac96904a4a68e19e # German
       - 6aad77771dabe9d3e9d7be86f310b867 # German DL (undefined)
+      - f845be10da4f442654c13e1f2c3d6cd5 # German DL
+      - 4eadb75fb23d09dfc0a8e3f687e72287 # Not German or English
 
       # German HQ Release Groups
       - 54795711b78ea87e56127928c423689b # German Bluray Tier 01

diff --git a/radarr/includes/custom-formats/radarr-custom-formats-uhd-remux-web-german.yml b/radarr/includes/custom-formats/radarr-custom-formats-uhd-remux-web-german.yml
@@ -1,15 +1,10 @@
 custom_formats:
-  - trash_ids:
-      # German Audio
-      - f845be10da4f442654c13e1f2c3d6cd5 # German DL
-    assign_scores_to:
-      - name: Remux + WEB 2160p (GER)
-        score: 10001
-
   - trash_ids:
       # German Audio
       - 86bc3115eb4e9873ac96904a4a68e19e # German
       - 6aad77771dabe9d3e9d7be86f310b867 # German DL (undefined)
+      - f845be10da4f442654c13e1f2c3d6cd5 # German DL
+      - 4eadb75fb23d09dfc0a8e3f687e72287 # Not German or English
 
       # German HQ Release Groups
       - 8608a2ed20c636b8a62de108e9147713 # German Remux Tier 01

diff --git a/radarr/includes/quality-profiles/radarr-quality-profile-hd-bluray-web-german.yml b/radarr/includes/quality-profiles/radarr-quality-profile-hd-bluray-web-german.yml
@@ -2,10 +2,11 @@ quality_profiles:
   - name: HD Bluray + WEB (GER)
     reset_unmatched_scores:
       enabled: false
+    score_set: german
     upgrade:
       allowed: true
       until_quality: Merged QPs
-      until_score: 25000
+      until_score: 35000
     min_format_score: 0
     quality_sort: top
     qualities:

diff --git a/radarr/includes/quality-profiles/radarr-quality-profile-uhd-bluray-web-german.yml b/radarr/includes/quality-profiles/radarr-quality-profile-uhd-bluray-web-german.yml
@@ -2,10 +2,11 @@ quality_profiles:
   - name: UHD Bluray + WEB (GER)
     reset_unmatched_scores:
       enabled: false
+    score_set: german
     upgrade:
       allowed: true
       until_quality: Merged QPs
-      until_score: 25000
+      until_score: 35000
     min_format_score: 0
     quality_sort: top
     qualities:

diff --git a/radarr/includes/quality-profiles/radarr-quality-profile-uhd-remux-web-german.yml b/radarr/includes/quality-profiles/radarr-quality-profile-uhd-remux-web-german.yml
@@ -2,10 +2,11 @@ quality_profiles:
   - name: Remux + WEB 2160p (GER)
     reset_unmatched_scores:
       enabled: false
+    score_set: german
     upgrade:
       allowed: true
       until_quality: Merged QPs
-      until_score: 25000
+      until_score: 35000
     min_format_score: 0
     quality_sort: top
     qualities:

diff --git a/radarr/templates/german-hd-bluray-web.yml b/radarr/templates/german-hd-bluray-web.yml
@@ -1,6 +1,6 @@
 ###################################################################################################
 # Recyclarr Configuration Template: HD Bluray + WEB (GER)                                         #
-# Updated: 2025-01-10                                                                             #
+# Updated: 2025-01-18                                                                             #
 # Documentation: https://recyclarr.dev                                                            #
 # Note: If you are using multiple profiles in a single instance, please read the following        #
 # documentation about file merging:                                                               #
@@ -48,15 +48,21 @@ radarr:
         assign_scores_to:
           - name: HD Bluray + WEB (GER)
 
-### Others
+### x265 - IMPORTANT: Only use on of the options below.
       - trash_ids:
 #          - 839bea857ed2c0a8e084f3cbdbd65ecb # Uncomment this line to allow HDR/DV x265 HD releases
         assign_scores_to:
           - name: HD Bluray + WEB (GER)
 
       - trash_ids:
-#          - dc98083864ea246d05a42df0d05f81cc # Uncomment this line to allow any x265 HD releases
-#          - e6886871085226c3da1830830146846c # Uncomment this line to allow Generated Dynamic HDR
+#          - dc98083864ea246d05a42df0d05f81cc # Uncomment this line to block all x265 HD releases
         assign_scores_to:
           - name: HD Bluray + WEB (GER)
-            score: 0
+            score: -35000
+
+### Generated Dynamic HDR
+      - trash_ids:
+#          - e6886871085226c3da1830830146846c # Uncomment this line to block Generated Dynamic HDR
+        assign_scores_to:
+          - name: HD Bluray + WEB (GER)
+            score: -35000
diff --git a/radarr/templates/german-uhd-bluray-web.yml b/radarr/templates/german-uhd-bluray-web.yml
@@ -1,6 +1,6 @@
 ###################################################################################################
-# Recyclarr Configuration Template: HD Bluray + WEB (GER)                                         #
-# Updated: 2025-01-10                                                                             #
+# Recyclarr Configuration Template: UHD Bluray + WEB (GER)                                        #
+# Updated: 2025-01-18                                                                             #
 # Documentation: https://recyclarr.dev                                                            #
 # Note: If you are using multiple profiles in a single instance, please read the following        #
 # documentation about file merging:                                                               #
@@ -86,7 +86,7 @@ radarr:
 ### HDR / DV
       - trash_ids:
 # Comment out the next line if you and all of your users' setups are fully DV compatible
-#          - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
+          - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
 
 # HDR10+ Boost - Uncomment the next two lines if any of your devices DO support HDR10+
 #          - b17886cb4158d9fea189859409975758 # HDR10Plus Boost
@@ -104,18 +104,24 @@ radarr:
         assign_scores_to:
           - name: UHD Bluray + WEB (GER)
 
-### Others
+### x265 - IMPORTANT: Only use on of the options below.
       - trash_ids:
 #          - 839bea857ed2c0a8e084f3cbdbd65ecb # Uncomment this line to allow HDR/DV x265 HD releases
         assign_scores_to:
           - name: UHD Bluray + WEB (GER)
 
       - trash_ids:
-#          - dc98083864ea246d05a42df0d05f81cc # Uncomment this line to allow any x265 HD releases
-#          - e6886871085226c3da1830830146846c # Uncomment this line to allow Generated Dynamic HDR
+#          - dc98083864ea246d05a42df0d05f81cc # Uncomment this line to block all x265 HD releases
         assign_scores_to:
           - name: UHD Bluray + WEB (GER)
-            score: 0
+            score: -35000
+
+### Generated Dynamic HDR
+      - trash_ids:
+#          - e6886871085226c3da1830830146846c # Uncomment this line to block Generated Dynamic HDR
+        assign_scores_to:
+          - name: UHD Bluray + WEB (GER)
+            score: -35000
 
 ### Alternative Quality Profile (upgrades 720p > 1080p > 2160p)
 # Uncomment the next 6 lines to use the alternative quality profile with english releases

diff --git a/radarr/templates/german-uhd-remux-web.yml b/radarr/templates/german-uhd-remux-web.yml
@@ -1,6 +1,6 @@
 ###################################################################################################
-# Recyclarr Configuration Template: HD Bluray + WEB (GER)                                         #
-# Updated: 2025-01-10                                                                             #
+# Recyclarr Configuration Template: UHD Remux + WEB (GER)                                         #
+# Updated: 2025-01-18                                                                             #
 # Documentation: https://recyclarr.dev                                                            #
 # Note: If you are using multiple profiles in a single instance, please read the following        #
 # documentation about file merging:                                                               #
@@ -72,7 +72,7 @@ radarr:
 ### HDR / DV
       - trash_ids:
 # Comment out the next line if you and all of your users' setups are fully DV compatible
-#          - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
+          - 923b6abef9b17f937fab56cfcf89e1f1 # DV (WEBDL)
 
 # HDR10+ Boost - Uncomment the next two lines if any of your devices DO support HDR10+
 #          - b17886cb4158d9fea189859409975758 # HDR10Plus Boost
@@ -90,15 +90,21 @@ radarr:
         assign_scores_to:
           - name: Remux + WEB 2160p (GER)
 
-### Others
+### x265 - IMPORTANT: Only use on of the options below.
       - trash_ids:
 #          - 839bea857ed2c0a8e084f3cbdbd65ecb # Uncomment this line to allow HDR/DV x265 HD releases
         assign_scores_to:
           - name: Remux + WEB 2160p (GER)
 
       - trash_ids:
-#          - dc98083864ea246d05a42df0d05f81cc # Uncomment this line to allow any x265 HD releases
-#          - e6886871085226c3da1830830146846c # Uncomment this line to allow Generated Dynamic HDR
+#          - dc98083864ea246d05a42df0d05f81cc # Uncomment this line to block all x265 HD releases
         assign_scores_to:
           - name: Remux + WEB 2160p (GER)
-            score: 0
+            score: -35000
+
+### Generated Dynamic HDR
+      - trash_ids:
+#          - e6886871085226c3da1830830146846c # Uncomment this line to block Generated Dynamic HDR
+        assign_scores_to:
+          - name: Remux + WEB 2160p (GER)
+            score: -35000
diff --git a/sonarr/includes/custom-formats/sonarr-v4-custom-formats-hd-bluray-web-german.yml b/sonarr/includes/custom-formats/sonarr-v4-custom-formats-hd-bluray-web-german.yml
@@ -0,0 +1,66 @@
+custom_formats:
+  - trash_ids:
+      # German Audio
+      - 8a9fcdbb445f2add0505926df3bb7b8a # German
+      - ed51973a811f51985f14e2f6f290e47a # German DL
+      - c5dd0fd675f85487ad5bdf97159180bd # German DL (undefined)
+      - 133589380b89f8f8394320901529bac1 # Not German or English
+
+      # German HQ Release Groups
+      - 7940b2fb0278f27cf4f70187f2be95d6 # German Bluray Tier 01
+      - 83b336a90d90d6b35ca673b007f80661 # German Bluray Tier 02
+      - d8f8e1539827967e0e564833e6c08d33 # German Bluray Tier 03
+      - 68be37323132b35cf333c81a2ac8fc16 # German Web Tier 01
+      - f51b96a50b0e6196cb69724b7833d837 # German Web Tier 02
+      - bda67c2c0aae257308a4723d92475b86 # German Web Tier 03
+      - c2eec878fa1989599c226ce4c287d6a7 # German Scene
+
+      # German Unwanted
+      - a6a6c33d057406aaad978a6902823c35 # German LQ
+      - 237eda4ef550a97da2c9d87b437e500b # German Microsized
+
+      # Resolution
+      - 9aa0ca0d2d66b6f6ee51fc630f46cf6f # German 1080p Booster
+      - c99279ee27a154c2f20d1d505cc99e25 # 720p
+      - 290078c8b266272a5cc8e251b5e2eb0b # 1080p
+
+      # HQ Release Groups
+      - d6819cba26b1a6508138d25fb5e32293 # HD Bluray Tier 01
+      - c2216b7b8aa545dc1ce8388c618f8d57 # HD Bluray Tier 02
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+
+      # Misc
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack3
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD)
+      - 23297a736ca77c0fc8e70f8edd7ee56c # Upscaled
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - dc5f2bb0e0262155b5fedd0f6c5d2b55 # DSCP
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - f6cce30f1733d5c8194222a7507909bb # Hulu
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+    assign_scores_to:
+      - name: HD Bluray + WEB (GER)
diff --git a/sonarr/includes/custom-formats/sonarr-v4-custom-formats-hd-remux-web-german.yml b/sonarr/includes/custom-formats/sonarr-v4-custom-formats-hd-remux-web-german.yml
@@ -0,0 +1,63 @@
+custom_formats:
+  - trash_ids:
+      # German Audio
+      - 8a9fcdbb445f2add0505926df3bb7b8a # German
+      - ed51973a811f51985f14e2f6f290e47a # German DL
+      - c5dd0fd675f85487ad5bdf97159180bd # German DL (undefined)
+      - 133589380b89f8f8394320901529bac1 # Not German or English
+
+      # German HQ Release Groups
+      - da0f005f9c3edf34fc26e18dce8c6573 # German Remux Tier 01
+      - 6bc5ccd80a03e7abb8f556eecd174b73 # German Remux Tier 02
+      - 68be37323132b35cf333c81a2ac8fc16 # German Web Tier 01
+      - f51b96a50b0e6196cb69724b7833d837 # German Web Tier 02
+      - bda67c2c0aae257308a4723d92475b86 # German Web Tier 03
+      - c2eec878fa1989599c226ce4c287d6a7 # German Scene
+
+      # German Unwanted
+      - a6a6c33d057406aaad978a6902823c35 # German LQ
+      - 237eda4ef550a97da2c9d87b437e500b # German Microsized
+
+      # Resolution
+      - 9aa0ca0d2d66b6f6ee51fc630f46cf6f # German 1080p Booster
+      - c99279ee27a154c2f20d1d505cc99e25 # 720p
+      - 290078c8b266272a5cc8e251b5e2eb0b # 1080p
+
+      # HQ Release Groups
+      - e6258996055b9fbab7e9cb2f75819294 # WEB Tier 01
+      - 58790d4e2fdcd9733aa7ae68ba2bb503 # WEB Tier 02
+      - d84935abd3f8556dcd51d4f27e22d0a6 # WEB Tier 03
+
+      # Misc
+      - ec8fa7296b64e8cd390a1600981f3923 # Repack/Proper
+      - eb3d5cc0a2be0db205fb823640db6a3c # Repack2
+      - 44e7c4de10ae50265753082e5dc76047 # Repack3
+
+      # Unwanted
+      - 85c61753df5da1fb2aab6f2a47426b09 # BR-DISK
+      - 9c11cd3f07101cdba90a2d81cf0e56b4 # LQ
+      - 47435ece6b99a0b477caf360e79ba0bb # x265 (HD)
+      - 23297a736ca77c0fc8e70f8edd7ee56c # Upscaled
+      - fbcb31d8dabd2a319072b84fc0b7249c # Extras
+      - 15a05bc7c1a36e2b57fd628f8977e2fc # AV1
+
+      # Streaming Services
+      - d660701077794679fd59e8bdf4ce3a29 # AMZN
+      - f67c9ca88f463a48346062e8ad07713f # ATVP
+      - 77a7b25585c18af08f60b1547bb9b4fb # CC
+      - 36b72f59f4ea20aad9316f475f2d9fbb # DCU
+      - dc5f2bb0e0262155b5fedd0f6c5d2b55 # DSCP
+      - 89358767a60cc28783cdc3d0be9388a4 # DSNP
+      - 7a235133c87f7da4c8cccceca7e3c7a6 # HBO
+      - a880d6abc21e7c16884f3ae393f84179 # HMAX
+      - f6cce30f1733d5c8194222a7507909bb # Hulu
+      - 0ac24a2a68a9700bcb7eeca8e5cd644c # iT
+      - 81d1fbf600e2540cee87f3a23f9d3c1c # MAX
+      - d34870697c9db575f17700212167be23 # NF
+      - 1656adc6d7bb2c8cca6acfb6592db421 # PCOK
+      - c67a75ae4a1715f2bb4d492755ba4195 # PMTP
+      - ae58039e1319178e6be73caab5c42166 # SHO
+      - 1efe8da11bfd74fbbcd4d8117ddb9213 # STAN
+      - 9623c5c9cac8e939c1b9aedd32f640bf # SYFY
+    assign_scores_to:
+      - name: HD Remux + WEB (GER)