From 98e3cbb0b674a10fb866bc334f4beb5e0134319b Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sat, 19 Nov 2022 08:35:04 +0100 Subject: [PATCH 1/8] [Guide] Fix link to naming guide - Fix: link to naming guide --- includes/cf/radarr-suggest-attention.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/cf/radarr-suggest-attention.md b/includes/cf/radarr-suggest-attention.md index 701b1332e..b3e7c8b10 100644 --- a/includes/cf/radarr-suggest-attention.md +++ b/includes/cf/radarr-suggest-attention.md @@ -1,7 +1,7 @@ I suggest to follow the following Guides first. - [Quality Settings (File Size)](/Radarr/Radarr-Quality-Settings-File-Size/){:target="_blank" rel="noopener noreferrer"}. -- [Recommended naming scheme](/Radarr/Radarr-recommended-naming-scheme.md){:target="_blank" rel="noopener noreferrer"}. +- [Recommended naming scheme](/Radarr/Radarr-recommended-naming-scheme/){:target="_blank" rel="noopener noreferrer"}. For this Quality Profile we're going to make use of the following Custom Formats with the scores given in the table. From 14bdadf9d593a8a2ccb69f50715b17bafebc9448 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 17 Nov 2022 09:39:25 +0100 Subject: [PATCH 2/8] Updated: CF `No-RlsGroup` - Updated: CF `No-RlsGroup` --- docs/json/radarr/cf/no-rlsgroup.json | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/docs/json/radarr/cf/no-rlsgroup.json b/docs/json/radarr/cf/no-rlsgroup.json index 8a88bee16..c5e2501e7 100644 --- a/docs/json/radarr/cf/no-rlsgroup.json +++ b/docs/json/radarr/cf/no-rlsgroup.json @@ -5,30 +5,12 @@ "includeCustomFormatWhenRenaming": false, "specifications": [ { - "name": "No -RlsGroup", - "implementation": "ReleaseTitleSpecification", + "name": "No Parsed Group", + "implementation": "ReleaseGroupSpecification", "negate": true, - "required": true, + "required": false, "fields": { - "value": "-[ ]?(?!(HD|MA|ES|X)\\b)\\w+?(\\.\\w{3})?$" - } - }, - { - "name": "No Weird Groups or Groups", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "\\b(Tigole|Joy|YIFY|YTS.MX|YTS.LT|FreetheFish|afm72|Anna|Bandi|Ghost|Kappa|MONOLITH|Qman|RZeroX|SAMPA|Silence|theincognito|t3nzin|Vyndros|HDO|DusIctv|DHD|SEV|CtrlHD|-ZR-|ADC|XZVN|RH|Kametsu)(?=\\]|\\))" - } - }, - { - "name": "No Weird Groups", - "implementation": "ReleaseTitleSpecification", - "negate": true, - "required": true, - "fields": { - "value": "KRaLiMaRKo|E\\.N\\.D|D\\-Z0N3|de\\[42\\]|Koten_Gars|BluDragon|\\bHONE\\b" + "value": "." } } ] From d0d190718d4bd69d64284d6e02c322450ef66eca Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 16 Nov 2022 14:19:22 +0100 Subject: [PATCH 3/8] Added: Videoland + NLZIET streaming services - Added: Videoland + NLZIET streaming services --- .../sonarr-collection-of-custom-formats.md | 38 +++++++++++++++++++ docs/json/sonarr/cf/nlz.json | 17 +++++++++ docs/json/sonarr/cf/vdl.json | 17 +++++++++ docs/json/sonarr/rp/streaming.json | 4 +- 4 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 docs/json/sonarr/cf/nlz.json create mode 100644 docs/json/sonarr/cf/vdl.json diff --git a/docs/Sonarr/sonarr-collection-of-custom-formats.md b/docs/Sonarr/sonarr-collection-of-custom-formats.md index 7ed991290..1ac304614 100644 --- a/docs/Sonarr/sonarr-collection-of-custom-formats.md +++ b/docs/Sonarr/sonarr-collection-of-custom-formats.md @@ -56,11 +56,13 @@ I also made 3 guides related to this one. | | | | [HBO Max](#hmax) | | | | | [HBO](#hbo) | | | | | [Hulu](#hulu) | +| | | | [NLZiet](#nlz) | | | | | [Netflix](#nf) | | | | | [Paramount+](#pmtp) | | | | | [Peacock TV](#pcok) | | | | | [Quibi](#qibi) | | | | | [SHOWTIME](#sho) | +| | | | [Videoland](#vdl) | | | | | [YouTube Red](#red) | | | | | [iTunes](#it) | @@ -1303,6 +1305,24 @@ I also made 3 guides related to this one. ------ +### NLZ + +NLZiet + +??? faq "NLZiet - [CLICK TO EXPAND]" + + NLZIET is the online service of Dutch broadcasters that provides non-stop tv, commercial-free. The streaming service brings the best of all channels straight to your preferred device and lets you see your favorite tv content in high quality on all available platforms; anytime and anywhere. + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/nlz.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### NF Netflix @@ -1393,6 +1413,24 @@ I also made 3 guides related to this one. ------ +### VDL + +Videoland + +??? faq "Videoland - [CLICK TO EXPAND]" + + Videoland is a Dutch OTT online service provider owned by RTL Nederland. Originally it was a retail chain of video rental stores. Its main competitor is Netflix. + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/sonarr/cf/vdl.json' %]][[% endfilter %]] + ``` + +[TOP](#index) + +------ + ### RED RED = Youtube Red = Youtube Premium diff --git a/docs/json/sonarr/cf/nlz.json b/docs/json/sonarr/cf/nlz.json new file mode 100644 index 000000000..0f7e671ad --- /dev/null +++ b/docs/json/sonarr/cf/nlz.json @@ -0,0 +1,17 @@ +{ + "trash_id": "b2b980877494b560443631eb1f473867", + "trash_score": "75", + "name": "NLZ", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "NLZiet", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(nlz|NLZiet)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)" + } + } + ] +} diff --git a/docs/json/sonarr/cf/vdl.json b/docs/json/sonarr/cf/vdl.json new file mode 100644 index 000000000..84cc11d53 --- /dev/null +++ b/docs/json/sonarr/cf/vdl.json @@ -0,0 +1,17 @@ +{ + "trash_id": "5d2317d99af813b6529c7ebf01c83533", + "trash_score": "75", + "name": "VDL", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "Videoland", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(vdl|Videoland)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)" + } + } + ] +} diff --git a/docs/json/sonarr/rp/streaming.json b/docs/json/sonarr/rp/streaming.json index 84bb97a1d..524fc6fd0 100644 --- a/docs/json/sonarr/rp/streaming.json +++ b/docs/json/sonarr/rp/streaming.json @@ -39,7 +39,9 @@ "/\\b(hbo)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i", "/\\b(red)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i", "/\\b(it)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i", - "/\\b(pmtp)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i" + "/\\b(pmtp)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i", + "/\\b(vdl)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i", + "/\\b(nlz)\\b(?=[ ._-]web[ ._-]?(dl|rip)\\b)/i" ] } ], From 2b59d259ae9be88aae8f80607e31acf9ad18bd15 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 16 Nov 2022 14:22:37 +0100 Subject: [PATCH 4/8] Added: RlsGrp `SwAgLaNdEr` - Added: RlsGrp `SwAgLaNdEr` This is a group that's on the BTN list and does Dutch TV shows from different Dutch Streaming Services. --- docs/json/sonarr/cf/web-tier-03.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/json/sonarr/cf/web-tier-03.json b/docs/json/sonarr/cf/web-tier-03.json index 79f49e1be..5f17214a4 100644 --- a/docs/json/sonarr/cf/web-tier-03.json +++ b/docs/json/sonarr/cf/web-tier-03.json @@ -13,6 +13,15 @@ "value": "\\b(SLiGNOME)\\b" } }, + { + "name": "SwAgLaNdEr", + "implementation": "ReleaseGroupSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(SwAgLaNdEr)\\b" + } + }, { "name": "T4H", "implementation": "ReleaseGroupSpecification", From d7aa14c55d10635222e95e4f0bf76f78c10473e8 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 16 Nov 2022 14:26:18 +0100 Subject: [PATCH 5/8] Added: RlsGrp `SwAgLaNdEr` + others - Added: RlsGrp `SwAgLaNdEr` This is a group that's on the BTN list and does Dutch TV shows from different Dutch Streaming Services. - Added: RlsGrp `CRFW`, `SDCC`, `SLiGNOME`, `T4H`. - Added: RlsGrp `HONE` known for their hybrid 4k releases. - Updated: Scores to be consistent with Radarr/Sonarr. --- docs/json/sonarr/rp/p2pRepackProper.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/json/sonarr/rp/p2pRepackProper.json b/docs/json/sonarr/rp/p2pRepackProper.json index 6fd014244..8b089765e 100644 --- a/docs/json/sonarr/rp/p2pRepackProper.json +++ b/docs/json/sonarr/rp/p2pRepackProper.json @@ -4,43 +4,43 @@ "includePreferredWhenRenaming": false, "required": [], "preferred": [{ - "score": 180, + "score": 1800, "terms": [ "/(-deflate|-inflate)\\b/i" ] }, { - "score": 150, + "score": 1700, "terms": [ - "/(-ABBIE|-AJP69|-CasStudio|-CtrlHD|-FLUX|-KiNGS|-monkee|NOSiViD|-NTb|-NTG|-QOQ|-RTN|-SIC|T6D|-TOMMY|-ViSUM)\\b/i" + "/(-ABBIE|-AJP69|-CasStudio|CRFW|-CtrlHD|-FLUX|\\bHONE|-KiNGS|-monkee|NOSiViD|-NTb|-NTG|-QOQ|-RTN|-SIC|T6D|-TOMMY|-ViSUM)\\b/i" ] }, { - "score": 125, + "score": 1650, "terms": [ - "/(3CTWeB|BLUTONiUM|-BTW|-Chotab|-Cinefeel|-CiT|Coo7|-dB|-DEEP|-END|-ETHiCS|-FC|-Flights|-GNOME|-iJP|-iKA|-iT00NZ|-JETIX|-KHN|-KiMCHI|-LAZY|-MZABI|-NPMS|-NYH|-orbitron|playWEB|PSiG|-ROCCaT|RTFM|-SA89|-SIGMA|-SMURF|-SPiRiT|-TEPES|-TVSmash|-WELP)\\b/i" + "/(3CTWeB|BLUTONiUM|-BTW|-Chotab|-Cinefeel|-CiT|Coo7|-dB|-DEEP|-END|-ETHiCS|-FC|-Flights|-GNOME|-iJP|-iKA|-iT00NZ|-JETIX|-KHN|-KiMCHI|-LAZY|-MZABI|-NPMS|-NYH|-orbitron|playWEB|PSiG|-ROCCaT|RTFM|-SA89|-SDCC|-SIGMA|-SMURF|-SPiRiT|-TEPES|-TVSmash|-WELP)\\b/i" ] }, { - "score": 100, + "score": 1600, "terms": [ - "/(-ViSiON)\\b/i" + "/(SLiGNOME|T4H|-ViSiON|SwAgLaNdEr)\\b/i" ] }, { - "score": 12, + "score": 13, "terms": [ "/(repack3)/i" ] }, { - "score": 11, + "score": 12, "terms": [ "/(repack2)/i" ] }, { - "score": 10, + "score": 11, "terms": [ "/\\b(repack|proper)\\b/i" ] From b84220927b95c22c4e76328f43c3c8f1e3426e75 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 16 Nov 2022 14:26:34 +0100 Subject: [PATCH 6/8] Updated: Scores to be consistent with Radarr/Sonarr. - Updated: Scores to be consistent with Radarr/Sonarr. --- docs/json/sonarr/rp/lqGroups.json | 2 +- docs/json/sonarr/rp/optionals.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/json/sonarr/rp/lqGroups.json b/docs/json/sonarr/rp/lqGroups.json index 3189f2f41..89f89e546 100644 --- a/docs/json/sonarr/rp/lqGroups.json +++ b/docs/json/sonarr/rp/lqGroups.json @@ -4,7 +4,7 @@ "includePreferredWhenRenaming": false, "required": [], "preferred": [{ - "score": -100, + "score": -10000, "terms": [ "/(-BRiNK|-CHX|-GHOSTS|MeGusta|-NERO|nhanc3|Pahe\\.ph|Pahe\\.in|TBS|-VIDEOHOLE|-worldmkv|-XLF)\\b/i" ] diff --git a/docs/json/sonarr/rp/optionals.json b/docs/json/sonarr/rp/optionals.json index cb3e5b89d..0c85f7761 100644 --- a/docs/json/sonarr/rp/optionals.json +++ b/docs/json/sonarr/rp/optionals.json @@ -35,21 +35,21 @@ "term": "/\\bS\\d+\\b(?!E\\d+\\b)/i" }] }, { - "score": 10, + "score": 500, "terms": [{ "name": "Prefer HDR", "trash_id": "bc7a6383cbe88c3ee2d6396e1aacc0b3", "term": "/\\bHDR(\\b|\\d)/i" }] }, { - "score": 100, + "score": 1500, "terms": [{ "name": "Prefer Dolby Vision", "trash_id": "fa47da3377076d82d07c4e95b3f13d07", "term": "/\\b(dv|dovi|dolby[ .]?vision)\\b/i" }] }, { - "score": -25, + "score": -10000, "terms": [{ "name": "Dislike retags: rartv, rarbg, eztv, TGx", "trash_id": "6f2aefa61342a63387f2a90489e90790", From 7887c52b13d2e2ba9cc18132d2800ff0bc40b7bc Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sat, 19 Nov 2022 08:54:46 +0100 Subject: [PATCH 7/8] # 2022-11-19 09:00 # 2022-11-19 09:00 --- docs/updates.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 582c6b2da..364e11ff4 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,19 @@ +# 2022-11-19 09:00 +**[Sonarr]** +- Added: Videoland + NLZIET streaming services. #973 +- Added: RlsGrp `SwAgLaNdEr` This is a group that's on the BTN list and does Dutch TV shows from different Dutch Streaming Services. #973 +- Added: RlsGrp `CRFW`, `SDCC`, `SLiGNOME`, `T4H`. #973 +- Added: RlsGrp `HONE` known for their hybrid 4k releases. #973 +- Updated: Scores to be consistent with Radarr/Sonarr. #973 +- Updated: Scores to be consistent with Radarr/Sonarr. #973 + +**[Radarr]** +- Updated: CF `No-RlsGroup` #975 + +**[Radarr Guide]** +*How to setup Quality Profiles* +- Fix: link to naming guide. #977 + # 2022-11-15 00:30 **[Sonarr]** - Add: `Lilith-Raws` to anime-raws. #964 From 5e264ef44f7043e766e4be19b7350e24005a9a31 Mon Sep 17 00:00:00 2001 From: Matthew Anson Date: Mon, 21 Nov 2022 13:05:01 +1100 Subject: [PATCH 8/8] added NanakoRaws and Lilith-Raws to anime-raws --- docs/json/radarr/cf/anime-raws.json | 18 ++++++++++++++++++ docs/json/sonarr/cf/anime-raws.json | 9 +++++++++ 2 files changed, 27 insertions(+) diff --git a/docs/json/radarr/cf/anime-raws.json b/docs/json/radarr/cf/anime-raws.json index bf7cca903..3d470907a 100644 --- a/docs/json/radarr/cf/anime-raws.json +++ b/docs/json/radarr/cf/anime-raws.json @@ -49,6 +49,15 @@ "value": "\\[km\\]|-km\\b " } }, + { + "name": "Lilith-Raws", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Lilith[ ._-]?(Raws)" + } + }, { "name": "LowPower-raws", "implementation": "ReleaseTitleSpecification", @@ -58,6 +67,15 @@ "value": "LowPower[ ._-]?(raws)" } }, + { + "name": "NanakoRaws", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Nanako(Raws)" + } + }, { "name": "NC-raws", "implementation": "ReleaseTitleSpecification", diff --git a/docs/json/sonarr/cf/anime-raws.json b/docs/json/sonarr/cf/anime-raws.json index 033300543..d6c74c821 100644 --- a/docs/json/sonarr/cf/anime-raws.json +++ b/docs/json/sonarr/cf/anime-raws.json @@ -67,6 +67,15 @@ "value": "LowPower[ ._-]?(raws)" } }, + { + "name": "NanakoRaws", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Nanako(Raws)" + } + }, { "name": "NC-raws", "implementation": "ReleaseTitleSpecification",