diff --git a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py index 9848e0f50..3b3832ba8 100644 --- a/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py +++ b/docs/Downloaders/SABnzbd/scripts/Clean/Clean.py @@ -29,6 +29,8 @@ except: fwp = nzbname fwp = re.sub('(?i)-4P$', '', fwp) fwp = re.sub('(?i)-4Planet$', '', fwp) +fwp = re.sub('(?i)-AlternativeToRequested$', '', fwp) +fwp = re.sub('(?i)-AlteZachen$', '', fwp) fwp = re.sub('(?i)-AsRequested$', '', fwp) fwp = re.sub('(?i)-AsRequested-xpost$', '', fwp) fwp = re.sub('(?i)-BUYMORE$', '', fwp) @@ -37,12 +39,15 @@ fwp = re.sub('(?i)-GEROV$', '', fwp) fwp = re.sub('(?i)-iNC0GNiTO$', '', fwp) fwp = re.sub('(?i)-NZBGeek$', '', fwp) fwp = re.sub('(?i)-Obfuscated$', '', fwp) +fwp = re.sub('(?i)-Obfuscation$', '', fwp) fwp = re.sub('(?i)-postbot$', '', fwp) -fwp = re.sub('(?i)-Rakuv$', '', fwp) +fwp = re.sub('(?i)-Rakuv[a-z0-9]*$', '', fwp) +fwp = re.sub('(?i)-RePACKPOST$', '', fwp) fwp = re.sub('(?i)-Scrambled$', '', fwp) fwp = re.sub('(?i)-WhiteRev$', '', fwp) fwp = re.sub('(?i)-WRTEAM$', '', fwp) fwp = re.sub('(?i)-CAPTCHA$', '', fwp) +fwp = re.sub('(?i)-Z0iDS3N$', '', fwp) fwp = re.sub('(?i)\[eztv\]$', '', fwp) fwp = re.sub('(?i)\[TGx\]$', '', fwp) fwp = re.sub('(?i)\[ettv\]$', '', fwp) @@ -50,6 +55,7 @@ fwp = re.sub('(?i)\[TGx\]-xpost$', '', fwp) fwp = re.sub('(?i).mkv-xpost$', '', fwp) fwp = re.sub('(?i)-xpost$', '', fwp) fwp = re.sub(r'(\-[^-.\n]*)(\-.{4})?$', r'\1', fwp) + print("1") # Accept print(fwp) print() @@ -58,4 +64,4 @@ print() print() print() # 0 means OK -sys.exit(0) +sys.exit(0) \ No newline at end of file diff --git a/docs/Downloaders/qBittorrent/Basic-Setup.md b/docs/Downloaders/qBittorrent/Basic-Setup.md index 115d22674..ee31553aa 100644 --- a/docs/Downloaders/qBittorrent/Basic-Setup.md +++ b/docs/Downloaders/qBittorrent/Basic-Setup.md @@ -245,7 +245,7 @@ These options allow you to control the number of active torrents being downloade ![!Security](images/qb-options-webui-security.png) -1. Enable clickjacking protection, in some cases when this is enabled it could result in issues. +1. In some cases when this is enabled it could result in issues. !!! check "" **Suggested: `Disabled`** diff --git a/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md b/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md index 71b28387b..d0815bea4 100644 --- a/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md +++ b/docs/Downloaders/qBittorrent/Tips/How-to-run-the-unRaid-mover-for-qBittorrent.md @@ -33,8 +33,8 @@ Install the following Plugins. - User Scripts - Nerd Tools - - python3 - - python-setuptools + - python3 [^2] + - python-setuptools [^2] ------ @@ -46,28 +46,33 @@ After you installed the needed Plugins it's time to configure everything. The script needs the qBit API to work, so we need to make sure it's installed when your unRaid server is booted or when the Array is started the first time. +You can choose from the following 2 options how you want to install it, depending what you preferce. + +- [User scripts](#user-scripts) +- [Go File](#go-file) + #### User scripts With this option we're going to install the qBit API when the Array is started the first time. Go to your unRaid Dashboard to your settings tab and select in the `User Utilities` at the bottom the new plugin you installed `User Scripts`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!User Scripts](images/Unraid-settings-user-scripts-icon.png) Select at the bottom `ADD NEW SCRIPT`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Add New Script](images/Unraid-user-scripts-add-new-script-icon.png) A popup will appear where you can give it a name, for this example we're going to use `Install qBittorrent API` and then click on `OK`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Install qBittorrent API](images/Unraid-user-scripts-add-new-script-enter-name.png) Click in the list on the cogwheel of the new user scrip you made. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Select user script](images/Unraid-settings-user-scripts-list-select-qbit-api.png) Copy/Paste in the new windows that opens the following bash command followed by `SAVE CHANGES`. @@ -77,17 +82,17 @@ Copy/Paste in the new windows that opens the following bash command followed by pip install qbittorrent-api ``` -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Bash script](images/Unraid-settings-user-scripts-qbit-api.png) Select in the schedule list when the script should run, and choose `At First Array Start Only`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Set Run Time](images/Unraid-settings-user-scripts-qbit-api-schedule.png) Click on `RUN IN BACKGROUND` or restart your unRaid server so the qBit API is installed. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!RUN IN BACKGROUND](images/Unraid-settings-user-scripts-qbit-api-run-background.png) ------ @@ -96,7 +101,7 @@ Click on `RUN IN BACKGROUND` or restart your unRaid server so the qBit API is in With this option we're going to install the qBit API when the unRaid server is started. -On your USB stick/key go to `/boot/config` and open the `go` file in your favorite editor and copy/paste the following command. +On your USB stick/key go to `/boot/config` and open the `go` file with your favorite editor ([VSCode](https://code.visualstudio.com/){:target="_blank" rel="noopener noreferrer"}/[Notepad++](https://notepad-plus-plus.org/downloads/){:target="_blank" rel="noopener noreferrer"}) and copy/paste the following command. ```bash pip install qbittorrent-api @@ -108,6 +113,8 @@ Restart your unRaid Server, or run the above command from the terminal. ### Script +Edit the script with your favorite editor ([VSCode](https://code.visualstudio.com/){:target="_blank" rel="noopener noreferrer"}/[Notepad++](https://notepad-plus-plus.org/downloads/){:target="_blank" rel="noopener noreferrer"}) you downloaded at the beginning of the guide [HERE](#the-script). + You only need to edit a few options in the script ```python @@ -121,7 +128,7 @@ qbt_pass = adminadmin ``` - `days` => Set Number of Days to stop torrents for the move. -- `qbt_host` => The URL you use to access qBittorrent locally. +- `qbt_host` => The URL you use to access qBittorrent locally. (*the* `'` *should remain*) - `qbt_user` => Your used qBittorrent `User Name` if you have authentication enabled. - `qbt_pass` => Your used qBittorrent `Password` if you have authentication enabled. @@ -130,7 +137,7 @@ qbt_pass = adminadmin #### Copy script to your preferred location -Now it's time to place the script somewhere easy to access/remember. +Now it's time to place the script you just edited somewhere easy to access/remember. Suggestions: @@ -143,22 +150,22 @@ Now it's time to setup the scheduler when the mover should run. Go to your unRaid Dashboard to your settings tab and select in the `User Utilities` at the bottom the new plugin you installed `User Scripts`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!User Scripts](images/Unraid-settings-user-scripts-icon.png) Select at the bottom `ADD NEW SCRIPT`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Add New Script](images/Unraid-user-scripts-add-new-script-icon.png) A popup will appear where you can give it a name, for this example we're going to use `qBittorrent Mover` and then click on `OK`. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!qBittorrent Mover](images/Unraid-user-scripts-add-new-script-enter-name-qbt.png) Click in the list on the cogwheel of the new user scrip you made. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Select user script](images/Unraid-settings-user-scripts-list-select-qbit-mover.png) Copy/Paste in the new windows that opens the following bash command followed by `SAVE CHANGES`. @@ -175,12 +182,12 @@ echo qbittorrent-mover completed and resumed all paused torrents. !!! info Replace the `/mnt/user/data/scripts/mover.py` path to the path where you placed your python script. -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Bash script](images/Unraid-settings-user-scripts-qbit-mover.png) Select in the schedule list when the script should run, and choose `Custom` -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Set Run Time](images/Unraid-settings-user-scripts-qbit-mover-schedule.png) After changing to `Custom` you get on the right a extra option where you can setup your cron schedule when it should be run. @@ -189,10 +196,13 @@ For this example we're going to let the script run a 4am at night. `0 4 * * *` Setup your own schedule [HERE](https://crontab.guru/) -??? check "Example - [CLICK TO EXPAND]" +??? check "Screenshot Example - [CLICK TO EXPAND]" ![!Set Run Time](images/Unraid-settings-user-scripts-qbit-mover-cron.png) --8<-- "includes/support.md" [^1]: Starr apps = Sonarr/Radarr etc. Doesn't Starr apps sound better then `The arr(s)` ? + +[^2]: + These needs to be installed from the Nerd Tools. diff --git a/docs/Hardlinks/Check-if-hardlinks-are-working.md b/docs/Hardlinks/Check-if-hardlinks-are-working.md index f375e4e74..589ad372d 100644 --- a/docs/Hardlinks/Check-if-hardlinks-are-working.md +++ b/docs/Hardlinks/Check-if-hardlinks-are-working.md @@ -2,9 +2,9 @@ You've followed the guide step by step but still want to check if hardlinks are working, or someone on the Sonarr/Radarr support team asked you to check if your files are hardlinked? -You can use 2 options to check if you got working hardlinks. +You can use 3 options to check if you got working hardlinks. -*Both ways requires you to login to your terminal with PuTTY or similar software.* +*All methods require you to login to your terminal with PuTTY or similar software.* !!! attention You can't create hard links for directories :bangbang: @@ -43,9 +43,9 @@ You will get a listing of all your files and on the left side you will see a cou This way requires a bit more work. -- On the terminal type: `stat /path/to/your/download/location/file.mkv` +- In the terminal type: `stat /path/to/your/download/location/file.mkv` -- On the terminal type: `stat /path/to/your/media/location/file.mkv` +- In the terminal type: `stat /path/to/your/media/location/file.mkv` You will get 2 results you can use to compare several things. @@ -53,3 +53,20 @@ You will get 2 results you can use to compare several things. 1. Links: Everything above 1 means it's a hardlink 1. Inode: if the numbers match you know the files are hardlinked + +## Method 3: Using Inode copies + +- In your terminal `cd` to your download location and run `ls -i file.mkv` or type `ls -i /path/to/your/download/location/file.mkv` + +This will reveal the inode of your file on the left side of the file. + +![!Hardlinks check ls -i](images/hardlinks-ls-i.png) + +- In your terminal type: `find /mnt/user/data/ -inum ###` or `find . -inum ###` if you're in your root folder. + +!!! note "" + `###` = Your inode number on the left of the file you found. + +![!hardlinks inode](images/hardlinks-inode.png) + +It will list all files linked with the same inode number. diff --git a/docs/Hardlinks/images/hardlinks-inode.png b/docs/Hardlinks/images/hardlinks-inode.png new file mode 100644 index 000000000..1d6bb3a9a Binary files /dev/null and b/docs/Hardlinks/images/hardlinks-inode.png differ diff --git a/docs/Hardlinks/images/hardlinks-ls-i.png b/docs/Hardlinks/images/hardlinks-ls-i.png new file mode 100644 index 000000000..2026f9153 Binary files /dev/null and b/docs/Hardlinks/images/hardlinks-ls-i.png differ diff --git a/docs/Misc/trash-sync.md b/docs/Misc/trash-sync.md index 435615019..45058aaa0 100644 --- a/docs/Misc/trash-sync.md +++ b/docs/Misc/trash-sync.md @@ -2,6 +2,7 @@ These are 3rd party applications to sync several sections of the guide with your Sonarr/Radarr (or multiple). +- GUI (graphical user interface) [^1] - Radarr Custom Formats [^1] [^2] - Radarr Scores [^1] [^2] - Radarr Quality Settings (File Size) [^2] diff --git a/docs/Radarr/Radarr-collection-of-custom-formats.md b/docs/Radarr/Radarr-collection-of-custom-formats.md index 462efed88..f7ce72026 100644 --- a/docs/Radarr/Radarr-collection-of-custom-formats.md +++ b/docs/Radarr/Radarr-collection-of-custom-formats.md @@ -57,7 +57,7 @@ I also made 3 guides related to this one. | [Theatrical Cut](#theatrical-cut) | [No-RlsGroup](#no-rlsgroup) | [MPEG2](#mpeg2) | | [Netflix](#nf) | | [IMAX](#imax) | [Obfuscated](#obfuscated) | [FreeLeech](#freeleech) | | [Peacock TV](#pcok) | | [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) | | [Movies Anywhere](#ma) | ------ @@ -1325,3 +1325,21 @@ I also made 3 guides related to this one. ``` [TOP](#index) + +------ + +### MA + +Movies Anywhere + +??? faq "Movies Anywhere - [CLICK TO EXPAND]" + + [From Wikipedia, the free encyclopedia](https://en.wikipedia.org/wiki/Movies_Anywhere){:target="_blank" rel="noopener noreferrer"} + +??? example "JSON - [CLICK TO EXPAND]" + + ```json + [[% filter indent(width=4) %]][[% include 'json/radarr/ma.json' %]][[% endfilter %]] + ``` + +[TOP](#index) diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md index fbe251e62..3af6efe41 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx-Anime.md @@ -87,7 +87,7 @@ Has all necessary information and a little extra if you needed to rebuild. Adding year back in with tvdb id allows matching to be correct. Thanks salty. ```bash -{Series TitleTheYear} [tvdb-{TvdbId}] +{Series TitleYear} [tvdb-{TvdbId}] ``` RESULT: diff --git a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md index 3bee411e6..4c229c8d7 100644 --- a/docs/Sonarr/Sonarr-Release-Profile-RegEx.md +++ b/docs/Sonarr/Sonarr-Release-Profile-RegEx.md @@ -469,7 +469,7 @@ Add this to your `Preferred (3)` with a score of [15] Add this to your `Must not contain (2)` ```bash -/^(?!.*(\bSIC\b|HDR|HULU|REMUX))(?=.*\b(DV|Dovi|Dolby[- .]?Vision)\b).*/i +/^(?!.*(HDR|HULU|REMUX))(?=.*\b(DV|Dovi|Dolby[- .]?Vision)\b).*/i ``` ------ diff --git a/docs/json/radarr/3d.json b/docs/json/radarr/3d.json index 67fc869c3..0ed0a3f45 100644 --- a/docs/json/radarr/3d.json +++ b/docs/json/radarr/3d.json @@ -3,13 +3,24 @@ "trash_score": "-10000", "name": "3D", "includeCustomFormatWhenRenaming": false, - "specifications": [{ + "specifications": [ + { "name": "3D", "implementation": "ReleaseTitleSpecification", "negate": false, - "required": true, + "required": false, "fields": { - "value": "\\b3d|sbs|half[ .-]ou|half[ .-]sbs\\b" + "value": "\\b3d|sbs|half[ .-]ou|half[ .-]sbs\\b" } - }] -} \ No newline at end of file + }, + { + "name": "BluRay3D", + "implementation": "ReleaseTitleSpecification", + "negate": false, + "required": false, + "fields": { + "value": "\\b(BluRay3D)\\b" + } + } + ] +} diff --git a/docs/json/radarr/aac.json b/docs/json/radarr/aac.json index 209fb463e..913364820 100644 --- a/docs/json/radarr/aac.json +++ b/docs/json/radarr/aac.json @@ -36,7 +36,7 @@ "negate": true, "required": true, "fields": { - "value": "(?