Merge pull request #115 from TRaSH-/Sonarr-Regex-RP

Big Update
pull/118/head
Visorask 3 years ago committed by GitHub
commit cf9c020128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,27 @@
Defaulting to user installation because normal site-packages is not writeable
Requirement already satisfied: mkdocs-macros-plugin in c:\users\epita\appdata\roaming\python\python37\site-packages (0.5.0)
Requirement already satisfied: jinja2 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (2.11.2)
Requirement already satisfied: termcolor in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (1.1.0)
Requirement already satisfied: python-dateutil in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (2.8.1)
Requirement already satisfied: mkdocs>=0.17 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (1.1.2)
Requirement already satisfied: mkdocs-macros-test in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (0.1.0)
Requirement already satisfied: mkdocs-material in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (6.2.5)
Requirement already satisfied: pyyaml in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-macros-plugin) (5.4.1)
Requirement already satisfied: tornado>=5.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=0.17->mkdocs-macros-plugin) (6.1)
Requirement already satisfied: click>=3.3 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=0.17->mkdocs-macros-plugin) (7.1.2)
Requirement already satisfied: lunr[languages]==0.5.8 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=0.17->mkdocs-macros-plugin) (0.5.8)
Requirement already satisfied: Markdown>=3.2.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=0.17->mkdocs-macros-plugin) (3.3.3)
Requirement already satisfied: livereload>=2.5.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=0.17->mkdocs-macros-plugin) (2.6.3)
Requirement already satisfied: six>=1.11.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from lunr[languages]==0.5.8->mkdocs>=0.17->mkdocs-macros-plugin) (1.15.0)
Requirement already satisfied: future>=0.16.0 in c:\program files\python37\lib\site-packages (from lunr[languages]==0.5.8->mkdocs>=0.17->mkdocs-macros-plugin) (0.17.1)
Requirement already satisfied: nltk>=3.2.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from lunr[languages]==0.5.8->mkdocs>=0.17->mkdocs-macros-plugin) (3.5)
Requirement already satisfied: MarkupSafe>=0.23 in c:\users\epita\appdata\roaming\python\python37\site-packages (from jinja2->mkdocs-macros-plugin) (1.1.1)
Requirement already satisfied: importlib-metadata in c:\users\epita\appdata\roaming\python\python37\site-packages (from Markdown>=3.2.1->mkdocs>=0.17->mkdocs-macros-plugin) (3.4.0)
Requirement already satisfied: joblib in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs>=0.17->mkdocs-macros-plugin) (1.0.0)
Requirement already satisfied: regex in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs>=0.17->mkdocs-macros-plugin) (2020.11.13)
Requirement already satisfied: tqdm in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs>=0.17->mkdocs-macros-plugin) (4.56.0)
Requirement already satisfied: typing-extensions>=3.6.4 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->Markdown>=3.2.1->mkdocs>=0.17->mkdocs-macros-plugin) (3.7.4.3)
Requirement already satisfied: zipp>=0.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->Markdown>=3.2.1->mkdocs>=0.17->mkdocs-macros-plugin) (3.4.0)
Requirement already satisfied: pymdown-extensions>=7.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material->mkdocs-macros-plugin) (8.1)
Requirement already satisfied: mkdocs-material-extensions>=1.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material->mkdocs-macros-plugin) (1.0.1)
Requirement already satisfied: Pygments>=2.4 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material->mkdocs-macros-plugin) (2.7.4)

19
1.1.2

