diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 67c7056d4..78e0cc818 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/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 %]] + ``` + +[TOP](#index) + +------ + ### x264 ??? faq "x264 - [CLICK TO EXPAND]" diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index 56206dc3c..3bee411e6 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/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 + ``` ------ diff --git a/docs/json/radarr/dv-hdr10.json b/docs/json/radarr/dv-hdr10.json index 788c2b21f..1b7d8153a 100644 --- a/docs/json/radarr/dv-hdr10.json +++ b/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" } }, { diff --git a/docs/json/radarr/dv-hlg.json b/docs/json/radarr/dv-hlg.json index 0ed32cf5b..58c4f0db0 100644 --- a/docs/json/radarr/dv-hlg.json +++ 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" } }, { diff --git a/docs/json/radarr/dv-sdr.json b/docs/json/radarr/dv-sdr.json index 91ef95328..cde5fbd87 100644 --- a/docs/json/radarr/dv-sdr.json +++ 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" } }, { diff --git a/docs/json/radarr/dv-webdl.json b/docs/json/radarr/dv-webdl.json index 66c283e24..1c54c48e1 100644 --- a/docs/json/radarr/dv-webdl.json +++ 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" } } ] diff --git a/docs/json/radarr/dv.json b/docs/json/radarr/dv.json index 24ecfec0c..52f51fea0 100644 --- a/docs/json/radarr/dv.json +++ 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" } }, { diff --git a/docs/json/radarr/hdr10.json b/docs/json/radarr/hdr10.json index c8882c819..137cffa80 100644 --- a/docs/json/radarr/hdr10.json +++ 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" + } } ] -} \ No newline at end of file +} diff --git a/docs/json/radarr/hdr10plus.json b/docs/json/radarr/hdr10plus.json index 902ed83d2..30b7ff3cf 100644 --- a/docs/json/radarr/hdr10plus.json +++ 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" } }, { diff --git a/docs/json/sonarr/optional.json b/docs/json/sonarr/optional.json index 5aa4ac4c4..f0a544d88 100644 --- a/docs/json/sonarr/optional.json +++ 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" diff --git a/docs/json/sonarr/optionals.json b/docs/json/sonarr/optionals.json index 520b5f03b..a899c306a 100644 --- a/docs/json/sonarr/optionals.json +++ b/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": [{ diff --git a/docs/requirements.txt b/docs/requirements.txt index b70e6bda3..f7f0bb6f9 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,6 +2,6 @@ lightgallery==0.5 mkdocs-awesome-pages-plugin==2.7.0 mkdocs-git-revision-date-localized-plugin==1.0.1 mkdocs-macros-plugin==0.7.0 -mkdocs-material==8.3.0 +mkdocs-material==8.3.3 mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.4 diff --git a/docs/updates.txt b/docs/updates.txt index 4da001443..0d0e567bf 100644 --- a/docs/updates.txt +++ b/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`. diff --git a/includes/cf/misc.md b/includes/cf/misc.md index 22b37cb27..137c7a21f 100644 --- a/includes/cf/misc.md +++ b/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]"