thesceneplace: fix freeleech row selector. resolves #11691

also add 2x > 10x uploadvolumefactor cases

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,8 @@
+### Read and complete in full with information about your setup and issue before submitting.
+### Do not delete the template.
+
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue.
-Check closed issues as well, because your issue may have already been fixed.
+Check closed issues as well, because your issue may have already been fixed. Also check our [Troubleshooting](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for steps to resolve common issues.
 
 Please read our [Contributing Guidelines](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md) before submitting your issue to ensure a prompt response to your bug.
 

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,13 +39,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BigFANGroup
  * BitRu
  * BT.etree
+ * BT4G
  * BTDB
  * BTDIGG
  * BTSOW
  * Byrutor
  * CiliPro (LIAORENCILI)
+ * comicat
  * ConCen
- * Corsaro.red
  * cpasbien
  * cpasbienClone
  * Demonoid
@@ -54,9 +54,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * E-Hentai
  * emtrek
  * Epizod
+ * Erai-Raws
  * ETTV
  * EXT Torrents
  * ExtraTorrent.cd
+ * ExtraTorrent.it
  * EZTV
  * Filebase
  * FireBit
@@ -65,7 +67,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,8 +76,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * KickAssTorrent (KATcr)
- * kickasstorrents (kickass.ws)
+ * kickasstorrents.ws
  * kickasstorrents.to
  * Legit Torrents
  * LePorno.info
@@ -82,12 +84,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
@@ -96,6 +97,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
@@ -107,6 +109,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLive
  * PornoRip
  * PornoTor
+ * Portugas
  * ProPorn
  * ProStyleX
  * Rapidzona
@@ -121,42 +124,44 @@ 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)
+ * 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 (토렌트뷰)
- * Torrentz2
- * Torrentz2k
+ * TorrentWhiz ( 토렌트위즈)
  * truPornolabs
  * Underverse
  * UnionDHT
  * VSTHouse
  * VST Torrents
- * XFSUB
  * xxxAdultTorrent
  * xxxtor
  * xxxtorrents
@@ -169,12 +174,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)
@@ -183,14 +189,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Erzsebet
  * Erzsebet.pl
  * ExKinoRay
- * ExtremlymTorrents (XTR)
  * Genesis-Movement
  * HamsterStudio
+ * HunTorrent
  * IV-Torrents
  * KinoNaVse100
  * Kinorun
  * Kinozal
- * Korsar
  * LostFilm.tv
  * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
  * MVGroup Forum
@@ -210,6 +215,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
@@ -226,30 +232,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
@@ -258,7 +264,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
@@ -275,7 +280,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
@@ -286,18 +290,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
@@ -310,23 +315,20 @@ 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
- * Elite-Tracker
  * Empornium (EMP)
  * 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
@@ -335,10 +337,8 @@ 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]](#)
  * Fuzer (FZ)
  * GFXPeers
  * Galeriens (LaPauseTorrents)
@@ -353,7 +353,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)
@@ -364,17 +363,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]](#)
@@ -383,10 +381,8 @@ 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]](#)
- * ICE Torrent
  * IPTorrents (IPT)
  * ImmortalSeed (iS)
  * Immortuos
@@ -400,7 +396,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
@@ -409,6 +405,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LosslessClub
  * M-Team TP (MTTP)
  * MaDs Revolution
+ * magic-heaven
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
  * MeseVilág (Fairytale World)
@@ -418,7 +415,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]](#)
@@ -426,12 +422,11 @@ 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
+ * Nordic+
+ * Oasis
  * oMg[WtF]trackr
- * OnlineSelfEducation
- * ONLYscene
+ * OpenCD
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -449,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
@@ -465,13 +461,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
+ * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RetroFlix
  * RevolutionTT
+ * ROFD
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
  * RPTorrents
- * SceneFZ
  * SceneHD
  * ScenePalace (SP)
  * SceneRush
@@ -479,14 +476,12 @@ 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]](#)
  * SiamBIT
  * SnowPT (SSPT)
  * SoulVoice [![(invite needed)][inviteneeded]](#)
- * SpaceTorrent
+ * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
  * Speedmaster HD
  * SpeedTorrent Reloaded
@@ -494,15 +489,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)
@@ -514,6 +509,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)
@@ -538,6 +535,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
@@ -563,9 +561,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * XWT-Classics
  * XWTorrents (XWT)
  * Xthor
- * XtreMeZone (MYXZ)
  * YDYPT
- * YingK
  * Zamunda.net
  * Zelka.org
  * ZonaQ
@@ -594,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.
 