@ -0,0 +1,19 @@
Defaulting to user installation because normal site-packages is not writeable
Requirement already satisfied: mkdocs in c:\users\epita\appdata\roaming\python\python37\site-packages (1.1.2)
Requirement already satisfied: click>=3.3 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (7.1.2)
Requirement already satisfied: Jinja2>=2.10.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (2.11.2)
Requirement already satisfied: tornado>=5.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (6.1)
Requirement already satisfied: PyYAML>=3.10 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (5.4.1)
Requirement already satisfied: livereload>=2.5.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (2.6.3)
Requirement already satisfied: Markdown>=3.2.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (3.3.3)
Requirement already satisfied: lunr[languages]==0.5.8 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs) (0.5.8)
Requirement already satisfied: future>=0.16.0 in c:\program files\python37\lib\site-packages (from lunr[languages]==0.5.8->mkdocs) (0.17.1)
Requirement already satisfied: six>=1.11.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from lunr[languages]==0.5.8->mkdocs) (1.15.0)
Requirement already satisfied: nltk>=3.2.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from lunr[languages]==0.5.8->mkdocs) (3.5)
Requirement already satisfied: MarkupSafe>=0.23 in c:\users\epita\appdata\roaming\python\python37\site-packages (from Jinja2>=2.10.1->mkdocs) (1.1.1)
Requirement already satisfied: importlib-metadata in c:\users\epita\appdata\roaming\python\python37\site-packages (from Markdown>=3.2.1->mkdocs) (3.4.0)
Requirement already satisfied: joblib in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs) (1.0.0)
Requirement already satisfied: regex in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs) (2020.11.13)
Requirement already satisfied: tqdm in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs) (4.56.0)
Requirement already satisfied: typing-extensions>=3.6.4 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->Markdown>=3.2.1->mkdocs) (3.7.4.3)
Requirement already satisfied: zipp>=0.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->Markdown>=3.2.1->mkdocs) (3.4.0)

@ -0,0 +1,6 @@
Defaulting to user installation because normal site-packages is not writeable
Requirement already satisfied: pymdown-extensions in c:\users\epita\appdata\roaming\python\python37\site-packages (8.1)
Requirement already satisfied: Markdown>=3.2 in c:\users\epita\appdata\roaming\python\python37\site-packages (from pymdown-extensions) (3.3.3)
Requirement already satisfied: importlib-metadata in c:\users\epita\appdata\roaming\python\python37\site-packages (from Markdown>=3.2->pymdown-extensions) (3.4.0)
Requirement already satisfied: zipp>=0.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->Markdown>=3.2->pymdown-extensions) (3.4.0)
Requirement already satisfied: typing-extensions>=3.6.4 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->Markdown>=3.2->pymdown-extensions) (3.7.4.3)

23
6.1.0

@ -0,0 +1,23 @@
Defaulting to user installation because normal site-packages is not writeable
Requirement already satisfied: mkdocs-material in c:\users\epita\appdata\roaming\python\python37\site-packages (6.2.5)
Requirement already satisfied: Pygments>=2.4 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material) (2.7.4)
Requirement already satisfied: mkdocs>=1.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material) (1.1.2)
Requirement already satisfied: markdown>=3.2 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material) (3.3.3)
Requirement already satisfied: pymdown-extensions>=7.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material) (8.1)
Requirement already satisfied: mkdocs-material-extensions>=1.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs-material) (1.0.1)
Requirement already satisfied: importlib-metadata in c:\users\epita\appdata\roaming\python\python37\site-packages (from markdown>=3.2->mkdocs-material) (3.4.0)
Requirement already satisfied: PyYAML>=3.10 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=1.1->mkdocs-material) (5.4.1)
Requirement already satisfied: Jinja2>=2.10.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=1.1->mkdocs-material) (2.11.2)
Requirement already satisfied: lunr[languages]==0.5.8 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=1.1->mkdocs-material) (0.5.8)
Requirement already satisfied: livereload>=2.5.1 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=1.1->mkdocs-material) (2.6.3)
Requirement already satisfied: click>=3.3 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=1.1->mkdocs-material) (7.1.2)
Requirement already satisfied: tornado>=5.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from mkdocs>=1.1->mkdocs-material) (6.1)
Requirement already satisfied: future>=0.16.0 in c:\program files\python37\lib\site-packages (from lunr[languages]==0.5.8->mkdocs>=1.1->mkdocs-material) (0.17.1)
Requirement already satisfied: six>=1.11.0 in c:\users\epita\appdata\roaming\python\python37\site-packages (from lunr[languages]==0.5.8->mkdocs>=1.1->mkdocs-material) (1.15.0)
Requirement already satisfied: nltk>=3.2.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from lunr[languages]==0.5.8->mkdocs>=1.1->mkdocs-material) (3.5)
Requirement already satisfied: MarkupSafe>=0.23 in c:\users\epita\appdata\roaming\python\python37\site-packages (from Jinja2>=2.10.1->mkdocs>=1.1->mkdocs-material) (1.1.1)
Requirement already satisfied: joblib in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs>=1.1->mkdocs-material) (1.0.0)
Requirement already satisfied: regex in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs>=1.1->mkdocs-material) (2020.11.13)
Requirement already satisfied: tqdm in c:\users\epita\appdata\roaming\python\python37\site-packages (from nltk>=3.2.5->lunr[languages]==0.5.8->mkdocs>=1.1->mkdocs-material) (4.56.0)
Requirement already satisfied: typing-extensions>=3.6.4 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->markdown>=3.2->mkdocs-material) (3.7.4.3)
Requirement already satisfied: zipp>=0.5 in c:\users\epita\appdata\roaming\python\python37\site-packages (from importlib-metadata->markdown>=3.2->mkdocs-material) (3.4.0)

