tvchaosuk: switch to unit3d 1.9.4 resolves #6132

Signed-off-by: Christian Franchin <christian@corp.kionux.com.br>

README.md

@@ -9,7 +9,7 @@
 
 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.
 
-Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
+Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
 
 Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
@@ -23,42 +23,51 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 ### Supported Public Trackers
  * 1337x
  * ACG.RIP
+ * ACGsou
  * Anidex
  * Anime Tosho
  * AniRena
  * AudioBook Bay (ABB)
  * btbit
  * BTDB
- * BTDigg
- * BTKitty
+ * BTDIGG
+ * ConCen
+ * Corsaro.red
  * cpasbien
  * cpasbienClone
+ * Demonoid
  * DIGBT
+ * dmhy
  * ETTV
  * EliteTorrent.biz
  * ExtraTorrent.ag
  * EZTV
  * Frozen Layer
  * GkTorrent
+ * Hon3yHD.net
  * Horrible Subs
+ * Idope
  * Il Corsaro Nero <!-- maintained by bonny1992 -->
  * Il Corsaro Blu
  * Isohunt2
+ * iTorrent
  * KATcrs
  * KickAssTorrent (KATcr)
- * KickAssTorrent (thekat.se clone)
- * KikiBT
+ * KickAssTorrent (kat.li)
+ * LemenCili
+ * LePorno
  * LimeTorrents
  * MacTorrents
  * MagnetDL
  * MejorTorrent <!-- maintained by ivandelabeldad -->
  * Monova
+ * MovCr
  * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
+ * Nitro
  * Nyaa.si
  * Nyaa-Pantsu
- * Nyoo
+ * OxTorrent
  * ProStyleX
- * QXR
  * RARBG
  * RuTor
  * shokweb
@@ -67,36 +76,43 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * SolidTorrents
  * sukebei.Nyaa.si
  * sukebei-Pantsu
+ * TFile
  * The Pirate Bay (TPB)
- * TNTVillage <!-- maintained by bonny1992 -->
  * Tokyo Tosho
  * Torlock
  * Torrent Downloads (TD)
  * TorrentFunk
- * TorrentGalaxy.org (TGx)
- * TorrentKitty
+ * TorrentGalaxy (TGx)
  * TorrentProject2
+ * TorrentQuest
  * Torrents.csv
+ * TorrentWal
  * Torrent9
- * Torernt9 clone (torrents9.ch)
+ * Torrent9Clone
  * Torrentz2
- * World Wide Torrents
+ * YourBittorrent
  * YTS.ag
  * Zooqle
 
 ### Supported Semi-Private Trackers
- * 7tor
  * Alein
+ * AlexFilm
+ * AniDUB
  * ArenaBG
+ * BaibaKo
+ * BookTracker
+ * Crazy's Corner
  * CzTorrent
  * Deildu
+ * EniaHD
  * Film-Paleis
  * Gay-Torrents.net
  * Gay-Torrents.org
  * GDF76
+ * HamsterStudio
  * Kinozal
  * LostFilm.tv
- * Mega-Bliz
+ * Marine Tracker
  * Metal Tracker
  * MVGroup Forum
  * MVGroup Main
@@ -108,16 +124,20 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Sharewood
  * SkTorrent
  * SoundPark
+ * Toloka.to
+ * Torrents-Local
+ * Underverse
  * Union Fansub
  * Vanila
- * XtreMeZone (MYXZ)
  * YggTorrent (YGG)
  * Ztracker
 
 ### Supported Private Trackers
+ * 0day.kiev
  * 2 Fast 4 You
  * 3D Torrents (3DT) 
  * 3evils
+ * 4thD (4th Dimension)
  * 720pier
  * Abnormal
  * Acid Lounge (A-L)
@@ -129,6 +149,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Anthelion
  * AOX (Chippu)
  * Araba Fenice (Phoenix)
+ * Asgaard (AG)
  * AsianCinema
  * AsianDVDClub
  * AST4u
@@ -137,7 +158,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Awesome-HD (AHD)
  * AVG (Audio Video Games)
  * Avistaz (AsiaTorrents)
- * B2S-Share
  * Back-ups
  * BakaBT
  * BaconBits (bB)
@@ -158,11 +178,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BJ-Share (BJ)
  * BlueBird
  * Blutopia (BLU)
- * Brasil Tracker
  * BroadcastTheNet (BTN)
  * BrokenStones
  * BTGigs (TG)
  * BTNext (BTNT)
+ * BTSCHOOL
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent
@@ -171,11 +191,13 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * CGPeers
  * CHDBits
  * ChannelX
- * CiNEFiLHD
  * Cinemageddon
  * Cinematik
  * CinemaZ (EuTorrents)
  * Classix
+ * Concertos
+ * CrazyHD
+ * CrazySpirits
  * CrnaBerza
  * DanishBits (DB)
  * Dark-Shadow
@@ -192,16 +214,20 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Dragonworld Reloaded
  * Dream Team
  * DXDHD
+ * EbookParadijs
+ * Ebooks-Shares
+ * EfectoDoppler
  * EliteHD (HDClub) [![(invite needed)][inviteneeded]](#)
  * Elit Tracker (ET)
  * Elite-Tracker
  * Empornium (EMP)
+ * eShareNet
  * eStone (XiDER, BeLoad)
  * Ethor.net (Thor's Land)
  * FANO.IN
  * FileList (FL)
  * Femdomcult
- * Freedom-HD (Freedom Paradise)
+ * FocusX
  * FreeTorrent
  * FullMixMusic
  * FunFile (FF)
@@ -209,12 +235,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Fuzer (FZ)
  * GAYtorrent.ru
  * GazelleGames (GGn)
- * GFXNews
+ * Generation-Free
  * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT) <!-- maintained by jamesb2147 -->
  * GiroTorrent
- * GODS
  * Greek Team
  * HacheDe
  * Hardbay
@@ -232,9 +257,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HDCity
  * HDHome (HDBigger)
  * HDME
- * HDplus
  * HDSky
  * HDTorrents.it
+ * HDTurk
+ * HDZone
  * Hebits
  * Hon3y HD
  * HQSource (HQS)
@@ -243,26 +269,33 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ICE Torrent
  * iLoveClassics (iLC)
  * ImmortalSeed (iS)
+ * Immortuos
  * inPeril
  * Insane Tracker
  * IPTorrents (IPT)
  * JPopsuki
  * Kapaki
  * Karagarga
+ * LaPauseTorrents
+ * Le Chaudron
  * Le Saloon
+ * LearnFlakes
+ * LibraNet (LN)
  * LinkoManija
  * LosslessClub
  * M-Team TP (MTTP)
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
- * Manicomio Share
  * Mononoké-BT
  * MoreThanTV (MTV)
+ * Music-Master
  * MyAnonamouse (MAM)
  * myAmity
  * MySpleen
+ * NBTorrents
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
+ * NetLab
  * New Real World
  * Norbits
  * NordicBits (NB)
@@ -276,6 +309,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Peers.FM
  * PiratBit
  * PirateTheNet (PTN)
+ * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD)
  * Pleasuredome
  * PolishSource (PS)
@@ -289,8 +323,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * PThome
  * PuntoTorrent
  * PWTorrents (PWT)
+ * R3V WTF!
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
+ * RainbowNation Sharing (RNS)
  * Redacted (PassTheHeadphones)
  * Red Star Torrent (RST)
  * RetroFlix
@@ -298,40 +334,49 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RGU
  * RoDVD (Cinefiles)
  * Romanian Metal Torrent (RMT)
+ * RPTorrents
  * SceneFZ
  * SceneHD
+ * ScenePalace (SP)
  * SceneReactor
  * SceneRush
  * SceneTime
  * SDBits
  * Secret Cinema
+ * SeedFile (SF)
  * Shareisland
  * ShareSpaceDB
- * Sharingue
+ * ShareUniversity
  * Shazbat
  * Shellife (SL)
+ * SiamBIT
  * SpaceTorrent
- * Speed-Share
  * SpeedCD
  * SpeedTorrent Reloaded
  * SportHD
  * SportsCult
  * SuperBits (SBS)
  * TakeaByte
+ * Tapochek
  * Tasmanit
- * TBPlus
+ * Tazmania-Den
+ * TeamHD
+ * TeamOS
+ * TEKNO3D
+ * TellyTorrent
  * TenYardTorrents (TYT)
+ * TheAudioScene
  * TheEmpire (TE)
  * The Geeks
  * The Horror Charnel (THC)
- * The Occult
+ * The Movie Cave
  * The New Retro
+ * The Occult
  * The Place
  * The Shinning (TsH)
  * The Show
  * The-Torrents
  * The Vault
- * Tigers-dl
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent.LT
@@ -353,24 +398,26 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ToTheGlory
  * TranceTraffic
  * Trezzor
