Merge branch 'master' into backend-maintenance-test-v2

pull/633/head
TRaSH 3 years ago
commit 321647c087

@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with:
fetch-depth: '0' fetch-depth: '0'
- uses: actions/setup-python@v3 - uses: actions/setup-python@v4
with: with:
python-version: 3.x python-version: 3.x
- run: pip install -r docs/requirements.txt - run: pip install -r docs/requirements.txt

@ -49,14 +49,14 @@ I also made 3 guides related to this one.
| Movie Versions | Unwanted | Misc | HQ Source Groups | Streaming Services | | Movie Versions | Unwanted | Misc | HQ Source Groups | Streaming Services |
| --------------------------------------------- | ---------------------------------- | ------------------------------------- | --------------------- | ---------------------------- | | --------------------------------------------- | ---------------------------------- | ------------------------------------- | --------------------- | ---------------------------- |
| [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [Repack/Proper](#repack-proper) | [HQ-Remux](#hq-remux) | [Amazon](#amazon) | | [Hybrid](#hybrid) | [BR-DISK](#br-disk) | [Repack/Proper](#repack-proper) | [HQ-Remux](#hq-remux) | [Amazon](#amzn) |
| [Remaster](#remaster) | [EVO (no WEBDL)](#evo-no-webdl) | [Repack2](#repack2) | [HQ](#hq) | [Apple TV+](#apple-tvplus) | | [Remaster](#remaster) | [EVO (no WEBDL)](#evo-no-webdl) | [Repack2](#repack2) | [HQ](#hq) | [Apple TV+](#aptv) |
| [4K Remaster](#4k-remaster) | [LQ](#lq) | [Multi](#multi) | [HQ-WEBDL](#hq-webdl) | [Disney+](#disneyplus) | | [4K Remaster](#4k-remaster) | [LQ](#lq) | [Multi](#multi) | [HQ-WEBDL](#hq-webdl) | [Disney+](#dsnp) |
| [Special Editions](#special-edition) | [x265 (720/1080p)](#x265-7201080p) | [x264](#x264) | | [HBO Max](#hbo-max) | | [Special Editions](#special-edition) | [x265 (720/1080p)](#x265-7201080p) | [x264](#x264) | | [HBO Max](#hmax) |
| [Criterion Collection](#criterion-collection) | [3D](#3d) | [x265](#x265) | | [Hulu](#hulu) | | [Criterion Collection](#criterion-collection) | [3D](#3d) | [x265](#x265) | | [Hulu](#hulu) |
| [Theatrical Cut](#theatrical-cut) | [No-RlsGroup](#no-rlsgroup) | [MPEG2](#mpeg2) | | [Netflix](#netflix) | | [Theatrical Cut](#theatrical-cut) | [No-RlsGroup](#no-rlsgroup) | [MPEG2](#mpeg2) | | [Netflix](#nf) |
| [IMAX](#imax) | [Obfuscated](#obfuscated) | [FreeLeech](#freeleech) | | [Peacock TV](#peacock-tv) | | [IMAX](#imax) | [Obfuscated](#obfuscated) | [FreeLeech](#freeleech) | | [Peacock TV](#pcok) |
| [IMAX Enhanced](#imax-enhanced) | [DV (WEBDL)](#dv-webdl) | [Dutch Groups](#dutch-groups) | | [Paramount+](#paramountplus) | | [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) | | |
------ ------
@ -1184,7 +1184,7 @@ I also made 3 guides related to this one.
------ ------
### Amazon ### AMZN
<sub>Amazon</sub> <sub>Amazon</sub>
@ -1195,14 +1195,14 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/amazon.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/amzn.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>
------ ------
### Apple TVplus ### APTV
<sub>Apple TV+</sub> <sub>Apple TV+</sub>
@ -1213,14 +1213,14 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/apple-tvplus.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/aptv.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>
------ ------
### DisneyPlus ### DSNP
<sub>Disney+</sub> <sub>Disney+</sub>
@ -1231,14 +1231,14 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/disneyplus.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/dsnp.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>
------ ------
### HBO Max ### HMAX
<sub>HBO Max</sub> <sub>HBO Max</sub>
@ -1249,7 +1249,7 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/hbo-max.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/hmax.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>
@ -1274,7 +1274,7 @@ I also made 3 guides related to this one.
------ ------
### Netflix ### NF
<sub>Netflix</sub> <sub>Netflix</sub>
@ -1285,14 +1285,14 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/netflix.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/nf.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>
------ ------
### Peacock TV ### PCOK
<sub>Peacock TV</sub> <sub>Peacock TV</sub>
@ -1303,14 +1303,14 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/peacock-tv.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/pcok.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>
------ ------
### ParamountPlus ### PMTP
<sub>Paramount+</sub> <sub>Paramount+</sub>
@ -1321,7 +1321,7 @@ I also made 3 guides related to this one.
??? example "JSON - [CLICK TO EXPAND]" ??? example "JSON - [CLICK TO EXPAND]"
```json ```json
[[% filter indent(width=4) %]][[% include 'json/radarr/paramountplus.json' %]][[% endfilter %]] [[% filter indent(width=4) %]][[% include 'json/radarr/pmtp.json' %]][[% endfilter %]]
``` ```
<sub><sup>[TOP](#index)</sup> <sub><sup>[TOP](#index)</sup>

@ -1,6 +1,6 @@
{ {
"trash_id": "b3b3a6ac74ecbd56bcdbefa4799fb9df", "trash_id": "b3b3a6ac74ecbd56bcdbefa4799fb9df",
"name": "Amazon", "name": "AMZN",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -1,6 +1,6 @@
{ {
"trash_id": "3472d276482257d68f7836a55ca24877", "trash_id": "3472d276482257d68f7836a55ca24877",
"name": "Apple TV+", "name": "APTV",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -1,6 +1,6 @@
{ {
"trash_id": "84272245b2988854bfb76a16e60baea5", "trash_id": "84272245b2988854bfb76a16e60baea5",
"name": "Disney+", "name": "DSNP",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -1,6 +1,6 @@
{ {
"trash_id": "5763d1b0ce84aff3b21038eea8e9b8ad", "trash_id": "5763d1b0ce84aff3b21038eea8e9b8ad",
"name": "HBO Max", "name": "HMAX",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -1,6 +1,6 @@
{ {
"trash_id": "170b1d363bd8516fbf3a3eb05d4faff6", "trash_id": "170b1d363bd8516fbf3a3eb05d4faff6",
"name": "Netflix", "name": "NF",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -1,6 +1,6 @@
{ {
"trash_id": "c9fd353f8f5f1baf56dc601c4cb29920", "trash_id": "c9fd353f8f5f1baf56dc601c4cb29920",
"name": "Peacock TV", "name": "PCOK",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -1,6 +1,6 @@
{ {
"trash_id": "e36a0ba1bc902b26ee40818a1d59b8bd", "trash_id": "e36a0ba1bc902b26ee40818a1d59b8bd",
"name": "Paramount+", "name": "PMTP",
"includeCustomFormatWhenRenaming": true, "includeCustomFormatWhenRenaming": true,
"specifications": [ "specifications": [
{ {

@ -2,6 +2,6 @@ lightgallery==0.5
mkdocs-awesome-pages-plugin==2.7.0 mkdocs-awesome-pages-plugin==2.7.0
mkdocs-git-revision-date-localized-plugin==1.0.1 mkdocs-git-revision-date-localized-plugin==1.0.1
mkdocs-macros-plugin==0.7.0 mkdocs-macros-plugin==0.7.0
mkdocs-material==8.3.3 mkdocs-material==8.3.5
mkdocs-minify-plugin==0.5.0 mkdocs-minify-plugin==0.5.0
mkdocs-redirects==1.0.4 mkdocs-redirects==1.0.4

@ -1,3 +1,7 @@
# 2022-06-13
Shortened Streaming Service naming #626
- Changed: On request Streaming Service to short names.
# 2022-06-08 # 2022-06-08
Radarr cf dv hdr10 fix for bad (re)named files #615 Radarr cf dv hdr10 fix for bad (re)named files #615
- Added: Fix for bad (re)named DV HDR10 releases. - Added: Fix for bad (re)named DV HDR10 releases.

Loading…
Cancel
Save