@@ -683,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:
 ```
@@ -707,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
@@ -732,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
@@ -763,13 +771,15 @@ 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)
-* Right-click on the Jackett solution and click 'Rebuild Solution' to restore NuGet packages
-* Select Jackett.Server as the startup project
-* In the drop-down menu of the run button select "Jackett.Server" instead of "IIS Express"
+* Open PowerShell and from the `src` directory:
+* - run `dotnet msbuild /restore`
+* - then run `dotnet restore`
+* - and run `dotnet build`
+* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
+* Select **Jackett.Server** as the startup project
+* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
 * Build/Start the project
 
 ### OSX
@@ -783,21 +793,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,22 @@ 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 --fix-whitespace --verbosity diagnostic --folder ./src/DateTimeRoutines
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Common
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Server
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Service
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Test
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Tray
+                dotnet-format --fix-whitespace --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 +362,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 +464,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

nuget.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

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_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}}
@@ -362,7 +375,12 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="6"></td>
+                        <th>Indexer</th>
+                        <th>Categories</th>
+                        <th>Type</th>
+                        <th>Type string</th>
+                        <th>Language</th>
+                        <th></th>
                     </tr>
                 </tfoot>
             </table>
@@ -680,6 +698,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=20210424"></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/0daykiev.yml

@@ -99,7 +99,7 @@ search:
     - name: re_replace # S01E01 to Сезон 1 Серии 1
       args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver
     incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"

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.onl/
+  - https://1337x.nocensor.space/
 legacylinks:
   - https://1337x.unblocked.earth/
   - https://1337x.unblockit.pro/
@@ -36,6 +35,15 @@ 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/
+  - https://1337x.unblockit.buzz/
+  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.club/
 
 caps:
   categorymappings:
@@ -134,8 +142,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 +186,7 @@ search:
       selector: td[class^="coll-1"] a[href^="/torrent/"]
       attribute: href
       filters:
+        - name: urldecode
         - name: split
           args: ["/", 3]
     title:
@@ -187,11 +194,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/2fast4you.yml

@@ -149,7 +149,7 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 incldead, 2 onlydead
     incldead: 1

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,15 +72,16 @@ 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
 
 search:
   path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 1
 
@@ -119,8 +123,8 @@ search:
       selector: .tablea tr:nth-child(2) td:nth-child(2) b:nth-child(3) font
     downloadvolumefactor:
       case:
-        img[src="pic/oupic.gif"]: "0"
-        "*": "1"
+        img[src="pic/oupic.gif"]: 0
+        "*": 1
     uploadvolumefactor:
       text: 1
 # engine tbd

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
 
@@ -114,7 +105,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # title, descr
     searchin: title

src/Jackett.Common/Definitions/acidlounge.yml

@@ -81,7 +81,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}cid[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
     search_type: title
 

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

@@ -166,7 +166,7 @@ search:
     order: "{{ .Config.type }}"
   # torrents-search.php does not support imdbid search or return imdb links.
   keywordsfilters:
-  # drop the year from searches since site titles do not include year
+    # drop the year from searches since site titles do not include year
     - name: re_replace
       args: ["(19|20[0-9]{2})", ""]
 
@@ -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: 0
+    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:
@@ -69,7 +71,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 0
     orderby: added

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/arabp2p.yml

@@ -47,7 +47,7 @@ caps:
     - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
     - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"}
+    - {id: 110, cat: TV, desc: "رمضان 2021 (Ramadan 2021)"}
     # المرئيات الاجنبية Foreign Movies
     - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}

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,18 @@ 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.onl/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
+  - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
+  - https://audiobookbay.unblockit.ltd/
+  - https://audiobookbay.unblockit.link/
+  - https://audiobookbay.unblockit.buzz/
+  - https://audiobookbay.unblockit.club/
 
 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/beyond-hd-oneurl.yml

@@ -64,8 +64,7 @@ search:
     qty: 100
 
   rows:
-    selector: div.table-torrents > table > tbody > tr
-    after: 1
+    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
 
   fields:
     _category:
@@ -79,18 +78,12 @@ search:
       text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
     title:
       selector: a.torrent-name
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
     details:
       selector: a.torrent-name
       attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/img/person.png", ""]
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
     date:
       selector: td:not(a[href$="/history"]) span.text-orange
       filters:

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

@@ -84,8 +84,7 @@ search:
     qty: 100
 
   rows:
-    selector: div.table-torrents > table > tbody > tr
-    after: 1
+    selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
 
   fields:
     _category:
@@ -99,18 +98,12 @@ search:
       text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
     title:
       selector: a.torrent-name
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
     details:
       selector: a.torrent-name
       attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/img/person.png", ""]
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
     date:
       selector: td:not(a[href$="/history"]) span.text-orange
       filters:

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/bigtorrent.yml

@@ -67,7 +67,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}  {{ end }}"
 
   rows:

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,101 @@ 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
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
+      selector: td.size
     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,35 +6,36 @@ 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:
     - {id: 1, cat: Movies/UHD, desc: "UHD"}
-    - {id: 2, cat: Movies/HD, desc: "BluRay"}
-    - {id: 8, cat: Movies/HD, desc: "TV"}
-    - {id: 6, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 16, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 3, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 25, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 4, cat: Movies/HD, desc: "BluRay"}
-    - {id: 7, cat: Movies/HD, desc: "TV"}
-    - {id: 5, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 14, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 27, cat: Movies/HD, desc: "LORD Rips"}
+    - {id: 2, cat: Movies/UHD, desc: "UHD - BluRay"}
+    - {id: 8, cat: Movies/UHD, desc: "UHD - TV"}
+    - {id: 6, cat: Movies/UHD, desc: "UHD - WEB-DL"}
+    - {id: 16, cat: Movies/UHD, desc: "UHD - WEBRip"}
+    - {id: 31, cat: Movies/BluRay, desc: "BluRay Disk"}
+    - {id: 3, cat: Movies/HD, desc: "HD"}
+    - {id: 25, cat: Movies/3D, desc: "HD - 3D"}
+    - {id: 4, cat: Movies/HD, desc: "HD - BluRay"}
+    - {id: 7, cat: Movies/HD, desc: "HD - TV"}
+    - {id: 5, cat: Movies/HD, desc: "HD - WEB-DL"}
+    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
+    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
     - {id: 9, cat: Movies/SD, desc: "SD"}
-    - {id: 23, cat: Movies/SD, desc: "BluRay"}
-    - {id: 10, cat: Movies/SD, desc: "DVD"}
-    - {id: 12, cat: Movies/SD, desc: "TV"}
-    - {id: 13, cat: Movies/SD, desc: "WEB-DL"}
-    - {id: 15, cat: Movies/SD, desc: "WEBRip"}
+    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
+    - {id: 10, cat: Movies/SD, desc: "SD - DVD"}
+    - {id: 36, cat: Movies/SD, desc: "SD - DVDRip"}
+    - {id: 12, cat: Movies/SD, desc: "SD - TV"}
+    - {id: 13, cat: Movies/SD, desc: "SD - WEB-DL"}
+    - {id: 15, cat: Movies/SD, desc: "SD - WEBRip"}
     - {id: 17, cat: TV, desc: "TV"}
-    - {id: 26, cat: TV/Other, desc: "TV Program"}
-    - {id: 19, cat: TV, desc: "Yabanci Dizi"}
-    - {id: 18, cat: TV, desc: "Yerli Dizi"}
-    - {id: 20, cat: Movies/HD, desc: "VIP"}
+    - {id: 26, cat: TV/Other, desc: "TV - TV Program"}
+    - {id: 19, cat: TV, desc: "TV - Yabanci Dizi"}
+    - {id: 18, cat: TV, desc: "TV - Yerli Dizi"}
 
   modes:
     search: [q]
@@ -123,4 +124,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.onl/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -29,6 +30,12 @@ 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/
+  - https://btdb.unblockit.buzz/
+  - https://btdb.unblockit.club/
 
 caps:
   categories:
@@ -42,6 +49,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 +99,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
@@ -58,7 +62,7 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 justdead
     incldead: 0
     # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%
@@ -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.work/
+  - https://btsow.digital
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -20,6 +20,11 @@ legacylinks:
   - https://btsow.casa/
   - https://btsow.website/
   - https://btsow.online/
+  - https://btsow.work/
+  - https://btsow.store/
+  - https://btsow.surf/
+  - https://btsow.com/
+  - https://btsow.cam/
 
 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,17 @@ 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: 218, cat: TV, desc: "TV-Ishara 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 +88,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 +99,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/byrutor.yml

@@ -262,10 +262,10 @@ download:
   attribute: href
 
 search:
-  # keywords (any age posts, article titles only search)
+  # keywords (article titles only search)
   # do=search&subaction=search&story=five+freddy&titleonly=3&searchdate=0&sortby=date&resorder=desc&catlist[]=1&catlist[]=2&catlist[]=3
-  # keywordless (1 day old posts or newer + article body search) query=game
-  # do=search&subaction=search&story=game&titleonly=0&searchdate=1&sortby=date&resorder=desc&catlist[]=0
+  # keywordless (article body search) query=game
+  # do=search&subaction=search&story=game&titleonly=0&searchdate=0&sortby=date&resorder=desc&catlist[]=0
   paths:
     - path: index.php
   inputs:
@@ -278,7 +278,7 @@ search:
     showposts: 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 }}"
+    searchdate: 0
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
     sortby: date
     resorder: desc

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/cilipro.yml

@@ -6,20 +6,9 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - http://www.cilipro1.xyz/
-  - http://www.cilipro2.xyz/
-  - http://www.cilipro3.xyz/
-  - http://www.cilipro4.xyz/
-  - http://www.cilipro5.xyz/
-  - http://www.cilipro6.xyz/
-  - http://www.cilipro7.xyz/
-  - http://www.cilipro8.xyz/
-  - http://www.cilipro9.xyz/
-  - http://www.cilipro10.xyz/
   - http://www.cilinb1.xyz/
   - http://www.cilinb2.xyz/
   - http://www.cilinb3.xyz/
-  - http://www.cilinb4.xyz/
   - http://www.cilinb5.xyz/
   - http://www.cilinb6.xyz/
   - http://www.cilinb7.xyz/
@@ -80,6 +69,17 @@ legacylinks:
   - http://www.lrsoso9.xyz/
   - http://www.lrsoso10.xyz/
   - http://www.cilijj.xyz/
+  - http://www.cilipro1.xyz/
+  - http://www.cilipro2.xyz/
+  - http://www.cilipro3.xyz/
+  - http://www.cilipro4.xyz/
+  - http://www.cilipro5.xyz/
+  - http://www.cilipro6.xyz/
+  - http://www.cilipro7.xyz/
+  - http://www.cilipro8.xyz/
+  - http://www.cilipro9.xyz/
+  - http://www.cilipro10.xyz/
+  - http://www.cilinb4.xyz/
 
 caps:
   categories:

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/cinematik.yml

@@ -74,7 +74,7 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Query.Keywords }}"
     incldead: "{{ .Config.incldead }}"
     srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"

src/Jackett.Common/Definitions/classix.yml

@@ -35,7 +35,7 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
 
   rows:

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/comicat.yml

@@ -0,0 +1,102 @@
+---
+id: comicat
+name: comicat
+description: "comicat is a CHINESE Public tracker for Anime / Hentai / Manga"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  - https://www.comicat.org/
+
+settings: []
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "动画(Anime)"}
+    - {id: 2, cat: Books/Comics, desc: "漫画(Manga)"}
+    - {id: 3, cat: Audio, desc: "音乐(Music)"}
+    - {id: 4, cat: TV/Anime, desc: "周边(Peripheral)"}
+    - {id: 5, cat: Other, desc: "其它(Other)"}
+    - {id: 6, cat: TV/Anime, desc: "Raw"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+search:
+  paths:
+    # https://www.comicat.org/ (latest)
+    # https://www.comicat.org/search.php?keyword=720p+2020 (search)
+    # sort_id: filters by a single category, multi cats is not supported so we cannot use it.
+    - path: "{{ if .Keywords }}/search.php?keyword={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}/search.php?keyword={{ .Keywords }}&page=2{{ else }}2.html{{ end }}"
+
+  rows:
+    selector: tr[class^="alt"]:has(a[href^="sort"])
+
+  fields:
+    category:
+      selector: a[href^="sort"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "-(\\d)-"
+    title:
+      selector: a[href^="show"]
+    details:
+      selector: a[href^="show"]
+      attribute: href
+    infohash:
+      selector: a[href^="show"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "-(\\w+).html"
+    size:
+      selector: td:nth-child(4)
+    grabs:
+      selector: td:nth-child(7) span
+    date:
+      selector: td:nth-child(1):contains("/")
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST (China)
+        - name: dateparse
+          args: "2006/01/02 -07:00"
+    date:
+      selector: td:nth-child(1):contains("今天")
+      optional: true
+      filters:
+        - name: replace
+          args: ["今天", ""]
+        - name: append
+          args: " +08:00" # CST (China)
+        - name: timeparse
+          args: "15:04 -07:00"
+    date:
+      selector: td:nth-child(1):contains("昨天")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".+", "yesterday"]
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(1):contains("前天")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".+", "2 days"]
+        - name: timeago
+    seeders:
+      selector: td:nth-child(5) span
+    leechers:
+      selector: td:nth-child(6) span
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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,10 +119,8 @@ 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: ["&w=52&h=80", "&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", ""]
     size:
@@ -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

@@ -6,9 +6,9 @@ language: ro-ro
 type: private
 encoding: windows-1252
 links:
-  - https://datascene.net/
-legacylinks:
   - http://datascene.net/
+legacylinks:
+  - https://datascene.net/
 
 caps:
   categorymappings:
@@ -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,9 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.app/
+  - https://demonoid.unblockit.onl/
+  - https://demonoid.torrentbay.to/
+  - https://demonoid.nocensor.space/
 legacylinks:
   - https://demonoid.unblockit.pro/
   - https://demonoid.unblockit.one/
@@ -25,6 +27,12 @@ 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/
+  - https://demonoid.unblockit.buzz/
+  - https://demonoid.unblockit.club/
 
 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/diablotorrent.yml

@@ -79,7 +79,7 @@ search:
   paths:
     - path: browse
   inputs:
-    $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
     s_alapjan: 7
     s_sorrend: desc

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"}
@@ -314,7 +315,7 @@ search:
   paths:
     - path: torrents-search.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ if .Keywords }}\"{{ .Keywords }}\"{{ else }}{{ end }}"
     # 0 only active 1 incl dead 2 only dead
     incldead: 0

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:
@@ -93,7 +96,7 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     searchtext: ""
     title: "{{ .Keywords }}"
     order_by: time
@@ -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:
@@ -89,7 +92,7 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     searchtext: ""
     title: "{{ .Keywords }}"
     order_by: time
@@ -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/emtrek.yml

@@ -10,6 +10,7 @@ links:
 
 caps:
   categorymappings:
+    # when refreshing categories remember to use the list on the tracker.php page and not the search.php page.
     # Игры для PC (pc games)
     - {id: 317, cat: PC/Games, desc: "Игры для Linux"}
     - {id: 174, cat: PC/Games, desc: " |- Патчи"}
@@ -192,6 +193,9 @@ caps:
     - {id: 121, cat: Other, desc: "Обои / Рисунки / Картинки"}
     # Корзина (other)
     - {id: 2, cat: Other, desc: "Для пробных раздач"}
+    # the following forums are not in the tracker pull down list.
+    # Архив (archive)
+    - {id: 20, cat: Other, desc: "Архив"}
 
   modes:
     search: [q]

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/erzsebet.yml

@@ -51,6 +51,7 @@ caps:
     - {id: 178, cat: XXX, desc: "Erotic Video Library / Эротические студии (видео)"}
     - {id: 85, cat: XXX, desc: "Adult Games / Порноигры"}
     - {id: 83, cat: XXX, desc: "Hentai, Manga & Cartoons  / Хентай, Манга и Мультфильм..."}
+    - {id: 252, cat: XXX, desc: "Chinese Porn / Китайское порно"}
     - {id: 89, cat: XXX, desc: "Japanese Porn / Японское порно"}
     - {id: 188, cat: XXX, desc: "Erotic Movies, Documentary & Reality / Эротически..."}
     - {id: 219, cat: XXX, desc: "Cinema / Зарубежный Кинематограф"}
@@ -62,7 +63,9 @@ caps:
     - {id: 213, cat: XXX, desc: "Music (Video) / Музыка (Видео)"}
     - {id: 212, cat: XXX, desc: "Games / Игры"}
     - {id: 211, cat: XXX, desc: "Soft / Софт"}
+    - {id: 251, cat: XXX, desc: "International Releases  / Иностранные релизы"}
     - {id: 210, cat: XXX, desc: "Various / Разное"}
+    - {id: 250, cat: XXX, desc: "Cinema (LGBT) / Кинематограф (ЛГБТ)"}
     - {id: 205, cat: XXX, desc: "Shemale Transsexual / Транссексуалы"}
     - {id: 204, cat: XXX, desc: "Bisexual / Бисексуалы"}
     - {id: 206, cat: XXX, desc: "Gay Clips & Movie Scenes / Ролики, SiteRip'ы..."}

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.onl/
+  - https://ettv.nocensor.space/
 legacylinks:
   - https://www.ettv.tv/
   - https://www.ettv.to/
@@ -29,9 +29,18 @@ 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/
+  - https://ettv.unblockit.buzz/
+  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.club/
 
 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

@@ -0,0 +1,989 @@
+---
+id: extratorrent-it
+name: ExtraTorrent.it
+description: "ExtraTorrent.it is a Public tracker, a popular alternative to the original ET site, providing Movie / TV / General magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://extratorrents.it/
+  - https://extratorrent.unblockit.onl/
+  - https://extratorrent.nocensor.space/
+legacylinks:
+  - https://extratorrent.ag/
+  - https://extratorrent.unblockit.app/
+  - https://extratorrent.unblockit.dev/
+  - https://extratorrent.unblockit.ltd/
+  - https://extratorrent.unblockit.link/
+  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.buzz/
+  - https://extratorrent.unblockit.club/
+
+caps:
+  categorymappings:
+    # Anime
+    - {id: 1, cat: TV/Anime, desc: "Anime"}
+    - {id: 963, cat: TV/Anime, desc: "Anime - Absolute Duo"}
+    - {id: 951, cat: TV/Anime, desc: "Anime - Akame ga Kill"}
+    - {id: 959, cat: TV/Anime, desc: "Anime - Aldnoah Zero"}
+    - {id: 99, cat: TV/Anime, desc: "Anime - Anime - Other"}
+    - {id: 86, cat: TV/Anime, desc: "Anime - Battle Programer Shirase"}
+    - {id: 87, cat: TV/Anime, desc: "Anime - Big O"}
+    - {id: 960, cat: TV/Anime, desc: "Anime - Binan Koukou Chikyuu Bouei-bu Love"}
+    - {id: 267, cat: TV/Anime, desc: "Anime - Bleach"}
+    - {id: 88, cat: TV/Anime, desc: "Anime - Cardcaptor Sakura"}
+    - {id: 89, cat: TV/Anime, desc: "Anime - Chobits"}
+    - {id: 142, cat: TV/Anime, desc: "Anime - Comics"}
+    - {id: 962, cat: TV/Anime, desc: "Anime - Death Parade"}
+    - {id: 151, cat: TV/Anime, desc: "Anime - Dragon ball"}
+    - {id: 90, cat: TV/Anime, desc: "Anime - Dragonball GT"}
+    - {id: 91, cat: TV/Anime, desc: "Anime - Dragonball Z"}
+    - {id: 156, cat: TV/Anime, desc: "Anime - DVD-R"}
+    - {id: 950, cat: TV/Anime, desc: "Anime - Fairy Tail"}
+    - {id: 92, cat: TV/Anime, desc: "Anime - Flame of Recca"}
+    - {id: 93, cat: TV/Anime, desc: "Anime - Full Metal Alchemist"}
+    - {id: 95, cat: TV/Anime, desc: "Anime - Ghost In The Shell SAC"}
+    - {id: 94, cat: TV/Anime, desc: "Anime - Gundam"}
+    - {id: 620, cat: TV/Anime, desc: "Anime - Hentai"}
+    - {id: 145, cat: TV/Anime, desc: "Anime - Hunter X Hunter"}
+    - {id: 949, cat: TV/Anime, desc: "Anime - Inou Battle wa Nichijou-kei no Naka de"}
+    - {id: 96, cat: TV/Anime, desc: "Anime - InuYasha"}
+    - {id: 524, cat: TV/Anime, desc: "Anime - Kiba"}
+    - {id: 97, cat: TV/Anime, desc: "Anime - Konkiki No Gash Bell"}
+    - {id: 961, cat: TV/Anime, desc: "Anime - Kuroko No Basuke"}
+    - {id: 98, cat: TV/Anime, desc: "Anime - Last Exile"}
+    - {id: 964, cat: TV/Anime, desc: "Anime - Log Horizon"}
+    - {id: 952, cat: TV/Anime, desc: "Anime - Nanatsu no Taizai"}
+    - {id: 101, cat: TV/Anime, desc: "Anime - Naruto"}
+    - {id: 508, cat: TV/Anime, desc: "Anime - One Piece"}
+    - {id: 100, cat: TV/Anime, desc: "Anime - Onegai Twins"}
+    - {id: 523, cat: TV/Anime, desc: "Anime - Ouran High School Host Club"}
+    - {id: 102, cat: TV/Anime, desc: "Anime - PlanetES"}
+    - {id: 146, cat: TV/Anime, desc: "Anime - Prince of Tennis"}
+    - {id: 103, cat: TV/Anime, desc: "Anime - Ranma 1/2"}
+    - {id: 104, cat: TV/Anime, desc: "Anime - Ruroni Kenshin"}
+    - {id: 105, cat: TV/Anime, desc: "Anime - Samurai Champloo"}
+    - {id: 107, cat: TV/Anime, desc: "Anime - Scrapped Princess"}
+    - {id: 997, cat: TV/Anime, desc: "Anime - Spider-man"}
+    - {id: 106, cat: TV/Anime, desc: "Anime - Stellvia of the Universe"}
+    - {id: 525, cat: TV/Anime, desc: "Anime - Strawberry Panic"}
+    - {id: 953, cat: TV/Anime, desc: "Anime - Sword Art Online II"}
+    - {id: 958, cat: TV/Anime, desc: "Anime - Tokyo Ghoul"}
+    # Audio
+    - {id: 5, cat: Audio, desc: "Music"}
+    - {id: 54, cat: Audio, desc: "Music - Alternative"}
+    - {id: 990, cat: Audio, desc: "Music - Ambient"}
+    - {id: 160, cat: Audio, desc: "Music - Anime"}
+    - {id: 55, cat: Audio, desc: "Music - Asian"}
+    - {id: 56, cat: Audio, desc: "Music - Blues"}
+    - {id: 809, cat: Audio, desc: "Music - Bollywood"}
+    - {id: 57, cat: Audio, desc: "Music - Christian"}
+    - {id: 58, cat: Audio, desc: "Music - Classic"}
+    - {id: 515, cat: Audio, desc: "Music - Compilation/Various Artists (VA)"}
+    - {id: 59, cat: Audio, desc: "Music - Country/Western"}
+    - {id: 971, cat: Audio, desc: "Music - Discography"}
+    - {id: 60, cat: Audio, desc: "Music - Drum N Bass"}
+    - {id: 61, cat: Audio, desc: "Music - Electronic"}
+    - {id: 850, cat: Audio/Lossless, desc: "Music - FLAC"}
+    - {id: 519, cat: Audio, desc: "Music - Folk"}
+    - {id: 62, cat: Audio, desc: "Music - Game Music"}
+    - {id: 233, cat: Audio, desc: "Music - Gothic"}
+    - {id: 63, cat: Audio, desc: "Music - Hardcore"}
+    - {id: 78, cat: Audio, desc: "Music - HardHouse/Old School Radio Mixes"}
+    - {id: 512, cat: Audio, desc: "Music - Hardrock"}
+    - {id: 724, cat: Audio, desc: "Music - Hardstyle"}
+    - {id: 306, cat: Audio, desc: "Music - Heavy/Death Metal"}
+    - {id: 64, cat: Audio, desc: "Music - Hip Hop"}
+    - {id: 511, cat: Audio, desc: "Music - Indie/Britpop"}
+    - {id: 65, cat: Audio, desc: "Music - Industrial"}
+    - {id: 66, cat: Audio, desc: "Music - Jazz"}
+    - {id: 67, cat: Audio, desc: "Music - Karaoke"}
+    - {id: 521, cat: Audio, desc: "Music - Latin"}
+    - {id: 68, cat: Audio, desc: "Music - Metal"}
+    - {id: 526, cat: Audio, desc: "Music - Motown"}
+    - {id: 79, cat: Audio, desc: "Music - Music - Other"}
+    - {id: 69, cat: Audio/Video, desc: "Music - Music Videos"}
+    - {id: 522, cat: Audio, desc: "Music - Non-English"}
+    - {id: 507, cat: Audio, desc: "Music - Now That's What I Call Music"}
+    - {id: 70, cat: Audio, desc: "Music - Pop"}
+    - {id: 852, cat: Audio, desc: "Music - Progressive"}
+    - {id: 71, cat: Audio, desc: "Music - Punk"}
+    - {id: 72, cat: Audio, desc: "Music - R&B"}
+    - {id: 851, cat: Audio, desc: "Music - Rai"}
+    - {id: 73, cat: Audio, desc: "Music - Rap"}
+    - {id: 74, cat: Audio, desc: "Music - Reggae"}
+    - {id: 75, cat: Audio, desc: "Music - Rock"}
+    - {id: 527, cat: Audio, desc: "Music - Rock 'n' Roll"}
+    - {id: 514, cat: Audio, desc: "Music - Singer Songwriter"}
+    - {id: 230, cat: Audio, desc: "Music - Ska"}
+    - {id: 505, cat: Audio, desc: "Music - Soul"}
+    - {id: 77, cat: Audio, desc: "Music - Soundtracks"}
+    - {id: 161, cat: Audio, desc: "Music - Techno"}
+    - {id: 420, cat: Audio, desc: "Music - Trance/House/Dance"}
+    - {id: 76, cat: Audio, desc: "Music - Unsigned/Amateur"}
+    - {id: 1002, cat: Audio, desc: "Music - AAC"}
+    - {id: 1003, cat: Audio, desc: "Music - Album"}
+    - {id: 1004, cat: Audio, desc: "Music - Box Set"}
+    - {id: 1005, cat: Audio, desc: "Music - Concerts"}
+    - {id: 1006, cat: Audio, desc: "Music - Discography"}
+    - {id: 1007, cat: Audio/Video, desc: "Music - DVD"}
+    - {id: 1008, cat: Audio/Lossless, desc: "Music - Lossless"}
+    - {id: 1009, cat: Audio/MP3, desc: "Music - MP3"}
+    - {id: 1011, cat: Audio, desc: "Music - Radio"}
+    - {id: 1012, cat: Audio, desc: "Music - Single"}
+    # Movies
+    - {id: 4, cat: Movies, desc: "Movies"}
+    - {id: 419, cat: Movies, desc: "Movies - Action"}
+    - {id: 28, cat: Movies, desc: "Movies - Adventure"}
+    - {id: 29, cat: Movies, desc: "Movies - Animation"}
+    - {id: 30, cat: Movies, desc: "Movies - Asian"}
+    - {id: 32, cat: Movies, desc: "Movies - Automotive/Cars"}
+    - {id: 628, cat: Movies, desc: "Movies - Biography"}
+    - {id: 977, cat: Movies, desc: "Movies - Black and White"}
+    - {id: 558, cat: Movies, desc: "Movies - Bollywood/Desi"}
+    - {id: 976, cat: Movies, desc: "Movies - Classic"}
+    - {id: 33, cat: Movies, desc: "Movies - Comedy"}
+    - {id: 34, cat: Movies, desc: "Movies - Concerts"}
+    - {id: 600, cat: Movies, desc: "Movies - Crime"}
+    - {id: 35, cat: Movies, desc: "Movies - Documentary"}
+    - {id: 37, cat: Movies, desc: "Movies - Drama"}
+    - {id: 742, cat: Movies, desc: "Movies - Dubbed/Dual Audio"}
+    - {id: 36, cat: Movies, desc: "Movies - DVD/Film Extras"}
+    - {id: 149, cat: Movies, desc: "Movies - Family"}
+    - {id: 38, cat: Movies, desc: "Movies - Fantasy"}
+    - {id: 39, cat: Movies, desc: "Movies - Gore Flicks"}
+    - {id: 602, cat: Movies, desc: "Movies - History"}
+    - {id: 40, cat: Movies, desc: "Movies - Horror"}
+    - {id: 41, cat: Movies, desc: "Movies - Kids"}
+    - {id: 150, cat: Movies/SD, desc: "Movies - KVCD"}
+    - {id: 974, cat: Movies, desc: "Movies - Lollywood"}
+    - {id: 42, cat: Movies, desc: "Movies - Martial Arts"}
+    - {id: 44, cat: Movies/Other, desc: "Movies - Other"}
+    - {id: 805, cat: Movies/3D, desc: "Movies - 3D"}
+    - {id: 975, cat: Movies/UHD, desc: "Movies - 4K"}
+    - {id: 947, cat: Movies, desc: "Movies - Musical"}
+    - {id: 43, cat: Movies, desc: "Movies - Mystery"}
+    - {id: 603, cat: Movies/Foreign, desc: "Movies - non English"}
+    - {id: 978, cat: Movies, desc: "Movies - Rarities"}
+    - {id: 45, cat: Movies, desc: "Movies - Romance"}
+    - {id: 46, cat: Movies, desc: "Movies - Samples/Trailers"}
+    - {id: 47, cat: Movies, desc: "Movies - Sci-Fi"}
+    - {id: 48, cat: Movies, desc: "Movies - Sports related"}
+    - {id: 779, cat: Movies, desc: "Movies - Stand-up comedy"}
+    - {id: 49, cat: Movies, desc: "Movies - Thriller"}
+    - {id: 671, cat: Movies, desc: "Movies - Travel"}
+    - {id: 307, cat: Movies, desc: "Movies - War"}
+    - {id: 601, cat: Movies, desc: "Movies - Western"}
+    - {id: 1024, cat: Movies/HD, desc: "Movies - HEVC/x265"}
+    - {id: 1030, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
+    - {id: 1031, cat: Movies/HD, desc: "Movies - h.264/x264"}
+    - {id: 1032, cat: Movies/HD, desc: "Movies - HD"}
+    - {id: 1033, cat: Movies/HD, desc: "Movies - MP4"}
+    - {id: 1034, cat: Movies/SD, desc: "Movies - SVCD/VCD"}
+    - {id: 1035, cat: Movies, desc: "Movies - YIFY"}
+    # TV
+    - {id: 8, cat: TV, desc: "TV"}
+    - {id: 986, cat: TV, desc: "TV - 12 Monkeys"}
+    - {id: 598, cat: TV, desc: "TV - 19-2"}
+    - {id: 795, cat: TV, desc: "TV - 2 Broke Girls"}
+    - {id: 435, cat: TV, desc: "TV - 24"}
+    - {id: 169, cat: TV, desc: "TV - 30 Days"}
+    - {id: 561, cat: TV, desc: "TV - 30 Rock"}
+    - {id: 274, cat: TV, desc: "TV - 60 Minutes"}
+    - {id: 862, cat: TV, desc: "TV - 666 Park Avenue"}
+    - {id: 273, cat: TV, desc: "TV - 'Allo 'Allo!"}
+    - {id: 310, cat: TV, desc: "TV - A-Team"}
+    - {id: 797, cat: TV, desc: "TV - About a Boy"}
+    - {id: 998, cat: TV, desc: "TV - Above Suspicion"}
+    - {id: 966, cat: TV, desc: "TV - Adam - E.V.A"}
+    - {id: 573, cat: TV, desc: "TV - Alaska State Troopers"}
+    - {id: 821, cat: TV, desc: "TV - Alcatraz"}
+    - {id: 118, cat: TV, desc: "TV - Alias"}
+    - {id: 810, cat: TV, desc: "TV - Almost Human"}
+    - {id: 771, cat: TV, desc: "TV - Alphas"}
+    - {id: 818, cat: TV, desc: "TV - American Chopper"}
+    - {id: 234, cat: TV, desc: "TV - American Dad"}
+    - {id: 194, cat: TV, desc: "TV - American Horror Story"}
+    - {id: 634, cat: TV, desc: "TV - American Idol"}
+    - {id: 674, cat: TV, desc: "TV - Americas Got Talent"}
+    - {id: 675, cat: TV, desc: "TV - Americas Next Top Model"}
+    - {id: 894, cat: TV, desc: "TV - Ancient Aliens"}
+    - {id: 170, cat: TV, desc: "TV - Angel"}
+    - {id: 911, cat: TV, desc: "TV - Anger Management"}
+    - {id: 659, cat: TV, desc: "TV - Archer"}
+    - {id: 275, cat: TV, desc: "TV - Arrested Development"}
+    - {id: 872, cat: TV, desc: "TV - Arrow"}
+    - {id: 984, cat: TV, desc: "TV - Ash vs Evil Dead"}
+    - {id: 171, cat: TV, desc: "TV - Attack Of The Show"}
+    - {id: 837, cat: TV, desc: "TV - Awake"}
+    - {id: 902, cat: TV, desc: "TV - Awkward"}
+    - {id: 916, cat: TV, desc: "TV - Baby Daddy"}
+    - {id: 165, cat: TV, desc: "TV - Babylon 5"}
+    - {id: 309, cat: TV, desc: "TV - Back In The Game"}
+    - {id: 460, cat: TV, desc: "TV - Band Of Brothers"}
+    - {id: 329, cat: TV, desc: "TV - Banshee"}
+    - {id: 891, cat: TV, desc: "TV - Bates Motel"}
+    - {id: 802, cat: TV, desc: "TV - Batman The Brave and The Bold"}
+    - {id: 163, cat: TV, desc: "TV - Battlestar Galactica"}
+    - {id: 794, cat: TV, desc: "TV - BBC"}
+    - {id: 886, cat: TV, desc: "TV - Beauty and the Beast"}
+    - {id: 172, cat: TV, desc: "TV - Beauty And The Geek"}
+    - {id: 782, cat: TV, desc: "TV - Beavis and Butt-Head"}
+    - {id: 584, cat: TV, desc: "TV - Being Erica"}
+    - {id: 669, cat: TV, desc: "TV - Being Human"}
+    - {id: 683, cat: TV, desc: "TV - Believe"}
+    - {id: 335, cat: TV, desc: "TV - Bellator FC"}
+    - {id: 979, cat: TV, desc: "TV - Better Call Saul"}
+    - {id: 173, cat: TV, desc: "TV - Big Brother"}
+    - {id: 666, cat: TV, desc: "TV - Big Love"}
+    - {id: 774, cat: TV, desc: "TV - Bigg Boss"}
+    - {id: 989, cat: TV, desc: "TV - Billions"}
+    - {id: 174, cat: TV, desc: "TV - Bitten"}
+    - {id: 396, cat: TV, desc: "TV - Black Sails"}
+    - {id: 981, cat: TV, desc: "TV - Blindspot"}
+    - {id: 717, cat: TV, desc: "TV - Blue Bloods"}
+    - {id: 754, cat: TV, desc: "TV - Boardwalk Empire"}
+    - {id: 709, cat: TV, desc: "TV - Bobs Burgers"}
+    - {id: 767, cat: TV, desc: "TV - Body of Proof"}
+    - {id: 175, cat: TV, desc: "TV - Bold and the beautiful"}
+    - {id: 969, cat: TV, desc: "TV - Bollywood TV Shows"}
+    - {id: 269, cat: TV, desc: "TV - Bones"}
+    - {id: 235, cat: TV, desc: "TV - Boston Legal"}
+    - {id: 676, cat: TV, desc: "TV - Breaking Bad"}
+    - {id: 707, cat: TV, desc: "TV - Breakout Kings"}
+    - {id: 409, cat: TV, desc: "TV - Brickleberry"}
+    - {id: 680, cat: TV, desc: "TV - Brooklyn Nine-Nine"}
+    - {id: 560, cat: TV, desc: "TV - Brothers And Sisters"}
+    - {id: 147, cat: TV, desc: "TV - Buffy"}
+    - {id: 677, cat: TV, desc: "TV - Burn Notice"}
+    - {id: 619, cat: TV, desc: "TV - Californication"}
+    - {id: 883, cat: TV, desc: "TV - Call of the Wildman"}
+    - {id: 719, cat: TV, desc: "TV - Camelot"}
+    - {id: 921, cat: TV, desc: "TV - Camp"}
+    - {id: 661, cat: TV, desc: "TV - Caprica"}
+    - {id: 928, cat: TV, desc: "TV - Capture"}
+    - {id: 128, cat: TV, desc: "TV - Carnivale"}
+    - {id: 736, cat: TV, desc: "TV - Cartoon"}
+    - {id: 658, cat: TV, desc: "TV - Castle"}
+    - {id: 941, cat: TV, desc: "TV - Cedar Cove"}
+    - {id: 846, cat: TV, desc: "TV - Celebrity Juice"}
+    - {id: 141, cat: TV, desc: "TV - Charmed"}
+    - {id: 900, cat: TV, desc: "TV - Chicago Fire"}
+    - {id: 324, cat: TV, desc: "TV - Chicago PD"}
+    - {id: 315, cat: TV, desc: "TV - Chopped"}
+    - {id: 184, cat: TV, desc: "TV - Chozen"}
+    - {id: 657, cat: TV, desc: "TV - Chuck"}
+    - {id: 133, cat: TV, desc: "TV - Cold Case"}
+    - {id: 629, cat: TV, desc: "TV - Community"}
+    - {id: 178, cat: TV, desc: "TV - Conan O'Brien"}
+    - {id: 946, cat: TV, desc: "TV - Constantine"}
+    - {id: 879, cat: TV, desc: "TV - Continuum"}
+    - {id: 861, cat: TV, desc: "TV - Copper"}
+    - {id: 322, cat: TV, desc: "TV - Cops"}
+    - {id: 186, cat: TV, desc: "TV - Cosmos A Space Time Odyssey"}
+    - {id: 670, cat: TV, desc: "TV - Cougar Town"}
+    - {id: 729, cat: TV, desc: "TV - Covert Affairs"}
+    - {id: 651, cat: TV, desc: "TV - Craig Ferguson"}
+    - {id: 280, cat: TV, desc: "TV - Criminal Minds"}
+    - {id: 788, cat: TV, desc: "TV - Crisis"}
+    - {id: 279, cat: TV, desc: "TV - Criss Angel BeLIEve"}
+    - {id: 323, cat: TV, desc: "TV - Crossing Jordan"}
+    - {id: 926, cat: TV, desc: "TV - Crossing Lines"}
+    - {id: 108, cat: TV, desc: "TV - CSI"}
+    - {id: 325, cat: TV, desc: "TV - Curb Your Enthusiasm"}
+    - {id: 882, cat: TV, desc: "TV - Da Vincis Demons"}
+    - {id: 282, cat: TV, desc: "TV - Dallas"}
+    - {id: 678, cat: TV, desc: "TV - Damages"}
+    - {id: 798, cat: TV, desc: "TV - Dancing with the Stars US"}
+    - {id: 652, cat: TV, desc: "TV - David Letterman"}
+    - {id: 994, cat: TV, desc: "TV - Days of Our Lives"}
+    - {id: 985, cat: TV, desc: "TV - DCs Legends of Tomorrow"}
+    - {id: 181, cat: TV, desc: "TV - Dead Like Me"}
+    - {id: 679, cat: TV, desc: "TV - Deadliest Catch"}
+    - {id: 182, cat: TV, desc: "TV - Deadwood"}
+    - {id: 890, cat: TV, desc: "TV - Defiance"}
+    - {id: 281, cat: TV, desc: "TV - Democracy Now!"}
+    - {id: 183, cat: TV, desc: "TV - Desperate Housewives"}
+    - {id: 939, cat: TV, desc: "TV - Devious Maids"}
+    - {id: 585, cat: TV, desc: "TV - Dexter"}
+    - {id: 644, cat: TV, desc: "TV - Dirty Jobs"}
+    - {id: 122, cat: TV, desc: "TV - Discovery Channel"}
+    - {id: 167, cat: TV, desc: "TV - Doctor Who"}
+    - {id: 968, cat: TV/Documentary, desc: "TV - Documentary"}
+    - {id: 606, cat: TV, desc: "TV - Dollhouse"}
+    - {id: 839, cat: TV, desc: "TV - Dont Trust the Bitch in Apartment"}
+    - {id: 326, cat: TV, desc: "TV - Dr Who"}
+    - {id: 925, cat: TV, desc: "TV - Dracula"}
+    - {id: 328, cat: TV, desc: "TV - Drawn Together"}
+    - {id: 732, cat: TV, desc: "TV - Drop Dead"}
+    - {id: 820, cat: TV, desc: "TV - Eastbound and Down"}
+    - {id: 875, cat: TV, desc: "TV - Elementary"}
+    - {id: 283, cat: TV, desc: "TV - Ellen DeGeneres"}
+    - {id: 330, cat: TV, desc: "TV - Enlisted"}
+    - {id: 187, cat: TV, desc: "TV - Entourage"}
+    - {id: 270, cat: TV, desc: "TV - ER"}
+    - {id: 765, cat: TV, desc: "TV - Eureka"}
+    - {id: 238, cat: TV, desc: "TV - Everybody Loves Raymond"}
+    - {id: 571, cat: TV, desc: "TV - Extant"}
+    - {id: 840, cat: TV, desc: "TV - Fact or Faked Paranormal Files"}
+    - {id: 828, cat: TV, desc: "TV - Fairly Legeal"}
+    - {id: 876, cat: TV, desc: "TV - Faking It"}
+    - {id: 917, cat: TV, desc: "TV - Falling Skies"}
+    - {id: 188, cat: TV, desc: "TV - Family Guy"}
+    - {id: 855, cat: TV, desc: "TV - Family Tools"}
+    - {id: 411, cat: TV, desc: "TV - Fargo"}
+    - {id: 331, cat: TV, desc: "TV - Farscape"}
+    - {id: 983, cat: TV, desc: "TV - Fear the Walking Dead"}
+    - {id: 332, cat: TV, desc: "TV - Fifth Gear"}
+    - {id: 672, cat: TV, desc: "TV - Flashforward"}
+    - {id: 753, cat: TV, desc: "TV - Flashpoint"}
+    - {id: 831, cat: TV, desc: "TV - Foreign Series/Non English"}
+    - {id: 266, cat: TV, desc: "TV - Forever"}
+    - {id: 922, cat: TV, desc: "TV - Franklin and Bash"}
+    - {id: 140, cat: TV, desc: "TV - Friends"}
+    - {id: 612, cat: TV, desc: "TV - Fringe"}
+    - {id: 277, cat: TV, desc: "TV - From Dusk Till Dawn"}
+    - {id: 681, cat: TV, desc: "TV - Futurama"}
+    - {id: 728, cat: TV, desc: "TV - Game of Thrones"}
+    - {id: 334, cat: TV, desc: "TV - Gang Related"}
+    - {id: 996, cat: TV, desc: "TV - General Hospital"}
+    - {id: 954, cat: TV, desc: "TV - Geordie Shore"}
+    - {id: 574, cat: TV, desc: "TV - Ghost Adventures"}
+    - {id: 704, cat: TV, desc: "TV - Ghost Hunters"}
+    - {id: 642, cat: TV, desc: "TV - Ghost Mine"}
+    - {id: 338, cat: TV, desc: "TV - Ghost Whisperer"}
+    - {id: 284, cat: TV, desc: "TV - Gilmore Girls"}
+    - {id: 682, cat: TV, desc: "TV - Glee"}
+    - {id: 865, cat: TV, desc: "TV - Go On"}
+    - {id: 276, cat: TV, desc: "TV - Gold Rush"}
+    - {id: 339, cat: TV, desc: "TV - Good Eats"}
+    - {id: 599, cat: TV, desc: "TV - Gossip Girl"}
+    - {id: 580, cat: TV, desc: "TV - Gotham"}
+    - {id: 919, cat: TV, desc: "TV - Graceland"}
+    - {id: 955, cat: TV, desc: "TV - Gracepoint"}
+    - {id: 285, cat: TV, desc: "TV - Greys Anatomy"}
+    - {id: 819, cat: TV, desc: "TV - Grimm"}
+    - {id: 237, cat: TV, desc: "TV - Growing Up Fisher"}
+    - {id: 340, cat: TV, desc: "TV - Guiding Light"}
+    - {id: 866, cat: TV, desc: "TV - Guys With Kids"}
+    - {id: 880, cat: TV, desc: "TV - Hannibal"}
+    - {id: 813, cat: TV, desc: "TV - Happily Divorced"}
+    - {id: 769, cat: TV, desc: "TV - Happy Endings"}
+    - {id: 190, cat: TV, desc: "TV - Harald Schmidt"}
+    - {id: 713, cat: TV, desc: "TV - Harrys Law"}
+    - {id: 832, cat: TV, desc: "TV - Hart of Dixie"}
+    - {id: 341, cat: TV, desc: "TV - Haunted"}
+    - {id: 773, cat: TV, desc: "TV - Haven"}
+    - {id: 712, cat: TV, desc: "TV - Hawaii Five-0"}
+    - {id: 781, cat: TV, desc: "TV - Helix"}
+    - {id: 853, cat: TV, desc: "TV - Hell on Wheels"}
+    - {id: 191, cat: TV, desc: "TV - Hells Kitchen"}
+    - {id: 884, cat: TV, desc: "TV - Hemlock Grove"}
+    - {id: 342, cat: TV, desc: "TV - Hercules"}
+    - {id: 556, cat: TV, desc: "TV - Heroes"}
+    - {id: 343, cat: TV, desc: "TV - Hex"}
+    - {id: 192, cat: TV, desc: "TV - Hogans Heroes"}
+    - {id: 588, cat: TV, desc: "TV - Hollands Hoop"}
+    - {id: 755, cat: TV, desc: "TV - Homeland"}
+    - {id: 812, cat: TV, desc: "TV - Hostages"}
+    - {id: 684, cat: TV, desc: "TV - Hot in Cleveland"}
+    - {id: 286, cat: TV, desc: "TV - House"}
+    - {id: 913, cat: TV, desc: "TV - House Of Cards"}
+    - {id: 287, cat: TV, desc: "TV - How I Met Your Mother"}
+    - {id: 568, cat: TV, desc: "TV - How Its Made"}
+    - {id: 893, cat: TV, desc: "TV - How to Live with Your Parents"}
+    - {id: 288, cat: TV, desc: "TV - Howard Stern"}
+    - {id: 132, cat: TV, desc: "TV - Huff"}
+    - {id: 345, cat: TV, desc: "TV - Humor Amarillo"}
+    - {id: 756, cat: TV, desc: "TV - Hung"}
+    - {id: 637, cat: TV, desc: "TV - Hustle"}
+    - {id: 346, cat: TV, desc: "TV - In Justice"}
+    - {id: 685, cat: TV, desc: "TV - In Plain Sight"}
+    - {id: 582, cat: TV, desc: "TV - Ink Master"}
+    - {id: 347, cat: TV, desc: "TV - Inked"}
+    - {id: 965, cat: TV, desc: "TV - Inside MMA"}
+    - {id: 873, cat: TV, desc: "TV - Intelligence US"}
+    - {id: 240, cat: TV, desc: "TV - Into the West"}
+    - {id: 166, cat: TV, desc: "TV - Iron Chef"}
+    - {id: 289, cat: TV, desc: "TV - Invasion"}
+    - {id: 817, cat: TV, desc: "TV - Ironside"}
+    - {id: 772, cat: TV, desc: "TV - Its Always Sunny in Philadelphia"}
+    - {id: 988, cat: TV, desc: "TV - iZombie"}
+    - {id: 991, cat: TV, desc: "TV - Jane the Virgin"}
+    - {id: 290, cat: TV, desc: "TV - Jay Leno"}
+    - {id: 763, cat: TV, desc: "TV - Jersey Shore"}
+    - {id: 177, cat: TV, desc: "TV - Joe Rogan Questions Everything"}
+    - {id: 110, cat: TV, desc: "TV - Joey"}
+    - {id: 196, cat: TV, desc: "TV - Justice League Unlimited"}
+    - {id: 686, cat: TV, desc: "TV - Justified"}
+    - {id: 412, cat: TV, desc: "TV - kabachitare!"}
+    - {id: 738, cat: TV, desc: "TV - Killer Contact"}
+    - {id: 349, cat: TV, desc: "TV - Killer Instinct"}
+    - {id: 197, cat: TV, desc: "TV - Kim Possible"}
+    - {id: 741, cat: TV, desc: "TV - King"}
+    - {id: 933, cat: TV, desc: "TV - King and Maxwel"}
+    - {id: 350, cat: TV, desc: "TV - King Of The Hill"}
+    - {id: 351, cat: TV, desc: "TV - Kitchen Confidential"}
+    - {id: 790, cat: TV, desc: "TV - Kitchen Nightmares US"}
+    - {id: 348, cat: TV, desc: "TV - Kolchak The Night Stalker"}
+    - {id: 241, cat: TV, desc: "TV - Koot en Bie"}
+    - {id: 198, cat: TV, desc: "TV - Kung Fu"}
+    - {id: 199, cat: TV, desc: "TV - La Femme Nikita"}
+    - {id: 570, cat: TV, desc: "TV - LA Ink"}
+    - {id: 242, cat: TV, desc: "TV - Laguna Beach"}
+    - {id: 130, cat: TV, desc: "TV - Las Vegas"}
+    - {id: 843, cat: TV, desc: "TV - Last Man Standing"}
+    - {id: 867, cat: TV, desc: "TV - Last Resort"}
+    - {id: 200, cat: TV, desc: "TV - Late Night with Conan O'Brien"}
+    - {id: 115, cat: TV, desc: "TV - Law And Order"}
+    - {id: 591, cat: TV, desc: "TV - Law and Order UK"}
+    - {id: 243, cat: TV, desc: "TV - Le Cameleon"}
+    - {id: 578, cat: TV, desc: "TV - Legend of the Seeker"}
+    - {id: 590, cat: TV, desc: "TV - Legends"}
+    - {id: 898, cat: TV, desc: "TV - Legit"}
+    - {id: 638, cat: TV, desc: "TV - Level3"}
+    - {id: 656, cat: TV, desc: "TV - Leverage"}
+    - {id: 618, cat: TV, desc: "TV - Lie To Me"}
+    - {id: 650, cat: TV, desc: "TV - Life"}
+    - {id: 353, cat: TV, desc: "TV - Life on Mars"}
+    - {id: 716, cat: TV, desc: "TV - Lights Out"}
+    - {id: 244, cat: TV, desc: "TV - Line Of Fire"}
+    - {id: 504, cat: TV, desc: "TV - Little Britain"}
+    - {id: 665, cat: TV, desc: "TV - Little Mosque on the Prairie"}
+    - {id: 148, cat: TV, desc: "TV - Long Island Medium"}
+    - {id: 914, cat: TV, desc: "TV - Longmire"}
+    - {id: 354, cat: TV, desc: "TV - Los Serrano"}
+    - {id: 111, cat: TV, desc: "TV - Lost"}
+    - {id: 314, cat: TV, desc: "TV - Lost Girl"}
+    - {id: 858, cat: TV, desc: "TV - Louie"}
+    - {id: 726, cat: TV, desc: "TV - Love Bites"}
+    - {id: 937, cat: TV, desc: "TV - Low Winter Sun"}
+    - {id: 956, cat: TV, desc: "TV - Lucha Underground"}
+    - {id: 980, cat: TV, desc: "TV - Lucifer"}
+    - {id: 503, cat: TV, desc: "TV - Lucky Louie"}
+    - {id: 687, cat: TV, desc: "TV - Luther"}
+    - {id: 157, cat: TV, desc: "TV - MacGyver"}
+    - {id: 705, cat: TV, desc: "TV - Mad Love"}
+    - {id: 826, cat: TV, desc: "TV - Mad Men"}
+    - {id: 869, cat: TV, desc: "TV - Made in Jersey"}
+    - {id: 355, cat: TV, desc: "TV - MADtv"}
+    - {id: 871, cat: TV, desc: "TV - Major Crimes"}
+    - {id: 667, cat: TV, desc: "TV - Make It or Break It"}
+    - {id: 357, cat: TV, desc: "TV - Malcolm In The Middle"}
+    - {id: 662, cat: TV, desc: "TV - Man vs Wild"}
+    - {id: 759, cat: TV, desc: "TV - Marvels Agents of S.H.I.E.L.D"}
+    - {id: 910, cat: TV, desc: "TV - MasterChef US"}
+    - {id: 358, cat: TV, desc: "TV - Masters Of Horror"}
+    - {id: 824, cat: TV, desc: "TV - Masters of Sex"}
+    - {id: 291, cat: TV, desc: "TV - Medium"}
+    - {id: 617, cat: TV, desc: "TV - Melrose Place"}
+    - {id: 688, cat: TV, desc: "TV - Memphis Beat"}
+    - {id: 905, cat: TV, desc: "TV - Men at Work"}
+    - {id: 645, cat: TV, desc: "TV - Men of a Certain Age"}
+    - {id: 633, cat: TV, desc: "TV - Mercy"}
+    - {id: 579, cat: TV, desc: "TV - Merlin"}
+    - {id: 359, cat: TV, desc: "TV - Miami Ink"}
+    - {id: 825, cat: TV, desc: "TV - Midsomer Murders"}
+    - {id: 783, cat: TV, desc: "TV - Mike and Molly"}
+    - {id: 823, cat: TV, desc: "TV - Mind Games"}
+    - {id: 246, cat: TV, desc: "TV - Mind of Mencia"}
+    - {id: 313, cat: TV, desc: "TV - Misfits"}
+    - {id: 842, cat: TV, desc: "TV - Missing"}
+    - {id: 647, cat: TV, desc: "TV - Mistresses US"}
+    - {id: 179, cat: TV, desc: "TV - Mixology"}
+    - {id: 632, cat: TV, desc: "TV - Modern Family"}
+    - {id: 245, cat: TV, desc: "TV - Modern Marvels"}
+    - {id: 398, cat: TV, desc: "TV - Mom"}
+    - {id: 201, cat: TV, desc: "TV - Monk"}
+    - {id: 361, cat: TV, desc: "TV - Monty Pythons Flying Circus"}
+    - {id: 907, cat: TV, desc: "TV - Motive"}
+    - {id: 247, cat: TV, desc: "TV - Mr Bean"}
+    - {id: 992, cat: TV, desc: "TV - Mr. Robot"}
+    - {id: 356, cat: TV, desc: "TV - MST3K"}
+    - {id: 292, cat: TV, desc: "TV - My Favorite Martian"}
+    - {id: 792, cat: TV, desc: "TV - My Ghost Story"}
+    - {id: 999, cat: TV, desc: "TV - My Little Pony - Friendship is Magic"}
+    - {id: 362, cat: TV, desc: "TV - My Name Is Earl"}
+    - {id: 202, cat: TV, desc: "TV - My Restaurant Rules"}
+    - {id: 193, cat: TV, desc: "TV - Mythbusters"}
+    - {id: 940, cat: TV, desc: "TV - Naked And Afraid"}
+    - {id: 203, cat: TV, desc: "TV - NASA 50 Years Of Space Exploration"}
+    - {id: 899, cat: TV, desc: "TV - Nashville"}
+    - {id: 636, cat: TV/Documentary, desc: "TV - National Geographic"}
+    - {id: 120, cat: TV, desc: "TV - NCIS"}
+    - {id: 920, cat: TV, desc: "TV - Necessary Roughness"}
+    - {id: 841, cat: TV, desc: "TV - New Girl"}
+    - {id: 957, cat: TV, desc: "TV - New Japan Pro Wrestling"}
+    - {id: 311, cat: TV, desc: "TV - NewGamePlus"}
+    - {id: 363, cat: TV, desc: "TV - Night Stalker"}
+    - {id: 722, cat: TV, desc: "TV - Nikita"}
+    - {id: 293, cat: TV, desc: "TV - Nip Tuck"}
+    - {id: 710, cat: TV, desc: "TV - No Ordinary Family"}
+    - {id: 294, cat: TV, desc: "TV - Numb3rs"}
+    - {id: 689, cat: TV, desc: "TV - Nurse Jackie"}
+    - {id: 703, cat: TV, desc: "TV - Off the Map"}
+    - {id: 833, cat: TV, desc: "TV - Once Upon a Time Once"}
+    - {id: 364, cat: TV, desc: "TV - One Tree Hill"}
+    - {id: 424, cat: TV, desc: "TV - Only Fools And Horses"}
+    - {id: 935, cat: TV, desc: "TV - Orange Is The New Black"}
+    - {id: 881, cat: TV, desc: "TV - Orphan Black"}
+    - {id: 113, cat: TV/Other, desc: "TV - Other"}
+    - {id: 365, cat: TV, desc: "TV - Out of Practice S01E"}
+    - {id: 248, cat: TV, desc: "TV - Outer Limits"}
+    - {id: 646, cat: TV, desc: "TV - Outer Space Astronauts"}
+    - {id: 336, cat: TV, desc: "TV - Outlander"}
+    - {id: 723, cat: TV, desc: "TV - Outsourced"}
+    - {id: 249, cat: TV, desc: "TV - Over There"}
+    - {id: 757, cat: TV, desc: "TV - Pan Am"}
+    - {id: 640, cat: TV, desc: "TV - Paradox"}
+    - {id: 778, cat: TV, desc: "TV - Parenthood"}
+    - {id: 613, cat: TV, desc: "TV - Parks and Recreation"}
+    - {id: 250, cat: TV, desc: "TV - Passions"}
+    - {id: 414, cat: TV, desc: "TV - PBS NOW"}
+    - {id: 690, cat: TV, desc: "TV - Penn and Teller Bullshit"}
+    - {id: 945, cat: TV, desc: "TV - Penny Dreadful"}
+    - {id: 927, cat: TV, desc: "TV - Perception"}
+    - {id: 785, cat: TV, desc: "TV - Person of Interest"}
+    - {id: 366, cat: TV, desc: "TV - Phil of the Future"}
+    - {id: 204, cat: TV, desc: "TV - Pimp My Ride"}
+    - {id: 967, cat: TV, desc: "TV - Player Attack"}
+    - {id: 427, cat: TV, desc: "TV - Poker"}
+    - {id: 691, cat: TV, desc: "TV - Pretty Little Liars"}
+    - {id: 784, cat: TV, desc: "TV - Prime Suspect US"}
+    - {id: 734, cat: TV, desc: "TV - Primeval"}
+    - {id: 229, cat: TV, desc: "TV - Prison Break"}
+    - {id: 692, cat: TV, desc: "TV - Private Practice"}
+    - {id: 368, cat: TV, desc: "TV - Project Runway"}
+    - {id: 663, cat: TV, desc: "TV - Psych"}
+    - {id: 205, cat: TV, desc: "TV - Punkd"}
+    - {id: 803, cat: TV, desc: "TV - QI"}
+    - {id: 982, cat: TV, desc: "TV - Quantico"}
+    - {id: 251, cat: TV, desc: "TV - Quantum Leap"}
+    - {id: 993, cat: TV, desc: "TV - Queen of the South"}
+    - {id: 252, cat: TV, desc: "TV - Queer as Folk"}
+    - {id: 714, cat: TV, desc: "TV - Raising Hope"}
+    - {id: 317, cat: TV, desc: "TV - Ravenswood"}
+    - {id: 936, cat: TV, desc: "TV - Ray Donovan"}
+    - {id: 594, cat: TV, desc: "TV - Ray Mears Northern Wilderness"}
+    - {id: 822, cat: TV, desc: "TV - Real Time with Bill Maher"}
+    - {id: 369, cat: TV, desc: "TV - Reba"}
+    - {id: 885, cat: TV, desc: "TV - Rectify"}
+    - {id: 206, cat: TV, desc: "TV - Red Dwarf"}
+    - {id: 906, cat: TV, desc: "TV - Red Widow"}
+    - {id: 117, cat: TV, desc: "TV - ReGenesis"}
+    - {id: 854, cat: TV, desc: "TV - Reign"}
+    - {id: 370, cat: TV, desc: "TV - Related"}
+    - {id: 327, cat: TV, desc: "TV - Remedy"}
+    - {id: 253, cat: TV, desc: "TV - Remington Steele"}
+    - {id: 254, cat: TV, desc: "TV - Reno 911"}
+    - {id: 207, cat: TV, desc: "TV - Rescue Me"}
+    - {id: 576, cat: TV, desc: "TV - Resurrection"}
+    - {id: 295, cat: TV, desc: "TV - Reunion"}
+    - {id: 208, cat: TV, desc: "TV - Revelations"}
+    - {id: 760, cat: TV, desc: "TV - Revenge"}
+    - {id: 859, cat: TV, desc: "TV - Revolution"}
+    - {id: 312, cat: TV, desc: "TV - Rewind"}
+    - {id: 768, cat: TV, desc: "TV - Ringer"}
+    - {id: 604, cat: TV, desc: "TV - Rip Off Britain"}
+    - {id: 693, cat: TV, desc: "TV - River Monsters"}
+    - {id: 929, cat: TV, desc: "TV - Rizzoli and Isles"}
+    - {id: 209, cat: TV, desc: "TV - Robot Chicken"}
+    - {id: 888, cat: TV, desc: "TV - Rogue"}
+    - {id: 944, cat: TV/Sport, desc: "TV - ROH-Wrestling"}
+    - {id: 255, cat: TV, desc: "TV - Rome"}
+    - {id: 849, cat: TV, desc: "TV - Rookie Blue"}
+    - {id: 694, cat: TV, desc: "TV - Royal Pains"}
+    - {id: 695, cat: TV, desc: "TV - Rubicon"}
+    - {id: 807, cat: TV, desc: "TV - Rules of Engagement"}
+    - {id: 372, cat: TV, desc: "TV - Ruri no Shima"}
+    - {id: 892, cat: TV, desc: "TV - Rush"}
+    - {id: 555, cat: TV, desc: "TV - Russian TV programs"}
+    - {id: 789, cat: TV, desc: "TV - Salem"}
+    - {id: 605, cat: TV, desc: "TV - Sanctuary"}
+    - {id: 776, cat: TV, desc: "TV - Satisfaction US"}
+    - {id: 373, cat: TV, desc: "TV - Saturday Night Live"}
+    - {id: 915, cat: TV, desc: "TV - Save Me"}
+    - {id: 696, cat: TV, desc: "TV - Saving Grace"}
+    - {id: 931, cat: TV, desc: "TV - Saving Hope"}
+    - {id: 844, cat: TV, desc: "TV - Scandal"}
+    - {id: 344, cat: TV, desc: "TV - Scorpion"}
+    - {id: 987, cat: TV, desc: "TV - Scream"}
+    - {id: 138, cat: TV, desc: "TV - Scrubs"}
+    - {id: 304, cat: TV, desc: "TV - Sean Saves The World"}
+    - {id: 715, cat: TV, desc: "TV - Secret Diary Of A Call Girl"}
+    - {id: 210, cat: TV, desc: "TV - Seinfeld"}
+    - {id: 296, cat: TV, desc: "TV - Sex and The City"}
+    - {id: 708, cat: TV, desc: "TV - Shameless"}
+    - {id: 375, cat: TV, desc: "TV - Sin Rastro"}
+    - {id: 737, cat: TV, desc: "TV - Single Ladies"}
+    - {id: 211, cat: TV, desc: "TV - Six Feet Under"}
+    - {id: 697, cat: TV, desc: "TV - Skins"}
+    - {id: 376, cat: TV, desc: "TV - Sleeper Cell"}
+    - {id: 112, cat: TV, desc: "TV - Sleepy Hollow"}
+    - {id: 256, cat: TV, desc: "TV - Sliders"}
+    - {id: 137, cat: TV, desc: "TV - Smallville"}
+    - {id: 830, cat: TV, desc: "TV - Smash"}
+    - {id: 649, cat: TV, desc: "TV - So You Think You Can Dance"}
+    - {id: 569, cat: TV, desc: "TV - Sons of Anarchy"}
+    - {id: 815, cat: TV, desc: "TV - Sons of Guns"}
+    - {id: 212, cat: TV, desc: "TV - South Park"}
+    - {id: 718, cat: TV, desc: "TV - Southland"}
+    - {id: 257, cat: TV, desc: "TV - Space 1999"}
+    - {id: 297, cat: TV, desc: "TV - Space Above and Beyond"}
+    - {id: 631, cat: TV, desc: "TV - Spartacus"}
+    - {id: 845, cat: TV, desc: "TV - Spike TV"}
+    - {id: 607, cat: TV, desc: "TV - Spooks"}
+    - {id: 131, cat: TV, desc: "TV - Sports Illustrated"}
+    - {id: 159, cat: TV/Sport, desc: "TV - Sports related"}
+    - {id: 378, cat: TV, desc: "TV - Stacked"}
+    - {id: 379, cat: TV, desc: "TV - Star Trek"}
+    - {id: 563, cat: TV, desc: "TV - Star Wars The Clone Wars"}
+    - {id: 615, cat: TV, desc: "TV - Star-Crossed"}
+    - {id: 139, cat: TV, desc: "TV - Star-Trek Enterprise"}
+    - {id: 144, cat: TV, desc: "TV - Star-Trek The Next Generation"}
+    - {id: 380, cat: TV, desc: "TV - Stargate"}
+    - {id: 123, cat: TV, desc: "TV - Stargate Atlantis"}
+    - {id: 124, cat: TV, desc: "TV - StarGate SG1"}
+    - {id: 562, cat: TV, desc: "TV - Stargate Universe"}
+    - {id: 258, cat: TV, desc: "TV - Starved"}
+    - {id: 213, cat: TV, desc: "TV - Stella"}
+    - {id: 614, cat: TV, desc: "TV - Steven Seagal Lawman"}
+    - {id: 381, cat: TV, desc: "TV - Still Standing"}
+    - {id: 857, cat: TV, desc: "TV - Strike Back"}
+    - {id: 528, cat: TV, desc: "TV - Studio 60 on the Sunset Strip"}
+    - {id: 838, cat: TV, desc: "TV - Suburgatory"}
+    - {id: 761, cat: TV, desc: "TV - Suits"}
+    - {id: 214, cat: TV, desc: "TV - Summerland"}
+    - {id: 400, cat: TV, desc: "TV - Super Fun Night"}
+    - {id: 298, cat: TV, desc: "TV - Supernatural"}
+    - {id: 299, cat: TV, desc: "TV - Surface"}
+    - {id: 382, cat: TV, desc: "TV - Survivor"}
+    - {id: 215, cat: TV, desc: "TV - Survivors"}
+    - {id: 847, cat: TV, desc: "TV - Swamp People"}
+    - {id: 863, cat: TV, desc: "TV - Switched at Birth"}
+    - {id: 153, cat: TV, desc: "TV - Tattoo Nightmares"}
+    - {id: 217, cat: TV, desc: "TV - Teen Titans"}
+    - {id: 731, cat: TV, desc: "TV - Teen Wolf"}
+    - {id: 764, cat: TV, desc: "TV - Terra Nova"}
+    - {id: 119, cat: TV, desc: "TV - That 70s Show"}
+    - {id: 316, cat: TV, desc: "TV - The 100"}
+    - {id: 168, cat: TV, desc: "TV - The 4400"}
+    - {id: 300, cat: TV, desc: "TV - The Adventures of Sherlock Holmes"}
+    - {id: 185, cat: TV, desc: "TV - The After"}
+    - {id: 383, cat: TV, desc: "TV - The Amazing Race"}
+    - {id: 887, cat: TV, desc: "TV - The Americans"}
+    - {id: 301, cat: TV, desc: "TV - The Apprentice"}
+    - {id: 384, cat: TV, desc: "TV - The Bernie Mac Show"}
+    - {id: 583, cat: TV, desc: "TV - The Big Bang Theory"}
+    - {id: 829, cat: TV, desc: "TV - The Big C"}
+    - {id: 572, cat: TV, desc: "TV - The Biggest Loser"}
+    - {id: 581, cat: TV, desc: "TV - The Blacklist"}
+    - {id: 410, cat: TV, desc: "TV - The Boondocks"}
+    - {id: 608, cat: TV, desc: "TV - The Border"}
+    - {id: 775, cat: TV, desc: "TV - The Borgias"}
+    - {id: 923, cat: TV, desc: "TV - The Bridge US"}
+    - {id: 711, cat: TV, desc: "TV - The Cape"}
+    - {id: 730, cat: TV, desc: "TV - The Carrie Diaries"}
+    - {id: 586, cat: TV, desc: "TV - The Cleveland Show"}
+    - {id: 896, cat: TV, desc: "TV - The Client List"}
+    - {id: 218, cat: TV, desc: "TV - The Closer"}
+    - {id: 272, cat: TV, desc: "TV - The Colbert Report"}
+    - {id: 219, cat: TV, desc: "TV - The Comeback"}
+    - {id: 510, cat: TV, desc: "TV - The Contender"}
+    - {id: 758, cat: TV, desc: "TV - The Crazy Ones"}
+    - {id: 114, cat: TV, desc: "TV - The Daily Show"}
+    - {id: 856, cat: TV, desc: "TV - The Dead Files"}
+    - {id: 220, cat: TV, desc: "TV - The Dead Zone"}
+    - {id: 189, cat: TV, desc: "TV - The Divide"}
+    - {id: 386, cat: TV, desc: "TV - The Dog Whisperer"}
+    - {id: 702, cat: TV, desc: "TV - The Event"}
+    - {id: 610, cat: TV, desc: "TV - The F Word"}
+    - {id: 639, cat: TV, desc: "TV - The Family"}
+    - {id: 835, cat: TV, desc: "TV - The Finder"}
+    - {id: 834, cat: TV, desc: "TV - The Firm"}
+    - {id: 973, cat: TV, desc: "TV - The Flash"}
+    - {id: 877, cat: TV, desc: "TV - The Following"}
+    - {id: 635, cat: TV, desc: "TV - The Forgotten"}
+    - {id: 932, cat: TV, desc: "TV - The Fosters"}
+    - {id: 816, cat: TV, desc: "TV - The Game"}
+    - {id: 766, cat: TV, desc: "TV - The Gates"}
+    - {id: 259, cat: TV, desc: "TV - The Girls Next Door"}
+    - {id: 740, cat: TV, desc: "TV - The Glades"}
+    - {id: 587, cat: TV, desc: "TV - The Goldbergs"}
+    - {id: 648, cat: TV, desc: "TV - The Good Wife"}
+    - {id: 912, cat: TV, desc: "TV - The Goodwin Games"}
+    - {id: 278, cat: TV, desc: "TV - The Haunting Of"}
+    - {id: 903, cat: TV, desc: "TV - The Hero"}
+    - {id: 655, cat: TV, desc: "TV - The Hills"}
+    - {id: 221, cat: TV, desc: "TV - The Inside"}
+    - {id: 595, cat: TV, desc: "TV - The Jeff Dunham Show"}
+    - {id: 387, cat: TV, desc: "TV - The Jetsons"}
+    - {id: 827, cat: TV, desc: "TV - The Killing"}
+    - {id: 388, cat: TV, desc: "TV - The King Of Queens"}
+    - {id: 321, cat: TV, desc: "TV - The Knick"}
+    - {id: 271, cat: TV, desc: "TV - The L Word"}
+    - {id: 609, cat: TV, desc: "TV - The League"}
+    - {id: 897, cat: TV, desc: "TV - The Leftovers"}
+    - {id: 808, cat: TV, desc: "TV - The Life and Times of Tim"}
+    - {id: 924, cat: TV, desc: "TV - The Listener"}
+    - {id: 222, cat: TV, desc: "TV - The Lone Gunmen"}
+    - {id: 152, cat: TV, desc: "TV - The Lost World"}
+    - {id: 643, cat: TV, desc: "TV - The Mentalist"}
+    - {id: 878, cat: TV, desc: "TV - The Michael J Fox"}
+    - {id: 630, cat: TV, desc: "TV - The Middle"}
+    - {id: 405, cat: TV, desc: "TV - The Millers"}
+    - {id: 901, cat: TV, desc: "TV - The Mindy Project"}
+    - {id: 860, cat: TV, desc: "TV - The Mob Doctor"}
+    - {id: 870, cat: TV, desc: "TV - The Musketeers"}
+    - {id: 239, cat: TV, desc: "TV - The Mysteries Of Laura"}
+    - {id: 938, cat: TV, desc: "TV - The Newsroom"}
+    - {id: 109, cat: TV, desc: "TV - The O.C."}
+    - {id: 308, cat: TV, desc: "TV - The Office"}
+    - {id: 319, cat: TV, desc: "TV - The Originals"}
+    - {id: 392, cat: TV, desc: "TV - The Others"}
+    - {id: 390, cat: TV, desc: "TV - The O`Reilly Factor"}
+    - {id: 698, cat: TV, desc: "TV - The Pacific"}
+    - {id: 302, cat: TV, desc: "TV - The PJs"}
+    - {id: 567, cat: TV, desc: "TV - The Practice"}
+    - {id: 260, cat: TV, desc: "TV - The Real World"}
+    - {id: 176, cat: TV, desc: "TV - The Red Road"}
+    - {id: 597, cat: TV, desc: "TV - The Replacements"}
+    - {id: 664, cat: TV, desc: "TV - The Sci Fi Guys"}
+    - {id: 393, cat: TV, desc: "TV - The Secret Adventures of Jules Verne"}
+    - {id: 786, cat: TV, desc: "TV - The Secret Circle"}
+    - {id: 668, cat: TV, desc: "TV - The Secret Life of the American Teenager"}
+    - {id: 735, cat: TV, desc: "TV - The Shadow Line"}
+    - {id: 223, cat: TV, desc: "TV - The Shield"}
+    - {id: 125, cat: TV, desc: "TV - The Simpsons"}
+    - {id: 423, cat: TV, desc: "TV - The Sopranos"}
+    - {id: 333, cat: TV, desc: "TV - The Strain"}
+    - {id: 236, cat: TV, desc: "TV - The Tomorrow People US"}
+    - {id: 699, cat: TV, desc: "TV - The Tudors"}
+    - {id: 611, cat: TV, desc: "TV - The Ultimate Fighter"}
+    - {id: 320, cat: TV, desc: "TV - The Unexplained Files"}
+    - {id: 721, cat: TV, desc: "TV - The Vampire Diaries"}
+    - {id: 654, cat: TV, desc: "TV - The Venture Bros"}
+    - {id: 725, cat: TV, desc: "TV - The Voice"}
+    - {id: 720, cat: TV, desc: "TV - The Walking Dead"}
+    - {id: 394, cat: TV, desc: "TV - The War At Home"}
+    - {id: 116, cat: TV, desc: "TV - The West Wing"}
+    - {id: 577, cat: TV, desc: "TV - The X Factor"}
+    - {id: 425, cat: TV, desc: "TV - Thief"}
+    - {id: 268, cat: TV, desc: "TV - Threshold"}
+    - {id: 796, cat: TV, desc: "TV - Thundercats"}
+    - {id: 216, cat: TV, desc: "TV - TLC Connections"}
+    - {id: 904, cat: TV/Sport, desc: "TV - TNA-Wrestling"}
+    - {id: 399, cat: TV, desc: "TV - Tonight Show With Jay Leno"}
+    - {id: 616, cat: TV, desc: "TV - Top Chef"}
+    - {id: 224, cat: TV, desc: "TV - Top Gear"}
+    - {id: 942, cat: TV, desc: "TV - Top Shot"}
+    - {id: 762, cat: TV, desc: "TV - Torchwood"}
+    - {id: 836, cat: TV, desc: "TV - Touch"}
+    - {id: 225, cat: TV, desc: "TV - Trailer Park Boys"}
+    - {id: 1001, cat: TV, desc: "TV - Transformers Prime"}
+    - {id: 733, cat: TV, desc: "TV - Treme"}
+    - {id: 303, cat: TV, desc: "TV - Tripping the Rift"}
+    - {id: 787, cat: TV, desc: "TV - Trophy Wife"}
+    - {id: 565, cat: TV, desc: "TV - True Blood"}
+    - {id: 180, cat: TV, desc: "TV - True Detective"}
+    - {id: 727, cat: TV, desc: "TV - Turn"}
+    - {id: 261, cat: TV, desc: "TV - Twin Peaks"}
+    - {id: 930, cat: TV, desc: "TV - Twisted"}
+    - {id: 401, cat: TV, desc: "TV - Two And A Half Men"}
+    - {id: 337, cat: TV, desc: "TV - Tyrant"}
+    - {id: 793, cat: TV/Sport, desc: "TV - UFC"}
+    - {id: 814, cat: TV, desc: "TV - Ugly Americans"}
+    - {id: 559, cat: TV, desc: "TV - Ugly Betty"}
+    - {id: 155, cat: TV, desc: "TV - UK"}
+    - {id: 934, cat: TV, desc: "TV - Under the Dome"}
+    - {id: 791, cat: TV, desc: "TV - Underbelly"}
+    - {id: 706, cat: TV, desc: "TV - Undercover Boss"}
+    - {id: 777, cat: TV, desc: "TV - Unforgettable"}
+    - {id: 129, cat: TV, desc: "TV - Unscripted"}
+    - {id: 739, cat: TV, desc: "TV - Unsealed Alien Files"}
+    - {id: 226, cat: TV, desc: "TV - Unsolved Mysteries"}
+    - {id: 868, cat: TV, desc: "TV - Up All Night"}
+    - {id: 262, cat: TV, desc: "TV - Urgences"}
+    - {id: 566, cat: TV, desc: "TV - V"}
+    - {id: 895, cat: TV, desc: "TV - Veep"}
+    - {id: 864, cat: TV, desc: "TV - Vegas"}
+    - {id: 121, cat: TV, desc: "TV - Veronica Mars"}
+    - {id: 908, cat: TV, desc: "TV - Vice"}
+    - {id: 402, cat: TV, desc: "TV - Viewtiful Joe"}
+    - {id: 799, cat: TV, desc: "TV - Vikings"}
+    - {id: 227, cat: TV, desc: "TV - Viva La Bam"}
+    - {id: 263, cat: TV, desc: "TV - Wanted"}
+    - {id: 593, cat: TV, desc: "TV - Warehouse 13"}
+    - {id: 995, cat: TV, desc: "TV - Wayward Pines"}
+    - {id: 264, cat: TV, desc: "TV - Weeds"}
+    - {id: 404, cat: TV, desc: "TV - Weird U S"}
+    - {id: 909, cat: TV, desc: "TV - Wentworth"}
+    - {id: 596, cat: TV, desc: "TV - When Ghosts Attack"}
+    - {id: 575, cat: TV, desc: "TV - White Collar"}
+    - {id: 406, cat: TV, desc: "TV - Whose Line Is It Anyway"}
+    - {id: 918, cat: TV, desc: "TV - Wilfred US"}
+    - {id: 135, cat: TV, desc: "TV - Will And Grace"}
+    - {id: 673, cat: TV, desc: "TV - Witches of East End"}
+    - {id: 408, cat: TV, desc: "TV - Without A Trace"}
+    - {id: 800, cat: TV, desc: "TV - Workaholics"}
+    - {id: 127, cat: TV/Sport, desc: "TV - WWE - Wrestling"}
+    - {id: 228, cat: TV, desc: "TV - X Files"}
+    - {id: 770, cat: TV, desc: "TV - X-Men"}
+    - {id: 265, cat: TV, desc: "TV - Young and the Restless"}
+    - {id: 801, cat: TV, desc: "TV - Young Justice"}
+    - {id: 889, cat: TV, desc: "TV - Zero Hour US"}
+    - {id: 1025, cat: TV/HD, desc: "TV - HEVC/x265"}
+    - {id: 1026, cat: TV/SD, desc: "TV - Divx/Xvid"}
+    - {id: 1027, cat: TV/SD, desc: "TV - DVD"}
+    - {id: 1028, cat: TV/HD, desc: "TV - HD"}
+    - {id: 1029, cat: TV/SD, desc: "TV - SVCD/VCD"}
+    # Apps
+    - {id: 7, cat: PC, desc: "Software"}
+    - {id: 532, cat: PC, desc: "Software - KeyGen / Tools"}
+    - {id: 17, cat: PC, desc: "Software - Linux"}
+    - {id: 27, cat: PC/Mac, desc: "Software - Mac"}
+    - {id: 232, cat: PC/Mobile-Other, desc: "Software - Mobile phones"}
+    - {id: 18, cat: PC, desc: "Software - Other operating systems"}
+    - {id: 19, cat: PC, desc: "Software - Palm, PocketPC and IPAQ"}
+    - {id: 20, cat: PC, desc: "Software - Windows - CD/DVD Tools"}
+    - {id: 25, cat: PC, desc: "Software - Windows - Other"}
+    - {id: 21, cat: PC, desc: "Software - Windows - Photo Editing"}
+    - {id: 22, cat: PC, desc: "Software - Windows - Security"}
+    - {id: 23, cat: PC, desc: "Software - Windows - Sound Editing"}
+    - {id: 24, cat: PC, desc: "Software - Windows - Video Apps"}
+    # Games
+    - {id: 3, cat: PC/Games, desc: "Games"}
+    - {id: 136, cat: PC/Games, desc: "Games - fixes/patches"}
+    - {id: 422, cat: PC/Games, desc: "Games - Other"}
+    - {id: 26, cat: PC/Games, desc: "Games - Mac"}
+    - {id: 231, cat: Console, desc: "Games - Mobile phones"}
+    - {id: 627, cat: Console/NDS, desc: "Games - Nintendo DS"}
+    - {id: 11, cat: Console, desc: "Games - PS 2"}
+    - {id: 700, cat: Console/PS3, desc: "Games - PS 3"}
+    - {id: 12, cat: Console, desc: "Games - PS X"}
+    - {id: 158, cat: Console/PSP, desc: "Games - PSP"}
+    - {id: 13, cat: Console, desc: "Games - ROMS/Retro"}
+    - {id: 15, cat: Console, desc: "Games - Sega Saturn"}
+    - {id: 14, cat: PC/Games, desc: "Games - Video Demonstrations"}
+    - {id: 701, cat: Console/Wii, desc: "Games - Wii"}
+    - {id: 421, cat: PC/Games, desc: "Games - Windows"}
+    - {id: 10, cat: PC/Games, desc: "Games - Windows Kids Games"}
+    - {id: 16, cat: Console/XBox, desc: "Games - XBox"}
+    - {id: 1017, cat: Console, desc: "Games - PS 1"}
+    - {id: 1018, cat: Console/XBox 360, desc: "Games - Xbox 360"}
+    - {id: 1014, cat: Console/3DS, desc: "Games - Nintendo 3DS"}
+    - {id: 1015, cat: Console, desc: "Games - Dreamcast"}
+    - {id: 1016, cat: Console, desc: "Games - GameCube"}
+    # XXX
+    - {id: 533, cat: XXX, desc: "XXX"}
+    - {id: 943, cat: XXX, desc: "XXX - Animation/Hentai"}
+    - {id: 553, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 536, cat: XXX, desc: "XXX - Games"}
+    - {id: 948, cat: XXX/x264, desc: "XXX - HD Video"}
+    - {id: 535, cat: XXX/ImageSet, desc: "XXX - Pictures"}
+    - {id: 552, cat: XXX, desc: "XXX - Video"}
+    - {id: 804, cat: XXX, desc: "XXX - Video 3D"}
+    - {id: 970, cat: XXX, desc: "XXX - Virtual Reality"}
+    - {id: 806, cat: XXX, desc: "XXX - Wallpapers"}
+    - {id: 811, cat: XXX, desc: "XXX - Books"}
+    # Books
+    - {id: 2, cat: Books, desc: "Books"}
+    - {id: 625, cat: Books, desc: "Books - Adventure"}
+    - {id: 51, cat: Audio/Audiobook, desc: "Books - Audio books"}
+    - {id: 848, cat: Books/Comics, desc: "Books - Comics"}
+    - {id: 624, cat: Books, desc: "Books - Crime"}
+    - {id: 623, cat: Books, desc: "Books - Drama"}
+    - {id: 50, cat: Books/EBook, desc: "Books - Ebooks"}
+    - {id: 621, cat: Books, desc: "Books - Educational"}
+    - {id: 622, cat: Books, desc: "Books - Horror"}
+    - {id: 465, cat: Books/Mags, desc: "Books - Magazines"}
+    - {id: 1000, cat: Books, desc: "Books - Sexual Fitness and Education"}
+    - {id: 626, cat: Books, desc: "Books - True Stories"}
+    # Other
+    - {id: 6, cat: Other, desc: "Pictures"}
+    - {id: 9, cat: Other, desc: "Other"}
+    - {id: 53, cat: Other, desc: "Pictures - Other"}
+    - {id: 52, cat: Other, desc: "Pictures - Wallpapers"}
+    - {id: 80, cat: Other, desc: "Other - Articles"}
+    - {id: 143, cat: Other, desc: "Other - Comics"}
+    - {id: 85, cat: Other, desc: "Other - Funny clips"}
+    - {id: 81, cat: Other, desc: "Other - Manuals"}
+    - {id: 83, cat: Other, desc: "Other - Other"}
+    - {id: 413, cat: Other, desc: "Other - Radio shows"}
+    - {id: 82, cat: Other, desc: "Other - Religion"}
+    - {id: 874, cat: Other, desc: "Other - Subtitles"}
+    - {id: 557, cat: Other, desc: "Other - Training "}
+    - {id: 1021, cat: Other, desc: "Other - Tutorials"}
+    - {id: 1022, cat: Other, desc: "Other - Sounds"}
+    - {id: 1023, cat: Other, desc: "Other - Nulled Scripts"}
+    # Mobile
+    - {id: 416, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 752, cat: PC/Mobile-Other, desc: "Mobile - Games for Android"}
+    - {id: 746, cat: PC/Mobile-Other, desc: "Mobile - Games for Apple iPod, iPod Touch, iPad, iPhone"}
+    - {id: 745, cat: PC/Mobile-Other, desc: "Mobile - Games for Java"}
+    - {id: 744, cat: PC/Mobile-Other, desc: "Mobile - Games for Symbian"}
+    - {id: 743, cat: PC/Mobile-Other, desc: "Mobile - Games for Windows Mobile"}
+    - {id: 517, cat: PC/Mobile-Other, desc: "Mobile - Music"}
+    - {id: 554, cat: PC/Mobile-Other, desc: "Mobile - Other"}
+    - {id: 748, cat: PC/Mobile-Other, desc: "Mobile - Software - Other"}
+    - {id: 972, cat: PC/Mobile-Other, desc: "Mobile - Software for Android"}
+    - {id: 749, cat: PC/Mobile-Other, desc: "Mobile - Software for Apple iPad, iPhone, iPod Touch"}
+    - {id: 747, cat: PC/Mobile-Other, desc: "Mobile - Software for Windows Mobile"}
+    - {id: 428, cat: PC/Mobile-Other, desc: "Mobile - Tv"}
+    - {id: 417, cat: PC/Mobile-Other, desc: "Mobile - Video"}
+    - {id: 750, cat: PC/Mobile-Other, desc: "Mobile - Video for Apple iPad, iPhone, iPod Touch"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings: []
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}{{ else }}/home{{ end }}"
+
+  rows:
+    selector: tr[class^="tl"]
+
+  fields:
+    title:
+      selector: td.tli a
+    category:
+      selector: td a[href^="/category/"]
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 2]
+    details:
+      selector: td.tli a
+      attribute: href
+    download:
+      selector: td a[href^="magnet:?xt="]
+      attribute: href
+      filters:
+        - name: replace
+          args: [";", "&"]
+    date:
+      selector: td:nth-last-of-type(5)
+      filters:
+        - name: timeago
+    size:
+      selector: td:nth-last-of-type(4)
+    seeders:
+      text: 0
+    leechers:
+      text: 0
+    seeders:
+      optional: true
+      selector: td.sy
+    leechers:
+      optional: true
+      selector: td.ly
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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/extremlymtorrents.yml