- * TurkTorrent (TT)
+ * TurkTorrent (TT) [![(invite needed)][inviteneeded]](#)
  * TV Chaos UK (TVCUK)
  * TV-Vault
  * TVstore
+ * Twilight Torrents
  * u-torrents (SceneFZ)
  * UHDBits
- * Ultimate Gamer Club (UGC)
+ * UnionGang
+ * UnlimitZ
  * Vizuk
  * Waffles
  * World-In-HD
  * World-of-Tomorrow
- * WorldOfP2P (WOP)
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
- * XKTorrent
  * XWTorrents (XWT)
  * Xthor
+ * XtremeFile
+ * XtreMeZone (MYXZ)
  * ExoticaZ (YourExotic)
  * Zamunda.net
  * Zelka.org
@@ -379,7 +426,7 @@ Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maint
 
 ### Aggregate indexers
 
-A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab/api`.
+A special "all" indexer is available at `/api/v2.0/indexers/all/results/torznab`.
 It will query all configured indexers and return the combined results.
 
 If your client supports multiple feeds it's recommended to add each indexer directly instead of using the all indexer.
@@ -414,10 +461,11 @@ Jackett can also be run from the command line if you would like to see log messa
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
 
 ### Install as service
-To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+1. Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases)
+2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxAMDx64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
 
 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
@@ -427,10 +475,11 @@ If you want to run it with a user without a /home directory you need to add `Env
 On most operating systems all the required dependencies will already be present. In case they are not, you can refer to this page https://docs.microsoft.com/en-us/dotnet/core/linux-prerequisites?tabs=netcore2x#linux-distribution-dependencies
 
 ### Install as service
-To install Jackett as a service, open the Terminal and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
+1. Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) 
+2. To install Jackett as a service, open a Terminal, cd to the jackett folder and run `sudo ./install_service_systemd.sh` You need root permissions to install the service. The service will start on each logon. You can always stop it by running `systemctl stop jackett.service` from Terminal. You can start it again it using `systemctl start jackett.service`. Logs are stored as usual under `~/.config/Jackett/log.txt` and also in `journalctl -u jackett.service`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`
+Download and extract the latest `Jackett.Binaries.LinuxARM32.tar.gz` or `Jackett.Binaries.LinuxARM64.tar.gz` (32 bit is the most common on ARM) release from the [releases page](https://github.com/Jackett/Jackett/releases), open a Terminal, cd to the jackett folder and run Jackett with the command `./jackett`
 
 ### home directory
 If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
@@ -454,7 +503,7 @@ Mono must be compiled with the Roslyn compiler (default), using MCS will cause "
 
 ### Installation on Linux via Ansible
 
-On a RHEL/Centos 7 system: [linuxhq.jackett](https://galaxy.ansible.com/linuxhq/jackett)
+On a CentOS/RedHat 7 system: [jewflix.jackett](https://galaxy.ansible.com/jewflix/jackett)
 
 On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chrisjohnson00/jackett)
 
@@ -475,6 +524,9 @@ Logs are stored as usual under `~/.config/Jackett/log.txt`.
 ### Run without installing as a service
 Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
 
+### upgrading from mono
+If you were previously using the Mono flavour of Jackett then you should shutdown the service from a terminal with with the command `systemctl stop jackett.service` and then remove the startup script at `/etc/systemd/system/jackett.service` and delete the content of the `/Applications/Jackett` folder, prior to performing this install.
+
 
 ## Installation using Docker
 Detailed instructions are available at [LinuxServer.io Jackett Docker](https://hub.docker.com/r/linuxserver/jackett/). The Jackett Docker is highly recommended, especially if you are having Mono stability issues or having issues running Mono on your system eg. QNAP, Synology. Thanks to [LinuxServer.io](https://linuxserver.io)
@@ -557,7 +609,7 @@ All contributions are welcome just send a pull request.
 ### Windows
 * Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
-* From the `src` directory, run `dotnet restore`
+* Open Powershell and from the `src` directory, run `dotnet restore`
 * Open the Jackett solution in Visual Studio 2017 (version 15.9 or above)
 * Right click on the Jackett solution and click 'Rebuild Solution' to restore nuget packages
 * Select Jackett.Server as startup project

appveyor.yml

@@ -6,6 +6,10 @@ image:
 environment:
   APPVEYOR_YML_DISABLE_PS_LINUX: true
 configuration: Release
+install:
+  #Remove once .NET Core 2.2.5 is deployed to Appveyor
+  - sh: sudo apt-get update
+  - sh: sudo apt-get -y install dotnet-sdk-2.2
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'

build.cake

@@ -126,7 +126,6 @@ Task("Package-Mono-Full-Framework")
 
 		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);  //builds against multiple frameworks
 
-		CopyFileToDirectory("./install_service_macos_mono", buildOutputPath);
 		CopyFileToDirectory("./install_service_systemd_mono.sh", buildOutputPath);
 		CopyFileToDirectory("./Upstart.config", buildOutputPath);
 

install_service_macos_mono

@@ -1,77 +0,0 @@
-#!/bin/bash
-
-#Setting up colors
-BOLDRED="$(printf '\033[1;31m')"
-BOLDGREEN="$(printf '\033[1;32m')"
-NC="$(printf '\033[0m')" # No Color
-
-# Stop and unload the service if it's running
-launchctl remove org.user.Jackett
-
-# Move working directory to Jackett's
-cd "$(dirname "$0")"
-
-# Check if we're running from Jackett's directory
-if [ ! -f ./JackettConsole.exe ]; then
-echo "${BOLDRED}ERROR${NC}: Couldn't locate JackettConsole.exe. Is the script in the right directory?"
-    exit 1
-fi
-jackettdir="$(pwd)"
-
-# Check if mono is installed
-command -v mono >/dev/null 2>&1 || { echo >&2 "${BOLDRED}ERROR${NC}: Jackett requires Mono but it's not installed. Aborting."; exit 1; }
-monodir="$(dirname $(command -v mono))"
-
-# Check that no other service called Jackett is already running
-if [[ $(launchctl list | grep org.user.Jackett) ]]; then
-    echo "${BOLDRED}ERROR${NC}: Jackett already seems to be running as a service. Please stop it before running this script again."
-    exit 1
-fi
-
-# Write the plist to LaunchAgents
-mkdir -p ~/Library/LaunchAgents/
-cat >~/Library/LaunchAgents/org.user.Jackett.plist <<EOL
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>EnvironmentVariables</key>
-    <dict>
-        <key>PATH</key>
-        <string>/usr/bin:/bin:/usr/sbin:/sbin:${monodir}</string>
-    </dict>
-    <key>KeepAlive</key>
-    <true/>
-    <key>Label</key>
-    <string>org.user.Jackett</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>${monodir}/mono</string>
-        <string>--debug</string>
-        <string>JackettConsole.exe</string>
-        <string>--NoRestart</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>WorkingDirectory</key>
-    <string>${jackettdir}</string>
-</dict>
-</plist>
-
-EOL
-
-# Run the agent
-launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
-
-# Check that it's running
-if [[ $(launchctl list | grep org.user.Jackett) ]]; then
-echo "${BOLDGREEN}Agent successfully installed and launched!${NC}"
-else
-    cat << EOL
-${BOLDRED}ERROR${NC}: Could not launch agent. The installation might have failed.
-Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Mono directory: \`${monodir}\`
-Jackett directory: \`${jackettdir}\`
-
-EOL
-fi

install_service_systemd.sh

@@ -70,7 +70,6 @@ else
     cat << EOL
 ${BOLDRED}ERROR${NC}: Could not launch service. The installation might have failed.
 Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Mono directory: \`${monodir}\`
 Jackett directory: \`${jackettdir}\`
 Jackett user: \`${jackettuser}\`
 

src/Jackett.Common/Content/custom.js

@@ -94,6 +94,10 @@ function loadJackettSettings() {
             $("#logoutBtn").show();
         }
 
+        if (data.can_run_netcore != null && data.can_run_netcore === true) {
+            $("#can-upgrade-from-mono").show();
+        }
+
         $.each(data.notices, function (index, value) {
             console.log(value);
             doNotify(value, "danger", "glyphicon glyphicon-alert", false);
@@ -222,12 +226,12 @@ function displayUnconfiguredIndexersList() {
 		                    doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
 		                }
 			        }).fail(function (data) {
-			            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
-            }
-                        
+                if(data.responseJSON.error !== undefined) {
+                  var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
+                  doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                } else {
+                  doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
+                }
 			        });
                 });
             });
@@ -444,12 +448,13 @@ function testIndexer(id, notifyResult) {
                 doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
         }
     }).fail(function (data) {
-        updateTestState(id, "error", data.error, indexers);
-        if(data.responseJSON.error !== undefined && notifyResult) {
-                doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
-            }
+      updateTestState(id, "error", data.error, indexers);
+      if(data.responseJSON.error !== undefined && notifyResult) {
+        var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
+        doNotify("An error occured while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+      } else {
+        doNotify("An error occured while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
+      }
     });
 }
 
@@ -651,11 +656,12 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
                 doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
             }
         }).fail(function (data) {
-            if(data.responseJSON.error !== undefined) {
-                doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
-            } else {
-                doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
-            }
+          if(data.responseJSON.error !== undefined) {
+            var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
+            doNotify("An error occured while updating this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+          } else {
+            doNotify("An error occured while updating this indexer, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
+          }
         }).always(function () {
             $goButton.html(originalBtnText);
             $goButton.prop('disabled', false);
@@ -732,7 +738,7 @@ function updateReleasesRow(row)
     labels.empty();
 
     if (IMDBId) {
-        labels.append('\n<a href="http://www.imdb.com/title/tt' + ("000000" + IMDBId).slice(-7) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
+        labels.append('\n<a href="http://www.imdb.com/title/tt' + ("0000000" + IMDBId).slice(-8) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
     }
 
     if (!isNaN(DownloadVolumeFactor)) {

src/Jackett.Common/Content/index.html

@@ -19,7 +19,7 @@
     <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
     <link rel="mask-icon" href="jackett_medium.png" color="#35c5f4">
     <link rel="icon" type="image/ico" href="../favicon.ico" />
-    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
+    <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico?' />
     <script type="text/javascript" src="../libs/filesize.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/jquery.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
@@ -51,6 +51,14 @@
             <input id="api-key-input" class="form-control input-right" type="text" value="" placeholder="API Key" readonly="">
         </div>
         <hr />
+
+        <div id="can-upgrade-from-mono" hidden class="alert alert-info" role="alert"> 
+            <strong>Standalone version of Jackett is now available - Mono not required</strong> <br>
+            To upgrade to the standalone version of Jackett, <a href="https://github.com/Jackett/Jackett#install-on-linux-amdx64" target="_blank" class="alert-link">click here</a> for install instructions. 
+            Upgrading is straight forward, simply install the standalone version and your indexers/configuration will carry over. 
+            Benefits include: increased performance, improved stability and no dependency on Mono. 
+        </div>
+
         <div class="pull-right">
             <button id="jackett-add-indexer" class="btn btn-success btn-sm">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
@@ -142,8 +150,7 @@
         </div>
         <div id="proxy-warning" hidden>
             <span>
-                WARNING: The proxy option is unstable and potentially leaks requests. If no fix from the community is forthcoming 
-                in the next few months, the proxy option will be removed from Jackett. Recommendation is to use a VPN.
+                WARNING: The proxy option potentially leaks requests. Recommendation is to use a VPN.
             </span>
         </div>
         <div class="input-area">
@@ -671,6 +678,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20190401"></script>
+    <script type="text/javascript" src="../custom.js?changed=20190427"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/0daykiev.yml

@@ -0,0 +1,165 @@
+---
+  site: 0daykiev
+  name: 0day.kiev
+  description: "0day.kiev.ua is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - https://tracker.0day.kiev.ua/
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: Movies, desc: "Фильмы (Movies)"}
+      - {id: 11, cat: TV, desc: "Мультфильмы (Cartoons)"}
+      - {id: 29, cat: TV, desc: "Мультсериалы (TV Series)"}
+      - {id: 34, cat: TV/Anime, desc: "Аниме (Anime)"}
+      - {id: 20, cat: TV/Documentary, desc: "Документальное (Documentary)"}
+      - {id: 14, cat: Audio, desc: "Музыка / Аудио (Music / Audio)"}
+      - {id: 15, cat: Audio/Video, desc: "Музыка / Видео (Music / Video)"}
+      - {id: 16, cat: Movies/HD, desc: "HD / Фильмы (HD / Movies)"}
+      - {id: 27, cat: TV/HD, desc: "HD / Мультфильмы (HD / Cartoons)"}
+      - {id: 28, cat: TV/HD, desc: "HD / Документальное (HD / Documentary)"}
+      - {id: 41, cat: Movies/3D, desc: "HD / 3D видео (HD / 3D video)"}
+      - {id: 47, cat: Movies, desc: "HDv 0day Team"}
+      - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
+      - {id: 25, cat: Console/Xbox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
+      - {id: 33, cat: Console/PSP, desc: "Игры / PSP - PS2 (Games / PSP - PS2)"}
+      - {id: 37, cat: Console/PS3, desc: "Игры / PS3 (Games / PS3)"}
+      - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
+      - {id: 39, cat: PC/Mac, desc: "Mac OS (Софт / Игры) (Mac OS (Software / Games))"}
+      - {id: 19, cat: TV, desc: "TV / Сериалы (TV shows)"}
+      - {id: 30, cat: TV/HD, desc: "HD / Сериалы (HD / TV Shows)"}
+      - {id: 23, cat: TV, desc: "TV / Передачи (TV / Broadcasts)"}
+      - {id: 22, cat: TV/Sport, desc: "Спорт (Sports)"}
+      - {id: 31, cat: Other, desc: "Прочее (Other)"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: true
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/browse.php"
+    error:
+      - selector: div.maintitle:contains("Ошибка")
+        message:
+          selector: div.borderwrap table.embedded
+    test:
+      path: browse.php
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+    # https://tracker.0day.kiev.ua/browse.php?c10=1&c27=1&search=endgame&incldead=1&where=0
+      - path: browse.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to Cезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
+      - name: re_replace # S01E01 to Сезон 1 Серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver
+      incldead: 1
+      # 0 title 1 title and descr
+      where: 0
+    rows:
+      selector: table > tbody > tr.rowtorrentinfo
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|]", " "]
+          - name: replace
+            args: ["Кураж Бамбей", "kurazh"]
+          - name: replace
+            args: ["Кубик в Кубе", "Kubik"]
+          - name: replace
+            args: ["Кравец", "Kravec"]
+          - name: re_replace
+            args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)\\s+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(2) i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      size:
+        selector: td:nth-child(4)
+        filters:
+          - name: replace
+            args: [".", ""] 
+          - name: replace
+            args: [",", "."] 
+          - name: replace
+            args: ["ТБ", "TB"] 
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: (\d+) 
+      seeders:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 1]
+      downloadvolumefactor:
+        case:
+          img[src="pic/freedownload.gif"]: 0
+          img[src="pic/silverdownload.gif"]: 0.5
+          "*": 1
+      uploadvolumefactor:
+          text: 1

src/Jackett.Common/Definitions/1337x.yml

@@ -110,16 +110,24 @@
       default: "magnet:"
       options:
         "http://itorrents.org/" : "iTorrents.org"
+        "http://torrage.info/" : "Torrage.info"
+        "http://btcache.me/" : "BTcache.me"
         "magnet:": "magnet"
 
   download:
     # the .torrent url is on the on the details page 
     selector: ul li a[href^="{{ .Config.downloadlink }}"]
+    # temp fix for #5372
+    filters: 
+      - name: urldecode
+      - name: replace
+        args: [" ⭐", ""]
 
   search:
     paths:
-      # present trending results if there are no search parms supplied
-      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/1/{{else}}trending{{end}}"
+      # present first page of movies and tv results if there are no search parms supplied
+      - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/1/{{else}}cat/Movies/1/{{end}}"
+      - path: "{{if .Keywords}}{{else}}cat/TV/1/{{end}}"
       - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/2/{{else}}{{end}}"
       - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/3/{{else}}{{end}}"
       - path: "{{if .Keywords}}sort-search/{{ .Keywords}}/time/desc/4/{{else}}{{end}}"

src/Jackett.Common/Definitions/2fast4you.yml

@@ -6,9 +6,10 @@
   type: private
   encoding: UTF-8
   links:
-    - https://www.2f4y.me/
+    - https://2f4y.me/
   legacylinks:
     - http://www.2f4y.me/
+    - https://www.2f4y.me/
 
   caps:
     categorymappings:
@@ -79,6 +80,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   login:
     path: account-login.php
@@ -100,13 +102,24 @@
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
-      incldead: "1"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 all 1 notfree 2 onlyfree
+      freeleech: 0
+      # 0 any 1 French 2 English 3 Multi 4-8 32-41
+      lang: 0
     keywordsfilters:
       - name: re_replace
         args: ["^$", "%"] # replace empty search string with %
     rows:
       selector: table.ttable_headinner > tbody > tr[class^="t-row"]
     fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
       download:
         selector: a[href^="torrents-details.php?id="]
         attribute: href
@@ -118,12 +131,6 @@
         filters:
           - name: replace
             args: [" - (Nouveau!)", ""]
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
       details:
         selector: a[href^="torrents-details.php?id="]
         attribute: href
@@ -136,6 +143,8 @@
         selector: td:nth-child(6)
       leechers:
         selector: td:nth-child(7)
+      date:
+        text: now
       downloadvolumefactor:
         case:
           img[title="freeleech"]: "0"

src/Jackett.Common/Definitions/3evils.yml

@@ -11,23 +11,20 @@
   caps:
     categorymappings:
       - {id: 65, cat: Books, desc: "Books"}
-      - {id: 27, cat: Console/NDS, desc: "Games/Nintendo-DS"}
-      - {id: 28, cat: Console/Other, desc: "Games/Switch"}
-      - {id: 42, cat: PC/Phone-Android, desc: "Mobile/Android"}
-      - {id: 44, cat: Movies/UHD, desc: "Movies/4K"}
-      - {id: 13, cat: Movies/BluRay, desc: "Movies/Bluray"}
-      - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
+      - {id: 11, cat: Movies/UHD, desc: "Movies/Encodes 2160p"}
+      - {id: 12, cat: Movies/UHD, desc: "Movies/Remux 2160p"}
+      - {id: 13, cat: Movies/HD, desc: "Movies/Remux 1080p"}
       - {id: 14, cat: Movies, desc: "Movies/Packs"}
-      - {id: 67, cat: Movies/HD, desc: "Movies/x264"}
-      - {id: 55, cat: Movies/HD, desc: "Movies/X265"}
-      - {id: 45, cat: Movies, desc: "Movies/Remux"}
-      - {id: 62, cat: Audio, desc: "Music/Audio"}
+      - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
+      - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
+      - {id: 33, cat: Audio, desc: "Music/Audio"}
       - {id: 32, cat: Audio, desc: "Music/Packs"}
       - {id: 6, cat: TV, desc: "TV/Packs"}
       - {id: 3, cat: TV/HD, desc: "TV/x264"}
       - {id: 4, cat: TV/HD, desc: "TV/x265"}
       - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-      - {id: 63, cat: PC/0day, desc: "Windows/Applications"}
+      - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
+      - {id: 42, cat: PC/Phone-Android, desc: "Appz/Android"}
 
     modes:
       search: [q]
@@ -35,108 +32,94 @@
       movie-search: [q]
 
   login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
+    path: takelogin.php
+    method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      returnto: "/browse.php"
+      submitme: "X"
     error:
-      - selector: h2:contains("Login failed!")
-        message:
-          selector: table tr td.colhead2
+      - selector: div.callout:contains("Login failed!")
     test:
       path: /
-      selector: :has(a[href$="/logout.php?hash_please="])
+      selector: a[href*="/logout.php?hash_please="]
 
   search:
     paths:
-    # ttps://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
-    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=0
+    # https://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
+    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=1
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{.Keywords}}"
-      searchin: "title"
+      # title descr genre all
+      searchin: title
+      # 0 active 1 incldead 2 onlydead
       incldead: 1
     rows:
-      selector: table.table-bordered tr:has(a[href^="browse.php?cat="])
+      selector: table.responsive-card-table tr:has(td[data-label])
       filters:
         - name: andmatch
     fields:
+      category:
+        selector: td[data-label="Type"] a
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
       title:
-        selector: a[href^="details.php?id="] b
-      title:
-        # if this is available it is the full length title, as the one above can be abbreviated with ...
-        optional: true
-        selector: a[href^="details.php?id="][onmouseover]
+        selector: td[data-label="Name"] a[onmouseover]
         attribute: onmouseover
         filters:
           - name: regexp
             args: "Tip\\('<b>(.*?)</b>"
       details:
-        selector: a[href^="details.php?id="]
+        selector: td[data-label="Name"] a
         attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
       download:
-        selector: a[href^="details.php?id="]
+        selector: td[data-label="Download"] a
         attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
       banner:
-        selector: a[href^="details.php?id="][onmouseover]
+        selector: td[data-label="Name"] a[onmouseover]
         attribute: onmouseover
+        optional: true
         filters:
-            #  onmouseover="Tip('<b>blahblah /><img src=\'/imdb/images/0090293.jpg\' blahblah />');"
+            #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
+            # <img src=\'./pic/noposter.png\' 
           - name: regexp
-            args: "/imdb/(.*?).jpg"
-          - name: prepend
-            args: "/imdb/"
-          - name: append
-            args: ".jpg"
+            args: "src=\\\\\'(.+?)\\\\\'"
+          - name: replace
+            args: ["./pic/noposter.png", ""]
       size:
-        selector: td:nth-last-child(4)
+        selector: td[data-label="Size"]
       files:
-        selector: a[href^="filelist.php?id="]
+        selector: td[data-label="Files"]
       grabs:
-        selector: a[href^="snatches.php?id="]
+        selector: td[data-label="Snatched"]
         filters:
           - name: regexp
-            args: "(\\d+)"
+            args: (\d+)
       # 2 flavours of dates
       date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
+        # Today<br> 10:20 AM
+        # Yesterday<br> 08:03 PM
         optional: true
-        selector: td:nth-last-child(5):contains("day")
+        selector: td[data-label="Added"]:contains("day")
       date:
-        # Feb 14 2019<br /> 10:20 AM
+        # Feb 14 2019<br> 10:20 AM
         optional: true
-        selector: td:nth-last-child(5):not(:contains("day"))
+        selector: td[data-label="Added"]:not(:contains("day"))
         filters:
           - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
+            args: "Jan 2 2006 03:04 PM"
       seeders:
-        text: "0"
-      seeders:
-        optional: true
-        selector: a[href$="#seeders"]
+        selector: td[data-label="Seeders"]
       leechers:
-        text: "0"
-      leechers:
-        optional: true
-        selector: a[href$="#leechers"]
+        selector: td[data-label="Leechers"]
       downloadvolumefactor:
         case:
-          "b:contains(\"[FREE]\")": "0"
-          "*": "1"
+          img[src="./pic/freedownload.gif"]: 0
+          "*": 1
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": 1

src/Jackett.Common/Definitions/4thd.yml

@@ -0,0 +1,114 @@
+---
+  site: 4thd
+  name: 4thD
+  description: "4th Dimension is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  encoding: UTF-8
+  type: private
+  links:
+    - https://4thd.xyz/
+
+  caps:
+    categorymappings:
+      - {id: 38, cat: Movies, "Movie Pack"}
+      - {id: 36, cat: Movies, "Movies/Classic Films"}
+      - {id: 13, cat: Movies, "Movies/Documentary"}
+      - {id: 21, cat: Movies/Foreign, "Movies/Foreign"}
+      - {id: 27, cat: Movies/HD, "MoviesHD"}
+      - {id: 29, cat: Movies/SD, "Movies/SD"}
+      - {id: 26, cat: Movies/SD, "Movies/XviD"}
+      - {id: 41, cat: TV/FOREIGN, "Foreign tv"}
+      - {id: 40, cat: TV, "Mini-Series"}
+      - {id: 43, cat: TV/HD, "TV H265"}
+      - {id: 42, cat: TV, "TV Movie"}
+      - {id: 4, cat: TV/HD, "TV/HD-x720"}
+      - {id: 14, cat: TV, "TV/Packs"}
+      - {id: 2, cat: TV/SD, "TV/SD MP4/mkv"}
+      - {id: 31, cat: TV/SD, "TV/XviD"}
+      - {id: 18, cat: PC/Games, "Games/PC"}
+      - {id: 12, cat: Audio/Lossless, "Music/FLAC"}
+      - {id: 15, cat: Audio/MP3, "Music/MP3"}
+      - {id: 37, cat: Audio, "Radio"}
+      - {id: 9, cat: PC/0day, "Apps/PC"}
+      - {id: 34, cat: Audio/Audiobook, "Audiobooks"}
+      - {id: 25, cat: Books/Ebook, "eBooks"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form#loginform
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form#loginform .warning
+    test:
+      path: index.php
+      selector: a[href^="logout.php?auth="]
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+    # https://4thd.xyz/torrents.php?order_by=time&order_way=desc&filter_freeleech=1&title=twilight+zone&search_type=1&taglist=&tags_type=0
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      order_by: time
+      order_way: desc
+      # 0 all 1 onlyfree
+      filter_freeleech: 0
+      title: "{{ .Keywords }}"
+      search_type: 1
+      taglist: ""
+      tags_type: 0
+    rows:
+      selector: table#torrent_table > tbody > tr.torrent
+    fields:
+      category:
+        selector: td.cats_col div a
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\[(\\d+)\\]"
+      title:
+        selector: a[href^="torrents.php?id="]
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.tags
+      banner:
+        selector: td:nth-child(2) script
+        optional: true
+        filters:
+          - name: regexp
+            args: "src=(.*?)>"
+          - name: re_replace
+            args: ["\\\\", ""]
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(6)
+      grabs:
+        selector: td:nth-child(7)
+      seeders:
+        selector: td:nth-child(8)
+      leechers:
+        selector: td:nth-child(9)
+      downloadvolumefactor:
+        case:
+          img[src$="/freedownload.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "*": 1

src/Jackett.Common/Definitions/acgsou.yml

@@ -0,0 +1,91 @@
+---
+  site: acgsou
+  name: ACGsou
+  description: "ACGsou is a CHINESE Public torrent tracker for ANIME"
+  language: zh-cn
+  type: public
+  followredirect: true
+  encoding: UTF-8
+  links:
+    - https://www.acgsou.com/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: TV/Anime, desc: "动画 (Anime)"}
+      - {id: 7, cat: TV/Anime, desc: "新番连载 (Anime New Fan Series)"}
+      - {id: 8, cat: TV/Anime, desc: "动画合集 (Anime Collection)"}
+      - {id: 14, cat: TV/Anime, desc: "英译动画 (Anime English Translation)"}
+      - {id: 5, cat: TV/Anime, desc: "RAW片源"}
+      - {id: 3, cat: Books/Comics, desc: "漫画 (Manga)"}
+      - {id: 12, cat: Books/Comics, desc: "港台漫画 (Manga Hong Kong and Taiwan)"}
+      - {id: 13, cat: Books/Comics, desc: "原版日漫 (Manga Original Japanese)"}
+      - {id: 16, cat: Books/Comics, desc: "英译漫画 (Manga English Translation)"}
+      - {id: 4, cat: Audio, desc: "动漫音乐 (Anime Music)"}
+      - {id: 15, cat: Audio/Video, desc: "音乐视频 (Music Video)"}
+      - {id: 20, cat: TV, desc: "日剧 (Drama Japanese)"}
+      - {id: 21, cat: TV, desc: "特摄片 (Drama Special)"}
+      - {id: 22, cat: TV, desc: "原版日剧 (Drama Original Japanese)"}
+      - {id: 23, cat: TV, desc: "英译日剧 (Drama English Translation)"}
+      - {id: 18, cat: PC/Games, desc: "游戏 (Games)"}
+      - {id: 6, cat: Other, desc: "其他资源 (Other)"}
+      - {id: 17, cat: Other, desc: "写真集 (Photobook)"}
+      - {id: 19, cat: Other, desc: "图集 (Atlas)"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+    # https://www.acgsou.com/1.html
+    # https://www.acgsou.com/search.php?keyword=test
+      - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{else}}1.html{{end}}"
+    rows:
+      selector: table tbody tr[class^="alt"]
+    fields:
+      date:
+        selector: td:nth-child(1):contains("昨天")
+        optional: true
+        filters:
+          - name: replace
+            args: ["昨天", "Yesterday"]
+      date:
+        selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
+        optional: true
+        filters:
+          - name: dateparse
+            args: "01/02 15:04"
+      date:
+        selector: td:nth-child(1):not(:contains(":"))
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006/01/02"
+      category:
+        selector: td:nth-child(2) a
+        attribute: href
+        filters:
+          - name: regexp
+            args: "sort-(\\d+)-1.html"
+      title:
+        selector: td:nth-child(3) a
+      details:
+        selector: td:nth-child(3) a
+        attribute: href
+      download:
+        selector: td:nth-child(3) a
+        attribute: href
+      size:
+        selector: td:nth-child(4)
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/alexfilm.yml

@@ -0,0 +1,135 @@
+---
+  site: alexfilm
+  name: AlexFilm
+  description: "AlexFilm is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://alexfilm.cc/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      "login_username": "{{ .Config.username }}"
+      "login_password": "{{ .Config.password }}"
+      autologin: 1
+      login: "Log in"
+    error:
+      - selector: div.bg-danger
+    test:
+      path: tracker.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+        method: post
+    inputs:
+      prev_allw: 1
+      prev_a: 0
+      prev_dla: 0
+      prev_dlc: 0
+      prev_dld: 0
+      prev_dlw: 0
+      prev_my: 0
+      prev_new: 0
+      prev_sd: 0
+      prev_da: 1
+      prev_dc: 0
+      prev_df: 1
+      prev_ds: 0
+      prev_tor_type: 0
+      # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+      o: 1
+      # 1=asc 2=desc
+      s: 2
+      # show category
+      dc: 0
+      # show forum
+      df: 1
+      # show author
+      da: 1
+      # show speed
+      ds: 0
+      # -1=all time
+      tm: -1
+      # seed not seen -1=disregard
+      sns: -1
+      # group releases -1=not selected
+      srg: -1
+      nm: "{{ .Keywords }}"
+      # find a username
+      pn: ""
+      # despite the all words flag the search engine returns anywords matching.
+      allw: 1
+
+    rows:
+      selector: tr[id^="tor_"]
+    fields:
+      title:
+        selector: td a.tLink
+        filters:
+          - name: re_replace
+            args: ["[\\/]+", ""]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: re_replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)\\s+[CСcс]ери[ия]\\s+(\\d+)[\\-](\\d+)\\s+\\((\\d+)\\)(.*)", "$1 S$2E$3-$4 rus $6"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+      details:
+        selector: td a.tLink
+        attribute: href
+      download:
+        selector: li a
+        attribute: href
+      category:
+        text: 1
+      seeders:
+        selector: td:nth-child(3) u
+      leechers:
+        selector: td:nth-child(4) u
+      size:
+        selector: td:nth-child(5) u
+      date:
+        selector: td:nth-child(6) u
+      grabs:
+        selector: td:nth-child(6) span:nth-last-child(1)
+      downloadvolumefactor:
+        case:
+          img[src="./styles/images/tor_gold.gif"]: "0"
+          img[src="./styles/images/tor_silver.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/amigosshare.yml

@@ -29,6 +29,8 @@
       - {id: 74, cat: XXX, desc: "Adultos: XXX"}
       - {id: 75, cat: XXX, desc: "Adultos: Hentai"}
       - {id: 69, cat: TV/Anime, desc: "Anime: Anime"}
+      - {id: 118, cat: TV/Anime, desc: "Anime: Séries"}
+      - {id: 116, cat: TV/Anime, desc: "Anime: Filmes"}
       - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"}
       - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
       - {id: 23, cat: PC/Phone-Android, desc: "Aplicativos: Android"}
@@ -40,28 +42,11 @@
       - {id: 72, cat: Books, desc: "Apostila: Apostila"}
       - {id: 67, cat: Books, desc: "Ebook: Livros"}
       - {id: 68, cat: Books, desc: "Ebook: Revistas"}
-      - {id: 85, cat: Movies, desc: "Filmes: Guerra"}
-      - {id: 81, cat: Movies, desc: "Filmes: Musical"}
-      - {id: 17, cat: Movies, desc: "Filmes: Biografia"}
-      - {id: 16, cat: Movies, desc: "Filmes: Esportes"}
-      - {id: 15, cat: Movies, desc: "Filmes: Ficção"}
-      - {id: 14, cat: Movies, desc: "Filmes: Infantil"}
-      - {id: 13, cat: Movies, desc: "Filmes: Nacionais"}
-      - {id: 12, cat: Movies, desc: "Filmes: Policial"}
-      - {id: 11, cat: Movies, desc: "Filmes: Religioso"}
-      - {id: 10, cat: Movies, desc: "Filmes: Suspense"}
-      - {id: 9, cat: Movies, desc: "Filmes: Western"}
-      - {id: 8, cat: Movies, desc: "Filmes: Animação"}
-      - {id: 7, cat: Movies, desc: "Filmes: Clássicos"}
-      - {id: 6, cat: Movies, desc: "Filmes: Comédia"}
-      - {id: 5, cat: Movies, desc: "Filmes: Documentário"}
-      - {id: 4, cat: Movies, desc: "Filmes: Drama"}
-      - {id: 3, cat: Movies, desc: "Filmes: Romance"}
-      - {id: 2, cat: Movies, desc: "Filmes: Terror"}
-      - {id: 1, cat: Movies, desc: "Filmes: Ação"}
-      - {id: 80, cat: Movies, desc: "Filmes: Aventura"}
+      - {id: 112, cat: Books, desc: "Ebook: HQs"}
+      - {id: 119, cat: Movies, desc: "Filmes:"}
       - {id: 70, cat: XXX, desc: "Fotos: XXX"}
       - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
+      - {id: 109, cat: Console, desc: "Jogos: Emulação"}
       - {id: 47, cat: PC/Games, desc: "Jogos: Pc"}
       - {id: 61, cat: Console, desc: "Jogos: Emuladores e Roms"}
       - {id: 48, cat: PC/Mac, desc: "Jogos: Mac"}
@@ -69,17 +54,15 @@
       - {id: 50, cat: Console, desc: "Jogos: Ps2"}
       - {id: 51, cat: Console/PS3, desc: "Jogos: Ps3"}
       - {id: 52, cat: Console, desc: "Jogos: Dreamcast"}
-      - {id: 54, cat: Console/Xbox 360, desc: "Jogos: X360"}
+      - {id: 54, cat: Console/Xbox 360, desc: "Jogos: Xbox360"}
       - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"}
       - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
       - {id: 58, cat: Console/NDS, desc: "Jogos: Nintendo DS"}
-      - {id: 111, cat: Console, desc: "Jogos: Nintendo Swich"}
       - {id: 110, cat: Console, desc: "Jogos: Nintendo Switch"}
       - {id: 57, cat: Console, desc: "Jogos: Android"}
       - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
       - {id: 78, cat: Console/Xbox One, desc: "Jogos: Xbox One"}
       - {id: 29, cat: Audio, desc: "Musica: Axé"}
-      - {id: 30, cat: Audio, desc: "Musica: Eletronica"}
       - {id: 31, cat: Audio, desc: "Musica: Funk"}
       - {id: 32, cat: Audio, desc: "Musica: Pagode"}
       - {id: 33, cat: Audio, desc: "Musica: Hip-Hop"}
@@ -88,7 +71,7 @@
       - {id: 37, cat: Audio, desc: "Musica: Hard Rock"}
       - {id: 38, cat: Audio, desc: "Musica: Blues"}
       - {id: 39, cat: Audio, desc: "Musica: Dance"}
-      - {id: 40, cat: Audio, desc: "Musica: Dicografia"}
+      - {id: 40, cat: Audio, desc: "Musica: Discografia"}
       - {id: 41, cat: Audio, desc: "Musica: Erudita"}
       - {id: 42, cat: Audio, desc: "Musica: Forró"}
       - {id: 43, cat: Audio, desc: "Musica: Dubstep"}
@@ -97,6 +80,8 @@
       - {id: 77, cat: Audio, desc: "Musica: Outros"}
       - {id: 76, cat: Audio, desc: "Musica: Reggae"}
       - {id: 83, cat: Audio, desc: "Musica: Gospel"}
+      - {id: 115, cat: Audio, desc: "Musica: POP"}
+      - {id: 114, cat: Audio, desc: "Musica: MPB"}
       - {id: 84, cat: Audio, desc: "Musica: Game (OST)"}
       - {id: 88, cat: TV, desc: "Series: Musical"}
       - {id: 86, cat: TV, desc: "Series: Guerra"}
@@ -168,31 +153,50 @@
           page: 4
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
       incldead: 1
       freeleech: 0
       lang: 0
       sort: "id"
       order: "desc"
+    keywordsfilters:
+      - name: re_replace
+        args: ["([12][0-9]{3})", ""]
     rows:
-      selector: table > tbody > tr:has(a[href^="torrents-details.php?id="])
+      selector: div#fancy-list-group ul.list-group li.list-group-item
     fields:
+      _quality:
+        selector: div.list-group-item-content p.m-0 span.badge-primary:contains("1080p"), div.list-group-item-content p.m-0 span.badge-primary:contains("720p"), div.list-group-item-content p.m-0 span.badge-primary:contains("4k")
+        optional: true
+      _year:
+        selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#246AB6;"]
+        optional: true
+      _type:
+        selector: div.list-group-item-content p.m-0 span.badge-info:contains("Rip"), div.list-group-item-content p.m-0 span.badge-info:contains("WEB-"), div.list-group-item-content p.m-0 span.badge-info:contains("TV"), div.list-group-item-content p.m-0 span.badge-info:contains("Blu-Ray"), div.list-group-item-content p.m-0 span.badge-info:contains("BD50"), div.list-group-item-content p.m-0 span.badge-info:contains("MUX"), div.list-group-item-content p.m-0 span.badge-info:contains("DVD"), div.list-group-item-content p.m-0 span.badge-info:contains("320"), div.list-group-item-content p.m-0 span.badge-info:contains("CAM"), div.list-group-item-content p.m-0 span.badge-info:contains("rip")
+        optional: true
       title:
         selector: a[href^="torrents-details.php?id="]
+        filters:
+            # strip out the non-english title [to the left of the brackets] and drop the brackets enclosing the english title
+          - name: re_replace
+            args: ["^(.*?)[\\(](.*?)[\\)](.*?)$", "$2$3"]
+            # add the year to the title
+          - name: append
+            args: "{{if .Result._year}} {{.Result._year}}{{else}}{{end}}"
+            # add the quality to the title
+          - name: append
+            args: "{{if .Result._quality}} {{.Result._quality}}{{else}}{{end}}"
+            # add the type to the title
+          - name: append
+            args: "{{if .Result._type}} {{.Result._type}}{{else}}{{end}}"
       details:
         selector: a[href^="torrents-details.php?id="]
         attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href
-      banner:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-        filters:
-          - name: regexp
-            args: "src=\"(.*?)\""
       category:
-        selector: td:first-child img
+        selector: div.list-group-item-addon img
         attribute: src
         case:
         # unfortunately the site does not have category numbers on the results page, just a .png which can apply to both movies and tv.
@@ -212,43 +216,47 @@
          "[src$=\"/Apostila.png\"]": "72"
          "[src$=\"/E-books.png\"]": "67"
          "[src$=\"/Revista.png\"]": "68"
-         "[src$=\"/Aventura.png\"]": "80"
+         "[src$=\"/HQ.png\"]": "112"
+         "[src$=\"/Filmes.png\"]": "119"
          "[src$=\"/Revistas-XXX.png\"]": "70"
-         "[src$=\"/Jogos-Ps4.png\"]": "79"
+         "[src$=\"/PS4.png\"]": "79"
          "[src$=\"/Jogos-PC.png\"]": "47"
-         "[src$=\"/Jogos-EmuladoreseRoms.png\"]": "61"
+         "[src$=\"/Emulador.png\"]": "61"
+         "[src$=\"/Emulacao.png\"]": "109"
          "[src$=\"/Jogos-Mac.png\"]": "48"
-         "[src$=\"/Jogos-Ps1.png\"]": "49"
-         "[src$=\"/Jogos-Ps2.png\"]": "50"
-         "[src$=\"/Jogos-Ps3.png\"]": "51"
+         "[src$=\"/Jogos-PS1.png\"]": "49"
+         "[src$=\"/Jogos-PS2.png\"]": "50"
+         "[src$=\"/Jogos-PS3.png\"]": "51"
          "[src$=\"/Jogos-Dreamcast.png\"]": "52"
-         "[src$=\"/ogos-X360.png\"]": "54"
-         "[src$=\"/Jogos-Xbox.png\"]": "55"
-         "[src$=\"/Jogos-Wii.png\"]": "56"
-         "[src$=\"/Jogos-NintendoDS.png\"]": "58"
-         "[src$=\"/Jogos-Android.png\"]": "57"
+         "[src$=\"/Jogos-Xbox360.png\"]": "54"
+         "[src$=\"/Jogos-Xbox.png\"]": "56"
+         "[src$=\"/Jogos-Wii.png\"]": "55"
+         "[src$=\"/Jogos-DS.png\"]": "58"
+         "[src$=\"/jogosandroid.png\"]": "57"
          "[src$=\"/Jogos-PSP.png\"]": "82"
+         "[src$=\"/Jogos-NS.png\"]": "110"
          "[src$=\"/Jogos-XboxOne.png\"]": "78"
          "[src$=\"/Axe.png\"]": "29"
-         "[src$=\"/Electronica.png\"]": "30"
          "[src$=\"/Funk.png\"]": "31"
          "[src$=\"/Pagode.png\"]": "32"
-         "[src$=\"/Hip-Hop.png\"]": "33"
+         "[src$=\"/Hip_Hop.png\"]": "33"
          "[src$=\"/Rap.png\"]": "34"
          "[src$=\"/Rock.png\"]": "36"
          "[src$=\"/Hard-Rock.png\"]": "37"
          "[src$=\"/Blues.png\"]": "38"
          "[src$=\"/Dance.png\"]": "39"
-         "[src$=\"/Dicografia.png\"]": "40"
+         "[src$=\"/Discografia.png\"]": "40"
          "[src$=\"/Erudita.png\"]": "41"
          "[src$=\"/Forro.png\"]": "42"
          "[src$=\"/Dubstep.png\"]": "43"
          "[src$=\"/Sertanejo.png\"]": "46"
          "[src$=\"/Samba.png\"]": "45"
-         "[src$=\"/Outros.png\"]": "77"
+         "[src$=\"/Musica-Outros.png\"]": "77"
          "[src$=\"/Reggae.png\"]": "76"
          "[src$=\"/Gospel.png\"]": "83"
-         "[src$=\"/Game-OST.png\"]": "84"
+         "[src$=\"/POP.png\"]": "115"
+         "[src$=\"/MPB.png\"]": "114"
+         "[src$=\"/OST.png\"]": "84"
          "[src$=\"/Musical.png\"]": "88"
          "[src$=\"/Guerra.png\"]": "86"
          "[src$=\"/Biografia.png\"]": "105"
@@ -274,36 +282,19 @@
          "[src$=\"/Aventura.png\"]": "87"
          "[src$=\"/Shows.png\"]": "65"
          "[src$=\"/Aberta.png\"]": "63"
-         "[src$=\"/Esportes.png\"]": "62"
+         "[src$=\"/Esporte.png\"]": "62"
          "[src$=\"/Fechada.png\"]": "64"
          "[src$=\"/Videoaula.png\"]": "73"
-         "[src$=\"/Guerra.png\"]": "85"
-         "[src$=\"/Musical.png\"]": "81"
-         "[src$=\"/Biografia.png\"]": "17"
-         "[src$=\"/Esportes.png\"]": "16"
-         "[src$=\"/Ficcao.png\"]": "15"
-         "[src$=\"/Infantil.png\"]": "14"
-         "[src$=\"/Nacionais.png\"]": "13"
-         "[src$=\"/Policial.png\"]": "12"
-         "[src$=\"/Religioso.png\"]": "11"
-         "[src$=\"/Suspense.png\"]": "10"
-         "[src$=\"/Western.png\"]": "9"
-         "[src$=\"/Animacao.png\"]": "8"
-         "[src$=\"/Classicos.png\"]": "7"
-         "[src$=\"/Comedia.png\"]": "6"
-         "[src$=\"/Documentario.png\"]": "5"
-         "[src$=\"/Drama.png\"]": "4"
-         "[src$=\"/Romance.png\"]": "3"
-         "[src$=\"/Terror.png\"]": "2"
-         "[src$=\"/Acao.png\"]": "1"
       date:
         text: now
       size:
-        selector: td:nth-child(2) span.badge-info
+        selector: div.list-group-item-content p.m-0 span.badge-info
       seeders:
-        selector: td:nth-child(4)
+        selector: div.list-group-item-controls a:nth-child(1)
       leechers:
-        selector: td:nth-child(5)
+        selector: div.list-group-item-controls a:nth-child(2)
+      grabs:
+        selector: div.list-group-item-controls a:nth-child(3)
       downloadvolumefactor:
         case:
           "span.badge-success:contains(\"FREE\")": "0"

src/Jackett.Common/Definitions/asgaard.yml

@@ -0,0 +1,168 @@
+---
+  site: asgaard
+  name: Asgaard
+  description: "Asgaard (AG) is a NORDIC Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en
+  type: private
+  encoding: UTF-8
+  links:
+    - https://asgrd.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "Kidz"}
+      - {id: 2, cat: Movies, desc: "Movies"}
+      - {id: 3, cat: TV, desc: "TV"}
+      - {id: 4, cat: Audio, desc: "Music"}
+      - {id: 5, cat: PC, desc: "Apps"}
+      - {id: 6, cat: PC/Games, desc: "Games"}
+      - {id: 7, cat: Books, desc: "Books"}
+      - {id: 8, cat: Movies, desc: "Kidz Movies"}
+      - {id: 9, cat: TV, desc: "Kidz TV"}
+      - {id: 10, cat: TV, desc: "Kidz Boxset"}
+      - {id: 54, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 55, cat: Movies/DVD, desc: "Movies DVDR"}
+      - {id: 13, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 14, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 56, cat: Movies/HD, desc: "Movies x265"}
+      - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
+      - {id: 16, cat: Movies, desc: "Movies Remux"}
+      - {id: 17, cat: Movies/BluRay, desc: "Movies Bluray Disc"}
+      - {id: 53, cat: Movies, desc: "Movies Boxset"}
+      - {id: 51, cat: Movies, desc: "Movies No Nordic Subs"}
+      - {id: 52, cat: TV/SD, desc: "TV SD"}
+      - {id: 58, cat: TV/SD, desc: "TV DVDR"}
+      - {id: 18, cat: TV/HD, desc: "TV 720p"}
+      - {id: 19, cat: TV/HD, desc: "TV 1080p"}
+      - {id: 60, cat: TV/HD, desc: "TV Bluray Disc"}
+      - {id: 20, cat: TV, desc: "TV Boxset"}
+      - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
+      - {id: 59, cat: TV/UHD, desc: "TV 4K"}
+      - {id: 49, cat: Audio/Video, desc: "Music Video"}
+      - {id: 23, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"}
+      - {id: 24, cat: Audio/Lossless, desc: "Music Flac"}
+      - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"}
+      - {id: 28, cat: PC/Phone-Android, desc: "Apps Android"}
+      - {id: 29, cat: PC/Phone-IOS, desc: "Apps iOS"}
+      - {id: 25, cat: PC/0day, desc: "Apps Windows"}
+      - {id: 26, cat: PC, desc: "Apps Linux"}
+      - {id: 27, cat: PC/Mac, desc: "Apps MacOS"}
+      - {id: 30, cat: PC/Games, desc: "Games Windows"}
+      - {id: 31, cat: PC, desc: "Games Linux"}
+      - {id: 32, cat: PC/Mac, desc: "Games MacOS"}
+      - {id: 33, cat: PC/Phone-Android, desc: "Games Android"}
+      - {id: 34, cat: PC/Phone-IOS, desc: "Games iOS"}
+      - {id: 35, cat: Console/NDS, desc: "Games Nintendo"}
+      - {id: 38, cat: Console/PSP, desc: "Games Playstation"}
+      - {id: 39, cat: Console/Xbox, desc: "Games XBox"}
+      - {id: 41, cat: Books/Ebook, desc: "Books E-Book"}
+      - {id: 42, cat: Audio/Audiobook, desc: "Books Audiobook"}
+      - {id: 43, cat: Books/Technical, desc: "Books Education"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: info
+      type: info
+      label: "About the Username field"
+      default: "Enter your <b>Email address</b> in the username field."
+
+  login:
+    path: login.php
+    method: post
+    form: form
+    inputs:
+      email: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: h2:contains("Error")
+        message:
+          selector: p
+    test:
+      path: /
+      selector: a[href$="/logout.php"]
+      
+  search:
+    paths:
+    # https://asgrd.org/browse.php?sns=&sna=&spf=&sr=&sg=&sys=&sye=&srs=&sre=&si=tt2401090&ss=&incldead=0&only_free=0&sort=4&type=desc
+    - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}cats[]={{.}}&{{end}}"
+      sns: ""
+      sna: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      spf: ""
+      sr: ""
+      sg: ""
+      sys: ""
+      sye: ""
+      srs: ""
+      sre: ""
+      si: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{end}}"
+      ss: ""
+      # 0 active 1 incldead 2 onlydead
+      incldead: 0
+      # 0 incl non-free 1 incl only-free
+      only_free: 0
+      sort: 4
+      type: desc
+    rows:
+      selector: table.table-striped > tbody > tr:has(a[href*="details.php?id="])
+      filters:
+        - name: andmatch
+    fields:
+      title:
+        selector: div.torrent-name
+        filters:
+        # need to remove the tooltip text
+          - name: regexp
+            args: "(.+?)\\n"
+      details:
+        selector: a[href*="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href*="browse.php?"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: cats\[\]=(\d+)$
+      banner:
+        optional: true
+        selector: img.tooltip-poster
+        attribute: src
+      download:
+        selector: a[href*="download.php?torrent="]
+        attribute: href
+      date:
+        selector: div:has(span[id^="staff_pick_"])
+        filters:
+          - name: dateparse
+            args: "2 Jan 2006 15:04:05"
+      files:
+      # remember #5754 advanced users have additional last TD so dont go using nth-last-child ;-)
+        selector: td:nth-child(5)
+      size:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      seeders:
+        selector: td:nth-child(9)
+      leechers:
+        selector: td:nth-child(10)
+      downloadvolumefactor:
+        case:
+          img[src="./images/gold.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/asiancinema.yml

@@ -27,7 +27,9 @@
       password: "{{ .Config.password }}"
       remember: 1
     error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
       selector: a[href$="/logout"]
@@ -39,6 +41,9 @@
       - name: regexp
         args: "Ratio : (\\d+)"
 
+  download:
+    selector: a[href*="/download/"]
+
   search:
     paths:
       - path: filterTorrents
@@ -51,8 +56,8 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: "created_at"
-      direction: "desc"
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -66,7 +71,7 @@
       title:
         selector: a.view-torrent
       download:
-        selector: a[href*="/download/"]
+        selector: a[href*="/download_check/"]
         attribute: href
       details:
         selector: a.view-torrent
@@ -78,14 +83,17 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -124,7 +132,7 @@
           "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
           "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
           "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
@@ -134,4 +142,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.2
+# UNIT3D 1.9.3

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -5,8 +5,10 @@
   language: en-us
   type: semi-private
   encoding: UTF-8
+  followredirect: true
   links:
     - http://audiobookbay.nl/
+  legacylinks:
     - https://audiobookbay.la/
 
   caps:
@@ -75,21 +77,26 @@
 
   login:
     path: https://audiobookbay.nl/member/login.php
-    form: form[action="https://audiobookbay.nl/member/login.php"]
+    form: form[action$="/member/login.php"]
     method: post
     form: form
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      login: "Login"
     error:
-      - selector: td.embedded:has(h2:contains("Invalid"))
+      - selector: div.warning
     test:
-      path: /member/users/
+      path: http://audiobookbay.nl/member/users/
+      selector: a[href="/member/logout"]
 
   download:
-    selector: a[href^="/download?"]
-    attribute: href 
+    method: get
+    before:
+      path:  https://audiobookbay.nl/member/login.php
+      method: "post"
+      inputs:
+        username: "{{ .Config.username }}"
+        password: "{{ .Config.password }}"
 
   search:
     paths:
@@ -110,8 +117,11 @@
         selector: div.postTitle h2 a
         attribute: href
       download:
-        selector: a[href^="/audio-books/"]
+        selector: a[href^="/dl-now?f="]
         attribute: href
+        filters:
+          - name: replace
+            args: ["/dl-now?f=", "/download?f="]
       banner:
         optional: true
         selector: img

src/Jackett.Common/Definitions/awesomehd.yml

@@ -18,21 +18,18 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
   login:
-    method: cookie
+    path: login.php
+    method: form
+    form: form#loginform
     inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form#loginform .warning
     test:
-      path: index.php
+      path: torrents.php
 
   search:
     paths:

src/Jackett.Common/Definitions/b2s-share.yml

@@ -1,286 +0,0 @@
----
-  site: b2s-share
-  name: B2S-Share
-  description: "B2S-Share is a Brazilian Private site for TV / MOVIES / GENERAL"
-  language: pt-br
-  type: private
-  encoding: iso-8859-1
-  links:
-    - http://www.b2s-share.com/
-
-  caps:
-    categorymappings:
-      #3D
-      - {id: 141, cat: Movies/3D, desc: "3D Ação"}
-      - {id: 142, cat: Movies/3D, desc: "3D Animação"}
-      - {id: 143, cat: Movies/3D, desc: "3D Aventura"}
-      - {id: 144, cat: Movies/3D, desc: "3D Clássico"}
-      - {id: 145, cat: Movies/3D, desc: "3D Comédia"}
-      - {id: 146, cat: Movies/3D, desc: "3D Documentário"}
-      - {id: 147, cat: Movies/3D, desc: "3D Drama"}
-      - {id: 149, cat: Movies/3D, desc: "3D Ficção"}
-      - {id: 150, cat: Movies/3D, desc: "3D Guerra"}
-      - {id: 151, cat: Movies/3D, desc: "3D Infantil"}
-      - {id: 152, cat: Movies/3D, desc: "3D Musical"}
-      - {id: 154, cat: Movies/3D, desc: "3D Outros"}
-      - {id: 155, cat: Movies/3D, desc: "3D Policial"}
-      - {id: 156, cat: Movies/3D, desc: "3D Religioso"}
-      - {id: 157, cat: Movies/3D, desc: "3D Romance"}
-      - {id: 158, cat: Movies/3D, desc: "3D Shows"}
-      - {id: 159, cat: Movies/3D, desc: "3D Suspense"}
-      - {id: 160, cat: Movies/3D, desc: "3D Terror"}
-      - {id: 161, cat: Movies/3D, desc: "3D Thriller"}
-      - {id: 162, cat: Movies/3D, desc: "3D Western"}
-      
-      #4K
-      - {id: 173, cat: Movies, desc: "4K Ação"}
-      - {id: 191, cat: Movies, desc: "4K Animação"}
-      - {id: 190, cat: Movies, desc: "4K Aventura"}
-      - {id: 188, cat: Movies, desc: "4K Clássico"}
-      - {id: 175, cat: Movies, desc: "4K Comédia"}
-      - {id: 186, cat: Movies, desc: "4K Documentário"}
-      - {id: 185, cat: Movies, desc: "4K Drama"}
-      - {id: 177, cat: Movies, desc: "4K Ficção"}
-      - {id: 178, cat: Movies, desc: "4K Guerra"}
-      - {id: 179, cat: Movies, desc: "4K Infantil"}
-      - {id: 180, cat: Movies, desc: "4K Musical"}
-      - {id: 184, cat: Movies, desc: "4K Outros"}
-      - {id: 176, cat: Movies, desc: "4K Policial"}
-      - {id: 187, cat: Movies, desc: "4K Religioso"}
-      - {id: 174, cat: Movies, desc: "4K Romance"}
-      - {id: 181, cat: Movies, desc: "4K Shows"}
-      - {id: 182, cat: Movies, desc: "4K Suspense"}
-      - {id: 189, cat: Movies, desc: "4K Terror"}
-      - {id: 183, cat: Movies, desc: "4K Thriller"}
-      
-      #ANIME
-      - {id: 11, cat: TV/Anime, desc: "Anime"}
-      
-      #PC-APPS
-      - {id: 2, cat: PC, desc: "PC APPS - Linux"}
-      - {id: 3, cat: PC, desc: "PC APPS - Mac"}
-      - {id: 33, cat: PC, desc: "PC APPS - Portateis"}
-      - {id: 1, cat: PC, desc: "PC APPS - Windows"}
-      
-      #BD-R           
-      - {id: 140, cat: Movies, desc: "BD-R Autorado"}
-      - {id: 119, cat: Movies, desc: "BD-R"}
-      
-      #MOBILE        
-      - {id: 163, cat: Other, desc: "Mobile App/Jogos-Android"}
-      - {id: 164, cat: Other, desc: "Mobile App/Jogos-iPhone"}
-      - {id: 93, cat: Other, desc: "Mobile App/Jogos-Java"}
-      - {id: 169, cat: Other, desc: "Mobile App/Jogos-Outros"}
-      - {id: 168, cat: Other, desc: "Mobile App/Jogos-Win"}
-      - {id: 92, cat: Other, desc: "Mobile Filmes"}
-      - {id: 118, cat: Other, desc: "Mobile Séries"}
-      - {id: 94, cat: Other, desc: "Mobile Wallpapers"}
-      
-      #CARTOON       
-      - {id: 172, cat: TV/Other, desc: "Desenho Animado"}
-      
-      #OTHER           
-      - {id: 4, cat: Other, desc: "Apostilas/Cursos"}
-      - {id: 12, cat: Books, desc: "Diversos"}
-      - {id: 167, cat: Books, desc: "E-book/Livros"}
-      - {id: 7, cat: PC/Games, desc: "Emuladores / Roms"}
-      - {id: 166, cat: Books/Comics, desc: "HQ"}
-      - {id: 165, cat: Books, desc: "Revistas"}
-      
-      #DVD-R          
-      - {id: 41, cat: Movies/SD, desc: "DVD-R Autorado"}
-      - {id: 32, cat: Movies/SD, desc: "DVD-R"}
-      
-      #MOVIES        
-      - {id: 14, cat: Movies, desc: "Filmes Ação"}
-      - {id: 99, cat: Movies, desc: "Filmes Animação"}
-      - {id: 15, cat: Movies, desc: "Filmes Aventura"}
-      - {id: 16, cat: Movies, desc: "Filmes Clássico"}
-      - {id: 17, cat: Movies, desc: "Filmes Comédia"}
-      - {id: 31, cat: Movies, desc: "Filmes Documentário"}
-      - {id: 18, cat: Movies, desc: "Filmes Drama"}
-      - {id: 19, cat: Movies, desc: "Filmes Ficção"}
-      - {id: 20, cat: Movies, desc: "Filmes Guerra"}
-      - {id: 126, cat: Movies, desc: "Filmes Infantil"}
-      - {id: 96, cat: Movies, desc: "Filmes Musical"}
-      - {id: 24, cat: Movies, desc: "Filmes Outros"}
-      - {id: 40, cat: Movies, desc: "Filmes Policial"}
-      - {id: 39, cat: Movies, desc: "Filmes Religioso"}
-      - {id: 30, cat: Movies, desc: "Filmes Romance"}
-      - {id: 22, cat: Movies, desc: "Filmes Suspense"}
-      - {id: 23, cat: Movies, desc: "Filmes Terror"}
-      - {id: 130, cat: Movies, desc: "Filmes Thriller"}
-      - {id: 131, cat: Movies, desc: "Filmes Western"}
-      - {id: 34, cat: Movies, desc: "Filmes x264"}
-      
-      #HD-1080p       
-      - {id: 73, cat: Movies/HD, desc: "Filmes 1080p Ação"}
-      - {id: 87, cat: Movies/HD, desc: "Filmes 1080p Animação"}
-      - {id: 74, cat: Movies/HD, desc: "Filmes 1080p Aventura"}
-      - {id: 75, cat: Movies/HD, desc: "Filmes 1080p Clássico"}
-      - {id: 76, cat: Movies/HD, desc: "Filmes 1080p Comédia"}
-      - {id: 77, cat: Movies/HD, desc: "Filmes 1080p Documentário"}
-      - {id: 78, cat: Movies/HD, desc: "Filmes 1080p Drama"}
-      - {id: 79, cat: Movies/HD, desc: "Filmes 1080p Ficção"}
-      - {id: 80, cat: Movies/HD, desc: "Filmes 1080p Guerra"}
-      - {id: 127, cat: Movies/HD, desc: "Filmes 1080p Infantil"}
-      - {id: 97, cat: Movies/HD, desc: "Filmes 1080p Musical"}
-      - {id: 63, cat: Movies/HD, desc: "Filmes 1080p Outros"}
-      - {id: 82, cat: Movies/HD, desc: "Filmes 1080p Policial"}
-      - {id: 83, cat: Movies/HD, desc: "Filmes 1080p Religioso"}
-      - {id: 84, cat: Movies/HD, desc: "Filmes 1080p Romance"}
-      - {id: 88, cat: Movies/HD, desc: "Filmes 1080p Shows"}
-      - {id: 85, cat: Movies/HD, desc: "Filmes 1080p Suspense"}
-      - {id: 86, cat: Movies/HD, desc: "Filmes 1080p Terror"}
-      - {id: 132, cat: Movies/HD, desc: "Filmes 1080p Thriller"}
-      - {id: 135, cat: Movies/HD, desc: "Filmes 1080p Western"}
-      
-      #HD-720p        
-      - {id: 58, cat: Movies/HD, desc: "Filmes 720p Ação"}
-      - {id: 89, cat: Movies/HD, desc: "Filmes 720p Animação"}
-      - {id: 60, cat: Movies/HD, desc: "Filmes 720p Aventura"}
-      - {id: 61, cat: Movies/HD, desc: "Filmes 720p Clássico"}
-      - {id: 62, cat: Movies/HD, desc: "Filmes 720p Comédia"}
-      - {id: 72, cat: Movies/HD, desc: "Filmes 720p Documentário"}
-      - {id: 64, cat: Movies/HD, desc: "Filmes 720p Drama"}
-      - {id: 65, cat: Movies/HD, desc: "Filmes 720p Ficção"}
-      - {id: 66, cat: Movies/HD, desc: "Filmes 720p Guerra"}
-      - {id: 129, cat: Movies/HD, desc: "Filmes 720p Infantil"}
-      - {id: 98, cat: Movies/HD, desc: "Filmes 720p Musical"}
-      - {id: 59, cat: Movies/HD, desc: "Filmes 720p Outros"}
-      - {id: 70, cat: Movies/HD, desc: "Filmes 720p Policial"}
-      - {id: 57, cat: Movies/HD, desc: "Filmes 720p Religioso"}
-      - {id: 71, cat: Movies/HD, desc: "Filmes 720p Romance"}
-      - {id: 90, cat: Movies/HD, desc: "Filmes 720p Shows"}
-      - {id: 68, cat: Movies/HD, desc: "Filmes 720p Suspense"}
-      - {id: 69, cat: Movies/HD, desc: "Filmes 720p Terror"}
-      - {id: 134, cat: Movies/HD, desc: "Filmes 720p Thriller"}
-      - {id: 137, cat: Movies/HD, desc: "Filmes 720p Western"}
-      
-      #GAMES          
-      - {id: 6, cat: Console, desc: "Jogos Console"}
-      - {id: 51, cat: PC/Games, desc: "Jogos Emuladores"}
-      - {id: 44, cat: Console, desc: "Jogos Gamecube"}
-      - {id: 43, cat: Console/NDS, desc: "Jogos Nintendo DS"}
-      - {id: 52, cat: Console, desc: "Jogos Outros"}
-      - {id: 5, cat: PC/Games, desc: "Jogos PC"}
-      - {id: 47, cat: Console, desc: "Jogos PS2"}
-      - {id: 48, cat: Console, desc: "Jogos PS3"}
-      - {id: 170, cat: Console, desc: "Jogos PS4"}
-      - {id: 46, cat: Console, desc: "Jogos PSP"}
-      - {id: 45, cat: Console/Wii, desc: "Jogos Wii"}
-      - {id: 49, cat: Console/Xbox, desc: "Jogos XBOX"}
-      - {id: 50, cat: Console/Xbox 360, desc: "Jogos XBOX360"}
-      - {id: 171, cat: Console, desc: "Jogos XBOXONE"}
-      
-      #MUSIC          
-      - {id: 29, cat: Audio, desc: "Musica Discografia"}
-      - {id: 28, cat: Audio, desc: "Musica Gospel"}
-      - {id: 139, cat: Audio, desc: "Musica Infantil"}
-      - {id: 27, cat: Audio, desc: "Musica Internacionais"}
-      - {id: 26, cat: Audio, desc: "Musica Nacionais"}
-      - {id: 91, cat: Audio, desc: "Musica Outros"}
-      
-      #TV-SERIES      
-      - {id: 35, cat: TV/HD, desc: "Séries HD"}
-      - {id: 8, cat: TV, desc: "Séries"}
-      
-      #SHOWS          
-      - {id: 13, cat: Audio/Video, desc: "Show"}
-      - {id: 56, cat: Audio/Video, desc: "Video Clipes"}
-      
-      #TV             
-      - {id: 53, cat: TV, desc: "Entretenimento"}
-      - {id: 54, cat: TV/Sport, desc: "Esportes"}
-      - {id: 138, cat: TV, desc: "Infantil"}
-      - {id: 55, cat: TV, desc: "Jornalismo"}
-      
-      #XXX            
-      - {id: 36, cat: XXX/Other, desc: "Anime Hentai"}
-      - {id: 10, cat: XXX, desc: "Filmes Adultos"}
-      - {id: 37, cat: XXX/Other, desc: "XXX Fotos"}
-      - {id: 95, cat: XXX/Other, desc: "XXX Revistas"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    test:
-      path: torrents.php
-      selector: div:has(a[href*="account-logout.php"])
-  search:
-    paths:
-      - path: torrents-search.php
-    keywordsfilters: 
-      - name: re_replace
-        args: ["[Ss][0-9]{2}[Ee][0-9]{2,3}", ""] # remove season and episode from search
-      - name: re_replace
-        args: ["[^a-zA-Z0-9]+", "%"]
-    inputs:
-      search: "{{ .Keywords }}"
-    rows:
-      selector: table[class^="ttable_headinner"] > tbody > tr:has(a[href^="torrents-details.php?id="])
-      filters:
-        - name: andmatch
-    fields:
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      is_anime:
-        optional: true
-        selector: a[href^="torrents.php?cat=11"]
-        attribute: href
-      title_anime:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-        - name: re_replace
-          args: ["(Ep[\\.]?[ ]?)|([S]\\d\\d[Ee])", "E"]
-      title_normal:
-        selector: a[href^="torrents-details.php?id="]
-        filters:
-        - name: re_replace
-          args: ["^(.*)[ ]([Ss][0-9]{2}[Ee][0-9]{2,3}).*(?:(?:\\((.*?)\\)))(.*$)", "$3 $2 $4"] # Convert series title from "Translated Name SXXEXX (Original Name) [Other stuffs]" to "Original Name SXXEXX [Other stuffs]"
-        - name: re_replace
-          args: ["^(.*)[ ].*(?:(?:\\((.*?)\\)))(.*$)", "$2 $3"] # Convert movies title from "Translated Name (Original Name) [Other stuffs]" to "Original Name [Other stuffs]"
-      title:
-        text: "{{if .Result.is_anime }}{{ .Result.title_anime }}{{else}}{{ .Result.title_normal }}{{end}}"
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-        - name: replace
-          args: ["torrents-details.php", "download.php"]
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      date:
-        selector: td:nth-child(2) > span
-        filters:
-        - name: replace
-          args: ["(", ""]
-        - name: replace
-          args: [")", ""]
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(4) > font > b
-      seeders:
-        selector: td:nth-child(5) > b > font
-      leechers:
-        selector: td:nth-child(6) > font > b
-      downloadvolumefactor:
-        case:
-          "img[alt=\"[free]\"]": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "img[alt=\"[+UP x2]\"]": "2"
-          "*": "1"

src/Jackett.Common/Definitions/baibako.yml

@@ -0,0 +1,149 @@
+---
+  site: baibako
+  name: BaibaKo
+  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - http://baibako.tv/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.login2
+    test:
+      path: /
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      search: "{{.Keywords }}"
+      # 0 active 1 incldead 2 onlydead 3 gold 4 seedfree
+      incldead: "1"
+    keywordsfilters:
+      - name: re_replace
+        args: ["[s|S](\\d+)[e|E][\\d]+", "/s$1"]
+    rows:
+      selector: table > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: re_replace
+            args: ["[\\/]+", ""]
+          - name: replace
+            args: [" (Золото)", ""]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: re_replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HD720p", "HD 720p"]
+          - name: replace
+            args: ["HDR720p", "HD 720p"]
+          - name: replace
+            args: ["HD1080p", "HD 1080p"]
+          - name: replace
+            args: ["HDR1080p", "HD 1080p"]
+          - name: re_replace
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: append
+            args: " - rus"
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        text: 1
+      banner:
+        selector: img[src^="/posters/"]
+        attribute: src
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: small
+        filters:
+          - name: replace
+            args: ["Загружена: ", ""]
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["января", "January"]
+          - name: replace
+            args: ["февраля", "February"]
+          - name: replace
+            args: ["марта ", "March"]
+          - name: replace
+            args: ["апреля", "April"]
+          - name: replace
+            args: ["мая", "May"]
+          - name: replace
+            args: ["июня", "June"]
+          - name: replace
+            args: ["июля", "July"]
+          - name: replace
+            args: ["августа", "August"]
+          - name: replace
+            args: ["сентября", "September"]
+          - name: replace
+            args: ["октября", "October"]
+          - name: replace
+            args: ["ноября", "November"]
+          - name: replace
+            args: ["декабря", "December"]
+          - name: dateparse
+            args: "2 January 2006 15:04:05"
+      files:
+        selector: td:nth-last-child(5)
+      size:
+        selector: td:nth-last-child(3)
+      seeders:
+        selector: td:nth-last-child(2)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-last-child(2)
+        filters:
+          - name: split
+            args: ["|", 1]
+      grabs:
+        selector: td:nth-last-child(1)
+      downloadvolumefactor:
+        case:
+          "a[href^=\"details.php?id=\"]:contains(\"(Золото)\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -0,0 +1,100 @@
+---
+  site: beyond-hd
+  name: Beyond-HD
+  description: "Without BeyondHD, your HDTV is just a TV"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://beyond-hd.me/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: div.has-error
+    test:
+      path: torrents
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tmdb: ""
+      sorting: created_at
+      direction: desc
+      qty: 100
+    rows:
+      selector: table > tbody > tr
+    fields:
+      _category:
+        selector: a[href*="/categories/"]
+        optional: true
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      category:
+        text: "{{if .Result._category}}{{.Result._category}}{{else}}1{{end}}"
+      title:
+        selector: a.torrent-name
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.torrent-name
+        attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      date:
+        selector: td:not(a[href$="/history"]) span.text-orange
+        filters:
+          - name: timeago
+      size:
+        selector: td span.text-blue
+      seeders:
+        selector: a[href$="/peers"] span.text-green
+      leechers:
+        selector: a[href$="/peers"] span.text-red
+      grabs:
+        selector: a[href$="/history"]
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          i[data-original-title="100% Free"]: "0"
+          i[data-original-title="100% Free (Limited UL)"]: "0"
+          i[data-original-title="25% Promo"]: "0.75"
+          i[data-original-title="50% Promo"]: "0.5"
+          i[data-original-title="75% Promo"]: "0.25"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+# UNIT3D

src/Jackett.Common/Definitions/bigtower.yml

@@ -140,21 +140,21 @@
       size:
         selector: td:nth-last-child(2)
       date:
-        selector: td:nth-last-child(7)
+        selector: td:nth-last-child(8)
         filters:
           - name: append
             args: " +01:00"
           - name: dateparse
             args: "02/01/2006 -07:00"
       grabs:
-        selector: td:nth-last-child(4)
+        selector: td:nth-last-child(5)
         filters:
           - name: replace
             args: ["---", "0"]
       seeders:
-        selector: td:nth-last-child(6)
+        selector: td:nth-last-child(7)
       leechers:
-        selector: td:nth-last-child(5)
+        selector: td:nth-last-child(6)
       downloadvolumefactor:
         case:
           img[alt="Gold 100% Free"]: "0"

src/Jackett.Common/Definitions/bithorlo.yml

@@ -53,6 +53,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings:
     - name: cookie
@@ -73,7 +74,7 @@
       - path: browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
     rows:
       selector: tr[class^="browse"]
     fields:

src/Jackett.Common/Definitions/bithumen.yml

@@ -91,7 +91,7 @@
         selector: a[href^="details.php?id="]
         attribute: href
       imdb:
-        selector: a[href^="http://anonym.to/?http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       banner:
         selector: a[onmouseover^="bithumen.UI.images.coverShow"]

src/Jackett.Common/Definitions/bitspyder.yml

@@ -21,7 +21,7 @@
       - {id: 63, cat: Books, desc: "College"}
       - {id: 53, cat: Books, desc: "Cooking"}
       - {id: 42, cat: Books, desc: "Documentary"}
-      - {id: 37, cat: Books, desc: "e-Books"}
+      - {id: 37, cat: Books/Ebook, desc: "e-Books"}
       - {id: 65, cat: Books, desc: "Engineering"}
       - {id: 54, cat: Books, desc: "Health-Fitness"}
       - {id: 64, cat: Books, desc: "Kids"}
@@ -29,27 +29,26 @@
       - {id: 49, cat: Books, desc: "Linux CBTs"}
       - {id: 43, cat: Books, desc: "Lynda.com"}
       - {id: 57, cat: Books/Magazines, desc: "Magazines"}
-      - {id: 71, cat: Books, desc: "Magic"}
+      - {id: 71, cat: Books, desc: "Pluralsight"}
       - {id: 60, cat: Books, desc: "Medical"}
       - {id: 44, cat: Books, desc: "Misc Learning"}
       - {id: 51, cat: Books, desc: "Music Learning"}
       - {id: 41, cat: Books, desc: "Others"}
       - {id: 52, cat: Books, desc: "Photography"}
-      - {id: 35, cat: Books, desc: "PPT 'n Docs"}
-      - {id: 38, cat: Books, desc: "Religion"}
+      - {id: 35, cat: Books, desc: "Developer"}
+      - {id: 38, cat: Books, desc: "Udemy"}
       - {id: 68, cat: Books, desc: "Self Growth"}
       - {id: 72, cat: Books, desc: "Templates"}
-      - {id: 58, cat: Books, desc: "Total Training"}
-      - {id: 45, cat: Books, desc: "Trainsignal"}
-      - {id: 59, cat: Books, desc: "VTC"}
+      - {id: 58, cat: Books, desc: "Packt"}
+      - {id: 45, cat: Books, desc: "Ethical hacking"}
+      - {id: 59, cat: Books, desc: "WEB | SocialMedia"}
 
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
 
   login:
-    path: processid.php
+    path: processf.php
     method: post
     inputs:
       username: "{{ .Config.username }}"
@@ -64,8 +63,11 @@
       - path: browse.php
         method: post
     inputs:
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      # 0 title 1 default
+      scope: 1
     rows:
       selector: table > tbody > tr[class]
       filters:

src/Jackett.Common/Definitions/blutopia.yml

@@ -27,9 +27,19 @@
       password: "{{ .Config.password }}"
       remember: 1
     error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
+      selector: a[href$="/logout"]
+      
+  ratio:
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -43,6 +53,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -70,14 +81,17 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -116,7 +130,7 @@
           "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
           "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
           "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
@@ -126,4 +140,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.2
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/booktracker.yml

@@ -0,0 +1,74 @@
+---
+  site: booktracker
+  name: BookTracker
+  description: "BookTracker is a RUSSIAN Semi-Private Torrent Tracker for EBOOKS"
+  language: ru-ru
+  type: private
+  encoding: UTF-8
+  links:
+    - https://booktracker.org/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Books/Ebook, desc: "Ebooks"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action$="/login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: "index.php"
+      autologin: 1
+    selectorinputs:
+      cookie_test:
+        selector: input[name="cookie_test"]
+        attribute: value
+    error:
+      - selector: h4.warnColor1
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    inputs:
+      nm: "{{ .Keywords }}"
+      o: 1
+      s: 2
+      tm: -1
+      sns: -1
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
+
+    fields:
+      title:
+        selector: a.tLink
+      details:
+        selector: a.tLink
+        attribute: href
+      download:
+        selector: a[href^="./download.php?id="]
+        attribute: href
+      category:
+        text: 1
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/btdb.yml

@@ -29,9 +29,10 @@
   search:
     paths:
       - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time{{else}}recent{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=2{{else}}{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=3{{else}}{{end}}"
-      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=4{{else}}{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=2{{else}}recent?page=2{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=3{{else}}recent?page=3{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=4{{else}}recent?page=4{{end}}"
+      - path: "{{if .Keywords}}?search={{ .Keywords}}&sort=time&page=5{{else}}recent?page=5{{end}}"
     rows:
       selector: li[class$="item"]
     fields:
@@ -52,6 +53,8 @@
         selector: div[class$="info"] span:nth-of-type(2)
       date:
         selector: div[class$="info"] span:nth-of-type(3)
+        filters:
+          - name: timeago
       grabs:
         selector: div[class$="info"] span:nth-of-type(4)
       seeders:

src/Jackett.Common/Definitions/btdigg.yml

@@ -25,21 +25,8 @@
   search:
     # https://btdig.com/search?q=test&order=2
     # only 10 results per page
-    # https://btdig.com/search?q=test&p=1&order=2
     paths:
       - path: search
-      - path: search
-        inputs:
-            p: 1
-      - path: search
-        inputs:
-            p: 2
-      - path: search
-        inputs:
-            p: 3
-      - path: search
-        inputs:
-            p: 4
     inputs:
       q: "{{if .Keywords }}{{.Keywords}}{{else}}test{{end}}"
       order: 2
@@ -77,4 +64,4 @@
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
-        text: "1"
+        text: "1"

src/Jackett.Common/Definitions/btgigs.yml

@@ -89,7 +89,7 @@
             args: "{{ .Result.description }}"
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
       date:
         selector: td:nth-child(5)
         filters:

src/Jackett.Common/Definitions/btkitty.yml

@@ -1,78 +0,0 @@
----
-  site: btkitty
-  name: BTKitty
-  description: "BTKITTY is a Public BitTorrent DHT search engine."
-  language: en-us
-  type: public
-  encoding: UTF-8
-  followredirect: true
-  links:
-    -  http://btkitty.pet/
-  legacylinks:
-    -  https://cnbtkitty.org/
-    -  http://cnbtkitty.org/
-    -  https://cnbtkitty.com/
-    -  http://cnbtkitty.com/
-    -  https://cnbtkitty.me/
-    -  http://cnbtkitty.me/
-    -  http://cnbtkitty.ws/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Other, desc: "Other"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: info
-      type: info
-      default: BTKitty does not use categories. In your software Indexer settings, set the category to 100001.
-
-  download:
-    selector: a[href^="magnet:?"]
-
-  search:
-    paths:
-      - path: /
-        method: post
-        followredirect: true
-    inputs:
-      keyword: "{{if .Keywords }}{{.Keywords}}{{else}}test{{end}}"
-      hidden: "true"
-    rows:
-      selector: dl.list-con
-      filters:
-        - name: andmatch
-    fields:
-      title:
-        selector: dt a
-      category:
-        text: "1"
-      details:
-        selector: dt a
-        attribute: href
-      download:
-        selector: dt a
-        attribute: href
-      size:
-        selector: dd span:nth-of-type(4) b
-      files:
-        selector: dd span:nth-of-type(5) b
-      date:
-        selector: dd span:nth-of-type(3) b
-        filters:
-          - name: dateparse
-            args: "2006-01-02"
-      grabs:
-        selector: dd span:nth-of-type(7) b
-      seeders:
-        text: "1"
-      leechers:
-        text: "1"
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/btschool.yml

@@ -0,0 +1,117 @@
+---
+  site: btschool
+  name: BTSCHOOL
+  description: "BTSCHOOL is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://pt.btschool.club/
+
+  caps:
+    categorymappings:
+      - {id: 405, cat: Movies, desc: "电影/Movies"}
+      - {id: 406, cat: TV, desc: "连续剧/TV-Series"}
+      - {id: 407, cat: TV/Anime, desc: "动漫/Anime"}
+      - {id: 408, cat: TV/Documentary, desc: "纪录片/Documentary"}
+      - {id: 412, cat: TV, desc: "综艺/TV-Show"}
+      - {id: 404, cat: PC, desc: "软件/Software"}
+      - {id: 402, cat: TV, desc: "资料/Education"}
+      - {id: 411, cat: PC/Games, desc: "游戏/Game"}
+      - {id: 409, cat: Audio, desc: "音乐/Music"}
+      - {id: 410, cat: TV/Sport, desc: "体育/Sports"}
+      - {id: 415, cat: Other, desc: "其他/Other"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    captcha:
+      type: image
+      selector: img[alt="CAPTCHA"]
+      input: imagestring
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("登錄失敗"))
+      - selector: td.embedded:has(h2:contains("失败"))
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+        
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 incldead 1 active 2 justdead
+      incldead: 0
+      # promotion: 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x 50% 7 30%
+      spstate: 0
+      # 0 all 1 bookmarked 2 not
+      inclbookmarked: 0
+      # 0 title 1 descr 3 uploaded 4 imdb
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 and 1 or 2 exact
+      search_mode: 0
+      sort: 4
+      type: desc
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[title][href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[title][href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(4) > span[title]
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      size:
+        selector: td.rowfollow:nth-child(5)
+      seeders:
+        selector: td.rowfollow:nth-child(6)
+      leechers:
+        selector: td.rowfollow:nth-child(7)
+      grabs:
+        selector: td.rowfollow:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img.pro_free: "0"
+          img.pro_free2up: "0"
+          img.pro_50pctdown: "0.5"
+          img.pro_50pctdown2up: "0.5"
+          img.pro_30pctdown: "0.3"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img.pro_50pctdown2up: "2"
+          img.pro_free2up: "2"
+          img.pro_2up: "2"
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a, img
+# NexusPHP

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -18,7 +18,7 @@
     - name: info_results
       type: info
       label: "Search results"
-      default: "For best results, increase the torrents number in your profile to 100.<br />Default is 15."
+      default: "Only the <b>xBtit_Default</b> style is supported with this indexer.<br />For best results, increase the torrents number in your profile to 100.<br />Default is 15."
 
   caps:
     categorymappings:
@@ -88,7 +88,7 @@
         attribute: href
       imdb:
         optional: true
-        selector: a[href*="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
         filters:
           # http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');

src/Jackett.Common/Definitions/casatorrent.yml

@@ -6,7 +6,10 @@
   type: private
   encoding: UTF-8
   links:
+    - https://teamctgame.xyz/
+  legacylinks:
     - https://teamctgame.co/
+    - http://teamctgame.xyz/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://casstudio.tk/
+  legacylinks:
     - https://casstudio.tv/
 
   caps:

src/Jackett.Common/Definitions/ccfbits.yml

@@ -91,7 +91,7 @@
         attribute: href
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       files:
         selector: a[href$="&filelist=1"]

src/Jackett.Common/Definitions/channelx.yml

@@ -28,7 +28,9 @@
       password: "{{ .Config.password }}"
       remember: 1
     error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
       selector: a[href$="/logout"]
@@ -40,9 +42,6 @@
       - name: regexp
         args: "Ratio : (\\d+)"
 
-  download:
-    selector: a[href*="/download/"]
-
   search:
     paths:
       - path: filterTorrents
@@ -55,6 +54,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -70,7 +70,7 @@
       title:
         selector: a.view-torrent
       download:
-        selector: a[href*="/download_check/"]
+        selector: a[href*="/download/"]
         attribute: href
       details:
         selector: a.view-torrent
@@ -82,14 +82,17 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -128,7 +131,7 @@
           "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
           "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
           "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
@@ -138,4 +141,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.2
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/cinefilhd.yml

@@ -1,142 +0,0 @@
----
-  site: cinefilhd
-  name: CiNEFiLHD
-  description: "CiNEFiLHD is a Private Torrent Tracker for MOVIES / TV /  MUSIC"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://www.cinefilhd.org/
-
-  caps:
-    categorymappings:
-      - {id: 37, cat: Movies/HD, desc: " Internal/HD-1080p"}
-      - {id: 17, cat: Movies/HD, desc: " Internal/HD-720p"}
-      - {id: 30, cat: TV/HD, desc: " Internal/HDTV"}
-      - {id: 15, cat: Movies/HD, desc: " Internal/mHD"}
-      - {id: 40, cat: Movies, desc: " Internal/Mp4"}
-      - {id: 26, cat: Movies, desc: " Internal/Remux"}
-      - {id: 45, cat: Movies/WEBDL, desc: " Internal/WEB-DL"}
-      - {id: 25, cat: Movies/3D, desc: " Movies/3D-Ou"}
-      - {id: 16, cat: Movies/3D, desc: " Movies/3D-SbS"}
-      - {id: 5, cat: Movies/BluRay, desc: " Movies/BluRay"}
-      - {id: 38, cat: Movies/HD, desc: " Movies/HD-1080p"}
-      - {id: 10, cat: Movies/HD, desc: " Movies/HD-720p"}
-      - {id: 29, cat: Movies/HD, desc: " Movies/mHD"}
-      - {id: 41, cat: Movies, desc: " Movies/Mp4"}
-      - {id: 39, cat: Movies, desc: " Movies/Remux"}
-      - {id: 44, cat: Movies/WEBDL, desc: " Movies/WEB-DL"}
-      - {id: 23, cat: Audio/Lossless, desc: " Lossless"}
-      - {id: 14, cat: Audio/MP3, desc: " MP3-Packs"}
-      - {id: 22, cat: Audio/MP3, desc: " Music-MP3"}
-      - {id: 43, cat: Audio/Video, desc: " Music/1080p"}
-      - {id: 42, cat: Audio/Video, desc: " Music/720p"}
-      - {id: 12, cat: TV/HD, desc: " HDTV-Packs"}
-      - {id: 21, cat: TV/HD, desc: " Movies/HDTV"}
-
-    modes:
-      search: [q, imdbid]
-      tv-search: [q, season, ep, imdbid]
-      movie-search: [q, imdbid]
-
-  login:
-    path: takelogin.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      submitme: "LOGIN"
-      returnto: /
-    error:
-      - selector: h2:contains("failed")
-        message:
-          selector: td.colhead2
-    test:
-      path: browse.php
-      selector: :has(a[href^="logout.php?hash_please="])
-
-  ratio:
-    path: browse.php
-    selector: div div font:contains("Ratio:")
-    filters:
-      - name: regexp
-        args: "Ratio:\\s(.*?)\\s"
-
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      # title descr genre all
-      searchin: "{{ if .Query.IMDBID }}descr{{else}}title{{end}}"
-      # 0=active 1=incl dead 2=only dead
-      incldead: 1
-      # 0=no 1=yes
-      only_free: 0
-    rows:
-      selector: table.mainouter table > tbody > tr:has(a[href^="details.php?id="]), table.mainouter table > tbody > tr[id^="kdescr"]
-      after: 1
-    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      details:
-        selector: a[href^="details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      download:
-        selector: a[href^="details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["details.php?id=", "download.php?torrent="]
-      banner:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-            #  onmouseover="Tip('<img class=\'pup\' src=\'https://image.tmdb.org/t/p/original/x96AdPlpl4MjUP2DeUhRJifhCMd.jpg\' width=
-          - name: regexp
-            args: src=\\'(.*?)\\'
-      imdb:
-        optional: true
-        selector: a[href*="www.imdb.com/title/tt"]
-      files:
-        selector: td:nth-child(4)
-      # 2 flavours of dates
-      date:
-        # Today<br /> 10:20 AM
-        # Yesterday<br /> 08:03 PM
-        optional: true
-        selector: td:nth-child(6):contains("day")
-      date:
-        # Feb 14 2019<br /> 10:20 AM
-        optional: true
-        selector: td:nth-child(6):not(:contains("day"))
-        filters:
-          - name: dateparse
-            args: "Jan 2 2006 03:04 pm"
-      size:
-        selector: td:nth-child(7)
-      grabs:
-        selector: td:nth-child(8)
-        filters:
-          - name: regexp
-            args: ([\d,]+)
-      seeders:
-        selector: td:nth-child(9)
-      leechers:
-        selector: td:nth-child(10)
-      downloadvolumefactor:
-        case:
-          tr.freeleech_color: "0"
-          tr.highlight: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
-# U-232 v3

src/Jackett.Common/Definitions/concen.yml

@@ -0,0 +1,62 @@
+---
+  site: concen
+  name: ConCen
+  description: "ConCen (Conspiracy Central) is a Public conspiracy related torrent index"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://concen.org/
+
+  caps:
+    categories:
+      1: Other
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: "torrents/concen.org/content/ufos-extraterrestrials-and-classified-free-energy-pack"
+    inputs:
+      title_op: "allwords"
+      title: "{{.Keywords}}"
+      title_1_op: "not"
+      title_1: ""
+      seeds: "All"
+
+    rows:
+      selector: table  > tbody > tr
+    fields:
+      title:
+        selector: td.views-field-title a
+      category:
+        text: 1
+      details:
+        selector: td.views-field-title a
+        attribute: href
+      download:
+        selector: td.views-field-field-torrent a
+        attribute: href
+      magnet:
+        selector: td.views-field-name a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "magnet:"
+      date:
+        selector: td.views-field-created
+      size:
+        selector: td.views-field-size
+      seeders:
+        selector: td.views-field-seeds
+      leechers:
+        selector: td.views-field-peers 
+      grabs:
+        selector: td.views-field-completed 
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/concertos.yml

@@ -0,0 +1,101 @@
+---
+  site: concertos
+  name: Concertos
+  description: "Concertos - Private site for Live Concerts with Strict Quality Control"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://concertos.live/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: TV, desc: "Live Concert"}
+      - {id: 2, cat: Audio/Video, desc: "Music Video"}
+      - {id: 4, cat: TV, desc: "Music Documentary"}
+      - {id: 5, cat: Audio/Lossless, desc: "Pure Audio"}
+      - {id: 7, cat: TV, desc: "Opera"}
+      - {id: 8, cat: TV, desc: "Musical"}
+      - {id: 9, cat: Audio, desc: "Podcast"}
+
+
+    modes:
+      search: [q, imdbid]
+      tv-search: [q, imdbid]
+      movie-search: [q, imdbid]
+      music-search: [q, imdbid]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: form[action$="/login"] .text-red
+    test:
+      path: /
+      selector: a[href$="/logout"]
+  ratio:
+    path: /
+    selector: span:has(i.fa-percent)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: torrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      title: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      imdb: "{{ .Query.IMDBIDShort }}"
+      order_by: created_at
+      direction: desc
+    rows:
+      selector: table > tbody > tr
+    fields:
+      category:
+        selector: a[href*="?category_"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "category_(\\d+)"
+      title:
+        selector: a[href*="/torrent/"]
+      details:
+        selector: a[href*="/torrent/"]
+        attribute: href
+      download:
+        selector: a[href*="/torrent/"]
+        attribute: href
+        filters:
+          - name: append
+            args: "/download"
+      size:
+        selector: td.torrents__size
+      date:
+        selector: td.torrents__age
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      grabs:
+        selector: td:nth-last-child(1)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      downloadvolumefactor:
+        case:
+          i.fa-star: 0 # Freeleech
+          i.fa-gem: 0 # Double Upload
+          i.fa-certificate: 0 # Featured
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          i.fa-certificate: 2 # Featured
+          i.fa-gem: 2 # Double Upload
+          "*": "1"
+# UNIT3D

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.cpasbien.vg/
+    - https://www.cpasbien.lol/
   legacylinks:
     - http://www.cpasbiens.cc/
     - http://www.cpabien.cm/
@@ -35,6 +35,7 @@
     - https://www.cpabien.link/
     - https://www.cpasbiens.cz/
     - https://www.cpasbiens.bz/
+    - https://www.cpasbien.vg/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -7,10 +7,11 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://cpasbiens.cm/
+    - https://www1.cpasbiens.cm/
   legacylinks:
     - https://www1.cpasbiens.ws/
     - https://www2.cpasbiens.ws/
+    - https://cpasbiens.cm/
 
   caps:
     categorymappings:
@@ -30,7 +31,7 @@
   settings: []
 
   download:
-    selector: div.btn-download a
+    selector: a[href^="magnet:"]
     attribute: href
 
   search:
@@ -87,6 +88,9 @@
             args: [ "To", "000000000000"]
           - name: replace
             args: [ "X", "" ]
+            # this is for the search with keywords which returns sizes nnnnn.n without unit indicator.
+          - name: re_replace
+            args: [ "(\\d+)\\.\\d", "$1 MB"]
       date:
         text: "now"
       seeders:

src/Jackett.Common/Definitions/crazyhd.yml

@@ -0,0 +1,177 @@
+---
+  site: crazyhd
+  name: CrazyHD
+  description: "CrazyHD is a BANGLADESHI Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.crazyhd.com/
+
+  caps:
+    categorymappings:
+      # Movies
+      - {id:  16, cat: Movies/BluRay, desc: "Movies English Bluray"}
+      - {id:  11, cat: Movies/DVD, desc: "Movies English DVD-RIP"}
+      - {id:  14, cat: Movies, desc: "Movies English CAM"}
+      - {id:  60, cat: Movies/WEBDL, desc: "Movies English HD/WEBRIP"}
+      - {id:  19, cat: Movies/DVD, desc: "Movies Hindi DVDRIP"}
+      - {id:  52, cat: Movies/BluRay, desc: "Movies Hindi Blu Ray"}
+      - {id:  18, cat: Movies/DVD, desc: "Movies Hindi PreDVD"}
+      - {id:  17, cat: Movies, desc: "Movies Hindi CAM"}
+      - {id:  42, cat: Movies, desc: "Movies Tamil"}
+      - {id:  65, cat: Movies/WEBDL, desc: "Movies Hindi Webrip/HDrip"}
+      - {id:  24, cat: Movies, desc: "Movies UNRATED"}
+      - {id:  53, cat: Movies/Foreign, desc: "Movies Other Foreign"}
+      - {id:  64, cat: Movies, desc: "Movies Animated"}
+      - {id:  45, cat: Movies, desc: "Movies Trailers"}
+      - {id:  93, cat: Movies, desc: "Movies Dual Movies"}
+      - {id:  59, cat: Movies, desc: "Movies Pack"}
+      - {id:  94, cat: Movies/UHD, desc: "Movies 4k"}
+      - {id:  62, cat: Movies/3D, desc: "Movies 3D"}
+      # TV
+      - {id:  34, cat: TV, desc: "TV English Series"}
+      - {id:  57, cat: TV, desc: "TV Bangla series"}
+      - {id:  58, cat: TV, desc: "TV Hindi series"}
+      - {id:  28, cat: TV/Sport, desc: "TV Sports"}
+      - {id:  29, cat: TV/Documentary, desc: "TV Documentary"}
+      - {id:  95, cat: TV, desc: "TV Other Language"}
+      # Games
+      - {id:  3, cat: PC/Games, desc: "Games PC"}
+      - {id:  75, cat: PC/Phone-Android, desc: "Games Android"}
+      - {id:  77, cat: PC/Phone-IOS, desc: "Games Ipad/Iphone"}
+      - {id:  79, cat: PC/Phone-Other, desc: "Games Other Platforms"}
+      - {id:  61, cat: PC/Games, desc: "Games trailer"}
+      - {id:  90, cat: Console/PS4, desc: "Games Ps4"}
+      - {id:  86, cat: Console/PS3, desc: "Games xbox / ps3"}
+      - {id:  92, cat: PC/Games, desc: "Games nrated"}
+      # Software
+      - {id:  7, cat: PC/0day, desc: "Software Windows"}
+      - {id:  20, cat: PC/Phone-Android, desc: "Software Android Apps"}
+      - {id:  83, cat: PC/Phone-IOS, desc: "Software Iphone Apps"}
+      - {id:  39, cat: PC, desc: "Software Tutorials"}
+      - {id:  63, cat: PC, desc: "Software Linux"}
+      - {id:  89, cat: PC/Mac, desc: "Software MAC OSX"}
+      #Bangla
+      - {id:  56, cat: Movies, desc: "Movies Bangla"}
+      - {id:  35, cat: Movies, desc: "Movies Bangla Natok"}
+      - {id:  47, cat: Movies, desc: "Movies Indian Bangla"}
+      - {id:  46, cat: Movies, desc: "Movies Eid Natok"}
+      - {id:  67, cat: Audio, desc: "Radio program"}
+      # Anime Anime 
+      - {id:  36, cat: TV/Anime, desc: "Anime Cartoons"}
+      - {id:  40, cat: TV/Anime, desc: "Anime Subbed"}
+      - {id:  51, cat: TV/Anime, desc: "Anime Dubbed"}
+      - {id:  69, cat: TV/Anime, desc: "Anime Dual Audio"}
+      # Music
+      - {id:  25, cat: Audio/MP3, desc: "MP3 English"}
+      - {id:  26, cat: Audio/MP3, desc: "MP3 Bangla"}
+      - {id:  27, cat: Audio/MP3, desc: "MP3 Hindi"}
+      # Music Video
+      - {id:  48, cat: Audio/Video, desc: "MusicVideo English"}
+      - {id:  49, cat: Audio/Video, desc: "MusicVideo Bangla"}
+      - {id:  50, cat: Audio/Video, desc: "MusicVideo Hindi"}
+      # ETC
+      - {id:  6, cat: Books, desc: "Books"}
+      - {id:  4, cat: Other, desc: "Other"}
+      - {id:  44, cat: Other, desc: "Food & Recipes"}
+      - {id:  38, cat: Other, desc: "Pictures"}
+      - {id:  54, cat: Books/Magazines, desc: "Magazine"}
+      - {id:  88, cat: Books/Comics, desc: "Comics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+      music-search: [q]
+
+  login:
+    path: index.php?page=login
+    method: form
+    form: form[action^="index.php?page=login"]
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: tr td span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  ratio:
+    path: index.php
+    selector: span:contains("Ratio ")
+    filters:
+      - name: replace
+        args: ["Ratio ", ""]
+
+  search:
+    paths:
+      - path: index.php?page=searchlist
+        method: post
+    inputs:
+      page: searchlist
+      pages: 1
+      order: 3
+      by: 2
+      # 0=mixed 1=no free 2=50%free 3=100%free 4=50%&100%free
+      gold: 0
+      # 0=filename 1=file&descr 2=descr 3=uploader
+      options: 0
+      # 0=all 1=onlyactive 2=onlydead
+      active: 0
+      category: "{{if .Categories}}{{range .Categories}}{{.}};{{end}}{{else}}0{{end}}"
+      search: "{{ .Keywords }}"
+
+    rows:
+      selector: div.inf-table-row
+    fields:
+      title:
+        selector: div.list-name a.tlink
+        filters:
+           - name: re_replace
+             args: [" [\\(\\=\\!]+(50|100).*?[\\!\\=\\)]+", ""]
+      details:
+        selector: div.list-name a.tlink
+        attribute: href
+      category:
+        selector: div.torrent-cat small a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      banner:
+        selector: div.list-name a.tlink
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?) width="
+      download:
+        selector: div.list-name a.tlink
+        attribute: tfid
+        filters:
+          - name: prepend
+            args: "download.php?id="
+          - name: append
+            args: "&f={{ .Result.title }}.torrent"
+      size:
+        selector: div.torrent-size
+      date:
+        selector: div.torrent-time
+        filters:
+          - name: dateparse
+            args: "02/01/2006"
+      seeders:
+        selector: div.torrent-seeder
+      leechers:
+        selector: div.torrent-peer
+      grabs:
+        selector: div.torrent-completed
+      downloadvolumefactor:
+        case:
+          img[src="gold/gold.gif"]: "0"
+          img[src="gold/silver.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/crazyscorner.yml

@@ -0,0 +1,176 @@
+---
+  site: crazyscorner
+  name: Crazy's Corner
+  description: "Crazy's Corner is a Private Torrent Tracker"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - http://crazys-corner.info/
+
+  caps:
+    categorymappings:
+      - {id: 11, cat: Movies/DVD, desc: "VIP MOVIES DVD-R"}
+      - {id: 34, cat: Movies/3D, desc: "VIP MOVIES 3D-Movies"}
+      - {id: 46, cat: Movies, desc: "VIP MOVIES VENOM-Packs"}
+      - {id: 52, cat: Movies/HD, desc: "VIP MOVIES High Def Mkv/Mp4"}
+      - {id: 70, cat: Movies, desc: "VIP MOVIES Movies Animation"}
+      - {id: 78, cat: TV, desc: "MISC POD CASTS"}
+      - {id: 35, cat: Movies/BluRay, desc: "VIP MOVIES Blu-Ray Movies"}
+      - {id: 36, cat: Movies/DVD, desc: "VIP MOVIES DvD-Rips"}
+      - {id: 37, cat: Movies, desc: "VIP MOVIES Classic-Movies"}
+      - {id: 38, cat: Movies, desc: "VIP MOVIES Classic-Kids-Movies"}
+      - {id: 47, cat: Movies/WEBDL, desc: "VIP MOVIES Webrip/WEB-DL"}
+      - {id: 39, cat: Movies, desc: "VIP MOVIES Movie-Packs"}
+      - {id: 1, cat: Movies, desc: "VIP MOVIES Movies"}
+      - {id: 5, cat: Movies, desc: "VIP MOVIES Anime"}
+      - {id: 32, cat: XXX, desc: "VIP MOVIES Adult-Movies"}
+      - {id: 33, cat: Movies/UHD, desc: "VIP MOVIES 4K-Movies"}
+      - {id: 4, cat: Movies, desc: "VIP MOVIES Misc-Torrents"}
+      - {id: 79, cat: Audio/Audiobook, desc: "MISC AUDIO BOOKS"}
+      - {id: 81, cat: Audio/Other, desc: "MISC RADIO SHOWS"}
+      - {id: 43, cat: TV, desc: "VIP TV Kids-tv"}
+      - {id: 48, cat: TV/Sport, desc: "VIP SPORTS Sport-Misc"}
+      - {id: 97, cat: Movies, desc: "DISNEY Movies"}
+      - {id: 44, cat: PC/ISO, desc: "VIP GAMES Games-Pc-Iso"}
+      - {id: 45, cat: Console, desc: "VIP GAMES All Console Games"}
+      - {id: 41, cat: TV, desc: "VIP TV Tv Episodes"}
+      - {id: 91, cat: Movies, desc: "U.B.D Movies"}
+      - {id: 92, cat: Audio, desc: "U.B.D Music"}
+      - {id: 93, cat: TV, desc: "U.B.D MISC TV"}
+      - {id: 94, cat: Other, desc: "U.B.D MISC"}
+      - {id: 95, cat: Movies, desc: "U.B.D.Classic picks"}
+      - {id: 42, cat: TV, desc: "VIP TV Tv Packs"}
+      - {id: 84, cat: PC, desc: "VIP APPS MISC"}
+      - {id: 2, cat: Audio, desc: "VIP Music"}
+      - {id: 30, cat: Audio, desc: "VIP Music-Packs"}
+      - {id: 31, cat: Audio, desc: "VIP Music-Albums"}
+      - {id: 3, cat: PC/Games, desc: "VIP Misc Games"}
+      - {id: 40, cat: TV, desc: "VIP TV Tv  Single Seasons"}
+      - {id: 7, cat: PC/0day, desc: "VIP Apps Win"}
+      - {id: 8, cat: PC, desc: "VIP Apps Linux"}
+      - {id: 9, cat: PC/Mac, desc: "VIP Apps Mac"}
+      - {id: 15, cat: Books/Ebook, desc: "E Books Adventure"}
+      - {id: 55, cat: Books/Ebook, desc: "E Books Sci-Fi"}
+      - {id: 51, cat: Books/Ebook, desc: "E Books Food/Cook-Books"}
+      - {id: 56, cat: Books/Ebook, desc: "E Books Fantasy/Paranormal"}
+      - {id: 57, cat: Books/Ebook, desc: "E Books Science"}
+      - {id: 58, cat: Books/Ebook, desc: "E Books Wildlife & Pets"}
+      - {id: 59, cat: Books/Ebook, desc: "E Books Hobbies"}
+      - {id: 60, cat: Books/Ebook, desc: "E Books Arts & Crafts"}
+      - {id: 61, cat: Books/Ebook, desc: "E Books Reference/Manuals"}
+      - {id: 62, cat: Books/Ebook, desc: "E Books Outdoors/Gardening"}
+      - {id: 63, cat: Books/Ebook, desc: "E Books Romance"}
+      - {id: 64, cat: Books/Ebook, desc: "E Books Book Packs"}
+      - {id: 65, cat: Books/Ebook, desc: "E Books Thriller"}
+      - {id: 66, cat: Books/Ebook, desc: "E Books Travel"}
+      - {id: 71, cat: Books/Ebook, desc: "E Books Children's Books"}
+      - {id: 16, cat: Books/Ebook, desc: "E Books Biography"}
+      - {id: 17, cat: Books/Ebook, desc: "E Books Fiction & Literature"}
+      - {id: 18, cat: Books/Ebook, desc: "E Books Gay/Lesbian"}
+      - {id: 19, cat: Books/Ebook, desc: "E Books Ghost Stories"}
+      - {id: 20, cat: Books/Ebook, desc: "E Books Health"}
+      - {id: 21, cat: Books/Ebook, desc: "E Books History"}
+      - {id: 22, cat: Books/Ebook, desc: "E Books Horror"}
+      - {id: 23, cat: Books/Ebook, desc: "E Books Humor"}
+      - {id: 24, cat: Books/Ebook, desc: "E Books Nature"}
+      - {id: 26, cat: Books/Ebook, desc: "E Books Magazines"}
+      - {id: 27, cat: Books/Ebook, desc: "E Books War & Crime"}
+      - {id: 28, cat: Books/Ebook, desc: "E Books Comics"}
+      - {id: 29, cat: Books/Ebook, desc: "E Books Misc Books"}
+      - {id: 12, cat: Books/Ebook, desc: "E Books Adult"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: index.php?page=login
+    method: post
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: tr td span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+    # http://crazys-corner.info/index.php?page=torrents&search=captain&category=0&uploader=0&options=0&active=0&gold=0
+      - path: index.php
+    inputs:
+      search: "{{ .Keywords }}"
+      page: "torrents"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      uploader: 0
+      # 0 filename 1 file&descr 2 descr
+      options: 0
+      # 0 all 1 active 2 deadonly
+      active: 0
+      # 0 all 1 classic 2 silver 3 gold 4 silver&gold
+      gold: 0
+    rows:
+      selector: table.lista tr:has(a[href^="index.php?page=torrent-details&id="])
+    fields:
+      category:
+        selector: a[href^="index.php?page=torrents&category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      title:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+      details:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      banner:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?)  width"
+      size:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Size: (.+?)<"
+      date:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Added:(.+?)<"
+          - name: timeago
+      seeders:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Seeders: (\\d+)<"
+      leechers:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Leechers: (\\d+)<"
+      grabs:
+        selector: a[title][href^="index.php?page=torrent-details&id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Done: (\\d+)<"
+      downloadvolumefactor:
+        case:
+          img[src="images/freeleech.gif"]: "0"
+          img[src="gold/gold.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -0,0 +1,191 @@
+---
+  site: crazyspirits
+  name: CrazySpirits
+  description: "Crazy Spirits is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.crazyspirits.com/
+
+  caps:
+    categorymappings:
+      # Documentaire
+      - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
+      # Films
+      - {id: 49, cat: Movies/3D, desc: "Films 3D"}
+      - {id: 1, cat: XXX, desc: "3X"}
+      - {id: 48, cat: XXX, desc: "3X  HD1080p"}
+      - {id: 47, cat: XXX, desc: "3X  HD720p"}
+      - {id: 50, cat: Movies/UHD, desc: "Films 4K"}
+      - {id: 51, cat: Movies/UHD, desc: "Films 4K UHDTV"}
+      - {id: 57, cat: Movies/BluRay, desc: "Films BDRip"}
+      - {id: 56, cat: Movies/BluRay, desc: "Films Blu-Ray"}
+      - {id: 58, cat: Movies/BluRay, desc: "Films BRRip"}
+      - {id: 66, cat: Movies, desc: "Films CamTS"}
+      - {id: 59, cat: Movies/DVD, desc: "Films DVDR"}
+      - {id: 60, cat: Movies/DVD, desc: "Films DVDRip"}
+      - {id: 98, cat: Movies, desc: "Films Film Animées"}
+      - {id: 65, cat: Movies, desc: "Films FSCR"}
+      - {id: 52, cat: Movies/HD, desc: "Films HD 720p"}
+      - {id: 53, cat: Movies/HD, desc: "Films HD1080p"}
+      - {id: 61, cat: Movies/HD, desc: "Films HDRip"}
+      - {id: 63, cat: Movies/HD, desc: "Films MHD"}
+      - {id: 67, cat: Movies, desc: "Films Pack Films"}
+      - {id: 64, cat: Movies, desc: "Films R5"}
+      - {id: 99, cat: Movies, desc: "Films Remux"}
+      - {id: 69, cat: Movies, desc: "Films VO"}
+      - {id: 68, cat: Movies, desc: "Films VostFR"}
+      - {id: 72, cat: Movies/WEBDL, desc: "Films WEB DL"}
+      - {id: 122, cat: Movies/WEBDL, desc: "Films Web-DL 1080P"}
+      - {id: 123, cat: Movies/WEBDL, desc: "Films WEB-DL 720p"}
+      - {id: 73, cat: Movies/WEBDL, desc: "Films Webrip"}
+      - {id: 70, cat: Movies/WEBDL, desc: "Films WebRip 1080p"}
+      - {id: 71, cat: Movies/WEBDL, desc: "Films WebRip 720p"}
+      # Jeux
+      - {id: 114, cat: PC/Games, desc: "Jeux PC"}
+      - {id: 115, cat: Console/PS3, desc: "Jeux PS3"}
+      - {id: 116, cat: Console/PSP, desc: "Jeux PSP- PSX"}
+      - {id: 117, cat: Console, desc: "Jeux Roms"}
+      - {id: 118, cat: Console, desc: "Jeux Switch"}
+      - {id: 119, cat: Console/Wii, desc: "Jeux Wii"}
+      - {id: 120, cat: Console/WiiU, desc: "Jeux WiiU"}
+      - {id: 121, cat: Console/Xbox, desc: "Jeux Xbox"}
+      # Livre
+      - {id: 100, cat: Audio/Audiobook, desc: "Livre Audio"}
+      - {id: 101, cat: Books/Ebook, desc: "Livre Epub"}
+      - {id: 102, cat: Books, desc: "Livre Mangas"}
+      - {id: 103, cat: Books, desc: "Livres BD"}
+      - {id: 104, cat: Books/Comics, desc: "Livres Comics"}
+      - {id: 105, cat: Books/Magazines, desc: "Livres Press"}
+      - {id: 106, cat: Books, desc: "Livres Romans"}
+      # Logiciel
+      - {id: 113, cat: PC/Phone-IOS, desc: "Logiciel Apple"}
+      - {id: 111, cat: PC, desc: "Logiciel Linux"}
+      - {id: 112, cat: PC/Phone-Other, desc: "Logiciel Smart Phone"}
+      - {id: 110, cat: PC/0day, desc: "Logiciel Windows"}
+      # Musiques
+      - {id: 108, cat: Audio/Lossless, desc: "Musiques FLAC"}
+      - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
+      - {id: 109, cat: Audio, desc: "Musiques WMA"}
+      # Séries
+      - {id: 78, cat: TV/HD, desc: "Series 1080p"}
+      - {id: 79, cat: TV/HD, desc: "Series 720p"}
+      - {id: 97, cat: TV/Anime, desc: "Series Animée"}
+      - {id: 76, cat: TV/HD, desc: "Series Blu-Ray"}
+      - {id: 80, cat: TV/SD, desc: "Series DvDR"}
+      - {id: 81, cat: TV/SD, desc: "Series DVDrip"}
+      - {id: 77, cat: TV/HD, desc: "Series HDTV"}
+      - {id: 82, cat: TV/HD, desc: "Series MHD"}
+      - {id: 88, cat: TV, desc: "Series Pack"}
+      - {id: 87, cat: TV, desc: "Series VO"}
+      - {id: 86, cat: TV, desc: "Series VosFR"}
+      - {id: 89, cat: TV, desc: "Series VOSTA"}
+      - {id: 85, cat: TV/WEB-DL, desc: "Series WEB"}
+      - {id: 83, cat: TV/WEB-DL, desc: "Series WebDL1080p"}
+      - {id: 84, cat: TV/WEB-DL, desc: "Series WebDL720p"}
+      # Spéctacle
+      - {id: 90, cat: TV/Other, desc: "Spectacle 1080p"}
+      - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
+      # Télévision
+      - {id: 94, cat: TV, desc: "TV Animation"}
+      - {id: 93, cat: TV/Documentary, desc: "TV Documentaires"}
+      - {id: 92, cat: TV/Other, desc: "TV Spectacles"}
+      - {id: 95, cat: TV/Sport, desc: "TV Sports"}
+      - {id: 74, cat: TV/HD, desc: "TV TVHD"}
+      - {id: 75, cat: TV, desc: "TV TVRip"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+          
+  login:
+    method: cookie
+    inputs:
+      cookie: "{{ .Config.cookie }}"
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+
+  download:
+    before:
+      path: thanks.php
+      method: "get"
+      inputs:
+        id: "{{ .DownloadUri.Query.id }}"
+        to: "give"
+        torrent: "{{ .DownloadUri.Query.id }}"
+    selector: a:contains("Télécharger ce torrent")
+
+  search:
+    paths:
+    # http://crazyspirits.com/torrents-search.php?c101=1&c102=1&c103=1&c104=1&c105=1&c106=1&search=&cat=0&incldead=0&freeleech=0&lang=0
+      - path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      incldead: 1
+      freeleech: 0
+      lang: 0
+
+    rows:
+      selector: table.border_table > tbody > tr.t-row
+    fields:
+      title:
+        selector: a[href^="torrents-details.php?id="] b
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      banner:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.*?)><"
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      size:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Taille : </b>(.*?)<br" 
+      date:
+        selector: a[onmouseover][href^="torrents-details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: " Le : </b>(.*?)<br" 
+          - name: dateparse
+            args: "02-01-2006"
+      downloadvolumefactor:
+        case:
+          img[src="images/Torrents/free.png"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"
+# TT3.0

src/Jackett.Common/Definitions/cztorrent.yml

@@ -38,19 +38,16 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
   login:
-    method: cookie
+    path: login-page
+    method: form
+    form: form[action="/login?url=%2F"]
     inputs:
-      cookie: "{{ .Config.cookie }}"
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      persistent_login: 1
+    error:
+      - selector: div.error
     test:
       path: torrents
 

src/Jackett.Common/Definitions/datascene.yml

@@ -93,7 +93,7 @@
           - name: regexp
             args: src=([^\s]+)
       imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         optional: true
         attribute: href
       category:

src/Jackett.Common/Definitions/demonoid.yml

@@ -0,0 +1,322 @@
+---
+  site: demonoid
+  name: Demonoid
+  description: "Demonoid is a Public torrent site for MOVIES / TV / GENERAL"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://www.dnoid.to/
+
+  caps:
+    categorymappings:
+      # Applications
+      - {id: 1, cat: PC/Phone-Android, desc: "Applications Android"}
+      - {id: 2, cat: PC/Phone-IOS, desc: "Applications Iphone / Ipod touch"}
+      - {id: 3, cat: PC, desc: "Applications Linux"}
+      - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
+      - {id: 5, cat: PC/Phone-Other, desc: "Applications Mobile phone"}
+      - {id: 6, cat: PC, desc: "Applications PocketPC"}
+      - {id: 7, cat: PC/0day, desc: "Applications Windows"}
+      # Audio Books
+      - {id: 8, cat: Audio/Audiobook, desc: "Audio Books Action"}
+      - {id: 9, cat: Audio/Audiobook, desc: "Audio Books Adventure"}
+      - {id: 10, cat: Audio/Audiobook, desc: "Audio Books Biography"}
+      - {id: 11, cat: Audio/Audiobook, desc: "Audio Books Childrens"}
+      - {id: 12, cat: Audio/Audiobook, desc: "Audio Books Computers and Technology"}
+      - {id: 13, cat: Audio/Audiobook, desc: "Audio Books Contemporary"}
+      - {id: 14, cat: Audio/Audiobook, desc: "Audio Books Cooking"}
+      - {id: 15, cat: Audio/Audiobook, desc: "Audio Books Crafts and Hobbies"}
+      - {id: 16, cat: Audio/Audiobook, desc: "Audio Books Educational"}
+      - {id: 17, cat: Audio/Audiobook, desc: "Audio Books Fantasy"}
+      - {id: 18, cat: Audio/Audiobook, desc: "Audio Books Fiction"}
+      - {id: 19, cat: Audio/Audiobook, desc: "Audio Books General"}
+      - {id: 20, cat: Audio/Audiobook, desc: "Audio Books History"}
+      - {id: 21, cat: Audio/Audiobook, desc: "Audio Books Horror"}
+      - {id: 22, cat: Audio/Audiobook, desc: "Audio Books Humor"}
+      - {id: 23, cat: Audio/Audiobook, desc: "Audio Books Literary"}
+      - {id: 24, cat: Audio/Audiobook, desc: "Audio Books Magazine"}
+      - {id: 25, cat: Audio/Audiobook, desc: "Audio Books Mainstream"}
+      - {id: 26, cat: Audio/Audiobook, desc: "Audio Books Medicine and Health"}
+      - {id: 27, cat: Audio/Audiobook, desc: "Audio Books Mystery and Suspense"}
+      - {id: 28, cat: Audio/Audiobook, desc: "Audio Books Newspaper"}
+      - {id: 29, cat: Audio/Audiobook, desc: "Audio Books Nonfiction"}
+      - {id: 30, cat: Audio/Audiobook, desc: "Audio Books Other"}
+      - {id: 31, cat: Audio/Audiobook, desc: "Audio Books Paranormal"}
+      - {id: 32, cat: Audio/Audiobook, desc: "Audio Books Religion"}
+      - {id: 33, cat: Audio/Audiobook, desc: "Audio Books Romance"}
+      - {id: 34, cat: Audio/Audiobook, desc: "Audio Books RPG"}
+      - {id: 35, cat: Audio/Audiobook, desc: "Audio Books Sci-Fi"}
+      - {id: 36, cat: Audio/Audiobook, desc: "Audio Books Self-help"}
+      - {id: 37, cat: Audio/Audiobook, desc: "Audio Books Suspense"}
+      - {id: 38, cat: Audio/Audiobook, desc: "Audio Books Textbook"}
+      - {id: 39, cat: Audio/Audiobook, desc: "Audio Books Thriller"}
+      - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"}
+      - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"}
+      # Books
+      - {id: 42, cat: Books/Ebook, desc: "Books Action and Adventure"}
+      - {id: 43, cat: Books/Ebook, desc: "Books Biography"}
+      - {id: 44, cat: Books/Ebook, desc: "Books Childrens"}
+      - {id: 45, cat: Books/Ebook, desc: "Books Computers and Technology"}
+      - {id: 46, cat: Books/Ebook, desc: "Books Contemporary"}
+      - {id: 47, cat: Books/Ebook, desc: "Books Cooking"}
+      - {id: 48, cat: Books/Ebook, desc: "Books Crafts and Hobbies"}
+      - {id: 49, cat: Books/Ebook, desc: "Books Educational"}
+      - {id: 50, cat: Books/Ebook, desc: "Books Fantasy"}
+      - {id: 51, cat: Books/Ebook, desc: "Books Fiction"}
+      - {id: 52, cat: Books/Ebook, desc: "Books General"}
+      - {id: 53, cat: Books/Ebook, desc: "Books History"}
+      - {id: 54, cat: Books/Ebook, desc: "Books Horror"}
+      - {id: 55, cat: Books/Ebook, desc: "Books Humor"}
+      - {id: 56, cat: Books/Ebook, desc: "Books Literary"}
+      - {id: 57, cat: Books/Magazines, desc: "Books Magazine"}
+      - {id: 58, cat: Books/Ebook, desc: "Books Mainstream"}
+      - {id: 59, cat: Books/Ebook, desc: "Books Medicine and Health"}
+      - {id: 60, cat: Books/Ebook, desc: "Books Mystery and Suspense"}
+      - {id: 61, cat: Books/Ebook, desc: "Books Newspaper"}
+      - {id: 62, cat: Books/Ebook, desc: "Books Nonfiction"}
+      - {id: 63, cat: Books/Ebook, desc: "Books Other"}
+      - {id: 64, cat: Books/Ebook, desc: "Books Paranormal"}
+      - {id: 65, cat: Books/Ebook, desc: "Books Religion"}
+      - {id: 66, cat: Books/Ebook, desc: "Books Romance"}
+      - {id: 67, cat: Books/Ebook, desc: "Books RPG"}
+      - {id: 68, cat: Books/Ebook, desc: "Books Sci-Fi"}
+      - {id: 69, cat: Books/Ebook, desc: "Books Self-help"}
+      - {id: 70, cat: Books/Ebook, desc: "Books Suspense"}
+      - {id: 71, cat: Books/Ebook, desc: "Books Textbook"}
+      - {id: 72, cat: Books/Ebook, desc: "Books Thriller"}
+      - {id: 73, cat: Books/Ebook, desc: "Books Western"}
+      - {id: 74, cat: Books/Ebook, desc: "Books Young Adult"}
+      # Comics
+      - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"}
+      - {id: 76, cat: Books/Comics, desc: "Comics Crime"}
+      - {id: 77, cat: Books/Comics, desc: "Comics Drama"}
+      - {id: 78, cat: Books/Comics, desc: "Comics Fantasy"}
+      - {id: 79, cat: Books/Comics, desc: "Comics Historical fiction"}
+      - {id: 80, cat: Books/Comics, desc: "Comics Horror"}
+      - {id: 81, cat: Books/Comics, desc: "Comics Illustrated novel"}
+      - {id: 82, cat: Books/Comics, desc: "Comics Manga"}
+      - {id: 83, cat: Books/Comics, desc: "Comics Other"}
+      - {id: 84, cat: Books/Comics, desc: "Comics Real-Life"}
+      - {id: 85, cat: Books/Comics, desc: "Comics Sci-Fi"}
+      - {id: 86, cat: Books/Comics, desc: "Comics Super Hero"}
+      # Games
+      - {id: 87, cat: PC, desc: "Games DOS"}
+      - {id: 88, cat: Console/Other, desc: "Games Dreamcast"}
+      - {id: 89, cat: Console/Other, desc: "Games Emulators"}
+      - {id: 90, cat: Console/Other, desc: "Games GameBoy"}
+      - {id: 91, cat: Console/Other, desc: "Games GameCube"}
+      - {id: 92, cat: PC, desc: "Games Linux"}
+      - {id: 93, cat: PC/Mac, desc: "Games Mac"}
+      - {id: 94, cat: PC/Phone-Other, desc: "Games Mobile phone"}
+      - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"}
+      - {id: 96, cat: Console/Other, desc: "Games Palm"}
+      - {id: 97, cat: Console/PS3, desc: "Games Playstation"}
+      - {id: 98, cat: Console/Other, desc: "Games PocketPC"}
+      - {id: 99, cat: Console/PSP, desc: "Games PSP"}
+      - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"}
+      - {id: 101, cat: PC/Games, desc: "Games Windows"}
+      - {id: 102, cat: Console/Xbox, desc: "Games XBox"}
+      # Anime
+      - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
+      - {id: 103, cat: TV/Anime, desc: "Anime Action"}
+      - {id: 104, cat: TV/Anime, desc: "Anime Adventure"}
+      - {id: 105, cat: TV/Anime, desc: "Anime Comedy"}
+      - {id: 106, cat: TV/Anime, desc: "Anime Drama"}
+      - {id: 107, cat: TV/Anime, desc: "Anime Fantasy"}
+      - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
+      - {id: 109, cat: TV/Anime, desc: "Anime Other"}
+      - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
+      # Movies
+      - {id: 151, cat: Movies, desc: "Movies Action"}
+      - {id: 110, cat: Movies, desc: "Movies Adventure"}
+      - {id: 236, cat: Movies, desc: "Movies Animation"}
+      - {id: 111, cat: Movies, desc: "Movies Biography"}
+      - {id: 152, cat: Movies, desc: "Movies Comedy"}
+      - {id: 112, cat: Movies, desc: "Movies Concerts"}
+      - {id: 113, cat: Movies, desc: "Movies Crime"}
+      - {id: 114, cat: Movies, desc: "Movies Documentary"}
+      - {id: 115, cat: Movies, desc: "Movies Drama"}
+      - {id: 116, cat: Movies, desc: "Movies Family"}
+      - {id: 153, cat: Movies, desc: "Movies Fantasy"}
+      - {id: 117, cat: Movies, desc: "Movies Horror"}
+      - {id: 118, cat: Movies, desc: "Movies Musical"}
+      - {id: 119, cat: Movies, desc: "Movies Mystery"}
+      - {id: 120, cat: Movies, desc: "Movies Other"}
+      - {id: 121, cat: Movies, desc: "Movies Romance"}
+      - {id: 154, cat: Movies, desc: "Movies Sci-Fi"}
+      - {id: 159, cat: Movies, desc: "Movies Short-Film"}
+      - {id: 160, cat: Movies, desc: "Movies Sports"}
+      - {id: 161, cat: Movies, desc: "Movies Thriller"}
+      - {id: 162, cat: Movies, desc: "Movies Trailers"}
+      - {id: 163, cat: Movies, desc: "Movies War"}
+      - {id: 164, cat: Movies, desc: "Movies Western"}
+      # Music
+      - {id: 122, cat: Audio, desc: "Music Alternative"}
+      - {id: 123, cat: Audio, desc: "Music Bluegrass"}
+      - {id: 124, cat: Audio, desc: "Music Blues"}
+      - {id: 125, cat: Audio, desc: "Music Childrens"}
+      - {id: 126, cat: Audio, desc: "Music Christian"}
+      - {id: 127, cat: Audio, desc: "Music Classical"}
+      - {id: 128, cat: Audio, desc: "Music Comedy"}
+      - {id: 129, cat: Audio, desc: "Music Contemporary African"}
+      - {id: 130, cat: Audio, desc: "Music Country"}
+      - {id: 131, cat: Audio, desc: "Music Dance / Disco"}
+      - {id: 132, cat: Audio, desc: "Music Drum and Bass"}
+      - {id: 133, cat: Audio, desc: "Music Electro / Techno"}
+      - {id: 134, cat: Audio, desc: "Music Folk"}
+      - {id: 165, cat: Audio, desc: "Music Gospel"}
+      - {id: 166, cat: Audio, desc: "Music Grunge"}
+      - {id: 167, cat: Audio, desc: "Music Hip-Hop / Rap"}
+      - {id: 168, cat: Audio, desc: "Music Indie"}
+      - {id: 169, cat: Audio, desc: "Music Industrial"}
+      - {id: 170, cat: Audio, desc: "Music J-Pop"}
+      - {id: 171, cat: Audio, desc: "Music Jazz"}
+      - {id: 172, cat: Audio, desc: "Music Latin American"}
+      - {id: 173, cat: Audio, desc: "Music Melodic"}
+      - {id: 174, cat: Audio, desc: "Music Metal"}
+      - {id: 175, cat: Audio, desc: "Music Other"}
+      - {id: 176, cat: Audio, desc: "Music Pop"}
+      - {id: 177, cat: Audio, desc: "Music Punk"}
+      - {id: 178, cat: Audio, desc: "Music Radio Show"}
+      - {id: 179, cat: Audio, desc: "Music Reggae"}
+      - {id: 180, cat: Audio, desc: "Music Rhythm and blues"}
+      - {id: 181, cat: Audio, desc: "Music Rock"}
+      - {id: 182, cat: Audio, desc: "Music Soul"}
+      - {id: 183, cat: Audio, desc: "Music Soundtrack"}
+      - {id: 184, cat: Audio, desc: "Music Trance"}
+      - {id: 185, cat: Audio, desc: "Music Trip Hop"}
+      # Music Videos
+      - {id: 135, cat: Audio/Video, desc: "Music Videos Alternative"}
+      - {id: 136, cat: Audio/Video, desc: "Music Videos Bluegrass"}
+      - {id: 137, cat: Audio/Video, desc: "Music Videos Blues"}
+      - {id: 138, cat: Audio/Video, desc: "Music Videos Childrens"}
+      - {id: 139, cat: Audio/Video, desc: "Music Videos Christian"}
+      - {id: 186, cat: Audio/Video, desc: "Music Videos Classical"}
+      - {id: 187, cat: Audio/Video, desc: "Music Videos Comedy"}
+      - {id: 188, cat: Audio/Video, desc: "Music Videos Contemporary African"}
+      - {id: 189, cat: Audio/Video, desc: "Music Videos Country"}
+      - {id: 190, cat: Audio/Video, desc: "Music Videos Dance / Disco"}
+      - {id: 191, cat: Audio/Video, desc: "Music Videos Drum and Bass"}
+      - {id: 192, cat: Audio/Video, desc: "Music Videos Electro / Techno"}
+      - {id: 193, cat: Audio/Video, desc: "Music Videos Folk"}
+      - {id: 194, cat: Audio/Video, desc: "Music Videos Gospel"}
+      - {id: 195, cat: Audio/Video, desc: "Music Videos Grunge"}
+      - {id: 196, cat: Audio/Video, desc: "Music Videos Hip-Hop / Rap"}
+      - {id: 197, cat: Audio/Video, desc: "Music Videos Indie"}
+      - {id: 198, cat: Audio/Video, desc: "Music Videos Industrial"}
+      - {id: 199, cat: Audio/Video, desc: "Music Videos J-Pop"}
+      - {id: 200, cat: Audio/Video, desc: "Music Videos Jazz"}
+      - {id: 201, cat: Audio/Video, desc: "Music Videos Latin American"}
+      - {id: 202, cat: Audio/Video, desc: "Music Videos Melodic"}
+      - {id: 203, cat: Audio/Video, desc: "Music Videos Metal"}
+      - {id: 204, cat: Audio/Video, desc: "Music Videos Other"}
+      - {id: 205, cat: Audio/Video, desc: "Music Videos Pop"}
+      - {id: 206, cat: Audio/Video, desc: "Music Videos Punk"}
+      - {id: 207, cat: Audio/Video, desc: "Music Videos Radio Show"}
+      - {id: 208, cat: Audio/Video, desc: "Music Videos Reggae"}
+      - {id: 209, cat: Audio/Video, desc: "Music Videos Rhythm and blues"}
+      - {id: 210, cat: Audio/Video, desc: "Music Videos Rock"}
+      - {id: 211, cat: Audio/Video, desc: "Music Videos Soul"}
+      - {id: 212, cat: Audio/Video, desc: "Music Videos Soundtrack"}
+      - {id: 213, cat: Audio/Video, desc: "Music Videos Trance"}
+      - {id: 214, cat: Audio/Video, desc: "Music Videos Trip Hop"}
+      # Pictures
+      - {id: 140, cat: Other, desc: "Pictures Art"}
+      - {id: 141, cat: Other, desc: "Pictures Commercial"}
+      - {id: 142, cat: Other, desc: "Pictures Glamour"}
+      - {id: 215, cat: Other, desc: "Pictures Other"}
+      - {id: 216, cat: Other, desc: "Pictures Photojournalism"}
+      - {id: 217, cat: Other, desc: "Pictures Snapshots"}
+      - {id: 218, cat: Other, desc: "Pictures Sports"}
+      - {id: 219, cat: Other, desc: "Pictures Wildlife"}
+      # TV
+      - {id: 155, cat: TV, desc: "TV Action"}
+      - {id: 143, cat: TV, desc: "TV Adventure"}
+      - {id: 144, cat: TV, desc: "TV Biography"}
+      - {id: 145, cat: TV, desc: "TV Cartoons"}
+      - {id: 146, cat: TV, desc: "TV Comedy"}
+      - {id: 147, cat: TV, desc: "TV Concerts"}
+      - {id: 148, cat: TV, desc: "TV Crime"}
+      - {id: 149, cat: TV, desc: "TV Documentary"}
+      - {id: 156, cat: TV, desc: "TV Drama"}
+      - {id: 220, cat: TV, desc: "TV Family"}
+      - {id: 221, cat: TV, desc: "TV Fantasy"}
+      - {id: 222, cat: TV, desc: "TV Horror"}
+      - {id: 223, cat: TV, desc: "TV Musical"}
+      - {id: 224, cat: TV, desc: "TV Mystery"}
+      - {id: 225, cat: TV, desc: "TV Other"}
+      - {id: 226, cat: TV, desc: "TV Reality"}
+      - {id: 227, cat: TV, desc: "TV Romance"}
+      - {id: 228, cat: TV, desc: "TV Sci-Fi"}
+      - {id: 229, cat: TV, desc: "TV Short film"}
+      - {id: 230, cat: TV, desc: "TV Sports"}
+      - {id: 231, cat: TV, desc: "TV Talk show"}
+      - {id: 232, cat: TV, desc: "TV Thriller"}
+      - {id: 233, cat: TV, desc: "TV Trailers"}
+      - {id: 234, cat: TV, desc: "TV War"}
+      - {id: 235, cat: TV, desc: "TV Western"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="magnet:?xt="]
+
+  search:
+    paths:
+      # https://www.dnoid.to/files/?c1&c2&c3&lang=0&incldead=3&search=&sort=added&order=desc
+      - path: files/
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}&{{end}}"
+      # 1 active 2 dead 3 both
+      incldead: 3
+      search: "{{.Keywords}}"
+      sort: added
+      order: desc
+    rows:
+      selector: table.ttable_headinner tr:has(td[class^="tone_1"])
+      after: 1
+      filters:
+        - name: andmatch
+      dateheaders:
+        selector: tr td.added_today:not(:contains("Sponsored links"))
+        filters:
+          - name: replace
+            args: ["Added ", ""]
+          - name: replace
+            args: ["on  ", ""]
+    fields:
+      title:
+        selector: a[href^="/files/details/"]
+        attribute: title
+      category:
+        selector:  a[href*="&subcategory="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: subcategory
+      details:
+        selector: a[href^="/files/details/"]
+        attribute: href
+      download:
+        selector: a[href^="/files/details/"]
+        attribute: href
+      description:
+        selector: td:nth-last-child(9)
+      size:
+        selector: td:nth-last-child(6)
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/desireleasers.yml

@@ -14,26 +14,24 @@
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
       - {id: 4, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 5, cat: Console, desc: "Game"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
-  settings:
-    - name: cookie
-      type: text
-      label: Cookie
-    - name: info
-      type: info
-      label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
   login:
-    method: cookie
+    path: login
+    method: form
     inputs:
-      cookie: "{{ .Config.cookie }}"
-    test:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
       selector: a[href$="/logout"]
@@ -57,6 +55,7 @@
       tvdb: ""
       tmdb: ""
       mal: ""
+      igdb: ""
       sort: created_at
       direction: desc
       qty: 100
@@ -81,14 +80,20 @@
         optional: true
         selector: div.torrent-poster img
         attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -127,7 +132,7 @@
           "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
           "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
           "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
@@ -137,4 +142,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.1
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -125,7 +125,7 @@
             args: src='(.*?)' 
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       description:
         selector: div.torrent_row_magyarcim

src/Jackett.Common/Definitions/divteam.yml

@@ -56,17 +56,21 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+          
   login:
-    path: index.php?page=login
-    method: post
+    method: cookie
     inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: div#login-alert
+      cookie: "{{ .Config.cookie }}"
     test:
       path: index.php
-      selector: a[href="logout.php"]
 
   search:
     paths:

src/Jackett.Common/Definitions/dmhy.yml

@@ -0,0 +1,80 @@
+---
+  site: dmhy
+  name: dmhy
+  description: "dmhy is a TAIWANESE Public magnet tracker for ANIME"
+  language: zh-TW
+  type: public
+  encoding: UTF-8
+  links:
+    - https://share.dmhy.org/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: TV/Anime, desc: "動畫 (Anime)"}
+      - {id: 31, cat: TV/Anime, desc: "季度全集 (Quarterly Complete)"}
+      - {id: 3, cat: Books/Comics, desc: "漫畫 (Manga)"}
+      - {id: 41, cat: TV, desc: "港台原版 (Hong Kong and Taiwan original)"}
+      - {id: 42, cat: TV, desc: "日文原版 (Japanese original)"}
+      - {id: 4, cat: Audio, desc: "音樂 (Music)"}
+      - {id: 43, cat: Audio, desc: "動漫音樂 (Anime Music)"}
+      - {id: 44, cat: Audio, desc: "同人音樂 (Fan Music)"}
+      - {id: 15, cat: Audio, desc: "流行音樂 (Pop Music)"}
+      - {id: 6, cat: TV, desc: "日劇 (Japanese TV drama)"}
+      - {id: 7, cat: TV/Anime, desc: "RAW"}
+      - {id: 9, cat: PC/Games, desc: "遊戲 (games)"}
+      - {id: 17, cat: PC/Games, desc: "電腦遊戲 (computer games)"}
+      - {id: 18, cat: Console, desc: "電視遊戲 (video games)"}
+      - {id: 19, cat: Console, desc: "掌機遊戲 (console games)"}
+      - {id: 20, cat: Console, desc: "網絡遊戲 (online games)"}
+      - {id: 21, cat: Console, desc: "遊戲周邊 (game periphery)"}
+      - {id: 12, cat: Other/Misc, desc: "特攝 (special photo)"}
+      - {id: 1, cat: Other, desc: "其他 (other)"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+      - path: topics/list
+    inputs:
+    # https://share.dmhy.org/topics/list?keyword=one+piece&sort_id=0&team_id=0&order=date-desc
+      keyword: "{{ .Keywords }}"
+      sort_id: 0
+      order: date-desc
+      team_id: 0
+    rows:
+      selector: table tbody tr
+    fields:
+      date:
+        selector: td:nth-child(1) span
+        filters:
+          - name: dateparse
+            args: "2006/01/02 15:04"
+      category:
+        selector: td:nth-child(2) a
+        attribute: href
+        filters:
+          - name: regexp
+            args: "\\/(\\d+)$"
+      title:
+        selector: a[href^="/topics/view/"]
+      details:
+        selector: a[href^="/topics/view/"]
+        attribute: href
+      download:
+        selector: a[href^="magnet:?"]
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/dxdhd.yml

@@ -13,13 +13,15 @@
       - {id: 1, cat: Movies, desc: "Movies"}
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
-      - {id: 4, cat: TV/Anime, desc: "Anime"}
+      - {id: 4, cat: TV/Anime, desc: "Anime-TV"}
       - {id: 5, cat: PC/0day, desc: "Apps"}
-      - {id: 6, cat: Books, desc: "eBooks"}
+      - {id: 6, cat: Books/Ebook, desc: "eBooks"}
       - {id: 7, cat: PC/Games, desc: "Games"}
       - {id: 8, cat: TV/Sport, desc: "Sports"}
       - {id: 9, cat: Other, desc: "Others"}
       - {id: 10, cat: XXX, desc: "XXX"}
+      - {id: 11, cat: Books/Comics, desc: "Comics"}
+      - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}
 
     modes:
       search: [q]
@@ -34,7 +36,9 @@
       password: "{{ .Config.password }}"
       remember: 1
     error:
-      - selector: div.has-error
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
       selector: a[href$="/logout"]
@@ -58,8 +62,9 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: "created_at"
-      direction: "desc"
+      igdb: ""
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -85,14 +90,17 @@
         filters:
           - name: replace
             args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
@@ -131,7 +139,7 @@
           "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
           "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
           "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
           "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
@@ -141,4 +149,4 @@
           "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
           "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D 1.9.2
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -0,0 +1,140 @@
+---
+  site: ebookparadijs
+  name: EbookParadijs
+  description: "EbookParadijs is a DUTCH Private Tracker for EBOOKS"
+  language: nl-NL
+  type: private
+  encoding: UTF-8
+  links:
+    - https://www.ebookparadijs.org/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: Books/Ebook, desc: "Roman"}
+      - {id: 3, cat: Books/Ebook, desc: "Thriller"}
+      - {id: 4, cat: Books/Ebook, desc: "Diverse"}
+      - {id: 7, cat: Books/Ebook, desc: "Jeugd"}
+      - {id: 8, cat: Books/Ebook, desc: "Oorlog"}
+      - {id: 9, cat: Books/Ebook, desc: "Luisterboeken"}
+      - {id: 10, cat: Books/Ebook, desc: "Stripboeken"}
+      - {id: 11, cat: Books/Ebook, desc: "Crime"}
+      - {id: 13, cat: Books/Ebook, desc: "Detective"}
+      - {id: 15, cat: Books/Ebook, desc: "erothiek"}
+      - {id: 16, cat: Books/Ebook, desc: "tijdschriften"}
+      - {id: 17, cat: Books/Ebook, desc: "hobby"}
+      - {id: 19, cat: Books/Ebook, desc: "medisch"}
+      - {id: 21, cat: Books/Ebook, desc: "sport"}
+      - {id: 50, cat: Books/Ebook, desc: "Kookboeken"}
+      - {id: 51, cat: Books/Ebook, desc: "Fantasy"}
+      - {id: 52, cat: Books/Ebook, desc: "Kerst"}
+      - {id: 53, cat: Books/Ebook, desc: "Waargebeurd"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table[border="0"][cellspacing="0"][cellpadding="10"] tr td font[color="yellow"]
+    test:
+      path: /
+      selector: :has(a[href="logout.php"])
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{.Keywords}}"
+      incldead: 1
+    rows:
+      selector: table.mainouter
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      banner:
+        selector: img[src*="/covers/"]
+        attribute: src
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["details", "download"]
+      size:
+        selector: td:nth-child(4) table tr td:nth-child(2)
+        filters:
+          - name: regexp
+            args: "(.+?) in"
+      files:
+        selector: td:nth-child(4) table tr td:nth-child(2)
+        filters:
+          - name: regexp
+            args: "in (\\d{1,}) bestan"
+      grabs:
+        selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
+        filters:
+          - name: regexp
+            args: "(\\d{1,})"
+      date:
+        selector: td:nth-child(4) table tr:nth-child(2) td:last-child
+        filters:
+          - name: replace
+            args: ["januari", "January"]
+          - name: replace
+            args: ["februari", "February"]
+          - name: replace
+            args: ["maart", "March"]
+          - name: replace
+            args: ["april", "April"]
+          - name: replace
+            args: ["mei", "May"]
+          - name: replace
+            args: ["juni", "June"]
+          - name: replace
+            args: ["juli", "July"]
+          - name: replace
+            args: ["augustus", "August"]
+          - name: replace
+            args: ["september", "September"]
+          - name: replace
+            args: ["oktober", "October"]
+          - name: replace
+            args: ["november", "November"]
+          - name: replace
+            args: ["december", "December"]
+          - name: re_replace
+            args: ["\\s*om\\s*"," "]
+          - name: dateparse
+            args: "2 January 2006 15:04:05"
+      seeders:
+        text: "0"
+      seeders:
+        optional: true
+        selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  b:nth-child(1)
+      leechers:
+        text: "0"
+      leechers:
+        optional: true
+        selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) b:nth-child(2)
+      downloadvolumefactor:
+        case:
+          img[src="pic/freedlfsu.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/ebooks-shares.yml

@@ -0,0 +1,323 @@
+---
+  site: ebooks-shares
+  name: Ebooks-Shares
+  description: "Ebooks-Shares is a Private Torrent Tracker for EBOOKS / AUDIOBOOKS"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://ebooks-shares.org/
+
+  caps:
+    categorymappings:
+      - {id: 274, cat: Audio/Audiobook, desc: "Audio: Poetry"}
+      - {id: 1, cat: Audio/Audiobook, desc: "Audio: Adventure"}
+      - {id: 2, cat: Audio/Audiobook, desc: "Audio: Radio Programs ie Dramas, Talk"}
+      - {id: 3, cat: Audio/Audiobook, desc: "Audio: Non English"}
+      - {id: 42, cat: Audio/Audiobook, desc: "Audio: Biography/Memoirs"}
+      - {id: 4, cat: Audio/Audiobook, desc: "Audio: Business"}
+      - {id: 5, cat: Audio/Audiobook, desc: "Audio: Childrens"}
+      - {id: 7, cat: Audio/Audiobook, desc: "Audio: Classics"}
+      - {id: 41, cat: Audio/Audiobook, desc: "Audio: Comedy"}
+      - {id: 9, cat: Audio/Audiobook, desc: "Audio: Crime/Mystery/Thriller"}
+      - {id: 10, cat: Audio/Audiobook, desc: "Audio: Factual"}
+      - {id: 11, cat: Audio/Audiobook, desc: "Audio: Graphic Audio Books"}
+      - {id: 43, cat: Audio/Audiobook, desc: "Audio: Historical Fiction"}
+      - {id: 12, cat: Audio/Audiobook, desc: "Audio: History/Military"}
+      - {id: 269, cat: Audio/Audiobook, desc: "Audio: History"}
+      - {id: 14, cat: Audio/Audiobook, desc: "Audio: Horror"}
+      - {id: 15, cat: Audio/Audiobook, desc: "Audio: Medical"}
+      - {id: 16, cat: Audio/Audiobook, desc: "Audio: Music"}
+      - {id: 45, cat: Audio/Audiobook, desc: "Audio: Non-Fict/Ref"}
+      - {id: 46, cat: Audio/Audiobook, desc: "Audio: Novels"}
+      - {id: 17, cat: Audio/Audiobook, desc: "Audio: General"}
+      - {id: 22, cat: Audio/Audiobook, desc: "Audio: Philosophy/Belief"}
+      - {id: 23, cat: Audio/Audiobook, desc: "Audio: Romance"}
+      - {id: 24, cat: Audio/Audiobook, desc: "Audio: Sci-Fi/Fantasy"}
+      - {id: 25, cat: Audio/Audiobook, desc: "Audio: Self-Improvement"}
+      - {id: 26, cat: Audio/Audiobook, desc: "Audio: Mod. Scholar/TTC"}
+      - {id: 27, cat: Audio/Audiobook, desc: "Audio: Travel"}
+      - {id: 33, cat: Audio/Audiobook, desc: "Audio: Tutorials"}
+      - {id: 34, cat: Audio/Audiobook, desc: "Audio: Western"}
+      - {id: 35, cat: Audio/Audiobook, desc: "Audio: Young Adult"}
+      - {id: 275, cat: Audio/Audiobook, desc: "Audio: Language"}
+      - {id: 276, cat: Audio/Audiobook, desc: "Audio: Military Fiction"}
+      - {id: 299, cat: Audio/Audiobook, desc: "Audio: Magazines"}
+      - {id: 301, cat: Audio/Audiobook, desc: "Audio: Collections"}
+      - {id: 47, cat: Books/Ebook, desc: "Children's: Adventure"}
+      - {id: 48, cat: Books/Ebook, desc: "Children's: Novels"}
+      - {id: 49, cat: Books/Ebook, desc: "Children's: Collections"}
+      - {id: 50, cat: Books/Ebook, desc: "Children's: Educational"}
+      - {id: 51, cat: Books/Ebook, desc: "Children's: Games"}
+      - {id: 52, cat: Books/Ebook, desc: "Children's: General"}
+      - {id: 283, cat: Books/Ebook, desc: "Children's: Sci-Fi/Fantasy"}
+      - {id: 284, cat: Books/Ebook, desc: "Children's: Mystery"}
+      - {id: 286, cat: Books/Ebook, desc: "Children's: Early Years / Picture"}
+      - {id: 295, cat: Books/Ebook, desc: "Children's: Nonfiction"}
+      - {id: 296, cat: Books/Ebook, desc: "Children's: Leveled / Decodable Readers"}
+      - {id: 288, cat: Books/Ebook, desc: "Collections: Same Author"}
+      - {id: 289, cat: Books/Ebook, desc: "Collections: Same Series"}
+      - {id: 291, cat: Books/Ebook, desc: "Collections: Fiction"}
+      - {id: 292, cat: Books/Ebook, desc: "Collections: Non Fiction"}
+      - {id: 220, cat: Books/Comics, desc: "Comics: Archie"}
+      - {id: 222, cat: Books/Comics, desc: "Comics: Books & Mags - Comics"}
+      - {id: 225, cat: Books/Comics, desc: "Comics: ComicStrip Collection"}
+      - {id: 228, cat: Books/Comics, desc: "Comics: DC"}
+      - {id: 244, cat: Books/Comics, desc: "Comics: Manga"}
+      - {id: 245, cat: Books/Comics, desc: "Comics: Marvel"}
+      - {id: 258, cat: Books/Comics, desc: "Comics: Other Pub - Humor/Satire"}
+      - {id: 262, cat: Books/Comics, desc: "Comics: Other Pub - Educational"}
+      - {id: 264, cat: Books/Comics, desc: "Comics: Independent Publishers"}
+      - {id: 265, cat: Books/Comics, desc: "Comics: General/Misc"}
+      - {id: 281, cat: Books/Technical, desc: "Computer: Tutorials"}
+      - {id: 38, cat: Books/Technical, desc: "Computer: Applications"}
+      - {id: 55, cat: Books/Technical, desc: "Computer: Gaming "}
+      - {id: 56, cat: Books/Technical, desc: "Computer: General"}
+      - {id: 57, cat: Books/Technical, desc: "Computer: Graphics"}
+      - {id: 58, cat: Books/Technical, desc: "Computer: Internet-WWW"}
+      - {id: 59, cat: Books/Technical, desc: "Computer: Networking"}
+      - {id: 60, cat: Books/Technical, desc: "Computer: OS/Mac"}
+      - {id: 61, cat: Books/Technical, desc: "Computer: OS/Other"}
+      - {id: 62, cat: Books/Technical, desc: "Computer: OS/Windows"}
+      - {id: 63, cat: Books/Technical, desc: "Computer: Programming "}
+      - {id: 66, cat: Books/Ebook, desc: "Doc/Vid/Tut: Computer"}
+      - {id: 67, cat: Books/Ebook, desc: "Doc/Vid/Tut: Crafts"}
+      - {id: 68, cat: Books/Ebook, desc: "Doc/Vid/Tut: Educational"}
+      - {id: 69, cat: Books/Ebook, desc: "Doc/Vid/Tut: General"}
+      - {id: 70, cat: Books/Ebook, desc: "Doc/Vid/Tut: History"}
+      - {id: 71, cat: Books/Ebook, desc: "Doc/Vid/Tut: Medical/Health"}
+      - {id: 72, cat: Books/Ebook, desc: "Doc/Vid/Tut: Military"}
+      - {id: 73, cat: Books/Ebook, desc: "Doc/Vid/Tut: Modelling"}
+      - {id: 74, cat: Books/Ebook, desc: "Doc/Vid/Tut: Sciences"}
+      - {id: 75, cat: Books/Ebook, desc: "Doc/Vid/Tut: Transportation"}
+      - {id: 76, cat: Books/Ebook, desc: "Doc/Vid/Tut: Woodworking"}
+      - {id: 287, cat: Books/Ebook, desc: "Doc/Vid/Tut: Martial Arts/Boxing/Wrestling"}
+      - {id: 121, cat: Books/Ebook, desc: "Educational: Arts"}
+      - {id: 122, cat: Books/Ebook, desc: "Educational: Astronomy/Cosmology"}
+      - {id: 123, cat: Books/Ebook, desc: "Educational: Biology & Genetics"}
+      - {id: 124, cat: Books/Ebook, desc: "Educational: Chemistry"}
+      - {id: 125, cat: Books/Ebook, desc: "Educational: Culture/Languages"}
+      - {id: 126, cat: Books/Ebook, desc: "Educational: Earth Sciences"}
+      - {id: 127, cat: Books/Ebook, desc: "Educational:  Educational"}
+      - {id: 128, cat: Books/Ebook, desc: "Educational: Engineering & Technology "}
+      - {id: 129, cat: Books/Ebook, desc: "Educational: Environmental Studies"}
+      - {id: 130, cat: Books/Ebook, desc: "Educational: General Science Titles"}
+      - {id: 131, cat: Books/Ebook, desc: "Educational: Literature / Writing"}
+      - {id: 132, cat: Books/Ebook, desc: "Educational: Mathematics and Statistics"}
+      - {id: 133, cat: Books/Ebook, desc: "Educational: Medical Texts"}
+      - {id: 134, cat: Books/Ebook, desc: "Educational: Military History"}
+      - {id: 135, cat: Books/Ebook, desc: "Educational: Non-Military History"}
+      - {id: 136, cat: Books/Ebook, desc: "Educational: Paleontology"}
+      - {id: 137, cat: Books/Ebook, desc: "Educational: Physics"}
+      - {id: 138, cat: Books/Ebook, desc: "Educational: Psychology"}
+      - {id: 139, cat: Books/Ebook, desc: "Educational: Student Reference"}
+      - {id: 297, cat: Books/Ebook, desc: "Educational: Life Sciences/Evolution/Human "}
+      - {id: 77, cat: Books/Ebook, desc: "Fiction: Adventure"}
+      - {id: 78, cat: Books/Ebook, desc: "Fiction: Classics"}
+      - {id: 79, cat: Books/Ebook, desc: "Fiction: Collections"}
+      - {id: 80, cat: Books/Ebook, desc: "Fiction: Comedy/Humorous  "}
+      - {id: 81, cat: Books/Ebook, desc: "Fiction: Crime/Mystery/Thriller"}
+      - {id: 302, cat: Books/Ebook, desc: "Fiction: Cozy Mysteries"}
+      - {id: 82, cat: Books/Ebook, desc: "Fiction: General Fiction"}
+      - {id: 83, cat: Books/Ebook, desc: "Fiction: Horror"}
+      - {id: 84, cat: Books/Ebook, desc: "Fiction: Military & Historic"}
+      - {id: 86, cat: Books/Ebook, desc: "Fiction: Romance"}
+      - {id: 87, cat: Books/Ebook, desc: "Fiction: Sci-Fi/Fantasy"}
+      - {id: 88, cat: Books/Ebook, desc: "Fiction: Westerns"}
+      - {id: 270, cat: Books/Ebook, desc: "Fiction: Historical "}
+      - {id: 312, cat: Books/Ebook, desc: "Fiction: Various Authors"}
+      - {id: 303, cat: Books/Ebook, desc: "Fiction: Poetry"}
+      - {id: 140, cat: Books/Ebook, desc: "Hobby/Pastime: Art"}
+      - {id: 141, cat: Books/Ebook, desc: "Hobby/Pastime: Boating"}
+      - {id: 142, cat: Books/Ebook, desc: "Hobby/Pastime: Crafts/Knitting/Sewing"}
+      - {id: 143, cat: Books/Ebook, desc: "Hobby/Pastime: Food & Drink"}
+      - {id: 144, cat: Books/Ebook, desc: "Hobby/Pastime: Games/RPG/Gaming"}
+      - {id: 145, cat: Books/Ebook, desc: "Hobby/Pastime: General Pastimes"}
+      - {id: 146, cat: Books/Ebook, desc: "Hobby/Pastime: Graphic Arts and Design"}
+      - {id: 147, cat: Books/Ebook, desc: "Hobby/Pastime: Health/Lifestyle"}
+      - {id: 148, cat: Books/Ebook, desc: "Hobby/Pastime: Home/Gardening"}
+      - {id: 149, cat: Books/Ebook, desc: "Hobby/Pastime: Metalworking"}
+      - {id: 150, cat: Books/Ebook, desc: "Hobby/Pastime: Modelling"}
+      - {id: 151, cat: Books/Ebook, desc: "Hobby/Pastime: Pets/Vet Science"}
+      - {id: 152, cat: Books/Ebook, desc: "Hobby/Pastime: Photography"}
+      - {id: 153, cat: Books/Ebook, desc: "Hobby/Pastime: Quiz and Crossword Books"}
+      - {id: 154, cat: Books/Ebook, desc: "Hobby/Pastime: Sports"}
+      - {id: 155, cat: Books/Ebook, desc: "Hobby/Pastime: Travel"}
+      - {id: 156, cat: Books/Ebook, desc: "Hobby/Pastime: Woodworking"}
+      - {id: 157, cat: Books/Ebook, desc: "Language Learn: Arabic"}
+      - {id: 158, cat: Books/Ebook, desc: "Language Learn: Chinese"}
+      - {id: 159, cat: Books/Ebook, desc: "Language Learn: English"}
+      - {id: 160, cat: Books/Ebook, desc: "Language Learn: French"}
+      - {id: 161, cat: Books/Ebook, desc: "Language Learn: German"}
+      - {id: 162, cat: Books/Ebook, desc: "Language Learn: Italian"}
+      - {id: 163, cat: Books/Ebook, desc: "Language Learn: Japanese"}
+      - {id: 164, cat: Books/Ebook, desc: "Language Learn: Latin"}
+      - {id: 165, cat: Books/Ebook, desc: "Language Learn: Nordic Lang"}
+      - {id: 166, cat: Books/Ebook, desc: "Language Learn: Oriental Lang"}
+      - {id: 167, cat: Books/Ebook, desc: "Language Learn: Russian"}
+      - {id: 168, cat: Books/Ebook, desc: "Language Learn: Spanish"}
+      - {id: 169, cat: Books/Ebook, desc: "Language Learn: Other Lang"}
+      - {id: 310, cat: Books/Magazines, desc: "Magazines: Woodworking"}
+      - {id: 311, cat: Books/Magazines, desc: "Magazines: Sewing, Knitting and Quilting"}
+      - {id: 170, cat: Books/Magazines, desc: "Magazines : Computer"}
+      - {id: 171, cat: Books/Magazines, desc: "Magazines: Current Events"}
+      - {id: 172, cat: Books/Magazines, desc: "Magazines: Business/Finance "}
+      - {id: 173, cat: Books/Magazines, desc: "Magazines: Electronics"}
+      - {id: 174, cat: Books/Magazines, desc: "Magazines: General/Misc"}
+      - {id: 175, cat: Books/Magazines, desc: "Magazines: Military"}
+      - {id: 176, cat: Books/Magazines, desc: "Magazines: Photography"}
+      - {id: 177, cat: Books/Magazines, desc: "Magazines: Sciences "}
+      - {id: 178, cat: Books/Magazines, desc: "Magazines: Sports"}
+      - {id: 179, cat: Books/Magazines, desc: "Magazines: Technology"}
+      - {id: 180, cat: Books/Magazines, desc: "Magazines: Transportation"}
+      - {id: 181, cat: Books/Ebook, desc: "Military: Aircraft"}
+      - {id: 182, cat: Books/Ebook, desc: "Military: Armour"}
+      - {id: 183, cat: Books/Ebook, desc: "Military: General Military"}
+      - {id: 184, cat: Books/Ebook, desc: "Military: Miscellaneous"}
+      - {id: 185, cat: Books/Ebook, desc: "Military: Naval"}
+      - {id: 186, cat: Books/Foreign, desc: "Non English Bks: Dutch"}
+      - {id: 187, cat: Books/Foreign, desc: "Non English Bks: French"}
+      - {id: 188, cat: Books/Foreign, desc: "Non English Bks: German"}
+      - {id: 189, cat: Books/Foreign, desc: "Non English Bks: Greek"}
+      - {id: 190, cat: Books/Foreign, desc: "Non English Bks: Hungarian"}
+      - {id: 191, cat: Books/Foreign, desc: "Non English Bks: Italian"}
+      - {id: 192, cat: Books/Foreign, desc: "Non English Bks: Japanese"}
+      - {id: 194, cat: Books/Foreign, desc: "Non English Bks: Other"}
+      - {id: 193, cat: Books/Foreign, desc: "Non English Bks: Polish"}
+      - {id: 195, cat: Books/Foreign, desc: "Non English Bks: Romanian"}
+      - {id: 196, cat: Books/Foreign, desc: "Non English Bks: Russian"}
+      - {id: 197, cat: Books/Foreign, desc: "Non English Bks: Scandinavian"}
+      - {id: 198, cat: Books/Foreign, desc: "Non English Bks: Serbian"}
+      - {id: 199, cat: Books/Foreign, desc: "Non English Bks: Spanish"}
+      - {id: 89, cat: Books/Ebook, desc: "Non Fict/Ref: Agricultural"}
+      - {id: 90, cat: Books/Ebook, desc: "Non Fict/Ref: Alt. Therapies"}
+      - {id: 95, cat: Books/Ebook, desc: "Non Fict/Ref: Architecture"}
+      - {id: 91, cat: Books/Ebook, desc: "Non Fict/Ref: Auto & Repair"}
+      - {id: 92, cat: Books/Ebook, desc: "Non Fict/Ref: Aviation"}
+      - {id: 94, cat: Books/Ebook, desc: "Non Fict/Ref: Biographies and Memoirs"}
+      - {id: 96, cat: Books/Ebook, desc: "Non Fict/Ref: Business/Finance"}
+      - {id: 97, cat: Books/Ebook, desc: "Non Fict/Ref: Comedy/Humorous"}
+      - {id: 98, cat: Books/Ebook, desc: "Non Fict/Ref: Crime"}
+      - {id: 99, cat: Books/Ebook, desc: "Non Fict/Ref: Criminology"}
+      - {id: 100, cat: Books/Ebook, desc: "Non Fict/Ref: Economics & Math"}
+      - {id: 102, cat: Books/Ebook, desc: "Non Fict/Ref: Electronics"}
+      - {id: 103, cat: Books/Ebook, desc: "Non Fict/Ref: Enc/Dict/Atlas,s"}
+      - {id: 104, cat: Books/Ebook, desc: "Non Fict/Ref: Entertainment"}
+      - {id: 105, cat: Books/Ebook, desc: "Non Fict/Ref: General Ref"}
+      - {id: 106, cat: Books/Ebook, desc: "Non Fict/Ref: Geo & Archaeology"}
+      - {id: 107, cat: Books/Ebook, desc: "Non Fict/Ref: Journ/Current Affairs "}
+      - {id: 108, cat: Books/Ebook, desc: "Non Fict/Ref: Legal"}
+      - {id: 109, cat: Books/Ebook, desc: "Non Fict/Ref: Medical/Health"}
+      - {id: 110, cat: Books/Ebook, desc: "Non Fict/Ref: Motorcycle"}
+      - {id: 111, cat: Books/Ebook, desc: "Non Fict/Ref:  Music"}
+      - {id: 112, cat: Books/Ebook, desc: "Non Fict/Ref: Parenting/Family"}
+      - {id: 113, cat: Books/Ebook, desc: "Non Fict/Ref: Philosophy & Belief"}
+      - {id: 114, cat: Books/Ebook, desc: "Non Fict/Ref: Literature / Writing"}
+      - {id: 115, cat: Books/Ebook, desc: "Non Fict/Ref: Political Science"}
+      - {id: 116, cat: Books/Ebook, desc: "Non Fict/Ref: Project Management"}
+      - {id: 117, cat: Books/Ebook, desc: "Non Fict/Ref: Self-Improvement"}
+      - {id: 118, cat: Books/Ebook, desc: "Non Fict/Ref: Sht Music-Tablatures"}
+      - {id: 119, cat: Books/Ebook, desc: "Non Fict/Ref: Sociology/Politics"}
+      - {id: 120, cat: Books/Ebook, desc: "Non Fict/Ref: Transportation"}
+      - {id: 266, cat: Books/Ebook, desc: "Non Fict/Ref: Technology Books"}
+      - {id: 267, cat: Books/Ebook, desc: "Non Fict/Ref: History Books"}
+      - {id: 271, cat: Books/Ebook, desc: "Non Fict/Ref: Collections"}
+      - {id: 272, cat: Books/Ebook, desc: "Non Fict/Ref: DIY (Do It Yourself)"}
+      - {id: 273, cat: Books/Ebook, desc: "Non Fict/Ref: Archaeology"}
+      - {id: 278, cat: Books/Ebook, desc: "Non Fict/Ref: Conspiracy Theory/UFO/Alien Bk"}
+      - {id: 279, cat: Books/Ebook, desc: "Non Fict/Ref: Psychology"}
+      - {id: 280, cat: Books/Ebook, desc: "Non Fict/Ref: Education"}
+      - {id: 282, cat: Books/Ebook, desc: "Non Fict/Ref: Martial Arts/Boxing/Wrestling"}
+      - {id: 293, cat: Books/Ebook, desc: "Non Fict/Ref: Zoology & Veterinary Science"}
+      - {id: 294, cat: Books/Ebook, desc: "Non Fict/Ref: True Stories"}
+      - {id: 300, cat: Books/Ebook, desc: "Non Fict/Ref: Maritime Books (Building,navig"}
+      - {id: 200, cat: Books/Ebook, desc: "Teens: Collections"}
+      - {id: 201, cat: Books/Ebook, desc: "Teens: Educational"}
+      - {id: 202, cat: Books/Ebook, desc: "Teens: Fiction"}
+      - {id: 203, cat: Books/Ebook, desc: "Teens: Non Fiction"}
+      - {id: 285, cat: Books/Ebook, desc: "Teens: Sci-Fi/Fantasy"}
+      - {id: 305, cat: Books/Other, desc: "VIP: Science Fiction"}
+      - {id: 307, cat: Books/Other, desc: "VIP: Thriller"}
+      - {id: 306, cat: Books/Other, desc: "VIP: Mystery"}
+      - {id: 308, cat: Books/Other, desc: "VIP: Crime"}
+      - {id: 309, cat: Books/Other, desc: "VIP: Fantasy "}
+      - {id: 204, cat: Books/Other, desc: "VIP: Collections "}
+      - {id: 205, cat: Books/Other, desc: "VIP: Audiobooks"}
+      - {id: 206, cat: Books/Other, desc: "VIP: Comics"}
+      - {id: 207, cat: Books/Other, desc: "VIP: Computers"}
+      - {id: 208, cat: Books/Other, desc: "VIP: Documentaries"}
+      - {id: 209, cat: Books/Other, desc: "VIP: Educational"}
+      - {id: 210, cat: Books/Other, desc: "VIP: Fiction"}
+      - {id: 211, cat: Books/Other, desc: "VIP: Hobby/Craft"}
+      - {id: 212, cat: Books/Other, desc: "VIP: Literature"}
+      - {id: 213, cat: Books/Other, desc: "VIP: Medical"}
+      - {id: 214, cat: Books/Other, desc: "VIP: Military"}
+      - {id: 215, cat: Books/Other, desc: "VIP: Music"}
+      - {id: 216, cat: Books/Other, desc: "VIP: Non Fiction"}
+      - {id: 217, cat: Books/Other, desc: "VIP: Original Content"}
+      - {id: 218, cat: Books/Other, desc: "VIP: RPG"}
+
+    modes:
+      search: [q]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.panel:contains("Access Denied")
+    test:
+      path: index.php
+
+  search:
+    paths:
+      - path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      search: "{{if .Keywords}}\"{{.Keywords}}\"{{else}}{{end}}"
+      # 0 only active 1 incl dead 2 only dead
+      incldead: 0
+      # 0 all 1 not freeleech 2 only freeleech
+      freeleech: 0
+      # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
+      lang: 0
+    rows:
+      selector: tr.t-row
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      seeders:
+        selector: td:nth-child(5)
+      leechers:
+        selector: td:nth-child(6)
+      size:
+        selector: td:nth-child(7)
+      description:
+        selector: td:nth-child(8)
+        filters:
+          - name: prepend
+            args: "wait: "
+      date:
+        text: now
+      downloadvolumefactor:
+        case:
+          img[src="images/free.gif"]: 0
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/efectodoppler.yml

@@ -0,0 +1,94 @@
+---
+  site: efectodoppler
+  name: Efecto Doppler
+  description: "Efecto Doppler is a SPANISH Private Torrent Tracker for MUSIC"
+  language: es-es
+  type: private
+  encoding: UTF-8
+  links:
+    - https://efectodoppler.pw/
+
+  caps:
+    categories:
+      1: Audio
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  login:
+    path: login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      keeplogged: 1
+    error:
+      - selector: form > span.warning
+    test:
+      path: index.php
+      selector: a[href^="logout.php?auth="]
+
+  ratio:
+    path: index.php
+    selector: li#stats_ratio span.stat span
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      artistname: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{end}}"
+      groupname: "{{if .Query.Artist}}{{else}}{{ .Keywords }}{{end}}"
+      order_by: time
+      order_way: desc
+    rows:
+      selector: tr.torrent
+    fields:
+      category:
+        text: "1"
+      artist:
+        text: "Varios artistas"
+      artist:
+        selector: a[href^="artist.php?id="]
+        optional: true
+      title:
+        selector: a[href^="torrents.php?id="]
+        filters:
+          - name: prepend
+            args: "{{.Result.artist}} - "
+      details:
+        selector: a[href^="torrents.php?id="]
+        attribute: href
+      banner:
+        selector: div.group_image img
+        attribute: src
+      download:
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.torrent_info
+      files:
+        selector: td:nth-child(3)
+      date:
+        selector: td:nth-child(4) span
+        attribute: title
+        filters:
+          - name: dateparse
+            args: "Jan 02 2006, 15:04"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          strong.torrent_label[title*="Neutral"]: "0"
+          strong.torrent_label[title*="Oro"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          strong.torrent_label[title*="Neutral"]: "0"
+          "*": "1"

src/Jackett.Common/Definitions/elitetorrent-biz.yml

@@ -6,9 +6,10 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.elitetorrent.io/
+    - https://www.elitetorrent.one/
   legacylinks:
     - https://www.elitetorrent.biz/
+    - https://www.elitetorrent.io/
 
   caps:
     categories:
@@ -48,8 +49,13 @@
     fields:
       title:
         selector: .meta a
+        attribute: href
         # normalize to SXXEYY format
         filters:
+          - name: re_replace
+            args: [".*/([^/]*)/$", "$1"]
+          - name: replace
+            args: ["-", " "]
           - name: re_replace
             args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
           - name: re_replace

src/Jackett.Common/Definitions/empornium.yml

@@ -95,7 +95,7 @@
       selector: table#torrent_table > tbody > tr[class^="torrent row"]
     fields:
       download:
-        selector: a[href^="torrents.php?action=download&id="]
+        selector: a[href^="/torrents.php?action=download&id="]
         attribute: href
       description:
         selector: div.tags
@@ -140,6 +140,7 @@
         selector: td:nth-child(9)
       downloadvolumefactor:
         case:
+          span.icon[title*="Freeleech"]: 0
           "img[alt=\"Freeleech\"]": "0"
           "*": "1"
       uploadvolumefactor:

src/Jackett.Common/Definitions/eniahd.yml

@@ -0,0 +1,170 @@
+---
+  site: eniahd
+  name: EniaHD
+  description: "EniaHD is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://eniahd.com/
+
+  caps:
+    categorymappings:
+      # Cinema
+      - {id: 13, cat: Movies/HD, desc: "Зарубежное кино HD"}
+      - {id: 11, cat: Movies, desc: "Зарубежное кино"}
+      - {id: 12, cat: Movies, desc: "Наше кино"}
+      # TV
+      - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+      - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
+      - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
+      - {id: 3, cat: TV, desc: "Зарубежные сериалы"}
+      - {id: 14, cat: TV, desc: "Русские сериалы"}
+      - {id: 10, cat: TV, desc: "Звуковые дорожки"}
+      # Cartoons
+      - {id: 24, cat: TV, desc: "Мультфильмы"}
+      - {id: 25, cat: TV, desc: "Мультсериалы"}
+      # Documentary
+      - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
+      - {id: 21, cat: TV/Documentary, desc: "Документальные"}
+      - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+      # Miscellaneous
+      - {id: 8, cat: Other, desc: "Разное (раздачи)"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: "/index.php"
+      autologin: 1
+    error:
+      - selector: table.error
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to сезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+      - name: re_replace # S01E01 to сезон 1 серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+      prev_allw: 0
+      prev_a: 0
+      prev_dla: 0
+      prev_dlc: 0
+      prev_dld: 0
+      prev_dlw: 0
+      prev_my: 0
+      prev_new: 0
+      prev_sd: 0
+      prev_da: 1
+      prev_dc: 0
+      prev_df: 1
+      prev_ds: 0
+      prev_tor_type: 0
+      # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+      o: 1
+      # 1=asc 2=desc
+      s: 2
+      # show category
+      dc: 0
+      # show forum
+      df: 1
+      # show author
+      da: 1
+      # show speed
+      ds: 0
+      # -1=all time
+      tm: -1
+      # seed not seen -1=disregard
+      sns: -1
+      # group releases -1=not selected
+      srg: -1
+      # title search
+      nm: "{{ .Keywords }}"
+      # find a username
+      pn: ""
+      # search by partial word
+      allw: 0
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+
+    fields:
+      title:
+        selector: a.tLink
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-я\\W]+\\))|(^[А-Яа-я\\W\\d]+\\/ )|([а-яА-Я \\-]+,+)|([а-яА-Я]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a.tLink
+        attribute: href
+      download:
+        selector: a[href^="./dl.php?id="]
+        attribute: href
+      magnet:
+        optional: true
+        selector: a[href^="magnet:?xt="]      
+        attribute: href
+      category:
+        selector: a.gen
+        attribute: href
+        filters:
+          - name: querystring
+            args: f
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        text: "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/esharenet.yml

@@ -0,0 +1,169 @@
+---
+  site: esharenet
+  name: eShareNet
+  description: "eShareNet is a Private Tracker for Brittish MOVIE / TV"
+  language: en
+  type: private
+  encoding: UTF-8
+  links:
+    - https://esharenet.eu/
+
+  caps:
+    categorymappings:
+      - {id: 2, cat: TV, desc: "Comedy"}
+      - {id: 4, cat: TV, desc: "Entertainment"}
+      - {id: 5, cat: TV, desc: "Game Shows"}
+      - {id: 6, cat: TV, desc: "Motoring"}
+      - {id: 7, cat: TV, desc: "News and Current Affairs"}
+      - {id: 8, cat: TV, desc: "Sci-Fi"}
+      - {id: 9, cat: TV, desc: "Talkshow"}
+      - {id: 10, cat: TV, desc: "Advertisements - Continuity"}
+      - {id: 11, cat: TV, desc: "Comedy-Drama"}
+      - {id: 12, cat: TV, desc: "Fantasy"}
+      - {id: 13, cat: TV, desc: "Home and Property"}
+      - {id: 14, cat: Movies, desc: "Movies"}
+      - {id: 15, cat: Other, desc: "Other"}
+      - {id: 16, cat: TV, desc: "Soaps"}
+      - {id: 17, cat: TV, desc: "Trains and Planes"}
+      - {id: 18, cat: TV, desc: "Animation"}
+      - {id: 19, cat: TV/Documentary, desc: "Documentaries"}
+      - {id: 20, cat: TV, desc: "Food and Cooking"}
+      - {id: 21, cat: TV, desc: "Horror"}
+      - {id: 22, cat: Audio, desc: "Music"}
+      - {id: 23, cat: Audio, desc: "Radio"}
+      - {id: 24, cat: TV/Sport, desc: "Sport"}
+      - {id: 25, cat: TV, desc: "True Crime"}
+      - {id: 26, cat: Audio/Audiobook, desc: "Audiobook and E-book"}
+      - {id: 27, cat: TV, desc: "Drama"}
+      - {id: 28, cat: TV, desc: "Kids"}
+      - {id: 29, cat: TV, desc: "Mystery and Crime Fiction"}
+      - {id: 30, cat: TV, desc: "Reality"}
+      - {id: 31, cat: TV, desc: "Subtitles - english subs"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  login:
+    path: login
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      remember: 1
+    error:
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
+    test:
+      path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
+
+  search:
+    paths:
+      - path: filterTorrents
+    inputs:
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
+      uploader: ""
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tvdb: ""
+      tmdb: ""
+      mal: ""
+      igdb: ""
+      sort: created_at
+      direction: desc
+      qty: 100
+    rows:
+      selector: table > tbody > tr
+    fields:
+      category:
+        selector: a[href*="/categories/"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+      title:
+        selector: a.view-torrent
+      download:
+        selector: a[href*="/download/"]
+        attribute: href
+      details:
+        selector: a.view-torrent
+        attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
+      size:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      grabs:
+        selector: td:nth-last-child(1)
+        filters:
+          - name: regexp
+            args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      date:
+        selector: time
+        filters:
+            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portoguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch
+          - name: re_replace
+            args: ["(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|hace|il y a|vor|преди)", "ago"]
+          - name: re_replace
+            args: ["(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut)", "minute"]
+          - name: re_replace
+            args: ["(dakika|minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+          - name: re_replace
+            args: ["(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur)", "hour"]
+          - name: re_replace
+            args: ["(saat|tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+          - name: re_replace
+            args: ["(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден)", "day"]
+          - name: re_replace
+            args: ["(gün|päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+          - name: re_replace
+            args: ["(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица)", "week"]
+          - name: re_replace
+            args: ["(hafta|nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+          - name: re_replace
+            args: [" (ay|kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|mois|Monat|месец|maand)", "month"]
+          - name: re_replace
+            args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+      downloadvolumefactor:
+        case:
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
+          "*": "1"
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/ettv.yml

@@ -6,6 +6,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.ettv.to/
+  legacylinks:
     - https://www.ettv.tv/
 
   caps:

src/Jackett.Common/Definitions/extratorrent-ag.yml

@@ -957,6 +957,11 @@
       download:
         selector: td a[href^="magnet:?xt="]
         attribute: href
+        # temp fix for #5372
+        filters: 
+          - name: urldecode
+          - name: replace
+            args: [" ⭐", ""]
       date:
         selector: td:nth-last-of-type(5)
         filters:

src/Jackett.Common/Definitions/fanoin.yml

@@ -99,7 +99,7 @@
           - name: replace
             args: ["details.php", "download.php"]
       imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       size:
         selector: td:nth-child(5)

src/Jackett.Common/Definitions/film-paleis.yml

@@ -6,6 +6,8 @@
   type: semi-private
   encoding: UTF-8
   links:
+    - http://www.film-paleis.me/
+  legacylinks:
     - https://www.film-paleis.me/
 
   caps:

src/Jackett.Common/Definitions/focusx.yml

@@ -0,0 +1,237 @@
+---
+  site: focusx
+  name: FocusX
+  description: "FocusX is a RUSSIAN Public torrent site for MOVIES and TV"
+  language: re-RU
+  type: public
+  encoding: UTF-8
+  links:
+    - https://focu.sx/
+
+  caps:
+    categorymappings:
+      - {id: 111, cat: Movies, desc: "1922"}
+      - {id: 135, cat: Movies, desc: "Анон"}
+      - {id: 168, cat: Movies, desc: "Воспитательница"}
+      - {id: 10, cat: Movies, desc: "Мёд в голове"}
+      - {id: 16, cat: Movies, desc: "Малыш"}
+      - {id: 18, cat: Movies, desc: "Копенгаген"}
+      - {id: 19, cat: Movies, desc: "Заброшенный"}
+      - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
+      - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
+      - {id: 44, cat: Movies, desc: "Женщина в золотом"}
+      - {id: 45, cat: Movies, desc: "Падение Лондона"}
+      - {id: 46, cat: Movies, desc: "Высотка"}
+      - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
+      - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
+      - {id: 54, cat: Movies, desc: "Охотник: Война Зимы"}
+      - {id: 57, cat: Movies, desc: "Портниха"}
+      - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
+      - {id: 61, cat: Movies, desc: "Комета"}
+      - {id: 64, cat: Movies, desc: "Зоотопия"}
+      - {id: 65, cat: Movies, desc: "В твоих глазах"}
+      - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
+      - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
+      - {id: 70, cat: Movies, desc: "Припаркованные"}
+      - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
+      - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
+      - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
+      - {id: 74, cat: Movies, desc: "Варкрафт"}
+      - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
+      - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+      - {id: 83, cat: Movies, desc: "Возмущение"}
+      - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
+      - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
+      - {id: 90, cat: Movies, desc: "Дангал"}
+      - {id: 100, cat: TV, desc: "Смертельное оружие"}
+      - {id: 101, cat: TV, desc: "Гавайи 5-0"}
+      - {id: 102, cat: TV, desc: "Черный Список"}
+      - {id: 103, cat: TV, desc: "Нелюди"}
+      - {id: 106, cat: TV, desc: "Одаренные"}
+      - {id: 107, cat: TV, desc: "Теория большого взрыва"}
+      - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
+      - {id: 109, cat: TV, desc: "Хроники Шаннары"}
+      - {id: 110, cat: TV, desc: "Порох"}
+      - {id: 112, cat: TV, desc: "Субура"}
+      - {id: 115, cat: TV, desc: "Безбожники"}
+      - {id: 116, cat: TV, desc: "Секретные Материалы"}
+      - {id: 118, cat: TV, desc: "Охотник за разумом"}
+      - {id: 119, cat: TV, desc: "Алиенист"}
+      - {id: 120, cat: TV, desc: "Ординатор"}
+      - {id: 121, cat: TV, desc: "Уэйко"}
+      - {id: 122, cat: TV, desc: "Американская история преступлений"}
+      - {id: 124, cat: TV, desc: "Бельвью"}
+      - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
+      - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
+      - {id: 129, cat: TV, desc: "Взлет"}
+      - {id: 130, cat: TV, desc: "Инстинкт"}
+      - {id: 131, cat: TV, desc: "Стартап"}
+      - {id: 133, cat: TV, desc: "Террор"}
+      - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
+      - {id: 138, cat: TV, desc: "В пустыне смерти"}
+      - {id: 139, cat: TV, desc: "Дождь"}
+      - {id: 140, cat: TV, desc: "Страйк"}
+      - {id: 141, cat: TV, desc: "Безопасность"}
+      - {id: 143, cat: TV, desc: "Подлый пит"}
+      - {id: 144, cat: TV, desc: "Голиаф"}
+      - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
+      - {id: 147, cat: TV, desc: "Королева Сахара"}
+      - {id: 155, cat: TV, desc: "Наследники"}
+      - {id: 156, cat: TV, desc: "Джек Райан"}
+      - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
+      - {id: 161, cat: TV, desc: "Частные сыщики"}
+      - {id: 162, cat: TV, desc: "Изнанка дела"}
+      - {id: 163, cat: TV, desc: "Наркос: Мексика"}
+      - {id: 164, cat: TV, desc: "Возвращение домой"}
+      - {id: 165, cat: TV, desc: "Метод Комински"}
+      - {id: 166, cat: TV, desc: "Элита"}
+      - {id: 167, cat: TV, desc: "Грязный Джон"}
+      - {id: 169, cat: TV, desc: "Романовы"}
+      - {id: 170, cat: TV, desc: "Страна приливов"}
+      - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+      - {id: 172, cat: TV, desc: "Смертельный класс"}
+      - {id: 173, cat: TV, desc: "Парфюм"}
+      - {id: 174, cat: TV, desc: "Цветочный дом"}
+      - {id: 175, cat: TV, desc: "Каратель"}
+      - {id: 176, cat: TV, desc: "Матрёшка"}
+      - {id: 177, cat: TV, desc: "Берлинская резидентура"}
+      - {id: 178, cat: TV, desc: "Настоящий Детектив"}
+      - {id: 179, cat: TV, desc: "Половое Просвещение"}
+      - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
+      - {id: 181, cat: TV, desc: "Сорвиголова"}
+      - {id: 182, cat: TV, desc: "Мистер Посредник"}
+      - {id: 9, cat: TV, desc: "Иерихон"}
+      - {id: 11, cat: TV, desc: "11-22-63"}
+      - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
+      - {id: 13, cat: TV, desc: "Смерть в раю"}
+      - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
+      - {id: 15, cat: TV, desc: "Чёрные паруса"}
+      - {id: 17, cat: TV, desc: "Карточный домик"}
+      - {id: 37, cat: TV, desc: "Джек Айриш"}
+      - {id: 39, cat: TV, desc: "Чужестранка"}
+      - {id: 40, cat: TV, desc: "Девушка по вызову"}
+      - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
+      - {id: 43, cat: TV, desc: "Игра престолов"}
+      - {id: 47, cat: TV, desc: "Острые козырьки"}
+      - {id: 48, cat: TV, desc: "Странная парочка"}
+      - {id: 51, cat: TV, desc: "Проповедник"}
+      - {id: 52, cat: TV, desc: "Изгой"}
+      - {id: 53, cat: TV, desc: "Рэй Донован"}
+      - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
+      - {id: 56, cat: TV, desc: "Бесстыдники"}
+      - {id: 58, cat: TV, desc: "Мистер Робот"}
+      - {id: 59, cat: TV, desc: "Валландер"}
+      - {id: 62, cat: TV, desc: "Штамм"}
+      - {id: 63, cat: TV, desc: "Куорри"}
+      - {id: 68, cat: TV, desc: "Бесстыжие"}
+      - {id: 69, cat: TV, desc: "Нарко"}
+      - {id: 75, cat: TV, desc: "Все схвачено"}
+      - {id: 77, cat: TV, desc: "Граница"}
+      - {id: 79, cat: TV, desc: "Бош"}
+      - {id: 81, cat: TV, desc: "Викинги"}
+      - {id: 82, cat: TV, desc: "Салем"}
+      - {id: 86, cat: TV, desc: "Кровавая Гонка"}
+      - {id: 87, cat: TV, desc: "Сеньор Авила"}
+      - {id: 88, cat: TV, desc: "Стрелок"}
+      - {id: 89, cat: TV, desc: "Миднайт Техас"}
+      - {id: 91, cat: TV, desc: "Утиные Истории"}
+      - {id: 96, cat: TV, desc: "Двойка"}
+      - {id: 97, cat: TV, desc: "Тик-герой"}
+
+    modes:
+      search: [q]
+
+  settings: []
+
+  search:
+    paths:
+    # https://focu.sx/tracker/search?freeleech=0&query=daredevil
+      - path: "{{if .Keywords}}tracker/search?freeleech=0&query={{.Keywords}}{{else}}tracker/{{end}}"
+        followredirect: true
+
+    rows:
+      selector: ol.torrentListItems li.torrentListItem
+    fields:
+      title:
+        selector: div.name div.titleText h3 a
+      details:
+        selector: div.name div.titleText h3 a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "{{ .Config.sitelink }}"
+      category:
+        selector:  div.torrentCategory a
+        attribute: href
+        filters:
+          - name: querystring
+            args: category_id
+      download:
+        selector: div.download a
+        attribute: href
+        filters:
+          - name: prepend
+            args: "{{ .Config.sitelink }}"
+      magnet:
+        selector: div.download a[href^="magnet:?"]
+        attribute: href
+      date:
+        selector: div.name div.titleText div.secondRow div span
+        attribute: title
+        # 7 мар 2019 в 21:06
+        filters:
+          - name: replace
+            args: [" в ", " "]
+          - name: replace
+            args: ["янв", "Jan"]
+          - name: replace
+            args: ["фев", "Feb"]
+          - name: replace
+            args: ["мар", "Mar"]
+          - name: replace
+            args: ["апр", "Apr"]
+          - name: replace
+            args: ["май", "May"]
+          - name: replace
+            args: ["июн", "Jun"]
+          - name: replace
+            args: ["июл", "Jul"]
+          - name: replace
+            args: ["авг", "Aug"]
+          - name: replace
+            args: ["сен", "Sep"]
+          - name: replace
+            args: ["окт", "Oct"]
+          - name: replace
+            args: ["ноя", "Nov"]
+          - name: replace
+            args: ["дек", "Dec"]
+          - name: dateparse
+            args: "2 Jan 2006 15:04"
+      size:
+        selector: div.size
+        filters:
+          - name: replace
+            args: [".", ""] 
+          - name: replace
+            args: [",", "."] 
+          - name: replace
+            args: ["ТБ", "TB"] 
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      grabs:
+        selector: div.snatched
+      seeders:
+        selector: div.seeders
+      leechers:
+        selector: div.leechers
+      downloadvolumefactor:
+        case:
+          "div.name div.titleText h3 span:contains(\"Золото\")": "0"
+          "*": "1"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/freedomhd.yml

@@ -1,160 +0,0 @@
----
-  site: freedomhd
-  name: Freedom-HD
-  description: "Freedom-HD (Freedom Paradise) is a ratioless FRENCH Private Torrent Tracker for HD MOVIES / GENERAL"
-  language: fr-fr
-  type: private
-  encoding: UTF-8
-  links:
-    - http://freedom-paradise.eu/
-
-  download:
-    before:
-      path: list_thanks.php
-      method: "get"
-      inputs:
-        id: "{{ .DownloadUri.Query.id }}"
-        to: "give"
-        torrent: "{{ .DownloadUri.Query.id }}"
-    
-
-  caps:
-    categorymappings:
-      # ANIMES
-      - {id: 105, cat: TV/Anime, desc: "ANIMES 1080p-Bluray"}
-      - {id: 149, cat: TV/Anime, desc: "ANIMES 3D"}
-      - {id: 143, cat: TV/Anime, desc: "ANIMES 4K-2160p"}
-      - {id: 104, cat: TV/Anime, desc: "ANIMES 720p-Bluray"}
-      - {id: 90, cat: TV/Anime, desc: "ANIMES HDrip-720p"}
-      - {id: 93, cat: TV/Anime, desc: "ANIMES HDrip-1080p"}
-      - {id: 131, cat: TV/Anime, desc: "ANIMES SD"}
-      - {id: 120, cat: TV/Anime, desc: "ANIMES X265-1080p"}
-      - {id: 119, cat: TV/Anime, desc: "ANIMES X265-720p"}
-      # DOCUMENTAIRES
-      - {id: 107, cat: TV/Documentary, desc: "DOCS 1080p-Bluray"}
-      - {id: 152, cat: TV/Documentary, desc: "DOCS 2160p-Bluray"}
-      - {id: 106, cat: TV/Documentary, desc: "DOCS 720p-Bluray"}
-      - {id: 94, cat: TV/Documentary, desc: "DOCS HDrip-1080p"}
-      - {id: 91, cat: TV/Documentary, desc: "DOCS HDrip-720p"}
-      - {id: 142, cat: TV/Documentary, desc: "DOCS HDTV"}
-      - {id: 141, cat: TV/Documentary, desc: "DOCS SD"}
-      # EBOOK
-      - {id: 124, cat: Books, desc: "Livres et Magazines"}
-      # FILMS
-      - {id: 97, cat: Movies/HD, desc: "FILMS Bluray-1080p"}
-      - {id: 103, cat: Movies/3D, desc: "FILMS 3D"}
-      - {id: 111, cat: Movies/UHD, desc: "FILMS 4K"}
-      - {id: 96, cat: Movies/HD, desc: "FILMS Bluray-720p"}
-      - {id: 127, cat: Movies/HD, desc: "FILMS BDrip"}
-      - {id: 128, cat: Movies/HD, desc: "FILMS BRrip"}
-      - {id: 140, cat: Movies/HD, desc: "FILMS BSD-Team"}
-      - {id: 126, cat: Movies/SD, desc: "FILMS DVDrip"}
-      - {id: 136, cat: Movies/BluRay, desc: "FILMS Full-Bluray"}
-      - {id: 135, cat: Movies/SD, desc: "FILMS Team Freedom-HD"}
-      - {id: 137, cat: Movies/SD, desc: "FILMS Team ticadow"}
-      - {id: 89, cat: Movies/HD, desc: "FILMS HDrip-720p"}
-      - {id: 92, cat: Movies/HD, desc: "FILMS HDrip-1080p"}
-      - {id: 112, cat: Movies/SD, desc: "FILMS Team-Hush"}
-      - {id: 129, cat: Movies/HD, desc: "FILMS Team-Romkent"}
-      - {id: 125, cat: Movies/Other, desc: "FILMS WEBrip"}
-      - {id: 110, cat: Movies/HD, desc: "FILMS X265-1080p"}
-      - {id: 109, cat: Movies/HD, desc: "FILMS X265-720p"}
-      # GAMES
-      - {id: 134, cat: PC/Games, desc: "jeu PC"}
-      # MUSIQUES
-      - {id: 114, cat: Audio/Lossless, desc: "MUSIQUES Flac"}
-      - {id: 113, cat: Audio/MP3, desc: "MUSIQUES MP3"}
-      - {id: 132, cat: Audio, desc: "MUSIQUES HQ"}
-      - {id: 130, cat: Audio/Video, desc: "MUSIQUES video clip"}
-      # SERIE
-      - {id: 121, cat: TV/SD, desc: "SERIE SD"}
-      - {id: 102, cat: TV/HD, desc: "SERIE 1080p-Bluray"}
-      - {id: 101, cat: TV/HD, desc: "SERIE 720p-Bluray"}
-      - {id: 100, cat: TV/HD, desc: "SERIE HDrip-1080p"}
-      - {id: 99, cat: TV/HD, desc: "SERIE HDrip-720p"}
-      - {id: 151, cat: TV/UHD, desc: "SERIE HDrip-2160p"}
-      # SPECTACLES
-      - {id: 138, cat: TV, desc: "SPECTACLES Bluray-1080p"}
-      - {id: 139, cat: TV, desc: "SPECTACLES Bluray-720p"}
-      - {id: 133, cat: TV, desc: "SPECTACLES DVDrip"}
-      - {id: 118, cat: TV, desc: "SPECTACLES HDrip-1080p"}
-      - {id: 117, cat: TV, desc: "SPECTACLES HDrip-720p"}
-      # SPORT
-      - {id: 146, cat: TV/Sport, desc: "SPORT HDTV-1080p"}
-      - {id: 147, cat: TV/Sport, desc: "SPORT HDTV-720p"}
-      - {id: 148, cat: TV/Sport, desc: "SPORT SD"}
-      - {id: 144, cat: TV/Sport, desc: "SPORT WEB-DL-1080p"}
-      - {id: 145, cat: TV/Sport, desc: "SPORT WEB-DL-720p"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  login:
-    path: account-login.php
-    method: post
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      remember: "yes"
-      returnto: "/"
-    error:
-      - selector: div.myFrame:has(font.error)
-    test:
-      path: torrents-search.php
-      selector: a.logout
-
-  search:
-    paths:
-      - path: torrents-search.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-
-    rows:
-      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
-      filters:
-        - name: andmatch
-      after: 1
-    fields:
-      download:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["torrents-details.php", "download.php"]
-      title:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: title
-      category:
-        selector: a[href^="torrents.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="torrents-details.php?id="]
-        attribute: href
-      description:
-        selector: ul
-      banner:
-        selector: img.rounded-img
-        attribute: src
-      size:
-        selector: td:nth-child(3)
-      grabs:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(4)
-      leechers:
-        selector: td:nth-child(5)
-      date:
-        text: now
-      downloadvolumefactor:
-        case:
-          img[alt="freeleech"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/freetorrent.yml

@@ -19,10 +19,10 @@
       - {id: 7, cat: TV, desc: "Animations"}
       - {id: 8, cat: PC, desc: "Linux"}
       - {id: 9, cat: PC/Mac, desc: "MacOS"}
-      - {id: 10, cat: PC/Phone-Android, desc: "Android app"}
-      - {id: 11, cat: PC/Phone-Android, desc: "Android ROMs"}
       - {id: 12, cat: TV/Documentary, desc: "Documentaries"}
       - {id: 13, cat: TV, desc: "Shows"}
+      - {id: 14, cat: Audio/Video, desc: "Music clips"}
+      - {id: 15, cat: PC/Phone-Android, desc: "Apps APK"}
 
     modes:
       search: [q]
@@ -35,10 +35,21 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
+      selector: a[href$="/logout"]
+      
+  ratio:
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -46,6 +57,7 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
@@ -71,20 +83,30 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
       imdb:
         optional: true
-        selector: a[href^="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       date:
         selector: time
@@ -114,13 +136,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
           "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.3

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -7,8 +7,6 @@
   encoding: UTF-8
   links:
     - https://www.frozen-layer.com/
-  certificates:
-    - 001bc21dd13b54b05106b510a327a7182ec443a4
 
   settings:
     - name: category

src/Jackett.Common/Definitions/fullmixmusic.yml

@@ -16,6 +16,7 @@
 
     modes:
       search: [q]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: login.php
@@ -32,7 +33,7 @@
     paths:
       - path: browse.php
     inputs:
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       showsearch: "1"
       incldead: "1"
     rows:

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -51,7 +51,7 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: takelogin.php
@@ -69,7 +69,7 @@
       - path: browse.php
     inputs:
       #$raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       incldead: 1
     rows:
       selector: table.mainouter > tbody > tr > td.outer > table > tbody > tr.mouse_out

src/Jackett.Common/Definitions/generationfree.yml

@@ -0,0 +1,208 @@
+---
+  site: generationfree
+  name: Generation-Free
+  description: "Generation-Free is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://generation-free.biz/
+
+  caps:
+    categorymappings:
+      - {id: 10, cat: TV/HD, desc: "Animation: HD720P"}
+      - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"}
+      - {id: 56, cat: TV/SD, desc: "Animation: DVDRip"}
+      - {id: 13, cat: TV/SD, desc: "Animation: DVD"}
+      - {id: 105, cat: TV/HD, desc: "Animation: Bluray"}
+      - {id: 106, cat: TV/HD, desc: "Animation: HDTV"}
+      - {id: 108, cat: TV/WEB-DL, desc: "Animation: WEBDL"}
+      - {id: 109, cat: TV/WEB-DL, desc: "Animation: WEBRIP"}
+      - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+      - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+      - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Applications: Mobile Phone"}
+      - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
+      - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
+      - {id: 40, cat: PC, desc: "Applications: Linux"}
+      - {id: 67, cat: TV/OTHER, desc: "Autres: Emission TV"}
+      - {id: 118, cat: TV/Documentary, desc: "Documentaires: Sport"}
+      - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
+      - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
+      - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
+      - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
+      - {id: 51, cat: Books/Ebook, desc: "E-Books: BD"}
+      - {id: 50, cat: Books/Ebook, desc: "E-Books: Manuel Français"}
+      - {id: 49, cat: Books/Ebook, desc: "E-Books: Manuel Anglais"}
+      - {id: 36, cat: Books/Ebook, desc: "E-Books: Livres Français"}
+      - {id: 53, cat: Books/Ebook, desc: "E-Books: Livre Anglais"}
+      - {id: 52, cat: Books/Ebook, desc: "E-Books: Revue - Journaux"}
+      - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
+      - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
+      - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
+      - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
+      - {id: 89, cat: Movies/BluRay, desc: "Films: BD/BR Rip"}
+      - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
+      - {id: 94, cat: Movies/DVD, desc: "Films: DVDscreen"}
+      - {id: 91, cat: Movies, desc: "Films: RemuX"}
+      - {id: 104, cat: Movies/BluRay, desc: "Films: Film-BDRip"}
+      - {id: 110, cat: Movies/WEBDL, desc: "Films: WEBRip"}
+      - {id: 111, cat: Movies/WEBDL, desc: "Films: WEBRip-720p-P"}
+      - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"}
+      - {id: 102, cat: Movies/WEBDL, desc: "Films: WEB-DL 720P"}
+      - {id: 101, cat: Movies/WEBDL, desc: "Films: WEB-DL 1080P"}
+      - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
+      - {id: 100, cat: Movies/UHD, desc: "Films: 4KLight"}
+      - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
+      - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
+      - {id: 65, cat: TV, desc: "Films: VO"}
+      - {id: 72, cat: TV/HD, desc: "Films: TVRip/HDTV"}
+      - {id: 96, cat: Movies/HD, desc: "Films: HDlight"}
+      - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
+      - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
+      - {id: 57, cat: TV, desc: "Films: TS/CAM"}
+      - {id: 59, cat: TV, desc: "Films: Spectacle"}
+      - {id: 87, cat: XXX, desc: "Films: XXX"}
+      - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
+      - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
+      - {id: 1, cat: Movies/HD, desc: "Films: HD720P"}
+      - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
+      - {id: 90, cat: Movies/HD, desc: "Films: HD X265"}
+      - {id: 112, cat: Movies/WEBDL, desc: "Films: WEBrip-1080-P"}
+      - {id: 77, cat: PC/Phone-Other, desc: "GPS: Cartes"}
+      - {id: 78, cat: PC/Phone-Other, desc: "GPS: Radars"}
+      - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"}
+      - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"}
+      - {id: 97, cat: Audio, desc: "Musique: Podcast"}
+      - {id: 98, cat: Audio, desc: "Musique: karaoké"}
+      - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
+      - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+      - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
+      - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
+      - {id: 115, cat: Audio/MP3, desc: "Musique: Coffret mp3"}
+      - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+      - {id: 116, cat: Audio/Lossless, desc: "Musique: Coffret flac"}
+      - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+      - {id: 58, cat: Audio, desc: "Musique: Concert"}
+      - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
+      - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
+      - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
+      - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
+      - {id: 113, cat: TV, desc: "Serie TV: Episode QC"}
+      - {id: 114, cat: TV, desc: "Serie TV: Saison QC"}
+      - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
+      - {id: 74, cat: TV/HD, desc: "Serie TV: TVRip/HDTV"}
+      - {id: 12, cat: TV, desc: "Serie TV: Animation"}
+      - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
+      - {id: 120, cat: TV/HD, desc: "Serie TV: Episode Bluray 1080p"}
+      - {id: 121, cat: TV/HD, desc: "Serie TV: Saison Bluray 720p"}
+      - {id: 122, cat: TV/HD, desc: "Serie TV: Saison Bluray 1080p"}
+      - {id: 119, cat: TV/HD, desc: "Serie TV: Episode Bluray 720p"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: multilang
+      type: checkbox
+      label: Replace MULTI by another language in release name
+      default:  false
+    - name: multilanguage
+      type: select
+      label: Replace MULTI by this language
+      default: VOSTFR
+      options:
+        FRENCH : "FRENCH"
+        "MULTI FRENCH": "MULTI FRENCH"
+        ENGLISH: "ENGLISH"
+        "MULTI ENGLISH": "MULTI ENGLISH"
+        VOSTFR: "VOSTFR"
+        "MULTI VOSTFR": "MULTI VOSTFR"
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+    - selector: td.tboxhead
+    test:
+      path: torrents-search.php
+      selector: a[href="account-logout.php"]
+
+  download:
+    before:
+      path: "list_thanks.php"
+      method: "get"
+      inputs:
+        id: "{{ .DownloadUri.Query.id }}"
+        to: "give"
+        torrent: "{{ .DownloadUri.Query.id }}"
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+    # 40 results per page
+      - path: torrents-search.php
+      - path: torrents-search.php
+        inputs:
+          page: 1
+    inputs:
+#      multi cats unsupported, defaulting to all
+      cat: 0
+      search: "{{ .Keywords }}"
+      incldead: 1
+      freeleech: 0
+      inclexternal: 0
+      lang: 0
+      sort: id
+      order: desc
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr.t-row
+    fields:
+      title_original:
+        selector: a[href^="torrents-details.php?id="] b
+      title_multilang:
+        text: "{{ .Result.title_original }}"
+        filters:
+          - name: re_replace
+            args: ["\\s[Mm][Uu][Ll][Tt][Ii]\\s", " {{ .Config.multilanguage }} "]
+      title:
+        text: "{{if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_original }}{{end}}"
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      date:
+        text: now
+      downloadvolumefactor:
+        case:
+          img[src="images/fl.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett.Common/Definitions/gfxnews.yml

@@ -1,322 +0,0 @@
----
-  site: gfxnews
-  name: Gfxnews
-  description: "GFXNews is a Private Torrent Tracker for GRAPHICS SOFTWARE / TUTORIALS / ETC"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - http://forum.gfxnews.org/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Other, desc: "3D CONTENT"}
-      - {id: 204, cat: Other, desc: "3D CONTENT/3D Total"}
-      - {id: 106, cat: Other, desc: "3D CONTENT/AmbientLight"}
-      - {id: 215, cat: Other, desc: "3D CONTENT/Archvision"}
-      - {id: 214, cat: Other, desc: "3D CONTENT/Arroway"}
-      - {id: 216, cat: Other, desc: "3D CONTENT/AsileFX"}
-      - {id: 218, cat: Other, desc: "3D CONTENT/Axyz Design"}
-      - {id: 217, cat: Other, desc: "3D CONTENT/Daz3D"}
-      - {id: 136, cat: Other, desc: "3D CONTENT/DoschDesign"}
-      - {id: 213, cat: Other, desc: "3D CONTENT/Evermotion"}
-      - {id: 175, cat: Other, desc: "3D CONTENT/ImageCel"}
-      - {id: 162, cat: Other, desc: "3D CONTENT/Marlin Studios 3D"}
-      - {id: 174, cat: Other, desc: "3D CONTENT/PsicoSonic"}
-      - {id: 2, cat: PC, desc: "APPS"}
-      - {id: 29, cat: PC/ISO, desc: "APPS/ISO"}
-      - {id: 30, cat: PC, desc: "APPS/RIP"}
-      - {id: 201, cat: PC, desc: "APPS/CAD/CAM/CAE"}
-      - {id: 31, cat: PC, desc: "APPS/Adobe Plugins"}
-      - {id: 200, cat: PC, desc: "APPS/Archicad Plugins"}
-      - {id: 198, cat: PC, desc: "APPS/Avid Plugin"}
-      - {id: 38, cat: PC, desc: "APPS/Cinema 4D Plugin"}
-      - {id: 32, cat: PC, desc: "APPS/3DMax Plugins"}
-      - {id: 33, cat: PC, desc: "APPS/LW Plugins"}
-      - {id: 34, cat: PC, desc: "APPS/Maya Plugins"}
-      - {id: 10, cat: Books, desc: "BOOKS"}
-      - {id: 236, cat: Books/Magazines, desc: "BOOKS/Magazines"}
-      - {id: 11, cat: Other, desc: "DEVELOPMENT"}
-      - {id: 228, cat: Other, desc: "FILMMAKING & VIDEO PR."}
-      - {id: 3, cat: Other, desc: "FONTS"}
-      - {id: 4, cat: Other, desc: "FOOTAGE"}
-      - {id: 54, cat: Other, desc: "FOOTAGE/12 INCH Design"}
-      - {id: 40, cat: Other, desc: "FOOTAGE/3D Bank"}
-      - {id: 50, cat: Other, desc: "FOOTAGE/3D Fon"}
-      - {id: 55, cat: Other, desc: "FOOTAGE/5 THINGS"}
-      - {id: 46, cat: Other, desc: "FOOTAGE/Actionback"}
-      - {id: 56, cat: Other, desc: "FOOTAGE/Adobe Image Library Video"}
-      - {id: 57, cat: Other, desc: "FOOTAGE/Alien Box/Tommy Back"}
-      - {id: 58, cat: Other, desc: "FOOTAGE/Animation Factory"}
-      - {id: 41, cat: Other, desc: "FOOTAGE/Artbeats"}
-      - {id: 59, cat: Other, desc: "FOOTAGE/Canopus"}
-      - {id: 87, cat: Other, desc: "FOOTAGE/Capital DV Studio"}
-      - {id: 60, cat: Other, desc: "FOOTAGE/Corbis Video"}
-      - {id: 48, cat: Other, desc: "FOOTAGE/Datacraft Video"}
-      - {id: 61, cat: Other, desc: "FOOTAGE/Digital Brewery"}
-      - {id: 42, cat: Other, desc: "FOOTAGE/Digital Juice Video"}
-      - {id: 44, cat: Other, desc: "FOOTAGE/Digital Hotcakes"}
-      - {id: 62, cat: Other, desc: "FOOTAGE/Digital Preserves"}
-      - {id: 43, cat: Other, desc: "FOOTAGE/Digital Vision Video"}
-      - {id: 51, cat: Other, desc: "FOOTAGE/Dosch Video"}
-      - {id: 63, cat: Other, desc: "FOOTAGE/DV Club"}
-      - {id: 53, cat: Other, desc: "FOOTAGE/Easymotion"}
-      - {id: 49, cat: Other, desc: "FOOTAGE/Eyewire"}
-      - {id: 64, cat: Other, desc: "FOOTAGE/F4 Studio"}
-      - {id: 52, cat: Other, desc: "FOOTAGE/Film Disk"}
-      - {id: 88, cat: Other, desc: "FOOTAGE/FreedomFX"}
-      - {id: 65, cat: Other, desc: "FOOTAGE/Fuzion Films"}
-      - {id: 66, cat: Other, desc: "FOOTAGE/HyperEye"}
-      - {id: 67, cat: Other, desc: "FOOTAGE/Marlin Studios Video"}
-      - {id: 68, cat: Other, desc: "FOOTAGE/Motionloops"}
-      - {id: 69, cat: Other, desc: "FOOTAGE/MovieStock"}
-      - {id: 70, cat: Other, desc: "FOOTAGE/Prismo"}
-      - {id: 71, cat: Other, desc: "FOOTAGE/Pro-Motion"}
-      - {id: 72, cat: Other, desc: "FOOTAGE/ProCimar"}
-      - {id: 47, cat: Other, desc: "FOOTAGE/Rab-Byte"}
-      - {id: 73, cat: Other, desc: "FOOTAGE/Rhino House"}
-      - {id: 74, cat: Other, desc: "FOOTAGE/Rubberball Video"}
-      - {id: 75, cat: Other, desc: "FOOTAGE/Shiny DV"}
-      - {id: 76, cat: Other, desc: "FOOTAGE/ShowStoppers FX"}
-      - {id: 45, cat: Other, desc: "FOOTAGE/STASH"}
-      - {id: 77, cat: Other, desc: "FOOTAGE/Studio BS"}
-      - {id: 78, cat: Other, desc: "FOOTAGE/Taste Media"}
-      - {id: 79, cat: Other, desc: "FOOTAGE/Thinkstock"}
-      - {id: 84, cat: Other, desc: "FOOTAGE/Thought Equity"}
-      - {id: 80, cat: Other, desc: "FOOTAGE/TimeImage"}
-      - {id: 81, cat: Other, desc: "FOOTAGE/Ulead Pick-a-Video"}
-      - {id: 82, cat: Other, desc: "FOOTAGE/Video Copilot"}
-      - {id: 86, cat: Other, desc: "FOOTAGE/vce.com"}
-      - {id: 85, cat: Other, desc: "FOOTAGE/Video3D.RU"}
-      - {id: 83, cat: Other, desc: "FOOTAGE/Wededit.RU"}
-      - {id: 5, cat: PC/Mac, desc: "MAC"}
-      - {id: 36, cat: Other, desc: "LINUX"}
-      - {id: 6, cat: Other, desc: "PHOTOSTOCK"}
-      - {id: 108, cat: Other, desc: "PHOTOSTOCK/Apply Pictures"}
-      - {id: 109, cat: Other, desc: "PHOTOSTOCK/Aridi"}
-      - {id: 110, cat: Other, desc: "PHOTOSTOCK/Art Explosion"}
-      - {id: 111, cat: Other, desc: "PHOTOSTOCK/Artbeats Photo"}
-      - {id: 112, cat: Other, desc: "PHOTOSTOCK/Artville"}
-      - {id: 202, cat: Other, desc: "PHOTOSTOCK/AsiaImageBank"}
-      - {id: 114, cat: Other, desc: "PHOTOSTOCK/BackArts"}
-      - {id: 115, cat: Other, desc: "PHOTOSTOCK/BananaStock"}
-      - {id: 116, cat: Other, desc: "PHOTOSTOCK/Bee-Line"}
-      - {id: 117, cat: Other, desc: "PHOTOSTOCK/Brand X"}
-      - {id: 145, cat: Other, desc: "PHOTOSTOCK/Broderbund"}
-      - {id: 135, cat: Other, desc: "PHOTOSTOCK/Central Stock"}
-      - {id: 119, cat: Other, desc: "PHOTOSTOCK/Circa Art"}
-      - {id: 205, cat: Other, desc: "PHOTOSTOCK/China Stock"}
-      - {id: 120, cat: Other, desc: "PHOTOSTOCK/Classic PIO Partnership"}
-      - {id: 121, cat: Other, desc: "PHOTOSTOCK/Club Scorpius"}
-      - {id: 122, cat: Other, desc: "PHOTOSTOCK/ComStock"}
-      - {id: 123, cat: Other, desc: "PHOTOSTOCK/Corbis RF"}
-      - {id: 124, cat: Other, desc: "PHOTOSTOCK/Corel"}
-      - {id: 125, cat: Other, desc: "PHOTOSTOCK/Creatas"}
-      - {id: 126, cat: Other, desc: "PHOTOSTOCK/DAJ"}
-      - {id: 127, cat: Other, desc: "PHOTOSTOCK/Datacraft Photo"}
-      - {id: 128, cat: Other, desc: "PHOTOSTOCK/Dex Image"}
-      - {id: 129, cat: Other, desc: "PHOTOSTOCK/DiAMAR"}
-      - {id: 130, cat: Other, desc: "PHOTOSTOCK/Digigra"}
-      - {id: 131, cat: Other, desc: "PHOTOSTOCK/Digital Juice Drops"}
-      - {id: 132, cat: Other, desc: "PHOTOSTOCK/Digital Vision"}
-      - {id: 133, cat: Other, desc: "PHOTOSTOCK/DigiTouch"}
-      - {id: 134, cat: Other, desc: "PHOTOSTOCK/Discovery"}
-      - {id: 137, cat: Other, desc: "PHOTOSTOCK/Dover"}
-      - {id: 139, cat: Other, desc: "PHOTOSTOCK/Eyewire Photo"}
-      - {id: 140, cat: Other, desc: "PHOTOSTOCK/Fancy"}
-      - {id: 222, cat: Other, desc: "PHOTOSTOCK/FStop"}
-      - {id: 219, cat: Other, desc: "PHOTOSTOCK/GlowImages"}
-      - {id: 141, cat: Other, desc: "PHOTOSTOCK/GoodShoot"}
-      - {id: 206, cat: Other, desc: "PHOTOSTOCK/GoMedia"}
-      - {id: 143, cat: Other, desc: "PHOTOSTOCK/Hakata"}
-      - {id: 146, cat: Other, desc: "PHOTOSTOCK/Health Head"}
-      - {id: 144, cat: Other, desc: "PHOTOSTOCK/Hemera"}
-      - {id: 147, cat: Other, desc: "PHOTOSTOCK/iDREAM stock"}
-      - {id: 148, cat: Other, desc: "PHOTOSTOCK/Image Kit"}
-      - {id: 149, cat: Other, desc: "PHOTOSTOCK/Image Making"}
-      - {id: 150, cat: Other, desc: "PHOTOSTOCK/Image100"}
-      - {id: 151, cat: Other, desc: "PHOTOSTOCK/ImageDJ"}
-      - {id: 152, cat: Other, desc: "PHOTOSTOCK/ImageFarm"}
-      - {id: 203, cat: Other, desc: "PHOTOSTOCK/ImageIdeas"}
-      - {id: 153, cat: Other, desc: "PHOTOSTOCK/ImageMore"}
-      - {id: 154, cat: Other, desc: "PHOTOSTOCK/Imagesource (Electra Visi.."}
-      - {id: 159, cat: Other, desc: "PHOTOSTOCK/Imagestate (John Foxx)"}
-      - {id: 160, cat: Other, desc: "PHOTOSTOCK/Ingram Publishing"}
-      - {id: 155, cat: Other, desc: "PHOTOSTOCK/iStockPhotos"}
-      - {id: 156, cat: Other, desc: "PHOTOSTOCK/Ivan Ivanich"}
-      - {id: 157, cat: Other, desc: "PHOTOSTOCK/Izosoft"}
-      - {id: 161, cat: Other, desc: "PHOTOSTOCK/Lushpix"}
-      - {id: 163, cat: Other, desc: "PHOTOSTOCK/Medio"}
-      - {id: 164, cat: Other, desc: "PHOTOSTOCK/MH Foto Design"}
-      - {id: 165, cat: Other, desc: "PHOTOSTOCK/Mixa"}
-      - {id: 166, cat: Other, desc: "PHOTOSTOCK/OdinKot"}
-      - {id: 223, cat: Other, desc: "PHOTOSTOCK/Ojoimages"}
-      - {id: 167, cat: Other, desc: "PHOTOSTOCK/Pepin Press"}
-      - {id: 168, cat: Other, desc: "PHOTOSTOCK/PhotoAlto"}
-      - {id: 169, cat: Other, desc: "PHOTOSTOCK/Photodisc"}
-      - {id: 170, cat: Other, desc: "PHOTOSTOCK/PhotoSpin"}
-      - {id: 171, cat: Other, desc: "PHOTOSTOCK/PixLand"}
-      - {id: 172, cat: Other, desc: "PHOTOSTOCK/Pixtal"}
-      - {id: 173, cat: Other, desc: "PHOTOSTOCK/Planet Art"}
-      - {id: 176, cat: Other, desc: "PHOTOSTOCK/Rubberball"}
-      - {id: 177, cat: Other, desc: "PHOTOSTOCK/Shibvisi"}
-      - {id: 225, cat: Other, desc: "PHOTOSTOCK/Shutterstock"}
-      - {id: 179, cat: Other, desc: "PHOTOSTOCK/Spotty"}
-      - {id: 180, cat: Other, desc: "PHOTOSTOCK/StockDisc"}
-      - {id: 181, cat: Other, desc: "PHOTOSTOCK/StockByte"}
-      - {id: 182, cat: Other, desc: "PHOTOSTOCK/Tattoo"}
-      - {id: 183, cat: Other, desc: "PHOTOSTOCK/Think Stock"}
-      - {id: 184, cat: Other, desc: "PHOTOSTOCK/Ulead Pick-a-Photo"}
-      - {id: 185, cat: Other, desc: "PHOTOSTOCK/Visual Language"}
-      - {id: 186, cat: Other, desc: "PHOTOSTOCK/Zedcor DeskGallery"}
-      - {id: 191, cat: Other, desc: "PHOTOSTOCK/ZZVE"}
-      - {id: 8, cat: Other, desc: "TEMPLATES"}
-      - {id: 107, cat: Other, desc: "TEMPLATES/Animation Factory Photo"}
-      - {id: 209, cat: Other, desc: "TEMPLATES/Atmosphere Studio"}
-      - {id: 210, cat: Other, desc: "TEMPLATES/Boxedart"}
-      - {id: 212, cat: Other, desc: "TEMPLATES/DG Foto Art Gallerias"}
-      - {id: 211, cat: Other, desc: "TEMPLATES/DriveArt"}
-      - {id: 207, cat: Other, desc: "TEMPLATES/DreamTemplate"}
-      - {id: 190, cat: Other, desc: "TEMPLATES/Iconbase"}
-      - {id: 178, cat: Other, desc: "TEMPLATES/SPC International"}
-      - {id: 208, cat: Other, desc: "TEMPLATES/TemplateMonster"}
-      - {id: 231, cat: Other, desc: "TEMPLATES/Videohive"}
-      - {id: 9, cat: Books, desc: "TUTORIALS"}
-      - {id: 95, cat: Books, desc: "TUTORIALS/3D Garage"}
-      - {id: 105, cat: Books, desc: "TUTORIALS/3D Trainer"}
-      - {id: 96, cat: Books, desc: "TUTORIALS/AsileFX Tutorial"}
-      - {id: 100, cat: Books, desc: "TUTORIALS/Autodesk / Alias"}
-      - {id: 196, cat: Books, desc: "TUTORIALS/Cartoon Smart"}
-      - {id: 192, cat: Books, desc: "TUTORIALS/CG Academy"}
-      - {id: 234, cat: Books, desc: "TUTORIALS/cmiVFX"}
-      - {id: 195, cat: Books, desc: "TUTORIALS/Desktop Images"}
-      - {id: 102, cat: Books, desc: "TUTORIALS/Digital Art"}
-      - {id: 93, cat: Books, desc: "TUTORIALS/Digital Tutors"}
-      - {id: 194, cat: Books, desc: "TUTORIALS/Digital Media"}
-      - {id: 232, cat: Books, desc: "TUTORIALS/EAT3D"}
-      - {id: 97, cat: Books, desc: "TUTORIALS/FXphd"}
-      - {id: 92, cat: Books, desc: "TUTORIALS/Gnomonology"}
-      - {id: 193, cat: Books, desc: "TUTORIALS/KW Media Group"}
-      - {id: 98, cat: Books, desc: "TUTORIALS/Lost Pencil"}
-      - {id: 94, cat: Books, desc: "TUTORIALS/Luxology"}
-      - {id: 89, cat: Books, desc: "TUTORIALS/Lynda.com"}
-      - {id: 199, cat: Books, desc: "TUTORIALS/MacProVideo.com"}
-      - {id: 99, cat: Books, desc: "TUTORIALS/Simply Maya"}
-      - {id: 189, cat: Books, desc: "TUTORIALS/Softimage"}
-      - {id: 104, cat: Books, desc: "TUTORIALS/Technical Animation"}
-      - {id: 90, cat: Books, desc: "TUTORIALS/The Gnomon Workshop"}
-      - {id: 91, cat: Books, desc: "TUTORIALS/Total Training"}
-      - {id: 103, cat: Books, desc: "TUTORIALS/Turbo Squid"}
-      - {id: 230, cat: Books, desc: "TUTORIALS/TutPlus"}
-      - {id: 235, cat: Books, desc: "TUTORIALS/Video2Brain"}
-      - {id: 101, cat: Books, desc: "TUTORIALS/VTC"}
-      - {id: 233, cat: Books, desc: "TUTORIALS/ZbrushWorkshops"}
-      - {id: 187, cat: Other, desc: "PHOTOGRAPHY"}
-      - {id: 188, cat: Other, desc: "TRADITIONAL ART"}
-
-    modes:
-      search: [q]
-
-  login:
-    path: login.php
-    method: post
-    inputs:
-      "login_username": "{{ .Config.username }}"
-      "login_password": "{{ .Config.password }}"
-      autologin: 1
-      login: "Log in"
-    error:
-      - selector: td.thead
-        message:
-          selector: td.thead b
-    test:
-      path: tracker.php
-      selector: li a[href^="login.php?logout=1"]
-
-  search:
-    paths:
-      - path: tracker.php
-        method: post
-    inputs:
-      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
-      prev_a: 0
-      prev_dla: 0
-      prev_dlc: 0
-      prev_dld: 0
-      prev_dlw: 0
-      prev_my: 0
-      prev_new: 0
-      prev_sd: 0
-      prev_da: 1
-      prev_dc: 0
-      prev_df: 1
-      prev_ds: 0
-      prev_date_from: ""
-      prev_date_to: ""
-      prev_hide_rereg: 0
-      o: 1
-      s: 2
-      df: 1
-      da: 1
-      date_from: ""
-      date_to: ""
-      nm: "{{ .Keywords }}"
-      helper_sortby: "date"
-      pn: ""
-      submit: "Search"
-
-    rows:
-      selector: table > tbody > tr:has(a[href^="download.php?id="])
-      dateheaders:
-        selector: td.menu[colspan="17"] > b
-        filters:
-          - name: dateparse
-            args: "2-Jan-06"
-    fields:
-      title:
-        selector: td a[href^="./viewtopic.php?t="]
-      details:
-        selector: td a[href^="./viewtopic.php?t="]
-        attribute: href
-      download:
-        selector: td a[href^="download.php?id="]
-        attribute: href
-      category:
-        selector: td a[href^="tracker.php?f="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: f
-      size:
-        text: "0 B"
-      size:
-        optional: true
-        selector: td:contains(\00a0GB)
-      size:
-        optional: true
-        selector: td:contains(\00a0MB)
-      size:
-        optional: true
-        selector: td:contains(\00a0kB)
-      size:
-        optional: true
-        selector: td:contains(\00a0B)
-      seeders:
-        text: "0"
-      seeders:
-        optional: true
-        selector: td[title="Seeders"]
-      leechers:
-        text: "0"
-      leechers:
-        optional: true
-        selector: td[title="Leechers"]
-      grabs:
-        text: "0"
-      grabs:
-        optional: true
-        selector: td[title^="Replies:"]
-      downloadvolumefactor:
-        text: "1"
-      uploadvolumefactor:
-        text: "1"

src/Jackett.Common/Definitions/girotorrent.yml

@@ -155,8 +155,12 @@
       title:
         selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
         filters:
+          # - name: re_replace # replace special characters with " " (space)
+          #   args: ["[^a-zA-Z0-9\\s]|\\.", " "]
           - name: re_replace # replace special characters with " " (space)
-            args: ["[^a-zA-Z0-9\\s]|\\.", " "]
+            args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
+          - name: diacritics
+            args: replace
           - name: re_replace # replace multiple spaces
             args: ["[ ]{2,}", " "]
           # normalize to SXXEYY format

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://www.gktorrent.net/
+    - https://www.gktorrent.biz/
   legacylinks:
     - https://www.gktorrent.com/
     - http://www.gktorrent.com/
@@ -25,6 +25,7 @@
     - https://www.rantop.org/
     - https://www.gktorrent.cx/
     - https://www.gktorrent.tv/
+    - https://www.gktorrent.net/
 
   caps:
     categorymappings:
@@ -44,7 +45,7 @@
   settings: []
 
   download:
-    selector: a[href*="/get_torrent/"]
+    selector: a[href^="/download/"]
 
   search:
     paths:

src/Jackett.Common/Definitions/gods.yml

@@ -1,165 +0,0 @@
----
-  site: gods
-  name: GODS
-  description: "GODS is a German Private site for TV / MOVIES / GENERAL"
-  language: de-de
-  type: private
-  encoding: windows-1252
-  links:
-    - https://gods.lu/
-
-  caps:
-    categorymappings:
-      # Movie
-      - {id: 132, cat: Movies/BluRay, desc: "BluRay"}
-      - {id: 146, cat: Movies/HD, desc: "Remux"}
-      - {id: 186, cat: Movies/UHD, desc: "UHD"}
-      - {id: 189, cat: Movies/HD, desc: "HD"}
-      - {id: 190, cat: Movies/SD, desc: "SD"}
-      - {id: 20, cat: Movies/DVD, desc: "DVD"}
-      - {id: 131, cat: Movies/3D, desc: "3D"}
-      - {id: 16, cat: Movies, desc: "Packs"}
-
-      # Serien
-      - {id: 187, cat: TV/UHD, desc: "Staffeln UHD"}
-      - {id: 173, cat: TV/HD, desc: "Staffeln HD"}
-      - {id: 133, cat: TV/SD, desc: "Staffeln SD"}
-      - {id: 188, cat: TV/UHD, desc: "Folgen UHD"}
-      - {id: 174, cat: TV/HD, desc: "Folgen HD"}
-      - {id: 7, cat: TV/SD, desc: "Folgen SD"}
-
-      # Doku
-      - {id: 152, cat: TV/Documentary, desc: "HD"}
-      - {id: 153, cat: TV/Documentary, desc: "SD"}
-
-      # Spiele
-      - {id: 4, cat: PC/Games, desc: "Windows"}
-      - {id: 29, cat: Console/XBox360, desc: "XBOX 360"}
-      - {id: 126, cat: Console/Wii, desc: "Wii"}
-      - {id: 183, cat: Console/Wii, desc: "Wii U"}
-      - {id: 128, cat: Console/PS3, desc: "PS3"}
-      - {id: 154, cat: Console/Other, desc: "Andere"}
-
-      # Musik
-      - {id: 6, cat: Audio, desc: "Alben"}
-      - {id: 139, cat: Audio/Lossless, desc: "Lossless"}
-      - {id: 177, cat: Audio, desc: "Singles"}
-      - {id: 157, cat: Audio, desc: "Charts"}
-      - {id: 192, cat: Audio, desc: "Packs"}
-      - {id: 161, cat: Audio/Video, desc: "Video"}
-
-      - {id: 22, cat: PC/0day, desc: "Windows"}
-      - {id: 129, cat: PC/Mac, desc: "Mac OS"}
-      - {id: 164, cat: PC/0day, desc: "Linux"}
-      - {id: 124, cat: PC/Phone-Android, desc: "Android"}
-      - {id: 165, cat: PC/Phone-IOS, desc: "Apple iOS"}
-      - {id: 167, cat: PC/Phone-Other, desc: "Andere"}
-
-      # Sport
-      - {id: 130, cat: TV/Sport, desc: "HD"}
-      - {id: 135, cat: TV/Sport, desc: "SD"}
-
-      #  International
-      - {id: 170, cat: Movies/Foreign, desc: "Filme HD"}
-      - {id: 134, cat: Movies/Foreign, desc: "Filme SD"}
-      - {id: 171, cat: TV/Foreign, desc: "Folgen HD"}
-      - {id: 172, cat: TV/Foreign, desc: "Folgen SD"}
-
-      # Sonstiges
-      - {id: 28, cat: TV/Anime, desc: "Anime"}
-      - {id: 13, cat: Books, desc: "e-Book"}
-      - {id: 11, cat: Audio/Audiobook, desc: "Hören"}
-      - {id: 136, cat: Other, desc: "Bilder"}
-      - {id: 9, cat: Other, desc: "Tutorial"}
-      - {id: 178, cat: Other, desc: "Anderes"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: pin
-      type: text
-      label: Pin
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-
-  login:
-    path: login/
-    method: form
-    form: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      pin: "{{ .Config.pin }}"
-    test:
-      path: browse.php
-
-  search:
-    paths:
-      - path: browse.php
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      intitle: "1"
-      incldead: "1"
-      team: "0"
-      orderby: "added"
-      sort: desc
-    rows:
-      selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
-    fields:
-      title:
-        selector: a[href^="details.php"]
-      banner:
-        selector: a[href^="details.php"] > span > img
-        attribute: src
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      details:
-        selector: a[href^="details.php"]
-        attribute: href
-      comments:
-        selector: a[href*="&tocomm="]
-        attribute: href
-      download:
-        selector: a[href^="download.php"]
-        attribute: href
-      files:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
-      grabs:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
-      size:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: replace
-            args: [",", "."]
-      seeders:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
-      leechers:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(3)
-      date:
-        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(6)
-        filters:
-          - name: replace
-            args: ["\xA0", " "]
-          - name: dateparse
-            args: "02.01.2006 15:04:05"
-      downloadvolumefactor:
-        case:
-          img[alt="onlyupload"]: "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"

src/Jackett.Common/Definitions/greekteam.yml

@@ -120,21 +120,21 @@
         attribute: href
       download:
         text: "download2.php?torrent={{ .Result._id }}"
-      size:
-        selector: td:nth-last-child(4)
+      files:
+        selector: td:has(a[href$="filelist=1"])
       date:
-        selector: td:nth-last-child(6) > nobr
+        selector: td:has(a[href$="filelist=1"]) ~ td ~ td > nobr
         filters:
           - name: append
             args: " +02:00"
           - name: dateparse
             args: "2006-01-0215:04:05 -07:00"
-      files:
-        selector: td:nth-last-child(8)
+      size:
+        selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td
       seeders:
-        selector: td:nth-last-child(3)
+        selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td
       leechers:
-        selector: td:nth-last-child(2)
+        selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td
       downloadvolumefactor:
         case:
           "img[src=\"pic/free.png\"]": "0"

src/Jackett.Common/Definitions/hachede.yml

@@ -63,22 +63,21 @@
       tv-search: [q, season, ep]
       movie-search: [q]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+
   login:
-    path: ajax/login.php
-    method: post
-    headers:
-      user-agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.104 Safari/537.36"
-    form: form
+    method: cookie
     inputs:
-      loginbox_membername: "{{ .Config.username }}"
-      loginbox_password: "{{ .Config.password }}"
-      action: "login"
-      loginbox_remember: "true"
-    error:
-      - selector: div.error
+      cookie: "{{ .Config.cookie }}"
     test:
       path: ?p=home&pid=1
-      selector: div#member_info_bar
 
   search:
     path: /
@@ -127,7 +126,7 @@
         selector: td.leechers a, .torrentInfo a[rel="torrent_leechers"]
       imdb:
         optional: true
-        selector: .torrentFlags a[href^="http://www.imdb.com/title/"]
+        selector: .torrentFlags a[href*="www.imdb.com/title/tt"]
         attribute: href
       date:
         selector: td.torrent_name, .torrentOwner

src/Jackett.Common/Definitions/hamsterstudio.yml

@@ -0,0 +1,345 @@
+---
+  site: hamsterstudio
+  name: HamsterStudio
+  description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  language: ru-ru
+  type: private
+  encoding: windows-1251
+  links:
+    - http://hamsterstudio.org/
+
+  caps:
+    categorymappings:
+    - {id: 23, cat: Movies, desc: "Кино"}
+    - {id: 18, cat: TV/WEB-DL, desc: "Веб-сериалы"}
+    - {id: 19, cat: TV/OTHER, desc: "Разные сериалы"}
+    - {id: 10, cat: Audio, desc: "Музыка"}
+    - {id: 29, cat: TV, desc: "Лечение (Пациенты)"}
+    - {id: 37, cat: TV, desc: "Сериалы с ТВ"}
+    - {id: 21, cat: TV, desc: "Полуночный зверь"}
+    - {id: 11, cat: TV, desc: "Милые обманщицы"}
+    - {id: 27, cat: TV, desc: "Девочки"}
+    - {id: 20, cat: TV, desc: "Умерь Свой Пыл"}
+    - {id: 24, cat: TV, desc: "Ийон Тихий, космический пилот"}
+    - {id: 25, cat: TV, desc: "Красный карлик"}
+    - {id: 22, cat: TV, desc: "Тримей"}
+    - {id: 26, cat: TV, desc: "На дне"}
+    - {id: 38, cat: TV, desc: "Галактика: Кровь и Хром"}
+    - {id: 39, cat: TV, desc: "Супертюрьма"}
+    - {id: 40, cat: TV, desc: "Семерка Блэйка"}
+    - {id: 42, cat: TV, desc: "Западное крыло"}
+    - {id: 43, cat: TV, desc: "Убойный Отдел: Уличные Будни"}
+    - {id: 47, cat: TV, desc: "Это Англия"}
+    - {id: 48, cat: TV, desc: "Бенидорм"}
+    - {id: 49, cat: TV, desc: "Сайнфелд"}
+    - {id: 51, cat: TV, desc: "Вице"}
+    - {id: 52, cat: TV, desc: "За кадром о кадре"}
+    - {id: 54, cat: TV, desc: "Хемлок Гроув"}
+    - {id: 56, cat: TV, desc: "Семейное древо"}
+    - {id: 57, cat: TV, desc: "Мэрон"}
+    - {id: 59, cat: TV, desc: "Спецнах"}
+    - {id: 60, cat: TV, desc: "Работа не волк"}
+    - {id: 64, cat: TV, desc: "Дивизион "}
+    - {id: 66, cat: TV, desc: "Кошмары Фредди"}
+    - {id: 67, cat: TV, desc: "Все дома"}
+    - {id: 69, cat: TV, desc: "Бездельницы"}
+    - {id: 70, cat: TV, desc: "Реальные люди"}
+    - {id: 71, cat: TV, desc: "Трофеи Вавилона"}
+    - {id: 72, cat: TV, desc: "Постфактум"}
+    - {id: 73, cat: TV, desc: "Детектив Босх"}
+    - {id: 74, cat: TV, desc: "В девятом номере"}
+    - {id: 75, cat: TV, desc: "Верь"}
+    - {id: 76, cat: TV, desc: "Семь дней"}
+    - {id: 77, cat: TV, desc: "Красная дорога"}
+    - {id: 78, cat: TV, desc: "Борджиа"}
+    - {id: 79, cat: TV, desc: "Вдовец"}
+    - {id: 80, cat: TV, desc: "Безумцы"}
+    - {id: 81, cat: TV, desc: "Убийство первой степени"}
+    - {id: 82, cat: TV, desc: "Мистер Слоун"}
+    - {id: 83, cat: TV, desc: "Путеводитель по семейной жизни"}
+    - {id: 84, cat: TV, desc: "Агенты"}
+    - {id: 85, cat: TV, desc: "Блюз Хилл-Стрит"}
+    - {id: 86, cat: TV, desc: "В погоне за тенями"}
+    - {id: 87, cat: TV, desc: "Константин"}
+    - {id: 88, cat: TV, desc: "Готэм"}
+    - {id: 89, cat: TV, desc: "Клей"}
+    - {id: 90, cat: TV, desc: "Скорострел"}
+    - {id: 91, cat: TV, desc: "Водитель"}
+    - {id: 92, cat: TV, desc: "Очевидное"}
+    - {id: 93, cat: TV, desc: "Красные дубы"}
+    - {id: 94, cat: TV, desc: "Жизнь начинается в 18"}
+    - {id: 95, cat: TV, desc: "Безрассудный"}
+    - {id: 96, cat: TV, desc: "Пропавший без вести"}
+    - {id: 97, cat: TV, desc: "Взгляд в прошлое"}
+    - {id: 98, cat: TV, desc: "Королевская семья"}
+    - {id: 99, cat: TV, desc: "Одиночки с причудами"}
+    - {id: 101, cat: TV, desc: "CSI: Киберпространство"}
+    - {id: 102, cat: TV, desc: "Сорвиголова"}
+    - {id: 103, cat: TV, desc: "Осадок"}
+    - {id: 104, cat: TV, desc: "Призраки Энфилда"}
+    - {id: 105, cat: TV, desc: "Ошибки прошлого"}
+    - {id: 106, cat: TV, desc: "Восьмое чувство"}
+    - {id: 107, cat: TV, desc: "Вызов"}
+    - {id: 108, cat: TV, desc: "Настоящий детектив"}
+    - {id: 109, cat: TV, desc: "Звездный охотник"}
+    - {id: 110, cat: TV, desc: "Это не моя жизнь"}
+    - {id: 111, cat: TV, desc: "Человек в высоком замке"}
+    - {id: 112, cat: TV, desc: "Бойтесь Ходячих мертвецов"}
+    - {id: 113, cat: TV, desc: "Стражи галактики"}
+    - {id: 114, cat: TV, desc: "Герои: Возрождение"}
+    - {id: 115, cat: TV, desc: "Заключенный"}
+    - {id: 116, cat: TV, desc: "Родина"}
+    - {id: 117, cat: TV, desc: "Фарго"}
+    - {id: 118, cat: TV, desc: "Американская история ужасов"}
+    - {id: 119, cat: TV, desc: "Оставленные"}
+    - {id: 121, cat: TV, desc: "Любовники"}
+    - {id: 122, cat: TV, desc: "Агенты Щит"}
+    - {id: 123, cat: TV, desc: "Эш против зловещих мертвецов"}
+    - {id: 124, cat: TV, desc: "Ходячие мертвецы"}
+    - {id: 125, cat: TV, desc: "Демоны Да Винчи"}
+    - {id: 120, cat: TV, desc: "Сонная лощина"}
+    - {id: 126, cat: TV, desc: "Джекил и Хайд"}
+    - {id: 127, cat: TV, desc: "Джессика Джонс"}
+    - {id: 128, cat: TV, desc: "Лондонский шпион"}
+    - {id: 129, cat: TV, desc: "Мост"}
+    - {id: 130, cat: TV, desc: "Хроники Франкенштейна"}
+    - {id: 131, cat: TV, desc: "Пространство"}
+    - {id: 132, cat: TV, desc: "Конец детства"}
+    - {id: 133, cat: TV, desc: "Путь к выздоровлению"}
+    - {id: 134, cat: TV, desc: "Старость не радость"}
+    - {id: 135, cat: TV, desc: "Пьяная история"}
+    - {id: 136, cat: TV, desc: "Хроники Шаннары"}
+    - {id: 137, cat: TV, desc: "Сумеречные охотники"}
+    - {id: 138, cat: TV, desc: "Клоун (Баскетс)"}
+    - {id: 139, cat: TV, desc: "Черные паруса"}
+    - {id: 140, cat: TV, desc: "Секретные материалы"}
+    - {id: 141, cat: TV, desc: "Изгои"}
+    - {id: 143, cat: TV, desc: "Куку"}
+    - {id: 144, cat: TV, desc: "Долл и Эм"}
+    - {id: 145, cat: TV, desc: "Банши "}
+    - {id: 146, cat: TV, desc: " Шоу Джимма Гаффигана"}
+    - {id: 147, cat: TV, desc: "Все кувырком"}
+    - {id: 148, cat: TV, desc: "Сожители"}
+    - {id: 149, cat: TV, desc: "Внутри Эми Шумер"}
+    - {id: 150, cat: TV, desc: "С чистого листа"}
+    - {id: 151, cat: TV, desc: "Хофф в записи"}
+    - {id: 152, cat: TV, desc: "Жевательная резинка"}
+    - {id: 153, cat: TV, desc: "Охотники"}
+    - {id: 154, cat: TV, desc: "Даркнет"}
+    - {id: 155, cat: TV, desc: "Бонг для путешествий во времен"}
+    - {id: 156, cat: TV, desc: "Бульварные ужасы"}
+    - {id: 157, cat: TV, desc: "Флауэрсы"}
+    - {id: 158, cat: TV, desc: "Грейс и Фрэнки "}
+    - {id: 159, cat: TV, desc: "Проповедник"}
+    - {id: 142, cat: TV, desc: "Принц из Беверли Хиллз"}
+    - {id: 160, cat: TV, desc: "Сосны"}
+    - {id: 161, cat: TV, desc: "Истории Нила Геймана"}
+    - {id: 162, cat: TV, desc: "Подчинение"}
+    - {id: 163, cat: TV, desc: "Обвиняемая"}
+    - {id: 164, cat: TV, desc: "Безмозглые"}
+    - {id: 165, cat: TV, desc: "Гастролеры"}
+    - {id: 166, cat: TV, desc: "Завучи"}
+    - {id: 167, cat: TV, desc: "Отжиг"}
+    - {id: 169, cat: TV, desc: "Человек-клещ"}
+    - {id: 168, cat: TV, desc: "Трагедия в Кеттеринге"}
+    - {id: 170, cat: TV, desc: "Я люблю Дика"}
+    - {id: 171, cat: TV, desc: "Жан-Клод Ван Джонсон "}
+    - {id: 173, cat: TV, desc: "Небезопасно для работы"}
+    - {id: 174, cat: TV, desc: "Граница "}
+    - {id: 175, cat: TV, desc: "Дрянь"}
+    - {id: 176, cat: TV, desc: "Сложные люди"}
+    - {id: 177, cat: TV, desc: "Девочки Гилмор"}
+    - {id: 178, cat: TV, desc: "Возвращение  в Миссисипи "}
+    - {id: 179, cat: TV, desc: "В хлам"}
+    - {id: 180, cat: TV, desc: "Бунтарь"}
+    - {id: 182, cat: TV, desc: "Слепое пятно"}
+    - {id: 183, cat: TV, desc: "Королевы крика"}
+    - {id: 184, cat: TV, desc: "Черный список"}
+    - {id: 185, cat: TV, desc: "Однажды в сказке"}
+    - {id: 186, cat: TV, desc: "Звездные войны: повстанцы"}
+    - {id: 187, cat: TV, desc: "Скорпион"}
+    - {id: 188, cat: TV, desc: "Безбашенные"}
+    - {id: 189, cat: TV, desc: "Черное зеркало"}
+    - {id: 190, cat: TV, desc: "Стэн против сил зла"}
+    - {id: 191, cat: TV, desc: "Удалённые"}
+    - {id: 192, cat: TV, desc: "Сирены"}
+    - {id: 193, cat: TV, desc: "По ту сторону"}
+    - {id: 194, cat: TV, desc: "ОА"}
+    - {id: 195, cat: TV, desc: "Табу"}
+    - {id: 196, cat: TV, desc: "Колония"}
+    - {id: 197, cat: TV, desc: "Волшебники"}
+    - {id: 198, cat: TV, desc: "24 часа"}
+    - {id: 199, cat: TV, desc: "Миллиарды"}
+    - {id: 200, cat: TV, desc: "Большая маленькая ложь"}
+    - {id: 201, cat: TV, desc: "Легион"}
+    - {id: 202, cat: TV, desc: "Сан рекордз"}
+    - {id: 203, cat: TV, desc: "Заложница"}
+    - {id: 204, cat: TV, desc: "Убийство на пляже"}
+    - {id: 205, cat: TV, desc: "Подземка"}
+    - {id: 206, cat: TV, desc: "Любовь"}
+    - {id: 207, cat: TV, desc: "Преступление по-американски "}
+    - {id: 208, cat: TV, desc: "Большой куш"}
+    - {id: 209, cat: TV, desc: "Побег"}
+    - {id: 210, cat: TV, desc: "Я Зомби"}
+    - {id: 211, cat: TV, desc: "Лучше звоните Солу"}
+    - {id: 212, cat: TV, desc: "Арчер"}
+    - {id: 213, cat: TV, desc: "Дорогие белые"}
+    - {id: 214, cat: TV, desc: "Американские боги"}
+    - {id: 215, cat: TV, desc: "Брокмайр"}
+    - {id: 216, cat: TV, desc: "Энджи Трайбека"}
+    - {id: 217, cat: TV, desc: "Уэнтуорт "}
+    - {id: 218, cat: TV, desc: "Звери."}
+    - {id: 219, cat: TV, desc: "Упадок и разрушение"}
+    - {id: 220, cat: TV, desc: "Просто парочка"}
+    - {id: 221, cat: TV, desc: "Твин Пикс"}
+    - {id: 222, cat: TV, desc: "Умираю со смеху"}
+    - {id: 223, cat: TV, desc: "По волчьим законам"}
+    - {id: 224, cat: TV, desc: "Карточный домик"}
+    - {id: 225, cat: TV, desc: "Приключения Тедди Ракспина"}
+    - {id: 226, cat: TV, desc: "Темная материя"}
+    - {id: 227, cat: TV, desc: "Вайнона Эрп"}
+    - {id: 228, cat: TV, desc: "Киллджойс"}
+    - {id: 229, cat: TV, desc: "Кровавая гонка"}
+    - {id: 230, cat: TV, desc: "Сшиватели"}
+    - {id: 231, cat: TV, desc: "Ночная смена"}
+    - {id: 232, cat: TV, desc: "Мгла"}
+    - {id: 233, cat: TV, desc: "Зверинец"}
+    - {id: 234, cat: TV, desc: "Снегопад"}
+    - {id: 235, cat: TV, desc: "Спасение"}
+    - {id: 236, cat: TV, desc: "По болезни"}
+    - {id: 237, cat: TV, desc: "Кастлвания"}
+    - {id: 238, cat: TV, desc: "Штамм"}
+    - {id: 239, cat: TV, desc: "Игра престолов"}
+    - {id: 240, cat: TV, desc: "Мстители"}
+    - {id: 241, cat: TV, desc: "Комната 104"}
+    - {id: 242, cat: TV, desc: "Миднайт, Техас"}
+    - {id: 243, cat: TV, desc: "Человек-паук"}
+    - {id: 244, cat: TV, desc: "Рэй Донован"}
+    - {id: 245, cat: TV, desc: "Мистер Мерседес"}
+    - {id: 246, cat: TV, desc: "Эпизоды"}
+    - {id: 247, cat: TV, desc: "Охота на Унабомбера "}
+    - {id: 248, cat: TV, desc: "Защитники"}
+    - {id: 249, cat: TV, desc: "Раскосяченные"}
+    - {id: 250, cat: TV, desc: "Двойка"}
+    - {id: 251, cat: TV, desc: "Нарко"}
+    - {id: 252, cat: TV, desc: "Ты — воплощение порока"}
+    - {id: 253, cat: TV, desc: "Конь БоДжек"}
+    - {id: 254, cat: TV, desc: "Орвилл"}
+    - {id: 256, cat: TV, desc: "Южный парк"}
+    - {id: 257, cat: TV, desc: "Звездный путь: Дискавери"}
+    - {id: 258, cat: TV, desc: "Мик"}
+    - {id: 259, cat: TV, desc: "Морская полиция"}
+    - {id: 260, cat: TV, desc: "Смертельное оружие"}
+    - {id: 261, cat: TV, desc: "Сверхлюди"}
+    - {id: 262, cat: TV, desc: "Одарённые"}
+    - {id: 263, cat: TV, desc: "Полиция Чикаго"}
+    - {id: 264, cat: TV, desc: "Это Мы"}
+    - {id: 265, cat: TV, desc: "Империя"}
+    - {id: 266, cat: TV, desc: "Мыслить как преступник"}
+    - {id: 267, cat: TV, desc: "Экзорцист"}
+    - {id: 268, cat: TV, desc: "Люцифер"}
+    - {id: 269, cat: TV, desc: "Нация Z"}
+    - {id: 270, cat: TV, desc: "Сверхестественое"}
+    - {id: 273, cat: TV, desc: "Доктор Шанс"}
+    - {id: 271, cat: TV, desc: "Мистер Робот"}
+    - {id: 272, cat: TV, desc: "Очень странные дела"}
+    - {id: 274, cat: TV, desc: "Стрела"}
+    - {id: 275, cat: TV, desc: "Флэш"}
+    - {id: 276, cat: TV, desc: "Супердевушка"}
+    - {id: 277, cat: TV, desc: "Легенды завтрашнего дня "}
+    - {id: 278, cat: TV, desc: "Суеверие"}
+    - {id: 279, cat: TV, desc: "Конец ёбанного мира"}
+    - {id: 280, cat: TV, desc: "Спецназ"}
+    - {id: 281, cat: TV, desc: "Бесстыдники "}
+    - {id: 282, cat: TV, desc: "Проклятая нация"}
+    - {id: 283, cat: TV, desc: "Человек будущего"}
+    - {id: 284, cat: TV, desc: "Каратель"}
+    - {id: 285, cat: TV, desc: "Фантастика"}
+    - {id: 286, cat: TV, desc: "Ужасы/триллер"}
+    - {id: 287, cat: TV, desc: "Драма"}
+    - {id: 288, cat: TV, desc: "Комедия"}
+    - {id: 289, cat: TV, desc: "Боевик"}
+    - {id: 290, cat: TV, desc: "Детектив"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: browse.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 incdead 2 onlydead 3 gold 4 seedfree
+      incldead: "1"
+    rows:
+      selector: table.embedded > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          - name: re_replace
+            args: ["\\b(\\d)\\b", "0$1"]
+          - name: re_replace
+            args: [".+Сезон\\s+(\\d+)(?:.+Серия\\s+(\\d+))*[\\s\\S]*\\/\\s+(.+)\\s+\\(\\d+\\)\\s+(\\S*)\\s*(\\w*\\d*).*", "$3 - S$1E$2 - rus $5 $4 newstudio"]
+          - name: replace
+            args: ["WEBDLRip","WEBDL"]
+          - name: replace
+            args: ["HDTVRip","HDTV"]
+          - name: replace
+            args: ["E -","E01-99 -"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(5)
+      date:
+        selector: i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      seeders:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 0]
+      leechers:
+        selector: td:nth-child(6)
+        filters:
+          - name: split
+            args: ["|", 1]
+      downloadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "0"
+          img[src="pic/freedownload.gif"]: "0"
+          img[src="pic/silver.gif"]: "0.5"
+          img[src="pic/bronze.gif"]: "0.75"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src="pic/diamond.png"]: "2"
+          "*": "1"

src/Jackett.Common/Definitions/hd4free.yml

@@ -14,9 +14,10 @@
       - {id: 2, cat: TV, desc: "TV"}
       - {id: 3, cat: Audio, desc: "Music"}
       - {id: 4, cat: Books, desc: "Books"}
-      - {id: 5, cat: PC/Mac, desc: "Apps"}
+      - {id: 5, cat: PC, desc: "Apps"}
       - {id: 6, cat: Other, desc: "Other"}
       - {id: 7, cat: PC/Games, desc: "Games"}
+      - {id: 8, cat: TV/Sport, desc: "Sports"}
 
 
     modes:
@@ -30,10 +31,18 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: table.main:contains("Login Failed!")
+      - selector: form[action$="/login"] .text-red
     test:
-      path: torrents
+      path: /
+      selector: a[href$="/logout"]
+  ratio:
+    path: /
+    selector: li:has(i.fa-signal)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -41,12 +50,13 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -66,6 +76,13 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
         selector: td:nth-child(5)
       seeders:
@@ -77,6 +94,10 @@
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -106,10 +127,12 @@
       downloadvolumefactor:
         case:
           "i[data-original-title=\"100% Free\"]": "0"
-          "i[data-original-title=\"Global FreeLeech\"]": "0"
+          "i[data-original-title=\"Global Freeleech\"]": "0"
+          "i[data-original-title=\"Featured\"]": "0"
           "*": "1"
       uploadvolumefactor:
         case:
+          "i[data-original-title=\"Featured\"]": "2"
           "i[data-original-title=\"Double upload\"]": "2"
           "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
           "*": "1"

src/Jackett.Common/Definitions/hdbitscom.yml

@@ -70,7 +70,7 @@
         selector: a[href^="torrents.php?id="]
         attribute: href
       imdb:
-        selector: a[href*="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         optional: true
         attribute: href
       banner:

src/Jackett.Common/Definitions/hdchina.yml

@@ -86,11 +86,8 @@
         selector: a[href^="details.php?id="]
         attribute: href    
       download:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="download.php?hash="]
         attribute: href
-        filters:
-          - name: replace
-            args: ["details.php", "download.php"]
       size:
         selector: td.t_size
       grabs:

src/Jackett.Common/Definitions/hdcity.yml

@@ -144,6 +144,8 @@
     keywordsfilters:
       - name: re_replace
         args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", " "]
     inputs:
       page: "torrents"
       $raw: "&category={{range .Categories}}{{.}};{{end}}"

src/Jackett.Common/Definitions/hdspain.yml

@@ -58,13 +58,30 @@
         filters:
           - name: querystring
             args: cat
+      extras:
+        text: ""
+      extras:
+        optional: true
+        selector: td.titulo a[class]
+        filters:
+          - name: prepend
+            args: "["
+          - name: append
+            args: "]"
       title:
         selector: td.titulo a[id]
         filters:
+          - name: prepend
+            args: "{{ .Result.extras }} "
           - name: append
-            args: " [spanish]"
+            args: " [Spanish]"
+          - name: re_replace
+            args: ["(?i)T(\\d{1,2})\\b", "S$1"]
       details:
-        selector: td.titulo a
+        selector: td.titulo a[id]
+        attribute: href
+      comments:
+        selector: td.foro a
         attribute: href
       size:
         selector: td.tamano
@@ -142,3 +159,10 @@
         filters:
           - name: replace
             args: ["Freeleech X2", "2"]
+      minimumratio:
+        text: "1.0"
+      minimumseedtime:
+        text: "345600"
+      description:
+        optional: true
+        selector: td.titulo a[class]

src/Jackett.Common/Definitions/hdturk.yml

@@ -0,0 +1,168 @@
+---
+  site: hdturk
+  name: HDTurk
+  description: "HDTurk is a TURKISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: tr
+  type: private
+  encoding: UTF-8
+  links:
+    - http://hdturk.de/
+
+  caps:
+    categorymappings:
+      - {id: 37, cat: Other, desc: "Diğer"}
+      - {id: 210, cat: Books/Ebook, desc: "E-Kitap"}
+      - {id: 208, cat: Other, desc: "Eğitim"}
+      - {id: 101, cat: Other, desc: "Resim"}
+      - {id: 15, cat: TV, desc: "TV Dizi/Show/Spor"}
+      - {id: 18, cat: TV, desc: "TV Dublaj"}
+      - {id: 81, cat: TV, desc: "TV Show"}
+      - {id: 207, cat: TV/Sport, desc: "TV Spor"}
+      - {id: 17, cat: TV, desc: "TV Yabancı"}
+      - {id: 16, cat: TV, desc: "TV Yerli"}
+      - {id: 19, cat: TV/HD, desc: "TV Yerli HD"}
+      - {id: 170, cat: Movies/HD, desc: "Movies HD"}
+      - {id: 174, cat: Movies/3D, desc: "Movies 3D DUAL"}
+      - {id: 180, cat: Movies/3D, desc: "Movies 3D TR"}
+      - {id: 181, cat: Movies/3D, desc: "Movies 3D Yabancı"}
+      - {id: 217, cat: Movies/UHD, desc: "Movies 4K DUAL"}
+      - {id: 218, cat: Movies/UHD, desc: "Movies 4K TR"}
+      - {id: 216, cat: Movies/UHD, desc: "Movies 4K Yabancı"}
+      - {id: 205, cat: Movies/DVD, desc: "Movies DVD DUAL"}
+      - {id: 206, cat: Movies/DVD, desc: "Movies DVD TR/Yerli"}
+      - {id: 219, cat: Movies/DVD, desc: "Movies DVD Yabancı"}
+      - {id: 173, cat: Movies/BluRay, desc: "Movies Full BD"}
+      - {id: 175, cat: Movies/HD, desc: "Movies Remux DUAL"}
+      - {id: 183, cat: Movies/HD, desc: "Movies Remux Yabancı"}
+      - {id: 171, cat: Movies/HD, desc: "Movies x264 DUAL"}
+      - {id: 176, cat: Movies/HD, desc: "Movies x264 TR"}
+      - {id: 177, cat: Movies/HD, desc: "Movies x264 Yabancı"}
+      - {id: 172, cat: Movies/HD, desc: "Movies x265 DUAL"}
+      - {id: 178, cat: Movies/HD, desc: "Movies x265 TR"}
+      - {id: 179, cat: Movies/HD, desc: "Movies x265 Yabancı"}
+      - {id: 198, cat: Movies/HD, desc: "Movies XviD DUAL"}
+      - {id: 200, cat: Movies/HD, desc: "Movies XviD TR"}
+      - {id: 202, cat: Movies/HD, desc: "Movies XviD Yabancı"}
+      - {id: 33, cat: Audio, desc: "MÜZİK"}
+      - {id: 34, cat: Audio, desc: "MÜZİK Albüm"}
+      - {id: 35, cat: Audio, desc: "MÜZİK Diskografi"}
+      - {id: 98, cat: Audio, desc: "MÜZİK Single"}
+      - {id: 36, cat: Audio/Video, desc: "MÜZİK Video"}
+      - {id: 56, cat: Console, desc: "OYUN"}
+      - {id: 59, cat: Console, desc: "Konsol"}
+      - {id: 58, cat: Console, desc: "Mobil/PDA"}
+      - {id: 57, cat: PC/Games, desc: "PC"}
+      - {id: 52, cat: PC, desc: "PROGRAM"}
+      - {id: 54, cat: PC/Mac, desc: "Apple"}
+      - {id: 55, cat: PC, desc: "Mobil/PDA"}
+      - {id: 53, cat: PC/0day, desc: "WINDOWS"}
+      - {id: 182, cat: Movies/SD, desc: "SD"}
+      - {id: 191, cat: Movies/SD, desc: "x264 DUAL"}
+      - {id: 192, cat: Movies/SD, desc: "x264 TR"}
+      - {id: 193, cat: Movies/SD, desc: "x264 Yabancı"}
+      - {id: 194, cat: Movies/SD, desc: "x265 DUAL"}
+      - {id: 195, cat: Movies/SD, desc: "x265 TR"}
+      - {id: 196, cat: Movies/SD, desc: "x265 Yabancı"}
+      - {id: 201, cat: Movies/SD, desc: "XviD DUAL"}
+      - {id: 197, cat: Movies/SD, desc: "XviD TR"}
+      - {id: 199, cat: Movies/SD, desc: "XviD Yabancı"}
+      - {id: 221, cat: Other, desc: "VIP"}
+      - {id: 85, cat: XXX, desc: "XXX"}
+      - {id: 92, cat: XXX, desc: "XXX E-Magazin"}
+      - {id: 93, cat: XXX, desc: "XXX Movie"}
+      - {id: 95, cat: XXX, desc: "XXX Packs"}
+      - {id: 96, cat: XXX, desc: "XXX Pics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="takelogin.php"]
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    captcha:
+      type: image
+      selector: img#regimage
+      input: imagestring
+    error:
+      - selector: table:contains("Bir hata oluştu!")
+    test:
+      path: index.php
+      selector: a[href*="/logout.php?logouthash="]
+
+  ratio:
+    path: index.php
+    selector: div#top div:nth-child(2) span:nth-child(2)
+    filters:
+      - name: regexp
+        args: "Ratio: (.+?) Bonus:"
+
+  search:
+    paths:
+      - path: browse.php
+    keywordsfilters:
+      - name: re_replace # E01 to BL01
+        args: ["(?i)\\bE(\\d+)\\b", "E$1"]
+    inputs:
+    # does not support multi categories so defaulting to ALL
+      do: search
+      keywords: "{{.Keywords}}"
+      category: 0
+      search_type: t_name
+      include_dead_torrents: yes
+    rows:
+      selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+    fields:
+      title:
+        selector: div[id^="port-target-"] a
+        filters:
+          - name: re_replace # BL01 to E01
+            args: ["(?i)\\bBL(\\d+)\\b", " E$1 "]
+      details:
+        selector: div[id^="port-target-"] a
+        attribute: href
+      category:
+        selector: a[href*="browse.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      banner:
+        selector: div[id^="port-content-"] img
+        attribute: src
+      date:
+        selector: td:nth-child(2)
+        filters:
+          - name: regexp
+            args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
+        filters:
+          - name: dateparse
+            args: "02-01-2006 15:04"
+      download:
+        selector: a[href*="download.php?id="]
+        attribute: href
+      comments:
+        selector: td:nth-child(4) a
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img[src$="/freedownload.gif"]: "0"
+          img[src$="/silverdownload.gif"]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img[src$="/x2.gif"]: "2"
+          "*": "1"

src/Jackett.Common/Definitions/hdzone.yml

@@ -0,0 +1,162 @@
+---
+  site: hdzone
+  name: HDZone
+  description: "HDZone is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+  language: zh-cn
+  type: private
+  encoding: UTF-8
+  links:
+    - https://hdzone.me/
+
+  caps:
+    categorymappings:
+      - {id: 411, cat: Movies/SD, desc: "Movies SD"}
+      - {id: 412, cat: Movies, desc: "Movies IPad"}
+      - {id: 413, cat: Movies/HD, desc: "Movies 720p"}
+      - {id: 414, cat: Movies/HD, desc: "Movies 1080p"}
+      - {id: 415, cat: Movies, desc: "Movies REMUX"}
+      - {id: 450, cat: Movies/BluRay, desc: "Movies Bluray"}
+      - {id: 499, cat: Movies/UHD, desc: "Movies UHD Blu-ray"}
+      - {id: 416, cat: Movies/UHD, desc: "Movies 2160p"}
+      - {id: 417, cat: TV/Documentary, desc: "Doc SD"}
+      - {id: 418, cat: TV/Documentary, desc: "Doc IPad"}
+      - {id: 419, cat: TV/Documentary, desc: "Doc 720p"}
+      - {id: 420, cat: TV/Documentary, desc: "Doc 1080p"}
+      - {id: 421, cat: TV/Documentary, desc: "Doc REMUX"}
+      - {id: 451, cat: TV/Documentary, desc: "Doc Bluray"}
+      - {id: 500, cat: TV/Documentary, desc: "Doc UHD Blu-ray"}
+      - {id: 422, cat: TV/Documentary, desc: "Doc 2160p"}
+      - {id: 423, cat: Audio/Video, desc: "TVMusic 720p"}
+      - {id: 424, cat: Audio/Video, desc: "TVMusic 1080i"}
+      - {id: 425, cat: TV/SD, desc: "TVShow SD"}
+      - {id: 426, cat: TV, desc: "TVShow IPad"}
+      - {id: 471, cat: TV, desc: "TVShow IPad"}
+      - {id: 427, cat: TV/HD, desc: "TVShow 720p"}
+      - {id: 472, cat: TV/HD, desc: "TVShow 720p"}
+      - {id: 428, cat: TV/HD, desc: "TVShow 1080i"}
+      - {id: 429, cat: TV/HD, desc: "TVShow 1080p"}
+      - {id: 430, cat: TV, desc: "TVShow REMUX"}
+      - {id: 452, cat: TV/HD, desc: "TVShow Bluray"}
+      - {id: 431, cat: TV/UHD, desc: "TVShow 2160p"}
+      - {id: 432, cat: TV/SD, desc: "TVSeries SD"}
+      - {id: 433, cat: TV, desc: "TVSeries IPad"}
+      - {id: 434, cat: TV/HD, desc: "TVSeries 720p"}
+      - {id: 435, cat: TV/HD, desc: "TVSeries 1080i"}
+      - {id: 436, cat: TV/HD, desc: "TVSeries 1080p"}
+      - {id: 437, cat: TV, desc: "TVSeries REMUX"}
+      - {id: 453, cat: TV/HD, desc: "TVSeries Bluray"}
+      - {id: 438, cat: TV/UHD, desc: "TVSeries 2160p"}
+      - {id: 439, cat: Audio, desc: "Music APE"}
+      - {id: 440, cat: Audio/Lossless, desc: "Music FLAC"}
+      - {id: 441, cat: Audio/Video, desc: "Music MV"}
+      - {id: 442, cat: TV/Sport, desc: "Sports 720p"}
+      - {id: 443, cat: TV/Sport, desc: "Sports 1080i"}
+      - {id: 444, cat: TV/Anime, desc: "Anime SD"}
+      - {id: 445, cat: TV/Anime, desc: "Anime IPad"}
+      - {id: 446, cat: TV/Anime, desc: "Anime 720p"}
+      - {id: 447, cat: TV/Anime, desc: "Anime 1080p"}
+      - {id: 448, cat: TV/Anime, desc: "Anime REMUX"}
+      - {id: 454, cat: TV/Anime, desc: "Anime Bluray"}
+      - {id: 409, cat: Other, desc: "Misc"}
+      - {id: 449, cat: TV/Anime, desc: "Anime 2160p"}
+      - {id: 501, cat: TV/Anime, desc: "Anime UHD Blu-ray"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+          
+  login:
+    method: cookie
+    inputs:
+      cookie: "{{ .Config.cookie }}"
+    test:
+      path: torrents.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
+      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 incldead 1 active 2 onlydead
+      incldead: 0
+      # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
+      spstate: 0
+      # 0 all 1 bookm 2 notbookm
+      inclbookmarked: 0
+      # 0 title 1 descr 3 uploader 4 imdb
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 AND 1 OR 2 exact
+      search_mode: 0
+    rows:
+      selector: table.torrents > tbody > tr:has(table.torrentname)
+    fields:
+      category:
+        selector: a[href^="?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      title:
+        optional: true
+        selector: a[title][href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href    
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
+      comments:
+        selector: td:nth-child(3) a
+        attribute: href
+      date:
+        selector: td:nth-child(4) > span[title]
+        attribute: title
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img.pro_free: "0"
+          img.pro_free2up: "0"
+          img.pro_50pctdown: "0.5"
+          img.pro_50pctdown2up: "0.5"
+          img.pro_30pctdown: "0.3"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          img.pro_50pctdown2up: "2"
+          img.pro_free2up: "2"
+          img.pro_2up: "2"
+          "*": "1"
+      description:
+        selector: td:nth-child(2)
+        remove: a, img

src/Jackett.Common/Definitions/hon3yhd-net.yml

@@ -0,0 +1,124 @@
+---
+  site: hon3yhd-net
+  name: Hon3yHD-net
+  description: "Hon3yHD.net is a Public INDIAN site for MOVIES / TV / MUSIC"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://hon3yhd.net/
+
+  caps:
+    categorymappings:
+      - {id: 84, cat: PC/Games, desc: "Games: PC"}
+      - {id: 85, cat: Console, desc: "Games: Consoles"}
+      - {id: 47, cat: Movies/BluRay, desc: "Movies: 1080P Bluray"}
+      - {id: 48, cat: Movies/BluRay, desc: "Movies: 720P Bluray"}
+      - {id: 49, cat: Movies/3D, desc: "Movies: 3D"}
+      - {id: 51, cat: Movies/BluRay, desc: "Movies: BD50"}
+      - {id: 50, cat: Movies/BluRay, desc: "Movies: BD25"}
+      - {id: 52, cat: Movies/DVD, desc: "Movies: DVD5"}
+      - {id: 53, cat: Movies/DVD, desc: "Movies: DVD9"}
+      - {id: 54, cat: Movies/DVD, desc: "Movies: DVDRips"}
+      - {id: 55, cat: Movies/HD, desc: "Movies: HDRips"}
+      - {id: 56, cat: Movies/HD, desc: "Movies: HEVC"}
+      - {id: 57, cat: Movies, desc: "Movies: Bollywood"}
+      - {id: 58, cat: Movies, desc: "Movies: Hollywood Dub"}
+      - {id: 59, cat: Movies, desc: "Movies: Bengali"}
+      - {id: 60, cat: Movies, desc: "Movies: Malayalam"}
+      - {id: 61, cat: Movies, desc: "Movies: Pakistani"}
+      - {id: 62, cat: Movies, desc: "Movies: Punjabi"}
+      - {id: 63, cat: Movies, desc: "Movies: Tamil"}
+      - {id: 64, cat: Movies, desc: "Movies: Telugu"}
+      - {id: 68, cat: Movies/SD, desc: "Movies: Xvid"}
+      - {id: 73, cat: Movies/WEBDL, desc: "Movies: WEB-HD"}
+      - {id: 74, cat: Movies, desc: "Movies: Remux"}
+      - {id: 75, cat: Movies/UHD, desc: "Movies: 4K/UHD"}
+      - {id: 76, cat: Movies, desc: "Movies: Pre-Releases"}
+      - {id: 82, cat: Movies, desc: "Movies: South Dub"}
+      - {id: 90, cat: Movies, desc: "Movies: Packs"}
+      - {id: 78, cat: Audio/MP3, desc: "Music: MP3"}
+      - {id: 79, cat: Audio, desc: "Music: WAV"}
+      - {id: 80, cat: Audio/Lossless, desc: "Music: FLAC"}
+      - {id: 81, cat: Audio/Video, desc: "Music: Videos"}
+      - {id: 91, cat: Audio, desc: "Music: Bollywood"}
+      - {id: 65, cat: Other, desc: "Other: Ebooks"}
+      - {id: 66, cat: Other, desc: "Other: Religious"}
+      - {id: 67, cat: Other, desc: "Other: Tutorial"}
+      - {id: 83, cat: Other, desc: "Other: Animation"}
+      - {id: 86, cat: Other, desc: "Other: Software"}
+      - {id: 69, cat: TV, desc: "TV: Pakistani"}
+      - {id: 70, cat: TV, desc: "TV: Indian"}
+      - {id: 71, cat: TV/HD, desc: "TV: HDTV"}
+      - {id: 72, cat: TV/WEB-DL, desc: "TV: WEB-HD"}
+      - {id: 77, cat: TV/Sport, desc: "TV: Sports"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="download.php?id="]
+
+  search:
+    paths:
+    # 20 results per page
+      - path: torrents-search.php
+      - path: torrents-search.php
+        inputs:
+          page: 1
+      - path: torrents-search.php
+        inputs:
+          page: 2
+      - path: torrents-search.php
+        inputs:
+          page: 3
+      - path: torrents-search.php
+        inputs:
+          page: 4
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{.Keywords}}"
+      # 0 only active 1 incl dead 2 only dead
+      incldead: 0
+      # 0 all 1 not freeleech 2 only freeleech
+      freeleech: 0
+      # 0 both 1 local only 2 external only
+      inclexternal: 0
+      # 0 all 1 English 2 French 3 German 4 Italian 5 Japanese 6 Spanish 7 Russian 8 Hindi 9 Gujarati 10 Punjabi 11 Telugu 12 Bengali 13 Malayalam 14 Urdu 15 Tamil 16 Kannada 17 Marathi 18 Chinese 19 Korean
+      lang: 0
+    rows:
+      selector: tr.t-row
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      date:
+        text: now
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1

src/Jackett.Common/Definitions/hon3yhd.yml

@@ -50,21 +50,37 @@
       search: [q]
       tv-search: [q, season, ep]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+          
   login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
+    method: cookie
     inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      use_ssl: "1"
-      perm_ssl: "1"
-    error:
-      - selector: tbody:has(td.colhead > span:contains("Error"))
-      - selector: tbody:has(td.colhead > span:contains("failed"))
+      cookie: "{{ .Config.cookie }}"
     test:
       path: browse.php
 
+#  login:
+#    path: login.php
+#    method: form
+#    form: form[action="takelogin.php"]
+#    inputs:
+#      username: "{{ .Config.username }}"
+#      password: "{{ .Config.password }}"
+#      use_ssl: "1"
+#      perm_ssl: "1"
+#    error:
+#      - selector: tbody:has(td.colhead > span:contains("Error"))
+#      - selector: tbody:has(td.colhead > span:contains("failed"))
+#    test:
+#      path: browse.php
+
   search:
     paths:
       - path: browse.php

src/Jackett.Common/Definitions/hqsource.yml

@@ -101,7 +101,7 @@
             args: "{{ .Result.description }}"
       imdb:
         optional: true
-        selector: a[href^="http://www.imdb.com/title/tt"]
+        selector: a[href*="www.imdb.com/title/tt"]
       grabs:
         selector: td:nth-child(6)
         filters:

src/Jackett.Common/Definitions/hush.yml

@@ -28,10 +28,21 @@
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      remember: 1
     error:
-      - selector: form[action*="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
       path: torrents
+      selector: a[href$="/logout"]
+
+  ratio:
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
+    filters:
+      - name: regexp
+        args: "Ratio : (\\d+)"
 
   search:
     paths:
@@ -39,12 +50,14 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sorting: created_at
+      igdb: ""
+      sort: created_at
       direction: desc
       qty: 100
     rows:
@@ -64,17 +77,31 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+        selector: a[href*="#comments"]
+        attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -103,12 +130,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
+          "i[data-original-title=\"Global Freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload          
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.4

src/Jackett.Common/Definitions/hyperay.yml

@@ -83,7 +83,7 @@
         selector: a[href^="download.php?id="]
         attribute: href
       imdb:
-        selector: a[href^="http://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         attribute: href
       banner:
         selector: a[title][onmouseover][href^="details.php?id="]

src/Jackett.Common/Definitions/icetorrent.yml

@@ -79,13 +79,12 @@
       incldead: 1
       search_by: "{{ if .Query.IMDBID }}imdb{{else}}name{{end}}"
     rows:
-      selector: table.table-striped > tbody > tr:has(a[title][href^="details.php?id="])
+      selector: table.table-striped > tbody > tr:has(a[href^="details.php?id="])
     fields:
       title:
-        selector: a[title][href^="details.php?id="]
-        attribute: title
+        selector: a[href^="details.php?id="]
       details:
-        selector: a[title][href^="details.php?id="]
+        selector: a[href^="details.php?id="]
         attribute: href
       category:
         selector: a[href^="?cat="]
@@ -96,7 +95,7 @@
       banner:
         attribute: rel
       imdb:
-        selector: a[href*="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/"]
         optional: true
         attribute: href
       download:

src/Jackett.Common/Definitions/idope.yml

@@ -0,0 +1,105 @@
+---
+  site: idope
+  name: Idope
+  description: "iDope is a Public torrent search engine presenting direct magnet links"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://idope.se/
+
+  caps:
+    categorymappings:
+      - {id: 0, cat: Other, desc: "Others"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: Other, desc: "Video"}
+      - {id: 3, cat: TV, desc: "TV"}
+      - {id: 4, cat: TV/Anime, desc: "Anime"}
+      - {id: 5, cat: XXX, desc: "XXX"}
+      - {id: 6, cat: Audio, desc: "Music"}
+      - {id: 7, cat: PC/Games, desc: "Games"}
+      - {id: 8, cat: PC, desc: "Apps"}
+      - {id: 9, cat: Books, desc: "Books"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: itorrents-links
+      type: checkbox
+      label: Add download links via itorrents.org
+      default: false
+    - name: info
+      type: info
+      label: ITorrents Note
+      default: Without the itorrents option only magnet links will be provided.
+
+  search:
+    paths:
+      # present trending results if there are no search parms supplied
+      # sort torrent-list by age in descending order
+      - path: "{{if .Keywords}}torrent-list/{{ .Keywords}}?&o=-3&c={{range .Categories }}{{.}}{{end}}{{else}}browse.html{{end}}"
+    rows:
+      selector: div.resultdiv
+    fields:
+      title:
+        selector: div.resultdivtop a div.resultdivtopname
+      category:
+        optional: true
+        selector:  div.resultdivbotton div.resultdivbottoncategory
+        case:
+          ":contains(\"Others\")": 0
+          ":contains(\"Movies\")": 1
+          ":contains(\"Video\")": 2
+          ":contains(\"TV\")": 3
+          ":contains(\"Anime\")": 4
+          ":contains(\"XXX\")": 5
+          ":contains(\"Music\")": 6
+          ":contains(\"Games\")": 7
+          ":contains(\"Apps\")": 8
+          ":contains(\"Books\")": 9
+      details:
+        selector: div.resultdivtop a
+        attribute: href
+      download-itorrents:
+        selector: div.resultdivbotton div.hideinfohash
+        filters:
+          - name: toupper
+          - name: prepend
+            args: http://itorrents.org/torrent/
+          - name: append
+            args: ".torrent"
+      download:
+        text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}"
+      magfile:
+        text: "{{ .Result.title }}"
+        filters:
+          - name: validfilename
+          - name: urlencode
+      magnet:
+        selector: div.resultdivbotton div.hideinfohash
+        filters:
+          - name: prepend
+            args: "magnet:?xt=urn:btih:"
+          - name: append
+            args: "&dn={{ .Result.magfile }}.torrent"
+          - name: append
+            args: "&tr=http://tracker.trackerfix.com:80/announce&tr=udp://9.rarbg.com:2710/announce&tr=udp://9.rarbg.me:2710/announce&tr=udp://9.rarbg.to:2710/announce&tr=udp://coppersurfer.tk:6969/announce&tr=udp://eddie4.nl:6969/announce&tr=udp://exodus.desync.com:6969&tr=udp://glotorrents.pw:6969/announce&tr=udp://open.demonii.com:1337&tr=udp://p4p.arenabg.ch:1337/announce&tr=udp://p4p.arenabg.com:1337&tr=udp://torrent.gresille.org:80/announce&tr=udp://tracker.aletorrenty.pl:2710/announce&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.glotorrents.com:6969/announce&tr=udp://tracker.internetwarriors.net:1337&tr=udp://tracker.leechers-paradise.org:6969/announce&tr=udp://tracker.openbittorrent.com:80/announce&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://zer0day.ch:1337/announce"
+      date:
+        selector: div.resultdivbotton div.resulttime div.resultdivbottontime
+        filters:
+          - name: timeago
+      size:
+        selector: div.resultdivbotton div.resultlength div.resultdivbottonlength
+      seeders:
+        selector: div.resultdivbotton div.resultseed div.resultdivbottonseed
+      leechers:
+        text: "0"
+      files:
+        selector: div.resultdivbotton div.resultfile div.resultdivbottonfiles
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -10,8 +10,6 @@
   legacylinks:
     - http://ilcorsaroblu.org/
     - https://www.ilcorsaroblu.info/
-  certificates:
-    - e6dd93ef71f96d04559e2bee8cc8e6fd74957730 # incomplete CA chain
 
   caps:
     categorymappings:
@@ -19,28 +17,54 @@
        - {id: 12, cat: XXX, desc: "Adult"}
       # Applicazioni
        - {id: 5, cat: PC/Phone-Android, desc: "Android"}
+       - {id: 30, cat: PC/Phone-IOS, desc: "iOS / iPhone"}
+       - {id: 7, cat: PC/0day, desc: "Windows"}
+       - {id: 8, cat: PC, desc: "Linux"}
+       - {id: 9, cat: PC/Mac, desc: "Mac"}
+       - {id: 40, cat: PC, desc: "Emulatori"}
+       - {id: 34, cat: PC, desc: "Student's Office"}
       # Books
-       - {id: 6, cat: Books, desc: "Books"}
+       - {id: 6, cat: Books/Ebook, desc: "Books"}
+       - {id: 45, cat: Books/Comics, desc: "Fumetti"}
+       - {id: 51, cat: Books/Ebook, desc: "Pdf"}
+       - {id: 33, cat: Books/Ebook, desc: "Romanzi"}
+       - {id: 26, cat: Books/Magazines, desc: "Edicola: Giornali/Quotidiani"}
       # Games
-       - {id: 3, cat: Other, desc: "Games"}
+       - {id: 3, cat: PC/Games, desc: "Games PC"}
+       - {id: 27, cat: Console, desc: "Games Console"}
+       - {id: 41, cat: Console/Xbox, desc: "Games Xbox360"}
+       - {id: 43, cat: Console, desc: "Games Retro"}
+       - {id: 47, cat: Console/NDS, desc: "Games Nintendo"}
       # Music
        - {id: 2, cat: Audio, desc: "Music"}
+       - {id: 48, cat: Audio/MP3, desc: "Music MP3"}
+       - {id: 49, cat: Audio, desc: "Radio Trasmissioni"}
       # Movies
-       - {id: 17, cat: Movies/SD, desc: "Movie BDRip"}
-       - {id: 21, cat: Movies/Other, desc: "Movies - Films"}
-       - {id: 11, cat: Movies/DVD, desc: "DVD-R"}
+       - {id: 17, cat: Movies/HD, desc: "Movie BDRip"}
+       - {id: 39, cat: Movies/HD, desc: "Movie BDRip TNT"}
+       - {id: 21, cat: Movies/Other, desc: "Movie Films"}
+       - {id: 11, cat: Movies/DVD, desc: "Movie DVD-R"}
        - {id: 14, cat: Movies/HD, desc: "Movie 720p"}
        - {id: 13, cat: Movies/HD, desc: "Movie 1080p"}
        - {id: 15, cat: Movies/3D, desc: "Movie 3D"}
-       - {id: 24, cat: TV/OTHER, desc: "TV Show Standard"}
-       - {id: 19, cat: TV/HD, desc: "Tv Show 1080p"}
-       - {id: 20, cat: TV/HD, desc: "Tv Show 720"}
+       - {id: 25, cat: Movies/UHD, desc: "Movie UHD"}
+       - {id: 36, cat: Movies, desc: "Movie TNT"}
+       - {id: 24, cat: TV/SD, desc: "TV Show Standard"}
+       - {id: 19, cat: TV/HD, desc: "TV Show 1080p"}
+       - {id: 20, cat: TV/HD, desc: "TV Show 720"}
+       - {id: 50, cat: TV, desc: "TV Show TNT"}
+       - {id: 28, cat: TV/Anime, desc: "Anime"}
+       - {id: 29, cat: TV, desc: "Cartoons"}
+       - {id: 37, cat: TV/Sport, desc: "Sport"}
+       - {id: 35, cat: TV/Documentary, desc: "Documentari"}
+       - {id: 38, cat: Movies, desc: "Commedia"}
+       - {id: 46, cat: Movies, desc: "Movie Parodie"}
       # Various
        - {id: 4, cat: Other, desc: "Other"}
-       - {id: 7, cat: PC, desc: "Windows"}
-       - {id: 8, cat: Other, desc: "Linux"}
-       - {id: 9, cat: PC/Mac, desc: "Mac"}
        - {id: 23, cat: Other, desc: "Archive"}
+       - {id: 42, cat: Other, desc: "Disegni e Modelli"}
+       - {id: 16, cat: Other, desc: "V.I.P."}
+       - {id: 32, cat: Other, desc: "Premium"}
 
     modes:
       search: [q]
@@ -72,8 +96,12 @@
       title:
         selector: td:nth-child(2) > a
         filters:
+          # - name: re_replace # replace special characters with " " (space)
+          #   args: ["[^a-zA-Z0-9\\s]|\\.", " "]
           - name: re_replace # replace special characters with " " (space)
-            args: ["[^a-zA-Z0-9\\s]|\\.", " "]
+            args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
+          - name: diacritics
+            args: replace
           - name: re_replace # replace multiple spaces
             args: ["[ ]{2,}", " "]
           # normalize to SXXEYY format
@@ -146,26 +174,31 @@
       size:
         selector: td:nth-last-child(2)
       date:
-        selector: td:nth-last-child(6):contains('ago')
+        selector: td:nth-last-child(7):contains('ago')
         optional: true
         filters:
           - name: timeago
       date:
-        selector: td:nth-last-child(6):contains('/')
+        selector: td:nth-last-child(7):contains('/')
         optional: true
         filters:
           - name: dateparse
             args: "02/01/2006"
       grabs:
-        selector: td:nth-last-child(3)
+        selector: td:nth-last-child(4)
         filters:
           - name: replace
             args: ["---", "0"]
       seeders:
-        selector: td:nth-last-child(5)
+        selector: td:nth-last-child(6)
       leechers:
-        selector: td:nth-last-child(4)
+        selector: td:nth-last-child(5)
       downloadvolumefactor:
+#        case:
+#          img[src="images/gold.gif"]: "0"
+#          img[src="images/silver.gif"]: "0.5"
+#          img[src="images/bronze.gif"]: "0.75"
+#          "*": "1"
         text: "0"
       uploadvolumefactor:
         text: "1"

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -4,7 +4,7 @@
   description: "Il Corsaro Nero is an ITALIAN Public site for TV / MOVIES / GENERAL"
   language: it-it
   type: public
-  encoding: UTF-8
+  encoding: Windows-1252
   links:
     - https://ilcorsaronero.pizza/
   legacylinks:
@@ -13,14 +13,6 @@
     - https://ilcorsaronero.info/
     - https://ilcorsaronero.ch/
     - https://ilcorsaronero.cc/
-  certificates:
-    - 89c12d4a080b5aeec00acbb269dc9b44584b1b3f # incomplete CA chain
-    - aa7c40aa360a1cec8a9687312fd50402b912e618 # incomplete CA chain
-    - 83174ec1f92fa13cdef9d51888ea1dfba2166e17 # incomplete CA chain
-    - c414bf4ad6c69841693c147849f4c314aa200bdf # incomplete CA chain
-    - 3a402766ce22fd1aa24bfc1a4fd47e9309eb8c98 # incomplete CA chain
-    - 160f832730737a70264768ceddf3cd94bc51ffb7 # incomplete CA chain
-    - a60e969b27965d4dc2ff45d50c20e2e872d4e9b9 # incomplete CA chain
 
   caps:
     categorymappings:
@@ -42,23 +34,9 @@
     - name: itorrents-links
       type: checkbox
       label: Add download links via itorrents.org
-    # - name: advanced-search
-    #   type: checkbox
-    #   label: Use the advanced search of IlCorsaroNero (experimental)
 
   search:
     paths:
-      # https://ilcorsaronero.info/advsearch.php?&category=15&search=flash+4&&order=data&by=DESC&page=3
-      # {{range .Categories}}{{.}};{{end}}
-
-    ##### Are the "not" and "and" functions implemented? Or am I doing it wrong?
-    # path: "{{if and .Query.Keywords .advanced-search}}adv/{{ .Query.Keywords}}.html
-    #        {{else if and .Query.Keywords (not .advanced-search)}}argh.php?search={{ .Query.Keywords}}
-    #        {{else}}/recenti
-    #        {{end}}"
-      # - path: "{{if .Keywords}}argh.php?search={{ .Keywords}}
-      #      {{else}}/recenti
-      #      {{end}}"
       - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=0{{else}}/browse/0{{end}}"
       - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=1{{else}}/browse/1{{end}}"
       - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=2{{else}}/browse/2{{end}}"
@@ -66,8 +44,8 @@
       - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=4{{else}}/browse/4{{end}}"
       - path: "{{if .Keywords}}advsearch.php?&category={{range .Categories}}{{.}};{{end}}&search={{ .Keywords}}&order=data&by=DESC&page=5{{else}}/browse/5{{end}}"
     keywordsfilters:
-      - name: diacritics
-        args: replace
+      # - name: diacritics
+      #   args: replace
       - name: re_replace # S01 to 1
         args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
       - name: re_replace # S01E01 to 1 1
@@ -83,9 +61,13 @@
         filters:
           - name: split
             args: [ "/", -1 ]
+          - name: diacritics
+            args: replace
           - name: urldecode
+          # - name: re_replace # replace special characters with " " (space)
+          #   args: ["[^a-zA-Z0-9\\s]|\\.", " "]
           - name: re_replace # replace special characters with " " (space)
-            args: ["[^a-zA-Z0-9\\s]|\\.", " "]
+            args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
           - name: re_replace # replace multiple spaces
             args: ["[ ]{2,}", " "]
           # normalize to SXXEYY format

src/Jackett.Common/Definitions/immortuos.yml

@@ -1,19 +1,24 @@
 ---
-  site: sharingue
-  name: Sharingue
-  description: "Sharingue is a BRAZILIAN Private Tracker for TV / MOVIES / ANIME / MUSIC"
-  language: pt-br
+  site: immortuos
+  name: Immortuos
+  description: "Immortuos is a GERMAN Private Tracker for MOVIES / TV"
+  language: de-de
   type: private
   encoding: UTF-8
   links:
-    - https://www.sharingue.live/
+    - https://www.immortuos.life/
 
   caps:
     categorymappings:
-      - {id: 1, cat: Movies, desc: "Movies (Filmes)"}
-      - {id: 3, cat: Audio, desc: "Music (Músicas)"}
-      - {id: 4, cat: TV, desc: "TV (Séries)"}
-      - {id: 5, cat: TV/Anime, desc: "Anime (Animes)"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Audio, desc: "Music"}
+      - {id: 4, cat: PC, desc: "Apps"}
+      - {id: 5, cat: XXX, desc: "XXX"}
+      - {id: 6, cat: TV/Documentary, desc: "Doku"}
+      - {id: 7, cat: Console, desc: "Games"}
+      - {id: 8, cat: Other, desc: "Sonstiges"}
+      - {id: 9, cat: Movies, desc: "Kino"}
 
     modes:
       search: [q]
@@ -27,19 +32,17 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       remember: 1
-    selectorinputs:
-      _token:
-        selector: meta[name="csrf-token"]
-        attribute: content
     error:
-      - selector: form[action$="/login"] .text-red
+      - selector: script[nonce]:contains("Error")
+        message:
+          selector: script[nonce]:contains("Error")
     test:
-      path: /
+      path: torrents
       selector: a[href$="/logout"]
 
   ratio:
-    path: /
-    selector: span:has(i.fa-sync-alt)
+    path: torrents
+    selector: li:has(i.fa-sync-alt)
     filters:
       - name: regexp
         args: "Ratio : (\\d+)"
@@ -50,13 +53,14 @@
     inputs:
       $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
       search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: created_at
-      direction: desc
+      sort: "created_at"
+      direction: "desc"
       qty: 100
     rows:
       selector: table > tbody > tr
@@ -75,17 +79,31 @@
       details:
         selector: a.view-torrent
         attribute: href
+      banner:
+        optional: true
+        selector: div.torrent-poster img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://via.placeholder.com/600x900", ""]
+      comments:
+         selector: a[href*="#comments"]
+         attribute: href
       size:
-        selector: td:nth-child(5)
+        selector: td:nth-last-child(4)
       seeders:
-        selector: td:nth-child(7)
+        selector: td:nth-last-child(3)
       leechers:
-        selector: td:nth-child(8)
+        selector: td:nth-last-child(2)
       grabs:
-        selector: td:nth-child(6)
+        selector: td:nth-last-child(1)
         filters:
           - name: regexp
             args: ([\d\.]+)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       date:
         selector: time
         filters:
@@ -114,12 +132,17 @@
             args: [" (ay|kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
       downloadvolumefactor:
         case:
-          "i[data-original-title=\"100% Free\"]": "0" # Single Torrent Freeleech
-          "i[data-original-title=\"Global freeleech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Personal Freeleech\"]": "0" # 24 Hour FreeLeech From BON Store
+          "i[data-original-title=\"Special Freeleech\"]": "0" # Special FreeLeech For Certain User Groups
+          "i[data-original-title=\"Freeleech Token\"]": "0" # Freeleech From Token
+          "i[data-original-title=\"Global FreeLeech\"]": "0" # Global Freeleech
+          "i[data-original-title=\"Freeleech\"]": "0" # Freeleech
+          "i[data-original-title=\"Featured\"]": "0" # Featured Torrent
           "*": "1"
       uploadvolumefactor:
         case:
-          "i[data-original-title=\"Double upload\"]": "2" # Single Torrent Double Upload
-          "i[data-original-title=\"Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Double Upload\"]": "2" # Single Torrent Double Upload
+          "i[data-original-title=\"Global Double Upload\"]": "2" # Global Double Upload
+          "i[data-original-title=\"Featured\"]": "2" # Featured Torrent
           "*": "1"
-# UNIT3D
+# UNIT3D 1.9.3

src/Jackett.Common/Definitions/insanetracker.yml

@@ -46,14 +46,14 @@
       movie-search: [q, imdbid]
 
   login:
-    path: takelogin.php
+    path: login.php
     method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       notsecure: "1"
     error:
-      - selector: div.login_error_content
+      - selector: div.login_error_content_text
     test:
       path: browse.php
         
@@ -65,10 +65,10 @@
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
       t: "all"
     rows:
-      selector: table.torrentable > tbody > tr:has(td.maintd)
+      selector: table.torrenttable > tbody > tr:has(td.torrentmain)
     fields:
       title:
-        selector: div.tortitle > a
+        selector: td.torrentmain > a.torrentname
         attribute: title
       category:
         selector: a[href^="browse.php?cat="]
@@ -77,10 +77,10 @@
           - name: querystring
             args: cat
       details:
-        selector: div.tortitle > a
+        selector: td.torrentmain > a.torrentname
         attribute: href
       download:
-        selector: a[href^="download.php/"]
+        selector: a[href*="/download.php/"]
         attribute: href
       imdb:
         optional: true
@@ -95,51 +95,49 @@
         selector: a.cover
         attribute: href
       files:
-        selector: td:nth-child(6)
+        selector: div.files > a.button.small
         filters:
           - name: replace
             args: [".", ""]
       size:
-        selector: td:nth-child(8)
+        selector: td.center.size
         filters:
           - name: replace
             args: [".", ""]
           - name: replace
             args: [",", "."]
-      grabs:
-        selector: td:nth-child(9) > div:first-child
-        filters:
-          - name: replace
-            args: [".", ""]
-          - name: regexp
-            args: "^([\\d]+)"
       seeders:
-        selector: td:nth-child(9) > div:first-child
+        selector: td.center.data > a:first-child
         filters:
           - name: replace
             args: [".", ""]
-          - name: regexp
-            args: "\\|\\s*([\\d]+)\\s*\\|"
       leechers:
-        selector: td:nth-child(9) > div:first-child
+        selector: td.center.data > a:nth-child(2)
         filters:
           - name: replace
             args: [".", ""]
-          - name: regexp
-            args: "([\\d]+)$"
-      date:
-        selector: td.date
+      grabs:
+        selector: td.center.data
         filters:
+          - name: replace
+            args: [".", ""]
+        remove: div.uploader, div.moderation, a.leftborder
+
+      date:
+        selector: td.center.date
+        filters:
+          - name: re_replace
+            args: ["(\\-)(\\d{2})(\\d{2})(\\:)", "-$2 $3:"]
           - name: dateparse
-            args: "2006.01.02 15:04:05"
+            args: "2006-01-02 15:04"
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
         case:
-          img[src^="pic/4x.gif"]: "4"
-          img[src^="pic/3x.gif"]: "3"
-          img[src^="pic/2x.gif"]: "2"
-          "*": "1"
+          a[href^="?doubleup=four"]: "4"
+          a[href^="?doubleup=three"]: "3"
+          a[href^="?doubleup=two"]: "2"
+          "*" : "1"
       description:
-        selector: td.maintd
-        remove: div.tortitle, div.markcont, div.tablebuttons, div.tablebigbuttons
+        selector: div.contenttext
+        remove: div.contenttitle

src/Jackett.Common/Definitions/isohunt2.yml

@@ -48,6 +48,9 @@
       - name: querystring
         args: url
       - name: urldecode
+      # temp fix for #5372
+      - name: replace
+        args: [" ⭐", ""]
 
   search:
     paths:

src/Jackett.Common/Definitions/itorrent.yml

@@ -0,0 +1,80 @@
+---
+  site: itorrent
+  name: iTorrent
+  description: "iTorrent is a Public HUNGARIAN site"
+  language: hu
+  type: public
+  encoding: UTF-8
+  links:
+    - https://itorrent.ws/
+
+  caps:
+    categories:
+      "Apps": PC
+      "book": Books
+      "Games": PC/Games
+      "Movies": Movies
+      "Music": Audio
+      "XXX": XXX
+      "TV": TV
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    selector: a[href^="/torrentfiles/"]
+
+  search:
+    paths:
+      - path: "torrentek/title/{{ .Keywords}}/"
+    rows:
+      selector: tr.gradeX
+      filters:
+        - name: andmatch
+    fields:
+      category:
+        selector: td:nth-child(1) i
+        attribute: class
+        filters:
+        # patch. books are "fa fa-book" while all the other categories are "ico-list-*"
+          - name: replace
+            args: [" ", "-"]
+          - name: split
+            args: ["-", 2]
+      title:
+        selector: td:nth-child(2) a
+      details:
+        selector: td:nth-child(2) a
+        attribute: href
+      download:
+        selector: td:nth-child(2) a
+        attribute: href
+      date:
+        selector: td:nth-child(4) span
+        optional: true
+        attribute: title
+        filters:
+          - name: dateparse
+            args: "2006.01.02 15:04"
+      date:
+        selector: td:nth-child(4):not(span)
+        optional: true
+        filters:
+          - name: dateparse
+            args: "2006.01.02"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8) 
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett.Common/Definitions/jpopsuki.yml

@@ -26,6 +26,7 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      music-search: [q, album, artist, label, year]
 
   login:
     path: login.php
@@ -49,7 +50,7 @@
       - path: torrents.php
     inputs:
       $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{ .Query.Keywords }}"
+      searchstr: "{{if .Query.Artist}}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
       order_by: time
       order_way: desc
       action: basic