Don't delete $(cwd)/Jackett if it has jackett (#11479) resolves #11463

"The Hit&Run rate is at least 0.5 for each torrent, regardless of category and features. You have to seed every torrent at least that rate.
You must seed every torrent for at least 2 days if you cannot provide a shipping amount."
https://broadcity.in/rules.php

README.md

@@ -17,10 +17,9 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)
 
-
 #### Supported Systems
-* Windows 7SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/3.1/3.1-supported-os.md#linux)
+* Windows 7 SP1 or greater
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md#linux)
 * macOS 10.13 or greater
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
@@ -40,6 +39,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BigFANGroup
  * BitRu
  * BT.etree
+ * BT4G
  * BTDB
  * BTDIGG
  * BTSOW
@@ -65,7 +65,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GkTorrent
  * GloDLS
  * GTorrent
- * HDReactor
+ * GTorrent.pro
+ * HDhouse (HDReactor)
  * IBit
  * Idope
  * Il CorSaRo Blu
@@ -73,7 +74,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * kickasstorrents (kickass.ws)
+ * kickasstorrents.ws
  * kickasstorrents.to
  * Legit Torrents
  * LePorno.info
@@ -81,12 +82,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LinuxTracker
  * MacTorrents
  * Magnet4You
- * MagnetDL
  * MejorTorrent
  * MixTapeTorrent
- * Monova
- * MovCr
+ * Montorrent
  * MoviesDVDR
+ * MovieTorrent
  * MyPornClub
  * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
  * Newstudio
@@ -95,6 +95,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NoNaMe Club (NNM-Club)
  * Nyaa-Pantsu
  * Nyaa.si
+ * OnceSearch
  * OneJAV
  * OxTorrent
  * ParnuXi
@@ -106,6 +107,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLive
  * PornoRip
  * PornoTor
+ * Portugas
  * ProPorn
  * ProStyleX
  * Rapidzona
@@ -120,35 +122,40 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ShizaProject
  * shokweb
  * ShowRSS
- * SkyTorrentsClone (*.lol)
- * SkyTorrentsClone2 (*.to)
+ * SkyTorrents.to
  * Solid Torrents
  * sosulki
+ * SubsPlease
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
+ * Tjangto (짱토)
+ * TNTfork
  * Tokyo Tosho
  * Torlock
  * TOROS
- * Torrent Bomb (토렌트봄)
  * Torrent Downloads (TD)
  * Torrent Oyun indir
+ * Torrent Paradise (ML)
  * torrent-pirat
  * Torrent4You
  * Torrent9
- * Torrent9Clone
+ * Torrent9 clone
  * TorrentDownload
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
  * TorrentMafya
+ * TorrentMax (토렌트맥스)
  * TorrentParadise
  * TorrentProject
  * TorrentProject2
- * TorrentQuest
+ * TorrentQQ (토렌트큐큐)
  * Torrents.csv
+ * TorrentSir (토렌트썰)
  * Torrentv
  * TorrentView (토렌트뷰)
+ * TorrentWhiz ( 토렌트위즈)
  * Torrentz2
  * Torrentz2k
  * truPornolabs
@@ -168,12 +175,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
  * AniDUB
+ * Anime-Free
  * ArenaBG
  * BaibaKo
  * BookTracker
  * BootyTape
  * CasStudioTV
- * cool-torrent
+ * Catorrent
  * Darmowe torrenty
  * Deildu
  * DimeADozen (EzTorrent)
@@ -185,6 +193,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremlymTorrents (XTR)
  * Genesis-Movement
  * HamsterStudio
+ * HunTorrent
  * IV-Torrents
  * KinoNaVse100
  * Kinorun
@@ -208,6 +217,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sharewood
  * SkTorrent
  * SkTorrent-org
