Merge branch 'master' into Radarr-french-cf

docs/Radarr/Radarr-collection-of-custom-formats.md

@@ -50,13 +50,14 @@ I also made 3 guides related to this one.
 | Movie Versions                                | Unwanted                           | Misc                                  | HQ Source Groups      | Streaming Services           |
 | --------------------------------------------- | ---------------------------------- | ------------------------------------- | --------------------- | ---------------------------- |
 | [Hybrid](#hybrid)                             | [BR-DISK](#br-disk)                | [Repack/Proper](#repack-proper)       | [HQ-Remux](#hq-remux) | [Amazon](#amazon)            |
-| [Remaster](#remaster)                         | [EVO (no WEBDL)](#evo-no-webdl)    | [Multi](#multi)                       | [HQ](#hq)             | [Apple TV+](#apple-tvplus)   |
-| [4K Remaster](#4k-remaster)                   | [LQ](#lq)                          | [x264](#x264)                         | [HQ-WEBDL](#hq-webdl) | [Disney+](#disneyplus)       |
-| [Special Editions](#special-edition)          | [x265 (720/1080p)](#x265-7201080p) | [x265](#x265)                         |                       | [HBO Max](#hbo-max)          |
-| [Criterion Collection](#criterion-collection) | [3D](#3d)                          | [MPEG2](#mpeg2)                       |                       | [Hulu](#hulu)                |
-| [Theatrical Cut](#theatrical-cut)             | [No-RlsGroup](#no-rlsgroup)        | [FreeLeech](#freeleech)               |                       | [Netflix](#netflix)          |
-| [IMAX](#imax)                                 | [Obfuscated](#obfuscated)          | [Dutch Groups](#dutch-groups)         |                       | [Peacock TV](#peacock-tv)    |
-| [IMAX Enhanced](#imax-enhanced)               | [DV (WEBDL)](#dv-webdl)            | [Anime Dual Audio](#anime-dual-audio) |                       | [Paramount+](#paramountplus) |
+| [Remaster](#remaster)                         | [EVO (no WEBDL)](#evo-no-webdl)    | [Repack2](#repack2)                   | [HQ](#hq)             | [Apple TV+](#apple-tvplus)   |
+| [4K Remaster](#4k-remaster)                   | [LQ](#lq)                          | [Multi](#multi)                       | [HQ-WEBDL](#hq-webdl) | [Disney+](#disneyplus)       |
+| [Special Editions](#special-edition)          | [x265 (720/1080p)](#x265-7201080p) | [x264](#x264)                         |                       | [HBO Max](#hbo-max)          |
+| [Criterion Collection](#criterion-collection) | [3D](#3d)                          | [x265](#x265)                         |                       | [Hulu](#hulu)                |
+| [Theatrical Cut](#theatrical-cut)             | [No-RlsGroup](#no-rlsgroup)        | [MPEG2](#mpeg2)                       |                       | [Netflix](#netflix)          |
+| [IMAX](#imax)                                 | [Obfuscated](#obfuscated)          | [FreeLeech](#freeleech)               |                       | [Peacock TV](#peacock-tv)    |
+| [IMAX Enhanced](#imax-enhanced)               | [DV (WEBDL)](#dv-webdl)            | [Dutch Groups](#dutch-groups)         |                       | [Paramount+](#paramountplus) |
+|                                               |                                    | [Anime Dual Audio](#anime-dual-audio) |                       |                              |
 
 ------
 
@@ -1002,6 +1003,18 @@ I also made 3 guides related to this one.
 
 ------
 
+### Repack2
+
+??? example "JSON - [CLICK TO EXPAND]"
+
+    ```json
+    [[% filter indent(width=4) %]][[% include 'json/radarr/repack2.json' %]][[% endfilter %]]
+    ```
+
+<sub><sup>[TOP](#index)</sup>
+
+------
+
 ### x264
 
 ??? faq "x264 - [CLICK TO EXPAND]"

docs/Sonarr/Sonarr-Release-Profile-RegEx.md

@@ -497,7 +497,8 @@ Add this to your `Must not contain (2)`
 Add this to your `Must not contain (2)`
 
 ```bash
-/^(?!.*(-deflate|-inflate))(?=.*([_. ]WEB[_. ]|\bCAKES\b|GGEZ|GGWP|GLHF)).*/i
+/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ]|-CAKES\b|-GGEZ\b|-GGWP\b|-GLHF\b|-KOGI\b)).*/i
+
 ```
 
 ------

docs/json/radarr/dv-hdr10.json

@@ -10,7 +10,7 @@
       "negate": false,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     },
     {

docs/json/radarr/dv-hlg.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     },
     {

docs/json/radarr/dv-sdr.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     },
     {

docs/json/radarr/dv-webdl.json

@@ -46,7 +46,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     }
   ]

docs/json/radarr/dv.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     },
     {

docs/json/radarr/hdr10.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     },
     {
@@ -57,6 +57,15 @@
       "fields": {
         "value": "\\bSDR(\\b|\\d)"
       }
+    },
+    {
+      "name": "Not DV",
+      "implementation": "ReleaseTitleSpecification",
+      "negate": true,
+      "required": true,
+      "fields": {
+        "value": "\\b(dv|dovi|dolby[ .]?vision)\\b"
+      }
     }
   ]
-}
+}

docs/json/radarr/hdr10plus.json

@@ -19,7 +19,7 @@
       "negate": true,
       "required": true,
       "fields": {
-        "value": "\\b(DV[ .]HDR10)\\b"
+        "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b"
       }
     },
     {

docs/json/sonarr/optional.json

@@ -1,4 +1,6 @@
 {
+  "!!! DEPRECATED !!!": "This JSON only exists as fallback for people still using the old trash-sync",
+
   "ignore": [{
     "name": "Golden rule",
     "term": "/(?=(1080|720)).*((x|h)[ ._-]?265|hevc)/i"

docs/json/sonarr/optionals.json

@@ -16,7 +16,7 @@
   }, {
     "name": "Ignore so called scene releases",
     "trash_id": "5bc23c3a055a1a5d8bbe4fb49d80e0cb",
-    "term": "/^(?!.*(-deflate|-inflate))(?=.*([_. ]WEB[_. ]|\\bCAKES\\b|GGEZ|GGWP|GLHF)).*/i"
+    "term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ]|-CAKES\\b|-GGEZ\\b|-GGWP\\b|-GLHF\\b|-KOGI\\b)).*/i"
   }],
   "required": [],
   "preferred": [{

docs/updates.txt

@@ -1,3 +1,14 @@
+# 2022-06-08
+Radarr cf dv hdr10 fix for bad (re)named files #615
+- Added: Fix for bad (re)named DV HDR10 releases.
+- Added: `Not DV` Condition to `[HDR10]` prevent double scoring for bad (re)named DV HDR10 Releases.
+Radarr CF Repack2 added to collection and instructions #616
+- Added: CF `[Repack2]` to the collection.
+- Updated: How to setup Custom Formats to support `[Repack2]`.
+Added KOGI to the Dislike Scene Releases for indexers that rename #619
+- Added: KOGI to the Dislike Scene Releases for indexers that rename.
+- Added: DEPRECATED warning for the optional.json, please use optionals.json.
+
 # 2022-06-03
 Radarr CF [Repack2] #607
 - NEW: Radarr CF `[Repack2]` with a score of `6`.

includes/cf/misc.md

@@ -2,6 +2,7 @@
     | Custom Format        | Score | LINK |
     | -------------------- | ----- | ---- |
     | Repack/Proper        |     5 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#repack-proper){: .header-icons target=_blank rel="noopener noreferrer" } |
+    | Repack2              |     6 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#repack2){: .header-icons target=_blank rel="noopener noreferrer" } |
 
     ??? tip "Proper and Repacks - [CLICK TO EXPAND]"