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 diff --git a/docs/Plex/Tips/4k-transcoding.md b/docs/Plex/Tips/4k-transcoding.md new file mode 100644 index 000000000..99e08d231 --- /dev/null +++ b/docs/Plex/Tips/4k-transcoding.md @@ -0,0 +1,52 @@ +# 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. + +## 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.' +``` 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-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/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 0e1d559d0..b3556b1ea 100644 Binary files a/docs/Sonarr/images/results.png and b/docs/Sonarr/images/results.png differ 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)?))))).*" } } ] 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" } } ] 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" } }, { 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/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..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" }, { @@ -34,17 +37,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" ] }, { diff --git a/docs/requirements.txt b/docs/requirements.txt index 9a8678cd7..aec801328 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,12 +1,12 @@ 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-git-revision-date-localized-plugin==0.11.1 +mkdocs-awesome-pages-plugin==2.7.0 +mkdocs-git-revision-date-localized-plugin==1.0.0 mkdocs-material-extensions==1.0.3 -mkdocs-material==8.1.8 +mkdocs-material==8.2.1 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 diff --git a/docs/updates.txt b/docs/updates.txt index 0d29da582..2cb9cfc48 100644 --- a/docs/updates.txt +++ b/docs/updates.txt @@ -1,3 +1,20 @@ +# 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. +- 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. +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.