+ * themixingbowl (TMB)
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
@@ -224,30 +234,30 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2 Fast 4 You
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
- * 3evils
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
  * Abnormal [![(invite needed)][inviteneeded]](#)
+ * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
+ * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
  * Aidoru!Online
  * Aither
  * AlphaRatio (AR)
  * AmigosShareClub
+ * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
+ * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
- * Asgaard (AG)
  * AsianCinema
- * AST4u [![(invite needed)][inviteneeded]](#)
  * Asylum Share
  * AudioNews (AN)
- * Audiobook Torrents (ABT + RNS)
+ * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Awesome-HD (AHD)
  * Borgzelle
  * Back-ups
  * bB
@@ -256,7 +266,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BeyondHD (BHD)
  * Bibliotik
  * BIGTorrent
- * BigTower
  * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
  * BIT-HDTV
  * BiT-TiTAN
@@ -273,7 +282,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadCity [![(invite needed)][inviteneeded]](#)
  * BroadcasTheNet (BTN)
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BTGigs (TG) [![(invite needed)][inviteneeded]](#)
  * BTNext (BTNT)
  * BTSCHOOL
  * BWTorrents
@@ -284,18 +292,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
- * ChannelX
  * ChileBT
  * Cinecalidad
- * CinemaMovies
+ * CinemaMovieS_ZT
  * CinemaZ (EuTorrents)
  * Cinemageddon
  * Cinematik
  * Classix
+ * Coastal-Crew
  * Concertos
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
+ * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
  * Dark Tracker
@@ -308,9 +317,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DigitalCore
  * DivTeam
  * DivxTotal
- * DocumentaryTorrents (DT)
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
- * DXDHD
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
@@ -319,12 +326,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EpubLibre
  * eShareNet
  * eStone (XiDER, BeLoad)
- * Ethor.net (Thor's Land)
  * ExoticaZ (YourExotic)
  * ExtremeBits
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * FANO.IN
  * Fantastic Heaven
+ * FeedUrNeed
  * Femdomcult
  * FileList (FL)
  * Film-Paleis
@@ -333,7 +340,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FocusX
  * Fou-Du-Cinema
  * FreeTorrent
- * FullMixMusic
  * FunFile (FF)
  * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
  * FunReleases [![(invite needed)][inviteneeded]](#)
@@ -351,7 +357,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GreekDiamond
  * Greek Team
  * HaiDan
- * HacheDe
  * HD Dolby [![(invite needed)][inviteneeded]](#)
  * HD-Bits.com
  * HD-Forever (HDF)
@@ -362,17 +367,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HD-Torrents (HDT)
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDArea (HDA)
+ * HDAtmos
  * HDBits
  * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing)
  * HDC (HDCiTY)
  * HDCity
- * HDDisk (HDD)
  * HDHome (HDBigger)
  * HDME
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky
- * HDStreet
  * HDTime
  * HDTorrents.it
  * HDTurk [![(invite needed)][inviteneeded]](#)
@@ -381,7 +385,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Hebits
  * HellasTZ
  * Hon3y HD
- * Horror Site
  * HQSource (HQS)
  * HuSh [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
@@ -397,7 +400,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LatinoP2P
  * Le Saloon
  * LeChaudron
- * LeagueHD
+ * LemonHD
  * LearnFlakes
  * LegacyHD (HD4Free)
  * Libble
@@ -415,7 +418,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MNV (Max-New-Vision)
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
- * Movie Zone (Mz)
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
@@ -423,12 +425,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NetLab
- * New Real World [![(invite needed)][inviteneeded]](#)
  * NorBits
- * notwhat.cd
  * oMg[WtF]trackr
- * OnlineSelfEducation
- * ONLYscene
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -446,15 +444,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PolishTracker
  * PornBits (PB)
  * Pornbay [![(invite needed)][inviteneeded]](#)
+ * PotUK
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
- * Psytorrents [![(invite needed)][inviteneeded]](#)
  * PTerClub
  * PTFiles (PTF)
  * PThome
  * PTMSG
  * PTSBAO
+ * PTtime
  * PuntoTorrent
  * PuroVicio
  * Puur-Hollands
@@ -475,7 +474,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile (SF)
- * ShareUniversity
  * Shareisland
  * Shazbat
  * Shellife (SL) [![(invite needed)][inviteneeded]](#)
@@ -483,7 +481,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SnowPT (SSPT)
  * SoulVoice [![(invite needed)][inviteneeded]](#)
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
- * SpaceTorrent
  * SpeedCD
  * Speedmaster HD
  * SpeedTorrent Reloaded
@@ -491,15 +488,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
  * SpringSunday
+ * SugoiMusic
  * Superbits (SBS)
- * TakeaByte
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
  * TeamHD
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
- * TenYardTorrents (TYT) [![(invite needed)][inviteneeded]](#)
+ * teracod (Movie Zone)
  * The Falling Angels (TFA)
  * The Geeks [![(invite needed)][inviteneeded]](#)
  * The Horror Charnel (THC)
@@ -511,6 +508,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
  * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheLeachZone
+ * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * ToTheGlory (TTG)
@@ -535,6 +534,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
  * Torrentland
  * TotallyKids (TK)
+ * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
  * TTsWEB
@@ -590,12 +590,13 @@ We recommend you install Jackett as a Windows service using the supplied install
 
 To get started with using the installer for Jackett, follow the steps below:
 
-1. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
-2. When prompted if you would like this app to make changes to your computer, select "yes".
-3. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
-4. Once the installation has finished, check the "Launch Jackett" box to get started.
-5. Navigate your web browser to http://127.0.0.1:9117
-6. You're now ready to begin adding your trackers and using Jackett.
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net50#dependencies
+2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
+3. When prompted if you would like this app to make changes to your computer, select "yes".
+4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
+5. Once the installation has finished, check the "Launch Jackett" box to get started.
+6. Navigate your web browser to http://127.0.0.1:9117
+7. You're now ready to begin adding your trackers and using Jackett.
 
 When installed as a service the tray icon acts as a way to open/start/stop Jackett. If you opted to not install it as a service then Jackett will run its web server from the tray tool.
 
@@ -679,7 +680,7 @@ Jackett is available as a beta package from [SynoCommunity](https://synocommunit
 
 
 ## Running Jackett behind a reverse proxy
-When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base Path Override" Jackett option accordingly.
+When running jackett behind a reverse proxy make sure that the original hostname of the request is passed to Jackett. If HTTPS is used also set the X-Forwarded-Proto header to "https". Don't forget to adjust the "Base path override" Jackett option accordingly.
 
 Example config for apache:
 ```
@@ -703,6 +704,20 @@ location /jackett {
 }
 ```
 
+## Search Cache
+Jackett has an internal cache to increase search speed and to reduce the number of requests to the torrent sites.
+The default values should be good for most users. If you have problems, you can reduce the TTL value in the
+configuration or even disable the cache. Keep in mind that you can be banned by the sites if you make a lot of requests.
+* **Cache TTL (seconds)**: (default 2100 / 35 minutes) It indicates how long the results can remain in the cache.
+* **Cache max results per indexer**: (default 1000) How many results are kept in cache for each indexer. This limit is used to limit the use of RAM. If you make many requests and you have enough memory, increase this number.
+
+## Configuring FlareSolverr
+Some indexers are protected by CloudFlare or similar services and Jackett is not able to solve the challenges.
+For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) has been integrated into Jackett. This service is in charge of solving the challenges and configuring Jackett with the necessary cookies.
+Setting up this service is optional, most indexers don't need it.
+* Install FlareSolverr service (following their instructions)
+* Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
+
 ## Configuring OMDb
 This feature is used as a fallback (when using the aggregate Indexer) to get the movie/series title if only the IMDB ID is provided in the request.
 To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/apikey.aspx) (1,000 daily requests limit) and paste the key in Jackett
@@ -728,9 +743,6 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 -   `-c, --UseClient`          Override web client selection.
                             [automatic(Default)/httpclient/httpclient2]
 
--   `-j, --ProxyConnection`    use proxy - e.g. 127.0.0.1:8888
-
-
 -   `-x, --ListenPublic`       Listen publicly
 
 -   `-z, --ListenPrivate`      Only allow local access
@@ -759,7 +771,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source
 
 ### Windows
-* Install the .NET Core [SDK](https://www.microsoft.com/net/download/windows)
+* Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
 * Open PowerShell and from the `src` directory, run `dotnet restore`
 * Open the Jackett solution in Visual Studio 2019 (version 16.4 or above)
@@ -779,21 +791,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f netcoreapp3.1 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp3.1/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net5.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net5.0/osx-x64/jackett # run jackett
 ```
 
 ### Linux
 
 
 ```bash
-sudo apt install mono-complete nuget msbuild dotnet-sdk-3.1 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-5.0 # install build tools (Debian/ubuntu)
 git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f netcoreapp3.1 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/netcoreapp3.1/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net5.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net5.0/linux-x64/jackett # run jackett
 ```
 
 ## Screenshots

azure-pipelines.yml

@@ -2,12 +2,12 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
   majorVersion: 0
-  minorVersion: 16
+  minorVersion: 17
   patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
   jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
   buildConfiguration: Release
-  netCoreFramework: netcoreapp3.1
-  netCoreSdkVersion: 3.1.x
+  netCoreFramework: net5.0
+  netCoreSdkVersion: 5.0.x
   # system.debug: true
 
 trigger:
@@ -50,7 +50,7 @@ stages:
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
@@ -110,7 +110,7 @@ stages:
               projects: 'src/Jackett.Tray/Jackett.Tray.csproj'
               publishWebProjects: false
               zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
 
           - task: DotNetCoreCLI@2
             displayName: Build Jackett Service (Windows only)
@@ -120,7 +120,7 @@ stages:
               projects: 'src/Jackett.Service/Jackett.Service.csproj'
               publishWebProjects: false
               zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
 
           - task: CopyFiles@2
             displayName: Copy Jackett Server
@@ -301,14 +301,14 @@ stages:
               targetType: inline
               failOnStderr: true
               script: |
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/DateTimeRoutines
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Common
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Server
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Service
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Test
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Tray
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Updater
+                dotnet-format --check --verbosity diagnostic --folder ./src/DateTimeRoutines
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Common
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Server
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Service
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Test
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Tray
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Updater
 
       - job: Linting_YAML
         displayName: Linting YAML
@@ -354,21 +354,16 @@ stages:
               imageName: macOS-latest
               framework: $(netCoreFramework)
               runtime: osx-x64
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
               runtime: linux-x64
-            LinuxARM32:
-              buildDescription: Linux ARM32
+            LinuxARM:
+              buildDescription: Linux ARM
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
               runtime: linux-arm
-            LinuxARM64:
-              buildDescription: Linux ARM64
-              imageName: ubuntu-latest
-              framework: $(netCoreFramework)
-              runtime: linux-arm64
         pool:
           vmImage: $(imageName)
         displayName: ${{ variables.buildDescription }}
@@ -461,7 +456,7 @@ stages:
               buildDescription: macOS
               imageName: macOS-latest
               artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz

src/Jackett.Common/Content/custom.css

@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputcheckbox label {
     padding: 0 1.5em;
 }
@@ -134,8 +138,8 @@ hr {
     }
 
 .input-header {
-    font-size: 18px;
-    width: 160px;
+    font-size: 16px;
+    width: 250px;
     display: inline-block;
 }
 
@@ -165,7 +169,7 @@ hr {
     text-align: center;
 }
 
-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
     width: 25px;
 }
 

src/Jackett.Common/Content/custom.js

@@ -98,6 +98,15 @@ function loadJackettSettings() {
         $("#jackett-allowupdate").attr('checked', data.updatedisabled);
         $("#jackett-prerelease").attr('checked', data.prerelease);
         $("#jackett-logging").attr('checked', data.logging);
+
+        $("#jackett-cache-enabled").attr('checked', data.cache_enabled);
+        $("#jackett-cache-ttl").val(data.cache_ttl);
+        $("#jackett-cache-max-results-per-indexer").val(data.cache_max_results_per_indexer);
+        if (!data.cache_enabled) {
+            $("#jackett-show-releases").attr("disabled", true);
+        }
+
+        $("#jackett-flaresolverrurl").val(data.flaresolverrurl);
         $("#jackett-omdbkey").val(data.omdbkey);
         $("#jackett-omdburl").val(data.omdburl);
         var password = data.password;
@@ -240,7 +249,13 @@ function displayUnconfiguredIndexersList() {
 			        }).fail(function (data) {
                 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 occurred 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);
+                  var githubrepo = "Jackett/Jackett"
+                  var githubtext = "this indexer"
+                  if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
+                    githubrepo = "FlareSolverr/FlareSolverr"
+                    githubtext = "FlareSolverr"
+                  }
+                  doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
                 } else {
                   doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
                 }
@@ -465,7 +480,13 @@ function testIndexer(id, notifyResult) {
       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 occurred 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);
+        var githubrepo = "Jackett/Jackett"
+        var githubtext = "this indexer"
+        if (data.responseJSON.error.includes("check FlareSolverr logs")) {
+          githubrepo = "FlareSolverr/FlareSolverr"
+          githubtext = "FlareSolverr"
+        }
+        doNotify("An error occurred while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
       } else {
         doNotify("An error occurred while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
       }
@@ -552,6 +573,9 @@ function getConfigModalJson(configForm) {
             case "inputstring":
                 itemEntry.value = $el.find(".setup-item-inputstring input").val();
                 break;
+            case "password":
+                itemEntry.value = $el.find(".setup-item-password input").val();
+                break;
             case "inputbool":
                 itemEntry.value = $el.find(".setup-item-inputbool input").is(":checked");
                 break;
@@ -1126,6 +1150,10 @@ function bindUIButtons() {
         var jackett_update = $("#jackett-allowupdate").is(':checked');
         var jackett_prerelease = $("#jackett-prerelease").is(':checked');
         var jackett_logging = $("#jackett-logging").is(':checked');
+        var jackett_cache_enabled = $("#jackett-cache-enabled").is(':checked');
+        var jackett_cache_ttl = $("#jackett-cache-ttl").val();
+        var jackett_cache_max_results_per_indexer = $("#jackett-cache-max-results-per-indexer").val();
+        var jackett_flaresolverr_url = $("#jackett-flaresolverrurl").val();
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();
 
@@ -1143,6 +1171,11 @@ function bindUIButtons() {
             blackholedir: $("#jackett-savedir").val(),
             logging: jackett_logging,
             basepathoverride: jackett_basepathoverride,
+            logging: jackett_logging,
+            cache_enabled: jackett_cache_enabled,
+            cache_ttl: jackett_cache_ttl,
+            cache_max_results_per_indexer: jackett_cache_max_results_per_indexer,
+            flaresolverrurl: jackett_flaresolverr_url,
             omdbkey: jackett_omdb_key,
             omdburl: jackett_omdb_url,
             proxy_type: jackett_proxy_type,

src/Jackett.Common/Content/custom_mobile.css

@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputbool input {
     max-width: 100px;
     height: 20px;
@@ -126,8 +130,8 @@ hr {
     }
 
 .input-header {
-    font-size: 18px;
-    width: 160px;
+    font-size: 16px;
+    width: 250px;
     display: inline-block;
 }
 
@@ -157,7 +161,7 @@ hr {
     text-align: center;
 }
 
-#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease {
+#jackett-allowext, #jackett-allowupdate, #jackett-logging, #jackett-prerelease, #jackett-cache-enabled {
     width: 25px;
 }
 

src/Jackett.Common/Content/index.html

@@ -9,14 +9,6 @@
     <meta charset="utf-8" />
     <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party resources (E.g. Empornium poster images won't load) -->
     <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
-    <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon" sizes="76x76" href="../apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="../apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="../apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="../apple-touch-icon-152x152.png" />
-    <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' />
@@ -25,7 +17,7 @@
     <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
     <script type="text/javascript" src="../libs/handlebars.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/moment.min.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=20210117"></script>
     <script type="text/javascript" src="../libs/handlebarsextend.js?changed=2017083001"></script>
     <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
@@ -33,8 +25,8 @@
 
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20200223" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20200223" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20201208" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20201208" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -127,7 +119,7 @@
             </a>
         </div>
         <div class="input-area">
-            <span class="input-header">Base Path Override: </span>
+            <span class="input-header">Base path override: </span>
             <input id="jackett-basepathoverride" class="form-control input-right" type="text" value="" placeholder="/jackett">
         </div>
         <div class="input-area">
@@ -135,7 +127,7 @@
             <input id="jackett-port" class="form-control input-right" type="text" value="" placeholder="9117">
         </div>
         <div class="input-area">
-            <span class="input-header">Manual download blackhole directory: </span>
+            <span class="input-header">Blackhole directory: </span>
             <input id="jackett-savedir" class="form-control input-right" type="text" value="" placeholder="c:\torrents\">
         </div>
 
@@ -188,6 +180,22 @@
             <span class="input-header">Enhanced logging: </span>
             <input id="jackett-logging" class="form-control input-right" type="checkbox" />
         </div>
+        <div class="input-area">
+            <span class="input-header">Cache enabled (recommended): </span>
+            <input id="jackett-cache-enabled" class="form-control input-right" type="checkbox" />
+        </div>
+        <div class="input-area">
+            <span class="input-header">Cache TTL (seconds): </span>
+            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="">
+        </div>
+        <div class="input-area">
+            <span class="input-header">Cache max results per indexer: </span>
+            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="">
+        </div>
+        <div class="input-area">
+          <span class="input-header">FlareSolverr API URL: </span>
+          <input id="jackett-flaresolverrurl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
+        </div>
         <div class="input-area">
             <span class="input-header">OMDB API key: </span>
             <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
@@ -219,6 +227,11 @@
             {{/if}}
         </div>
     </script>
+    <script id="setup-item-password" type="text/x-handlebars-template">
+        <div class="setup-item-password">
+            <input class="form-control" type="password" value="{{{value}}}" />
+        </div>
+    </script>
     <script id="setup-item-inputbool" type="text/x-handlebars-template">
         <div class="setup-item-inputbool">
             {{#if value}}
@@ -680,6 +693,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20201107"></script>
+    <script type="text/javascript" src="../custom.js?changed=20210322"></script>
 </body>
 </html>

src/Jackett.Common/Content/libs/handlebarsmoment.js

@@ -33,5 +33,5 @@ Handlebars.registerHelper('jacketTimespan', function (context, block) {
 });
 
 Handlebars.registerHelper('jacketSize', function (context, block) {
-    return filesize(context, { round: 1 });
+    return filesize(context, { round: 2 });
 });

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

@@ -14,9 +14,8 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337.root.yt/
-  - https://1337x.unblockit.app/
-  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.buzz/
+  - https://1337x.unblocked.monster/
 legacylinks:
   - https://1337x.unblocked.earth/
   - https://1337x.unblockit.pro/
@@ -36,6 +35,12 @@ legacylinks:
   - https://1337x.uk-unblock.pro/
   - https://1337x.unblockit.top/
   - https://1337x.unblockit.lat/
+  - https://1337x.unblockit.app/
+  - https://1337.root.yt/
+  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.dev/
+  - https://1337x.unblockit.ltd/
+  - https://1337x.unblockit.link/
 
 caps:
   categorymappings:
@@ -134,8 +139,6 @@ settings:
     default: "magnet:"
     options:
       "http://itorrents.org/": iTorrents.org
-      "http://torrage.info/": Torrage.info
-      "http://btcache.me/": BTcache.me
       "magnet:": magnet
   - name: sort
     type: select
@@ -180,6 +183,7 @@ search:
       selector: td[class^="coll-1"] a[href^="/torrent/"]
       attribute: href
       filters:
+        - name: urldecode
         - name: split
           args: ["/", 3]
     title:
@@ -187,11 +191,28 @@ search:
       text: "{{ if .Result.title_href }}{{ .Result.title_href }}{{ else }}{{ .Result.title_text }}{{ end }}"
       filters:
         - name: re_replace
-          args: ["(-+)", " "]
+          args: ["-", " "]
         - name: replace
           args: ["Grey's Anatomy", "Greys Anatomy"]
         - name: replace
-          args: ["\u000f", ""] # get rid of unwanted character
+          args: ["\u000f", ""] # get rid of unwanted character #6582
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
     category:
       text: 40
     category|noappend:

src/Jackett.Common/Definitions/1ptbar.yml

@@ -11,15 +11,17 @@ links:
 caps:
   categorymappings:
     - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
     - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
     - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 403, cat: TV, desc: "TV Show/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺节目"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
-    - {id: 409, cat: Other, desc: "Other/其它"}
-    - {id: 412, cat: Other, desc: "Education/教育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/高品质音频"}
+    - {id: 412, cat: Other, desc: "Edu/教育"}
+    - {id: 411, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 410, cat: PC/0day, desc: "Software/软件"}
 
   modes:
     search: [q]

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

@@ -1,188 +0,0 @@
----
-id: 3evils
-name: 3evils
-description: "3evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
-type: private
-encoding: UTF-8
-links:
-  - https://www.3evils.net/
-legacylinks:
-  - https://www.3evils.com/
-  - https://the-unknown.xyz/
-
-caps:
-  categorymappings:
-    - {id: 73, cat: PC, desc: "Appz/Linux"}
-    - {id: 42, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 65, cat: Books/EBook, desc: "Books"}
-    - {id: 80, cat: Console/NDS, desc: "Games/Nintendo"}
-    - {id: 78, cat: Console/PS4, desc: "Games/PS4"}
-    - {id: 77, cat: PC/Games, desc: "Games/Windows"}
-    - {id: 79, cat: Console/XBox, desc: "Games/XBOX"}
-    - {id: 13, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 71, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 72, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
-    - {id: 14, cat: Movies, desc: "Movies/Packs"}
-    - {id: 70, cat: Movies/SD, desc: "Movies/Screeners & Cams"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
-    - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 11, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 74, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 33, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 32, cat: Audio, desc: "Music/Packs"}
-    - {id: 75, cat: Audio/Video, desc: "Music/Videos"}
-    - {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"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-  error:
-    - selector: div.callout:contains("Login failed!")
-  test:
-    path: /
-    selector: a[href*="/logout.php?hash_please="]
-
-search:
-  paths:
-    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # title, descr, genre, all
-    searchin: title
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.unstriped tbody tr:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.*?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
-        # <img src=\'./pic/noposter.png\'
-        - name: regexp
-          args: "src=\\\\'(.+?)\\\\'"
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    files:
-      selector: td[data-label="Files"]
-    # 2 flavours of dates
-    date:
-      # Today<br> 10:20 AM
-      # Yesterday<br> 08:03 PM
-      optional: true
-      selector: td[data-label="Added"]:contains("day")
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-    date:
-      # Feb 14 2019<br> 10:20 AM
-      optional: true
-      selector: td[data-label="Added"]:not(:contains("day"))
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
-    size:
-      selector: td[data-label="Size"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td[data-label="Seeders"]
-    leechers:
-      selector: td[data-label="Leechers"]
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5 (customised)

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

@@ -17,6 +17,7 @@ caps:
     - {id: 27, cat: Movies/HD, desc: "MoviesHD"}
     - {id: 29, cat: Movies/SD, desc: "Movies/SD"}
     - {id: 26, cat: Movies/SD, desc: "Movies/XviD"}
+    - {id: 45, cat: Movies, desc: "Movies/Kids"}
     - {id: 41, cat: TV/Foreign, desc: "Foreign tv"}
     - {id: 40, cat: TV, desc: "Mini-Series"}
     - {id: 43, cat: TV/HD, desc: "TV H265"}
@@ -90,7 +91,7 @@ search:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
-    # 0 all 1 onlyfree
+    # 0 all, 1 onlyfree
     filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
     title: "{{ .Keywords }}"
     search_type: 1

src/Jackett.Common/Definitions/7torrents.yml

@@ -20,10 +20,6 @@ caps:
     book-search: [q]
 
 settings:
-  - name: info_8000
-    type: info
-    label: About 7torrents Categories
-    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
   - name: sort
     type: select
     label: Sort requested from site
@@ -32,6 +28,14 @@ settings:
       created: created
       length: size
       seeders: seeders
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
+  - name: info_8000
+    type: info
+    label: About 7torrents Categories
+    default: 7torrents does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
 
 search:
   # https://www.7torrents.cc/search?query=2020&sort=created

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -121,6 +121,14 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_account
+    type: info
+    label: Account Settings
+    default: In order to see the correct date and size in the torrent rows, change the <b>Torrentliste:</b> setting to <b>Modern</b> on your account profile.
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: signin.php

src/Jackett.Common/Definitions/DasUnerwartete.yml

@@ -61,6 +61,9 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: pin
+    type: text
+    label: Pin
 
 login:
   path: login.php
@@ -69,8 +72,9 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
   error:
-    - selector: .tablea:contains("Benutzername oder Passwort ungültig")
+    - selector: .tablea:contains("Benutzername, Passwort oder Pin ungültig")
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/abtorrents.yml

@@ -1,7 +1,7 @@
----
-id: audiobooktorrents
-name: Audiobook Torrents
-description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
+---
+id: abtorrents
+name: ABtorrents
+description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
 language: en-us
 type: private
 encoding: UTF-8
@@ -80,12 +80,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with 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 (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -96,17 +97,7 @@ settings:
     default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."
 
 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: 1
-    submitme: X
-  error:
-    - selector: td.embedded:has(h2:contains("Oops"))
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/acrossthetasman.yml

@@ -0,0 +1,83 @@
+---
+id: acrossthetasman
+name: Across The Tasman
+description: "ATT is a torrent site for Rugby and other sports played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://acrossthetasman.com/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    default: date
+    options:
+      date: created
+      filename: title
+      size: size
+      seeders: seeders
+  - name: order
+    type: select
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: post
+  path: login.php
+  inputs:
+    vb_login_username: "{{ .Config.username }}"
+    vb_login_password: "{{ .Config.password }}"
+    cookieuser: 1
+    do: login
+  test:
+    path: torrents.php
+
+search:
+  paths:
+    - path: "torrents.php?sort={{ .Config.sort }}&order={{ .Config.order}}&query={{ .Keywords }}"
+
+  rows:
+    selector: table[width='100%'][align='center']:not([class]) > tbody > tr
+
+  fields:
+    category:
+      text: 1
+    date:
+      # Feb 12, 2021
+      selector: td:nth-child(1)
+      filters:
+        - name: dateparse
+          args: "Jan 02, 2006"
+    title:
+      selector: td:nth-child(4) > span:nth-child(1)
+      filters:
+        - name: re_replace
+          args: ["[\\s]+Uploaded.*", ""]
+    download:
+      selector: a[href*="attachment.php?attachmentid="]
+      attribute: href
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    size:
+      selector: td:nth-child(10)
+# engine n/a

src/Jackett.Common/Definitions/aither.yml

@@ -199,4 +199,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# UNIT3D 4.0.0
+# UNIT3D 5.1.0

src/Jackett.Common/Definitions/amigosshare.yml

@@ -205,7 +205,7 @@ search:
         - name: append
           args: "{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
         - name: re_replace
-          args: ["(Dual-Audio|Dublado)", "Brazilian $1"]
+          args: ["(Dual|[Nn]acional|[Dd]ublado)", "Brazilian $1"]
     details:
       selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
       attribute: href

src/Jackett.Common/Definitions/anaschcc.yml

@@ -0,0 +1,159 @@
+---
+id: anaschcc
+name: anasch.cc
+description: "anasch.cc is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://anasch.cc/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: Movies}
+    - {id: 2, cat: TV, desc: TV}
+    - {id: 3, cat: TV, desc: Animation}
+    - {id: 5, cat: Audio, desc: Music}
+    - {id: 12, cat: XXX, desc: Porn}
+    - {id: 29, cat: TV/Sport, desc: Sports}
+    - {id: 37, cat: PC, desc: Software}
+    - {id: 38, cat: Console, desc: Games}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+
+login:
+  path: index.php?page=login
+  method: form
+  form: form[action^="index.php?page=login"]
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: div[data-validate^="Valid"]
+      message:
+        selector: div[data-validate^="Valid"]
+        attribute: data-validate
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    page: torrents
+    active: 0
+    search: "{{ .Keywords }}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
+    # 1 freeleech, 2 2x upload, 3 featured
+    discount[]: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: "table.lista tbody tr:has(a[href^=\"index.php?page=torrent-details\"])"
+
+  fields:
+    category:
+      selector: td a[href^="index.php?page=torrents&category[]="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category[]
+    title:
+      selector: td a[href^="index.php?page=torrent-details"]
+    details:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: td a[href^="download.php"]
+      attribute: href
+    imdb:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: replace
+          args: ["javascript:ShowImage('/images/imdb/", "tt"]
+        - name: replace
+          args: [".jpg')", ""]
+        - name: replace
+          args: ["tt0000000", ""]
+    poster:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: replace
+          args: ["javascript:ShowImage('", ""]
+        - name: replace
+          args: ["')", ""]
+        - name: replace
+          args: ["/images/imdb/0000000.jpg", ""]
+    size:
+      selector: td:nth-child(5)
+    date:
+      # 22/01/21 01:28
+      selector: td:nth-child(6)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
+        - name: dateparse
+          args: "02/01/06 15:04 -07:00"
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+      filters:
+        - name: replace
+          args: ["---", "0"]
+    downloadvolumefactor:
+      case:
+        img[src*="freeleech.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src*="x2u.png"]: 2
+        "*": 1
+    minimumratio:
+      text: 3.0
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# xbtit

src/Jackett.Common/Definitions/anime-free.yml

@@ -0,0 +1,138 @@
+---
+id: anime-free
+name: Anime-Free
+description: "Anime-Free is a RUSSIAN Semi-Private Torrent Tracker for Hentai manga, eroge and flash porn games"
+language: ru-ru
+type: semi-private
+encoding: windows-1251
+links:
+  - https://anime-free.biz/
+legacylinks:
+  - https://anime-free.net/ # redirects to *.biz
+
+caps:
+  categorymappings:
+    - {id: 14, cat: TV/Anime, desc: "Аниме хентай"}
+    - {id: 47, cat: TV/Anime, desc: "   Хентай на Русском языке"}
+    - {id: 48, cat: TV/Anime, desc: "   Хентай Без русского перевода"}
+    - {id: 45, cat: TV/Anime, desc: "   Хентай Без цензуры"}
+    - {id: 46, cat: TV/Anime, desc: "   Хентай с цензурой"}
+    - {id: 54, cat: Other, desc: "Косплей"}
+    - {id: 51, cat: TV/Anime, desc: "[3D] хентай и анимация"}
+    - {id: 5, cat: Books/Comics, desc: "Хентай манга"}
+    - {id: 56, cat: Console, desc: "Игры"}
+    - {id: 10, cat: Console, desc: "   Эротические и хентай игры"}
+    - {id: 55, cat: Console, desc: "   3DCG/3D-Animation игры"}
+    - {id: 57, cat: Console, desc: "   Игры на русском языке"}
+    - {id: 58, cat: Other, desc: "   Онлайн игры"}
+    - {id: 52, cat: Books/Comics, desc: "Порно комиксы"}
+    - {id: 49, cat: XXX/ImageSet, desc: "Хентай картинки, иллюстрации, обои и Art "}
+    - {id: 43, cat: TV/Anime, desc: "Эччи (Легкая эротика)"}
+    - {id: 4, cat: TV/Anime, desc: "Аниме Хентай"}
+    - {id: 50, cat: Other, desc: "Хентай Онлайн"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: email
+    type: text
+    label: Email
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: /
+  method: form
+  form: form.login-form
+  inputs:
+    login_name: "{{ .Config.email }}"
+    login_password: "{{ .Config.password }}"
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&catlist[]=0
+  paths:
+    - path: index.php
+  inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    showposts: 0
+    all_word_seach: 1
+    # 0 article, 1 comments, 2 static pages, 3 article titles
+    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
+    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    searchuser: ""
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    sortby: date
+    resorder: desc
+
+  rows:
+    selector: article
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      case:
+        a[href$="3d_hentai"]: 51
+        a[href$="3dcg_game"]: 55
+        a[href$="censored"]: 46
+        a[href$="comics"]: 52
+        a[href$="cosplay"]: 54
+        a[href$="etty"]: 43
+        a[href$="h-game"]: 10
+        a[href$="h-online"]: 50
+        a[href$="hentai"]: 4
+        a[href$="hentai_games"]: 56
+        a[href$="hentai_manga"]: 5
+        a[href$="hentai_raznoe"]: 49
+        a[href$="hentai_rus"]: 47
+        a[href$="online_games"]: 58
+        a[href$="original_hentai"]: 48
+        a[href$="rus-game"]: 57
+        a[href$="uncensored"]: 45
+    title:
+      selector: h2.title a
+    details:
+      selector: h2.title a
+      attribute: href
+    download:
+      selector: h2.title a
+      attribute: href
+    poster:
+      selector: img.entry-image
+      attribute: src
+    description:
+      selector: div[itemprop="description"]
+      optional: true
+    date:
+      selector: li:has(img#adddate)
+      filters:
+        - name: dateparse
+          args: "02-01-2006, 15:04"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      selector: b.file_size
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/animeworld.yml

@@ -1,11 +1,13 @@
 ---
-id: ast4u
-name: AST4u
-description: "AST4u is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
+id: animeworld
+name: AnimeWorld
+description: "AnimeWorld (AST4u) is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
 language: de-de
 type: private
 encoding: iso-8859-1
 links:
+  - https://animeworld.cx/
+legacylinks:
   - https://www.ast4u.me/
 
 caps:

src/Jackett.Common/Definitions/anirena.yml

@@ -8,7 +8,11 @@ encoding: UTF-8
 links:
   - https://www.anirena.com/
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/arenabg.yml

@@ -130,7 +130,7 @@ search:
 
   fields:
     category:
-      selector: td.filename a[href^="/en/torrents/?category="]:last-of-type
+      selector: td.category a[href^="/en/torrents/?category="]:last-of-type
       attribute: href
       filters:
         - name: querystring
@@ -163,15 +163,15 @@ search:
         - name: replace
           args: ["\\", ""]
     date:
-      # 16 November 2020
-      selector: div.row
+      # 2 January 2021, Saturday @ 20:46
+      selector: small
       filters:
         - name: regexp
-          args: "uplodaded (.+?),"
+          args: "(.+?, .+? @ [0-9]{2}:[0-9]{2})"
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2 January 2006 -07:00"
+          args: "2 January 2006, Monday @ 15:04 -07:00"
     size:
       selector: td:nth-child(3)
     seeders:

src/Jackett.Common/Definitions/asgaard.yml

@@ -1,204 +0,0 @@
----
-id: 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: 14, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
-    - {id: 17, cat: Movies/BluRay, desc: "Movies BD"}
-    - {id: 73, 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 HD"}
-    - {id: 19, cat: TV/UHD, desc: "TV 4K"}
-    - {id: 60, cat: TV/HD, desc: "TV BD"}
-    - {id: 20, cat: TV, desc: "TV Boxset"}
-    - {id: 50, cat: TV, desc: "TV No Nordic Subs"}
-    - {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/Mobile-Android, desc: "Apps Android"}
-    - {id: 29, cat: PC/Mobile-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/Mobile-Android, desc: "Games Android"}
-    - {id: 34, cat: PC/Mobile-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]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info
-    type: info
-    label: "About the Username field"
-    default: "Enter your <b>Email address</b> in the username field."
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 2
-    options:
-      2: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-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: 1
-    # 0 incl non-free, 1 incl only-free
-    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  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+)$
-    poster:
-      selector: img.tooltip-poster
-      attribute: src
-    download:
-      selector: a[href*="download.php?torrent="]
-      attribute: href
-    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)
-    date:
-      # 26 May 20 14:05:06
-      selector: td:nth-child(2) > div > div:last-of-type:not(:contains("day"))
-      optional: true
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "2 Jan 2006 15:04:05 -07:00"
-    date:
-      # Today, 20:26:23
-      # Yesterday, 13:50:05
-      selector: td:nth-child(2) > div > div:last-of-type:contains("day")
-      optional: true
-      remove: span
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: fuzzytime
-    downloadvolumefactor:
-      case:
-        img[src="./images/gold.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.95
-# Midgaard

src/Jackett.Common/Definitions/asylumshare.yml

@@ -176,6 +176,9 @@ search:
     # drop the year from searches since site titles do not include year
     - name: re_replace
       args: ["(19|20[0-9]{2})", ""]
+    # prepend + to each word
+    - name: re_replace
+      args: ["(\\w+)", "+$1"]
 
   rows:
     selector: tr.t-row:has(a[href^="download.php?id="])

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -7,10 +7,16 @@ type: public
 encoding: UTF-8
 links:
   - http://audiobookbay.nl/ # site forces http, does not support https
-  - https://audiobookbay.unblockit.app/
+  - http://audiobookbay.net/
+  - http://audiobookbayabb.com/
+  - https://audiobookbay.unblockit.buzz/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
+  - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
+  - https://audiobookbay.unblockit.ltd/
+  - https://audiobookbay.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/aussierules.yml

@@ -0,0 +1,91 @@
+---
+id: aussierules
+name: Aussierul.es
+description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://aussierul.es/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: type
+    label: Search Type
+    type: select
+    default: t_name
+    options:
+      t_name: Torrent Name
+      t_description: Torrent Description
+      t_both: Name & Description
+      t_uploader: Uploader
+      t_genre: IMDB Genre
+  - name: dead
+    label: Include Dead Torrents
+    type: select
+    default: No
+    options:
+      yes: Yes
+      no: No
+
+login:
+  method: form
+  form: form
+  path: login.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("An error has occured!")
+  test:
+    path: browse.php
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    search_type: "{{ .Config.type }}"
+    include_dead_torrents: "{{ .Config.dead }}"
+    keywords: "{{ .Keywords }}"
+
+  rows:
+    selector: table#sortabletable > tbody > tr:not(:first-child)
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: td:nth-child(2) > div:nth-child(1) > a > strong
+    details:
+      selector: td:nth-child(2) > div:nth-child(1) > a
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]
+      attribute: href
+    date:
+      # 27-03-2021 18:34
+      selector: td:nth-child(2) > div:nth-child(2)
+      filters:
+        - name: dateparse
+          args: "2-01-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)
+# TS Special Edition v.7.4

src/Jackett.Common/Definitions/bibliotik.yml

@@ -30,25 +30,20 @@ settings:
   - name: orderby
     type: select
     label: Sort requested from site
-    default: relevance
+    default: added
     options:
-      relevance: relevance
-      year: year
+      "@relevance": relevance
+      title: title
       size: size
-      duration: duration
       added: added
-      leechers: leechers
       seeders: seeders
-      snatches: snatches
-      comments: comments
-      files: files
   - name: order
     type: select
     label: Order requested from site
-    default: desc
+    default: DESC
     options:
-      desc: desc
-      asc: asc
+      DESC: desc
+      ASC: asc
 
 login:
   path: /
@@ -108,7 +103,7 @@ search:
       text: "{{ .Result.booktitle }}"
       filters:
         - name: append
-          args: "{{ if .Result.author }} by {{ .Result.author }}{{ else }}{{ end }}{{ if .Result._year }} {{ .Result._year }}{{ else }}{ {end }}{{ if .Result._filetype }} {{ .Result._filetype }}{{ else }}{{ end }}{{ if .Result._retail }} {{ .Result._retail }}{{ else }}{{ end }}"
+          args: "{{ if .Result.author }} by {{ .Result.author }}{{ else }}{{ end }}{{ if .Result._year }} {{ .Result._year }}{{ else }}{{ end }}{{ if .Result._filetype }} {{ .Result._filetype }}{{ else }}{{ end }}{{ if .Result._retail }} {{ .Result._retail }}{{ else }}{{ end }}"
     details:
       selector: .title a
       attribute: href
@@ -146,4 +141,4 @@ search:
       text: 1
     uploadvolumefactor:
       text: 1
-# engine tbc
+# engine n/a

src/Jackett.Common/Definitions/bigtower.yml

@@ -1,141 +0,0 @@
----
-id: bigtower
-name: BigTower
-description: "Big Tower is an ITALIAN Private site for TV / MOVIES / GENERAL"
-language: it-it
-type: private
-encoding: UTF-8
-links:
-  - http://bigtower.info/ # site does not support https NET::ERR_CERT_DATE_INVALID
-legacylinks:
-  - https://bigtower.info/
-
-caps:
-  categorymappings:
-
-    - {id: 11, cat: Movies/HD, desc: "DSS"}
-    - {id: 1, cat: Movies, desc: "Screener"}
-    - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
-    - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
-    - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
-    - {id: 6, cat: TV, desc: "Serie TV"}
-    - {id: 4, cat: TV/Anime, desc: "Cartoni"}
-    - {id: 7, cat: PC/Games, desc: "Giochi"}
-    - {id: 8, cat: Audio, desc: "Musica"}
-    - {id: 9, cat: PC/0day, desc: "Software"}
-    - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"}
-    - {id: 14, cat: Other, desc: "Varie & Altro"}
-    - {id: 13, cat: Books, desc: "Libri & Edicola"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: donor
-    type: checkbox
-    label: Show donor torrent? (Enable if you're a donor)
-    default: false
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: span:contains("Nome Utente non corretto")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    page: torrents
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    options: 0
-    active: 0
-
-  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{ if .Config.donor }}{{ else }}:not(:has(img[src*="keditbookmarks.png"])){{ end }}
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      filters:
-        - name: re_replace # rimozioni varie
-          args: ["(?i)(\\[Richiesta\\])", ""]
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["index.php?page=torrent-details&id=", "download.php?id="]
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    size:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(8)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    grabs:
-      selector: td:nth-last-child(5)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    seeders:
-      selector: td:nth-last-child(7)
-    leechers:
-      selector: td:nth-last-child(6)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-#  xbtitFM v3.0.00

src/Jackett.Common/Definitions/bit-titan.yml

@@ -81,7 +81,6 @@ caps:
     - {id: 9020, cat: Books/EBook, desc: "Books E-Book"}
     - {id: 9030, cat: Books, desc: "Books E-Paper"}
     - {id: 9040, cat: Books, desc: "Books E-Learning"}
-    - {id: 9050, cat: TV, desc: "TV Kids"}
     - {id: 9060, cat: TV/Anime, desc: "Anime HD"}
     - {id: 9070, cat: TV/Anime, desc: "Anime SD"}
     - {id: 9080, cat: TV/Anime, desc: "Anime Pack"}
@@ -90,7 +89,7 @@ caps:
   modes:
     search: [q]
     tv-search: [q, season, ep]
-    movie-search: [q, imdbid]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
@@ -111,9 +110,9 @@ settings:
     default: 1
     options:
       1: created
-      8: seeders
-      6: size
-      2: title
+      2: seeders
+      5: size
+      9: title
   - name: type
     type: select
     label: Order requested from site
@@ -137,97 +136,108 @@ login:
   error:
     - selector: div#login_error
   test:
-    path: browse.php
-    selector: a[href="logout.php"]
+    path: index.php
+#    selector: a[href="logout.php"] # ajax does not return a full page so cant test this.
 
 search:
   paths:
-    - path: browse.php
+    - path: ajax_browse.php
+      method: post
   inputs:
-    suchfeld: 2
-    alleanzeigen: 1
-    $raw: "{{ range .Categories }}kategorie[]={{.}}&{{end}}"
-    suche: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # searchin: 1 name, 2 descr, 3 all, 4 genre, 5 movei titles, 6 actors, 7 authors, 8 directors, 9 filmcrew, 10 plot, 11 imdbid, 12 tmdbid
-    # note: although tmdbid appears as option 12, searching for this yields no results.
-    durchsuche: "{{ if .Query.IMDBID }}11{{ else }}1{{ end }}"
-    # incldead: 1 active, 2 all, 3 onlydead, 4 highlight, 5 bookmark, 6 onlyups, 7 freeleech, 8 multi2, 9 multi5, 10 multi10, 11 25%d,l 12 50%dl, 13 75%dl
-    # note: searching with 6(freeleech) yielded no results, using 7(onlyups) works.
-    suchein: "{{ if .Config.freeleech }}6{{ else }}2{{ end }}"
-    # cat: 1 all, 1000 film, 2000 tv, 3000 docs, 4000 sport, 5000 xxx, 6000 games, 7000 apps, 8000 music, 9000 other
-    sucheaus: 1
-    sortierenach: "{{ .Config.sort }}"
-    sortierung: "{{ .Config.type }}"
+    # allCats=1000&categories[]=1010&categories[]=1020&search=&limit=1&searchIn=0&orderBy=1&order=1
+    $raw: "{{ if .Categories }}{{ range .Categories }}categories[]={{.}}&{{end}}{{ else }}{{ end }}"
+    # cat: (empty) all, 1000 film, 2000 tv, 3000 docs, 4000 sport, 5000 xxx, 6000 games, 7000 apps, 8000 music, 9000 other
+    allCats: ""
+    search: "{{ .Keywords }}"
+    # 1 25, 2 50, 3 75, 4 100
+    limit: 1
+    # searchin: 0 all, 1 active, 2 dead, 3 highlights, 4 bookmarks, 5 uploads, 10 bots, 11 onlyupload, 12 multiplier, 13 %download, 14 freeleech
+    # note: freeleech on this site means download and upload is not counted, whereas OU means download is free and upload is counted
+    # 14 yields no freeleech, but 11 returns results
+    searchin: "{{ if .Config.freeleech }}11{{ else }}0{{ end }}"
+    orderBy: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+  headers:
+    x-requested-with: ["XMLHttpRequest"]
 
   rows:
-    selector: table.tableinborder[border="0"][cellspacing="0"][cellpadding="0"] tr
+    selector: table.tableinborder tr:has(.catPic)
 
   fields:
     category:
-      selector: a.bt-cat
-      attribute: href
+      selector: td.catPic > img
+      attribute: src
       filters:
         - name: regexp
-          args: (\d+)$
+          args: (\d+).png$
     title:
-      selector: a.tor-name
+      selector: a[href^="details.php?id="]
     details:
-      selector: a.tor-name
+      selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: div.tor-metadl a
-      attribute: href
-    poster:
-      selector: div[id^="details-"] img
-      attribute: src
+      # a[onlick="downloadTorrent(383718);"] --> a[href="download.php?torrent=383559"]
+      selector: td.tdl > a
+      attribute: onclick
+      filters:
+        - name: regexp
+          args: (\d+)
+        - name: prepend
+          args: "download.php?torrent="
     seeders:
-      selector: div.tor-seeder
+      selector: td.peers:has(i[title="Seeders"])
     leechers:
-      selector: div.tor-leecher
+      selector: td.peers:has(i[title="Leechers"])
     grabs:
-      selector: div.tor-snatcher
+      selector: td.peers:has(i[title="Snatchers"])
       # 2 flavours of dates
     date:
-      # Heute 13:30:04
-      # Gestern 09:10:10
-      selector: div.tor-date:not(:contains("."))
+      #  Heute 13:30:04
+      #  Gestern 22:44:23
+      selector: td.added:not(:contains("."))
       optional: true
       filters:
+        - name: replace
+          args: ["\u00a0", ""]
         - name: replace
           args: ["Heute", "Today"]
         - name: replace
           args: ["Gestern", "Yesterday"]
         - name: append
           args: " +01:00" # CET
+        - name: fuzzytime
     date:
-      # &nbsp;&nbsp;27.05.2019 <b>12:52:11</b>
-      selector: div.tor-date:contains(".")
+      # &nbsp;24.05.2019 20:15:38
+      selector: td.added:contains(".")
       optional: true
       filters:
-        - name: replace
-          args: ["\u00a0", ""]
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "02.01.2006 15:04:05 -07:00"
     size:
-      selector: div.tor-size
+      selector: td.size
       filters:
+        - name: replace
+          args: ["\u00a0", ""]
         - name: replace
           args: [".", ""]
         - name: replace
           args: [",", "."]
     downloadvolumefactor:
       case:
-        font.ou: 0 # only upload is counted
-        font.fl: 0 # freeleech neither dl or ul is counted
+        "span:contains(\"OU\")": 0 # only upload is counted
+        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted (identity unconfirmed)
+        "span:contains(\"%25\")": .25 # 75% free
+        "span:contains(\"%50\")": .5 # 50% free
+        "span:contains(\"%75\")": .75 # 25% free
         "*": 1
     uploadvolumefactor:
       case:
-        "font.mu:contains(\"2x\")": 2
-        "font.mu:contains(\"5x\")": 5
-        "font.mu:contains(\"10x\")": 10
-        font.fl: 0 # freeleech neither dl or ul is counted
+        "span:contains(\"2x\")": 2
+        "span:contains(\"5x\")": 5
+        "span:contains(\"10x\")": 10
+        "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted
         "*": 1
     minimumseedtime:
       # 2 day (as seconds = 2 x 24 x 60 x 60)

src/Jackett.Common/Definitions/bitru.yml

@@ -6,7 +6,9 @@ language: ru-ru
 type: public
 encoding: UTF-8
 links:
-  - http://bitru.org/ # site forces http, https is not supported
+  - https://bitru.org/
+legacylinks:
+  - http://bitru.org/ # site forces https
 
 caps:
   categorymappings:
@@ -30,12 +32,9 @@ caps:
 
 settings:
   - name: adverts
-    type: select
+    type: checkbox
     label: Include Advertising
-    default: _
-    options:
-      _: yes
-      no: no
+    default: true
   - name: sort
     type: select
     label: Sort requested from site
@@ -50,8 +49,8 @@ search:
     - path: browse.php
   inputs:
     s: "{{ .Keywords }}"
-    rek: "{{ re_replace .Config.adverts \"_\" \"\" }}"
     sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
+    $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"
 
   rows:
     selector: table.browse-list > tbody > tr

src/Jackett.Common/Definitions/bitturk.yml

@@ -12,7 +12,6 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 69, cat: Movies, desc: "BiTTuRK Altın"}
     - {id: 56, cat: Movies, desc: "BTRG"}
     - {id: 57, cat: Movies, desc: "Yerli Dizi"}
     - {id: 62, cat: Movies, desc: "Yab@ncı Dizi"}
@@ -21,12 +20,15 @@ caps:
     - {id: 66, cat: Movies/HD, desc: "x265"}
     - {id: 67, cat: XXX, desc: "XxX"}
     - {id: 68, cat: Movies, desc: "Dual (TR-~)"}
+    - {id: 71, cat: Movies, desc: "NFLIX"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}
-    - {id: 45, cat: Movies, desc: "Eğitim / Prog "}
+    - {id: 76, cat: Movies/UHD, desc: "4K UHD"}
+    - {id: 45, cat: Movies, desc: "Eğitim / Prog"}
     - {id: 1, cat: Movies, desc: "Filmler"}
     - {id: 14, cat: Movies/3D, desc: "3D Film"}
+    - {id: 77, cat: Movies/UHD, desc: "4K UHD"}
     - {id: 16, cat: Movies, desc: "Animasyon"}
     - {id: 17, cat: TV/Anime, desc: "Anime"}
     - {id: 31, cat: Movies, desc: "Belgesel"}
@@ -48,7 +50,9 @@ caps:
     - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
     - {id: 21, cat: Audio/Video, desc: "Video Klipler"}
     - {id: 2, cat: Console, desc: "Oyun"}
-    - {id: 6, cat: PC, desc: "Program / Misc "}
+    - {id: 74, cat: PC, desc: "PC"}
+    - {id: 73, cat: Console, desc: "SONY-PS"}
+    - {id: 6, cat: PC, desc: "Program"}
     - {id: 47, cat: Other, desc: "Resimler"}
     - {id: 48, cat: TV, desc: "Televizyon"}
     - {id: 49, cat: TV/HD, desc: "Tv HD"}
@@ -132,8 +136,9 @@ search:
     searchin: title
     "sortOptions[sortBy]": "{{ .Config.sort }}"
     "sortOptions[sortOrder]": "{{ .Config.type }}"
-  error:
-    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
+# Drop error trap to stop Sonarr disabling indexer, see https://github.com/Jackett/Jackett/issues/1415
+#  error:
+#    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
 
   rows:
     selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"

src/Jackett.Common/Definitions/blutopia.yml

@@ -103,12 +103,12 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
       attribute: href
     poster:
       selector: div.torrent-poster img
@@ -193,4 +193,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 4.0.0b
+# UNIT3D 5.2.1b

src/Jackett.Common/Definitions/brasiltracker.yml

@@ -133,8 +133,8 @@ search:
         - name: append
           args: " {{ .Result.title_details }}"
     minimumratio:
-      text: 0.6
+      text: 1.0
     minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # Project Gazelle

src/Jackett.Common/Definitions/broadcity.yml

@@ -6,9 +6,9 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - http://broadcity.in/ # site is forcing to http
+  - https://broadcity.in/ # site is forcing to https
 legacylinks:
-  - https://broadcity.in/
+  - http://broadcity.in/
 
 caps:
   categorymappings:
@@ -123,4 +123,9 @@ search:
       case:
         img[src$="/x2.gif"]: 2
         "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TS Special Edition v.7.5

src/Jackett.Common/Definitions/bt4g.yml

@@ -0,0 +1,77 @@
+---
+id: bt4g
+name: BT4G
+description: "BT4G is a Public metadata crawler for magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://bt4g.org/
+
+caps:
+  categories:
+    Application: PC
+    Archive file: Other
+    Audio: Audio
+    Doc: Books
+    Other: Other
+    Video: Movies
+    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://bt4g.org/search/2021
+    # site does not support cat search
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.row > div.col > div:has(h5)
+
+  fields:
+    title:
+      selector: a
+    category:
+      selector: span.cpill
+    category:
+      # add tv to video
+      optional: true
+      selector: span.cpill
+      filters:
+        - name: replace
+          args: ["Video", "TV"]
+    details:
+      selector: a
+      attribute: href
+    infohash:
+      selector: a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/magnet/", ""]
+    date:
+      selector: span:nth-last-child(5) b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    files:
+      selector: span:nth-last-child(4) b
+    size:
+      selector: span:nth-last-child(3) b
+    seeders:
+      selector: span:nth-last-child(2) b
+    leechers:
+      selector: span:nth-last-child(1) b
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/btdb.yml

@@ -7,8 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
+  # update poster placeholder link too
   - https://btdb.eu/
-  - https://btdb.unblockit.app/
+  - https://btdb.unblockit.buzz/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -29,6 +30,10 @@ legacylinks:
   - https://btdb.uk-unblock.pro/
   - https://btdb.unblockit.top/
   - https://btdb.unblockit.lat/
+  - https://btdb.unblockit.app/
+  - https://btdb.unblockit.dev/
+  - https://btdb.unblockit.ltd/
+  - https://btdb.unblockit.link/
 
 caps:
   categories:
@@ -42,6 +47,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_8000
     type: info
     label: About BTDB Categories
@@ -88,7 +97,7 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["https://btdb.io/assets/img/placeholder.png", ""]
+          args: ["https://btdb.eu/assets/img/placeholder.png", ""]
     date:
       selector: small:nth-of-type(5) strong
       filters:

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
+  - http://btdiggwzoyrwwbiv.onion.ly/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btgigs.yml

@@ -1,148 +0,0 @@
----
-id: btgigs
-name: BTGigs
-description: "BTGigs (TG) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: private
-encoding: ISO-8859-2
-links:
-  - https://btgigs.info/
-
-caps:
-  categorymappings:
-    - {id: 36, cat: Audio/Audiobook, desc: "aBooki"}
-    - {id: 27, cat: TV/Anime, desc: "Anime"}
-    - {id: 1, cat: PC, desc: "Aplikacje PC"}
-    - {id: 10, cat: Books/EBook, desc: "eBooki"}
-    - {id: 34, cat: Movies/BluRay, desc: "Filmy/BR"}
-    - {id: 4, cat: Movies/SD, desc: "Filmy/DVD-R"}
-    - {id: 31, cat: Movies/HD, desc: "Filmy/HD Rip"}
-    - {id: 17, cat: Movies/Other, desc: "Filmy/Inne"}
-    - {id: 35, cat: Movies/UHD, desc: "Filmy/UHD"}
-    - {id: 20, cat: Movies/SD, desc: "Filmy/XviD"}
-    - {id: 21, cat: Console, desc: "Gry/konsole"}
-    - {id: 7, cat: PC/Games, desc: "Gry/PC ISO"}
-    - {id: 12, cat: PC/Games, desc: "Gry/PC Rips"}
-    - {id: 28, cat: Other, desc: "GSM/PDA"}
-    - {id: 19, cat: Audio/Video, desc: "Koncerty/Teledyski"}
-    - {id: 32, cat: Audio/Lossless, desc: "musicDVD/DTS/FLAC"}
-    - {id: 5, cat: Audio/MP3, desc: "Muzyka/MP3"}
-    - {id: 26, cat: Other, desc: "Rozne"}
-    - {id: 30, cat: TV/Sport, desc: "Sport"}
-    - {id: 6, cat: TV, desc: "TV/Seriale"}
-    - {id: 37, cat: TV/UHD, desc: "TV/UHD"}
-    - {id: 29, cat: PC, desc: "Witaminki"}
-    - {id: 9, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: lang
-    type: checkbox
-    label: Add POLISH to title if is in polish category
-    default: false
-
-login:
-  path: takelogin_action.php
-  method: post
-  inputs:
-    username_dupa: "{{ .Config.username }}"
-    password__dupa: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("Error"))
-  test:
-    selector: a[href^="logout.php"]
-    path: index.php?news=1
-
-search:
-  paths:
-    - path: browse.php
-  error:
-    - selector: a.altlink
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    tyt: 0
-    lang: 0
-    subcat: 0
-
-  rows:
-    selector: table[border="1"][cellpadding=5] > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    is_polish:
-      optional: true
-      selector: img[src*="cat_pl"]
-      attribute: src
-    title_phase1:
-      selector: a[href^="details.php?id="]
-    title_polish:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: append
-          args: " POLISH"
-    title:
-      text: "{{ if and (.Config.lang) (.Result.is_polish) }}{{ .Result.title_polish }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php/"]
-      attribute: href
-    description:
-      optional: true
-      selector: img[src^="/pic/cat_pl/"]
-      attribute: src
-      filters:
-        - name: append
-          args: "Language: polish\n<br>"
-        - name: prepend
-          args: "{{ .Result.description }}"
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    grabs:
-      selector: td:nth-child(7)
-      filters:
-        - name: regexp
-          args: (\d+)
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      case:
-        "img[src=\"pic/ico_disk1.png\"]": 0
-        "img[src=\"pic/ico_disk2.png\"]": 1
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/btschool.yml

@@ -40,6 +40,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -119,6 +123,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.0
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.store/
+  - https://btsow.cam/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -21,6 +21,8 @@ legacylinks:
   - https://btsow.website/
   - https://btsow.online/
   - https://btsow.work/
+  - https://btsow.store/
+  - https://btsow.surf/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -9,6 +9,8 @@ links:
   - https://bwtorrents.tv/
   - https://bwtorrents.fun/
   - https://bwtorrents.xyz/
+  - https://bwtorrents.us/
+  - https://bwtorrents.live/
 
 caps:
   categorymappings:
@@ -26,25 +28,24 @@ caps:
     - {id: 122, cat: Movies/WEB-DL, desc: "Bollywood-DVDRips 1080p/720p"}
     - {id: 123, cat: Movies/WEB-DL, desc: "Bollywood-SDRips WEB/DVD"}
     - {id: 124, cat: Movies/3D, desc: "Bollywood-3D-Movies"}
-    - {id: 190, cat: Movies, desc: "Bollywood-Movies packs"}
-    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movie packs"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-Web Series"}
+    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
     - {id: 126, cat: Movies/UHD, desc: "Hollywood-4K Ultra HD / Upscaled"}
     - {id: 127, cat: Movies/BluRay, desc: "Hollywood-Untouched BluRay"}
     - {id: 128, cat: Movies/HD, desc: "Hollywood-1080p BluRay Rips"}
     - {id: 129, cat: Movies/HD, desc: "Hollywood-720p BluRay Rips"}
     - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"}
     - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
-    - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
+    - {id: 132, cat: Movies, desc: "Hollywood-1080p WEB-Rips"}
+    - {id: 192, cat: Movies, desc: "Hollywood-720p WEB-Rips"}
     - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
     - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"}
     - {id: 134, cat: Movies/WEB-DL, desc: "Hollywood-DVDRips 1080p/720p"}
     - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"}
     - {id: 135, cat: Movies/3D, desc: "Hollywood-3D-Movies"}
-    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
-    - {id: 194, cat: Movies, desc: "Hollywood-Movies packs"}
+    - {id: 194, cat: Movies, desc: "Hollywood-Movie packs"}
     - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
-    - {id: 138, cat: Movies, desc: "Telugu-Movies"}
-    - {id: 139, cat: Movies, desc: "Tamil-Movies"}
     - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
     - {id: 141, cat: Movies, desc: "Kannada-Movies"}
     - {id: 142, cat: Movies, desc: "Lollywood-Movies"}
@@ -52,10 +53,9 @@ caps:
     - {id: 144, cat: Movies, desc: "Marathi-Movies"}
     - {id: 145, cat: Movies, desc: "Bangla-Movies"}
     - {id: 185, cat: Movies, desc: "Gujarati-Movies"}
-    - {id: 184, cat: Movies, desc: "Bollywood-South Hindi Dubbed"}
-    - {id: 183, cat: Movies, desc: "Hindi Dubbed Movies"}
+    - {id: 184, cat: Movies, desc: "South Hindi Dubbed"}
+    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
     - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
-    - {id: 198, cat: Movies, desc: "TV-MTV"}
     - {id: 182, cat: Movies, desc: "Other Movies"}
     - {id: 146, cat: TV, desc: "TV-Colors"}
     - {id: 147, cat: TV, desc: "TV-TV"}
@@ -66,13 +66,16 @@ caps:
     - {id: 152, cat: TV, desc: "TV-Star Bharat"}
     - {id: 153, cat: TV, desc: "TV-Star Plus"}
     - {id: 154, cat: TV, desc: "TV-Zee TV"}
+    - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
     - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
-    - {id: 156, cat: TV/Documentary, desc: "TV-Documentary"}
-    - {id: 157, cat: TV, desc: "TV-Hollywood"}
-    - {id: 158, cat: TV, desc: "TV-Others"}
-    - {id: 195, cat: TV, desc: "TV-Packs"}
-    - {id: 159, cat: TV, desc: "Religion &Spirituality "}
+    - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
+    - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
+    - {id: 195, cat: TV, desc: "TV-Tv Packs"}
+    - {id: 159, cat: Audio, desc: "Music-Religion & Spirituality"}
     - {id: 160, cat: Audio, desc: "Music-Classical"}
+    - {id: 172, cat: Audio, desc: "Music-Remix"}
     - {id: 161, cat: Audio/Lossless, desc: "Music-Flacs"}
     - {id: 162, cat: Audio, desc: "Music-Ghazals"}
     - {id: 163, cat: Audio, desc: "Music-Hindi OSTs"}
@@ -84,11 +87,10 @@ caps:
     - {id: 169, cat: Audio/Video, desc: "Music-Videos"}
     - {id: 170, cat: Audio, desc: "Music-Pop"}
     - {id: 171, cat: Audio, desc: "Music-Punjabi"}
-    - {id: 172, cat: Audio, desc: "Music-Remix"}
-    - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 174, cat: Audio, desc: "Music-Telugu"}
+    - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 196, cat: Audio, desc: "Music-Packs"}
-    - {id: 175, cat: Books/EBook, desc: "EBooks"}
+    - {id: 175, cat: Books/EBook, desc: "Ebooks"}
     - {id: 176, cat: PC/Games, desc: "Games PC"}
     - {id: 177, cat: Console, desc: "Games Console"}
     - {id: 178, cat: TV/Anime, desc: "Anime"}
@@ -96,6 +98,26 @@ caps:
     - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"}
     - {id: 181, cat: Other, desc: "Pics/Wallpapers"}
     - {id: 187, cat: XXX, desc: "Adult XXX 18+"}
+    # Telugu-Movies
+    - {id: 199, cat: Movies, desc: "Telgu-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 200, cat: Movies, desc: "Telgu-Movies | Untouched WEB-DLs"}
+    - {id: 201, cat: Movies, desc: "Telgu-Movies | 1080p/720p WEBRips"}
+    - {id: 202, cat: Movies, desc: "Telgu-Movies | Untouched BluRay"}
+    - {id: 208, cat: Movies, desc: "Telgu-Movies | Remuxes BluRay"}
+    - {id: 207, cat: Movies, desc: "Telgu-Movies | BluRay Rips"}
+    - {id: 203, cat: Movies, desc: "Telgu-Movies | Untouched DVDs"}
+    - {id: 204, cat: Movies, desc: "Telgu-Movies | SD-WEBRips / DVDRips"}
+    - {id: 205, cat: Movies, desc: "Telgu-Movies | Movie Packs"}
+    # Tamil-Movies
+    - {id: 209, cat: Movies, desc: "Tamil-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 210, cat: Movies, desc: "Tamil-Movies | Untouched WEB-DLs"}
+    - {id: 211, cat: Movies, desc: "Tamil-Movies | 1080p/720p WEBRips"}
+    - {id: 212, cat: Movies, desc: "Tamil-Movies | Untouched BluRay"}
+    - {id: 217, cat: Movies, desc: "Tamil-Movies | Remuxes BluRay"}
+    - {id: 216, cat: Movies, desc: "Tamil-Movies | BluRay Rips"}
+    - {id: 213, cat: Movies, desc: "Tamil-Movies | Untouched DVDs"}
+    - {id: 214, cat: Movies, desc: "Tamil-Movies | SD-WEBRips / DVDRips"}
+    - {id: 215, cat: Movies, desc: "Tamil-Movies | Movie Packs"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/carpathians.yml

@@ -11,22 +11,20 @@ links:
 caps:
   categorymappings:
     - {id: 186, cat: Books, desc: "E-book"}
-    - {id: 194, cat: Movies/SD, desc: "Film/CAM/Hun"}
+    - {id: 199, cat: Movies/SD, desc: "Film/Bluray/Hun"}
+    - {id: 194, cat: Movies/SD, desc: "Film/CAM"}
     - {id: 60, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
     - {id: 10, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
     - {id: 20, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
     - {id: 181, cat: Movies/HD, desc: "Film/HD/Eng"}
     - {id: 183, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 200, cat: Movies/HD, desc: "Film/UHD/Hun"}
     - {id: 192, cat: Movies/HD, desc: "Film/x264/Eng"}
     - {id: 190, cat: Movies/HD, desc: "Film/x264/Hun"}
     - {id: 70, cat: Movies/SD, desc: "Film/XviD/Eng"}
     - {id: 30, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 140, cat: PC/Games, desc: "Játék/DOX"}
-    - {id: 130, cat: PC/Games, desc: "Játék/PCiso"}
-    - {id: 160, cat: Console/PS3, desc: "Játék/PS2-PS3"}
-    - {id: 189, cat: Console/PSP, desc: "Játék/PSP"}
-    - {id: 184, cat: Console/Wii, desc: "Játék/Wii"}
-    - {id: 150, cat: Console/XBox, desc: "Játék/XBOX (XBOX360)"}
+    - {id: 150, cat: Console, desc: "Játék/Konzol"}
+    - {id: 130, cat: PC/Games, desc: "Játék/PC"}
     - {id: 182, cat: Audio/Lossless, desc: "Lossless"}
     - {id: 90, cat: Audio/MP3, desc: "Mp3/Eng"}
     - {id: 50, cat: Audio/MP3, desc: "Mp3/Hun"}
@@ -158,4 +156,9 @@ search:
         img[src="pic/double.png"]: 2
         img[src="pic/doubledouble2.png"]: 4
         "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TBDev & XBTT

src/Jackett.Common/Definitions/catorrent.yml

@@ -0,0 +1,105 @@
+---
+id: catorrent
+name: Catorrent
+description: "Catorrent is a RUSSIAN Semi-Private Torrent Tracker for GAMES"
+language: ru-ru
+type: semi-private
+encoding: UTF-8
+links:
+  - https://catorrent.org/
+
+caps:
+  categorymappings:
+    - {id: PC, cat: PC/Games, desc: "PC"}
+    - {id: PS1, cat: Console/Other, desc: "Playstation 1"}
+    - {id: PS2, cat: Console/Other, desc: "Playstation 2"}
+    - {id: PS3, cat: Console/PS3, desc: "Playstation 3"}
+    - {id: PS4, cat: Console/PS4, desc: "Playstation 4"}
+    - {id: SWITCH, cat: Console/Other, desc: "Nintendo Switch"}
+    - {id: PSP, cat: Console/PSP, desc: "Playstation (portable) PSP"}
+    - {id: PSVITA, cat: Console/PS Vita, desc: "Playstation Vita"}
+    - {id: XONE, cat: Console/XBox One, desc: "Xbox ONE"}
+    - {id: X360, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: WIIU, cat: Console/WiiU, desc: "Nintendo WIIU"}
+    - {id: WII, cat: Console/Wii, desc: "Nintendo WII"}
+    - {id: 3DS, cat: Console/3DS, desc: "Nintendo 3DS"}
+    - {id: NDS, cat: Console/NDS, desc: "Nintendo DS"}
+    - {id: N64, cat: Console/Other, desc: "Nintendo 64"}
+    - {id: NGC, cat: Console/Other, desc: "Nintendo Game Cube"}
+    - {id: DREAMCAST, cat: Console/Other, desc: "Dreamcast"}
+    - {id: SAT, cat: Console/Other, desc: "Sega Saturn"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: index.php
+  method: form
+  form: form[action=""]
+  inputs:
+    login_name: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    login_not_save: ""
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/index.php?do=download&id="]
+  attribute: href
+
+search:
+  # https://catorrent.org/index.php?do=search&subaction=search&story=lovelot
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.short_game_search
+
+  fields:
+    category:
+      selector: div.icon_default
+    title:
+      selector: div.short_game_title
+    details:
+      selector: a[href$=".html"]
+      attribute: href
+    download:
+      selector: a[href$=".html"]
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    description:
+      selector: div.short_game_genre
+      optional: true
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      text: "512 MB"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -1,7 +1,7 @@
 ---
 id: cinemamovies
-name: CinemaMovies
-description: "CinemaMovies is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
+name: CinemaMovieS_ZT
+description: "CinemaMovieS_ZT is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: pl-pl
 type: private
 encoding: ISO-8859-2
@@ -18,7 +18,7 @@ caps:
     - {id: 12, cat: Movies/Other, desc: "Filmy Inne"}
     - {id: 32, cat: Movies/UHD, desc: "Filmy UHD"}
     - {id: 2, cat: TV/Anime, desc: "Anime"}
-    - {id: 2, cat: TV/Documentary, desc: "TV Dokumentalne"}
+    - {id: 10, cat: TV/Documentary, desc: "TV Dokumentalne"}
     - {id: 20, cat: TV, desc: "TV Paczki"}
     - {id: 22, cat: TV/Sport, desc: "TV Sport"}
     - {id: 24, cat: TV/HD, desc: "TV HD"}

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -0,0 +1,234 @@
+---
+id: coastalcrew
+name: Coastal-Crew
+description: "Coastal-Crew is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-de
+type: private
+encoding: UTF-8
+links:
+  - https://coastal-crew.bounceme.net/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Movie - Xvid/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Movie - 720p/1080p"}
+    - {id: 130, cat: Movies, desc: "Movie - Pack"}
+    - {id: 155, cat: Movies/DVD, desc: "Movie - DVD"}
+    - {id: 154, cat: Movies/UHD, desc: "Movie - UHD/4K"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "Serien - Xvid/x264"}
+    - {id: 157, cat: TV/HD, desc: "Serien - 720p/1080p"}
+    - {id: 57, cat: TV/SD, desc: "Serien - Pack/SD"}
+    - {id: 59, cat: TV/HD, desc: "Serien - Pack/720p"}
+    - {id: 156, cat: TV/HD, desc: "Serien - Pack/1080p"}
+    - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Alle"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App - Win"}
+    - {id: 11, cat: PC, desc: "App - Other"}
+    - {id: 10, cat: PC/Mac, desc: "App - Mac"}
+    - {id: 9, cat: PC/Mobile-Android, desc: "App - Linux/Android"}
+    # Game
+    - {id: 131, cat: Console, desc: "Game - Nintendo"}
+    - {id: 17, cat: PC/Games, desc: "Game - PC"}
+    - {id: 18, cat: Console, desc: "Game - PS"}
+    - {id: 24, cat: Console/Other, desc: "Game - Wimmelbild"}
+    # Music
+    - {id: 48, cat: Audio/MP3, desc: "Music - mp3"}
+    - {id: 53, cat: Audio/Lossless, desc: "Music - Flac"}
+    - {id: 52, cat: Audio, desc: "Music - Pack"}
+    - {id: 109, cat: Audio/Video, desc: "Music - Video-HD/SD"}
+    # Sport
+    - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
+    # Sonstiges
+    - {id: 159, cat: Audio/Audiobook, desc: "Sonstiges - Hörbuch"}
+    - {id: 64, cat: Books/Comics, desc: "Sonstiges - Anime"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges - A-Book"}
+    - {id: 96, cat: Books/EBook, desc: "Sonstiges - E-Book"}
+    - {id: 69, cat: Books, desc: "Sonstiges - Tutorial"}
+    - {id: 71, cat: Books/Other, desc: "Sonstiges - Other"}
+    # Kinder
+    - {id: 102, cat: Movies, desc: "Kinder - Alles"}
+    # XXX
+    - {id: 113, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 76, cat: XXX, desc: "XXX - HD-SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX - Pack"}
+    # Request
+    - {id: 151, cat: Other, desc: "Request - spritti01"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: pin
+    type: text
+    label: Pin
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+    loggiin: "einloggen"
+  error:
+    - selector: div#login_error
+  test:
+    path: selection.php
+
+download:
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: thanks
+      det_id: "{{ .DownloadUri.Query.torrent }}"
+      ajax: yes
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    search: "{{ .Keywords }}"
+    blah: "0"
+    orderby: "added"
+    sort: "desc"
+  rows:
+    selector: div.selection_wrap
+  fields:
+    title:
+      selector: a.selection_a
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a.selection_a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
+    category:
+      selector: div.kat_cat_pic
+      case:
+        # Movie
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "28"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "32"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "130"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "155"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "154"
+        # Serien
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "60"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "157"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/SD\"))": "57"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/720p\"))": "59"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/1080p\"))": "156"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
+        # Doku
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Alle\"))": "15"
+        # App
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "10"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": "9"
+        # Game
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": "131"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": "18"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "24"
+        # Music
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": "48"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "53"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": "109"
+        # Sport
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "62"
+        # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": "159"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Tutorial\"))": "69"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "71"
+        # Kinder
+        ":has(div.kat_cat_pic_name:contains(\"Kinder\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "102"
+        # XXX
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "113"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": "76"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
+        # Request
+        ":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": "151"
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ag
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    grabs:
+      text: 0
+    seeders:
+      selector: div.selection_unter_aa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    leechers:
+      selector: div.selection_unter_aaa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    date:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+    date:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    description:
+      selector: selection_unter_af
+      optional: true
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine tbd

src/Jackett.Common/Definitions/cooltorrent.yml

@@ -1,136 +0,0 @@
----
-id: cooltorrent
-name: cool-torrent
-description: "cool-torrent is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: semi-private
-encoding: UTF-8
-links:
-  - http://cool-torrent.pl/
-legacylinks:
-  - https://cool-torrent.pl/ # NET::ERR_CERT_COMMON_NAME_INVALID
-
-caps:
-  categorymappings:
-    - {id: "Filmy XviD", cat: Movies/SD, desc: "Filmy XviD/DivX"}
-    - {id: "BluRay", cat: Movies/HD, desc: "BluRay/x264 720p"}
-    - {id: "Filmy x264", cat: Movies/HD, desc: "Filmy x264/h264"}
-    - {id: "Filmy HD 1080p AVC", cat: Movies/HD, desc: "Filmy HD 1080p AVC"}
-    - {id: "Filmy x265", cat: Movies/HD, desc: "Filmy x265/h265"}
-    - {id: "Filmy 4K UHD", cat: Movies/UHD, desc: "Filmy 4K UHD"}
-    - {id: "Filmy DVD", cat: Movies/DVD, desc: "Filmy DVD"}
-    - {id: "Filmy 3D", cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: "Filmy RMVB", cat: Movies, desc: "Filmy RMVB"}
-    - {id: "Filmy IVO", cat: Movies, desc: "Filmy IVO"}
-    - {id: "Filmy TS", cat: Movies/SD, desc: "Filmy TS/CAM"}
-    - {id: "TV", cat: TV, desc: "TV/Seriale"}
-    - {id: "Erotyka", cat: XXX, desc: "Erotyka"}
-    - {id: "Muzyka", cat: Audio, desc: "Muzyka"}
-    - {id: "Programy", cat: PC, desc: "Programy"}
-    - {id: "GSM", cat: PC/Mobile-Other, desc: "GSM/PDA"}
-    - {id: "Konsole", cat: Console, desc: "Konsole"}
-    - {id: "Gry PC", cat: PC/Games, desc: "Gry PC"}
-    - {id: "Dla Dzieci", cat: Movies, desc: "Dla Dzieci"}
-    - {id: "Książki", cat: Books, desc: "Książki"}
-    - {id: "Linux", cat: PC, desc: "Linux"}
-    - {id: "Mac", cat: PC/Mac, desc: "Mac"}
-    - {id: "Sport", cat: TV/Sport, desc: "Sport"}
-    - {id: "Inne", cat: Other, desc: "Inne"}
-    - {id: "Anime", cat: TV/Anime, desc: "Anime"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: /
-  error:
-    - selector: table[class="main-2"][cellpadding="10"]:has(b:contains("Błąd"))
-  test:
-    path: /
-    selector: a[href$="logout.php"]
-
-search:
-  paths:
-    # http://cool-torrent.pl/szukaj.php?form-display-time=1&search=&cat=0
-    - path: szukaj.php
-  inputs:
-    form-display-time: 1
-    # does not support multi cat search
-    cat: 0
-    search: "{{ .Keywords }}"
-    # does not support imdbid searching and does not display imdb links in results
-
-  rows:
-    selector: table.test5 > tbody > tr > td > div[id]:has(a[href*="/download/"])
-
-  fields:
-    category:
-      selector: a[href^="files/"]
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 1]
-    title:
-      selector: a[href^="/torrent/"]
-      attribute: title
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    poster:
-      selector: img.browse_poster
-      attribute: src
-    date:
-      selector: td.descr3
-      remove: br
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: (\d{1,4}\.\d{2}\s[K|M|G][B])
-    seeders:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Seedów: (\\d+)"
-    leechers:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Peerów: (\\d+)"
-    grabs:
-      selector: td.descr3
-      filters:
-        - name: regexp
-          args: "Pobrano: (\\d+)"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/cpabien.yml

@@ -66,6 +66,10 @@ settings:
     type: info
     label: How to get the User-Agent
     default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_8000
     type: info
     label: About cpasbien Categories

src/Jackett.Common/Definitions/danishbytes.yml

@@ -1,26 +1,28 @@
 ---
-id: Channelx
-name: ChannelX
-description: "ChannelX is a Private Torrent Tracker for High Quality Optimized HD MOVIES / TV"
+id: danishbytes
+name: DANISH BYTES
+description: "DANISH BYTES is a Private Danish Tracker"
 language: en-us
 type: private
 encoding: UTF-8
 links:
-  - https://channelx.xyz/
-legacylinks:
-  - https://channelx.online/
+  - https://danishbytes.org/
 
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Audiotracks"}
-    - {id: 4, cat: TV/Sport, desc: "Sports"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 8, cat: Books, desc: "Bookz"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -75,6 +77,7 @@ search:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    keywords: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
@@ -105,6 +108,10 @@ search:
     download:
       selector: a[href*="/download/"]
       attribute: href
+# tracker has issue with some magnet downloads failing #10758
+#    magnet:
+#      selector: a[href^="magnet"]
+#      attribute: href
     details:
       selector: a.view-torrent
       attribute: href
@@ -112,12 +119,10 @@ search:
       selector: div.torrent-poster img
       attribute: src
       filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
         - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:
@@ -176,7 +181,7 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From PARA Store
         i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
         i[class*="fa-star text-bold"]: 0 # Freeleech From Token
         i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
@@ -191,8 +196,8 @@ search:
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
     minimumratio:
-      text: 0.4
+      text: 1.1
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 2.7.0
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# UNIT3D 5.1.0 DB-edition

src/Jackett.Common/Definitions/dark-shadow.yml

@@ -13,59 +13,59 @@ legacylinks:
 caps:
   categorymappings:
     # Film
-    - {id: 32, cat: Movies/HD, desc: "Film 720p/1080p"}
-    - {id: 28, cat: Movies/SD, desc: "Film XviD/x264"}
     - {id: 119, cat: Movies/DVD, desc: "Film DVD"}
     - {id: 114, cat: Movies/UHD, desc: "Film 4K/2160p"}
+    - {id: 28, cat: Movies/SD, desc: "Film XviD/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Film 720p/1080p"}
     - {id: 26, cat: Movies/3D, desc: "Film 3D"}
     # Serien
     - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 59, cat: TV, desc: "Serien Pack"}
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 122, cat: TV, desc: "Serien Show"}
     - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
+    # Audio
+    - {id: 120, cat: Audio/Video, desc: "Audio Video"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
+    - {id: 52, cat: Audio, desc: "Audio Pack"}
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App PC"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
+    - {id: 125, cat: PC/Mac, desc: "App macOS"}
     # Doku
     - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
     - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
-    # Spiele
-    - {id: 17, cat: PC/Games, desc: "Spiele PC"}
-    - {id: 24, cat: Console, desc: "Spiele Konsole"}
-    - {id: 121, cat: Console, desc: "Spiele Wimmelbild"}
-    - {id: 126, cat: Console/Other, desc: "Spiele Mobil"}
-    # Musik
-    - {id: 110, cat: Audio/MP3, desc: "Musik MP3"}
-    - {id: 52, cat: Audio, desc: "Musik Pack"}
-    - {id: 48, cat: Audio/Lossless, desc: "Musik Flac"}
-    - {id: 120, cat: Audio/Video, desc: "Musik Video"}
-    # App
-    - {id: 12, cat: PC/0day, desc: "App PC"}
-    - {id: 125, cat: PC/Mac, desc: "App MacOS"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
+    # Spiel
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
+    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
+    - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
     # Sport
     - {id: 61, cat: TV/Sport, desc: "Sport HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport SD"}
-    #  Internal
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
-    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
     # Sonstiges
     - {id: 64, cat: TV/Anime, desc: "Anime"}
-    - {id: 96, cat: Books/EBook, desc: "e-Book"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
-    - {id: 71, cat: Other, desc: "Anderes"}
+    - {id: 96, cat: Books/EBook, desc: "E-Book"}
+    - {id: 71, cat: Other, desc: "Other"}
     # XXX
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
     - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
     - {id: 133, cat: XXX/Other, desc: "XXX A/E-book"}
+    #  Internal
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
@@ -136,9 +136,9 @@ search:
     - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name, 1 descr, 2 both, 4 imdb
-    blah: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    search: "{{ .Keywords }}}"
+    # 0 name, 1 descr, 2 both
+    blah: "0"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
@@ -151,7 +151,7 @@ search:
       case:
         # Movies
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "119"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"4K/2160p\"))": "114"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"2160p\"))": "114"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"x264\"))": "28"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": "32"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "26"
@@ -161,7 +161,7 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "60"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Show\"))": "122"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": "123"
-        # Musik
+        # Audio
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "120"
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "48"
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
@@ -170,15 +170,15 @@ search:
         # App
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "12"
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "11"
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"MacOS\"))": "125"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"macOS\"))": "125"
         # Doku
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "14"
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "15"
-        # Games
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
+        # Spiel
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
         # Sport
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "61"
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"

src/Jackett.Common/Definitions/datascene.yml

@@ -163,6 +163,8 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 1.0
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,7 +10,7 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.app/
+  - https://demonoid.unblockit.buzz/
   - https://demonoid.torrentbay.to/
 legacylinks:
   - https://demonoid.unblockit.pro/
@@ -26,6 +26,10 @@ legacylinks:
   - https://demonoid.unblockit.win/
   - https://demonoid.unblockit.top/
   - https://demonoid.unblockit.lat/
+  - https://demonoid.unblockit.app/
+  - https://demonoid.unblockit.dev/
+  - https://demonoid.unblockit.ltd/
+  - https://demonoid.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -183,4 +183,4 @@ search:
         "*": 1
     minimumratio:
       text: 0.4
-# UNIT3D 2.7.0 (Customised)
+# UNIT3D 5.1.0 (Customised)

src/Jackett.Common/Definitions/divteam.yml

@@ -12,14 +12,18 @@ caps:
   categorymappings:
     - {id: 60, cat: Movies/HD, desc: "MicroHD 720p"}
     - {id: 77, cat: Movies/HD, desc: "MicroHD 1080p"}
-    - {id: 78, cat: Movies/HD, desc: "MicroHD 4K"}
+    - {id: 78, cat: Movies/UHD, desc: "MicroHD 4K"}
     - {id: 64, cat: TV/HD, desc: "Pack Series"}
     - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"}
-    - {id: 80, cat: Movies/BluRay, desc: "BDRip X265 1080p"}
+    - {id: 80, cat: Movies/HD, desc: "BDRip X265 1080p"}
     - {id: 81, cat: Movies/UHD, desc: "UHDRip x265 4K"}
     - {id: 82, cat: Movies/WEB-DL, desc: "Pelis Web-DL 1080"}
     - {id: 83, cat: Movies/WEB-DL, desc: "Pelis Web-DL 720"}
     - {id: 84, cat: Movies/UHD, desc: "UHD Remux x265"}
+    - {id: 91, cat: Movies/HD, desc: "BDRip x264"}
+    - {id: 89, cat: Movies/HD, desc: "BDRemux"}
+    - {id: 88, cat: Movies/BluRay, desc: "Full HD"}
+    - {id: 90, cat: Movies/BluRay, desc: "UHD Full"}
     - {id: 23, cat: TV/Sport, desc: "Deportes"}
     - {id: 20, cat: TV/HD, desc: "Series"}
     - {id: 31, cat: TV/HD, desc: "Series VOSE"}
@@ -31,25 +35,15 @@ caps:
     - {id: 74, cat: Movies, desc: "Saga Crepúsculo"}
     - {id: 75, cat: Movies, desc: "Saga The Purge"}
     - {id: 79, cat: Movies, desc: "Saga Star Wars"}
-    - {id: 18, cat: Movies/BluRay, desc: "Video Full & Remux"}
     - {id: 76, cat: Movies, desc: "x-men saga"}
+    - {id: 85, cat: Movies, desc: "Sean Connery"}
     - {id: 6, cat: Books/EBook, desc: "EBooks"}
-    - {id: 58, cat: Books/EBook, desc: "Kiosko"}
+    - {id: 58, cat: Books/Mags, desc: "Kiosko"}
     - {id: 24, cat: TV/Documentary, desc: "Documentales"}
     - {id: 32, cat: TV/Documentary, desc: "Documentales VOSE"}
-    - {id: 49, cat: Books/EBook, desc: "eLearning"}
-    - {id: 68, cat: TV, desc: "eLearning Multimedia"}
-    - {id: 16, cat: Movies/DVD, desc: "DVD-Rip"}
-    - {id: 48, cat: Movies/BluRay, desc: "BR-Rip/HD-Rip"}
-    - {id: 17, cat: Movies/BluRay, desc: "BD-Rip"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 34, cat: PC/Games, desc: "Juegos PC"}
-    - {id: 7, cat: PC/0day, desc: "Software PC"}
-    - {id: 35, cat: Console, desc: "Juegos Sony"}
-    - {id: 36, cat: PC/Games, desc: "Juegos Microsoft"}
-    - {id: 37, cat: Console/NDS, desc: "Juegos Nintendo"}
-    - {id: 45, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 44, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 49, cat: Books/Technical, desc: "eLearning"}
+    - {id: 68, cat: Books/Technical, desc: "eLearning Multimedia"}
+    - {id: 87, cat: Audio/Audiobook, desc: "Audiolibros"}
 
   modes:
     search: [q]
@@ -115,7 +109,7 @@ search:
     # does not support imdbid search and does not supply imdb link in results.
 
   rows:
-    selector: table.table.table-bordered > tbody > tr:has(a[href^="download.php?id="]):not(:has(td[style*="background-color"]))
+    selector: table.table.table-bordered > tbody > tr:has(a[href^="download.php?id="])
 
   fields:
     download:
@@ -131,16 +125,16 @@ search:
       selector: a[href^="index.php?page=torrent-details"][onmouseover]:not(:contains("VOSE"))
       optional: true
       filters:
-        - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
         - name: append
-          args: ".Spanish-DivTeam"
+          args: " MULTi/SPANiSH" # DivTeam doesn't bring languages. Usually Original + Spanish.
         - name: re_replace
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
+        - name: replace
+          args: ["UHDRip", "Bluray-2160p"] # Fix for Radarr
+        - name: replace
+          args: ["2160p BDRip", "Bluray-2160p"] # Fix for Radarr
     poster:
       selector: a[onmouseover][href^="index.php?page=torrent-details"]
       attribute: onmouseover

src/Jackett.Common/Definitions/dmhy.yml

@@ -29,14 +29,23 @@ caps:
     - {id: 21, cat: Console, desc: "遊戲周邊 (game periphery)"}
     - {id: 12, cat: Other/Misc, desc: "特攝 (special photo)"}
     - {id: 1, cat: Other, desc: "其他 (other)"}
+    # Anime as Movies (Radarr uses t=movie):
+    - {id: 2, cat: Movies/Other, desc: "動畫 (Anime)"}
+    - {id: 31, cat: Movies/Other, desc: "季度全集 (Quarterly Complete)"}
+    - {id: 7, cat: Movies/Other, desc: "RAW"}
 
   modes:
     search: [q]
     tv-search: [q]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   paths:

src/Jackett.Common/Definitions/documentarytorrents.yml

@@ -1,177 +0,0 @@
----
-id: documentarytorrents
-name: DocumentaryTorrents
-description: "Documentary Torrents (DT) is a Private Torrent Tracker for E-LEARNING MOVIES / TV"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - http://www.documentarytorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 128, cat: TV/HD, desc: "Adventure: HD"}
-    - {id: 129, cat: TV/SD, desc: "Adventure: Xvid / x264"}
-    - {id: 85, cat: TV/SD, desc: "Biography: Xvid / x264"}
-    - {id: 86, cat: TV/HD, desc: "Biography: HD"}
-    - {id: 60, cat: TV/HD, desc: "Computers: HD"}
-    - {id: 58, cat: TV/SD, desc: "Computers: Xvid / x264"}
-    - {id: 103, cat: TV/SD, desc: "Crime: Xvid / x264"}
-    - {id: 105, cat: TV/HD, desc: "Crime: HD"}
-    - {id: 64, cat: TV/SD, desc: "Culture: Xvid / x264"}
-    - {id: 66, cat: TV/HD, desc: "Culture: HD"}
-    - {id: 122, cat: TV/SD, desc: "Discovery: Xvid / x264"}
-    - {id: 123, cat: TV/HD, desc: "Discovery: HD"}
-    - {id: 98, cat: TV/HD, desc: "Drugs: HD"}
-    - {id: 97, cat: TV/SD, desc: "Drugs: Xvid / x264"}
-    - {id: 92, cat: TV/HD, desc: "Economy: HD"}
-    - {id: 91, cat: TV/SD, desc: "Economy: Xvid / x264"}
-    - {id: 83, cat: TV/HD, desc: "Food: HD"}
-    - {id: 82, cat: TV/SD, desc: "Food: Xvid / x264"}
-    - {id: 124, cat: TV/HD, desc: "HBO: HD"}
-    - {id: 125, cat: TV/SD, desc: "HBO: Xvid / x264"}
-    - {id: 76, cat: TV/SD, desc: "Health: Xvid / x264"}
-    - {id: 78, cat: TV/HD, desc: "Health: HD"}
-    - {id: 67, cat: TV/SD, desc: "History: Xvid / x264"}
-    - {id: 69, cat: TV/HD, desc: "History: HD"}
-    - {id: 79, cat: TV/SD, desc: "Humor: Xvid / x264"}
-    - {id: 80, cat: TV/HD, desc: "Humor: HD"}
-    - {id: 116, cat: TV/HD, desc: "Music: HD"}
-    - {id: 115, cat: TV/SD, desc: "Music: Xvid / x264"}
-    - {id: 118, cat: TV/HD, desc: "NatGeo: HD"}
-    - {id: 119, cat: TV/SD, desc: "NatGeo: Xvid / x264"}
-    - {id: 63, cat: TV/HD, desc: "Nature: HD"}
-    - {id: 61, cat: TV/SD, desc: "Nature: Xvid / x264"}
-    - {id: 109, cat: TV/SD, desc: "New World Order: Xvid / x264"}
-    - {id: 111, cat: TV/HD, desc: "New World Order: HD"}
-    - {id: 48, cat: TV/HD, desc: "Other: HD"}
-    - {id: 50, cat: TV/HD, desc: "Other: DVD"}
-    - {id: 9, cat: TV/SD, desc: "Other: Xvid / x264"}
-    - {id: 126, cat: TV/HD, desc: "PBS: HD"}
-    - {id: 127, cat: TV/SD, desc: "PBS: Xvid / x264"}
-    - {id: 72, cat: TV/HD, desc: "Politics: HD"}
-    - {id: 112, cat: Books/EBook, desc: "Politics: Ebook"}
-    - {id: 70, cat: TV/SD, desc: "Politics: Xvid / x264"}
-    - {id: 114, cat: Books/EBook, desc: "Reference: Ebook"}
-    - {id: 117, cat: Audio/Audiobook, desc: "Reference: Audio Book"}
-    - {id: 56, cat: TV/HD, desc: "Religion: HD"}
-    - {id: 54, cat: TV/SD, desc: "Religion: Xvid / x264"}
-    - {id: 94, cat: TV/SD, desc: "Science: Xvid / x264"}
-    - {id: 95, cat: TV/HD, desc: "Science: HD"}
-    - {id: 75, cat: TV/HD, desc: "Space: HD"}
-    - {id: 73, cat: TV/SD, desc: "Space: Xvid / x264"}
-    - {id: 113, cat: TV/HD, desc: "Space: DVD"}
-    - {id: 100, cat: TV/SD, desc: "Sports: Xvid / x264"}
-    - {id: 102, cat: TV/HD, desc: "Sports: HD"}
-    - {id: 106, cat: TV/SD, desc: "Technology: Xvid / x264"}
-    - {id: 108, cat: TV/HD, desc: "Technology: HD"}
-    - {id: 121, cat: TV/SD, desc: "Transport: Xvid / x264"}
-    - {id: 120, cat: TV/HD, desc: "Transport: HD"}
-    - {id: 57, cat: TV/HD, desc: "Travel: HD"}
-    - {id: 52, cat: TV/SD, desc: "Travel: Xvid / x264"}
-    - {id: 89, cat: TV/HD, desc: "War: HD"}
-    - {id: 88, cat: TV/SD, desc: "War: Xvid / x264"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: form
-  form: form[action="account-login.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.myBlock:has(font.error)
-  test:
-    path: index.php
-    selector: a[href$="/account-logout.php"]
-
-search:
-  paths:
-    # http://documentarytorrents.com/torrents.php?c123=1&c69=1&c67=1&c89=1&c88=1&search=grow+old&cat=0&incldead=1&freeleech=0&lang=0
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 english, 2 french, etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  rows:
-    selector: table.ttable_headinner tr.t-row
-    filters:
-      - name: andmatch
-
-  fields:
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    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
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    date:
-      text: now
-    downloadvolumefactor:
-      case:
-        img[src="images/freeleech_star.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.4
-# TorrentTrader v2-svn

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -12,62 +12,45 @@ caps:
   categorymappings:
     # Kino
     - {id: 118, cat: Movies/HD, desc: "Kino - HD"}
+    - {id: 141, cat: Movies/HD, desc: "Kino - Blu-Ray/ 4K"}
     - {id: 4, cat: Movies/SD, desc: "Kino - SD"}
     # Movies
-    - {id: 18, cat: Movies/SD, desc: "Movies - x264/XviD"}
-    - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
-    - {id: 22, cat: Movies/DVD, desc: "Movies - DVD/HD2"}
-    - {id: 52, cat: Movies, desc: "Movies - Kids"}
+    - {id: 139, cat: Movies/3D, desc: "Movies - 3D"}
     - {id: 19, cat: Movies/HD, desc: "Movies - HD"}
-    - {id: 25, cat: Movies/3D, desc: "Movies - 3D"}
-    - {id: 26, cat: Movies/BluRay, desc: "Movies - Blu-Ray"}
+    - {id: 18, cat: Movies/SD, desc: "Movies - x264/XviD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies - Blu-Ray/ 4K"}
+    - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
     # Serien
-    - {id: 40, cat: TV/SD, desc: "Serien - SD"}
     - {id: 41, cat: TV/HD, desc: "Serien - HD"}
-    - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
+    - {id: 40, cat: TV/SD, desc: "Serien - SD"}
     - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
+    - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
     # Musik
     - {id: 119, cat: Audio, desc: "Musik - Alben"}
     - {id: 5, cat: Audio/MP3, desc: "Musik - Mp3"}
-    - {id: 6, cat: Audio, desc: "Musik - Mixe"}
     - {id: 92, cat: Audio, desc: "Musik - Discography"}
-    - {id: 114, cat: Audio, desc: "Musik - Musik Pack"}
-    - {id: 48, cat: Audio/Video, desc: "Musik - Video"}
+    - {id: 136, cat: Audio/Video, desc: "Musik - Videos"}
     # Doku
-    - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
     - {id: 38, cat: TV/Documentary, desc: "Doku - HD"}
-    - {id: 81, cat: TV/Documentary, desc: "Doku - Pack "}
-    # Anime
-    - {id: 73, cat: TV/Anime, desc: "Anime - Movies"}
-    - {id: 74, cat: TV/Anime, desc: "Anime - Serien"}
+    - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
     # Games
+    - {id: 140, cat: Console, desc: "Games - Nintendo/Sonstige"}
     - {id: 16, cat: PC/Games, desc: "Games - PC"}
     - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}
-    - {id: 7, cat: Console/PSP, desc: "Games - PSP"}
-    - {id: 17, cat: Console/PS3, desc: "Games - PS2/PS3"}
-    - {id: 29, cat: Console/NDS, desc: "Games - NDS/3DS"}
-    - {id: 15, cat: Console/Wii, desc: "Games - Wii"}
-    - {id: 8, cat: Console/XBox, desc: "Games - XboX "}
     # Appz
     - {id: 30, cat: PC/0day, desc: "Appz - Windows"}
-    - {id: 31, cat: PC/0day, desc: "Appz - Linux"}
-    - {id: 32, cat: PC/Mac, desc: "Appz - Mac"}
     - {id: 106, cat: PC/Mobile-Android, desc: "Appz - Android"}
+    - {id: 138, cat: PC/0day, desc: "Appz - Sonstiges"}
     # Sport
     - {id: 43, cat: TV/Sport, desc: "Sport - SD"}
     - {id: 50, cat: TV/Sport, desc: "Sport - HD"}
     # Sonstiges
-    - {id: 34, cat: Books, desc: "Sonstiges - E-Books"}
+    - {id: 36, cat: Books/Comics, desc: "Sonstiges - Anime"}
+    - {id: 34, cat: Books/EBook, desc: "Sonstiges - E-Books"}
     - {id: 35, cat: Audio/Audiobook, desc: "Sonstiges - Audiobook"}
-    - {id: 36, cat: Other, desc: "Sonstiges - Diverses"}
     # XXX
-    - {id: 46, cat: XXX, desc: "XXX - SD"}
-    - {id: 47, cat: XXX, desc: "XXX - HD"}
-    - {id: 45, cat: XXX, desc: "XXX - Pack"}
+    - {id: 47, cat: XXX, desc: "XXX - SD/HD"}
     - {id: 49, cat: XXX, desc: "XXX - Sonstiges"}
-    - {id: 110, cat: XXX, desc: "XXX - Hentai Serie"}
-    - {id: 111, cat: XXX, desc: "XXX - Hentai Movie"}
-    - {id: 116, cat: XXX, desc: "XXX - SexBooks"}
 
   modes:
     search: [q]
@@ -142,62 +125,45 @@ search:
       case:
         # Kino
         ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "118"
+        ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray/ 4K\"))": "141"
         ":has(div.kat_cat_pic_name:contains(\"Kino\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "4"
         # Movies
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"x264/XviD\"))": "18"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD/HD\"))": "2"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"DVD/HD2\"))": "22"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Kids\"))": "52"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "139"
         ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "19"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "25"
-        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray\"))": "26"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"x264/XviD\"))": "18"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Blu-Ray/ 4K\"))": "26"
+        ":has(div.kat_cat_pic_name:contains(\"Movies\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD/HD\"))": "2"
         # Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "40"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "41"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "40"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack HD\"))": "80"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack SD\"))": "42"
         # Musik
         ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Alben\"))": "119"
         ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mp3\"))": "5"
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": "6"
         ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Discography\"))": "92"
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Musik Pack\"))": "114"
-        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Video\"))": "48"
+        ":has(div.kat_cat_pic_name:contains(\"Musik\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "136"
         # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "37"
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "38"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack \"))": "81"
-        # Anime
-        ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Movies\"))": "73"
-        ":has(div.kat_cat_pic_name:contains(\"Anime\")):has(div.kat_cat_pic_name_b:contains(\"Serien\"))": "74"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "37"
         # Games
+        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo/Sonstige\"))": "140"
         ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "16"
         ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "14"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PSP\"))": "7"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PS2/PS3\"))": "17"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"NDS/3DS\"))": "29"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wii\"))": "15"
-        ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"XboX \"))": "8"
         # Appz
         ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Windows\"))": "30"
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Linux\"))": "31"
-        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "32"
         ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": "106"
+        ":has(div.kat_cat_pic_name:contains(\"Appz\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "138"
         # Sport
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "43"
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "50"
         # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "36"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Books\"))": "34"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Audiobook\"))": "35"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Diverses\"))": "36"
         # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "46"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "47"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "45"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD/HD\"))": "47"
         ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": "49"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Serie\"))": "110"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Hentai Movie\"))": "111"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SexBooks\"))": "116"
     poster:
       selector: div[id^="details"] img
       attribute: src
@@ -261,5 +227,9 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-# MR and MST tbd
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 12 hours (as seconds = 12 x 60 x 60)
+      text: 43200
 # engine tbd

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

@@ -44,6 +44,7 @@ caps:
     - {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: 314, cat: Audio/Audiobook, desc: "Audio: Dystopian/Post Apocalyptic Bks"}
     - {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"}

src/Jackett.Common/Definitions/empornium.yml

@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
   - https://www.empornium.me/
 
 caps:
@@ -112,6 +115,7 @@ search:
       selector: a[href^="/torrents.php?action=download&id="]
       attribute: href
     description:
+      optional: true
       selector: div.tags
     title:
       selector: a[href^="/torrents.php?id="]

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
   - https://www.empornium.me/
 
 caps:
@@ -108,6 +111,7 @@ search:
       selector: a[href^="/torrents.php?action=download&id="]
       attribute: href
     description:
+      optional: true
       selector: div.tags
     title:
       selector: a[href^="/torrents.php?id="]

src/Jackett.Common/Definitions/eniahd.yml

@@ -6,6 +6,8 @@ language: ru-ru
 type: semi-private
 encoding: UTF-8
 links:
+  - https://eniatv.com/
+legacylinks:
   - https://eniahd.com/
 
 caps:
@@ -16,6 +18,25 @@ caps:
     - {id: 12, cat: Movies, desc: "Наше кино"}
     # TV
     - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+    - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}
+    - {id: 52, cat: TV/HD, desc: "Блудный сын / Prodigal Son"}
+    - {id: 49, cat: TV/HD, desc: "Пенниуорт / Pennyworth"}
+    - {id: 62, cat: TV/HD, desc: "Черный список / The Blacklist"}
+    - {id: 64, cat: TV/HD, desc: "Игра престолов / Game of Thrones"}
+    - {id: 59, cat: TV/HD, desc: "Американская история ужасов / American Horror Story"}
+    - {id: 60, cat: TV/HD, desc: "Хороший доктор / The Good Doctor"}
+    - {id: 54, cat: TV/HD, desc: "Рэй Донован / Ray Donovan"}
+    - {id: 55, cat: TV/HD, desc: "Сверхъестественное / Supernatural"}
+    - {id: 56, cat: TV/HD, desc: "Сквозь снег / Snowpiercer"}
+    - {id: 57, cat: TV/HD, desc: "Теория большого взрыва / The Big Bang Theory"}
+    - {id: 58, cat: TV/HD, desc: "Миллиарды / Billions"}
+    - {id: 53, cat: TV/HD, desc: "Родина / Homeland"}
+    - {id: 51, cat: TV/HD, desc: "Новобранец / The Rookie"}
+    - {id: 50, cat: TV/HD, desc: "Это мы / This Is Us"}
+    - {id: 48, cat: TV/HD, desc: "Бэтвумен / Batwoman"}
+    - {id: 32, cat: TV/HD, desc: "Кости / Bones"}
+    - {id: 31, cat: TV/HD, desc: "Американские боги / American Gods"}
+    - {id: 30, cat: TV/HD, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
     - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
     - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
     - {id: 3, cat: TV, desc: "Зарубежные сериалы"}
@@ -28,6 +49,8 @@ caps:
     - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
     - {id: 21, cat: TV/Documentary, desc: "Документальные"}
     - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+    # Private Forums
+    - {id: 47, cat: TV/HD, desc: "Рассказ служанки / The Handmaid's Tale"}
     # Miscellaneous
     - {id: 8, cat: Other, desc: "Разное (раздачи)"}
 

src/Jackett.Common/Definitions/epizod.yml

@@ -15,7 +15,9 @@ caps:
     - {id: series, cat: TV, desc: SÉRIES}
     - {id: films, cat: Movies, desc: FILMS}
     - {id: musique, cat: Audio, desc: MUSIQUE}
+    - {id: albums, cat: Audio, desc: ALBUMS}
     - {id: ebook, cat: Books, desc: EBOOK}
+    - {id: jeux, cat: Console, desc: GAMES}
     - {id: other, cat: Other, desc: OTHER}
 
   modes:
@@ -45,6 +47,10 @@ settings:
     type: checkbox
     label: Replace VOSTFR with ENGLISH
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
   selector: a[href^="magnet:?xt="]
@@ -57,28 +63,49 @@ search:
   inputs:
     s: "{{ .Keywords }}"
 
+  headers:
+    # Windows User-Agent is required, Linux is blocked
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
+
   rows:
-    selector: article:not(:has(a[title="DMCA"]))
+    selector: li[class^="ilovewp-post"]:not(:has(a[title="DMCA"]))
 
   fields:
-    category:
-      text: other
-    category|noappend:
+    category1:
       selector: a[href*="/category/"]
       attribute: href
       optional: true
       filters:
         - name: split
           args: ["/", 4]
+    category2:
+      selector: li[class^="ilovewp-post"]
+      attribute: class
+      optional: true
+      filters:
+        - name: regexp
+          args: "category-(.+?) "
+    category3:
+      selector: img[src*="img"]
+      attribute: src
+      optional: true
+      filters:
+        - name: regexp
+          args: "img/(.+?)_"
+        - name: replace
+          args: ["ebooks", "ebook"]
+    category:
+      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
+    sizecat:
+      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
     site_date:
-      selector: div.post-cover > a
-      attribute: title
+      selector: time > a
       filters:
         # year can be at the end of the title, so we get it and name it site_date
         - name: regexp
           args: "(19|20\\d{2})$"
     title_phase1:
-      selector: div.post-cover > a
+      selector: time > a
       attribute: title
       filters:
         # now we put the date at the right place according scene naming rules using .Result.site_date
@@ -112,10 +139,10 @@ search:
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
-      selector: div.post-cover > a
+      selector: h2.title-post > a
       attribute: href
     download:
-      selector: div.post-cover > a
+      selector: h2.title-post > a
       attribute: href
     poster:
       selector: img[data-lazy-src]
@@ -128,17 +155,8 @@ search:
           args: ["T", " "]
         - name: dateparse
           args: "2006-01-02 15:04:05-07:00"
-    cat:
-      selector: a[href*="/category/"]
-      attribute: href
-      optional: true
-      filters:
-        - name: split
-          args: ["/", 4]
-    cat:
-      text: "{{ if .Result.cat }}{{ .Result.cat }}{{ else }}other{{ end }}"
     size:
-      text: "{{ if eq .Result.cat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.cat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.cat \"series\") (eq .Result.cat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.cat \"films\" }}2 GB{{ else }}{{ end }}"
+      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"albums\") (eq .Result.sizecat \"musique\") }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"jeux\" }}1 GB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
     seeders:
       text: 1
     leechers:

src/Jackett.Common/Definitions/ethor.yml

@@ -1,167 +0,0 @@
----
-id: ethor
-name: Ethor.net (Thor's Land)
-description: "A French general tracker"
-language: fr-fr
-type: private
-encoding: UTF-8
-links:
-  - https://ethor.net/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: PC, desc: "Applications/Divers"}
-    - {id: 1, cat: PC, desc: "Applications/PC ISO"}
-    - {id: 44, cat: PC, desc: "Applications/Portable"}
-    - {id: 47, cat: Movies/BluRay, desc: "Films/Bluray"}
-    - {id: 20, cat: Movies/DVD, desc: "Films/DVDr"}
-    - {id: 42, cat: Movies/HD, desc: "Films/HD Rip"}
-    - {id: 19, cat: Movies/SD, desc: "Films/SD Rip"}
-    - {id: 5, cat: Movies/SD, desc: "Films/VCD"}
-    - {id: 4, cat: PC/Games, desc: "Jeux/PC"}
-    - {id: 41, cat: Console, desc: "Jeux/Portable"}
-    - {id: 34, cat: Console/PS4, desc: "Jeux/PS2-PS3"}
-    - {id: 38, cat: Console/Wii, desc: "Jeux/Wii-GC"}
-    - {id: 40, cat: Console/XBox, desc: "Jeux/Xbox360"}
-    - {id: 6, cat: Audio, desc: "Musique"}
-    - {id: 37, cat: Audio/Video, desc: "Musique/Video"}
-    - {id: 48, cat: TV/HD, desc: "Série-Télé/Bluray"}
-    - {id: 45, cat: TV/SD, desc: "Série-Télé/DVDr"}
-    - {id: 43, cat: TV/HD, desc: "Série-Télé/HD Rip"}
-    - {id: 7, cat: TV/SD, desc: "Série-Télé/SD Rip"}
-    - {id: 23, cat: Books, desc: "E-Books"}
-    - {id: 46, cat: Other, desc: "Évé. sportif"}
-    - {id: 36, cat: Other, desc: "Kidz"}
-    - {id: 25, cat: Other, desc: "Misc"}
-    - {id: 9, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: multilang
-    type: checkbox
-    label: Replace VFQ/MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: MULTI.FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-
-login:
-  path: login3.php
-  method: form
-  form: form[action="login3.php?takelogin=1"]
-  captcha:
-    type: image
-    selector: img#validationimage
-    input: validationcode
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    secure_cookie: 0
-  error:
-    - selector: :contains("\"status\":\"error\"")
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    advcat: 0
-    incldead: 1
-    stype: b
-    dp: 0
-    isUserClick: 0
-
-  rows:
-    selector: p + table > tbody > tr:has(a[href^="/details.php"])
-
-  fields:
-    download:
-      selector: a[href^="/details.php"]:has(b)
-      attribute: href
-      filters:
-        - name: replace
-          args: ["/details.php", "/download.php"]
-    _title_original_b:
-      selector: a[href^="/details.php"] b
-    _title_original_title: # long titles (shortened with ...)
-      selector: a[href^="/details.php"][title]
-      attribute: title
-      optional: true
-    _title_original:
-      text: "{{ if .Result._title_original_title }}{{ .Result._title_original_title }}{{ else }}{{ .Result._title_original_b }}{{ end }}"
-    _title_normalized:
-      text: "{{ .Result._title_original }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)S(\\d{2}) E(\\d{2})", "S$1E$2"]
-        - name: re_replace
-          args: ["(?i)S(\\d{1}) E(\\d{2})", "S0$1E$2"]
-    _title_multilang:
-      text: "{{ .Result._title_normalized }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)[\\.\\s\\[\\-]MULTI[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
-        - name: re_replace
-          args: ["(?i)[\\.\\s\\[\\-]VFQ[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
-    title:
-      text: "{{ if .Config.multilang }}{{ .Result._title_multilang }}{{ else }}{{ .Result._title_normalized }}{{ end }}"
-    category:
-      selector: a[href^="/browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="/details.php"]:has(b)
-      attribute: href
-    files:
-      selector: a[href*="#filelist"]
-    size:
-      selector: td:nth-child(6)
-    grabs:
-      selector: td:nth-child(7)
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " -05:00" # timezone offset? is this correct? usually France is on CET +01:00
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    downloadvolumefactor:
-      case:
-        "img[title^=\"Freeleech: \"]": 0
-        "img[title^=\"Half Freeleech: \"]": 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/ettv.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.lat/
-  - https://ettv.unblocked.rest/
+  - https://ettv.unblockit.buzz/
+  - https://ettv.unblocked.monster/
 legacylinks:
   - https://www.ettv.tv/
   - https://www.ettv.to/
@@ -29,9 +29,15 @@ legacylinks:
   - https://ettv.unblocked.bar/
   - https://ettv.proxyportal.pw/
   - https://ettv.uk-unblock.pro/
-  - https://ettv.root.yt/ # currently redirects to ettvcentral.com
+  - https://ettv.root.yt/
   - https://www.ettv.be/
   - https://ettv.unblockit.top/
+  - https://ettv.unblockit.lat/
+  - https://ettv.unblockit.app/
+  - https://ettv.unblocked.rest/
+  - https://ettv.unblockit.dev/
+  - https://ettv.unblockit.ltd/
+  - https://ettv.unblockit.link/
 
 caps:
   categorymappings:

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

@@ -1,7 +1,7 @@
 ---
 id: extratorrent-cd
 name: ExtraTorrent.cd
-description: "ExtraTorrent.cd is a Public tracker, a  popular alternative to the original ET site, providing Movie / TV / General magnets"
+description: "ExtraTorrent.cd is a Public tracker for MOVIE / TV / GENERAL magnets"
 language: en-us
 type: public
 encoding: UTF-8
@@ -13,8 +13,15 @@ legacylinks:
   - https://extratorrent.unblockit.one/ # for .ag
 
 caps:
-  categories:
-    Other: Other
+  categorymappings:
+    - {id: Movies, cat: Movies, desc: "Movies"}
+    - {id: Video, cat: Movies, desc: "Movies"}
+    - {id: TV, cat: TV, desc: "TV"}
+    - {id: Music, cat: Audio, desc: "Music"}
+    - {id: Porn, cat: XXX, desc: "Adult / Porn"}
+    - {id: Software, cat: PC, desc: "Software"}
+    - {id: Games, cat: Console, desc: "Games"}
+    - {id: Other, cat: Other/Misc, desc: "Other"}
 
   modes:
     search: [q]
@@ -23,15 +30,14 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings:
-  - name: info_8000
-    type: info
-    label: About ExtraTorrent Categories
-    default: ExtraTorrent does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+settings: []
 
 search:
   paths:
-    - path: "search/?search={{ .Keywords }}"
+    # 30 rows per page
+    - path: "search/?search={{ .Keywords }}&srt=added&order=desc"
+    - path: "search/?page=2&search={{ .Keywords }}&srt=added&order=desc"
+    - path: "search/?page=3&search={{ .Keywords }}&srt=added&order=desc"
   keywordsfilters:
     - name: re_replace
       args: ["[\\s]+", "."]
@@ -44,7 +50,7 @@ search:
 
   fields:
     category:
-      text: Other
+      selector: span.c_tor > a
     title:
       selector: a[href*="/torrent/"][title^="view"]
     details:

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

@@ -7,10 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrents.it/
-  - https://extratorrent.unblockit.app/
-  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.buzz/
 legacylinks:
   - https://extratorrent.ag/
+  - https://extratorrent.unblockit.app/
+  - https://extratorrent.unblockit.dev/
+  - https://extratorrent.unblockit.ltd/
+  - https://extratorrent.unblockit.link/
+  - https://extratorrent2.unblockninja.com/
 
 caps:
   categorymappings:
@@ -956,6 +960,9 @@ search:
     download:
       selector: td a[href^="magnet:?xt="]
       attribute: href
+      filters:
+        - name: replace
+          args: [";", "&"]
     date:
       selector: td:nth-last-of-type(5)
       filters:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
+    tv-search: [q]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -104,6 +104,15 @@ search:
           args: cat
     title:
       selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+        - name: re_replace
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+        - name: re_replace
+          args: ["(?i)compleet", "Complete"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/exttorrents.yml

@@ -35,14 +35,18 @@ caps:
     - {id: "/games/ps3/", cat: Console/PS3, desc: "Games PS3"}
     - {id: "/games/ps4/", cat: Console/PS4, desc: "Games PS4"}
     - {id: "/games/psp/", cat: Console/PSP, desc: "Games PSP"}
+    - {id: "/games/switch/", cat: Console/Other, desc: "Games Switch"}
     - {id: "/games/wii/", cat: Console/Wii, desc: "Games Wii"}
     - {id: "/games/xbox360/", cat: Console/XBox 360, desc: "Games Xbox360"}
     - {id: "/movies/", cat: Movies, desc: Movies}
     - {id: "/movies/3d-movies/", cat: Movies/3D, desc: "Movies 3D"}
     - {id: "/movies/bollywood/", cat: Movies, desc: "Movies Bollywood"}
+    - {id: "/movies/documentary/", cat: Movies, desc: "Movies Documentary"}
     - {id: "/movies/dubbed-movies/", cat: Movies, desc: "Movies Dubbed"}
+    - {id: "/movies/dvd/", cat: Movies/DVD, desc: "Movies DVD"}
     - {id: "/movies/highres-movies/", cat: Movies/HD, desc: "Movies Highres"}
     - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
+    - {id: "/movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
     - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
     - {id: "/music/", cat: Audio, desc: Music}
     - {id: "/music/aac/", cat: Audio, desc: "Music AAC"}
@@ -52,6 +56,13 @@ caps:
     - {id: "/music/radio-shows/", cat: Audio, desc: "Music Radio Shows"}
     - {id: "/other/", cat: Other, desc: Other}
     - {id: "/tv/", cat: TV, desc: TV}
+    - {id: "/xxx/", cat: XXX, desc: XXX}
+    - {id: "/xxx/games/", cat: XXX/Other, desc: "XXX Games"}
+    - {id: "/xxx/hentai/", cat: XXX/Other, desc: "XXX Hentai"}
+    - {id: "/xxx/magazines/", cat: XXX/Other, desc: "XXX Magazines"}
+    - {id: "/xxx/pictures/", cat: XXX/ImageSet, desc: "XXX Pictures"}
+    - {id: "/xxx/video/", cat: XXX, desc: "XXX Video"}
+    - {id: "/video/", cat: XXX, desc: "XXX Video"}
 
   modes:
     search: [q]
@@ -76,7 +87,10 @@ settings:
     options:
       desc: desc
       asc: asc
-
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
   selector: a[href^="magnet:?xt="]
@@ -89,6 +103,10 @@ search:
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/3/&{{ else }}latest/3/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/4/&{{ else }}latest/4/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
 
+  headers:
+    # site presents hcaptcha challenge for Jackett's User-Agent, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
   rows:
     selector: table.table-striped > tbody > tr
 

src/Jackett.Common/Definitions/eztv.yml

@@ -11,10 +11,9 @@ links:
   - https://eztv.wf/
   - https://eztv.tf/
   - https://eztv.yt/
-  - https://eztv.root.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.app/
-  - https://eztv.unblocked.rest/
+  - https://eztv.unblockit.buzz/
+  - https://eztv.unblocked.monster/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
@@ -36,6 +35,12 @@ legacylinks:
   - https://eztv.unblockit.top/
   - https://eztv.unblockit.lat/
   - https://eztv.io/
+  - https://eztv.unblockit.app/
+  - https://eztv.root.yt/
+  - https://eztv.unblocked.rest/
+  - https://eztv.unblockit.dev/
+  - https://eztv.unblockit.ltd/
+  - https://eztv.unblockit.link/
 
 caps:
   categories:

src/Jackett.Common/Definitions/feedurneed.yml

@@ -0,0 +1,208 @@
+---
+id: feedurneed
+name: FeedUrNeed
+description: "FeedUrNeed (FuN) is a Private Torrent Tracker for MOVIES / TV / General"
+language: en-us
+type: private
+encoding: utf-8
+links:
+  - https://feedurneed.xyz/
+
+caps:
+  categorymappings:
+    - {id: 12, cat: TV/Anime, desc: Anime}
+    - {id: 82, cat: PC/0day, desc: Apps/0day}
+    - {id: 1, cat: PC/ISO, desc: Apps/ISO}
+    - {id: 63, cat: Audio/Audiobook, desc: Audiobooks}
+    - {id: 66, cat: Console/Other, desc: Console/NSW}
+    - {id: 67, cat: Console/PS4, desc: Console/PS4}
+    - {id: 68, cat: Console/Other, desc: Console/PS5}
+    - {id: 24, cat: Books/EBook, desc: E-Books}
+    - {id: 64, cat: PC/Games, desc: Games/ISO}
+    - {id: 65, cat: PC/Games, desc: Games/Rips}
+    - {id: 28, cat: Movies/3D, desc: Movies/3D}
+    - {id: 30, cat: Movies, desc: Movies/Cam-TS}
+    - {id: 15, cat: Movies/DVD, desc: Movies/DVDR}
+    - {id: 58, cat: Movies/Foreign, desc: Movies/DVDR-Foreign}
+    - {id: 31, cat: Movies, desc: Movies/FooKaS RG}
+    - {id: 70, cat: Movies/BluRay, desc: Movies/HD-Blu-Ray}
+    - {id: 60, cat: Movies/HD, desc: Movies/HD-Foreign}
+    - {id: 18, cat: Movies/HD, desc: Movies/HD-Retail-X264}
+    - {id: 56, cat: Movies/HD, desc: Movies/HD-Retail-X265}
+    - {id: 55, cat: Movies/WEB-DL, desc: Movies/HD-Web}
+    - {id: 23, cat: Movies/BluRay, desc: Movies/Remuxes}
+    - {id: 59, cat: Movies/Foreign, desc: Movies/SD-Foreign}
+    - {id: 74, cat: Movies/WEB-DL, desc: Movies/SD-Web}
+    - {id: 72, cat: Movies/SD, desc: Movies/SD-X264}
+    - {id: 13, cat: Movies/SD, desc: Movies/SD-XviD}
+    - {id: 71, cat: Movies/BluRay, desc: Movies/UHD-Blu-Ray}
+    - {id: 78, cat: Movies/Foreign, desc: Movies/UHD-Foreign}
+    - {id: 57, cat: Movies/UHD, desc: Movies/UHD-Retail}
+    - {id: 69, cat: Movies/WEB-DL, desc: Movies/UHD-Web}
+    - {id: 26, cat: Audio/Lossless, desc: Music/FLAC}
+    - {id: 10, cat: Audio/MP3, desc: Music/MP3}
+    - {id: 43, cat: Audio/Video, desc: Music/Mvids}
+    - {id: 29, cat: Movies, desc: Packs/Movies}
+    - {id: 19, cat: Audio/MP3, desc: Packs/MP3}
+    - {id: 62, cat: TV/HD, desc: Packs/TV-HD}
+    - {id: 61, cat: TV/SD, desc: Packs/TV-SD}
+    - {id: 76, cat: TV/HD, desc: TV/Blu-Ray}
+    - {id: 81, cat: TV/SD, desc: TV/DVDR}
+    - {id: 77, cat: TV/Foreign, desc: TV/Foreign}
+    - {id: 45, cat: TV/HD, desc: TV/HD}
+    - {id: 80, cat: TV/HD, desc: TV/HD-Retail}
+    - {id: 36, cat: TV/SD, desc: TV/SD}
+    - {id: 79, cat: TV/SD, desc: TV/SD-Retail}
+    - {id: 73, cat: TV/Sport, desc: TV/Sports}
+    - {id: 75, cat: TV/UHD, desc: TV/UHD}
+    - {id: 17, cat: XXX, desc: XXX}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>25</i>.
+  - name: info_pm
+    type: info
+    label: Force Read PM
+    default: To prevent being redirected to the mailbox when you have unread PMs, the setting <b>Force read pm:</b> should be set to <b>No</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.embedded:has(h2:contains("failed"))
+  test:
+    path: index.php
+    selector: a[href*="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered > tbody > tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[onmouseover][href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=\\\\'(.*?)\\\\'"
+        - name: replace
+          args: ["./pic/noposter.png", ""]
+    imdb:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "(\\d{6,8})"
+        - name: prepend
+          args: "tt"
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: a[href^="snatches.php?id="]
+      filters:
+        - name: replace
+          args: ["Times", ""]
+    downloadvolumefactor:
+      case:
+        "a.info:contains(\"FREE\")": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "a.info:contains(\"Double\")": 2
+        "*": 1
+    date:
+      selector: td:nth-child(7):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(7):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 pm +00:00"
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
+      # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
+      case:
+        "a.info:contains(\"FREE\")": 172800
+        "*": 129600
+# U-232 V5

src/Jackett.Common/Definitions/femdomcult.yml

@@ -30,6 +30,7 @@ caps:
     - {id: 65, cat: XXX, desc: "Scat"}
     - {id: 71, cat: XXX, desc: "Strapon"}
     - {id: 66, cat: XXX, desc: "Transdom"}
+    - {id: 77, cat: XXX, desc: "Unknown & Low Quality"}
     - {id: 75, cat: XXX, desc: "Virtual Reality"}
 
   modes:
@@ -82,8 +83,7 @@ search:
     title: "{{ .Keywords }}"
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
-    action: basic
-    searchsubmit: 1
+    action: advanced
 
   rows:
     # exclude redbar torrents
@@ -117,9 +117,12 @@ search:
           args: ["/static/common/noartwork/noimage.png", ""]
     files:
       selector: td:nth-child(3)
+    date: # some torrents have "Never" date
+      text: 20 years ago
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      optional: true
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile

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

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
@@ -95,6 +95,8 @@ search:
     title:
       selector: a[href^="details.php?id="]
       filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
         - name: re_replace
           args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
         - name: re_replace

src/Jackett.Common/Definitions/firebit.yml

@@ -8,8 +8,6 @@ encoding: UTF-8
 links:
   - https://firebit.net/
   - https://firebit.info/
-  - https://firebit.pro/
-  - https://firebit.club/
 legacylinks:
   - https://firebit.name/
   - https://firebit.biz/
@@ -19,6 +17,8 @@ legacylinks:
   - http://firebit.pro/
   - http://firebit.club/
   - http://firebit.biz/
+  - https://firebit.pro/
+  - https://firebit.club/
 
 caps:
   categorymappings:
@@ -45,6 +45,7 @@ caps:
     - {id: "Музыка Видео", cat: Audio/Video, desc: "Музыка Видео"}
     - {id: "Другие категории", cat: Other, desc: "Другие категории"}
     - {id: "Сериалы", cat: TV, desc: "Сериалы"}
+    - {id: "-", cat: Other, desc: "Другие категории"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/focusx.yml

@@ -10,152 +10,156 @@ links:
 
 caps:
   categorymappings:
-    - {id: 111, cat: Movies, desc: "1922"}
-    - {id: 135, cat: Movies, desc: "Анон"}
-    - {id: 213, cat: Movies, desc: "Борат 2"}
-    - {id: 206, cat: Movies, desc: "Брачная история"}
-    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
-    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
-    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
-    - {id: 65, cat: Movies, desc: "В твоих глазах"}
-    - {id: 74, cat: Movies, desc: "Варкрафт"}
-    - {id: 202, cat: Movies, desc: "Визит инспектора"}
-    - {id: 83, cat: Movies, desc: "Возмущение"}
-    - {id: 168, cat: Movies, desc: "Воспитательница"}
-    - {id: 46, cat: Movies, desc: "Высотка"}
-    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
-    - {id: 90, cat: Movies, desc: "Дангал"}
-    - {id: 189, cat: Movies, desc: "Дедвуд"}
-    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
-    - {id: 19, cat: Movies, desc: "Заброшенный"}
-    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
-    - {id: 64, cat: Movies, desc: "Зоотопия"}
-    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
-    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
-    - {id: 61, cat: Movies, desc: "Комета"}
-    - {id: 18, cat: Movies, desc: "Копенгаген"}
-    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
-    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
-    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 9, cat: TV, desc: "Иерихон"}
     - {id: 10, cat: Movies, desc: "Мёд в голове"}
-    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
-    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
-    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
-    - {id: 54, cat: Movies, 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: 16, cat: Movies, desc: "Малыш"}
+    - {id: 17, cat: TV, desc: "Карточный домик"}
+    - {id: 18, cat: Movies, desc: "Копенгаген"}
+    - {id: 19, cat: Movies, desc: "Заброшенный"}
+    - {id: 37, cat: TV, desc: "Джек Айриш"}
+    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
+    - {id: 39, cat: TV, desc: "Чужестранка"}
+    - {id: 40, cat: TV, desc: "Девушка по вызову"}
+    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
+    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
+    - {id: 43, cat: TV, desc: "Игра престолов"}
+    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
     - {id: 45, cat: Movies, desc: "Падение Лондона"}
-    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
-    - {id: 57, cat: Movies, desc: "Портниха"}
-    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
-    - {id: 70, cat: Movies, desc: "Припаркованные"}
-    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 46, cat: Movies, desc: "Высотка"}
+    - {id: 47, cat: TV, desc: "Острые козырьки"}
+    - {id: 48, cat: TV, desc: "Странная парочка"}
+    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
     - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
-    - {id: 193, cat: Movies, 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: 57, cat: Movies, desc: "Портниха"}
+    - {id: 58, cat: TV, desc: "Мистер Робот"}
+    - {id: 59, cat: TV, desc: "Валландер"}
+    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
+    - {id: 61, cat: Movies, desc: "Комета"}
+    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 63, cat: TV, desc: "Куорри"}
+    - {id: 64, cat: Movies, desc: "Зоотопия"}
+    - {id: 65, cat: Movies, desc: "В твоих глазах"}
+    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
+    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
+    - {id: 68, cat: TV, desc: "Бесстыжие"}
+    - {id: 69, cat: TV, 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: 75, cat: TV, desc: "Все схвачено"}
+    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
+    - {id: 77, cat: TV, desc: "Граница"}
+    - {id: 79, cat: TV, desc: "Бош"}
+    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 81, cat: TV, desc: "Викинги"}
+    - {id: 82, cat: TV, desc: "Салем"}
+    - {id: 83, cat: Movies, desc: "Возмущение"}
     - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
     - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
-    - {id: 11, cat: TV, desc: "11-22-63"}
-    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
-    - {id: 119, cat: TV, desc: "Алиенист"}
-    - {id: 122, cat: TV, desc: "Американская история преступлений"}
-    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
-    - {id: 115, cat: TV, desc: "Безбожники"}
-    - {id: 141, cat: TV, desc: "Безопасность"}
-    - {id: 124, cat: TV, desc: "Бельвью"}
-    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
-    - {id: 56, cat: TV, desc: "Бесстыдники"}
-    - {id: 68, cat: TV, desc: "Бесстыжие"}
-    - {id: 79, cat: TV, desc: "Бош"}
-    - {id: 138, cat: TV, desc: "В пустыне смерти"}
-    - {id: 59, cat: TV, desc: "Валландер"}
-    - {id: 204, cat: TV, desc: "Ведьмак"}
-    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
-    - {id: 129, cat: TV, desc: "Взлет"}
-    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
-    - {id: 81, cat: TV, desc: "Викинги"}
-    - {id: 164, cat: TV, desc: "Возвращение домой"}
-    - {id: 75, cat: TV, desc: "Все схвачено"}
-    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
-    - {id: 144, cat: TV, desc: "Голиаф"}
-    - {id: 77, cat: TV, desc: "Граница"}
-    - {id: 167, cat: TV, desc: "Грязный Джон"}
-    - {id: 96, cat: TV, desc: "Двойка"}
-    - {id: 40, cat: TV, desc: "Девушка по вызову"}
-    - {id: 37, cat: TV, desc: "Джек Айриш"}
-    - {id: 156, cat: TV, desc: "Джек Райан"}
-    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
-    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
-    - {id: 139, cat: TV, desc: "Дождь"}
-    - {id: 184, cat: TV, desc: "Доктор Блейк"}
-    - {id: 197, cat: TV, desc: "Западное крыло"}
-    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
-    - {id: 43, cat: TV, desc: "Игра престолов"}
-    - {id: 9, cat: TV, desc: "Иерихон"}
-    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
-    - {id: 186, cat: TV, desc: "Изгнание"}
-    - {id: 52, cat: TV, desc: "Изгой"}
-    - {id: 162, cat: TV, desc: "Изнанка дела"}
-    - {id: 130, cat: TV, desc: "Инстинкт"}
-    - {id: 175, cat: TV, desc: "Каратель"}
-    - {id: 17, cat: TV, desc: "Карточный домик"}
-    - {id: 203, cat: TV, desc: "Книга Рабов"}
-    - {id: 190, cat: TV, desc: "Кобра Кай"}
-    - {id: 147, cat: TV, desc: "Королева Сахара"}
     - {id: 86, cat: TV, desc: "Кровавая Гонка"}
-    - {id: 187, cat: TV, desc: "Крупный Город"}
-    - {id: 63, cat: TV, desc: "Куорри"}
-    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
-    - {id: 176, cat: TV, desc: "Матрёшка"}
-    - {id: 165, cat: TV, desc: "Метод Комински"}
-    - {id: 89, cat: TV, desc: "Миднайт Техас"}
-    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
-    - {id: 182, cat: TV, desc: "Мистер Посредник"}
-    - {id: 58, cat: TV, desc: "Мистер Робот"}
-    - {id: 69, cat: TV, desc: "Нарко"}
-    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
-    - {id: 155, cat: TV, desc: "Наследники"}
-    - {id: 106, cat: TV, desc: "Одаренные"}
-    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
-    - {id: 120, cat: TV, desc: "Ординатор"}
-    - {id: 47, cat: TV, desc: "Острые козырьки"}
-    - {id: 118, cat: TV, desc: "Охотник за разумом"}
-    - {id: 173, cat: TV, desc: "Парфюм"}
-    - {id: 143, cat: TV, desc: "Подлый пит"}
-    - {id: 179, cat: TV, desc: "Половое Просвещение"}
-    - {id: 110, cat: TV, desc: "Порох"}
-    - {id: 51, cat: TV, desc: "Проповедник"}
-    - {id: 169, cat: TV, desc: "Романовы"}
-    - {id: 53, cat: TV, desc: "Рэй Донован"}
-    - {id: 82, cat: TV, desc: "Салем"}
-    - {id: 116, cat: TV, desc: "Секретные Материалы"}
-    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
     - {id: 87, cat: TV, desc: "Сеньор Авила"}
-    - {id: 100, cat: TV, desc: "Смертельное оружие"}
-    - {id: 172, cat: TV, desc: "Смертельный класс"}
-    - {id: 13, cat: TV, desc: "Смерть в раю"}
-    - {id: 181, cat: TV, desc: "Сорвиголова"}
-    - {id: 185, cat: TV, desc: "Стальная Звезда"}
-    - {id: 131, cat: TV, desc: "Стартап"}
-    - {id: 140, cat: TV, desc: "Страйк"}
-    - {id: 170, cat: TV, desc: "Страна приливов"}
-    - {id: 48, cat: TV, desc: "Странная парочка"}
     - {id: 88, cat: TV, desc: "Стрелок"}
-    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
-    - {id: 112, cat: TV, desc: "Субура"}
-    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
-    - {id: 133, cat: TV, desc: "Террор"}
-    - {id: 97, cat: TV, desc: "Тик-герой"}
-    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 89, cat: TV, desc: "Миднайт Техас"}
+    - {id: 90, cat: Movies, desc: "Дангал"}
     - {id: 91, cat: TV, desc: "Утиные Истории"}
-    - {id: 121, cat: TV, desc: "Уэйко"}
-    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 96, cat: TV, desc: "Двойка"}
+    - {id: 97, cat: TV, desc: "Тик-герой"}
+    - {id: 100, cat: TV, desc: "Смертельное оружие"}
+    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
+    - {id: 102, cat: TV, desc: "Черный Список"}
+    - {id: 106, cat: TV, desc: "Одаренные"}
+    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
     - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
     - {id: 109, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 110, cat: TV, desc: "Порох"}
+    - {id: 111, cat: Movies, desc: "1922"}
+    - {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: 135, cat: Movies, 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: 15, cat: TV, desc: "Чёрные паруса"}
-    - {id: 102, cat: TV, desc: "Черный Список"}
-    - {id: 39, cat: TV, desc: "Чужестранка"}
-    - {id: 62, 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: 168, cat: Movies, 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: 179, cat: TV, desc: "Половое Просвещение"}
+    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
+    - {id: 181, 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: 189, cat: Movies, desc: "Дедвуд"}
+    - {id: 190, cat: TV, desc: "Кобра Кай"}
+    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
+    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 197, cat: TV, desc: "Западное крыло"}
+    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
+    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
+    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
+    - {id: 202, cat: Movies, desc: "Визит инспектора"}
+    - {id: 203, cat: TV, desc: "Книга Рабов"}
+    - {id: 204, cat: TV, desc: "Ведьмак"}
+    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
+    - {id: 206, cat: Movies, desc: "Брачная история"}
+    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
+    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
+    - {id: 213, cat: Movies, desc: "Борат 2"}
+    - {id: 222, cat: Movies, desc: "Траффик"}
+    - {id: 223, cat: Movies, desc: "На колёсах"}
+    - {id: 224, cat: Movies, desc: "Чудо в камере №7"}
+    - {id: 227, cat: Movies, desc: "Сначала убили моего отца"}
+    - {id: 228, cat: Movies, desc: "Айла: Дочь войны"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/fouducinema.yml

@@ -1,9 +1,9 @@
 ---
 id: fouducinema
 name: Fou-Du-Cinema
-description: "Fou-Du-Cinema (FdC) is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "Fou-Du-Cinema (FdC) is a FRENCH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: fr-fr
-type: private
+type: semi-private
 encoding: UTF-8
 links:
   - https://fou-du-cinema.net/
@@ -11,29 +11,44 @@ links:
 caps:
   categorymappings:
     # when refreshing categories dont forget to update the category case block
+    - {id: 94, cat: TV/Sport, desc: "sport catch"}
+    - {id: 93, cat: TV/Sport, desc: "sport catch"}
+    - {id: 96, cat: TV/Sport, desc: "sport sport"}
+    - {id: 97, cat: TV/Sport, desc: "sport divers"}
     - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
-    - {id: 2, cat: Movies/DVD, desc: "Film DVD"}
-    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"}
-    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
-    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
-    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
+    - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
+    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
+    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
+    - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
+    - {id: 87, cat: Movies/HD, desc: "Film REMUX"}
+    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
     - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 46, cat: TV/HD, desc: "Série 1080P"}
-    - {id: 48, cat: TV/HD, desc: "Série Bluray"}
-    - {id: 60, cat: TV/Other, desc: "Série Divers"}
-    - {id: 12, cat: TV/Other, desc: "Série DVDRip"}
-    - {id: 30, cat: TV/HD, desc: "Série 720P"}
-    - {id: 23, cat: TV/WEB-DL, desc: "Série Web"}
-    - {id: 44, cat: TV/HD, desc: "Pack Séries 1080P"}
-    - {id: 38, cat: TV/Other, desc: "Pack Séries intégrale"}
-    - {id: 41, cat: TV/WEB-DL, desc: "Pack Séries Web"}
-    - {id: 45, cat: TV/HD, desc: "Pack Séries 720P"}
-    - {id: 63, cat: TV/Other, desc: "Pack Séries Divers"}
-    - {id: 10, cat: XXX, desc: "XxX Film"}
+    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 59, cat: Movies/Other, desc: "Film Divers"}
+    - {id: 19, cat: Movies/HD, desc: "Film 720P"}
+    - {id: 17, cat: Movies/Other, desc: "Film Iso"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Film Webrip - HDrip"}
+    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray Full"}
+    - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
+    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
+    - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
+    - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
+    - {id: 60, cat: TV/Other, desc: "Serie Divers"}
+    - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 73, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
+    - {id: 30, cat: TV/HD, desc: "Serie 720P"}
+    - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
+    - {id: 44, cat: TV/HD, desc: "Pack_Series 1080P"}
+    - {id: 38, cat: TV/Other, desc: "Pack_Series intégrale"}
+    - {id: 41, cat: TV/WEB-DL, desc: "Pack_Series Web"}
+    - {id: 45, cat: TV/HD, desc: "Pack_Series 720P"}
+    - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
+    - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
+    - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
+    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
     - {id: 13, cat: PC/0day, desc: "Apps Win"}
     - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
     - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"}
@@ -143,28 +158,43 @@ search:
       selector: div.kat_cat_pic
       filters:
       case:
+        ":contains(\"sport\"):contains(\"catch\")": 94
+        ":contains(\"sport\"):contains(\"catch\")": 93
+        ":contains(\"sport\"):contains(\"sport\")": 96
+        ":contains(\"sport\"):contains(\"divers\")": 97
         ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Documentaires\"):contains(\"audio\")": 66
-        ":contains(\"Film\"):contains(\"DVD\")": 2
-        ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"Bluray\")": 15
-        ":contains(\"Film\"):contains(\"Web\")": 16
-        ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"720P\")": 19
-        ":contains(\"Film\"):contains(\"Divers\")": 59
-        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
+        ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
+        ":contains(\"Animation\"):contains(\"Séries\")": 81
+        ":contains(\"Animation\"):contains(\"Film\")": 79
+        ":contains(\"Film\"):contains(\"DVDRip\")": 2
+        ":contains(\"Film\"):contains(\"REMUX\")": 87
+        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
         ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Série\"):contains(\"1080P\")": 46
-        ":contains(\"Série\"):contains(\"Bluray\")": 48
-        ":contains(\"Série\"):contains(\"Divers\")": 60
-        ":contains(\"Série\"):contains(\"DVDRip\")": 12
-        ":contains(\"Série\"):contains(\"720P\")": 30
-        ":contains(\"Série\"):contains(\"Web\")": 23
-        ":contains(\"Séries\"):contains(\"1080P\")": 44
-        ":contains(\"Séries\"):contains(\"intégrale\")": 38
-        ":contains(\"Séries\"):contains(\"Web\")": 41
-        ":contains(\"Séries\"):contains(\"720P\")": 45
-        ":contains(\"Séries\"):contains(\"Divers\")": 63
+        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Film\"):contains(\"Divers\")": 59
+        ":contains(\"Film\"):contains(\"720P\")": 19
+        ":contains(\"Film\"):contains(\"Iso\")": 17
+        ":contains(\"Film\"):contains(\"Webrip\")": 16
+        ":contains(\"Film\"):contains(\"Bluray\")": 15
+        ":contains(\"Film\"):contains(\"1080P\")": 4
+        ":contains(\"Film\"):contains(\"UHD\")": 86
+        ":contains(\"Serie\"):contains(\"1080P\")": 46
+        ":contains(\"Serie\"):contains(\"Bluray\")": 48
+        ":contains(\"Serie\"):contains(\"Divers\")": 60
+        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
+        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 73
+        ":contains(\"Serie\"):contains(\"DVDRip\")": 12
+        ":contains(\"Serie\"):contains(\"720P\")": 30
+        ":contains(\"Serie\"):contains(\"Web\")": 23
+        ":contains(\"Pack_Series\"):contains(\"1080P\")": 44
+        ":contains(\"Pack_Series\"):contains(\"intégrale\")": 38
+        ":contains(\"Pack_Series\"):contains(\"Web\")": 41
+        ":contains(\"Pack_Series\"):contains(\"720P\")": 45
+        ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
+        ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
+        ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
         ":contains(\"XxX\"):contains(\"Film\")": 10
         ":contains(\"Apps\"):contains(\"Win\")": 13
         ":contains(\"Apps\"):contains(\"Mac\")": 14
@@ -199,6 +229,9 @@ search:
     details:
       selector: a[href^="details.php?id="]
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     download:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://www.frozen-layer.com/
+certificates:
+  - 5fc6a320560295f0d7589c9dd8738bfaed36c3aa # expired 20 December 2020
 
 settings:
   - name: category
@@ -73,7 +75,7 @@ search:
         - name: re_replace
           args: ["- Episodio ([0-9]*)", "$1"]
         - name: append
-          args: " [spanish]"
+          args: " Spanish"
     details:
       selector: td.tit a
       attribute: href

src/Jackett.Common/Definitions/fullmixmusic.yml

@@ -1,89 +0,0 @@
----
-id: fullmixmusic
-name: FullMixMusic
-description: "FullMixMusic is a HUNGARIAN Private Torrent Tracker for MUSIC"
-language: hu-hu
-type: private
-encoding: UTF-8
-links:
-  - https://fullmixmusic.org/
-legacylinks:
-  - http://fullmixmusic.org/
-
-caps:
-  categories:
-    1: Audio
-
-  modes:
-    search: [q]
-    music-search: [q, artist]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("Művelet!")
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    showsearch: 1
-    incldead: 1
-
-  rows:
-    selector: table.tablak > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: a[href^="details.php?id="][title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: ^(.*?)<br />
-    details:
-      selector: a[href^="details.php?id="][title]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="][title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: "src=\"(.*?)\">"
-    description:
-      selector: td:nth-child(2) > i > font
-    date:
-      selector: td:nth-child(6)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    grabs:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      case:
-        font[title^="Dupla feltöltésű torrent!"]: 2
-        font[title^="x3 feltöltésű torrent!"]: 3
-        font[title^="x4 feltöltésű torrent!"]: 4
-        "*": 1
-# engine tbd

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -126,4 +126,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.6
 # engine tbd

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -95,8 +95,9 @@ caps:
     book-search: [q]
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"

src/Jackett.Common/Definitions/generationfree.yml

@@ -10,112 +10,66 @@ links:
 
 caps:
   categorymappings:
-    - {id: 106, cat: TV/HD, desc: "Animation: HDTV"}
-    - {id: 108, cat: TV/WEB-DL, desc: "Animation: WEBDL"}
-    - {id: 56, cat: TV/SD, desc: "Animation: DVDRip"}
-    - {id: 109, cat: TV/WEB-DL, desc: "Animation: WEBRIP"}
-    - {id: 13, cat: TV/SD, desc: "Animation: DVD"}
-    - {id: 105, cat: TV/HD, desc: "Animation: Bluray"}
-    - {id: 10, cat: TV/HD, desc: "Animation: HD720P"}
-    - {id: 11, cat: TV/HD, desc: "Animation: HD1080P"}
+    - {id: 106, cat: TV/Anime, desc: "Animation: FR"}
+    - {id: 13, cat: TV/Anime, desc: "Animation: VO"}
     - {id: 140, cat: PC, desc: "Applications: Noel"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
-    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
-    - {id: 40, cat: PC, desc: "Applications: Linux"}
-    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
     - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
+    - {id: 17, cat: PC/Mac, desc: "Applications: Mac"}
     - {id: 18, cat: PC/0day, desc: "Applications: PC"}
+    - {id: 40, cat: PC, desc: "Applications: Linux"}
     - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
+    - {id: 38, cat: PC/Mobile-Other, desc: "Applications: Mobile Phone"}
+    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
     - {id: 67, cat: TV/Other, desc: "Autres: Emission TV"}
-    - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
     - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
-    - {id: 90, cat: Books/EBook, desc: "BD: Livres"}
-    - {id: 132, cat: TV/Documentary, desc: "Documentaires: BluRay"}
-    - {id: 133, cat: TV/Documentary, desc: "Documentaires: 4k"}
-    - {id: 134, cat: TV/Documentary, desc: "Documentaires: Vostfr"}
-    - {id: 147, cat: TV/Documentary, desc: "Documentaires: Web Dl"}
-    - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
-    - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
-    - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
+    - {id: 141, cat: TV/Other, desc: "Autres: Noel"}
+    - {id: 90, cat: Books/EBook, desc: "BD: Bande Dessinée"}
+    - {id: 76, cat: TV/Documentary, desc: "Documentaires: FR"}
     - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
+    - {id: 134, cat: TV/Documentary, desc: "Documentaires: VO"}
     - {id: 138, cat: Books/EBook, desc: "E-Books: Noel"}
     - {id: 62, cat: Audio/Audiobook, desc: "E-Books: E-Books Audio"}
-    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
-    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
-    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
     - {id: 36, cat: Books/EBook, desc: "E-Books: Livres Français"}
+    - {id: 49, cat: Books/EBook, desc: "E-Books: Manuel Anglais"}
+    - {id: 53, cat: Books/EBook, desc: "E-Books: Livre Anglais"}
+    - {id: 52, cat: Books/EBook, desc: "E-Books: Revue - Journaux"}
     - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
-    - {id: 89, cat: Movies/BluRay, desc: "Films: BD/BR Rip"}
-    - {id: 88, cat: Movies/BluRay, desc: "Films: Full BD/BR"}
-    - {id: 104, cat: Movies/BluRay, desc: "Films: Film-BDRip"}
-    - {id: 72, cat: TV/HD, desc: "Films: TVRip/HDTV"}
-    - {id: 91, cat: Movies, desc: "Films: RemuX"}
-    - {id: 94, cat: Movies/DVD, desc: "Films: DVDscreen"}
-    - {id: 96, cat: Movies/HD, desc: "Films: HDlight"}
     - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 3, cat: Movies/DVD, desc: "Films: DVDRIP"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD 720P"}
-    - {id: 131, cat: Movies/3D, desc: "Films: Remux Bluray 3D"}
-    - {id: 95, cat: Movies/BluRay, desc: "Films: bluray"}
-    - {id: 129, cat: Movies/BluRay, desc: "Films: Remux Bluray"}
-    - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEBRip"}
     - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 54, cat: Movies/HD, desc: "Films: MHD 1080P"}
-    - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"}
-    - {id: 145, cat: Movies/SD, desc: "Films: VHS"}
-    - {id: 102, cat: Movies/WEB-DL, desc: "Films: WEB-DL 720P"}
-    - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
-    - {id: 130, cat: Movies/HD, desc: "Films: HD720P"}
-    - {id: 111, cat: Movies/WEB-DL, desc: "Films: WEBRip-720P"}
-    - {id: 1, cat: Movies/UHD, desc: "Films: Remux Bluray 4K"}
-    - {id: 112, cat: Movies/WEB-DL, desc: "Films: WEBrip-1080P"}
-    - {id: 101, cat: Movies/WEB-DL, desc: "Films: WEB-DL 1080P"}
-    - {id: 87, cat: XXX, desc: "Films: XXX"}
-    - {id: 2, cat: Movies/HD, desc: "Films: HD1080P"}
-    - {id: 4, cat: Movies/DVD, desc: "Films: DVD5"}
-    - {id: 126, cat: Movies/HD, desc: "Films: HD X265"}
-    - {id: 100, cat: Movies/UHD, desc: "Films: 4KLight"}
-    - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
-    - {id: 5, cat: Movies/DVD, desc: "Films: DVD9"}
-    - {id: 128, cat: Movies/UHD, desc: "Films: Webdl 4K"}
+    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
+    - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
+    - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
+    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
+    - {id: 2, cat: Movies/HD, desc: "Films: HD"}
+    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
+    - {id: 89, cat: Movies/SD, desc: "Films: SD"}
+    - {id: 70, cat: Movies/HD, desc: "Films: X265"}
     - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
     - {id: 135, cat: Movies, desc: "Films: Noel"}
-    - {id: 59, cat: TV, desc: "Films: Spectacle"}
-    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
+    - {id: 87, cat: XXX, desc: "Films: XXX"}
+    - {id: 4, cat: Movies, desc: "Films: ISO"}
+    - {id: 151, cat: TV, desc: "Films: .Série animation"}
+    - {id: 150, cat: TV, desc: "Films: .Film série"}
     - {id: 77, cat: PC/Mobile-Other, desc: "GPS: Cartes"}
-    - {id: 125, cat: TV/Anime, desc: "Mangas: DVDRip"}
-    - {id: 124, cat: TV/Anime, desc: "Mangas: HD720P"}
-    - {id: 137, cat: Audio, desc: "Musique: Noel"}
-    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
-    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
-    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
-    - {id: 115, cat: Audio/MP3, desc: "Musique: Coffret mp3"}
-    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
-    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 75, cat: Audio, desc: "Musique: Concert TVRip"}
-    - {id: 58, cat: Audio, desc: "Musique: Concert"}
-    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
+    - {id: 78, cat: PC/Mobile-Other, desc: "GPS: Radars"}
     - {id: 97, cat: Audio, desc: "Musique: Podcast"}
+    - {id: 137, cat: Audio, desc: "Musique: Noel"}
+    - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
+    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
+    - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
     - {id: 98, cat: Audio, desc: "Musique: karaoké"}
-    - {id: 116, cat: Audio/Lossless, desc: "Musique: Coffret flac"}
-    - {id: 113, cat: TV, desc: "Serie TV: Episode QC"}
-    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
-    - {id: 74, cat: TV/HD, desc: "Serie TV: TVRip/HDTV"}
+    - {id: 58, cat: Audio, desc: "Musique: Concert"}
+    - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
+    - {id: 23, cat: Audio/Lossless, desc: "Musique: Album Flac"}
+    - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
     - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
-    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
     - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
-    - {id: 120, cat: TV/HD, desc: "Serie TV: Episode Bluray 1080p"}
+    - {id: 153, cat: TV, desc: "Serie TV: Saison VO"}
+    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
     - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
-    - {id: 122, cat: TV/HD, desc: "Serie TV: Saison Bluray 1080p"}
-    - {id: 73, cat: TV/WEB-DL, desc: "Serie TV: WEB-DL"}
-    - {id: 121, cat: TV/HD, desc: "Serie TV: Saison Bluray 720p"}
-    - {id: 119, cat: TV/HD, desc: "Serie TV: Episode Bluray 720p"}
-    - {id: 144, cat: TV/WEB-DL, desc: "Serie TV: WEB-Rip"}
     - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
-    - {id: 146, cat: TV/SD, desc: "Serie TV: VHSrip"}
-    - {id: 114, cat: TV, desc: "Serie TV: Saison QC"}
+    - {id: 12, cat: TV, desc: "Serie TV: Animation"}
+    - {id: 136, cat: TV, desc: "Serie TV: Noel"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 81, cat: TV/SD, desc: "Sorozat/SD-x264/Hun"}
+    - {id: 91, cat: Movies/UHD, desc: "4K Blu-Ray"}
     - {id: 62, cat: Movies/BluRay, desc: "Bluray Disc"}
     - {id: 80, cat: Movies/SD, desc: "CAM/Eng"}
     - {id: 79, cat: Movies/SD, desc: "CAM/Hun"}
@@ -39,6 +39,7 @@ caps:
     - {id: 85, cat: TV/HD, desc: "Sorozat HD/Eng"}
     - {id: 84, cat: TV/HD, desc: "Sorozat HD/Hun"}
     - {id: 8, cat: TV/SD, desc: "Sorozat/SD-x264/Eng"}
+    - {id: 81, cat: TV/SD, desc: "Sorozat/SD-x264/Hun"}
     - {id: 83, cat: TV/SD, desc: "Sorozat/SD-Xvid/Eng"}
     - {id: 7, cat: TV/SD, desc: "Sorozat/SD-Xvid/Hun"}
     - {id: 46, cat: XXX, desc: "XXX"}
@@ -165,6 +166,11 @@ search:
       filters:
         - name: trim
           args: "x"
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
     date:
       selector: td:nth-child(2)
       remove: a

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://vww.gktorrent.pw/
+  - https://www.gktorrent.cc/
 legacylinks:
   - https://www.gktorrent.com/
   - http://www.gktorrent.com/
@@ -30,6 +30,7 @@ legacylinks:
   - https://www.gktorrent.io/
   - https://www.gktorrent.pw/
   - https://wvw.gktorrent.pw/
+  - https://vww.gktorrent.pw/
 
 caps:
   categorymappings:
@@ -50,13 +51,6 @@ caps:
     book-search: [q]
 
 settings:
-  - name: downloadlink
-    type: select
-    label: Download link
-    default: "magnet:?xt="
-    options:
-      "get_torrent": ".torrent"
-      "magnet:?xt=": "magnet"
   - name: multilang
     type: checkbox
     label: Replace MULTI by another language in release name
@@ -78,7 +72,7 @@ settings:
     default: false
 
 download:
-  selector: a[href*="{{ .Config.downloadlink }}"]
+  selector: a[href*="magnet:?xt="]
   attribute: href
 
 search:
@@ -92,7 +86,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a)
+    selector: table.table-hover > tbody > tr:has(a[href*=torrent])
 
   fields:
     category:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.app/
-  - https://glodls.unblocked.rest/
+  - https://glotorrents.unblockit.buzz/
+  - https://glodls.unblocked.monster/
 legacylinks:
   - https://glodls.rocks/
   - https://glotorrents.unblockit.pro/
@@ -30,6 +30,11 @@ legacylinks:
   - https://gtdb.to/
   - https://glotorrents.unblockit.top/
   - https://glotorrents.unblockit.lat/
+  - https://glotorrents.unblockit.app/
+  - https://glodls.unblocked.rest/
+  - https://glotorrents.unblockit.dev/
+  - https://glotorrents.unblockit.ltd/
+  - https://glotorrents.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/greekdiamond.yml

@@ -182,4 +182,7 @@ search:
       text: 1
     minimumratio:
       text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # xbtit dt fm v20.0

src/Jackett.Common/Definitions/gtorrent.yml

@@ -10,7 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Other, desc: "Other"}
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
 
   modes:
     search: [q]
@@ -40,7 +45,11 @@ search:
 
   fields:
     category:
-      text: 1
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
     title:
       selector: div.name
     details:

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -0,0 +1,73 @@
+---
+id: gtorrentpro
+name: GTorrent.pro
+description: "GTorrent.pro is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-ru
+type: public
+encoding: windows-1251
+links:
+  - http://gtorrent.pro/
+
+caps:
+  categorymappings:
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selector: a[href^="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.blog_brief_news:not(div.first_line):not(:has(div.uploaded:empty))
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: div.name
+    details:
+      selector: div.name a
+      attribute: href
+    download:
+      selector: div.name a
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: div:nth-child(2)
+    seeders:
+      selector: div.uploaded
+    leechers:
+      selector: div.download
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/hachede.yml

@@ -1,305 +0,0 @@
----
-id: hachede
-name: HacheDe
-description: "HacheDe is a SPANISH site for HD content"
-language: es-es
-type: private
-encoding: UTF-8
-links:
-  - https://hachede.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 46, cat: Movies/3D, desc: "Películas 3D"}
-    - {id: 52, cat: Movies/BluRay, desc: "Películas Full Bluray"}
-    - {id: 33, cat: Movies/BluRay, desc: "Películas BDRemux"}
-    - {id: 120, cat: Movies/BluRay, desc: "Películas JMBD"}
-    - {id: 34, cat: Movies/HD, desc: "Películas BDrip 1080p"}
-    - {id: 99, cat: Movies/HD, desc: "Películas BDrip 720p"}
-    - {id: 140, cat: Movies/WEB-DL, desc: "Películas WEB-DL AMAZON"}
-    - {id: 141, cat: Movies/WEB-DL, desc: "Películas WEB-DL APPLE TV+"}
-    - {id: 142, cat: Movies/WEB-DL, desc: "Películas WEB-DL HBO"}
-    - {id: 143, cat: Movies/WEB-DL, desc: "Películas WEB-DL NETFLIX"}
-    - {id: 37, cat: Movies/Other, desc: "Películas HDTVrip"}
-    - {id: 119, cat: Movies/HD, desc: "Películas HDiTunes"}
-    - {id: 84, cat: Movies/HD, desc: "Películas MicroHD 1080p"}
-    - {id: 100, cat: Movies/HD, desc: "Películas MicroHD 720p"}
-    - {id: 16, cat: TV/HD, desc: "Series"}
-    - {id: 133, cat: TV/HD, desc: "Series WEB-DL AMAZON"}
-    - {id: 134, cat: TV/HD, desc: "Series WEB-DL HBO"}
-    - {id: 135, cat: TV/HD, desc: "Series WEB-DL NETFLIX"}
-    - {id: 136, cat: TV/HD, desc: "Series WEB-DL STARZ"}
-    - {id: 137, cat: TV/HD, desc: "Series WEB-DL DISNEY PLUS"}
-    - {id: 139, cat: TV/HD, desc: "Series WEB-DL APPLE TV+"}
-    - {id: 44, cat: TV/Other, desc: "Series HDTVrip"}
-    - {id: 144, cat: TV/HD, desc: "Series WEB-DL ATRESPLAYER PREMIUM"}
-    - {id: 89, cat: TV/HD, desc: "Series HDiTunes"}
-    - {id: 57, cat: TV/HD, desc: "Series Full Bluray"}
-    - {id: 40, cat: TV/HD, desc: "Series BDRemux"}
-    - {id: 121, cat: TV/HD, desc: "Series JMBD"}
-    - {id: 41, cat: TV/HD, desc: "Series BDrip 1080p"}
-    - {id: 101, cat: TV/HD, desc: "Series BDrip 720p"}
-    - {id: 45, cat: TV/HD, desc: "Series MicroHD 1080p"}
-    - {id: 102, cat: TV/HD, desc: "Series MicroHD 720p"}
-    - {id: 90, cat: Movies, desc: "Animación"}
-    - {id: 91, cat: Movies/3D, desc: "Animación 3D"}
-    - {id: 92, cat: Movies/BluRay, desc: "Animación Full Bluray"}
-    - {id: 93, cat: Movies/HD, desc: "Animación BDrip 1080p"}
-    - {id: 104, cat: Movies/HD, desc: "Animación BDrip 720p"}
-    - {id: 94, cat: Movies/BluRay, desc: "Animación BDRemux"}
-    - {id: 123, cat: Movies/BluRay, desc: "Animación JMBD"}
-    - {id: 96, cat: Movies/Other, desc: "Animación HDTVrip"}
-    - {id: 98, cat: Movies/HD, desc: "Animación MicroHD 1080p"}
-    - {id: 105, cat: Movies/HD, desc: "Animación MicroHD 720p"}
-    - {id: 32, cat: Movies, desc: "Documentales"}
-    - {id: 53, cat: Movies/BluRay, desc: "Documentales Full Bluray"}
-    - {id: 59, cat: Movies/3D, desc: "Documentales 3D"}
-    - {id: 64, cat: Movies/BluRay, desc: "Documentales BDremux"}
-    - {id: 138, cat: Movies/WEB-DL, desc: "Documentales WEB-DL"}
-    - {id: 122, cat: Movies/BluRay, desc: "Documentales JMBD"}
-    - {id: 68, cat: Movies/HD, desc: "Documentales BDrip 1080p"}
-    - {id: 106, cat: Movies/HD, desc: "Documentales BDrip 720p"}
-    - {id: 80, cat: Movies/Other, desc: "Documentales HDTVrip"}
-    - {id: 85, cat: Movies/HD, desc: "Documentales MicroHD 1080p"}
-    - {id: 107, cat: Movies/HD, desc: "Documentales MicroHD 720p"}
-    - {id: 114, cat: TV, desc: "TV"}
-    - {id: 115, cat: TV/Other, desc: "TV HDTVrip 1080p"}
-    - {id: 116, cat: TV/Other, desc: "TV HDTVrip 720p"}
-    - {id: 50, cat: Other, desc: "Deportes"}
-    - {id: 55, cat: Other/Misc, desc: "Deportes Full Bluray"}
-    - {id: 60, cat: Other/Misc, desc: "Deportes 3D"}
-    - {id: 65, cat: Other/Misc, desc: "Deportes BDremux"}
-    - {id: 69, cat: Other/Misc, desc: "Deportes BDrip 1080p"}
-    - {id: 108, cat: Other/Misc, desc: "Deportes BDrip 720p"}
-    - {id: 81, cat: Other/Misc, desc: "Deportes HDTVrip"}
-    - {id: 86, cat: Other/Misc, desc: "Deportes MicroHD 1080p"}
-    - {id: 109, cat: Other/Misc, desc: "Deportes MicroHD 720p"}
-    - {id: 51, cat: Movies, desc: "Conciertos"}
-    - {id: 56, cat: Movies/BluRay, desc: "Conciertos Full Bluray"}
-    - {id: 61, cat: Movies/3D, desc: "Conciertos 3D"}
-    - {id: 66, cat: Movies/HD, desc: "Conciertos BDremux"}
-    - {id: 70, cat: Movies/HD, desc: "Conciertos BDrip 1080p"}
-    - {id: 110, cat: Movies/HD, desc: "Conciertos BDrip 720p"}
-    - {id: 82, cat: Movies/Other, desc: "Conciertos HDTVrip"}
-    - {id: 87, cat: Movies/HD, desc: "Conciertos MicroHD 1080p"}
-    - {id: 111, cat: Movies/HD, desc: "Conciertos MicroHD 720p"}
-    - {id: 49, cat: XXX, desc: "Adultos"}
-    - {id: 54, cat: XXX/x264, desc: "Adultos Full Bluray"}
-    - {id: 62, cat: XXX/x264, desc: "Adultos 3D"}
-    - {id: 67, cat: XXX/x264, desc: "Adultos BDremux"}
-    - {id: 71, cat: XXX/x264, desc: "Adultos BDrip 1080p"}
-    - {id: 112, cat: XXX/x264, desc: "Adultos BDrip 720p"}
-    - {id: 83, cat: XXX/XviD, desc: "Adultos HDTVrip"}
-    - {id: 88, cat: XXX/x264, desc: "Adultos MicroHD 1080p"}
-    - {id: 113, cat: XXX/x264, desc: "Adultos MicroHD 720p"}
-    - {id: 124, cat: Movies, desc: "H265"}
-    - {id: 126, cat: Movies/HD, desc: "H265 Peliculas"}
-    - {id: 127, cat: TV/HD, desc: "H265 Series"}
-    - {id: 130, cat: Movies/3D, desc: "H265 3D"}
-    - {id: 128, cat: Movies/HD, desc: "H265 Animación"}
-    - {id: 129, cat: Movies/HD, desc: "H265 Documentales"}
-    - {id: 125, cat: Movies/UHD, desc: "UHD"}
-    - {id: 131, cat: Movies/UHD, desc: "UHD Películas"}
-    - {id: 132, cat: TV/UHD, desc: "UHD Series"}
-
-  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 with 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 (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: ?p=home&pid=1
-    selector: div#member_info_bar
-
-search:
-  path: /
-  keywordsfilters:
-    - name: re_replace
-      args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-  inputs:
-    p: torrents
-    page: 1
-    pid: 10
-    $raw: "{{ range .Categories }}&cid[]={{.}}{{end}}"
-    keywords: "{{ .Keywords }}"
-    # name description both uploader
-    search_type: name
-    "sortOptions[sortBy]": "{{ .Config.sort }}"
-    "sortOptions[sortOrder]": "{{ .Config.type }}"
-
-  rows:
-    selector: "table#torrents_table_classic > tbody > tr:not(:first-child), .torrent-box[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: td.torrent_image div.category_image a, .categoryImage a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cid
-    title:
-      selector: td.torrent_name > a, .newIndicator > a
-      filters:
-        - name: re_replace
-          args: ["(?i)full", "BRDISK."] # FULL(BR/UHD) -> BRDISK
-        - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
-        - name: append
-          args: ".Spanish-HacheDe"
-        - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
-        - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: [".BR.", ".BDRip."] # Fix for Radarr
-        - name: re_replace
-          args: ["(?i)m720p", "MicroHD.720p"] # Fix for Radarr
-        - name: re_replace
-          args: ["(?i)m1080p", "MicroHD.1080p"] # Fix for Radarr
-    details:
-      selector: td.torrent_name > a, .newIndicator > a
-      attribute: href
-    download:
-      selector: .torrentImages > span:first-child a
-      attribute: href
-    poster:
-      selector: td.torrent_image div.relativeDiv div:not(.category_image) a, .previewImage a
-      attribute: href
-    imdb:
-      selector: .torrentFlags a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: td.torrent_name:contains("Subido"):contains("-"), .torrentOwner:contains("Subido"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Subido )(.*)(?= por)"
-        - name: replace
-          args: [": ", ":"]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    date:
-      selector: td.torrent_name:contains("Subido"):not(:contains("-")), .torrentOwner:contains("Subido"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Subido )(.*)(?= por)"
-        - name: replace
-          args: [": ", ":"]
-        - name: replace
-          args: ["Ayer a las", "Yesterday"]
-        - name: replace
-          args: ["Hoy en", "Today"]
-        - name: replace
-          args: ["Lunes a las", "Monday at"]
-        - name: replace
-          args: ["Martes a las", "Tuesday at"]
-        - name: replace
-          args: ["Miércoles a las", "Wednesday at"]
-        - name: replace
-          args: ["Jueves a las", "Thursday at"]
-        - name: replace
-          args: ["Viernes a las", "Friday at"]
-        - name: replace # WTF?
-          args: ["Friday a las", "Friday at"]
-        - name: replace
-          args: ["Sábado a las", "Saturday at"]
-        - name: replace
-          args: ["Domingo a las", "Sunday at"]
-        - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    date:
-      selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    date:
-      selector: td.torrent_name:contains("Uploaded"):not(:contains("-")), .torrentOwner:contains("Uploaded"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: replace
-          args: ["Yesterday at", "Yesterday"]
-        - name: replace
-          args: ["Today at", "Today"]
-        - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    size:
-      selector: td.size a, .torrentInfo a[rel="torrent_size"]
-    grabs:
-      selector: td.completed a, .torrentInfo a[rel="times_completed"]
-    seeders:
-      selector: td.seeders a, .torrentInfo a[rel="torrent_seeders"]
-    leechers:
-      selector: td.leechers a, .torrentInfo a[rel="torrent_leechers"]
-    downloadvolumefactor:
-      text: 1
-    downloadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_free.png"]
-      attribute: title
-      filters:
-        - name: replace
-          args: ["FREE LEECH!", "0"]
-    downloadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_multiple_download.png"]
-      attribute: title
-      filters:
-        - name: split
-          args: [":", 1]
-        - name: trim
-    uploadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_multiple_upload.png"]
-      attribute: title
-      filters:
-        - name: split
-          args: [":", 1]
-        - name: trim
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      text: 259200 # 3 day (72h)
-# TSUE 2.2

src/Jackett.Common/Definitions/haidan.yml

@@ -104,7 +104,7 @@ search:
     # supports search using imdbid, does not return imdb links in results
 
   rows:
-    selector: div.group_content
+    selector: div.group_content:has(a[href^="download.php?id="])
 
   fields:
     category:
@@ -177,4 +177,6 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.0
 # NexusPHP Standard v1.5 Beta 4 customised

src/Jackett.Common/Definitions/hdatmos.yml

@@ -1,12 +1,12 @@
 ---
-id: hddisk
-name: HDDisk
-description: "HDDisk (HDD) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hdatmos
+name: HDAtmos
+description: "HDAtmos is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: zh-cn
 type: private
 encoding: UTF-8
 links:
-  - https://hddisk.life/
+  - https://hdatmos.club/
 
 caps:
   categorymappings:
@@ -14,19 +14,20 @@ caps:
     - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
     - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
     - {id: 402, cat: TV, desc: "TV Series/电视剧"}
-    - {id: 422, cat: Console, desc: "Games/游戏"}
+    - {id: 422, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 423, cat: TV, desc: "TV Shows/综艺"}
     - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV演唱会"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 409, cat: PC, desc: "Software/软件"}
+    - {id: 409, cat: PC/0day, desc: "Software/软件"}
+    - {id: 424, cat: Other, desc: "Misc/其他"}
     - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
-    - {id: 423, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 424, cat: Other, desc: "Other/其他"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -39,6 +40,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -55,10 +60,6 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
@@ -74,10 +75,11 @@ login:
     logout: ""
     securelogin: ""
     ssl: yes
-    trackerssl: yes
+    trackerssl: ""
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
+      message:
+        selector: td.text
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -168,4 +170,6 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
+    minimumratio:
+      text: 0.81
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdcity.yml

@@ -172,7 +172,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " [English]"
+          args: " English"
         - name: re_replace
           args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
         - name: re_replace
@@ -184,7 +184,7 @@ search:
       optional: true
       filters:
         - name: append
-          args: " [Spanish]"
+          args: " Spanish"
         - name: re_replace
           args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
         - name: re_replace

src/Jackett.Common/Definitions/hddolby.yml

@@ -47,6 +47,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -143,6 +147,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.2
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, img