From c2659977583247a8d2e37435bf1b9a3607af9630 Mon Sep 17 00:00:00 2001 From: FonduemangVI Date: Thu, 22 Jun 2023 20:51:22 +1000 Subject: [PATCH 1/6] feat(anime) - major anime updates --- .../anime-bd-tier-01-top-seadex-muxers.json | 12 +++---- .../cf/anime-bd-tier-02-seadex-muxers.json | 34 ++++++++++++++----- .../cf/anime-bd-tier-04-seadex-muxers.json | 9 ----- .../radarr/cf/anime-web-tier-01-muxers.json | 16 ++++----- .../cf/anime-web-tier-02-top-fansubs.json | 18 ++++++++++ .../cf/anime-web-tier-03-official-subs.json | 4 +-- .../cf/anime-web-tier-04-official-subs.json | 18 ++++++++++ docs/json/radarr/cf/dubs-only.json | 2 +- docs/json/radarr/cf/multi.json | 2 +- .../anime-bd-tier-01-top-seadex-muxers.json | 12 +++---- .../cf/anime-bd-tier-02-seadex-muxers.json | 34 ++++++++++++++----- .../cf/anime-bd-tier-04-seadex-muxers.json | 9 ----- .../sonarr/cf/anime-web-tier-01-muxers.json | 16 ++++----- .../cf/anime-web-tier-02-top-fansubs.json | 18 ++++++++++ .../cf/anime-web-tier-03-official-subs.json | 4 +-- .../cf/anime-web-tier-04-official-subs.json | 18 ++++++++++ docs/json/sonarr/cf/cr.json | 2 +- docs/json/sonarr/cf/funi.json | 2 +- docs/json/sonarr/cf/multi.json | 2 +- docs/updates.txt | 21 ++++++++++++ 20 files changed, 182 insertions(+), 71 deletions(-) diff --git a/docs/json/radarr/cf/anime-bd-tier-01-top-seadex-muxers.json b/docs/json/radarr/cf/anime-bd-tier-01-top-seadex-muxers.json index 4272a288b..ef683f23b 100644 --- a/docs/json/radarr/cf/anime-bd-tier-01-top-seadex-muxers.json +++ b/docs/json/radarr/cf/anime-bd-tier-01-top-seadex-muxers.json @@ -32,21 +32,21 @@ } }, { - "name": "CsS", + "name": "Legion", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(CsS)\\b" + "value": "\\[Legion\\]|-Legion\\b" } }, { - "name": "Legion", + "name": "LYS1TH3A", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\[Legion\\]|-Legion\\b" + "value": "\\b(LYS1TH3A)\\b" } }, { @@ -77,12 +77,12 @@ } }, { - "name": "Spirale", + "name": "smol", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Spirale)\\b" + "value": "\\[smol\\]|-smol\\b" } }, { diff --git a/docs/json/radarr/cf/anime-bd-tier-02-seadex-muxers.json b/docs/json/radarr/cf/anime-bd-tier-02-seadex-muxers.json index 257ad05f9..ea224638a 100644 --- a/docs/json/radarr/cf/anime-bd-tier-02-seadex-muxers.json +++ b/docs/json/radarr/cf/anime-bd-tier-02-seadex-muxers.json @@ -121,6 +121,15 @@ "value": "\\b(CUNNY)\\b" } }, + { + "name": "CsS", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(CsS)\\b" + } + }, { "name": "D-Z0N3", "implementation": "ReleaseTitleSpecification", @@ -212,39 +221,39 @@ } }, { - "name": "LYS1TH3A", + "name": "Matsya", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(LYS1TH3A)\\b" + "value": "\\b(Matsya)\\b" } }, { - "name": "Matsya", + "name": "MC", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Matsya)\\b" + "value": "\\b(MC)\\b" } }, { - "name": "MC", + "name": "Metal", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(MC)\\b" + "value": "\\[Metal\\]|-Metal\\b" } }, { - "name": "Metal", + "name": "MTBB", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\[Metal\\]|-Metal\\b" + "value": "\\b(MTBB)\\b" } }, { @@ -319,6 +328,15 @@ "value": "\\[Smoke\\]|-Smoke\\b" } }, + { + "name": "Spirale", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Spirale)\\b" + } + }, { "name": "Thighs", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/anime-bd-tier-04-seadex-muxers.json b/docs/json/radarr/cf/anime-bd-tier-04-seadex-muxers.json index f7e00f475..8cd56a08c 100644 --- a/docs/json/radarr/cf/anime-bd-tier-04-seadex-muxers.json +++ b/docs/json/radarr/cf/anime-bd-tier-04-seadex-muxers.json @@ -346,15 +346,6 @@ "value": "\\b(Koitern)\\b" } }, - { - "name": "MTBB", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": false, - "fields": { - "value": "\\b(MTBB)\\b" - } - }, { "name": "Commie", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/anime-web-tier-01-muxers.json b/docs/json/radarr/cf/anime-web-tier-01-muxers.json index 15caad4d3..f6e36f0ce 100644 --- a/docs/json/radarr/cf/anime-web-tier-01-muxers.json +++ b/docs/json/radarr/cf/anime-web-tier-01-muxers.json @@ -59,39 +59,39 @@ } }, { - "name": "Reza", + "name": "sam", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Reza)\\b" + "value": "\\[sam\\]|-sam\\b" } }, { - "name": "sam", + "name": "SCY", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\[sam\\]|-sam\\b" + "value": "\\b(SCY)\\b" } }, { - "name": "SCY", + "name": "Setsugen", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(SCY)\\b" + "value": "\\b(Setsugen)\\b" } }, { - "name": "Setsugen", + "name": "smol", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(Setsugen)\\b" + "value": "\\[smol\\]|-smol\\b" } }, { diff --git a/docs/json/radarr/cf/anime-web-tier-02-top-fansubs.json b/docs/json/radarr/cf/anime-web-tier-02-top-fansubs.json index 86fac1bef..ab47a7705 100644 --- a/docs/json/radarr/cf/anime-web-tier-02-top-fansubs.json +++ b/docs/json/radarr/cf/anime-web-tier-02-top-fansubs.json @@ -85,6 +85,15 @@ "value": "\\b(GSK[._-]kun)\\b" } }, + { + "name": "HatSubs", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(HatSubs)\\b" + } + }, { "name": "MTBB", "implementation": "ReleaseTitleSpecification", @@ -112,6 +121,15 @@ "value": "\\[Pizza\\]|-Pizza\\b" } }, + { + "name": "Reza", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(Reza)\\b" + } + }, { "name": "Slyfox", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/radarr/cf/anime-web-tier-03-official-subs.json b/docs/json/radarr/cf/anime-web-tier-03-official-subs.json index 7195edbb4..661976e89 100644 --- a/docs/json/radarr/cf/anime-web-tier-03-official-subs.json +++ b/docs/json/radarr/cf/anime-web-tier-03-official-subs.json @@ -32,12 +32,12 @@ } }, { - "name": "VARYG", + "name": "SubsPlus+", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(VARYG)\\b" + "value": "\\b(SubsPlus\\+?)\\b" } }, { diff --git a/docs/json/radarr/cf/anime-web-tier-04-official-subs.json b/docs/json/radarr/cf/anime-web-tier-04-official-subs.json index 4844f1976..8e241f8ba 100644 --- a/docs/json/radarr/cf/anime-web-tier-04-official-subs.json +++ b/docs/json/radarr/cf/anime-web-tier-04-official-subs.json @@ -111,6 +111,24 @@ "fields": { "value": "\\b(URANIME)\\b" } + }, + { + "name": "VARYG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(VARYG)\\b(?=.*Multi[ _-]?Sub)" + } + }, + { + "name": "ZigZag", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(ZigZag)\\b(?=.*Multi[ _-]?Sub)" + } } ] } diff --git a/docs/json/radarr/cf/dubs-only.json b/docs/json/radarr/cf/dubs-only.json index 416be656c..8427b5e55 100644 --- a/docs/json/radarr/cf/dubs-only.json +++ b/docs/json/radarr/cf/dubs-only.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(dub(bed)?)\\b|(funi|eng(lish)?)_?dub" + "value": "(? Date: Thu, 22 Jun 2023 20:55:39 +1000 Subject: [PATCH 2/6] feat(anime) - update streaming services scores --- includes/cf/sonarr-streaming-services-anime.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/cf/sonarr-streaming-services-anime.md b/includes/cf/sonarr-streaming-services-anime.md index 9b57a04b2..d8567590e 100644 --- a/includes/cf/sonarr-streaming-services-anime.md +++ b/includes/cf/sonarr-streaming-services-anime.md @@ -1,12 +1,12 @@ ??? abstract "Anime Streaming Services - [CLICK TO EXPAND]" | Custom Format | Score | Trash ID | | ----------------------------------------------------------------------------------------------- | ----------------------------------------- | ------------------------------------------ | - | [{{ sonarr['cf']['amzn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#amzn) | 1 | {{ sonarr['cf']['amzn']['trash_id'] }} | + | [{{ sonarr['cf']['amzn']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#amzn) | 3 | {{ sonarr['cf']['amzn']['trash_id'] }} | | [{{ sonarr['cf']['bglobal']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#b-global) | 0 | {{ sonarr['cf']['bglobal']['trash_id'] }} | | [{{ sonarr['cf']['bilibili']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#bilibili) | 0 | {{ sonarr['cf']['bilibili']['trash_id'] }} | | [{{ sonarr['cf']['cr']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#cr) | {{ sonarr['cf']['cr']['trash_score'] }} | {{ sonarr['cf']['cr']['trash_id'] }} | - | [{{ sonarr['cf']['dsnp']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#dsnp) | 4 | {{ sonarr['cf']['dsnp']['trash_id'] }} | + | [{{ sonarr['cf']['dsnp']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#dsnp) | 5 | {{ sonarr['cf']['dsnp']['trash_id'] }} | | [{{ sonarr['cf']['funi']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#funi) | {{ sonarr['cf']['funi']['trash_score'] }} | {{ sonarr['cf']['funi']['trash_id'] }} | | [{{ sonarr['cf']['hidive']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#hidive) | 0 | {{ sonarr['cf']['hidive']['trash_id'] }} | - | [{{ sonarr['cf']['nf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#nf) | 2 | {{ sonarr['cf']['nf']['trash_id'] }} | + | [{{ sonarr['cf']['nf']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#nf) | 4 | {{ sonarr['cf']['nf']['trash_id'] }} | | [{{ sonarr['cf']['vrv']['name'] }}](/Sonarr/sonarr-collection-of-custom-formats/#vrv) | {{ sonarr['cf']['vrv']['trash_score'] }} | {{ sonarr['cf']['vrv']['trash_id'] }} | From d973c3a468e5e9a281617d5fa9c6edce6d288880 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Thu, 22 Jun 2023 16:26:13 +0200 Subject: [PATCH 3/6] feat(starr): add ELEANOR to Scene CF --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 2 +- docs/json/radarr/cf/scene.json | 2 +- docs/json/sonarr/cf/scene.json | 2 +- docs/json/sonarr/rp/optionals.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index 74c31a500..9e4f1fd53 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -550,7 +550,7 @@ Add this to your `Must not contain (2)` Add this to your `Must not contain (2)` ```bash -/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\b)|\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL).*/i +/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\b)|\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL|-ELEANOR).*/i ``` diff --git a/docs/json/radarr/cf/scene.json b/docs/json/radarr/cf/scene.json index 7272f9e9b..618bb8f94 100644 --- a/docs/json/radarr/cf/scene.json +++ b/docs/json/radarr/cf/scene.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL)" + "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL|-ELEANOR)" } }, { diff --git a/docs/json/sonarr/cf/scene.json b/docs/json/sonarr/cf/scene.json index f7160674a..48f2e1263 100644 --- a/docs/json/sonarr/cf/scene.json +++ b/docs/json/sonarr/cf/scene.json @@ -11,7 +11,7 @@ "negate": false, "required": true, "fields": { - "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL)" + "value": "^(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL|-ELEANOR)" } }, { diff --git a/docs/json/sonarr/rp/optionals.json b/docs/json/sonarr/rp/optionals.json index 4c6caea82..0202a6821 100644 --- a/docs/json/sonarr/rp/optionals.json +++ b/docs/json/sonarr/rp/optionals.json @@ -16,7 +16,7 @@ }, { "name": "Ignore so called scene releases", "trash_id": "5bc23c3a055a1a5d8bbe4fb49d80e0cb", - "term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL).*/i" + "term": "/^(?!.*(web[ ]dl|-deflate|-inflate))(?=.*([_. ]WEB[_. ])(?!DL)\\b)|\\b(-CAKES|-GGEZ|-GGWP|-GLHF|-GOSSIP|-NAISU|-KOGI|-PECULATE|-SLOT|-EDITH|-ETHEL|-ELEANOR).*/i" }, { "name": "Ignore Bad Dual Audio Groups", "trash_id": "538bad00ee6f8aced8e0db5218b8484c", From 9714ae8dfe0352673d12f109c2d398ee326b12d2 Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Thu, 22 Jun 2023 20:15:11 +0200 Subject: [PATCH 4/6] feat(starr): add NINJACENTRAL to WEB Tier 03 --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 2 +- docs/json/radarr/cf/web-tier-03.json | 9 +++++++++ docs/json/sonarr/cf/web-tier-03.json | 9 +++++++++ docs/json/sonarr/rp/p2pRepackProper.json | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index 9e4f1fd53..9c449f935 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -263,7 +263,7 @@ Add this to your `Preferred (3)` with a score of [1650] Add this to your `Preferred (3)` with a score of [1600] ```bash -/(-DRACULA|SLiGNOME|T4H|-ViSiON|SwAgLaNdEr)\b/i +/(-DRACULA|SLiGNOME|T4H|-ViSiON|SwAgLaNdEr|-NINJACENTRAL)\b/i ``` Add this to your `Preferred (3)` with a score of [12] diff --git a/docs/json/radarr/cf/web-tier-03.json b/docs/json/radarr/cf/web-tier-03.json index 633ad534c..389cdca3f 100644 --- a/docs/json/radarr/cf/web-tier-03.json +++ b/docs/json/radarr/cf/web-tier-03.json @@ -13,6 +13,15 @@ "value": "^(GNOMiSSiON)$" } }, + { + "name": "NINJACENTRAL", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "^(NINJACENTRAL)$" + } + }, { "name": "ROCCaT", "implementation": "ReleaseGroupSpecification", diff --git a/docs/json/sonarr/cf/web-tier-03.json b/docs/json/sonarr/cf/web-tier-03.json index 7c5f54b61..cb1b158c6 100644 --- a/docs/json/sonarr/cf/web-tier-03.json +++ b/docs/json/sonarr/cf/web-tier-03.json @@ -13,6 +13,15 @@ "value": "^(DRACULA)$" } }, + { + "name": "NINJACENTRAL", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "^(NINJACENTRAL)$" + } + }, { "name": "SLiGNOME", "implementation": "ReleaseGroupSpecification", diff --git a/docs/json/sonarr/rp/p2pRepackProper.json b/docs/json/sonarr/rp/p2pRepackProper.json index f32c43d0e..50ce0f58c 100644 --- a/docs/json/sonarr/rp/p2pRepackProper.json +++ b/docs/json/sonarr/rp/p2pRepackProper.json @@ -24,7 +24,7 @@ { "score": 1600, "terms": [ - "/(-DRACULA|SLiGNOME|T4H|-ViSiON|SwAgLaNdEr)\\b/i" + "/(-DRACULA|SLiGNOME|T4H|-ViSiON|SwAgLaNdEr|-NINJACENTRAL)\\b/i" ] }, { From 1a23375f2fa7b4c33b3171969dcb9a6949b8241d Mon Sep 17 00:00:00 2001 From: nuxen <47067662+nuxencs@users.noreply.github.com> Date: Thu, 22 Jun 2023 20:05:20 +0200 Subject: [PATCH 5/6] feat(radarr): add CiNEPHiLES to Remux Tier 02 --- docs/json/radarr/cf/remux-tier-02.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/json/radarr/cf/remux-tier-02.json b/docs/json/radarr/cf/remux-tier-02.json index a5e53b33b..2b123ea32 100644 --- a/docs/json/radarr/cf/remux-tier-02.json +++ b/docs/json/radarr/cf/remux-tier-02.json @@ -13,6 +13,15 @@ "value": 5 } }, + { + "name": "CiNEPHiLES", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "^(CiNEPHiLES)$" + } + }, { "name": "Flights", "implementation": "ReleaseGroupSpecification", From 280f69e4e3ead9a1197883da214322e58f12ea04 Mon Sep 17 00:00:00 2001 From: FonduemangVI Date: Fri, 23 Jun 2023 11:15:15 +1000 Subject: [PATCH 6/6] fix(anime): updated subs only for sonarr and updated anime streaming services --- docs/json/sonarr/cf/dubs-only.json | 2 +- includes/cf/sonarr-streaming-services-anime.md | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/json/sonarr/cf/dubs-only.json b/docs/json/sonarr/cf/dubs-only.json index 466e854cc..40613e94d 100644 --- a/docs/json/sonarr/cf/dubs-only.json +++ b/docs/json/sonarr/cf/dubs-only.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(dub(bed)?)\\b|(funi|eng(lish)?)_?dub" + "value": "(?