Merge branch 'master' into dependabot/pip/mkdocs-git-revision-date-localized-plugin-0.10.0

pull/345/head
TRaSH 3 years ago committed by GitHub
commit 58ed4888d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -16,7 +16,7 @@
Login to your [Client Area](https://torguard.net/clientarea.php){:target="_blank" rel="noopener noreferrer"}.
??? check "Example"
??? check "Example - [CLICK TO EXPAND]"
![!Client Area Login](images/torguard/client-area-login.png)
### Create a user account
@ -26,12 +26,12 @@ This account will be used for authentication with your VPN Torrent client.
`Services` > `My Services` > `Manage` > `Manage Credentials`
??? Check "Example"
??? Check "Example - [CLICK TO EXPAND]"
![!Client Area Manage Credentials](images/torguard/client-area-manage-credentials.png)
Create a new username and choose a secure password or create a random username and password.
??? Check "Example"
??? Check "Example - [CLICK TO EXPAND]"
![!Create User Account](images/torguard/create_user_account.png)
------
@ -42,7 +42,7 @@ Now it's time to get the IP of your VPN server you're going to use from the [Glo
`Servers` > `Global VPN Network`
??? Check "Example"
??? Check "Example - [CLICK TO EXPAND]"
![!Servers > Global VPN Network](images/torguard/servers-globalvpnnetwork.png)
### Global VPN Network
@ -54,6 +54,9 @@ Let's use for this example: `USA Miami` and copy/paste the Hostname `us-fl.secur
![!Torguard Global VPN Network](images/torguard/globalvpnnetwork-list.png)
!!! important
Also check if your choosen server supports OpenVPN or Wireguard depending what you want to use.
### Get your VPN IP
Open a cmd window or something equal and type:
@ -65,7 +68,7 @@ Open a cmd window or something equal and type:
You will then get the IP of the server.
Remember that for later use.
??? Check "Example"
??? Check "Example - [CLICK TO EXPAND]"
![!ping](images/torguard/cmd-ping.png)
------
@ -83,7 +86,7 @@ Then click on `Manage` and select `Request Port Forward`.
`Services` > `My Services` > `Manage` > `Request Port Forward`
??? Check "Example"
??? Check "Example - [CLICK TO EXPAND]"
![!Request Port Forward](images/torguard/req_port_fwd.png)
### VPN Tunnel Type
@ -116,7 +119,7 @@ Choose your preferred VPN Tunnel type.
#### WireGuard Request Port Forward
??? example "WireGuard Request Port Forward"
??? example "WireGuard Request Port Forward - [CLICK TO EXPAND]"
![!Request New Port Forward WireGuard](images/torguard/request-new-pfw-wireguard.png)
@ -152,7 +155,7 @@ From your Client Area go to your [Config Generator](https://torguard.net/tgconf.
`Tools` > `Config Generator`
??? Check "Example Select Tools > Config Generator"
??? Check "Example Select Tools > Config Generator - [CLICK TO EXPAND]"
![!Tools - Config Generator](images/torguard/tools-config-generator.png)
### Config Generator
@ -161,7 +164,7 @@ Choose your preferred VPN Tunnel type.
#### OVPN Config Generator
??? example "OVPN Config Generator"
??? example "OVPN Config Generator - [CLICK TO EXPAND]"
![!OVPN Config Generator](images/torguard/config-generator-ovpn.png)
@ -181,7 +184,7 @@ Choose your preferred VPN Tunnel type.
#### WireGuard Config Generator
??? example "WireGuard Config Generator"
??? example "WireGuard Config Generator - [CLICK TO EXPAND]"
![!WireGuard Config Generator](images/torguard/config-generator-wireguard.png)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 104 KiB

@ -101,7 +101,7 @@ Open your User Settings -> Appearance -> Enable Developer Mode.
Right click on your server name and select "Copy ID"
??? example "Example right click"
??? example "Example right click - [CLICK TO EXPAND]"
![!dn-discord-copyid](images/dn-discord-copyid.png)
Paste the server ID in box `[1]`
@ -125,7 +125,7 @@ You will get a screen that looks like the following screenshot.
1. Click on `Continue` to approve.
!!! note
Check [Discord Permissions](https://notifiarr.wiki/en/Website/Discord/Permissions)){:target="_blank" rel="noopener noreferrer"} for information which permissions the bot needs.
Check [Discord Permissions](https://notifiarr.wiki/en/Website/Discord/Permissions){:target="_blank" rel="noopener noreferrer"} for information which permissions the bot needs.
#### Reactions
@ -161,7 +161,7 @@ After you've added them to your Discord Server it's time to get the ID's from yo
\:emoji_name:
```
??? example "Example"
??? example "Example - [CLICK TO EXPAND]"
![!dn-emoji-example](images/dn-emoji-example.png)
What results in to.
@ -183,7 +183,7 @@ Do this for all the other boxes also including your Trackers/Indexers.
1. Paste here the the emoji ID.
1. The actual indexer name you're using in Sonarr/Radarr.
??? example "Example"
??? example "Example - [CLICK TO EXPAND]"
![!dn-indexer-torznab](images/dn-indexer-torznab.png)
@ -210,7 +210,7 @@ When you click on the cogwheel of the enabled Integration you will see on the to
It will show you a short description where and how to add what.
??? example
??? example "Example" - [CLICK TO EXPAND]
![!dn-radarr-integration-instructions](images/dn-radarr-integration-instructions.png)
@ -220,7 +220,7 @@ Radarr, Readarr and Lidarr supports Notifiarr natively so that's an easy one to
`Settings` => `Connect` => click on the ![dn-arr-add-plus.png](images/dn-arr-add-plus.png) `plus` icon and select `Notifiarr` add your API key and you're done.
??? example "Radarr Example"
??? example "Radarr Example - [CLICK TO EXPAND]"
In Radarr go to `Settings` => `Connect` => Click on the ![dn-arr-add-plus](images/dn-arr-add-plus.png) `plus` icon and select `notifiarr`.
![!dn-arr-add-notification](images/dn-arr-add-notification.png)
@ -254,7 +254,7 @@ Add the following info:
Click **Save**
??? example "Sonarr Example"
??? example "Sonarr Example - [CLICK TO EXPAND]"
`Settings` => `Connect` > Click on the ![dn-arr-add-plus.png](images/dn-arr-add-plus.png) `plus` icon and select `Webhook`.
@ -285,7 +285,7 @@ Add the JSON URL that you copy/pasted from the integrations page.
Scroll up and save
??? example "Bazarr Example"
??? example "Bazarr Example - [CLICK TO EXPAND]"
`Settings` => `Notifications` => and select`JSON`
@ -312,7 +312,7 @@ Scroll up and save
`Settings` => `Webhooks` => click on `ADD WEBHOOK` and add the URL that you can copy/paste from the integrations page and click on `SAVE CHANGES`
??? example "Plex Example"
??? example "Plex Example - [CLICK TO EXPAND]"
`Settings` => `Webhooks` => click on `ADD WEBHOOK`

@ -430,8 +430,7 @@ Add this to your `Preferred (3)` with a score of [15]
Add this to your `Must not contain (2)`
```bash
/\b(dv|dovi|dolby[ .]vision)\b.*(?=[ ._-]web[ ._-]?(dl|rip)\b)/i,
/(?=[ ._-]web[ ._-]?(dl|rip)\b).*\b(dv|dovi|dolby[ .]vision)\b/i
\b(?=.*(dv|dovi|dolby[ .]vision)\b)(?=.*(WEB[-_. ]DL|WEBDL|AmazonHD|iTunesHD|MaxdomeHD|NetflixU?HD|WebHD|[. ]WEB[. ](?:[xh]26[45]|DDP?5[. ]1)|[. ](?-i:WEB)$|\d+0p(?:[-. ]AMZN)?[-. ]WEB[-. ]|WEB-DLMux|\b\s\/\sWEB\s\/\s\b|AMZN[. ]WEB[. ]|WebRip|Web-Rip|WEBMux))
```
#### Optional Ignore the group -scene

@ -1,16 +1,25 @@
{
"trash_id": "ed38b889b31be83fda192888e2286d83",
"trash_score": "-10000",
"name": "BR-DISK",
"name": "!BR-DISK",
"includeCustomFormatWhenRenaming": false,
"specifications": [
{
"name": "Video coding standards",
"implementation": "ReleaseTitleSpecification",
"negate": false,
"required": true,
"required": false,
"fields": {
"value": "\\b(avc|vc[-_. ]?1|hevc|MPEG[-_. ]?2)\\b"
}
},
{
"name": "BRDISK",
"implementation": "ReleaseTitleSpecification",
"negate": false,
"required": false,
"fields": {
"value": "avc|vc[-.]?1|hevc|MPEG[-.]?2"
"value": "\\b(COMPLETE|ISO|BDISO|BD25|BD50|BR.?DISK)\\b"
}
},
{
@ -41,12 +50,12 @@
}
},
{
"name": "x265",
"name": "x264/x265",
"implementation": "ReleaseTitleSpecification",
"negate": true,
"required": true,
"fields": {
"value": "[xh][ .]?265"
"value": "[xh][ .]?26[45]"
}
},
{

Loading…
Cancel
Save