From de18fe19d2c93b56aeef5b7591e26c8b9f23b75d Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 21:01:33 +0200 Subject: [PATCH 1/7] Replaced/Renamed to ddplus-atmos.json - Replaced/Renamed: `dd-atmos.sjon` to `ddplus-atmos.json` to be consistent. --- docs/json/radarr/{dd-atmos.json => ddplus-atmos.json} | 0 includes/cf/audio.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename docs/json/radarr/{dd-atmos.json => ddplus-atmos.json} (100%) diff --git a/docs/json/radarr/dd-atmos.json b/docs/json/radarr/ddplus-atmos.json similarity index 100% rename from docs/json/radarr/dd-atmos.json rename to docs/json/radarr/ddplus-atmos.json diff --git a/includes/cf/audio.md b/includes/cf/audio.md index b210b945a..a17b27c40 100644 --- a/includes/cf/audio.md +++ b/includes/cf/audio.md @@ -4,7 +4,7 @@ | TrueHD ATMOS | 5000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#truehd-atmos){: .header-icons target=_blank rel="noopener noreferrer" } | | DTS X | 4500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#dts-x){: .header-icons target=_blank rel="noopener noreferrer" } | | ATMOS (undefined) | 3000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#atmos-undefined){: .header-icons target=_blank rel="noopener noreferrer" } | - | DD+ ATMOS | 3000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#dd-atmos){: .header-icons target=_blank rel="noopener noreferrer" } | + | DD+ ATMOS | 3000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#ddplus-atmos){: .header-icons target=_blank rel="noopener noreferrer" } | | TrueHD | 2750 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#truehd){: .header-icons target=_blank rel="noopener noreferrer" } | | DTS-HD MA | 2500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#dts-hd-ma){: .header-icons target=_blank rel="noopener noreferrer" } | | FLAC | 2250 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#flac){: .header-icons target=_blank rel="noopener noreferrer" } | From e42c1c0560c04687227b3f4febdaba203f74074c Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 21:03:00 +0200 Subject: [PATCH 2/7] Added: Scoring - Added: Scoring --- docs/json/radarr/mp3.json | 1 + docs/json/radarr/opus.json | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/json/radarr/mp3.json b/docs/json/radarr/mp3.json index 2f546cc1e..5edfb111b 100644 --- a/docs/json/radarr/mp3.json +++ b/docs/json/radarr/mp3.json @@ -1,5 +1,6 @@ { "trash_id": "6ba9033150e7896bdc9ec4b44f2b230f", + "trash_score": "500", "name": "MP3", "includeCustomFormatWhenRenaming": false, "specifications": [{ diff --git a/docs/json/radarr/opus.json b/docs/json/radarr/opus.json index 00b510ec5..055faa6e2 100644 --- a/docs/json/radarr/opus.json +++ b/docs/json/radarr/opus.json @@ -1,5 +1,6 @@ { "trash_id": "a061e2e700f81932daf888599f8a8273", + "trash_score": "250", "name": "Opus", "includeCustomFormatWhenRenaming": false, "specifications": [{ From cb01732ad19ed90949032e9fbb82e743f09616d6 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 21:09:33 +0200 Subject: [PATCH 3/7] Fixed: CF [MA] for false positive - Fixed: CF [MA] for false positive. --- docs/json/radarr/ma.json | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/docs/json/radarr/ma.json b/docs/json/radarr/ma.json index 58560a116..d5883fd9f 100644 --- a/docs/json/radarr/ma.json +++ b/docs/json/radarr/ma.json @@ -10,34 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "\\b(ma)\\b" - } - }, - { - "name": "Not DTS-HD MA", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "dts[ .-]?(ma\\b|hd[ .-]?ma|hd)(?!china|r)" - } - }, - { - "name": "WEBDL", - "implementation": "SourceSpecification", - "negate": false, - "required": false, - "fields": { - "value": 7 - } - }, - { - "name": "WEBRIP", - "implementation": "SourceSpecification", - "negate": false, - "required": false, - "fields": { - "value": 8 + "value": "\\b(ma)\\b(?=.*\\bweb[ ._-]?(dl|rip)\\b)" } } ] From c65d6e11a64d76c2b9e2b9965881e3258344cc82 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 21:12:37 +0200 Subject: [PATCH 4/7] Separated: CF [Obfuscated] conditions - Separated: CF [Obfuscated] conditions and created CF [Retags]. --- .../Radarr-collection-of-custom-formats.md | 26 +++- docs/json/radarr/obfuscated.json | 143 +++++++++++++++++- includes/cf/unwanted.md | 4 +- 3 files changed, 163 insertions(+), 10 deletions(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index f7ce72026..9438d40e7 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -37,7 +37,7 @@ I also made 3 guides related to this one. | [TrueHD ATMOS](#truehd-atmos) | [FLAC](#flac) | [1.0 Mono](#10-mono) | [DV HDR10](#dv-hdr10) | | [DTS X](#dts-x) | [PCM](#pcm) | [2.0 Stereo](#20-stereo) | [DV](#dv) | | [ATMOS (undefined)](#atmos-undefined) | [DTS-HD HRA](#dts-hd-hra) | [3.0 Sound](#30-sound) | [DV HLG](#dv-hlg) | -| [DD+ ATMOS](#dd-atmos) | [AAC](#aac) | [4.0 Sound](#40-sound) | [DV SDR](#dv-sdr) | +| [DD+ ATMOS](#ddplus-atmos) | [AAC](#aac) | [4.0 Sound](#40-sound) | [DV SDR](#dv-sdr) | | [TrueHD](#truehd) | [DD](#dd) | [5.1 Surround](#51-surround) | [HDR10+](#hdr10plus) | | [DTS-HD MA](#dts-hd-ma) | [MP3](#mp3) | [6.1 Surround](#61-surround) | [HDR10](#hdr10) | | [DD+](#ddplus) | [Opus](#opus) | [7.1 Surround](#71-surround) | [HDR](#hdr) | @@ -56,8 +56,8 @@ I also made 3 guides related to this one. | [Criterion Collection](#criterion-collection) | [3D](#3d) | [x265](#x265) | | [Hulu](#hulu) | | [Theatrical Cut](#theatrical-cut) | [No-RlsGroup](#no-rlsgroup) | [MPEG2](#mpeg2) | | [Netflix](#nf) | | [IMAX](#imax) | [Obfuscated](#obfuscated) | [FreeLeech](#freeleech) | | [Peacock TV](#pcok) | -| [IMAX Enhanced](#imax-enhanced) | [DV (WEBDL)](#dv-webdl) | [Dutch Groups](#dutch-groups) | | [Paramount+](#pmtp) | -| | | [Anime Dual Audio](#anime-dual-audio) | | [Movies Anywhere](#ma) | +| [IMAX Enhanced](#imax-enhanced) | [Retags](#retags) | [Dutch Groups](#dutch-groups) | | [Paramount+](#pmtp) | +| | [DV (WEBDL)](#dv-webdl) | [Anime Dual Audio](#anime-dual-audio) | | [Movies Anywhere](#ma) | ------ @@ -127,7 +127,7 @@ I also made 3 guides related to this one. ??? example "JSON - [CLICK TO EXPAND]" ```json - [[% filter indent(width=4) %]][[% include 'json/radarr/dd-atmos.json' %]][[% endfilter %]] + [[% filter indent(width=4) %]][[% include 'json/radarr/ddplus-atmos.json' %]][[% endfilter %]] ``` [TOP](#index) @@ -952,7 +952,7 @@ I also made 3 guides related to this one. ??? faq "Obfuscated - [CLICK TO EXPAND]" - Optional (use these only if you dislike renamed and retagged releases) + Optional (use these only if you dislike renamed releases) ??? example "JSON - [CLICK TO EXPAND]" @@ -964,6 +964,22 @@ I also made 3 guides related to this one. ------ +### Retags + +??? faq "Retags - [CLICK TO EXPAND]" + + Optional (use these only if you dislike retagged releases) + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/retags.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### DV (WEBDL) Dolby Vision = DoVi = DV diff --git a/docs/json/radarr/obfuscated.json b/docs/json/radarr/obfuscated.json index 9fc5a8206..f08f5f62a 100644 --- a/docs/json/radarr/obfuscated.json +++ b/docs/json/radarr/obfuscated.json @@ -4,23 +4,158 @@ "name": "Obfuscated", "includeCustomFormatWhenRenaming": false, "specifications": [ + { + "name": "4P", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-4P\\b" + } + }, + { + "name": "4Planet", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-4Planet\\b" + } + }, + { + "name": "AsRequested", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-AsRequested\\b" + } + }, + { + "name": "BUYMORE", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-BUYMORE\\b" + } + }, + { + "name": "Chamele0n", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-Chamele0n\\b" + } + }, + { + "name": "GEROV", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-GEROV\\b" + } + }, + { + "name": "iNC0GNiTO", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-iNC0GNiTO\\b" + } + }, + { + "name": "NZBGeek", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-NZBGeek\\b" + } + }, { "name": "Obfuscated", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "(-4P|-4Planet|-AsRequested|-BUYMORE|-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek|-Obfuscated|-postbot|-Rakuv|-Scrambled|-WhiteRev|-xpost|-WRTEAM|-CAPTCHA|_nzb)\\b" + "value": "-Obfuscated\\b" + } + }, + { + "name": "postbot", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-postbot\\b" + } + }, + { + "name": "Rakuv", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-Rakuv\\b" + } + }, + { + "name": "Scrambled", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Scrambled\\b" + } + }, + { + "name": "WhiteRev", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-WhiteRev\\b" + } + }, + { + "name": "xpost", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-xpost\\b" + } + }, + { + "name": "WRTEAM", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-WRTEAM\\b" + } + }, + { + "name": "CAPTCHA", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-CAPTCHA\\b" } }, { - "name": "Retagged", + "name": "_nzb", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "(\\[rartv\\]|\\[eztv\\]|\\[TGx\\])" + "value": "_nzb\\b" } } ] -} \ No newline at end of file +} diff --git a/includes/cf/unwanted.md b/includes/cf/unwanted.md index 1ca875b42..aea297fa6 100644 --- a/includes/cf/unwanted.md +++ b/includes/cf/unwanted.md @@ -8,6 +8,7 @@ | 3D | -10000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#3d){: .header-icons target=_blank rel="noopener noreferrer" } | | No-RlsGroup | -10000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#no-rlsgroup){: .header-icons target=_blank rel="noopener noreferrer" } | | Obfuscated | -10000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#obfuscated){: .header-icons target=_blank rel="noopener noreferrer" } | + | Retags | -10000 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#retags){: .header-icons target=_blank rel="noopener noreferrer" } | | DV (WEBDL) | ?????? | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#dv-webdl){: .header-icons target=_blank rel="noopener noreferrer" } | ??? example "Breakdown and Why - [CLICK TO EXPAND]" @@ -18,7 +19,8 @@ - **x265 (720/1080p):** This blocks/ignores 720/1080p releases that are encoded in x265 - More info [HERE](/Misc/x265-4k/){:target="_blank" rel="noopener noreferrer"}. - **3D:** Is 3D still a thing for home use ? - **No-RlsGroup:** [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. - - **Obfuscated:** [Optional] (use these only if you dislike renamed and retagged releases) + - **Obfuscated:** [Optional] (use these only if you dislike renamed releases) + - **Retags:** [Optional] (use these only if you dislike retagged releases) - **DV (WEBDL):** 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. From 0aba9f20ab29de93fa9f8f092b13b38888d6c80a Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 21:14:16 +0200 Subject: [PATCH 5/7] Added: NEW CF `[Retags]` - Added: NEW CF `[Retags]` with a score of `-10000` --- docs/json/radarr/retags.json | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 docs/json/radarr/retags.json diff --git a/docs/json/radarr/retags.json b/docs/json/radarr/retags.json new file mode 100644 index 000000000..0d703af16 --- /dev/null +++ b/docs/json/radarr/retags.json @@ -0,0 +1,44 @@ +{ + "trash_id": "5c44f52a8714fdd79bb4d98e2673be1f", + "trash_score": "-10000", + "name": "Retags", + "includeCustomFormatWhenRenaming": false, + "specifications": [ + { + "name": "[rartv]", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\[rartv\\]" + } + }, + { + "name": "[rarbg]", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\[rarbg\\]" + } + }, + { + "name": "[eztv]", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\[eztv\\]" + } + }, + { + "name": "[TGx]", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\[TGx\\]" + } + } + ] +} From 57747ed8f10965b3062d4029504c315661cfa04b Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 21:23:06 +0200 Subject: [PATCH 6/7] # 2022-07-10 # 2022-07-10 --- docs/updates.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 97bc8996e..439d85258 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,21 @@ +# 2022-07-10 +Radarr cf 20220710 #661 +- Replaced/Renamed: `dd-atmos.json` to `ddplus-atmos.json` to be consistent. +- Added: Scoring to CF `[MP3]` => `500`. +- Added: Scoring to CF `[Opus]` => `250`. +- Fixed: CF [MA] for false positive. +- Separated: CF [Obfuscated] conditions and created CF [Retags]. +- Added: NEW CF `[Retags]` with a score of `-10000`. +How to check if hardlinks work formatting fix #660 +- Fixed: formatting to make it more clear. +How to run the unRaid mover for qBittorent seeding torrents - formatting #659 +- Fixed: formatting to make it more understandable. +Added Streaming Service CF for MoviesAnywhere #657 +- Added: Streaming Service CF for MoviesAnywhere. +Add missing bots to Clean.py (SABnzbd) #656 +- Add: missing bots to Clean script (SABnzbd). +- Optimize regex matching in Clean script (SABnzbd). + # 2022-07-06 Changed: CF HDR10 to match HDR to prevent loops #655 - Changed: CF `HDR10` to match `HDR` to prevent loops `550` to `500`. From eb5d8a7c001ec5a55c2a6521913cda0db4fefcd7 Mon Sep 17 00:00:00 2001 From: nitsua Date: Sun, 10 Jul 2022 20:58:05 -0400 Subject: [PATCH 7/7] Update ma.json Remove 0 score from ma.json --- docs/json/radarr/ma.json | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/json/radarr/ma.json b/docs/json/radarr/ma.json index d5883fd9f..2236a5991 100644 --- a/docs/json/radarr/ma.json +++ b/docs/json/radarr/ma.json @@ -1,6 +1,5 @@ { "trash_id": "2a6039655313bf5dab1e43523b62c374", - "trash_score": "0", "name": "MA", "includeCustomFormatWhenRenaming": true, "specifications": [