From bf7489fc4bc7abea725e1f9b7c67edcda9cb4325 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Tue, 21 Jun 2022 23:05:16 +0200 Subject: [PATCH 01/35] Updated: CF `[3D]` added 3D group `BluRay3D` - Updated: CF `[3D]` added 3D group `BluRay3D`. --- docs/json/radarr/3d.json | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/docs/json/radarr/3d.json b/docs/json/radarr/3d.json index 67fc869c3..0ed0a3f45 100644 --- a/docs/json/radarr/3d.json +++ b/docs/json/radarr/3d.json @@ -3,13 +3,24 @@ "trash_score": "-10000", "name": "3D", "includeCustomFormatWhenRenaming": false, - "specifications": [{ + "specifications": [ + { "name": "3D", "implementation": "ReleaseTitleSpecification", "negate": false, - "required": true, + "required": false, "fields": { - "value": "\\b3d|sbs|half[ .-]ou|half[ .-]sbs\\b" + "value": "\\b3d|sbs|half[ .-]ou|half[ .-]sbs\\b" } - }] -} \ No newline at end of file + }, + { + "name": "BluRay3D", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(BluRay3D)\\b" + } + } + ] +} From b75c2a7bad6bec653dd1317407e594b6ec055176 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Tue, 21 Jun 2022 23:07:44 +0200 Subject: [PATCH 02/35] CF `[DV (WEBDL)]` replaced condition `DV HDR10` with `No HDR` - Updated: CF `[DV (WEBDL)]` replaced condition `DV HDR10` with `No HDR`. --- docs/json/radarr/dv-webdl.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/json/radarr/dv-webdl.json b/docs/json/radarr/dv-webdl.json index 1c54c48e1..182595e44 100644 --- a/docs/json/radarr/dv-webdl.json +++ b/docs/json/radarr/dv-webdl.json @@ -41,13 +41,13 @@ } }, { - "name": "DV HDR10", + "name": "Not HDR", "implementation": "ReleaseTitleSpecification", "negate": true, "required": true, "fields": { - "value": "\\b(DV[ .]HDR10|HDR10[ .]DV)\\b" + "value": "\\bHDR(\\b|\\d)" } } ] -} \ No newline at end of file +} From 67dd23342d436bcafd17e5c0b87a9d6e418a2d6d Mon Sep 17 00:00:00 2001 From: TRaSH Date: Tue, 21 Jun 2022 23:15:32 +0200 Subject: [PATCH 03/35] #2022-06-21 #2022-06-21 --- docs/updates.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 5d22732d5..7b1de2a43 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,8 @@ +#2022-06-21 +Radarr CF 20220621 #635 +- Updated: CF `[3D]` added 3D group `BluRay3D`. +- Updated: CF `[DV (WEBDL)]` replaced condition `DV HDR10` with `No HDR`. + # 2022-06-13 Shortened Streaming Service naming #626 - Changed: On request Streaming Service to short names. From 03074a32eb7d02e199ece306b6cf30546d96d7a7 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 23 Jun 2022 20:55:30 +0200 Subject: [PATCH 04/35] Improved: readability of description. - Improved: readability of description. --- docs/Downloaders/qBittorrent/Basic-Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Downloaders/qBittorrent/Basic-Setup.md b/docs/Downloaders/qBittorrent/Basic-Setup.md index 115d22674..ee31553aa 100644 --- a/docs/Downloaders/qBittorrent/Basic-Setup.md +++ b/docs/Downloaders/qBittorrent/Basic-Setup.md @@ -245,7 +245,7 @@ These options allow you to control the number of active torrents being downloade ![!Security](images/qb-options-webui-security.png) -1. Enable clickjacking protection, in some cases when this is enabled it could result in issues. +1. In some cases when this is enabled it could result in issues. !!! check "" **Suggested: `Disabled`** From 94b2ab33d3af8816ed4e8ec3633bb6079dc83989 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 23 Jun 2022 20:59:33 +0200 Subject: [PATCH 05/35] Fixed: Series Folder Format issue: - Fixed: Series Folder Format issue: #624 --- docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md index fbe251e62..3af6efe41 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md @@ -87,7 +87,7 @@ Has all necessary information and a little extra if you needed to rebuild. Adding year back in with tvdb id allows matching to be correct. Thanks salty. ```bash -{Series TitleTheYear} [tvdb-{TvdbId}] +{Series TitleYear} [tvdb-{TvdbId}] ``` RESULT: From f97e199a12c263def6f9ca4d46b5dd73ad77c2cd Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 24 Jun 2022 21:50:07 +0200 Subject: [PATCH 06/35] Updated: CF `[HQ-Remux]` Separated conditions on request - Updated: CF `[HQ-Remux]` Separated conditions on request --- docs/json/radarr/hq-remux.json | 104 ++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 7 deletions(-) diff --git a/docs/json/radarr/hq-remux.json b/docs/json/radarr/hq-remux.json index f83b89036..68e5b0299 100644 --- a/docs/json/radarr/hq-remux.json +++ b/docs/json/radarr/hq-remux.json @@ -5,21 +5,111 @@ "includeCustomFormatWhenRenaming": false, "specifications": [ { - "name": "Remux Groups", - "implementation": "ReleaseTitleSpecification", + "name": "Remux", + "implementation": "QualityModifierSpecification", "negate": false, "required": true, "fields": { - "value": "\\b(FraMeSToR|EPSiLON|KRaLiMaRKo|PmP|BLURANiUM|SiCFoI|SURFINBIRD|HiFi|iFT|playBD)\\b" + "value": 5 } }, { - "name": "REMUX", - "implementation": "QualityModifierSpecification", + "name": "FraMeSToR", + "implementation": "ReleaseTitleSpecification", "negate": false, - "required": true, + "required": false, "fields": { - "value": 5 + "value": "FraMeSToR" + } + }, + { + "name": "EPSiLON", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "EPSiLON" + } + }, + { + "name": "KRaLiMaRKo", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "KRaLiMaRKo" + } + }, + { + "name": "PmP", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(PmP)\\b" + } + }, + { + "name": "BLURANiUM", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "BLURANiUM" + } + }, + { + "name": "SiCFoI", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "SiCFoI" + } + }, + { + "name": "SURFINBIRD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "SURFINBIRD" + } + }, + { + "name": "HiFi", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "HiFi" + } + }, + { + "name": "iFT", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(iFT)\\b" + } + }, + { + "name": "playBD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "playBD" + } + }, + { + "name": "TRiTon", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "TRiTon" } } ] From 15f07407940f1cc5f8bb8ac0a50f91575d00f54b Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 24 Jun 2022 21:51:10 +0200 Subject: [PATCH 07/35] Updated: CF `[HQ]` Separated conditions on request - Updated: CF `[HQ]` Separated conditions on request. --- docs/json/radarr/hq.json | 225 ++++++++++++++++++++++++++++++++++----- 1 file changed, 198 insertions(+), 27 deletions(-) diff --git a/docs/json/radarr/hq.json b/docs/json/radarr/hq.json index 06e31cd1f..9605ef299 100644 --- a/docs/json/radarr/hq.json +++ b/docs/json/radarr/hq.json @@ -5,67 +5,238 @@ "includeCustomFormatWhenRenaming": false, "specifications": [ { - "name": "[BLOCK1]", + "name": "Not WEBDL", + "implementation": "SourceSpecification", + "negate": true, + "required": true, + "fields": { + "value": 7 + } + }, + { + "name": "Not WEBRIP", + "implementation": "SourceSpecification", + "negate": true, + "required": true, + "fields": { + "value": 8 + } + }, + { + "name": "Not REMUX", + "implementation": "QualityModifierSpecification", + "negate": true, + "required": true, + "fields": { + "value": 5 + } + }, + { + "name": "Not 2160p", + "implementation": "ResolutionSpecification", + "negate": true, + "required": true, + "fields": { + "value": 2160 + } + }, + { + "name": "BMF", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "-BMF|-decibeL|\\bD-Z0N3\\b|\\bFTW-HD\\b|-HiFi|-NCmt|-OISTiLe|-TDD|\\bZQ\\b" + "value": "-BMF\\b" } }, { - "name": "[BLOCK2]", + "name": "decibeL", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "-HiSD|-NTb|-ift|-geek|-tnp|-pter|-bbq|FraMeSToR" + "value": "-decibeL\\b" } }, { - "name": "[BLOCK3]", + "name": "D-Z0N3", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "-CRiSC|-CtrlHD|-DON|\\b-EA\\b|-EbP|-LolHD|-SbR|-TayTo|-VietHD" + "value": "\\bD-Z0N3\\b" } }, { - "name": "Not WEBDL", - "implementation": "SourceSpecification", - "negate": true, - "required": true, + "name": "HiFi", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, "fields": { - "value": 7 + "value": "-HiFi\\b" } }, { - "name": "Not WEBRIP", - "implementation": "SourceSpecification", - "negate": true, - "required": true, + "name": "NCmt", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, "fields": { - "value": 8 + "value": "-NCmt\\b" } }, { - "name": "Not REMUX", - "implementation": "QualityModifierSpecification", - "negate": true, - "required": true, + "name": "TDD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, "fields": { - "value": 5 + "value": "-TDD\\b" } }, { - "name": "Not 2160p", - "implementation": "ResolutionSpecification", - "negate": true, - "required": true, + "name": "ZQ", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, "fields": { - "value": 2160 + "value": "\\bZQ\\b" + } + }, + { + "name": "HiSD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-HiSD\\b" + } + }, + { + "name": "NTb", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-NTb\\b" + } + }, + { + "name": "iFT", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-iFT\\b" + } + }, + { + "name": "Geek", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-geek\\b" + } + }, + { + "name": "TnP", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-tnp\\b" + } + }, + { + "name": "PTer", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-pter\\b" + } + }, + { + "name": "BBQ", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-bbq\\b" + } + }, + { + "name": "CRiSC", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-CRiSC\\b" + } + }, + { + "name": "CtrlHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-CtrlHD\\b" + } + }, + { + "name": "DON", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-DON\\b" + } + }, + { + "name": "EbP", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-EbP\\b" + } + }, + { + "name": "LolHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-LolHD\\b" + } + }, + { + "name": "SbR", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-SbR\\b" + } + }, + { + "name": "TayTo", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-TayTo\\b" + } + }, + { + "name": "VietHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-VietHD\\b" } } ] -} \ No newline at end of file +} From 1867d9fdbd3df792eb7615ede9483e3f90c35ead Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 24 Jun 2022 21:51:54 +0200 Subject: [PATCH 08/35] Updated: CF `[LQ]` Separated conditions on request - Updated: CF `[LQ]` Separated conditions on request --- docs/json/radarr/lq.json | 491 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 475 insertions(+), 16 deletions(-) diff --git a/docs/json/radarr/lq.json b/docs/json/radarr/lq.json index 66c78ce1d..eceb3bc46 100644 --- a/docs/json/radarr/lq.json +++ b/docs/json/radarr/lq.json @@ -5,57 +5,57 @@ "includeCustomFormatWhenRenaming": false, "specifications": [ { - "name": "[BLOCK1]", + "name": "aXXo", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(aXXo|CrEwSaDe|DNL|FaNGDiNG0|FRDS|HDTime|iPlanet|-KiNGDOM|Leffe|mHD|mSD|nHD|nikt0|nSD|NhaNc3|PRODJi|RDN|SANTi|STUTTERSHIT|WAF|x0r|YIFY|YTS)\\b" + "value": "\\b(aXXo)\\b" } }, { - "name": "[BLOCK2]", + "name": "CDDHD", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(CDDHD|-EuReKA|DDR|DNL|-BARC0DE)\\b" + "value": "CDDHD" } }, { - "name": "[BLOCK3]", + "name": "FGT", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(x0r|nikt0|FGT|d3g|MeGusta|YIFY|YTS|tigole|C4K|RARBG|4K4U)\\b" + "value": "\\b(FGT)\\b" } }, { - "name": "[BLOCK4]", + "name": "AROMA", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(-AROMA|aXXo|CrEwSaDe|d3g|DNL|FGT|FaNGDiNG0|FRDS|HDTime|iPlanet|-KiNGDOM|Leffe|MeGusta|mHD|mSD|nHD|nikt0|nSD|NhaNc3|PRODJi|RDN|SANTi|STUTTERSHIT|WAF|x0r|YIFY|YTS)\\b" + "value": "-AROMA\\b" } }, { - "name": "[BLOCK5]", + "name": "LiGaS", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(RARBG|FGT|STUTTERSHIT|LiGaS|-DDR|-Zeus|Tigole|TBS)\\b" + "value": "\\b(LiGaS)\\b" } }, { - "name": "[BLOCK6]", + "name": "beAst", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(-beAst|CHD|HDWinG|MTeam|MySiLU|-WiKi)\\b" + "value": "-beAst\\b" } }, { @@ -64,17 +64,476 @@ "negate": false, "required": false, "fields": { - "value": "\\b(Rifftrax|RU4HD)\\b" + "value": "Rifftrax" } }, { - "name": "Nominated Unwanted Groups", + "name": "BdC", "implementation": "ReleaseTitleSpecification", "negate": false, "required": false, "fields": { - "value": "\\b(TEKNO3D|TIKO|Liber8|FZHD|PATOMiEL|-KIRA|PTNK)\\b" + "value": "\\b(BdC)\\b" + } + }, + { + "name": "TEKNO3D", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "TEKNO3D" + } + }, + { + "name": "CrEwSaDe", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "CrEwSaDe" + } + }, + { + "name": "DNL", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(DNL)\\b" + } + }, + { + "name": "FaNGDiNG0", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "FaNGDiNG0" + } + }, + { + "name": "FRDS", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(FRDS)\\b" + } + }, + { + "name": "HDTime", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "HDTime" + } + }, + { + "name": "iPlanet", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "iPlanet" + } + }, + { + "name": "KiNGDOM", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-KiNGDOM\\b" + } + }, + { + "name": "Leffe", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Leffe" + } + }, + { + "name": "mHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(mHD)\\b" + } + }, + { + "name": "mSD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(mSD)\\b" + } + }, + { + "name": "nHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(nHD)\\b" + } + }, + { + "name": "nikt0", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "nikt0" + } + }, + { + "name": "nSD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(nSD)\\b" + } + }, + { + "name": "NhaNc3", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "NhaNc3" + } + }, + { + "name": "PRODJi", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "PRODJi" + } + }, + { + "name": "RDN", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(RDN)\\b" + } + }, + { + "name": "SANTi", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(SANTi)\\b" + } + }, + { + "name": "STUTTERSHIT", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "STUTTERSHIT" + } + }, + { + "name": "WAF", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(WAF)\\b" + } + }, + { + "name": "x0r", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "x0r" + } + }, + { + "name": "YIFY", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "YIFY" + } + }, + { + "name": "YTS", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(YTS)\\b" + } + }, + { + "name": "EuReKA", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-EuReKA\\b" + } + }, + { + "name": "DDR", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(DDR)\\b" + } + }, + { + "name": "DNL", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(DNL)" + } + }, + { + "name": "BARC0DE", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "BARC0DE" + } + }, + { + "name": "d3g", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "d3g" + } + }, + { + "name": "MeGusta", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "MeGusta" + } + }, + { + "name": "Tigole", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Tigole" + } + }, + { + "name": "C4K", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "C4K" + } + }, + { + "name": "RARBG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "RARBG" + } + }, + { + "name": "4K4U", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "4K4U" + } + }, + { + "name": "RU4HD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "RU4HD" + } + }, + { + "name": "Zeus", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-Zeus\\b" + } + }, + { + "name": "TBS", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(TBS)\\b" + } + }, + { + "name": "CHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(CHD)\\b" + } + }, + { + "name": "HDWinG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "HDWinG" + } + }, + { + "name": "MTeam", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(MTeam)\\b" + } + }, + { + "name": "MySiLU", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(MySiLU)\\b" + } + }, + { + "name": "WiKi", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-WiKi\\b" + } + }, + { + "name": "TIKO", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(TIKO)\\b" + } + }, + { + "name": "Liber8", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "Liber8" + } + }, + { + "name": "FZHD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(FZHD)\\b" + } + }, + { + "name": "PATOMiEL", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "PATOMiEL" + } + }, + { + "name": "KIRA", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-KIRA\\b" + } + }, + { + "name": "PTNK", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(PTNK)\\b" + } + }, + { + "name": "GalaxyRG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "GalaxyRG" + } + }, + { + "name": "HDS", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(HDS)\\b" + } + }, + { + "name": "NoGroup", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "NoGr(ou)?p" + } + }, + { + "name": "EVO", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "[-. ]EVO(TGX)?\\b" } } ] -} \ No newline at end of file +} From afdb588f8d19c8ccd7c69cadc6a8c01e5ec8db42 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 24 Jun 2022 21:55:37 +0200 Subject: [PATCH 09/35] Updated: CF `[HQ-WEBDL]` Separated conditions on request + Added Hone - Updated: CF `[HQ-WEBDL]` Separated conditions on request - Updated: CF `[HQ-WEBDL]` added group `HONE` --- docs/json/radarr/hq-webdl.json | 164 +++++++++++++++++++++++++++++++-- 1 file changed, 154 insertions(+), 10 deletions(-) diff --git a/docs/json/radarr/hq-webdl.json b/docs/json/radarr/hq-webdl.json index c6b0afed2..6838721cd 100644 --- a/docs/json/radarr/hq-webdl.json +++ b/docs/json/radarr/hq-webdl.json @@ -4,15 +4,6 @@ "name": "HQ-WEBDL", "includeCustomFormatWhenRenaming": false, "specifications": [ - { - "name": "P2P Groups", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": true, - "fields": { - "value": "\\b(-TOMMY|-BLUTONiUM|-NTG|-TEPES|-KiNGS|-NTb|-CMRG|AJP69|-PHOENiX|-monkee|-MZABI|ROCCaT|FLUX|NOSiViD|SIC|Flights)\\b" - } - }, { "name": "WEBDL", "implementation": "SourceSpecification", @@ -30,6 +21,159 @@ "fields": { "value": 8 } + }, + { + "name": "TOMMY", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-TOMMY\\b" + } + }, + { + "name": "BLUTONiUM", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-BLUTONiUM\\b" + } + }, + { + "name": "NTG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-NTG\\b" + } + }, + { + "name": "TEPES", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-TEPES\\b" + } + }, + { + "name": "KiNGS", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-KiNGS\\b" + } + }, + { + "name": "NTb", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-NTb\\b" + } + }, + { + "name": "CMRG", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-CMRG\\b" + } + }, + { + "name": "AJP69", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-AJP69\\b" + } + }, + { + "name": "PHOENiX", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-PHOENiX\\b" + } + }, + { + "name": "monkee", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-monkee\\b" + } + }, + { + "name": "MZABI", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-MZABI\\b" + } + }, + { + "name": "ROCCaT", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-ROCCaT\\b" + } + }, + { + "name": "FLUX", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-FLUX\\b" + } + }, + { + "name": "NOSiViD", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-NOSiViD\\b" + } + }, + { + "name": "SiC", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-SiC\\b" + } + }, + { + "name": "Flights", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "-Flights\\b" + } + }, + { + "name": "HONE", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "hone\\b" + } } ] -} \ No newline at end of file +} From d32060471490d78bb87ae572987fe0e507f0a91c Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 24 Jun 2022 22:02:25 +0200 Subject: [PATCH 10/35] Updated: CF `[No-RlsGroup]` added group `HONE` to the exemption - Updated: CF `[No-RlsGroup]` added group `HONE` to the exemption. --- docs/json/radarr/no-rlsgroup.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/no-rlsgroup.json b/docs/json/radarr/no-rlsgroup.json index ac4d6e91a..977210cc6 100644 --- a/docs/json/radarr/no-rlsgroup.json +++ b/docs/json/radarr/no-rlsgroup.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "KRaLiMaRKo|E\\.N\\.D|D\\-Z0N3|de\\[42\\]|Koten_Gars|BluDragon" + "value": "KRaLiMaRKo|E\\.N\\.D|D\\-Z0N3|de\\[42\\]|Koten_Gars|BluDragon|HONE" } } ] From fb6bd0581c31654ad87cf527276140d766a20c06 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 24 Jun 2022 22:21:15 +0200 Subject: [PATCH 11/35] +# 2022-06-24 +# 2022-06-24 --- docs/updates.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 7b1de2a43..f95762fd3 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,15 @@ +# 2022-06-24 +Guide formatting fixes #639 +- Improved: readability of description in `Downloaders - qBittorent - Basic Setup`. +- Fixed: Series Folder Format issue:#624 in `Sonarr - Release Profile RegEx (Anime)`. +Radarr CF 20220624 #640 +- Updated: CF `[LQ]` Separated conditions on request. +- Updated: CF `[HQ-Remux]` Separated conditions on request. +- Updated: CF `[HQ]` Separated conditions on request. +- Updated: CF `[HQ-WEBDL]` Separated conditions on request. +- Updated: CF `[HQ-WEBDL]` added group `HONE`. +- Updated: CF `[No-RlsGroup]` added group `HONE` to the exemption. + #2022-06-21 Radarr CF 20220621 #635 - Updated: CF `[3D]` added 3D group `BluRay3D`. From 3c6f228209d17e2937ac59483886650d9927b9db Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sat, 25 Jun 2022 13:04:07 +0200 Subject: [PATCH 12/35] Added word boundary for HONE Added word boundary for HONE - Updated: CF `[HQ-WEBDL]` Added word boundary for `HONE`. - Updated: CF `[No-RlsGroup]` Added word boundary for `HONE`. --- docs/json/radarr/hq-webdl.json | 2 +- docs/json/radarr/no-rlsgroup.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/json/radarr/hq-webdl.json b/docs/json/radarr/hq-webdl.json index 6838721cd..a690559c1 100644 --- a/docs/json/radarr/hq-webdl.json +++ b/docs/json/radarr/hq-webdl.json @@ -172,7 +172,7 @@ "negate": false, "required": false, "fields": { - "value": "hone\\b" + "value": "\\b(HONE)\\b" } } ] diff --git a/docs/json/radarr/no-rlsgroup.json b/docs/json/radarr/no-rlsgroup.json index 977210cc6..8a88bee16 100644 --- a/docs/json/radarr/no-rlsgroup.json +++ b/docs/json/radarr/no-rlsgroup.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "KRaLiMaRKo|E\\.N\\.D|D\\-Z0N3|de\\[42\\]|Koten_Gars|BluDragon|HONE" + "value": "KRaLiMaRKo|E\\.N\\.D|D\\-Z0N3|de\\[42\\]|Koten_Gars|BluDragon|\\bHONE\\b" } } ] From a887aed44f5a48f244c807c291b169b61727b3d5 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 26 Jun 2022 14:19:25 +0200 Subject: [PATCH 13/35] How to check if hardlinks work inode find option - Added: How to check if hardlinks work inode find option --- .../Check-if-hardlinks-are-working.md | 23 +++++++++++++++--- docs/Hardlinks/images/hardlinks-inode.png | Bin 0 -> 18574 bytes docs/Hardlinks/images/hardlinks-ls-i.png | Bin 0 -> 9218 bytes 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 docs/Hardlinks/images/hardlinks-inode.png create mode 100644 docs/Hardlinks/images/hardlinks-ls-i.png diff --git a/docs/Hardlinks/Check-if-hardlinks-are-working.md b/docs/Hardlinks/Check-if-hardlinks-are-working.md index f375e4e74..aa332ed8e 100644 --- a/docs/Hardlinks/Check-if-hardlinks-are-working.md +++ b/docs/Hardlinks/Check-if-hardlinks-are-working.md @@ -2,7 +2,7 @@ You've followed the guide step by step but still want to check if hardlinks are working, or someone on the Sonarr/Radarr support team asked you to check if your files are hardlinked? -You can use 2 options to check if you got working hardlinks. +You can use 3 options to check if you got working hardlinks. *Both ways requires you to login to your terminal with PuTTY or similar software.* @@ -43,9 +43,9 @@ You will get a listing of all your files and on the left side you will see a cou This way requires a bit more work. -- On the terminal type: `stat /path/to/your/download/location/file.mkv` +- In the terminal type: `stat /path/to/your/download/location/file.mkv` -- On the terminal type: `stat /path/to/your/media/location/file.mkv` +- In the terminal type: `stat /path/to/your/media/location/file.mkv` You will get 2 results you can use to compare several things. @@ -53,3 +53,20 @@ You will get 2 results you can use to compare several things. 1. Links: Everything above 1 means it's a hardlink 1. Inode: if the numbers match you know the files are hardlinked + +## Method 3: Using Inode copies + +- In your terminal `cd` to your download location and run `ls -i file.mkv` or type `ls -i /path/to/your/download/location/file.mkv` + +This will reveal the inode of your file on the left side of the file. + +![!Hardlinks check ls -i](images/hardlinks-ls-i.png) + +- In your terminal type: `find /mnt/user/data/ -inum ###` or `find . -inum ###` if you're in your root folder. + +!!! note "" + `###` = Your inode number on the left of the file you found. + +![!hardlinks inode](images/hardlinks-inode.png) + +It will list all files linked with the same inode number. diff --git a/docs/Hardlinks/images/hardlinks-inode.png b/docs/Hardlinks/images/hardlinks-inode.png new file mode 100644 index 0000000000000000000000000000000000000000..1d6bb3a9a9d48f58136984e088e71a9b78382fca GIT binary patch literal 18574 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 literal 0 HcmV?d00001 From 261e9802519c9d320bed864c73b351469fd77e80 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 26 Jun 2022 22:42:32 +0200 Subject: [PATCH 14/35] # 2022-06-26 # 2022-06-26 --- docs/updates.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index f95762fd3..2c3df4175 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,10 @@ +# 2022-06-26 +Added word boundary for HONE #642 +- Updated: CF `[HQ-WEBDL]` Added word boundary for `HONE`. +- Updated: CF `[No-RlsGroup]` Added word boundary for `HONE`. +How to check if hardlinks work inode find option #643 +- Added: How to check if hardlinks work inode find option. + # 2022-06-24 Guide formatting fixes #639 - Improved: readability of description in `Downloaders - qBittorent - Basic Setup`. From 4ebe193de30be698a0052fe644d5a84adbf62288 Mon Sep 17 00:00:00 2001 From: NiceTSY <38940602+NiceTSY@users.noreply.github.com> Date: Wed, 29 Jun 2022 20:40:02 +0200 Subject: [PATCH 15/35] Fixed? the TrueHD regex I found a few releases that were spelled "True-HD" or "True HD" leading to not being recognised by the CFs. --- docs/json/radarr/aac.json | 2 +- docs/json/radarr/atmos-undefined.json | 2 +- docs/json/radarr/dd-atmos.json | 2 +- docs/json/radarr/dd.json | 2 +- docs/json/radarr/ddplus.json | 2 +- docs/json/radarr/dts-es.json | 2 +- docs/json/radarr/dts-hd-hra.json | 2 +- docs/json/radarr/dts-hd-ma.json | 2 +- docs/json/radarr/dts-x.json | 2 +- docs/json/radarr/dts.json | 2 +- docs/json/radarr/flac.json | 2 +- docs/json/radarr/pcm.json | 2 +- docs/json/radarr/truehd-atmos.json | 2 +- docs/json/radarr/truehd.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/json/radarr/aac.json b/docs/json/radarr/aac.json index 209fb463e..7c452d9b9 100644 --- a/docs/json/radarr/aac.json +++ b/docs/json/radarr/aac.json @@ -63,7 +63,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } } ] diff --git a/docs/json/radarr/atmos-undefined.json b/docs/json/radarr/atmos-undefined.json index 03f4f49a8..4d350927c 100644 --- a/docs/json/radarr/atmos-undefined.json +++ b/docs/json/radarr/atmos-undefined.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD" + "value": "True[ .-]?HD" } }, { diff --git a/docs/json/radarr/dd-atmos.json b/docs/json/radarr/dd-atmos.json index e945cfb16..e70ca69c0 100644 --- a/docs/json/radarr/dd-atmos.json +++ b/docs/json/radarr/dd-atmos.json @@ -28,7 +28,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD" + "value": "True[ .-]?HD" } }, { diff --git a/docs/json/radarr/dd.json b/docs/json/radarr/dd.json index 8ca7a7c7b..29853390f 100644 --- a/docs/json/radarr/dd.json +++ b/docs/json/radarr/dd.json @@ -27,7 +27,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/ddplus.json b/docs/json/radarr/ddplus.json index 992426894..b561439f2 100644 --- a/docs/json/radarr/ddplus.json +++ b/docs/json/radarr/ddplus.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/dts-es.json b/docs/json/radarr/dts-es.json index 0a4eeb2f0..5bfcc2374 100644 --- a/docs/json/radarr/dts-es.json +++ b/docs/json/radarr/dts-es.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/dts-hd-hra.json b/docs/json/radarr/dts-hd-hra.json index 89b261323..c05b6e33d 100644 --- a/docs/json/radarr/dts-hd-hra.json +++ b/docs/json/radarr/dts-hd-hra.json @@ -18,7 +18,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/dts-hd-ma.json b/docs/json/radarr/dts-hd-ma.json index 7f1eab06c..519b373af 100644 --- a/docs/json/radarr/dts-hd-ma.json +++ b/docs/json/radarr/dts-hd-ma.json @@ -19,7 +19,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/dts-x.json b/docs/json/radarr/dts-x.json index a2aba08a5..5f4b139e0 100644 --- a/docs/json/radarr/dts-x.json +++ b/docs/json/radarr/dts-x.json @@ -45,7 +45,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/dts.json b/docs/json/radarr/dts.json index 50c40f4e0..c04e66b07 100644 --- a/docs/json/radarr/dts.json +++ b/docs/json/radarr/dts.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/flac.json b/docs/json/radarr/flac.json index d4d3863ed..998582dea 100644 --- a/docs/json/radarr/flac.json +++ b/docs/json/radarr/flac.json @@ -45,7 +45,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/pcm.json b/docs/json/radarr/pcm.json index dd4dba78c..57b7c7601 100644 --- a/docs/json/radarr/pcm.json +++ b/docs/json/radarr/pcm.json @@ -45,7 +45,7 @@ "negate": true, "required": true, "fields": { - "value": "TrueHD|\\bATMOS(\\b|\\d)" + "value": "True[ .-]?HD|\\bATMOS(\\b|\\d)" } }, { diff --git a/docs/json/radarr/truehd-atmos.json b/docs/json/radarr/truehd-atmos.json index 92de4c8ef..f25e03e47 100644 --- a/docs/json/radarr/truehd-atmos.json +++ b/docs/json/radarr/truehd-atmos.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "TrueHD|W4NK3R|HQMUX" + "value": "True[ .-]?HD|W4NK3R|HQMUX" } }, { diff --git a/docs/json/radarr/truehd.json b/docs/json/radarr/truehd.json index 04ee750b9..1af2a274c 100644 --- a/docs/json/radarr/truehd.json +++ b/docs/json/radarr/truehd.json @@ -10,7 +10,7 @@ "negate": false, "required": true, "fields": { - "value": "TrueHD" + "value": "True[ .-]?HD" } }, { From 1df64ec836cf3cb92f314392464f608421f4fae3 Mon Sep 17 00:00:00 2001 From: nuxencs <47067662+nuxencs@users.noreply.github.com> Date: Fri, 1 Jul 2022 11:22:29 +0200 Subject: [PATCH 16/35] Fixed: Conditions in DTS and DTS-ES fixed and added conditions in DTS and DTS-ES to better match their respective releases. --- docs/json/radarr/dts-es.json | 11 +---------- docs/json/radarr/dts.json | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/json/radarr/dts-es.json b/docs/json/radarr/dts-es.json index 0a4eeb2f0..438f0d7a4 100644 --- a/docs/json/radarr/dts-es.json +++ b/docs/json/radarr/dts-es.json @@ -9,7 +9,7 @@ "negate": false, "required": true, "fields": { - "value": "dts[-. ]?(es|(hd[. ]?)?(hr|hi))" + "value": "dts[-. ]?es" } }, { @@ -83,15 +83,6 @@ "fields": { "value": "\\b(l?)PCM(\\b|\\d)" } - }, - { - "name": "6.1 Surround", - "implementation": "ReleaseTitleSpecification", - "negate": false, - "required": true, - "fields": { - "value": "[^0-9]6[ .][0-1]" - } } ] } \ No newline at end of file diff --git a/docs/json/radarr/dts.json b/docs/json/radarr/dts.json index 50c40f4e0..6bc5244ff 100644 --- a/docs/json/radarr/dts.json +++ b/docs/json/radarr/dts.json @@ -21,6 +21,15 @@ "value": "dts[ .-]?(ma\\b|hd[ .-]?ma|hd)(?!china|r)" } }, + { + "name": "Not DTS-HD HRA/ES", + "implementation": "ReleaseTitleSpecification", + "negate": true, + "required": true, + "fields": { + "value": "dts[-. ]?(es|(hd[. ]?)?(hr|hi))" + } + }, { "name": "Not Dolby Digital Plus", "implementation": "ReleaseTitleSpecification", From 23b881d3c65df7976df508528c5bdbe2476d5cd1 Mon Sep 17 00:00:00 2001 From: nuxencs <47067662+nuxencs@users.noreply.github.com> Date: Fri, 1 Jul 2022 11:57:16 +0200 Subject: [PATCH 17/35] Fixed: Added a word boundary to DTS-ES added a word boundary to the DTS-ES regex to avoid matching anything after DTS-ES. --- docs/json/radarr/dts-es.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/dts-es.json b/docs/json/radarr/dts-es.json index 438f0d7a4..4add5e3e3 100644 --- a/docs/json/radarr/dts-es.json +++ b/docs/json/radarr/dts-es.json @@ -9,7 +9,7 @@ "negate": false, "required": true, "fields": { - "value": "dts[-. ]?es" + "value": "dts[-. ]?es\\b" } }, { From d8d0020e31c91ee1549119d91a7b7c249bf20bc9 Mon Sep 17 00:00:00 2001 From: nuxencs <47067662+nuxencs@users.noreply.github.com> Date: Fri, 1 Jul 2022 12:35:29 +0200 Subject: [PATCH 18/35] Fixed: Regex to recognize Basic Dolby Digital updated the regex to fix the recognition of Basic Dolby Digital to help with incorrect matching of some Custom Formats. --- docs/json/radarr/aac.json | 2 +- docs/json/radarr/atmos-undefined.json | 2 +- docs/json/radarr/dd-atmos.json | 2 +- docs/json/radarr/ddplus.json | 2 +- docs/json/radarr/dts-es.json | 2 +- docs/json/radarr/dts-hd-hra.json | 2 +- docs/json/radarr/dts-hd-ma.json | 2 +- docs/json/radarr/dts-x.json | 2 +- docs/json/radarr/dts.json | 2 +- docs/json/radarr/flac.json | 2 +- docs/json/radarr/pcm.json | 2 +- docs/json/radarr/truehd-atmos.json | 2 +- docs/json/radarr/truehd.json | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/json/radarr/aac.json b/docs/json/radarr/aac.json index 209fb463e..7ac3175d0 100644 --- a/docs/json/radarr/aac.json +++ b/docs/json/radarr/aac.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "(? Date: Fri, 1 Jul 2022 17:40:54 +0200 Subject: [PATCH 19/35] Raised score from `25` to `800` to match `Imax Enhanced`. - Updated: CF `[IMAX]` Raised score from `25` to `800` to match `Imax Enhanced`. --- docs/json/radarr/imax.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/imax.json b/docs/json/radarr/imax.json index c90eb9295..2f851eafd 100644 --- a/docs/json/radarr/imax.json +++ b/docs/json/radarr/imax.json @@ -1,6 +1,6 @@ { "trash_id": "eecf3a857724171f968a66cb5719e152", - "trash_score": "25", + "trash_score": "800", "name": "IMAX", "includeCustomFormatWhenRenaming": true, "specifications": [ From 8868d4c4146f651d0122f2496fed503ba6bc1479 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 1 Jul 2022 17:48:18 +0200 Subject: [PATCH 20/35] # 2022-07-01 # 2022-07-01 --- docs/updates.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 2c3df4175..56f83272b 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,10 @@ +# 2022-07-01 +Raised score from 25 to 800 to match Imax Enhanced. #650 +- Updated: CF `[IMAX]` Raised score from `25` to `800` to match `Imax Enhanced`. +Fixed: Conditions in various sound codec CFs #649 +- Fixed: Conditions in `[DTS]` and `[DTS-ES]` +- Fixed: Regex to recognize Basic Dolby Digital `[DD]`, updated the regex to fix the recognition of `DD` to help with incorrect matching of some Custom Formats. + # 2022-06-26 Added word boundary for HONE #642 - Updated: CF `[HQ-WEBDL]` Added word boundary for `HONE`. From a8bbcb012bd466e23fe480cf97bb306195f62cdc Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 3 Jul 2022 18:19:51 +0200 Subject: [PATCH 21/35] Added: GUI option - Added: GUI option --- docs/Misc/trash-sync.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Misc/trash-sync.md b/docs/Misc/trash-sync.md index 435615019..45058aaa0 100644 --- a/docs/Misc/trash-sync.md +++ b/docs/Misc/trash-sync.md @@ -2,6 +2,7 @@ These are 3rd party applications to sync several sections of the guide with your Sonarr/Radarr (or multiple). +- GUI (graphical user interface) [^1] - Radarr Custom Formats [^1] [^2] - Radarr Scores [^1] [^2] - Radarr Quality Settings (File Size) [^2] From 84cbb4c4498559a01aef1588df3efa2179616d55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jul 2022 06:05:58 +0000 Subject: [PATCH 22/35] Bump mkdocs-git-revision-date-localized-plugin from 1.0.1 to 1.1.0 Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 1.0.1 to 1.1.0. - [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases) - [Commits](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/compare/v1.0.1...v1.1.0) --- updated-dependencies: - dependency-name: mkdocs-git-revision-date-localized-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1f76e0b16..a0e45f039 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ lightgallery==0.5 mkdocs-awesome-pages-plugin==2.7.0 -mkdocs-git-revision-date-localized-plugin==1.0.1 +mkdocs-git-revision-date-localized-plugin==1.1.0 mkdocs-macros-plugin==0.7.0 mkdocs-material==8.3.6 mkdocs-minify-plugin==0.5.0 From 11c661518e618c9fa84d4b45cbdc093b7e180d37 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jul 2022 20:23:05 +0000 Subject: [PATCH 23/35] Bump mkdocs-material from 8.3.6 to 8.3.9 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 8.3.6 to 8.3.9. - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/8.3.6...8.3.9) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index a0e45f039..26060f0e4 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.1.0 mkdocs-macros-plugin==0.7.0 -mkdocs-material==8.3.6 +mkdocs-material==8.3.9 mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.4 From 65c92a1f85c5559b2db0afadf99cf9eddab3bf41 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 6 Jul 2022 20:23:38 +0200 Subject: [PATCH 24/35] Fix: DV NoWEBDL - Fix: Optional - Ignore Dolby Vision without HDR10 fallback --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 2 +- docs/json/sonarr/optionals.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index 3bee411e6..4c229c8d7 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -469,7 +469,7 @@ Add this to your `Preferred (3)` with a score of [15] Add this to your `Must not contain (2)` ```bash -/^(?!.*(\bSIC\b|HDR|HULU|REMUX))(?=.*\b(DV|Dovi|Dolby[- .]?Vision)\b).*/i +/^(?!.*(HDR|HULU|REMUX))(?=.*\b(DV|Dovi|Dolby[- .]?Vision)\b).*/i ``` ------ diff --git a/docs/json/sonarr/optionals.json b/docs/json/sonarr/optionals.json index a899c306a..e2980618d 100644 --- a/docs/json/sonarr/optionals.json +++ b/docs/json/sonarr/optionals.json @@ -8,7 +8,7 @@ }, { "name": "Ignore Dolby Vision without HDR10 fallback.", "trash_id": "436f5a7d08fbf02ba25cb5e5dfe98e55", - "term": "/^(?!.*(\\bSIC\\b|HDR|HULU|REMUX))(?=.*\\b(DV|Dovi|Dolby[- .]?Vision)\\b).*/i" + "term": "/^(?!.*(HDR|HULU|REMUX))(?=.*\\b(DV|Dovi|Dolby[- .]?Vision)\\b).*/i" }, { "name": "Ignore The Group -SCENE", "trash_id": "f3f0f3691c6a1988d4a02963e69d11f2", From 97e8b19e98e5bad9c12a5413156b628f2696ceb8 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 6 Jul 2022 20:24:13 +0200 Subject: [PATCH 25/35] Delete optional.json - Removed: cleaned up v1 of this file please use optionals --- docs/json/sonarr/optional.json | 52 ---------------------------------- 1 file changed, 52 deletions(-) delete mode 100644 docs/json/sonarr/optional.json diff --git a/docs/json/sonarr/optional.json b/docs/json/sonarr/optional.json deleted file mode 100644 index f0a544d88..000000000 --- a/docs/json/sonarr/optional.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "!!! 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" - }, { - "name": "Ignore Dolby Vision without HDR10 fallback.", - "term": "/^(?!.*(HDR|HULU|REMUX))(?=.*\\b(DV|Dovi|Dolby[- .]Vision)\\b).*/i" - }, { - "name": "Ignore The Group -SCENE", - "term": "/\\b(-scene)\\b/i" - }, { - "name": "Ignore so called scene releases", - "term": "/([_. ]WEB[_. ]|\\bCAKES\\b|GGEZ|GGWP|GLHF)/i" - }], - "required": [], - "preferred": [{ - "score": 15, - "terms": [{ - "name": "Prefer Season Packs", - "term": "/\\bS\\d+\\b(?!E\\d+\\b)/i" - }] - }, { - "score": 10, - "terms": [{ - "name": "Prefer HDR", - "term": "/\\bHDR(\\b|\\d)/i" - }] - }, { - "score": 100, - "terms": [{ - "name": "Prefer Dolby Vision", - "term": "/\\b(dv|dovi|dolby[ .]?vision)\\b/i" - }] - }, { - "score": -25, - "terms": [{ - "name": "Dislike retags: rartv, rarbg, eztv, TGx", - "term": "/(\\[rartv\\]|\\[rarbg\\]|\\[eztv\\]|\\[TGx\\])/i" - }, { - "name": "Dislike retagged groups", - "term": "/(-4P|-4Planet|-AsRequested|-BUYMORE|-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek|-Obfuscated|-postbot|-Rakuv|-Scrambled|-WhiteRev|-xpost|-WRTEAM|-CAPTCHA)\\b/i" - }, { - "name": "Dislike release ending: en", - "term": "/\\s?\\ben\\b$/i" - }, { - "name": "Dislike release containing: 1-", - "term": "/(1-.+)$/i" - }] - }] -} From 644c4693e795019c2de26655b95dfe47e4d679c3 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 6 Jul 2022 20:54:01 +0200 Subject: [PATCH 26/35] Changed: CF `HDR10` to match `HDR` to prevent loops - Changed: CF `HDR10` to match `HDR` to prevent loops `550` to `500`. --- docs/json/radarr/hdr10.json | 2 +- includes/cf/hdr-metadata.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/json/radarr/hdr10.json b/docs/json/radarr/hdr10.json index 137cffa80..a260bad50 100644 --- a/docs/json/radarr/hdr10.json +++ b/docs/json/radarr/hdr10.json @@ -1,6 +1,6 @@ { "trash_id": "dfb86d5941bc9075d6af23b09c2aeecd", - "trash_score": "550", + "trash_score": "500", "name": "HDR10", "includeCustomFormatWhenRenaming": false, "specifications": [ diff --git a/includes/cf/hdr-metadata.md b/includes/cf/hdr-metadata.md index 812ceb793..4df081693 100644 --- a/includes/cf/hdr-metadata.md +++ b/includes/cf/hdr-metadata.md @@ -6,7 +6,7 @@ | DV HLG | 1500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#dv-hlg){: .header-icons target=_blank rel="noopener noreferrer" } | | DV SDR | 1500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#dv-sdr){: .header-icons target=_blank rel="noopener noreferrer" } | | HDR10Plus | 600 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#hdr10plus){: .header-icons target=_blank rel="noopener noreferrer" } | - | HDR10 | 550 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#hdr10){: .header-icons target=_blank rel="noopener noreferrer" } | + | HDR10 | 500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#hdr10){: .header-icons target=_blank rel="noopener noreferrer" } | | HDR | 500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#hdr){: .header-icons target=_blank rel="noopener noreferrer" } | | HDR (undefined) | 500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#hdr-undefined){: .header-icons target=_blank rel="noopener noreferrer" } | | PQ | 500 | [:octicons-link-external-16:](/Radarr/Radarr-collection-of-custom-formats/#pq){: .header-icons target=_blank rel="noopener noreferrer" } | From e35f71d955acb240ca31445efe573a61507d516a Mon Sep 17 00:00:00 2001 From: TRaSH Date: Wed, 6 Jul 2022 21:43:45 +0200 Subject: [PATCH 27/35] # 2022-07-06 # 2022-07-06 --- docs/updates.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 56f83272b..97bc8996e 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,12 @@ +# 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`. +Sonarr rp fix dv nowebdl #654 +- Fix: Optional - Ignore Dolby Vision without HDR10 fallback. +- Removed: `optimal.json` cleaned up v1 of this file please use `optionals.json` (recyclarr) +Fixed? the TrueHD regex #647 +- Fixed: `True-HD` or `True HD` leading to not being recognized by the CFs. + # 2022-07-01 Raised score from 25 to 800 to match Imax Enhanced. #650 - Updated: CF `[IMAX]` Raised score from `25` to `800` to match `Imax Enhanced`. From 81088a8e055f6c22b4adaeb147936bf6cf0ac734 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 7 Jul 2022 11:33:21 +0200 Subject: [PATCH 28/35] Add missing bots to Clean script (SABnzbd) --- docs/Downloaders/SABnzbd/scripts/Clean/Clean.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index 9848e0f50..f2c5088d7 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -29,6 +29,8 @@ except: fwp = nzbname fwp = re.sub('(?i)-4P$', '', fwp) fwp = re.sub('(?i)-4Planet$', '', fwp) +fwp = re.sub('(?i)-AlternativeToRequested$', '', fwp) +fwp = re.sub('(?i)-AlteZachen$', '', fwp) fwp = re.sub('(?i)-AsRequested$', '', fwp) fwp = re.sub('(?i)-AsRequested-xpost$', '', fwp) fwp = re.sub('(?i)-BUYMORE$', '', fwp) @@ -37,12 +39,15 @@ fwp = re.sub('(?i)-GEROV$', '', fwp) fwp = re.sub('(?i)-iNC0GNiTO$', '', fwp) fwp = re.sub('(?i)-NZBGeek$', '', fwp) fwp = re.sub('(?i)-Obfuscated$', '', fwp) +fwp = re.sub('(?i)-Obfuscation$', '', fwp) fwp = re.sub('(?i)-postbot$', '', fwp) fwp = re.sub('(?i)-Rakuv$', '', fwp) +fwp = re.sub('(?i)-RePACKPOST$', '', fwp) fwp = re.sub('(?i)-Scrambled$', '', fwp) fwp = re.sub('(?i)-WhiteRev$', '', fwp) fwp = re.sub('(?i)-WRTEAM$', '', fwp) fwp = re.sub('(?i)-CAPTCHA$', '', fwp) +fwp = re.sub('(?i)-Z0iDS3N$', '', fwp) fwp = re.sub('(?i)\[eztv\]$', '', fwp) fwp = re.sub('(?i)\[TGx\]$', '', fwp) fwp = re.sub('(?i)\[ettv\]$', '', fwp) @@ -58,4 +63,4 @@ print() print() print() # 0 means OK -sys.exit(0) +sys.exit(0) \ No newline at end of file From bb7ce488b3ee92d39af6c714f9dcf40e943dacef Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 7 Jul 2022 11:36:45 +0200 Subject: [PATCH 29/35] Optimize regex matching in Clean script (SABnzbd) --- docs/Downloaders/SABnzbd/scripts/Clean/Clean.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index f2c5088d7..3b3832ba8 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -41,7 +41,7 @@ fwp = re.sub('(?i)-NZBGeek$', '', fwp) fwp = re.sub('(?i)-Obfuscated$', '', fwp) fwp = re.sub('(?i)-Obfuscation$', '', fwp) fwp = re.sub('(?i)-postbot$', '', fwp) -fwp = re.sub('(?i)-Rakuv$', '', fwp) +fwp = re.sub('(?i)-Rakuv[a-z0-9]*$', '', fwp) fwp = re.sub('(?i)-RePACKPOST$', '', fwp) fwp = re.sub('(?i)-Scrambled$', '', fwp) fwp = re.sub('(?i)-WhiteRev$', '', fwp) @@ -55,6 +55,7 @@ fwp = re.sub('(?i)\[TGx\]-xpost$', '', fwp) fwp = re.sub('(?i).mkv-xpost$', '', fwp) fwp = re.sub('(?i)-xpost$', '', fwp) fwp = re.sub(r'(\-[^-.\n]*)(\-.{4})?$', r'\1', fwp) + print("1") # Accept print(fwp) print() From 559d089e6718808ef0391108de16688457d0fe15 Mon Sep 17 00:00:00 2001 From: nuxencs <47067662+nuxencs@users.noreply.github.com> Date: Sat, 9 Jul 2022 18:15:54 +0200 Subject: [PATCH 30/35] Added: Streaming Service CF for MoviesAnywhere --- docs/json/radarr/ma.json | 42 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 docs/json/radarr/ma.json diff --git a/docs/json/radarr/ma.json b/docs/json/radarr/ma.json new file mode 100644 index 000000000..f69fccc61 --- /dev/null +++ b/docs/json/radarr/ma.json @@ -0,0 +1,42 @@ +{ + "name": "MA", + "includeCustomFormatWhenRenaming": true, + "specifications": [ + { + "name": "Movies Anywhere", + "implementation": "ReleaseTitleSpecification", + "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 + } + } + ] +} From f3d8d005dfe7a2f3eae0c9b98ce82bebfba2f967 Mon Sep 17 00:00:00 2001 From: nuxencs <47067662+nuxencs@users.noreply.github.com> Date: Sat, 9 Jul 2022 18:31:35 +0200 Subject: [PATCH 31/35] Updated: added trash_id and trash_score to "MA" CF --- docs/json/radarr/ma.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/json/radarr/ma.json b/docs/json/radarr/ma.json index f69fccc61..58560a116 100644 --- a/docs/json/radarr/ma.json +++ b/docs/json/radarr/ma.json @@ -1,4 +1,6 @@ { + "trash_id": "2a6039655313bf5dab1e43523b62c374", + "trash_score": "0", "name": "MA", "includeCustomFormatWhenRenaming": true, "specifications": [ From fb3ad6940c5202e7a4a6aaa7e7ca00fbf7d67731 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 11:55:23 +0200 Subject: [PATCH 32/35] Fixed: formatting to make it more understandable. - Fixed: formatting to make it more understandable. --- ...to-run-the-unRaid-mover-for-qBittorrent.md | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md b/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md index 71b28387b..c390bf694 100644 --- a/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md +++ b/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md @@ -33,8 +33,8 @@ Install the following Plugins. - User Scripts - Nerd Tools - - python3 - - python-setuptools + - python3 [^2] + - python-setuptools [^2] ------ @@ -46,28 +46,33 @@ After you installed the needed Plugins it's time to configure everything. The script needs the qBit API to work, so we need to make sure it's installed when your unRaid server is booted or when the Array is started the first time. +You can choose from the following 2 options how you want to install it, depending what you preferce. + +- [User scripts](#user-scripts) +- [Go File](#go-file) + #### User scripts With this option we're going to install the qBit API when the Array is started the first time. Go to your unRaid Dashboard to your settings tab and select in the `User Utilities` at the bottom the new plugin you installed `User Scripts`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!User Scripts](images/Unraid-settings-user-scripts-icon.png) Select at the bottom `ADD NEW SCRIPT`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Add New Script](images/Unraid-user-scripts-add-new-script-icon.png) A popup will appear where you can give it a name, for this example we're going to use `Install qBittorrent API` and then click on `OK`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Install qBittorrent API](images/Unraid-user-scripts-add-new-script-enter-name.png) Click in the list on the cogwheel of the new user scrip you made. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Select user script](images/Unraid-settings-user-scripts-list-select-qbit-api.png) Copy/Paste in the new windows that opens the following bash command followed by `SAVE CHANGES`. @@ -77,17 +82,17 @@ Copy/Paste in the new windows that opens the following bash command followed by pip install qbittorrent-api ``` -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Bash script](images/Unraid-settings-user-scripts-qbit-api.png) Select in the schedule list when the script should run, and choose `At First Array Start Only`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Set Run Time](images/Unraid-settings-user-scripts-qbit-api-schedule.png) Click on `RUN IN BACKGROUND` or restart your unRaid server so the qBit API is installed. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!RUN IN BACKGROUND](images/Unraid-settings-user-scripts-qbit-api-run-background.png) ------ @@ -96,7 +101,7 @@ Click on `RUN IN BACKGROUND` or restart your unRaid server so the qBit API is in With this option we're going to install the qBit API when the unRaid server is started. -On your USB stick/key go to `/boot/config` and open the `go` file in your favorite editor and copy/paste the following command. +On your USB stick/key go to `/boot/config` and open the `go` file with your favorite editor ([VSCode](https://code.visualstudio.com/){:target="_blank" rel="noopener noreferrer"}/[Notepad++](https://notepad-plus-plus.org/downloads/){:target="_blank" rel="noopener noreferrer"}) and copy/paste the following command. ```bash pip install qbittorrent-api @@ -108,6 +113,8 @@ Restart your unRaid Server, or run the above command from the terminal. ### Script +Edit the script with your favorite editor ([VSCode](https://code.visualstudio.com/){:target="_blank" rel="noopener noreferrer"}/[Notepad++](https://notepad-plus-plus.org/downloads/){:target="_blank" rel="noopener noreferrer"}) you downloaded at the beginning of the guide [HERE](#the-script). + You only need to edit a few options in the script ```python @@ -121,7 +128,7 @@ qbt_pass = adminadmin ``` - `days` => Set Number of Days to stop torrents for the move. -- `qbt_host` => The URL you use to access qBittorrent locally. +- `qbt_host` => The URL you use to access qBittorrent locally. (*the* `'` *should remain*) - `qbt_user` => Your used qBittorrent `User Name` if you have authentication enabled. - `qbt_pass` => Your used qBittorrent `Password` if you have authentication enabled. @@ -130,7 +137,7 @@ qbt_pass = adminadmin #### Copy script to your preferred location -Now it's time to place the script somewhere easy to access/remember. +Now it's time to place the script you just edited somewhere easy to access/remember. Suggestions: @@ -143,22 +150,22 @@ Now it's time to setup the scheduler when the mover should run. Go to your unRaid Dashboard to your settings tab and select in the `User Utilities` at the bottom the new plugin you installed `User Scripts`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!User Scripts](images/Unraid-settings-user-scripts-icon.png) Select at the bottom `ADD NEW SCRIPT`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Add New Script](images/Unraid-user-scripts-add-new-script-icon.png) A popup will appear where you can give it a name, for this example we're going to use `qBittorrent Mover` and then click on `OK`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!qBittorrent Mover](images/Unraid-user-scripts-add-new-script-enter-name-qbt.png) Click in the list on the cogwheel of the new user scrip you made. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Select user script](images/Unraid-settings-user-scripts-list-select-qbit-mover.png) Copy/Paste in the new windows that opens the following bash command followed by `SAVE CHANGES`. @@ -175,12 +182,12 @@ echo qbittorrent-mover completed and resumed all paused torrents. !!! info Replace the `/mnt/user/data/scripts/mover.py` path to the path where you placed your python script. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Bash script](images/Unraid-settings-user-scripts-qbit-mover.png) Select in the schedule list when the script should run, and choose `Custom` -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Set Run Time](images/Unraid-settings-user-scripts-qbit-mover-schedule.png) After changing to `Custom` you get on the right a extra option where you can setup your cron schedule when it should be run. @@ -189,10 +196,13 @@ For this example we're going to let the script run a 4am at night. `0 4 * * *` Setup your own schedule [HERE](https://crontab.guru/) -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Set Run Time](images/Unraid-settings-user-scripts-qbit-mover-cron.png) --8<-- "includes/support.md" [^1]: Starr apps = Sonarr/Radarr etc. Doesn't Starr apps sound better then `The arr(s)` ? + +[^2]: + These needs to be installed from the Nerd Tools. From 13f01b93e1a99210d73c8d77f491aec326535eec Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 12:07:15 +0200 Subject: [PATCH 33/35] MD007 Unordered list indentation Fix: MD007 Unordered list indentation --- .../Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md b/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md index c390bf694..d0815bea4 100644 --- a/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md +++ b/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md @@ -33,8 +33,8 @@ Install the following Plugins. - User Scripts - Nerd Tools - - python3 [^2] - - python-setuptools [^2] + - python3 [^2] + - python-setuptools [^2] ------ From 3004ac47c347436b7319f7b29f868177dab3ccfa Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 12:17:18 +0200 Subject: [PATCH 34/35] Fixed: formatting - Fixed: formatting --- docs/Hardlinks/Check-if-hardlinks-are-working.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Hardlinks/Check-if-hardlinks-are-working.md b/docs/Hardlinks/Check-if-hardlinks-are-working.md index aa332ed8e..589ad372d 100644 --- a/docs/Hardlinks/Check-if-hardlinks-are-working.md +++ b/docs/Hardlinks/Check-if-hardlinks-are-working.md @@ -4,7 +4,7 @@ You've followed the guide step by step but still want to check if hardlinks are You can use 3 options to check if you got working hardlinks. -*Both ways requires you to login to your terminal with PuTTY or similar software.* +*All methods require you to login to your terminal with PuTTY or similar software.* !!! attention You can't create hard links for directories :bangbang: From 689d26a17ad784767b1f172203ad2a575f33c426 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Sun, 10 Jul 2022 16:42:10 +0200 Subject: [PATCH 35/35] Added: Movies Anywhere to the index - Added: Movies Anywhere to the index --- .../Radarr-collection-of-custom-formats.md | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 462efed88..f7ce72026 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -57,7 +57,7 @@ I also made 3 guides related to this one. | [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) | | | +| | | [Anime Dual Audio](#anime-dual-audio) | | [Movies Anywhere](#ma) | ------ @@ -1325,3 +1325,21 @@ I also made 3 guides related to this one. ``` [TOP](#index) + +------ + +### MA + +Movies Anywhere + +??? faq "Movies Anywhere - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://en.wikipedia.org/wiki/Movies_Anywhere){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/ma.json' %]][[% endfilter %]] + ``` + +[TOP](#index)