@ -60,25 +60,25 @@ Having tested most of these settings, they work pretty well but Anime is a fickl
### Suggested naming scheme
For this I used the [Sonarr Recommended naming scheme](/Sonarr/V3/Sonarr-recommended-naming-scheme/#anime-episode-format){:target="_blank" rel="noopener noreferrer"} for Sonarr with only a small change for the `Series Folder Format` for easier matching.
For this I used the [Sonarr Recommended naming scheme](/Sonarr/V3/Sonarr-recommended-naming-scheme/#anime-episode-format){:target="_blank" rel="noopener noreferrer"} for Sonarr with only a small change for a formatting error to be fixed and the `Series Folder Format` for easier matching.
#### Anime Episode Format
Has all necessary information and a little extra if you needed to rebuild.
```bash
{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRange]}[{MediaInfo VideoBitDepth}bit]{[MediaInfo VideoCodec]}{[Mediainfo AudioCodec}{ Mediainfo AudioChannels]}{MediaInfo AudioLanguages}{-Release Group}
{Series TitleYear} - S{season:00}E{episode:00} - {absolute:000} - {Episode CleanTitle} [{Preferred Words }{Quality Full}]{[MediaInfo VideoDynamicRange]}[{MediaInfo VideoBitDepth}bit]{[MediaInfo VideoCodec]}[{Mediainfo AudioCodec} { Mediainfo AudioChannels}]{MediaInfo AudioLanguages}{-Release Group}
```
??? summary "RESULTS:"
Single Episode:
`The Series Title! (2010) - S01E01 - 001 - Episode Title 1 [AMZN WEBDL-1080p v2][HDR][10bit][x264][DTS 5.1][JA]-RlsGrp`
`The Series Title! (2010) - S01E01 - 001 - Episode Title 1 [AMZN WEBDL-1080p v2][HDR][10bit][x264][DTS 5.1][FLAC][JA]-RlsGrp`
Multi Episode:
`The Series Title! (2010) - S01E01-E02-E03 - 001-002-003 - Episode Title [AMZN WEBDL-1080p v2][HDR][10bit][x264][DTS 5.1][JA]-RlsGrp`
`The Series Title! (2010) - S01E01-E02-E03 - 001-002-003 - Episode Title [AMZN WEBDL-1080p v2][HDR][10bit][x264][DTS 5.1][FLAC][JA]-RlsGrp`
#### Series Folder Format
@ -185,14 +185,16 @@ The reason most of these are added is due to their shitty quality or just in gen
!!! note
Golumpa and KaiDubs are dub only versions of Anime. If you want this then remove the last 2 lines in the next part.
If you would like Dub only release then remove the last 3 lines and do not add them.
```bash
/(CuaP|\[EMBER\]|-EMBER|PnPSubs|ICEBLUE|URANiME|SLAX)/i,
/(Raws-Maji|\bKRP\b|M@nI|Kanjouteki|Scryous-raws|PuyaSubs)/i,
/\b(Beatrice|ohys|Kawaiika|neko|LowPower)\b(?=[ ._-]?(raws)\b)/i,
/\b(english|funi)?[ ._-](dub|dubbed)|\b(dub|dubbed)/i,
/(Golumpa|KaiDubs)/i
/(CuaP|\[EMBER\]|-EMBER|PnPSubs|ICEBLUE|SLAX)/i,
/(Raws-Maji|\bKRP\b|M@nI|Kanjouteki|PuyaSubs)/i,
/\b(Beatrice|ohys|Kawaiika|neko)\b(?=[ ._-]?(raws)\b)/i,
/\bLowPower|Scryous)\b(?=[ ._-]?(raws)\b)/i,
/(eng[ ._-]dub|english[ ._-]dub|funimation)/i,
/(funi[ ._-]dub|\bfuni\b|\bdub\b|\bdubbed\b)/i,
/(Golumpa)/i
```
??? success "example"
@ -200,32 +202,64 @@ The reason most of these are added is due to their shitty quality or just in gen
#### Preferred
Add this to your Preferred with a score of [600]
!!! note
2 lines in one grouping is just there for readability purposes but achieves the same result and score.
Add this to your Preferred with a score of [650]
BluRay-Remux / Dual-Audio / 1st Tier
```bash
/(deanzel|\bZR\b|Kametsu|\bCTR\b|\bSCY\b|\bShir\b|\bMK\b|LostYears|BluDragon|KAWAiREMUX)/i
/(deanzel|\bZR\b|Kametsu|\bCTR\b|\bSCY\b|\bShir\b)/i
```
```bash
/(\bMK\b|LostYears|BluDragon|KAWAiREMUX|ANThELIa)/i
```
---
Add this to your Preferred with a score of [550]
Add this to your Preferred with a score of [600]
BluRay-Remux / Dual-Audio / 2nd Tier
```bash
/(iAHD|ANiHLS|MKVULTRA|ANThELIa)/i
/(iAHD|ANiHLS|MKVULTRA)/i
```
---
Add this to your Preferred with a score of [500]
Add this to your Preferred with a score of [575]
BluRay / Dual-Audio / Special (Releases they have are in between below releases and remuxes above.)
```bash
/(\bE.N.D\b|\bE-N-D\b)/i
```
---
Add this to your Preferred with a score of [550]
BluRay / Dual-Audio
```bash
/(\bDHD\b|\bRB\b|HAiKU|Exiled-Destiny|E-D|Koten_Gars|Hark0N|\[GHOST\]|-GHOST|\[NPC\]|-NPC)/i
/(HAiKU|Exiled-Destiny|E-D|Koten_Gars|Hark0N)/i
```
```bash
/(\[GHOST\]|-GHOST|\[NPC\]|-NPC|\[Prof\]|-Prof)/i
```
---
Add this to your Preferred with a score of [500]
BluRay / Dual-Audio / Scene|P2P Groups
```bash
/\bDHD\b|RedBlade|TENEIGHTY|WaLMaRT)/i
```
---
@ -245,7 +279,7 @@ Add this to your Preferred with a score of [400]
WebSource / Dual-Audio
```bash
/(xPearse|TENEIGHTY)/i
/(xPearse|\[Prof\]|-Prof)/i
```
---
@ -305,7 +339,11 @@ Add this to your Preferred with a score of [100]
FanSubs 1st Tier
```bash
/(\bCH\b|\bFFF\b|Licca|Soldado|SNSbu|Coalgirls|BlurayDesuYo)/i
/(\bCH\b|\bFFF\b|Licca|Soldado|SNSbu)/i
```
```bash
/(Coalgirls|BlurayDesuYo|DameDesuYo)/i
```
---
@ -315,7 +353,39 @@ Add this to your Preferred with a score of [50]
FanSubs 2nd Tier
```bash
/(\[Orphan\]|-Orphan|\[Yabai\]|Yabai|Nii-sama)/i
/(\[Orphan\]|-Orphan|\[Yabai\]|-Yabai|Nii-sama)/i
```
---
!!! note
These are extra parameters that can help and are not needed but are nice to have.
Add this to your Preferred with a score of [10]
Adds Hi10|Hi10p into a match. Prefers this over some erroneous matches.
```bash
/(10.?bit|hi10p)/i
```
---
Add this to your Preferred with a score of [10]-[20]-[30] in order.
Adds version due to anime groups sometimes fixing issues with their releases.
```bash
/\b(v2)\b/i
```
```bash
/\b(v3)\b/i
```
```bash
/\b(v4)\b/i
```
---
@ -329,7 +399,11 @@ Add this to your Preferred with a score of [-1000]
Sub-Par Releases 1st Tier (Re-encoded to crap or really small filesizes) (Little less worse than the rest)
```bash
/(\[Judas\]|-Judas|\[Cleo\]|-Cleo|AnimeRG)/i
/(\[Judas\]|-Judas|\[Cleo\]|-Cleo)/i
```
```bash
/(AnimeRG|bonkai77|URANiME)/i
```
---
@ -339,17 +413,40 @@ Add this to your Preferred with a score of [-1500]
Sub-Par Releases 2nd Tier (Re-encoded to crap or really small filesizes) (Seperated onto separate lines for readability)
```bash
/(bonkai77|\bDB\b|Man.K|phazer11|\[Pixel\]|-Pixel|\[Ranger\]|-Ranger|\bHR\b|SpaceFish|DeadFish)/i
/(\bDB\b|Man.K|phazer11|\[Pixel\]|-Pixel|\bHR\b)/i
```
```bash
/(\[Ranger\]|-Ranger|SpaceFish|DeadFish)/i
```
```bash
/(BakedFish|NoobSubs|NewbSubs|Anime Time)/i
```
```bash
/(AnimeKaizoku|Kaizoku|\bCBB\b|\[EDGE\]|-EDGE)/i
```
```bash
/(BakedFish|NoobSubs|NewbSubs|Anime Time|AnimeKaizoku|Kaizoku|\bCBB\b|\[EDGE\]|-EDGE)/i
/(iPUNISHER|MiniTheatre|MiniFreeza|Mr.Deadpool)/i
```
```bash
/(iPUNISHER|MiniTheatre|MiniFreeza|Mr.Deadpool|NemDiggers|Project-gxs|youshikibi)/i
/(NemDiggers|Project-gxs|youshikibi)/i
```
??? tip "If you would like the above to be in DO NOT WANT in an easy format here it is."
```bash
/(\bDB\b|Man.K|phazer11|\[Pixel\]|-Pixel|\bHR\b)/i,
/(\[Ranger\]|-Ranger|SpaceFish|DeadFish)/i,
/(BakedFish|NoobSubs|NewbSubs|Anime Time)/i,
/(AnimeKaizoku|Kaizoku|\bCBB\b|\[EDGE\]|-EDGE)/i,
/(iPUNISHER|MiniTheatre|MiniFreeza|Mr.Deadpool)/i,
/(NemDiggers|Project-gxs|youshikibi)/i
```
---
??? success "example"
@ -359,4 +456,14 @@ Sub-Par Releases 2nd Tier (Re-encoded to crap or really small filesizes) (Sepera
### Acknowledgements
Most of my information and knowledge came from Kaiser and rg9400 for the anime releases and best groups on discord and [TRaSH](https://trash-guides.info/) for his amazing regex.
Most of my information and knowledge came from:
- Kaiser (Guidance on anime groups)
- rg9400 (Guidance on regex fixes, anime groups and general knowledge share.)
- Drazzilb (Guidance on regex fixes, anime groups and general knowledge share.)
- [TRaSH](https://trash-guides.info/) (For allowing me to utilize his website for my guide and general knowledge share.)
Thanks a bunch!!

Loading…
Cancel
Save