@@ -1,179 +0,0 @@
----
-id: extremlymtorrents
-name: ExtremlymTorrents
-description: "ExtremlymTorrents (XTR) is a Semi-Private tracker for MOVIES / TV / GENERAL"
-language: en-us
-type: semi-private
-encoding: UTF-8
-links:
-  - https://extremlymtorrents.ws/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: Movies/HD, desc: "720p HD"}
-    - {id: 15, cat: Movies/HD, desc: "1080p HD"}
-    - {id: 40, cat: Movies/UHD, desc: "4K UHD 2160p"}
-    - {id: 12, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 5, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 16, cat: Movies/3D, desc: "BluRay 3D"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 47, cat: XXX, desc: "Porn UHD 4K -[+18]- xXx"}
-    - {id: 11, cat: XXX, desc: "Porn -[+18]- xXx"}
-    - {id: 50, cat: XXX, desc: "xXx iMAGESET (+18)"}
-    - {id: 41, cat: TV, desc: "TVRip"}
-    - {id: 6, cat: Audio, desc: "Music Mp3 | FLAC"}
-    - {id: 9, cat: TV, desc: "Kidz | Cartoons"}
-    - {id: 8, cat: Books/EBook, desc: "Comics | EBook"}
-    - {id: 10, cat: TV, desc: "TV Episode | Season Complete"}
-    - {id: 27, cat: Movies/DVD, desc: "DVD | PAL | NTSC"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "WEBRip | WEB-DL"}
-    - {id: 35, cat: Movies, desc: "BRRip | BDRip | HDRip"}
-    - {id: 3, cat: PC, desc: "Applications"}
-    - {id: 17, cat: Console/PSP, desc: "PSP | Playstation "}
-    - {id: 30, cat: TV/SD, desc: "PDTV | SDTV"}
-    - {id: 18, cat: Console/PS3, desc: "PS3 | Playstation 3 "}
-    - {id: 46, cat: Console/PS4, desc: "PS4 | PlayStation 4"}
-    - {id: 20, cat: PC/Mobile-iOS, desc: "Iphone iOS"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Android Apk"}
-    - {id: 21, cat: Movies, desc: "Pack"}
-    - {id: 49, cat: TV/UHD, desc: "TV UHD | 2160p | Episodes"}
-    - {id: 24, cat: Audio/Video, desc: "VideoClip"}
-    - {id: 26, cat: Console/Wii, desc: "Wii Games"}
-    - {id: 31, cat: TV/Documentary, desc: "DOC's"}
-    - {id: 36, cat: Movies, desc: "CAMRip | REC"}
-    - {id: 38, cat: Movies, desc: "TS: TeleSync | HD-TS"}
-    - {id: 48, cat: Audio/Video, desc: "4K | 2160p | Music Video"}
-    - {id: 28, cat: TV/Anime, desc: "Anime | Japanese"}
-    - {id: 43, cat: XXX, desc: "Hentai | Manga"}
-    - {id: 29, cat: PC/0day, desc: "Windows PC"}
-    - {id: 7, cat: PC/Mac, desc: "Mac"}
-    - {id: 23, cat: PC, desc: "Linux"}
-    - {id: 32, cat: PC/Mobile-Other, desc: "GPS Navigation"}
-    - {id: 45, cat: Audio, desc: "Vinyl Rip"}
-    - {id: 2, cat: Console/XBox 360, desc: "XBOX 360"}
-    - {id: 1, cat: PC/Games, desc: "Games PC"}
-    - {id: 14, cat: Other, desc: "Wallpapers"}
-    - {id: 44, cat: Movies, desc: "Bollywood"}
-    - {id: 42, cat: Other/Misc, desc: "X EXTERN ONLY MAGNET"}
-    - {id: 39, cat: TV/Sport, desc: "Sport TV"}
-
-  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: 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: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: span.titlebar:contains("Access Denied")
-      message:
-        selector: td.text
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 all 1 English 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.xtrz > tbody > tr[class^="ttable_col"]
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    language:
-      selector: td:nth-last-child(5)
-    description:
-      optional: true
-      selector: img[src="/images/vip-icon.png"]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/images/vip-icon.png", " VIP ONLY"]
-    title:
-      selector: a[href^="file.php?id="] b
-      filters:
-        - name: append
-          args: " {{ .Result.language }}{{ .Result.description }}"
-    details:
-      selector: a[href^="file.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="file.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
-    leechers:
-      selector: td:nth-last-child(2)
-    seeders:
-      selector: td:nth-last-child(3)
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        img[src="/images/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# engine n/a

src/Jackett.Common/Definitions/exttorrents.yml

@@ -8,8 +8,9 @@ encoding: UTF-8
 links:
   - https://ext.to/
   - https://torrent.extto.com/
+  - https://ext.torrentbay.to/
 legacylinks:
-  - https://ext.unblockninja.com/ # currently redirects to https://ext.to/
+  - https://ext.unblockninja.com/ # currently redirects to https://ext.torrentbay.to/
   - https://t.extto.com/ # redirects to https://torrent.extto.com/
 
 caps:
@@ -34,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"}
@@ -51,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]
@@ -75,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="]
@@ -84,6 +99,13 @@ download:
 search:
   paths:
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&{{ else }}latest/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/2/&{{ else }}latest/2/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
+    - 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.onl/
+  - https://eztv.nocensor.space/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
@@ -36,6 +35,15 @@ 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/
+  - https://eztv.unblockit.buzz/
+  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.club/
 
 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:
@@ -78,12 +79,11 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     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]
@@ -68,7 +69,7 @@ search:
     - path: "{{ if .Keywords }}index.php?do=search&type=simple&q=abcd1234{{ else }}%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/{{ end }}"
 
   rows:
-    selector: "{{ if .Keywords }}table.torrents tbody tr{{ else }}div[id^=\"post-id-\"]{{ end }}"
+    selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
     filters:
       - name: andmatch