From 905301d6bd149fe49ef0bfaaa09ecb77d12c2715 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 06:05:02 +0000 Subject: [PATCH 01/21] Bump mkdocs-material from 8.1.8 to 8.1.9 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 8.1.8 to 8.1.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.1.8...8.1.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 9a8678cd7..1ecba3abc 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,7 +4,7 @@ markdown==3.3.6 mkdocs-awesome-pages-plugin==2.6.1 mkdocs-git-revision-date-localized-plugin==0.11.1 mkdocs-material-extensions==1.0.3 -mkdocs-material==8.1.8 +mkdocs-material==8.1.9 mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.3 mkdocs==1.2.3 From 614c14f26de02e2d796f52472623b049259b5d76 Mon Sep 17 00:00:00 2001 From: Brett Petch Date: Mon, 31 Jan 2022 16:26:02 -0500 Subject: [PATCH 02/21] New: Plex 4K transcoding --- docs/Plex/Tips/4k-transcoding.md | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 docs/Plex/Tips/4k-transcoding.md diff --git a/docs/Plex/Tips/4k-transcoding.md b/docs/Plex/Tips/4k-transcoding.md new file mode 100644 index 000000000..95c780d37 --- /dev/null +++ b/docs/Plex/Tips/4k-transcoding.md @@ -0,0 +1,46 @@ +# JBOPS 4K Transcode Stopping with Tautulli + +## Introduction +The bane of Plex admins existence... 4K Transcodes. According to Plex's forum post [*The Rules of 4K*](https://forums.plex.tv/t/info-plex-4k-transcoding-and-you-aka-the-rules-of-4k/378203) the first three rules of collecting 4k content is don’t bother transcoding 4k. + +This guide will walk you through getting started with Tautulli and JBOPS. By the end of this guide you'll be able to stop all 4K video transcodes on your server. + +## Getting Started +`git clone https://github.com/blacktwin/JBOPS` into the config dir of your tautulli instance (if dockerized) +Install requirements if needed (`pip install -r requirements.txt`) + +Go to your tautulli and go to the settings menu. In the sidebar, open “Notification Agents”. Create a new Notification Agent. + +## Configuration Tab +```plaintext +Script Folder: /config/JBOPS +Script File: killstream/kill_stream.py +Script Timeout: 30 (default) +Description (optional): 4K Transcode Stopper +``` + +## Triggers +```plaintext +☑️ Playback Start +☑️ Playback Resume +☑️ Transcode Decision Change +``` + +## Conditions +```plaintext +Condition {1} +Video Decision is transcode + +Condition {2} +Video Resolution is 4k + +Condition Logic +{1} and {2} +``` + +## Arguments +```plaintext +Under each: Playback Start, Playback Resume, Transcode Decision Change + +--jbop stream --username {username} --sessionId {session_id} --killMessage 'Transcoding streams are not allowed for {video_resolution} streams.' +``` From b81b99db15d73c6181c7062aea53fed6d47c7195 Mon Sep 17 00:00:00 2001 From: Brett Petch Date: Mon, 31 Jan 2022 16:27:54 -0500 Subject: [PATCH 03/21] edit(4K transcoding): mention PlexPass requirement --- docs/Plex/Tips/4k-transcoding.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Plex/Tips/4k-transcoding.md b/docs/Plex/Tips/4k-transcoding.md index 95c780d37..2e8e7c43e 100644 --- a/docs/Plex/Tips/4k-transcoding.md +++ b/docs/Plex/Tips/4k-transcoding.md @@ -3,7 +3,7 @@ ## Introduction The bane of Plex admins existence... 4K Transcodes. According to Plex's forum post [*The Rules of 4K*](https://forums.plex.tv/t/info-plex-4k-transcoding-and-you-aka-the-rules-of-4k/378203) the first three rules of collecting 4k content is don’t bother transcoding 4k. -This guide will walk you through getting started with Tautulli and JBOPS. By the end of this guide you'll be able to stop all 4K video transcodes on your server. +This guide will walk you through getting started with Tautulli and JBOPS. By the end of this guide you'll be able to stop all 4K video transcodes on your server. Note that this does require a [Plex Pass](https://www.plex.tv/plex-pass/) to work. ## Getting Started `git clone https://github.com/blacktwin/JBOPS` into the config dir of your tautulli instance (if dockerized) From c55f0e7e728207c7c87f63ae603f0225c70b542d Mon Sep 17 00:00:00 2001 From: Brett Petch Date: Tue, 1 Feb 2022 14:10:54 -0500 Subject: [PATCH 04/21] fix: lint error cleanup --- docs/Plex/Tips/4k-transcoding.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/Plex/Tips/4k-transcoding.md b/docs/Plex/Tips/4k-transcoding.md index 2e8e7c43e..99e08d231 100644 --- a/docs/Plex/Tips/4k-transcoding.md +++ b/docs/Plex/Tips/4k-transcoding.md @@ -1,17 +1,20 @@ # JBOPS 4K Transcode Stopping with Tautulli ## Introduction + The bane of Plex admins existence... 4K Transcodes. According to Plex's forum post [*The Rules of 4K*](https://forums.plex.tv/t/info-plex-4k-transcoding-and-you-aka-the-rules-of-4k/378203) the first three rules of collecting 4k content is don’t bother transcoding 4k. This guide will walk you through getting started with Tautulli and JBOPS. By the end of this guide you'll be able to stop all 4K video transcodes on your server. Note that this does require a [Plex Pass](https://www.plex.tv/plex-pass/) to work. ## Getting Started + `git clone https://github.com/blacktwin/JBOPS` into the config dir of your tautulli instance (if dockerized) Install requirements if needed (`pip install -r requirements.txt`) -Go to your tautulli and go to the settings menu. In the sidebar, open “Notification Agents”. Create a new Notification Agent. +Go to your tautulli and go to the settings menu. In the sidebar, open “Notification Agents”. Create a new Notification Agent. ## Configuration Tab + ```plaintext Script Folder: /config/JBOPS Script File: killstream/kill_stream.py @@ -20,6 +23,7 @@ Description (optional): 4K Transcode Stopper ``` ## Triggers + ```plaintext ☑️ Playback Start ☑️ Playback Resume @@ -27,6 +31,7 @@ Description (optional): 4K Transcode Stopper ``` ## Conditions + ```plaintext Condition {1} Video Decision is transcode @@ -39,6 +44,7 @@ Condition Logic ``` ## Arguments + ```plaintext Under each: Playback Start, Playback Resume, Transcode Decision Change From 1498bfb14164221568129d0018b9f5bc7c518be2 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Tue, 1 Feb 2022 20:17:16 +0100 Subject: [PATCH 05/21] Update .pages --- docs/Plex/Tips/.pages | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Plex/Tips/.pages b/docs/Plex/Tips/.pages index ae3c89c79..0d7e7e9f0 100644 --- a/docs/Plex/Tips/.pages +++ b/docs/Plex/Tips/.pages @@ -1,5 +1,6 @@ nav: - Suggested Plex Media Server Settings: Plex-media-server.md + - JBOPS 4K Transcode Stopping with Tautulli: 4k-transcoding.md From 7d21e45c4ba89554f838f5a8be939d59e0a94ceb Mon Sep 17 00:00:00 2001 From: nuxencs <47067662+nuxencs@users.noreply.github.com> Date: Thu, 3 Feb 2022 15:36:40 +0100 Subject: [PATCH 06/21] Updated: Preferred Sonarr Naming Scheme Use 'Prefixed Range' instead of 'Scene' for better episode recognition in Plex. --- .../Sonarr-Release-Profile-RegEx-Anime.md | 2 +- .../Sonarr-recommended-naming-scheme.md | 2 +- docs/Sonarr/images/results.png | Bin 8696 -> 9178 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md index 201ac2eac..0016b43e6 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md @@ -109,7 +109,7 @@ RESULT: #### Multi-Episode Style ```bash -Scene +Prefixed Range ``` RESULTS: diff --git a/docs/Sonarr/Sonarr-recommended-naming-scheme.md b/docs/Sonarr/Sonarr-recommended-naming-scheme.md index 12a1d9ad2..abaf09483 100644 --- a/docs/Sonarr/Sonarr-recommended-naming-scheme.md +++ b/docs/Sonarr/Sonarr-recommended-naming-scheme.md @@ -127,7 +127,7 @@ RESULT: ### Multi-Episode Style ```bash -Scene +Prefixed Range ``` RESULTS: diff --git a/docs/Sonarr/images/results.png b/docs/Sonarr/images/results.png index 0e1d559d06c7a51d6905eb0a64028df319fb5480..b3556b1ea60c4628a7056a0c1c16d611adc25aff 100644 GIT binary patch literal 9178 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 Date: Thu, 3 Feb 2022 20:37:21 +0100 Subject: [PATCH 07/21] Sonarr regex update - Merged: several regex to on regex after Sonarr fixed the GUI bug. --- docs/Sonarr/Sonarr-Release-Profile-RegEx.md | 65 ++++----------------- docs/json/sonarr/lqGroups.json | 3 +- docs/json/sonarr/optional.json | 13 +---- docs/json/sonarr/p2pRepackProper.json | 12 +--- 4 files changed, 15 insertions(+), 78 deletions(-) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index 9f2c8f3e8..a2d1b5e03 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -236,8 +236,7 @@ Add this to your `Must not contain (2)` ### P2P Groups + Repack/Proper -Add this to your `Preferred (3)` with a score of [180] -The reason why this one get's such a high score is because it's the only quality scene group that exist (till now) and scene groups don't add the [Release Sources (Streaming Service)](#release-sources-streaming-service) to their release name so they don't get the extra point of the release source regex. +Add this to your `Preferred (3)` with a score of [180] [^1] ```bash /(-deflate|-inflate)\b/i @@ -246,45 +245,13 @@ The reason why this one get's such a high score is because it's the only quality Add this to your `Preferred (3)` with a score of [150] ```bash -/(-AJP69|-BTN|-CasStudio|-CtrlHD|-KiNGS)\b/i -``` - -```bash -/(-monkee|-NTb|-NTG|-QOQ|-RTN)\b/i -``` - -```bash -/(-TOMMY|-ViSUM|-T6D)\b/i +/(-AJP69|-BTN|-CasStudio|-CtrlHD|-KiNGS|-monkee|-NTb|-NTG|-QOQ|-RTN|-TOMMY|-ViSUM|-T6D|-FLUX|NOSiViD)\b/i ``` Add this to your `Preferred (3)` with a score of [125] ```bash -/(-BTW|-Chotab|-CiT|-DEEP|-iJP|-iT00NZ)\b/i -``` - -```bash -/(-LAZY|-NYH|-SA89|-SIGMA|-TEPES|-TVSmash)\b/i -``` - -```bash -/(-SDCC|-iKA|-iJP|-Cinefeel|-SPiRiT|-FC)\b/i -``` - -```bash -/(-JETIX|-Coo7|-WELP|-KiMCHI|-BLUTONiUM)\b/i -``` - -```bash -/(-orbitron|-ETHiCS|-RTFM|-PSiG|-MZABI)\b/i -``` - -```bash -/(-ROCCaT|3cTWeB|playWEB|-FLUX|NOSiViD)\b/i -``` - -```bash -/(-KHN|NPMS|-END)\b/i +/(-BTW|-Chotab|-CiT|-DEEP|-iJP|-iT00NZ|-LAZY|-NYH|-SA89|-SIGMA|-TEPES|-TVSmash|-SDCC|-iKA|-iJP|-Cinefeel|-SPiRiT|-FC|-JETIX|-Coo7|-WELP|-KiMCHI|-BLUTONiUM|-orbitron|-ETHiCS|-RTFM|-PSiG|-MZABI|-ROCCaT|3cTWeB|playWEB|-KHN|NPMS|-END)\b/i ``` Add this to your `Preferred (3)` with a score of [100] @@ -330,11 +297,7 @@ Add this to your `Preferred (3)` with a score of [10] Add this to your `Preferred (3)` with a score of [-100] ```bash -/(TBS|-BRiNK|-CHX|-XLF|-worldmkv|-GHOSTS)\b/i -``` - -```bash -/(-VIDEOHOLE|nhanc3)\b/i +/(TBS|-BRiNK|-CHX|-XLF|-worldmkv|-GHOSTS|-VIDEOHOLE|nhanc3)\b/i ``` ??? success "example - [CLICK TO EXPAND]" @@ -383,19 +346,7 @@ Add this to your `Preferred (3)` with a score of [-25] ``` ```bash -/(-4P|-4Planet|-AsRequested|-BUYMORE)\b/i -``` - -```bash -/(-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek)\b/i -``` - -```bash -/(-Obfuscated|-postbot|-Rakuv|-Scrambled)\b/i -``` - -```bash -/(-WhiteRev|-xpost|-WRTEAM|-CAPTCHA)\b/i +/(-4P|-4Planet|-AsRequested|-BUYMORE|-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek|-Obfuscated|-postbot|-Rakuv|-Scrambled|-WhiteRev|-xpost|-WRTEAM|-CAPTCHA)\b/i ``` #### Optional (matches releases that ends with EN) @@ -477,7 +428,7 @@ Add this to your `Must not contain (2)` Add this to your `Must not contain (2)` ```bash -/([_. ]WEB[_. ]|\\bCAKES\\b|GGEZ|GGWP|GLHF)/i +/([_. ]WEB[_. ]|\bCAKES\b|GGEZ|GGWP|GLHF)/i ``` ------ @@ -542,3 +493,7 @@ If you want to be mentioned please message me on discord, including a link for p ------ --8<-- "includes/support.md" + +[^1]: + + The reason why this one get's such a high score is because it's the only quality scene group that exist (till now) and scene groups don't add the [Release Sources (Streaming Service)](#release-sources-streaming-service) to their release name so they don't get the extra point of the release source regex. diff --git a/docs/json/sonarr/lqGroups.json b/docs/json/sonarr/lqGroups.json index 65248ba52..15d296706 100644 --- a/docs/json/sonarr/lqGroups.json +++ b/docs/json/sonarr/lqGroups.json @@ -7,8 +7,7 @@ { "score": -100, "terms": [ - "/(TBS|-BRiNK|-CHX|-XLF|-worldmkv|-GHOSTS)\\b/i", - "/(-VIDEOHOLE|nhanc3)\\b/i" + "/(TBS|-BRiNK|-CHX|-XLF|-worldmkv|-GHOSTS|-VIDEOHOLE|nhanc3)\\b/i" ] } ], diff --git a/docs/json/sonarr/optional.json b/docs/json/sonarr/optional.json index 2d156f1b1..21f550bc3 100644 --- a/docs/json/sonarr/optional.json +++ b/docs/json/sonarr/optional.json @@ -34,17 +34,8 @@ "name": "Dislike retags: rartv, rarbg, eztv, TGx", "term": "/(\\[rartv\\]|\\[rarbg\\]|\\[eztv\\]|\\[TGx\\])/i" }, { - "name": "Dislike groups 1/4: 4Planet, AsRequested, BUYMORE", - "term": "/(-4P|-4Planet|-AsRequested|-BUYMORE)\\b/i" - }, { - "name": "Dislike groups 2/4: Chamele0n, GEROV, iNC0GNiTO, NZBGeek", - "term": "/(-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek)\\b/i" - }, { - "name": "Dislike groups 3/4: Obfuscated, postbot, Rakuv, Scrambled", - "term": "/(-Obfuscated|-postbot|-Rakuv|-Scrambled)\\b/i" - }, { - "name": "Dislike groups 4/4: WhiteRev, xpost, WRTEAM, CAPTCHA", - "term": "/(-WhiteRev|-xpost|-WRTEAM|-CAPTCHA)\\b/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" diff --git a/docs/json/sonarr/p2pRepackProper.json b/docs/json/sonarr/p2pRepackProper.json index 8ce9162d3..d79cbc3d9 100644 --- a/docs/json/sonarr/p2pRepackProper.json +++ b/docs/json/sonarr/p2pRepackProper.json @@ -13,21 +13,13 @@ { "score": 150, "terms": [ - "/(-AJP69|-BTN|-CasStudio|-CtrlHD|-KiNGS)\\b/i", - "/(-monkee|-NTb|-NTG|-QOQ|-RTN)\\b/i", - "/(-TOMMY|-ViSUM|-T6D)\\b/i" + "/(-AJP69|-BTN|-CasStudio|-CtrlHD|-KiNGS|-monkee|-NTb|-NTG|-QOQ|-RTN|-TOMMY|-ViSUM|-T6D|-FLUX|NOSiViD)\\b/i" ] }, { "score": 125, "terms": [ - "/(-BTW|-Chotab|-CiT|-DEEP|-iJP|-iT00NZ)\\b/i", - "/(-LAZY|-NYH|-SA89|-SIGMA|-TEPES|-TVSmash)\\b/i", - "/(-SDCC|-iKA|-iJP|-Cinefeel|-SPiRiT|-FC)\\b/i", - "/(-JETIX|-Coo7|-WELP|-KiMCHI|-BLUTONiUM)\\b/i", - "/(-orbitron|-ETHiCS|-RTFM|-PSiG|-MZABI)\\b/i", - "/(-ROCCaT|3cTWeB|playWEB|-FLUX|NOSiViD)\\b/i", - "/(-KHN|NPMS|-END)\\b/i" + "/(-BTW|-Chotab|-CiT|-DEEP|-iJP|-iT00NZ|-LAZY|-NYH|-SA89|-SIGMA|-TEPES|-TVSmash|-SDCC|-iKA|-iJP|-Cinefeel|-SPiRiT|-FC|-JETIX|-Coo7|-WELP|-KiMCHI|-BLUTONiUM|-orbitron|-ETHiCS|-RTFM|-PSiG|-MZABI|-ROCCaT|3cTWeB|playWEB|-KHN|NPMS|-END)\\b/i" ] }, { From 08fa822db3f37224ca9eafc6ec357a371b87f9a7 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 3 Feb 2022 22:19:28 +0100 Subject: [PATCH 08/21] JSON Merge - Merged Golden Rule Json in to optional --- docs/json/sonarr/goldenRule.json | 8 -------- docs/json/sonarr/optional.json | 5 ++++- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 docs/json/sonarr/goldenRule.json diff --git a/docs/json/sonarr/goldenRule.json b/docs/json/sonarr/goldenRule.json deleted file mode 100644 index 8d373b3fc..000000000 --- a/docs/json/sonarr/goldenRule.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Golden rule", - "trash_id": "D06EA70E08E9185E00A22AC19DC4CA48", - "includePreferredWhenRenaming": false, - "required": [], - "preferred": [], - "ignored": ["/(?=(1080|720)).*((x|h)[ ._-]?265|hevc)/i"] -} diff --git a/docs/json/sonarr/optional.json b/docs/json/sonarr/optional.json index 21f550bc3..609ae8e1b 100644 --- a/docs/json/sonarr/optional.json +++ b/docs/json/sonarr/optional.json @@ -1,8 +1,11 @@ { "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" }, { From 48ac12fca1cd0c2e6d0bec4b80dfd3597d09e7f6 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Thu, 3 Feb 2022 22:56:24 +0100 Subject: [PATCH 09/21] # 2022-02-03 --- docs/updates.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 0d29da582..2f370486a 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,11 @@ +# 2022-02-03 +Sonarr regex update #504 +- Merged: several regex to on regex after Sonarr fixed the GUI bug. +Updated: Preferred Sonarr Naming Scheme #503 +- Use 'Prefixed Range' instead of 'Scene' for better episode recognition in Plex. +New: Plex 4K Transcode Stopping #502 (Plex Tips section) +- Stop Video Transcoding for 4k + # 2022-01-30 Updated: Radarr cf collection no rls group hotfix #500 - Hotfix: for earlier screw up from my side. From 98e8d0ad01088b3d255909967956958a1cd02e8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Feb 2022 08:37:11 +0000 Subject: [PATCH 10/21] Bump mkdocs-git-revision-date-localized-plugin from 0.11.1 to 0.12 Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 0.11.1 to 0.12. - [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/v0.11.1...v0.12) --- 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 1ecba3abc..c792598a3 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,7 +2,7 @@ git+https://github.com/fralau/mkdocs_macros_plugin@v0.5.12#egg=mkdocs-macros-plu git+https://github.com/g-provost/lightgallery-markdown@v0.5#egg=lightgallery markdown==3.3.6 mkdocs-awesome-pages-plugin==2.6.1 -mkdocs-git-revision-date-localized-plugin==0.11.1 +mkdocs-git-revision-date-localized-plugin==0.12 mkdocs-material-extensions==1.0.3 mkdocs-material==8.1.9 mkdocs-minify-plugin==0.5.0 From f5f1f26f1d7163f9374791d467c9b749491e8eff Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 11 Feb 2022 21:10:19 +0100 Subject: [PATCH 11/21] Updated: CF [LQ] added `Liber8` to the `Nominated Unwanted Groups` condition. - Updated: CF [LQ] added `Liber8` to the `Nominated Unwanted Groups` condition. --- docs/json/radarr/lq.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/lq.json b/docs/json/radarr/lq.json index cc80c4def..059de5063 100644 --- a/docs/json/radarr/lq.json +++ b/docs/json/radarr/lq.json @@ -73,7 +73,7 @@ "negate": false, "required": false, "fields": { - "value": "\\b(TEKNO3D|TIKO)\\b" + "value": "\\b(TEKNO3D|TIKO|Liber8)\\b" } } ] From 97da47cfa66b2847b27654dca042f24e9b7995b0 Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 11 Feb 2022 21:10:38 +0100 Subject: [PATCH 12/21] Updated: CF [Obfuscated] added `_nzb` to the `Retagged`condition. - Updated: CF [Obfuscated] added `_nzb` to the `Retagged`condition. --- docs/json/radarr/obfuscated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/obfuscated.json b/docs/json/radarr/obfuscated.json index cceb1ff98..9fc5a8206 100644 --- a/docs/json/radarr/obfuscated.json +++ b/docs/json/radarr/obfuscated.json @@ -10,7 +10,7 @@ "negate": false, "required": false, "fields": { - "value": "(-4P|-4Planet|-AsRequested|-BUYMORE|-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek|-Obfuscated|-postbot|-Rakuv|-Scrambled|-WhiteRev|-xpost|-WRTEAM|-CAPTCHA)\\b" + "value": "(-4P|-4Planet|-AsRequested|-BUYMORE|-Chamele0n|-GEROV|-iNC0GNiTO|-NZBGeek|-Obfuscated|-postbot|-Rakuv|-Scrambled|-WhiteRev|-xpost|-WRTEAM|-CAPTCHA|_nzb)\\b" } }, { From 6f3b666b689df51696b0a0d82490025eeb09d37e Mon Sep 17 00:00:00 2001 From: TRaSH Date: Fri, 11 Feb 2022 21:15:34 +0100 Subject: [PATCH 13/21] # 2022-02-11 --- docs/updates.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 2f370486a..59a260ed2 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,8 @@ +# 2022-02-11 +Radarr cf collection 20220211 #511 +- Updated: CF [LQ] added `Liber8` to the `Nominated Unwanted Groups` condition. +- Updated: CF [Obfuscated] added `_nzb` to the `Retagged`condition. + # 2022-02-03 Sonarr regex update #504 - Merged: several regex to on regex after Sonarr fixed the GUI bug. From f64df5ccdc2bb125462e7e416604620734e1909f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 20:16:25 +0000 Subject: [PATCH 14/21] Bump mkdocs-git-revision-date-localized-plugin from 0.12 to 0.12.1 Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 0.12 to 0.12.1. - [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/v0.12...v0.12.1) --- updated-dependencies: - dependency-name: mkdocs-git-revision-date-localized-plugin 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 c792598a3..2ca47d116 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,7 +2,7 @@ git+https://github.com/fralau/mkdocs_macros_plugin@v0.5.12#egg=mkdocs-macros-plu git+https://github.com/g-provost/lightgallery-markdown@v0.5#egg=lightgallery markdown==3.3.6 mkdocs-awesome-pages-plugin==2.6.1 -mkdocs-git-revision-date-localized-plugin==0.12 +mkdocs-git-revision-date-localized-plugin==0.12.1 mkdocs-material-extensions==1.0.3 mkdocs-material==8.1.9 mkdocs-minify-plugin==0.5.0 From c9f0fd43b50dcbee35f9b9c6142c7b33d49ca2f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 20:37:23 +0000 Subject: [PATCH 15/21] Bump pymdown-extensions from 9.1 to 9.2 Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 9.1 to 9.2. - [Release notes](https://github.com/facelessuser/pymdown-extensions/releases) - [Commits](https://github.com/facelessuser/pymdown-extensions/compare/9.1...9.2) --- updated-dependencies: - dependency-name: pymdown-extensions 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 2ca47d116..7daec7f12 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -9,4 +9,4 @@ mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.3 mkdocs==1.2.3 pygments==2.11.2 -pymdown-extensions==9.1 +pymdown-extensions==9.2 From 2646c5b80ab9861915910125cffe976d5e010575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 23:30:42 +0000 Subject: [PATCH 16/21] Bump mkdocs-material from 8.1.9 to 8.1.11 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 8.1.9 to 8.1.11. - [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.1.9...8.1.11) --- 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 7daec7f12..9404d1f84 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,7 +4,7 @@ markdown==3.3.6 mkdocs-awesome-pages-plugin==2.6.1 mkdocs-git-revision-date-localized-plugin==0.12.1 mkdocs-material-extensions==1.0.3 -mkdocs-material==8.1.9 +mkdocs-material==8.1.11 mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.3 mkdocs==1.2.3 From 2369a1135dfc72e64aeaee0816a7497202a796b8 Mon Sep 17 00:00:00 2001 From: ItsME6969 <89707006+ItsME6969@users.noreply.github.com> Date: Sun, 13 Feb 2022 13:55:53 -0700 Subject: [PATCH 17/21] Update br-disk.json Added: Support for BD AVC|HEVC --- docs/json/radarr/br-disk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/json/radarr/br-disk.json b/docs/json/radarr/br-disk.json index 340a2d355..6d58d978d 100644 --- a/docs/json/radarr/br-disk.json +++ b/docs/json/radarr/br-disk.json @@ -19,7 +19,7 @@ "negate": false, "required": true, "fields": { - "value": "^(((?=.*(Blu[-_. ]?ray|HD[-_. ]?DVD)\\b)(?=.*\\b(AVC|HEVC|VC[-_. ]?1|MVC|MPEG[-_. ]?2|BDMV)\\b))|^((?=.*\\b(^((?=.*\\b(COMPLETE|Dis[ck])\\b)(?=.*(Blu[-_. ]?ray|HD[-_. ]?DVD)))|3D[-_. ]?BD|BR[-_. ]?DISK|Full[-_. ]?Blu[-_. ]?ray|^((?=.*((BD|UHD)[-_. ]?(25|50|66)))(?=.*ISO)?))))).*" + "value": "^(((?=.*(Blu[-_. ]?ray|BD|HD[-_. ]?DVD)\\b)(?=.*\\b(AVC|HEVC|VC[-_. ]?1|MVC|MPEG[-_. ]?2|BDMV)\\b))|^((?=.*\\b(^((?=.*\\b(COMPLETE|Dis[ck])\\b)(?=.*(Blu[-_. ]?ray|HD[-_. ]?DVD)))|3D[-_. ]?BD|BR[-_. ]?DISK|Full[-_. ]?Blu[-_. ]?ray|^((?=.*((BD|UHD)[-_. ]?(25|50|66)))(?=.*ISO)?))))).*" } } ] From 0381684a825bb0d356d9bc48322ce6673be1d246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Feb 2022 06:07:29 +0000 Subject: [PATCH 18/21] Bump mkdocs-awesome-pages-plugin from 2.6.1 to 2.7.0 Bumps [mkdocs-awesome-pages-plugin](https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin) from 2.6.1 to 2.7.0. - [Release notes](https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin/releases) - [Commits](https://github.com/lukasgeiter/mkdocs-awesome-pages-plugin/compare/v2.6.1...v2.7.0) --- updated-dependencies: - dependency-name: mkdocs-awesome-pages-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 9404d1f84..adc1b5c86 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,7 +1,7 @@ git+https://github.com/fralau/mkdocs_macros_plugin@v0.5.12#egg=mkdocs-macros-plugin git+https://github.com/g-provost/lightgallery-markdown@v0.5#egg=lightgallery markdown==3.3.6 -mkdocs-awesome-pages-plugin==2.6.1 +mkdocs-awesome-pages-plugin==2.7.0 mkdocs-git-revision-date-localized-plugin==0.12.1 mkdocs-material-extensions==1.0.3 mkdocs-material==8.1.11 From 3ad75038db4269aec6702b3c8a51fc37922afc0e Mon Sep 17 00:00:00 2001 From: TRaSH Date: Tue, 15 Feb 2022 22:43:06 +0100 Subject: [PATCH 19/21] # 2022-02-15 --- docs/updates.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/updates.txt b/docs/updates.txt index 59a260ed2..2cb9cfc48 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,7 @@ +# 2022-02-15 +Update br-disk.json #512 +- Updated: CF [BR-DISK] Support for BD AVC|HEVC. + # 2022-02-11 Radarr cf collection 20220211 #511 - Updated: CF [LQ] added `Liber8` to the `Nominated Unwanted Groups` condition. From dcbd10df3f8aa5dd29d48ed690dda5f1b669cfac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Feb 2022 06:06:04 +0000 Subject: [PATCH 20/21] Bump mkdocs-material from 8.1.11 to 8.2.1 Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material) from 8.1.11 to 8.2.1. - [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.1.11...8.2.1) --- updated-dependencies: - dependency-name: mkdocs-material 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 adc1b5c86..bdaa57ef6 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -4,7 +4,7 @@ markdown==3.3.6 mkdocs-awesome-pages-plugin==2.7.0 mkdocs-git-revision-date-localized-plugin==0.12.1 mkdocs-material-extensions==1.0.3 -mkdocs-material==8.1.11 +mkdocs-material==8.2.1 mkdocs-minify-plugin==0.5.0 mkdocs-redirects==1.0.3 mkdocs==1.2.3 From 2d8f1ebcab390970e9e38075858cd224a397b1d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 06:04:23 +0000 Subject: [PATCH 21/21] Bump mkdocs-git-revision-date-localized-plugin from 0.12.1 to 1.0.0 Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin) from 0.12.1 to 1.0.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/v0.12.1...v1.0.0) --- updated-dependencies: - dependency-name: mkdocs-git-revision-date-localized-plugin dependency-type: direct:production update-type: version-update:semver-major ... 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 bdaa57ef6..aec801328 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -2,7 +2,7 @@ git+https://github.com/fralau/mkdocs_macros_plugin@v0.5.12#egg=mkdocs-macros-plu git+https://github.com/g-provost/lightgallery-markdown@v0.5#egg=lightgallery markdown==3.3.6 mkdocs-awesome-pages-plugin==2.7.0 -mkdocs-git-revision-date-localized-plugin==0.12.1 +mkdocs-git-revision-date-localized-plugin==1.0.0 mkdocs-material-extensions==1.0.3 mkdocs-material==8.2.1 mkdocs-minify-plugin==0.5.0