assorted yml: convert to categorymappings

code tidy
when seeds and leech are missing default to 0

README.md

@@ -1,5 +1,4 @@
 # Jackett
-# Jackett
 
 [![GitHub issues](https://img.shields.io/github/issues/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/pulls)
@@ -14,7 +13,7 @@ Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) be
 
 Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc.) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
 
-Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
+Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with hybrid [nZEDb](https://github.com/nZEDb/nZEDb/blob/b485fa326a0ff1f47ce144164eb1f070e406b555/resources/db/schema/data/10-categories.tsv)/[Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) [category numbering](https://github.com/Jackett/Jackett/wiki/Jackett-Categories)) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
 
 
@@ -30,6 +29,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ACG.RIP
  * ACGsou (36DM)
  * Anidex
+ * AniLibria
+ * Animedia
  * Anime Tosho
  * AniRena
  * AniSource
@@ -40,6 +41,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BTDB
  * BTDIGG
  * BTSOW
+ * Byrutor
  * CiliPro (LIAORENCILI)
  * ConCen
  * Corsaro.red
@@ -48,7 +50,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Demonoid
  * dmhy
  * E-Hentai
- * EliteTorrent.biz
+ * emtrek
  * Epizod
  * ETTV
  * EXT Torrents
@@ -60,25 +62,27 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * GamesTorrents
  * GkTorrent
  * GloDLS
+ * GTorrent
  * HDReactor
- * Horrible Subs
  * IBit
  * Idope
  * Il CorSaRo Blu
- * Il Corsaro Nero <!-- maintained by bonny1992 -->
+ * Il Corsaro Nero
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * KickAssTorrent (kat.li)
  * KickAssTorrent (KATcr)
+ * kickasstorrents (kickass.ws)
+ * kickasstorrents.to
  * Legit Torrents
- * LePorno
+ * LePorno.info
  * LimeTorrents
  * LinuxTracker
  * MacTorrents
  * Magnet4You
  * MagnetDL
- * MejorTorrent <!-- maintained by ivandelabeldad -->
+ * MejorTorrent
+ * MixTapeTorrent
  * Monova
  * MovCr
  * MoviesDVDR
@@ -101,6 +105,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * PornoLive
  * PornoRip
  * PornoTor
+ * ProPorn
  * ProStyleX
  * Rapidzona
  * RARBG
@@ -111,16 +116,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RuTracker.RU
  * seleZen
  * Sexy-Pics
+ * ShizaProject
  * shokweb
  * ShowRSS
- * SkyTorrentsClone
+ * SkyTorrentsClone (*.lol)
+ * SkyTorrentsClone2 (*.to)
  * Solid Torrents
  * sosulki
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
  * Tokyo Tosho
- * TopNow
  * Torlock
  * TOROS
  * Torrent Bomb (토렌트봄)
@@ -134,6 +140,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
+ * TorrentMafya
  * TorrentParadise
  * TorrentProject2
  * TorrentQuest
@@ -145,6 +152,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * truPornolabs
  * Underverse
  * UnionDHT
+ * VSTHouse
+ * VST Torrents
  * XFSUB
  * xxxAdultTorrent
  * xxxtor
@@ -161,8 +170,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ArenaBG
  * BaibaKo
  * BookTracker
+ * BootyTape
  * CasStudioTV
- * CzTorrent
  * cool-torrent
  * Darmowe torrenty
  * Deildu
@@ -172,10 +181,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Erzsebet
  * Erzsebet.pl
  * ExKinoRay
- * ExtremlymTorrents
- * Gay-Torrents.net
- * Gay-Torrents.org
- * HD Dolby
+ * ExtremlymTorrents (XTR)
+ * Genesis-Movement
  * HamsterStudio
  * IV-Torrents
  * KinoNaVse100
@@ -200,7 +207,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Sharewood
  * SkTorrent
  * SkTorrent-org
- * SoundPark
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
@@ -216,15 +222,14 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * 1ptbar
  * 2 Fast 4 You
  * 32Pages (32P)
- * 3ChangTrai (3CT)
- * 3D Torrents (3DT)
+ * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
+ * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
  * 3evils
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
- * AST4u
- * Abnormal
- * Acid Lounge (A-L)
+ * Abnormal [![(invite needed)][inviteneeded]](#)
+ * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
  * Aftershock
  * Aidoru!Online
  * Aither
@@ -233,42 +238,44 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
  * Anthelion
- * Araba Fenice (Phoenix)
+ * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * Asgaard (AG)
  * AsianCinema
+ * AST4u [![(invite needed)][inviteneeded]](#)
+ * Asylum Share
  * AudioNews (AN)
  * Audiobook Torrents (ABT + RNS)
  * AvistaZ (AsiaTorrents)
  * Awesome-HD (AHD)
- * BIGTorrent
- * BIT-HDTV
- * BJ-Share (BJ)
- * BRObits
- * BTGigs (TG)
- * BTNext (BTNT)
- * BTSCHOOL
+ * Borgzelle
  * Back-ups
- * BaconBits (bB)
+ * bB
  * BakaBT
  * BeiTai
  * BeyondHD (BHD)
- * BiT-TiTAN
  * Bibliotik
+ * BIGTorrent
  * BigTower
- * Bit-City Reloaded
+ * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
+ * BIT-HDTV
+ * BiT-TiTAN
  * BitHUmen
  * BitTorrentFiles
  * BiTTuRK
  * Bithorlo (BHO)
  * Bitspyder
- * BlueBird
+ * BJ-Share (BJ)
+ * BlueBird [![(invite needed)][inviteneeded]](#)
  * Blutopia (BLU)
  * Boxing Torrents
  * Brasil Tracker
- * BroadCity
+ * BroadCity [![(invite needed)][inviteneeded]](#)
  * BroadcasTheNet (BTN)
- * BrokenStones
+ * BrokenStones [![(invite needed)][inviteneeded]](#)
+ * BTGigs (TG) [![(invite needed)][inviteneeded]](#)
+ * BTNext (BTNT)
+ * BTSCHOOL
  * BWTorrents
  * CCFBits
  * CGPeers
@@ -276,7 +283,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Carp-Hunter
  * Carpathians
  * CartoonChaos (CC)
- * CasaTorrent
+ * CasaTorrent [![(invite needed)][inviteneeded]](#)
  * ChannelX
  * ChileBT
  * Cinecalidad
@@ -289,22 +296,21 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
- * DXDHD
- * DanishBits (DB)
+ * Darius Tracker
  * Dark-Shadow
  * Dark Tracker
- * Das Unerwartete
+ * Das Unerwartete [![(invite needed)][inviteneeded]](#)
  * DataScene (DS)
  * DesiReleasers
  * DesiTorrents
  * Diablo Torrent
  * DICMusic
  * DigitalCore
- * DigitalHive
  * DivTeam
  * DivxTotal
  * DocumentaryTorrents (DT)
- * Dragonworld Reloaded
+ * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
+ * DXDHD
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
@@ -316,7 +322,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Ethor.net (Thor's Land)
  * ExoticaZ (YourExotic)
  * ExtremeBits
- * ExtremeTorrents
+ * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * FANO.IN
  * Fantastic Heaven
  * Femdomcult
@@ -329,61 +335,67 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * FreeTorrent
  * FullMixMusic
  * FunFile (FF)
- * FunkyTorrents (FT)
+ * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
+ * FunReleases [![(invite needed)][inviteneeded]](#)
  * Fuzer (FZ)
- * GAYtorrent.ru
  * GFXPeers
  * Galeriens (LaPauseTorrents)
- * GazelleGames (GGn)
+ * Gay-Torrents.net
+ * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
+ * GAYtorrent.ru
+ * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
  * Generation-Free
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreekDiamond
  * Greek Team
+ * HaiDan
+ * HacheDe
+ * HD Dolby [![(invite needed)][inviteneeded]](#)
  * HD-Bits.com
  * HD-Forever (HDF)
  * HD-Olimpo
  * HD-Only (HDO)
  * HD-Space (HDS)
- * HD-Spain
+ * HD-Spain [![(invite needed)][inviteneeded]](#)
  * HD-Torrents (HDT)
- * HD4FANS
+ * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDArea (HDA)
  * HDBits
- * HDCenter
+ * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing)
  * HDC (HDCiTY)
  * HDCity
  * HDDisk (HDD)
  * HDHome (HDBigger)
  * HDME
- * HDRoute
+ * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky
  * HDStreet
  * HDTime
  * HDTorrents.it
- * HDTurk
- * HDU
+ * HDTurk [![(invite needed)][inviteneeded]](#)
+ * HDU [![(invite needed)][inviteneeded]](#)
  * HDZone
- * HaiDan
- * HQSource (HQS)
- * HacheDe
  * Hebits
  * HellasTZ
  * Hon3y HD
  * Horror Site
- * HuSh
+ * HQSource (HQS)
+ * HuSh [![(invite needed)][inviteneeded]](#)
  * ICE Torrent
  * IPTorrents (IPT)
  * ImmortalSeed (iS)
  * Immortuos
  * Insane Tracker
+ * IPTorrents (IPT)
  * JPopsuki
  * JPTV
  * Karagarga
  * Keep Friends
  * LastFiles
+ * LatinoP2P
  * Le Saloon
  * LeChaudron
  * LeagueHD
@@ -394,24 +406,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * LinkoManija
  * LosslessClub
  * M-Team TP (MTTP)
+ * MaDs Revolution
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
  * MicroBit (µBit)
  * Milkie
  * MMA-Torrents
- * Mononoké-BT
+ * MNV (Max-New-Vision)
+ * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
+ * Movie Zone (Mz)
  * MyAnonamouse (MAM)
- * myAmity
- * MySpleen
- * NBTorrents
+ * MySpleen [![(invite needed)][inviteneeded]](#)
+ * NBTorrents [![(invite needed)][inviteneeded]](#)
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NetLab
- * New Real World
+ * New Real World [![(invite needed)][inviteneeded]](#)
  * NorBits
- * NordicBits (NB)
  * notwhat.cd
  * oMg[WtF]trackr
  * OnlineSelfEducation
@@ -421,92 +434,91 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Ourbits (HDPter)
  * P2PBG
  * P2PElite
- * PTFiles (PTF)
- * PThome
- * PWTorrents (PWT)
- * Partis
+ * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
  * Peers.FM
  * Pirata Digital
  * PirateTheNet (PTN)
  * PixelCove (Ultimate Gamer)
- * PiXELHD (PxHD)
+ * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * Pleasuredome
  * PolishSource (PS)
  * PolishTracker
  * PornBits (PB)
- * Pornbay
+ * Pornbay [![(invite needed)][inviteneeded]](#)
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
- * Psytorrents
+ * Psytorrents [![(invite needed)][inviteneeded]](#)
  * PTerClub
+ * PTFiles (PTF)
+ * PThome
  * PTMSG
  * PTSBAO
  * PuntoTorrent
  * PuroVicio
- * R3V WTF!
- * RPTorrents
+ * Puur-Hollands
+ * PWTorrents (PWT)
+ * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
- * Red Star Torrent (RST)
+ * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RetroFlix
  * RevolutionTT
- * Romanian Metal Torrents (RMT)
- * SDBits
+ * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
+ * RPTorrents
  * SceneFZ
  * SceneHD
  * ScenePalace (SP)
  * SceneRush
  * SceneTime
+ * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile (SF)
  * ShareUniversity
  * Shareisland
  * Shazbat
- * Shellife (SL)
+ * Shellife (SL) [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SnowPT (SSPT)
- * SoulVoice
+ * SoulVoice [![(invite needed)][inviteneeded]](#)
  * SpaceTorrent
  * SpeedCD
  * Speedmaster HD
  * SpeedTorrent Reloaded
- * Spirit of Revolution
+ * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
+ * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
  * SpringSunday
  * Superbits (SBS)
- * TEKNO3D
- * TLFBits
- * TOrrent-tuRK (TORK)
- * TTsWEB
- * TV Chaos UK (TVCUK)
- * TV-Vault
- * TVstore
  * TakeaByte
  * Tapochek
- * Tasmanit
+ * Tasmanit [![(invite needed)][inviteneeded]](#)
  * TeamHD
  * TeamOS
+ * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
- * TenYardTorrents (TYT)
+ * TenYardTorrents (TYT) [![(invite needed)][inviteneeded]](#)
  * The Falling Angels (TFA)
- * The Geeks
+ * The Geeks [![(invite needed)][inviteneeded]](#)
  * The Horror Charnel (THC)
  * The New Retro
- * The Occult
- * The Place
+ * The Occult [![(invite needed)][inviteneeded]](#)
+ * The Place [![(invite needed)][inviteneeded]](#)
  * The Shinning (TsH)
- * The Show
- * The Vault
+ * The Show [![(invite needed)][inviteneeded]](#)
+ * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
- * TheEmpire (TE)
+ * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
  * TJUPT
+ * TLFBits [![(invite needed)][inviteneeded]](#)
  * ToTheGlory (TTG)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
- * Torrent-Syndikat
+ * Torrent Surf
+ * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
+ * TOrrent-tuRK (TORK)
  * Torrent.LT
  * TorrentBD
  * TorrentBytes (TBy)
@@ -515,31 +527,34 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentDB
  * TorrentFactory
  * TorrentHR
- * TorrentHeaven
+ * TorrentHeaven [![(invite needed)][inviteneeded]](#)
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentSeeds (TS)
  * Torrentech (TTH)
- * Torrenting (TT)
+ * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
  * Torrentland
  * TotallyKids (TK)
- * TorrentSeed
- * TranceTraffic
+ * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
+ * TTsWEB
  * TurkSeed
  * TurkTorrent (TT)
+ * TV Chaos UK (TVCUK)
+ * TV-Vault
+ * TVstore
  * Twilight Torrents
  * Twilights Zoom
- * U2 (U2分享園@動漫花園)
+ * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UHDBits
- * UnionGang
+ * UnionGang [![(invite needed)][inviteneeded]](#)
  * UnlimitZ
  * Vizuk
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
- * World-In-HD
  * Witch-Hunter (Demon-Site)
- * World-of-Tomorrow
- * x-ite.me (XM)
+ * wOOt [![(invite needed)][inviteneeded]](#)
+ * World-In-HD [![(invite needed)][inviteneeded]](#)
+ * x-ite.me (XM) [![(invite needed)][inviteneeded]](#)
  * xBytesV2
  * XSpeeds (XS)
  * XWT-Classics
@@ -552,7 +567,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Zelka.org
 </details>
 
-Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maintainer and are missing features or are broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved.
+Trackers marked with [![(invite needed)][inviteneeded]](#) have no active maintainer and may be missing features or be broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved.
 
 ### Aggregate indexers
 

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

@@ -23,7 +23,7 @@ caps:
     - {id: 41, cat: Movies/3D, desc: "HD / 3D видео (HD / 3D video)"}
     - {id: 47, cat: Movies, desc: "HDv 0day Team"}
     - {id: 17, cat: PC/Games, desc: "Игры / ПК (Games / PC)"}
-    - {id: 25, cat: Console/Xbox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
+    - {id: 25, cat: Console/XBox 360, desc: "Игры / XBOX360 (Games / XBOX360)"}
     - {id: 33, cat: Console/PSP, desc: "Игры / PSP - PS2 (Games / PSP - PS2)"}
     - {id: 37, cat: Console/PS3, desc: "Игры / PS3 (Games / PS3)"}
     - {id: 18, cat: PC/0day, desc: "Софт / Windows (Software / Windows)"}
@@ -58,19 +58,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
@@ -148,8 +148,10 @@ search:
     date:
       selector: td:nth-child(2) i
       filters:
+        - name: append
+          args: " +03:00"
         - name: dateparse
-          args: "2006-01-02 15:04:05"
+          args: "2006-01-02 15:04:05 -07:00"
     size:
       selector: td:nth-child(4)
       filters:
@@ -187,4 +189,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.2
 # engine n/a

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

@@ -15,7 +15,7 @@ links:
   - https://x1337x.eu/
   - https://x1337x.se/
   - https://1337.root.yt/
-  - https://1337x.unblockit.top/
+  - https://1337x.unblockit.lat/
   - https://1337x.unblocked.rest/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -34,6 +34,7 @@ legacylinks:
   - https://1337x.unblocked.bar/
   - https://1337x.proxyportal.pw/
   - https://1337x.uk-unblock.pro/
+  - https://1337x.unblockit.top/
 
 caps:
   categorymappings:
@@ -43,7 +44,6 @@ caps:
     - {id: 79, cat: TV/Anime, desc: "Anime/Dubbed"}
     - {id: 80, cat: TV/Anime, desc: "Anime/Subbed"}
     - {id: 81, cat: TV/Anime, desc: "Anime/Raw"}
-
     # Audio
     - {id: 22, cat: Audio/MP3, desc: "Music/MP3"}
     - {id: 23, cat: Audio/Lossless, desc: "Music/Lossless"}
@@ -57,7 +57,6 @@ caps:
     - {id: 60, cat: Audio, desc: "Music/Single"}
     - {id: 68, cat: Audio, desc: "Music/Concerts"}
     - {id: 69, cat: Audio, desc: "Music/AAC"}
-
     # Movies
     - {id: 1, cat: Movies/DVD, desc: "Movies/DVD"}
     - {id: 2, cat: Movies/SD, desc: "Movies/Divx/Xvid"}
@@ -70,7 +69,6 @@ caps:
     - {id: 70, cat: Movies/HD, desc: "Movies/HEVC/x265"}
     - {id: 73, cat: Movies, desc: "Movies/Bollywood"}
     - {id: 76, cat: Movies/UHD, desc: "Movies/UHD"}
-
     # TV
     - {id: 5, cat: TV, desc: "TV/DVD"}
     - {id: 6, cat: TV, desc: "TV/Divx/Xvid"}
@@ -80,44 +78,40 @@ caps:
     - {id: 74, cat: TV, desc: "TV/Cartoons"}
     - {id: 75, cat: TV/SD, desc: "TV/SD"}
     - {id: 9, cat: TV/Documentary, desc: "TV/Documentary"}
-
     # Apps
     - {id: 18, cat: PC, desc: "Apps/PC Software"}
     - {id: 19, cat: PC/Mac, desc: "Apps/Mac"}
     - {id: 20, cat: PC, desc: "Apps/Linux"}
     - {id: 21, cat: PC, desc: "Apps/Other"}
-    - {id: 56, cat: PC/Phone-Android, desc: "Apps/Android"}
-    - {id: 57, cat: PC/Phone-IOS, desc: "Apps/iOS"}
-
+    - {id: 56, cat: PC/Mobile-Android, desc: "Apps/Android"}
+    - {id: 57, cat: PC/Mobile-iOS, desc: "Apps/iOS"}
     # Games
     - {id: 10, cat: PC/Games, desc: "Games/PC Game"}
-    - {id: 11, cat: Console/Other, desc: "Games/PS2"}
+    - {id: 11, cat: Console/PS3, desc: "Games/PS2"}
     - {id: 12, cat: Console/PSP, desc: "Games/PSP"}
-    - {id: 13, cat: Console/Xbox, desc: "Games/Xbox"}
-    - {id: 14, cat: Console/Xbox 360, desc: "Games/Xbox360"}
-    - {id: 15, cat: Console/Other, desc: "Games/PS1"}
+    - {id: 13, cat: Console/XBox, desc: "Games/Xbox"}
+    - {id: 14, cat: Console/XBox 360, desc: "Games/Xbox360"}
+    - {id: 15, cat: Console/PS3, desc: "Games/PS1"}
     - {id: 16, cat: Console/Other, desc: "Games/Dreamcast"}
-    - {id: 17, cat: PC/Phone-Other, desc: "Games/Other"}
+    - {id: 17, cat: PC/Mobile-Other, desc: "Games/Other"}
     - {id: 43, cat: Console/PS3, desc: "Games/PS3"}
     - {id: 44, cat: Console/Wii, desc: "Games/Wii"}
     - {id: 45, cat: Console/NDS, desc: "Games/DS"}
-    - {id: 46, cat: Console, desc: "Games/GameCube"}
+    - {id: 46, cat: Console/Other, desc: "Games/GameCube"}
     - {id: 72, cat: Console/3DS, desc: "Games/3DS"}
     - {id: 77, cat: Console/PS4, desc: "Games/PS4"}
     - {id: 82, cat: Console/Other, desc: "Games/Switch"}
-
     # XXX
     - {id: 48, cat: XXX/DVD, desc: "XXX/Video"}
-    - {id: 49, cat: XXX/Imageset, desc: "XXX/Picture"}
+    - {id: 49, cat: XXX/ImageSet, desc: "XXX/Picture"}
     - {id: 50, cat: XXX, desc: "XXX/Magazine"}
     - {id: 51, cat: XXX, desc: "XXX/Hentai"}
     - {id: 67, cat: XXX, desc: "XXX/Games"}
-
     # Other
     - {id: 33, cat: Other, desc: "Other/Emulation"}
     - {id: 34, cat: Books, desc: "Other/Tutorial"}
     - {id: 35, cat: Other, desc: "Other/Sounds"}
-    - {id: 36, cat: Books/Ebook, desc: "Other/E-books"}
+    - {id: 36, cat: Books/EBook, desc: "Other/E-books"}
     - {id: 37, cat: Other, desc: "Other/Images"}
     - {id: 38, cat: Other, desc: "Other/Mobile Phone"}
     - {id: 39, cat: Books/Comics, desc: "Other/Comics"}
@@ -129,7 +123,8 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, album, artist]
+    book-search: [q]
 
 settings:
   - name: downloadlink
@@ -137,25 +132,25 @@ settings:
     label: Download link
     default: "magnet:"
     options:
-      "http://itorrents.org/": "iTorrents.org"
-      "http://torrage.info/": "Torrage.info"
-      "http://btcache.me/": "BTcache.me"
-      "magnet:": "magnet"
+      "http://itorrents.org/": iTorrents.org
+      "http://torrage.info/": Torrage.info
+      "http://btcache.me/": BTcache.me
+      "magnet:": magnet
   - name: sort
     type: select
     label: Sort requested from site
-    default: "time"
+    default: time
     options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 download:
   # the .torrent url is on the on the details page
@@ -165,9 +160,9 @@ download:
 search:
   paths:
     # present first page of movies tv and music results if there are no search parms supplied (20 hits per page)
-    - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Movies{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/1/"
-    - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/TV{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}2{{else}}1{{end}}/"
-    - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Music{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}3{{else}}1{{end}}/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Movies{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/1/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/TV{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}2{{ else }}1{{ end }}/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
   keywordsfilters:
     - name: replace # use this as a workaround till #893 is implemented
       args: ["Greys Anatomy", "Grey's Anatomy"]
@@ -219,14 +214,8 @@ search:
       optional: true
       selector: td[class^="coll-date"]:not(:contains(":")):not(:contains("'"))
       filters:
-        - name: replace
-          args: ["st", ""]
-        - name: replace
-          args: ["nd", ""]
-        - name: replace
-          args: ["rd", ""]
-        - name: replace
-          args: ["th", ""]
+        - name: re_replace
+          args: ["st|nd|rd|th", ""]
         - name: dateparse
           args: "3pm Jan. 2"
     date:
@@ -236,14 +225,8 @@ search:
       filters:
         - name: replace
           args: ["'", ""]
-        - name: replace
-          args: ["st", ""]
-        - name: replace
-          args: ["nd", ""]
-        - name: replace
-          args: ["rd", ""]
-        - name: replace
-          args: ["th", ""]
+        - name: re_replace
+          args: ["st|nd|rd|th", ""]
         - name: dateparse
           args: "Jan. 2 06"
     date:

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

@@ -22,7 +22,7 @@ caps:
     - {id: 412, cat: Other, desc: "Education/教育"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -46,19 +46,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   method: cookie

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

@@ -18,7 +18,7 @@ caps:
     - {id: 56, cat: TV/Anime, desc: "Animation: DVDRip"}
     - {id: 18, cat: PC/0day, desc: "Applications: PC"}
     - {id: 16, cat: PC/Games, desc: "Applications: Jeux"}
-    - {id: 19, cat: PC/Phone-Android, desc: "Applications: Android"}
+    - {id: 19, cat: PC/Mobile-Android, desc: "Applications: Android"}
     - {id: 17, cat: PC/0day, desc: "Applications: Autres"}
     - {id: 67, cat: TV, desc: "Autres: Emission TV"}
     - {id: 68, cat: TV/Sport, desc: "Autres: Sport"}
@@ -35,7 +35,7 @@ caps:
     - {id: 51, cat: Books, desc: "E-Books: BD"}
     - {id: 95, cat: Movies, desc: "Films: Film Divx XviD"}
     - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
+    - {id: 71, cat: Movies/WEB-DL, desc: "Films: WEB-DL"}
     - {id: 65, cat: Movies, desc: "Films: VO"}
     - {id: 72, cat: Movies/SD, desc: "Films: TVRip/HDTV"}
     - {id: 70, cat: Movies/HD, desc: "Films: MHD X265"}
@@ -82,6 +82,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -116,19 +117,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: order
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: account-login.php
@@ -207,6 +208,8 @@ search:
       attribute: src
     size:
       selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
     seeders:
       selector: td:nth-child(7)
     leechers:

src/Jackett.Common/Definitions/32pages.yml

@@ -15,6 +15,7 @@ caps:
 
   modes:
     search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -33,26 +34,26 @@ settings:
   - name: lockip
     type: select
     label: "Lock session to my IP address"
-    default: "1"
+    default: 1
     options:
-      "1": "yes"
-      "0": "no"
+      1: yes
+      0: no
   - name: sort
     type: select
     label: Sort requested from site
-    default: "time"
+    default: time
     options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      time: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info
     type: info
     label: Results Per Page

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

@@ -23,10 +23,11 @@ caps:
     - {id: 412, cat: PC/Games, desc: "Games"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -42,19 +43,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info_tpp
     type: info
     label: Results Per Page

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

@@ -6,31 +6,45 @@ language: en
 type: private
 encoding: UTF-8
 links:
+  - https://www.3evils.net/
+legacylinks:
   - https://www.3evils.com/
+  - https://the-unknown.xyz/
 
 caps:
   categorymappings:
-    - {id: 65, cat: Books, desc: "Books"}
-    - {id: 11, cat: Movies/UHD, desc: "Movies/Encodes 2160p"}
-    - {id: 12, cat: Movies/UHD, desc: "Movies/Remux 2160p"}
-    - {id: 13, cat: Movies/HD, desc: "Movies/Remux 1080p"}
+    - {id: 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: 33, cat: Audio, desc: "Music/Audio"}
+    - {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"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 42, cat: PC/Phone-Android, desc: "Appz/Android"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -46,27 +60,33 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      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: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    submitme: "X"
+    use_ssl: 1
+    perm_ssl: ""
   error:
     - selector: div.callout:contains("Login failed!")
   test:
@@ -75,12 +95,11 @@ login:
 
 search:
   paths:
-    # https://www.3evils.com/browse.php?search=black+lightning+s02e11&searchin=title&incldead=1
-    # https://www.3evils.com/browse.php?c3=1&c4=1&search=&searchin=title&incldead=1
+    # 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}}"
+    search: "{{ .Keywords }}"
     # title, descr, genre, all
     searchin: title
     # 0 active, 1 incldead, 2 onlydead
@@ -90,31 +109,31 @@ search:
     type: "{{ .Config.type }}"
 
   rows:
-    selector: table.responsive-card-table tr:has(td[data-label])
+    selector: table.unstriped tbody tr:has(a[href^="download.php?torrent="])
     filters:
       - name: andmatch
 
   fields:
     category:
-      selector: td[data-label="Type"] a
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
     title:
-      selector: td[data-label="Name"] a[onmouseover]
+      selector: a[href^="details.php?id="]
       attribute: onmouseover
       filters:
         - name: regexp
           args: "Tip\\('<b>(.*?)</b>"
     details:
-      selector: td[data-label="Name"] a
+      selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: td[data-label="Download"] a
+      selector: a[href^="download.php?torrent="]
       attribute: href
     banner:
-      selector: td[data-label="Name"] a[onmouseover]
+      selector: a[href^="details.php?id="]
       attribute: onmouseover
       optional: true
       filters:
@@ -124,37 +143,47 @@ search:
           args: "src=\\\\'(.+?)\\\\'"
         - name: replace
           args: ["./pic/noposter.png", ""]
-    size:
-      selector: td[data-label="Size"]
     files:
       selector: td[data-label="Files"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
     # 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"
+          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:
-        img[src="./pic/freedownload.gif"]: 0
+        "a.info:contains(\"[FREE]\")": 0
         "*": 1
     uploadvolumefactor:
       case:
         "*": 1
-# U-232 V5
+    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,7 +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: 41, cat: TV/FOREIGN, desc: "Foreign tv"}
+    - {id: 41, cat: TV/Foreign, desc: "Foreign tv"}
     - {id: 40, cat: TV, desc: "Mini-Series"}
     - {id: 43, cat: TV/HD, desc: "TV H265"}
     - {id: 42, cat: TV, desc: "TV Movie"}
@@ -32,13 +32,14 @@ caps:
     - {id: 37, cat: Audio, desc: "Radio"}
     - {id: 9, cat: PC/0day, desc: "Apps/PC"}
     - {id: 34, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 25, cat: Books/Ebook, desc: "eBooks"}
+    - {id: 25, cat: Books/EBook, desc: "eBooks"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -54,18 +55,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "time"
+    default: time
     options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php

src/Jackett.Common/Definitions/52pt.yml

@@ -20,9 +20,10 @@ caps:
     - {id: 409, cat: Other, desc: "Misc/其他"}
     - {id: 410, cat: Other, desc: "Opera/戏曲 曲艺"}
     - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
+    - {id: 411, cat: XXX, desc: "Erotic/情色"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -46,19 +47,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -71,15 +72,6 @@ login:
   test:
     path: index.php
 
-ratio:
-  path: index.php
-  selector: table tr td.bottom
-  filters:
-    - name: replace
-      args: ["分享率:", "Ratio:"] # for simplified chinese language setting
-    - name: regexp
-      args: "Ratio:\\s(.*?)\\s\\s"
-
 search:
   paths:
     - path: torrents.php
@@ -167,4 +159,9 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
+    minimumratio:
+      text: 1
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
 # NexusPHP Standard v1.5 Beta 4

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

@@ -10,32 +10,35 @@ links:
 
 caps:
   categories:
-    1: Other
+    Other: Other
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
+    book-search: [q]
 
 settings:
-  - name: info
+  - name: info_8000
     type: info
-    default: 7torrents does not use categories. In your software Indexer settings, set the category to 7000.
+    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
-    default: "created"
+    default: created
     options:
-      "created": "created"
-      "length": "size"
-      "seeders": "seeders"
+      created: created
+      length: size
+      seeders: seeders
 
 search:
   # https://www.7torrents.cc/search?query=2020&sort=created
   paths:
     - path: search
   inputs:
-    query: "{{ if .Keywords }}{{ .Keywords }}{{else}} {{end}}"
+    query: "{{ if .Keywords }}{{ .Keywords }}{{ else }} {{ end }}"
     sort: "{{ .Config.sort }}"
 
   rows:
@@ -43,7 +46,7 @@ search:
 
   fields:
     category:
-      text: 1
+      text: Other
     title:
       selector: div.media
       attribute: data-name

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -23,7 +23,6 @@ caps:
     - {id: 49, cat: Movies/Foreign, desc: "Movie International"}
     - {id: 78, cat: Movies/UHD, desc: "Movie UHD"}
     - {id: 85, cat: Movies/HD, desc: "Movie x265"}
-
     # Serien
     - {id: 79, cat: TV/HD, desc: "Staffeln HD"}
     - {id: 56, cat: TV/SD, desc: "Staffeln SD"}
@@ -33,24 +32,21 @@ caps:
     - {id: 80, cat: TV/HD, desc: "Folgen HD/BD"}
     - {id: 7, cat: TV/SD, desc: "Folgen SD"}
     - {id: 55, cat: TV/Foreign, desc: "Folgen International"}
-
     # Doku
     - {id: 91, cat: TV/Documentary, desc: "Doku UHD"}
     - {id: 64, cat: TV/Documentary, desc: "Doku HD"}
     - {id: 36, cat: TV/Documentary, desc: "Doku SD"}
     - {id: 81, cat: TV/Documentary, desc: "Doku 3D"}
     - {id: 82, cat: TV/Documentary, desc: "Doku Packs"}
-
     # Spiele
     - {id: 4, cat: PC/Games, desc: "Spiele Windows"}
     - {id: 92, cat: PC/Mac, desc: "Spiele Mac"}
     - {id: 93, cat: PC, desc: "Spiele Linux"}
     - {id: 97, cat: Console/XBox, desc: "Spiele XBOX"}
-    - {id: 94, cat: PC/Phone-Other, desc: "Spiele Mobile"}
+    - {id: 94, cat: PC/Mobile-Other, desc: "Spiele Mobile"}
     - {id: 95, cat: Console/NDS, desc: "Spiele Nintendo"}
     - {id: 96, cat: Console/PSP, desc: "Spiele Playstation"}
     - {id: 42, cat: Console/Other, desc: "Spiele Andere"}
-
     # Musik
     - {id: 66, cat: Audio, desc: "Musik Alben"}
     - {id: 75, cat: Audio, desc: "Musik Singles"}
@@ -63,43 +59,40 @@ caps:
     - {id: 6, cat: Audio, desc: "Musik Misc"}
     - {id: 51, cat: Audio, desc: "Musik OST"}
     - {id: 67, cat: Audio, desc: "Musik Sampler"}
-
     # App
     - {id: 98, cat: PC/0day, desc: "App Windows"}
     - {id: 62, cat: PC/Mac, desc: "App Mac OS"}
     - {id: 63, cat: PC/0day, desc: "App Linux"}
     - {id: 34, cat: PC, desc: "App Andere"}
-
     # Sport
     - {id: 74, cat: TV/Sport, desc: "Sport HD"}
     - {id: 39, cat: TV/Sport, desc: "Sport SD"}
-
     # Sonstiges
     - {id: 41, cat: Books/Comics, desc: "Sonstiges A-Book"}
     - {id: 33, cat: TV/Anime, desc: "Sonstiges Anime"}
-    - {id: 35, cat: Books/Ebook, desc: "Sonstiges e-Book-DE"}
-    - {id: 90, cat: Books/Ebook, desc: "Sonstiges e-Book-INT"}
+    - {id: 35, cat: Books/EBook, desc: "Sonstiges e-Book-DE"}
+    - {id: 90, cat: Books/EBook, desc: "Sonstiges e-Book-INT"}
     - {id: 65, cat: Other, desc: "Sonstiges E-Learning"}
     - {id: 37, cat: PC, desc: "Sonstiges Mobile"}
-    - {id: 87, cat: Books/Magazines, desc: "Sonstiges E-Paper"}
+    - {id: 87, cat: Books/Mags, desc: "Sonstiges E-Paper"}
     - {id: 38, cat: Other, desc: "Sonstiges Kids"}
     - {id: 47, cat: Other, desc: "Sonstiges Line"}
     - {id: 9, cat: Other, desc: "Sonstiges Andere"}
-
     # XXX
     - {id: 58, cat: Books/Comics, desc: "XXX HD"}
     - {id: 46, cat: XXX, desc: "XXX Hentai"}
     - {id: 35, cat: XXX/Other, desc: "XXX Andere"}
-    - {id: 59, cat: XXX/Packs, desc: "XXX Pack"}
+    - {id: 59, cat: XXX/Pack, desc: "XXX Pack"}
     - {id: 27, cat: XXX, desc: "XXX SD"}
     - {id: 76, cat: XXX, desc: "XXX Andere"}
 
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: user
@@ -115,19 +108,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeds: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: signin.php
@@ -212,6 +205,8 @@ search:
           args: ["Heute", "Today"]
         - name: replace
           args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
     date:
       # 30.02.2018 23:12:50
       selector: td:nth-child(10):contains("."):contains(":")
@@ -219,8 +214,10 @@ search:
       filters:
         - name: split
           args: ["b", 0]
+        - name: append
+          args: " +01:00" # CET
         - name: dateparse
-          args: "02.01.2006 15:04:05"
+          args: "02.01.2006 15:04:05 -07:00"
     downloadvolumefactor:
       case:
         img[alt="OU"]: 0

src/Jackett.Common/Definitions/DasUnerwartete.yml

@@ -32,26 +32,27 @@ caps:
     - {id: 109, cat: Console/PSP, desc: "Games/PSP"}
     - {id: 113, cat: Console/Wii, desc: "Games/Wii"}
     - {id: 86, cat: PC/Games, desc: "Games/Windows"}
-    - {id: 104, cat: Console/XBox360, desc: "Games/Xbox360"}
+    - {id: 104, cat: Console/XBox 360, desc: "Games/Xbox360"}
     - {id: 116, cat: PC/Games, desc: "Linux/Spiele"}
-    - {id: 53, cat: PC/Phone-Android, desc: "Android/Appz/Games/Navi"}
+    - {id: 53, cat: PC/Mobile-Android, desc: "Android/Appz/Games/Navi"}
     - {id: 126, cat: PC, desc: "Win/Mac/linux"}
     - {id: 129, cat: TV/HD, desc: "Serien/Folgen HD"}
     - {id: 61, cat: TV/SD, desc: "Serien/Folgen SD"}
     - {id: 131, cat: TV/HD, desc: "Serien/Staffeln HD"}
     - {id: 130, cat: TV/SD, desc: "Serien/Staffeln SD"}
-    - {id: 94, cat: Books/Ebook, desc: "Ebooks"}
+    - {id: 94, cat: Books/EBook, desc: "Ebooks"}
     - {id: 96, cat: TV/Anime, desc: "Anime / Hentai"}
     - {id: 9, cat: Other/Misc, desc: "Sonstiges"}
     - {id: 115, cat: TV/Sport, desc: "Sport"}
     - {id: 69, cat: XXX, desc: "XXX"}
-    - {id: 122, cat: Books/Magazines, desc: "Zeitschriften/Zeitungen"}
+    - {id: 122, cat: Books/Mags, desc: "Zeitschriften/Zeitungen"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -77,11 +78,12 @@ search:
   path: browse.php
   inputs:
     $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
-    incldead: "1"
+    search: "{{ .Keywords }}"
+    incldead: 1
 
   rows:
     selector: table.tableinborder > tbody > tr:has(a[href^="download.php"])
+
   fields:
     title:
       selector: a[href^="details.php"]
@@ -120,5 +122,5 @@ search:
         img[src="pic/oupic.gif"]: "0"
         "*": "1"
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd

src/Jackett.Common/Definitions/acgsou.yml

@@ -44,6 +44,9 @@ caps:
 
   modes:
     search: [q]
+    tv-search: [q, season, ep]
+    music-search: [q]
+    book-search: [q]
 
 settings: []
 
@@ -61,24 +64,6 @@ search:
     selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)
 
   fields:
-    date:
-      selector: td:nth-child(1):contains("昨天")
-      optional: true
-      filters:
-        - name: replace
-          args: ["昨天", "Yesterday"]
-    date:
-      selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
-      optional: true
-      filters:
-        - name: dateparse
-          args: "01/02 15:04"
-    date:
-      selector: td:nth-child(1):not(:contains(":"))
-      optional: true
-      filters:
-        - name: dateparse
-          args: "2006/01/02"
     category:
       selector: td:nth-child(2) a
       attribute: href
@@ -93,6 +78,28 @@ search:
     download:
       selector: td:nth-child(3) a
       attribute: href
+    date:
+      selector: td:nth-child(1):contains("昨天")
+      optional: true
+      filters:
+        - name: replace
+          args: ["昨天", "Yesterday"]
+    date:
+      selector: td:nth-child(1):contains(":"):not(:contains("昨天"))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "01/02 15:04 -07:00"
+    date:
+      selector: td:nth-child(1):not(:contains(":"))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006/01/02 -07:00"
     size:
       selector: td:nth-child(4)
     seeders:

src/Jackett.Common/Definitions/acidlounge.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 79, cat: PC/Phone-Android, desc: "Android"}
+    - {id: 79, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 61, cat: TV/Anime, desc: "Anime"}
     - {id: 55, cat: PC/0day, desc: "Appz/0-Day"}
     - {id: 59, cat: PC/Mac, desc: "Appz/Mac"}
@@ -26,9 +26,9 @@ caps:
     - {id: 4, cat: PC/Games, desc: "Games/PC"}
     - {id: 42, cat: Console/PS3, desc: "Games/PS3"}
     - {id: 56, cat: Console/Wii, desc: "Games/Wii"}
-    - {id: 36, cat: Console/Xbox360, desc: "Games/xbox360"}
+    - {id: 36, cat: Console/XBox 360, desc: "Games/xbox360"}
     - {id: 69, cat: Other, desc: "Halloween"}
-    - {id: 80, cat: PC/Phone-IOS, desc: "iPhone / iPad"}
+    - {id: 80, cat: PC/Mobile-iOS, desc: "iPhone / iPad"}
     - {id: 46, cat: Other, desc: "Kids"}
     - {id: 63, cat: PC, desc: "Linux"}
     - {id: 49, cat: Other, desc: "Misc"}
@@ -59,6 +59,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: Main/?act=Login

src/Jackett.Common/Definitions/aftershock.yml

@@ -18,7 +18,7 @@ caps:
     - {id: 191, cat: Movies/DVD, desc: "DVD-9Hun"}
     - {id: 1, cat: Movies/DVD, desc: "DVDEng"}
     - {id: 4, cat: Movies/DVD, desc: "DVDHun"}
-    - {id: 23, cat: Books/Ebook, desc: "E-Book"}
+    - {id: 23, cat: Books/EBook, desc: "E-Book"}
     - {id: 3, cat: Movies, desc: "Film Pack"}
     - {id: 185, cat: Audio/Lossless, desc: "FLACeng"}
     - {id: 188, cat: Audio/Lossless, desc: "FLAChu"}
@@ -30,14 +30,14 @@ caps:
     - {id: 130, cat: Console, desc: "JátékKonzol"}
     - {id: 38, cat: Console/PSP, desc: "JátékPS2"}
     - {id: 44, cat: Console, desc: "Jatekrip"}
-    - {id: 131, cat: Console/Xbox, desc: "JátékX-box"}
+    - {id: 131, cat: Console/XBox, desc: "JátékX-box"}
     - {id: 140, cat: Other, desc: "Képek"}
     - {id: 141, cat: Other, desc: "Klipek"}
     - {id: 154, cat: Other, desc: "MeseEng"}
     - {id: 155, cat: Other, desc: "MeseHun"}
     - {id: 176, cat: Other, desc: "Mikro HDEng"}
     - {id: 174, cat: Other, desc: "Mikro HDHun"}
-    - {id: 37, cat: PC/Phone-Other, desc: "MobilPDA"}
+    - {id: 37, cat: PC/Mobile-Other, desc: "MobilPDA"}
     - {id: 35, cat: PC, desc: "ProgramEgyéb"}
     - {id: 170, cat: PC/ISO, desc: "ProgramIso"}
     - {id: 24, cat: TV, desc: "Sorozat Eng"}
@@ -45,7 +45,7 @@ caps:
     - {id: 167, cat: Movies/SD, desc: "Xvid CamEng"}
     - {id: 166, cat: Movies/SD, desc: "Xvid CamHun"}
     - {id: 9, cat: Movies/SD, desc: "XvidHun"}
-    - {id: 169, cat: XXX/Imageset, desc: "XXX Képek"}
+    - {id: 169, cat: XXX/ImageSet, desc: "XXX Képek"}
     - {id: 39, cat: XXX, desc: "XXXFilm"}
     - {id: 28, cat: Audio, desc: "ZeneEng"}
     - {id: 29, cat: Audio, desc: "ZeneHun"}
@@ -55,6 +55,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -70,19 +71,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "0"
+    default: 0
     options:
-      "0": "created"
-      "6": "seeders"
-      "4": "size"
-      "1": "title"
+      0: created
+      6: seeders
+      4: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
@@ -98,13 +99,6 @@ login:
     path: /
     selector: a[href="/logout.php"]
 
-ratio:
-  path: /
-  selector: p.sajatadatok font
-  filters:
-    - name: replace
-      args: [",", ""]
-
 search:
   paths:
     - path: browse.php
@@ -178,4 +172,6 @@ search:
       case:
         span.icon_upload: 2
         "*": 1
+    minimumratio:
+      text: 0.31
 # XBT v3

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -29,6 +29,7 @@ caps:
     search: [q]
     tv-search: [q]
     movie-search: [q]
+    music-search: [q]
 
 settings:
   - name: cookie
@@ -45,19 +46,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   method: cookie
@@ -69,10 +70,6 @@ login:
     path: /
     selector: a[href="account-logout.php"]
 
-ratio:
-  path: /
-  selector: td:contains("Ratio") ~ td
-
 search:
   paths:
     # https://aidoru-online.me/get_ttable.php?pcat=Show+All&scat=3%2C4%2C5%2C6&subbed=&fl=&resd=&p=0&searchstr=peace&deadlive=0&sortcol=id&sortorder=desc&startdt=&enddt=
@@ -132,7 +129,7 @@ search:
       selector: td:last-child
       filters:
         - name: append
-          args: " +09:00"
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "060102 15:04:05 -07:00"
     downloadvolumefactor:
@@ -144,4 +141,6 @@ search:
       case:
         img[src="images/freeleech2.png"]: 2
         "*": 1
+    minimumratio:
+      text: 0.8
 # TorrentTrader v2-svn

src/Jackett.Common/Definitions/aither.yml

@@ -10,20 +10,23 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 9, cat: TV/Sport, desc: "Sports"}
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 9, cat: TV/Sport, desc: "Sport"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: Console, desc: "Games"}
-    - {id: 10, cat: PC, desc: "Apps"}
+    - {id: 10, cat: PC, desc: "Software & Apps"}
     - {id: 11, cat: Books, desc: "Ebooks & Magazines"}
     - {id: 14, cat: Audio/Audiobook, desc: "Audiobooks"}
+    - {id: 15, cat: Other, desc: "Education"}
     - {id: 6, cat: XXX, desc: "XXX"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -39,19 +42,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -71,13 +74,6 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: torrents/filter
@@ -150,6 +146,8 @@ search:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace

src/Jackett.Common/Definitions/amigosshare.yml

@@ -20,10 +20,10 @@ caps:
     - {id: 69, cat: TV/Anime, desc: "Anime: Anime"}
     - {id: 116, cat: TV/Anime, desc: "Anime: Filmes"}
     - {id: 118, cat: TV/Anime, desc: "Anime: Séries"}
-    - {id: 23, cat: PC/Phone-Android, desc: "Aplicativos: Android"}
-    - {id: 27, cat: PC/Phone-IOS, desc: "Aplicativos: iPad"}
-    - {id: 26, cat: PC/Phone-IOS, desc: "Aplicativos: iPhone"}
-    - {id: 28, cat: PC/Phone-IOS, desc: "Aplicativos: iPod"}
+    - {id: 23, cat: PC/Mobile-Android, desc: "Aplicativos: Android"}
+    - {id: 27, cat: PC/Mobile-iOS, desc: "Aplicativos: iPad"}
+    - {id: 26, cat: PC/Mobile-iOS, desc: "Aplicativos: iPhone"}
+    - {id: 28, cat: PC/Mobile-iOS, desc: "Aplicativos: iPod"}
     - {id: 25, cat: PC, desc: "Aplicativos: Linux"}
     - {id: 22, cat: PC/Mac, desc: "Aplicativos: Mac"}
     - {id: 21, cat: PC/0day, desc: "Aplicativos: Windows"}
@@ -49,9 +49,9 @@ caps:
     - {id: 79, cat: Console/PS4, desc: "Jogos: Ps4"}
     - {id: 82, cat: Console/PSP, desc: "Jogos: PSP"}
     - {id: 55, cat: Console/Wii, desc: "Jogos: Wii"}
-    - {id: 54, cat: Console/Xbox 360, desc: "Jogos: Xbox360"}
-    - {id: 56, cat: Console/Xbox, desc: "Jogos: Xbox"}
-    - {id: 78, cat: Console/Xbox One, desc: "Jogos: Xbox One"}
+    - {id: 54, cat: Console/XBox 360, desc: "Jogos: Xbox360"}
+    - {id: 56, cat: Console/XBox, desc: "Jogos: Xbox"}
+    - {id: 78, cat: Console/XBox One, desc: "Jogos: Xbox One"}
     - {id: 29, cat: Audio, desc: "Musica: Axé"}
     - {id: 38, cat: Audio, desc: "Musica: Blues"}
     - {id: 39, cat: Audio, desc: "Musica: Dance"}
@@ -94,6 +94,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -113,19 +114,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: account-login.php
@@ -140,10 +141,6 @@ login:
     path: torrents-search.php
     selector: a[href="account-logout.php"]
 
-ratio:
-  path: torrents-search.php
-  selector: li:contains("Ratio:") a b
-
 search:
   paths:
     # http://amigos-share.club/torrents-search.php?search=&sort=id&order=desc&page=1
@@ -305,8 +302,10 @@ search:
           args: "Lançado: (.+?)$"
         - name: re_replace
           args: [" (\\d:)", " 0$1"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/06 15:04:05"
+          args: "02/01/06 15:04:05 -07:00"
     size:
       selector: div.list-group-item-content p.m-0 span.badge-info
     seeders:
@@ -321,4 +320,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 1.0
 # engine n/a

src/Jackett.Common/Definitions/anirena.yml

@@ -32,10 +32,12 @@ caps:
   modes:
     search: [q]
     tv-search: [q, season, ep]
+    music-search: [q]
+    book-search: [q]
 
 search:
   paths:
-    - path: "{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
+    - path: "{{ if .Keywords }}?s={{ .Keywords}}{{ else }}{{ end }}"
 
   rows:
     selector: table tbody tr:has(td.torrents_small_type_data1)

src/Jackett.Common/Definitions/anisource.yml

@@ -65,7 +65,7 @@ search:
         - name: replace
           args: [" at ", " "]
         - name: append
-          args: " -09:00"
+          args: " -09:00" # CUS
         - name: dateparse
           args: "2006-01-02 15:04 -07:00"
     size:

src/Jackett.Common/Definitions/arabafenice.yml

@@ -55,20 +55,21 @@ caps:
 
     # GAMES
     - {id: 25, cat: Console/PS4, desc: "Sony Games"}
-    - {id: 26, cat: Console/Xbox, desc: "XboX Games"}
+    - {id: 26, cat: Console/XBox, desc: "XboX Games"}
     - {id: 27, cat: Console/Other, desc: "Nintendo Games"}
     - {id: 28, cat: PC/Games, desc: "PC Games"}
 
     # SOFTWARE
     - {id: 30, cat: PC/ISO, desc: "Windows APP"}
-    - {id: 31, cat: PC/Phone-IOS, desc: "Apple APP"}
-    - {id: 32, cat: PC/Phone-Android, desc: "Android APP"}
+    - {id: 31, cat: PC/Mobile-iOS, desc: "Apple APP"}
+    - {id: 32, cat: PC/Mobile-Android, desc: "Android APP"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -80,19 +81,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
   - name: info
     type: info
     label: Results Per Page

src/Jackett.Common/Definitions/arabp2p.yml

@@ -20,19 +20,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 caps:
   categorymappings:
@@ -49,10 +49,10 @@ caps:
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
     - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"}
     # المرئيات الاجنبية Foreign Movies
-    - {id: 92, cat: TV/FOREIGN, desc: "تعليمي (Educational)"}
+    - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
-    - {id: 45, cat: TV/FOREIGN, desc: "مسلسلات وبرامج اجنبيه (Serials)"}
-    - {id: 57, cat: TV/FOREIGN, desc: "مسلسلات آسيوية (Asian Series)"}
+    - {id: 45, cat: TV/Foreign, desc: "مسلسلات وبرامج اجنبيه (Serials)"}
+    - {id: 57, cat: TV/Foreign, desc: "مسلسلات آسيوية (Asian Series)"}
     - {id: 42, cat: Movies/Foreign, desc: "افلام اجنبيه (Foreign)"}
     - {id: 76, cat: Movies/3D, desc: "&ثلاثي الابعاد 3D (3D)"}
     - {id: 74, cat: Movies/HD, desc: "جودة عالية HD"}
@@ -74,14 +74,14 @@ caps:
     # برامج  Software
     - {id: 22, cat: PC, desc: "برامج عربية (Arabic Software)"}
     - {id: 23, cat: PC, desc: "برامج عامه (Public Software)"}
-    - {id: 78, cat: PC/Phone-IOS, desc: "iPad/iPhone"}
-    - {id: 79, cat: PC/Phone-Android, desc: "android"}
+    - {id: 78, cat: PC/Mobile-iOS, desc: "iPad/iPhone"}
+    - {id: 79, cat: PC/Mobile-Android, desc: "android"}
     # العاب  Games
     - {id: 30, cat: PC/Games, desc: "PC"}
     - {id: 31, cat: Console/PS3, desc: "PS2"}
     - {id: 53, cat: Console/Wii, desc: "wii"}
     - {id: 55, cat: Console/PSP, desc: "PSP"}
-    - {id: 63, cat: Console/Xbox, desc: "XBOX"}
+    - {id: 63, cat: Console/XBox, desc: "XBOX"}
     - {id: 64, cat: Console/PS3, desc: "PS3"}
     # اخرى Other
     - {id: 17, cat: Books, desc: "كتب (Books)"}
@@ -94,6 +94,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: index.php?page=login
@@ -147,7 +148,7 @@ search:
       attribute: title
       filters:
         - name: append
-          args: " +03:00" # (AST)
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     seeders:

src/Jackett.Common/Definitions/arenabg.yml

@@ -46,20 +46,20 @@ caps:
     - {id: "pc-rip", cat: PC, desc: "Games / PC RIP"}
     - {id: "ps2", cat: Console, desc: "Games / PS2"}
     - {id: "psp", cat: Console/PSP, desc: "Games / PSP"}
-    - {id: "xbox", cat: Console/Xbox, desc: "Games / XBOX"}
-    - {id: "xbox-360", cat: Console/Xbox 360, desc: "Games / XBOX-360"}
+    - {id: "xbox", cat: Console/XBox, desc: "Games / XBOX"}
+    - {id: "xbox-360", cat: Console/XBox 360, desc: "Games / XBOX-360"}
     - {id: "ps3", cat: Console/PS3, desc: "Games / PS3"}
     - {id: "wii", cat: Console/Wii, desc: "Games / WII"}
     - {id: "PS4", cat: Console/PS4, desc: "Games / PS4"}
     - {id: "software", cat: PC, desc: "Software"}
     - {id: "pc-iso", cat: PC/ISO, desc: "Software / PC ISO"}
-    - {id: "pdasmartphone", cat: PC/Phone-Other, desc: "Software / Smartphone"}
+    - {id: "pdasmartphone", cat: PC/Mobile-Other, desc: "Software / Smartphone"}
     - {id: "tutorial", cat: PC, desc: "Software / Tutorial"}
-    - {id: "android", cat: PC/Phone-Android, desc: "Software / Android"}
-    - {id: "ios", cat: PC/Phone-IOS, desc: "Software / iOS"}
+    - {id: "android", cat: PC/Mobile-Android, desc: "Software / Android"}
+    - {id: "ios", cat: PC/Mobile-iOS, desc: "Software / iOS"}
     - {id: "misc", cat: Other/Misc, desc: "Misc"}
     - {id: "other", cat: Other, desc: "Misc / Other"}
-    - {id: "e-books", cat: Books/Ebook, desc: "Misc / e-Books"}
+    - {id: "e-books", cat: Books/EBook, desc: "Misc / e-Books"}
     - {id: "sports", cat: TV/Sport, desc: "Misc / Sports"}
     - {id: "0-day", cat: PC/0day, desc: "Misc / 0-Day"}
     - {id: "xxx", cat: XXX, desc: "XXX"}
@@ -71,6 +71,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -113,7 +114,7 @@ search:
       method: post
       followredirect: true
   inputs:
-    text: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
+    text: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
     "text_mobile": ""
     type: 0
     audio: 0
@@ -146,15 +147,19 @@ search:
       selector: td:nth-child(3):contains(":")
       optional: true
       filters:
+        - name: append
+          args: " +02:00" # EET
         - name: dateparse
-          args: "15:04:05"
+          args: "15:04:05 -07:00"
     date:
       # 2018-10-19
       selector: td:nth-child(3):contains("-")
       optional: true
       filters:
+        - name: append
+          args: " +02:00" # EET
         - name: dateparse
-          args: "2006-01-02"
+          args: "2006-01-02 -07:00"
     seeders:
       selector: td:nth-child(6)
       filters:

src/Jackett.Common/Definitions/asgaard.yml

@@ -39,28 +39,29 @@ caps:
     - {id: 61, cat: Audio/MP3, desc: "Music MP3 Boxset"}
     - {id: 24, cat: Audio/Lossless, desc: "Music Flac"}
     - {id: 62, cat: Audio/Lossless, desc: "Music Flac Boxset"}
-    - {id: 28, cat: PC/Phone-Android, desc: "Apps Android"}
-    - {id: 29, cat: PC/Phone-IOS, desc: "Apps iOS"}
+    - {id: 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/Phone-Android, desc: "Games Android"}
-    - {id: 34, cat: PC/Phone-IOS, desc: "Games iOS"}
+    - {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: 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, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: info
@@ -80,19 +81,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      2: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -177,19 +178,21 @@ search:
       # 26 May 20 14:05:06
       selector: td:nth-child(2) > div > div:last-of-type:not(:contains("day"))
       optional: true
-      # drop New!
       remove: span
       filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2 Jan 2006 15:04:05"
+          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
-      # drop New!
       remove: span
       filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     downloadvolumefactor:
       case:
@@ -197,4 +200,6 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.95
 # Midgaard

src/Jackett.Common/Definitions/asiancinema.yml

@@ -15,7 +15,7 @@ caps:
     - {id: 3, cat: Audio, desc: "Music"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -34,19 +34,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -66,13 +66,6 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: torrents/filter

src/Jackett.Common/Definitions/ast4u.yml

@@ -41,6 +41,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/asylumshare.yml

@@ -0,0 +1,225 @@
+---
+id: asylumshare
+name: Asylum Share
+description: "Asylum Share is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: pt-br
+type: private
+encoding: UTF-8
+links:
+  - https://asylumshare.net/
+
+caps:
+  categorymappings:
+    - {id: 104, cat: XXX, desc: "Adultos: Fotos +18"}
+    - {id: 120, cat: TV/Anime, desc: "Anime: Anime"}
+    - {id: 122, cat: PC/Mobile-Android, desc: "Aplicativos: Android"}
+    - {id: 115, cat: PC/Mobile-Other, desc: "Aplicativos: Celular"}
+    - {id: 129, cat: PC, desc: "Aplicativos: Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Aplicativos: Mac"}
+    - {id: 18, cat: PC, desc: "Aplicativos: PC"}
+    - {id: 123, cat: PC/Mobile-Other, desc: "Aplicativos: Symbian"}
+    - {id: 94, cat: PC/0day, desc: "Aplicativos: Windows"}
+    - {id: 9, cat: Other, desc: "Cursos: Apostilas"}
+    - {id: 113, cat: Other, desc: "Cursos: Curso"}
+    - {id: 111, cat: Other, desc: "Cursos: Video-Aula"}
+    - {id: 4, cat: Movies, desc: "Filmes: Ação"}
+    - {id: 47, cat: XXX, desc: "Filmes: Adulto +18"}
+    - {id: 114, cat: Movies, desc: "Filmes: Animação"}
+    - {id: 23, cat: Movies, desc: "Filmes: Aventura"}
+    - {id: 24, cat: Movies, desc: "Filmes: Biografia"}
+    - {id: 25, cat: Movies, desc: "Filmes: Clássico"}
+    - {id: 26, cat: Movies, desc: "Filmes: Comédia "}
+    - {id: 27, cat: TV/Documentary, desc: "Filmes: Documentário"}
+    - {id: 33, cat: Movies, desc: "Filmes: Drama"}
+    - {id: 117, cat: Movies, desc: "Filmes: Épico"}
+    - {id: 34, cat: Movies, desc: "Filmes: Esporte"}
+    - {id: 35, cat: Movies, desc: "Filmes: Ficção "}
+    - {id: 36, cat: Movies, desc: "Filmes: Guerra "}
+    - {id: 37, cat: Movies, desc: "Filmes: Infantil "}
+    - {id: 124, cat: Movies, desc: "Filmes: Músical"}
+    - {id: 42, cat: Movies, desc: "Filmes: Nacionais"}
+    - {id: 7, cat: Movies, desc: "Filmes : Ocidental"}
+    - {id: 39, cat: Movies, desc: "Filmes: Policial"}
+    - {id: 5, cat: Movies, desc: "Filmes : Religioso"}
+    - {id: 41, cat: Movies, desc: "Filmes : Romance "}
+    - {id: 40, cat: Movies, desc: "Filmes : Suspense"}
+    - {id: 6, cat: Movies, desc: "Filmes : Terror"}
+    - {id: 93, cat: Other, desc: "Fotos: Fotos"}
+    - {id: 121, cat: Console, desc: "Jogos: Celular"}
+    - {id: 16, cat: Console, desc: "Jogos: Dreamcast"}
+    - {id: 102, cat: Console, desc: "Jogos: Emuladores e Roms"}
+    - {id: 105, cat: Console, desc: "Jogos: Game-Cube"}
+    - {id: 116, cat: Console, desc: "Jogos: Nintendo DS"}
+    - {id: 10, cat: PC/Games, desc: "Jogos: PC"}
+    - {id: 15, cat: Console, desc: "Jogos: PS1"}
+    - {id: 11, cat: Console, desc: "Jogos: PS2"}
+    - {id: 43, cat: Console, desc: "Jogos: PS3"}
+    - {id: 128, cat: Console, desc: "Jogos: PS4"}
+    - {id: 12, cat: Console, desc: "Jogos: PSP"}
+    - {id: 44, cat: Console, desc: "Jogos: Wii"}
+    - {id: 13, cat: Console, desc: "Jogos: Xbox"}
+    - {id: 14, cat: Console, desc: "Jogos: Xbox 360"}
+    - {id: 127, cat: Books, desc: "Leitura: HQs e Mangás"}
+    - {id: 119, cat: Books, desc: "Leitura: Quadrinhos"}
+    - {id: 109, cat: Books, desc: "Leitura: Revistas e E-Books"}
+    - {id: 85, cat: Audio, desc: "Músicas: Alma"}
+    - {id: 72, cat: Audio, desc: "Músicas: Antigas"}
+    - {id: 51, cat: Audio, desc: "Músicas: Axé"}
+    - {id: 52, cat: Audio, desc: "Músicas: Blues"}
+    - {id: 53, cat: Audio, desc: "Músicas: Coletânea"}
+    - {id: 54, cat: Audio, desc: "Músicas: Country"}
+    - {id: 55, cat: Audio, desc: "Músicas: Dance"}
+    - {id: 56, cat: Audio, desc: "Músicas: Discografia"}
+    - {id: 57, cat: Audio, desc: "Músicas: Eletrônica"}
+    - {id: 58, cat: Audio, desc: "Músicas: Enka"}
+    - {id: 59, cat: Audio, desc: "Músicas: Erudita"}
+    - {id: 60, cat: Audio, desc: "Músicas: Forró"}
+    - {id: 61, cat: Audio, desc: "Músicas: Funk"}
+    - {id: 62, cat: Audio, desc: "Músicas: Gospel"}
+    - {id: 64, cat: Audio, desc: "Músicas: Hard Rock"}
+    - {id: 65, cat: Audio, desc: "Músicas: Heavy Metal"}
+    - {id: 66, cat: Audio, desc: "Músicas: Hip Hop"}
+    - {id: 67, cat: Audio, desc: "Músicas: House"}
+    - {id: 68, cat: Audio, desc: "Músicas: Infantil"}
+    - {id: 107, cat: Audio, desc: "Músicas: Instrumental"}
+    - {id: 69, cat: Audio, desc: "Músicas: Jazz"}
+    - {id: 118, cat: Audio, desc: "Músicas: Mixados"}
+    - {id: 70, cat: Audio, desc: "Músicas: MPB"}
+    - {id: 71, cat: Audio, desc: "Músicas: Nova Era"}
+    - {id: 73, cat: Audio, desc: "Músicas: Pagode"}
+    - {id: 74, cat: Audio, desc: "Músicas: Pop"}
+    - {id: 75, cat: Audio, desc: "Músicas: Psicodélico"}
+    - {id: 76, cat: Audio, desc: "Músicas: Punk Rock"}
+    - {id: 78, cat: Audio, desc: "Músicas: Rap"}
+    - {id: 79, cat: Audio, desc: "Músicas: Reggae"}
+    - {id: 80, cat: Audio, desc: "Músicas: Regionais"}
+    - {id: 82, cat: Audio, desc: "Músicas: Rock"}
+    - {id: 83, cat: Audio, desc: "Músicas: Samba"}
+    - {id: 84, cat: Audio, desc: "Músicas: Sertanejo"}
+    - {id: 86, cat: Audio, desc: "Músicas: Surf"}
+    - {id: 87, cat: Audio, desc: "Músicas: Techno"}
+    - {id: 88, cat: Audio, desc: "Músicas: Trance"}
+    - {id: 89, cat: Audio, desc: "Músicas: Trilha Sonora"}
+    - {id: 90, cat: Audio, desc: "Músicas: Vocal"}
+    - {id: 91, cat: Audio, desc: "Músicas: World Music"}
+    - {id: 108, cat: Other, desc: "Outros: Outros"}
+    - {id: 95, cat: TV, desc: "Séries: Seriados"}
+    - {id: 110, cat: TV, desc: "Shows: Shows"}
+    - {id: 49, cat: TV, desc: "Televisão: TV"}
+    - {id: 112, cat: Audio/Video, desc: "Video Clipe: Video Clipe"}
+
+  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: 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: p#msgError
+  test:
+    path: index.php
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    # https://asylumshare.net/torrents-search.php?c108=1&c95=1&c110=1&c49=1&search=&cat=0&incldead=1&freeleech=2&filmeQualidade=0
+    - path: torrents-search.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 3D, 2 4K, 3 FHD, 4 HD
+    filmeQualidade: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # site does not support imdbid search or return imdb links.
+  keywordsfilters:
+    # drop the year from searches since site titles do not include year
+    - name: re_replace
+      args: ["(19|20[0-9]{2})", ""]
+
+  rows:
+    selector: tr.t-row:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: td a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: td a[href^="torrents-details.php?id="]
+      filters:
+        - name: replace
+          args: ["[FREE]", ""]
+    details:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: td a[href^="download.php?id="]
+      attribute: href
+    date:
+      selector: a[title]
+      attribute: title
+      filters:
+        - name: regexp
+          args: "(\\d{2}\\/\\d{2}\\/\\d{2} \\d{2}:\\d{2}:\\d{2})"
+        - name: append
+          args: " -03:00"
+        - name: dateparse
+          args: "02/01/06 15:04:05 -07:00"
+    size:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        "span.color-green:contains(\"FREE\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1
+# engine n/a, likely customised TT3.0

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -7,13 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - http://audiobookbay.nl/ # site forces http, does not support https
+  - https://audiobookbay.unblockit.lat/
 legacylinks:
   - https://audiobookbay.la/
 
 caps:
   categorymappings:
     - {id: "(Post)apocalyptic", cat: Audio/Audiobook, desc: "(Post)apocalyptic"}
-    - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
     - {id: Action, cat: Audio/Audiobook, desc: "Action"}
     - {id: Adults, cat: Audio/Audiobook, desc: "Adults"}
     - {id: Adventure, cat: Audio/Audiobook, desc: "Adventure"}
@@ -39,12 +39,12 @@ caps:
     - {id: History, cat: Audio/Audiobook, desc: "History"}
     - {id: Horror, cat: Audio/Audiobook, desc: "Horror"}
     - {id: Humor, cat: Audio/Audiobook, desc: "Humor"}
-    - {id: LGBT, cat: Audio/Audiobook, desc: "LGBT"}
     - {id: Lecture, cat: Audio/Audiobook, desc: "Lecture"}
     - {id: Lesbian, cat: Audio/Audiobook, desc: "Lesbian"}
+    - {id: LGBT, cat: Audio/Audiobook, desc: "LGBT"}
     - {id: Libertarian, cat: Audio/Audiobook, desc: "Libertarian"}
-    - {id: LitRPG, cat: Audio/Audiobook, desc: "LitRPG"}
     - {id: Literature, cat: Audio/Audiobook, desc: "Literature"}
+    - {id: LitRPG, cat: Audio/Audiobook, desc: "LitRPG"}
     - {id: Military, cat: Audio/Audiobook, desc: "Military"}
     - {id: Misc., cat: Audio/Audiobook, desc: "Misc. Non-fiction"}
     - {id: Mystery, cat: Audio/Audiobook, desc: "Mystery"}
@@ -67,12 +67,14 @@ caps:
     - {id: Teen, cat: Audio/Audiobook, desc: "Teen & Young Adult"}
     - {id: The, cat: Audio/Audiobook, desc: "The Undead"}
     - {id: Thriller, cat: Audio/Audiobook, desc: "Thriller"}
+    - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
     - {id: Tutorial, cat: Audio/Audiobook, desc: "Tutorial"}
     - {id: Violence, cat: Audio/Audiobook, desc: "Violence"}
     - {id: Westerns, cat: Audio/Audiobook, desc: "Westerns"}
 
   modes:
     search: [q]
+    book-search: [q]
 
 settings: []
 
@@ -99,6 +101,11 @@ search:
     selector: div.post:has(div[class="postTitle"])
 
   fields:
+    category:
+      selector: div.postInfo
+      filters:
+        - name: regexp
+          args: "Category: (.+?)\\s"
     title:
       selector: div.postTitle
     details:
@@ -111,11 +118,6 @@ search:
       optional: true
       selector: img
       attribute: src
-    category:
-      selector: div.postInfo
-      filters:
-        - name: regexp
-          args: "Category: (.+?)\\s"
     _date:
       selector: div.postContent
       filters:

src/Jackett.Common/Definitions/audiobooktorrents.yml

@@ -40,43 +40,44 @@ caps:
     - {id: 260, cat: Audio/Audiobook, desc: "Thriller and Suspense"}
     - {id: 290, cat: Audio/Audiobook, desc: "Urban Fantasy"}
     - {id: 300, cat: Audio/Audiobook, desc: "Western"}
-    - {id: 400, cat: Books/Ebook, desc: "[E] Action/Adventure"}
-    - {id: 410, cat: Books/Ebook, desc: "[E] Adult / Erotica"}
-    - {id: 420, cat: Books/Ebook, desc: "[E] Arts & Crafts (Hobbies)"}
-    - {id: 430, cat: Books/Ebook, desc: "[E] Biography/Memoirs"}
-    - {id: 730, cat: Books/Ebook, desc: "[E] Collections"}
-    - {id: 440, cat: Books/Ebook, desc: "[E] Comic Books"}
-    - {id: 450, cat: Books/Ebook, desc: "[E] Computer Learning"}
-    - {id: 460, cat: Books/Ebook, desc: "[E] Cookery"}
-    - {id: 470, cat: Books/Ebook, desc: "[E] Crime/Thriller/Mystery"}
-    - {id: 480, cat: Books/Ebook, desc: "[E] Fantasy"}
-    - {id: 490, cat: Books/Ebook, desc: "[E] Forteana"}
-    - {id: 500, cat: Books/Ebook, desc: "[E] General Fiction"}
-    - {id: 510, cat: Books/Ebook, desc: "[E] Historical Fiction"}
-    - {id: 520, cat: Books/Ebook, desc: "[E] History/Documentary"}
-    - {id: 530, cat: Books/Ebook, desc: "[E] Horror"}
-    - {id: 540, cat: Books/Ebook, desc: "[E] Humor ( Comedy)"}
-    - {id: 550, cat: Books/Ebook, desc: "[E] LGBT"}
-    - {id: 560, cat: Books/Ebook, desc: "[E] Literary Fiction"}
-    - {id: 570, cat: Books/Ebook, desc: "[E] Magazines - all"}
-    - {id: 580, cat: Books/Ebook, desc: "[E] Non-Fiction"}
-    - {id: 590, cat: Books/Ebook, desc: "[E] Paranormal Romance"}
-    - {id: 600, cat: Books/Ebook, desc: "[E] Reference/Educational"}
-    - {id: 610, cat: Books/Ebook, desc: "[E] Religion and Spirituality"}
-    - {id: 620, cat: Books/Ebook, desc: "[E] Romance"}
-    - {id: 630, cat: Books/Ebook, desc: "[E] Sci-Fi"}
-    - {id: 640, cat: Books/Ebook, desc: "[E] Sci-Fi/Apocalyptic"}
-    - {id: 650, cat: Books/Ebook, desc: "[E] Self-Help"}
-    - {id: 660, cat: Books/Ebook, desc: "[E] Sports/Fitness"}
-    - {id: 670, cat: Books/Ebook, desc: "[E] Travel"}
-    - {id: 680, cat: Books/Ebook, desc: "[E] Unsorted"}
-    - {id: 690, cat: Books/Ebook, desc: "[E] Urban Fantasy/Paranormal"}
-    - {id: 700, cat: Books/Ebook, desc: "[E] Western"}
-    - {id: 710, cat: Books/Ebook, desc: "[E] Young Adult"}
-    - {id: 720, cat: Books/Ebook, desc: "[E] Young Children"}
+    - {id: 400, cat: Books/EBook, desc: "[E] Action/Adventure"}
+    - {id: 410, cat: Books/EBook, desc: "[E] Adult / Erotica"}
+    - {id: 420, cat: Books/EBook, desc: "[E] Arts & Crafts (Hobbies)"}
+    - {id: 430, cat: Books/EBook, desc: "[E] Biography/Memoirs"}
+    - {id: 730, cat: Books/EBook, desc: "[E] Collections"}
+    - {id: 440, cat: Books/EBook, desc: "[E] Comic Books"}
+    - {id: 450, cat: Books/EBook, desc: "[E] Computer Learning"}
+    - {id: 460, cat: Books/EBook, desc: "[E] Cookery"}
+    - {id: 470, cat: Books/EBook, desc: "[E] Crime/Thriller/Mystery"}
+    - {id: 480, cat: Books/EBook, desc: "[E] Fantasy"}
+    - {id: 490, cat: Books/EBook, desc: "[E] Forteana"}
+    - {id: 500, cat: Books/EBook, desc: "[E] General Fiction"}
+    - {id: 510, cat: Books/EBook, desc: "[E] Historical Fiction"}
+    - {id: 520, cat: Books/EBook, desc: "[E] History/Documentary"}
+    - {id: 530, cat: Books/EBook, desc: "[E] Horror"}
+    - {id: 540, cat: Books/EBook, desc: "[E] Humor ( Comedy)"}
+    - {id: 550, cat: Books/EBook, desc: "[E] LGBT"}
+    - {id: 560, cat: Books/EBook, desc: "[E] Literary Fiction"}
+    - {id: 570, cat: Books/EBook, desc: "[E] Magazines - all"}
+    - {id: 580, cat: Books/EBook, desc: "[E] Non-Fiction"}
+    - {id: 590, cat: Books/EBook, desc: "[E] Paranormal Romance"}
+    - {id: 600, cat: Books/EBook, desc: "[E] Reference/Educational"}
+    - {id: 610, cat: Books/EBook, desc: "[E] Religion and Spirituality"}
+    - {id: 620, cat: Books/EBook, desc: "[E] Romance"}
+    - {id: 630, cat: Books/EBook, desc: "[E] Sci-Fi"}
+    - {id: 640, cat: Books/EBook, desc: "[E] Sci-Fi/Apocalyptic"}
+    - {id: 650, cat: Books/EBook, desc: "[E] Self-Help"}
+    - {id: 660, cat: Books/EBook, desc: "[E] Sports/Fitness"}
+    - {id: 670, cat: Books/EBook, desc: "[E] Travel"}
+    - {id: 680, cat: Books/EBook, desc: "[E] Unsorted"}
+    - {id: 690, cat: Books/EBook, desc: "[E] Urban Fantasy/Paranormal"}
+    - {id: 700, cat: Books/EBook, desc: "[E] Western"}
+    - {id: 710, cat: Books/EBook, desc: "[E] Young Adult"}
+    - {id: 720, cat: Books/EBook, desc: "[E] Young Children"}
 
   modes:
     search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -146,7 +147,13 @@ search:
     files:
       selector: td:nth-last-child(8)
     date:
+      # Sep 20 2020<br/>07:25 PM
       selector: td:nth-last-child(7)
+      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:nth-last-child(6)
     grabs:

src/Jackett.Common/Definitions/audionews.yml

@@ -10,9 +10,9 @@ links:
 
 caps:
   categorymappings:
-    - {id: 106, cat: PC/Phone-Other, desc: "Mobile Apps"}
-    - {id: 161, cat: PC/Phone-IOS, desc: "Mobile Apps iOS"}
-    - {id: 160, cat: PC/Phone-Android, desc: "Mobile Apps Android"}
+    - {id: 106, cat: PC/Mobile-Other, desc: "Mobile Apps"}
+    - {id: 161, cat: PC/Mobile-iOS, desc: "Mobile Apps iOS"}
+    - {id: 160, cat: PC/Mobile-Android, desc: "Mobile Apps Android"}
     - {id: 12, cat: PC, desc: "AUDIOAPPS"}
     - {id: 32, cat: PC, desc: "AUDIOAPPS DAW Apps"}
     - {id: 175, cat: PC, desc: "AUDIOAPPS Ableton"}
@@ -163,14 +163,18 @@ caps:
     - {id: 168, cat: Audio/Other, desc: "PRESETS Toontrack"}
     - {id: 21, cat: Other, desc: "UPDATE"}
     - {id: 222, cat: Other, desc: "GFXNEWS 3D"}
+    - {id: 235, cat: Other, desc: "GFXNEWS APPS ANDROID & IOS"}
     - {id: 207, cat: Other, desc: "GFXNEWS APPS WIN"}
     - {id: 215, cat: Other, desc: "GFXNEWS APPS LINUX"}
     - {id: 214, cat: Other, desc: "GFXNEWS APPS MAC"}
     - {id: 211, cat: Other, desc: "GFXNEWS BOOKS"}
     - {id: 224, cat: Other, desc: "GFXNEWS CAD/CAM"}
+    - {id: 237, cat: Other, desc: "GFXNEWS DAZ3D"}
     - {id: 212, cat: Other, desc: "GFXNEWS FONTS"}
     - {id: 213, cat: Other, desc: "GFXNEWS FOOTAGE"}
+    - {id: 233, cat: Other, desc: "GFXNEWS GAME DEVELOPMENT"}
     - {id: 226, cat: Other, desc: "GFXNEWS MAGAZINE"}
+    - {id: 234, cat: Other, desc: "GFXNEWS MATERIAL"}
     - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
     - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
     - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
@@ -181,14 +185,17 @@ caps:
     - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
     - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
     - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
+    - {id: 236, cat: Other, desc: "GFXNEWS POSER"}
     - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
     - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
     - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}
     - {id: 219, cat: Other, desc: "GFXNEWS TUTORIALS"}
+    - {id: 238, cat: Other, desc: "GFXNEWS VECTOR GRAPHICS"}
     - {id: 221, cat: Other, desc: "GFXNEWS VIDEO PRODUCTION"}
 
   modes:
     search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -200,19 +207,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   path: login.php
@@ -267,8 +274,10 @@ search:
     dateheaders:
       selector: td[colspan="20"] > strong
       filters:
+        - name: append
+          args: " -07:00" # PDT
         - name: dateparse
-          args: "01-02-2006"
+          args: "01-02-2006 -07:00"
 
   fields:
     title:
@@ -318,4 +327,6 @@ search:
       text: 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.8
 # engine n/a

src/Jackett.Common/Definitions/backups.yml

@@ -43,6 +43,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/baibako.yml

@@ -6,9 +6,10 @@ language: ru-ru
 type: semi-private
 encoding: windows-1251
 links:
-  - https://baibako.tv/
+  - http://bko.baibako.tv/ # https is unsupported ERR_CONNECTION_REFUSED
 legacylinks:
   - http://baibako.tv/
+  - https://baibako.tv/
 
 caps:
   categorymappings:
@@ -29,22 +30,26 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: false
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
@@ -63,8 +68,8 @@ search:
     - path: browse.php
   inputs:
     search: "{{.Keywords }}"
-    # 0 active 1 incldead 2 onlydead 3 gold 4 seedfree
-    incldead: 1
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 seedfree
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
   keywordsfilters:
@@ -75,6 +80,8 @@ search:
     selector: table > tbody > tr:has(a[href^="details.php?id="])
 
   fields:
+    category:
+      text: 1
     title:
       selector: a[href^="details.php?id="]
       filters:
@@ -105,8 +112,6 @@ search:
     details:
       selector: a[href^="details.php?id="]
       attribute: href
-    category:
-      text: 1
     banner:
       selector: img[src^="/posters/"]
       attribute: src
@@ -144,8 +149,10 @@ search:
           args: ["ноября", "November"]
         - name: replace
           args: ["декабря", "December"]
+        - name: append
+          args: " +03:00" # MSK
         - name: dateparse
-          args: "2 January 2006 15:04:05"
+          args: "2 January 2006 15:04:05 -07:00"
     files:
       selector: td:nth-last-child(5)
     size:
@@ -167,6 +174,7 @@ search:
         "a[href^=\"details.php?id=\"]:contains(\"(Золото)\")": 0
         "*": 1
     uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
+    minimumratio:
+      text: 0.3
 # engine n/a

src/Jackett.Common/Definitions/beitai.yml

@@ -21,7 +21,7 @@ caps:
     - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -40,19 +40,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info_tpp
     type: info
     label: Results Per Page

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

@@ -1,7 +1,7 @@
 ---
 id: beyond-hd-oneurl
 name: Beyond-HD (OneURL)
-description: "Without BeyondHD, your HDTV is just a TV"
+description: "This is BeyondHD using OneURL (for those that have enabled 2FA)"
 language: en-us
 type: private
 encoding: UTF-8
@@ -14,7 +14,7 @@ caps:
     - {id: 2, cat: TV, desc: "TV"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
 
@@ -22,22 +22,26 @@ settings:
   - name: oneurl
     type: text
     label: OneURL
+  - name: info_oid
+    type: info
+    label: "About One-URL"
+    default: "<li>OneURL is found by accessing your Beyond-HD web site,</li><li>hovering over the <b>user icon</b></li><li>and going to <b>My Security</b></li><li>then going to the <b>One URL (OID)</b> tab,</li><li>and if it's not already active, you need to hit <b>Reset One URL</b> to activate it.</li><li>Then use that link here.</li>"
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   method: oneurl

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

@@ -14,11 +14,15 @@ caps:
     - {id: 2, cat: TV, desc: "TV"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
 
 settings:
+  - name: info_oid
+    type: info
+    label: "About 2FA"
+    default: "If you want to enable 2FA then use the Beyond-HD (OneURL) indexer instead."
   - name: username
     type: text
     label: Username
@@ -28,19 +32,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login

src/Jackett.Common/Definitions/bibliotik.yml

@@ -13,12 +13,12 @@ caps:
     - {id: 1, cat: PC, desc: "Applications"}
     - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 4, cat: Books/Comics, desc: "Comics"}
-    - {id: 5, cat: Books/Ebook, desc: "eBooks"}
-    - {id: 7, cat: Books/Magazines, desc: "Magazines"}
+    - {id: 5, cat: Books/EBook, desc: "eBooks"}
+    - {id: 7, cat: Books/Mags, desc: "Magazines"}
 
   modes:
     search: [q]
-    book-search: [q, author, title]
+    book-search: [q, title, author]
 
 settings:
   - name: username
@@ -30,25 +30,25 @@ settings:
   - name: orderby
     type: select
     label: Sort requested from site
-    default: "relevance"
+    default: relevance
     options:
-      "relevance": "relevance"
-      "year": "year"
-      "size": "size"
-      "duration": "duration"
-      "added": "added"
-      "leechers": "leechers"
-      "seeders": "seeders"
-      "snatches": "snatches"
-      "comments": "comments"
-      "files": "files"
+      relevance: relevance
+      year: year
+      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: /

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -11,60 +11,56 @@ links:
 
 caps:
   categorymappings:
-    # Movies
+    - {id: 51, cat: Movies/3D, desc: "3D"}
+    - {id: 12, cat: TV, desc: "Анимация"}
+    - {id: 35, cat: Audio/Audiobook, desc: "Аудио-книги"}
     - {id: 13, cat: Movies, desc: "Боевик"}
-    - {id: 18, cat: Movies, desc: "Катастрофа"}
-    - {id: 19, cat: Movies, desc: "Мелодрама"}
-    - {id: 21, cat: Movies, desc: "Драма"}
-    - {id: 22, cat: Movies, desc: "Триллер"}
-    - {id: 23, cat: Movies, desc: "Фантастика"}
-    - {id: 24, cat: Movies, desc: "Комедия"}
-    - {id: 26, cat: Movies, desc: "Ужасы"}
-    - {id: 27, cat: Movies, desc: "Приключения"}
-    - {id: 28, cat: Movies, desc: "Исторический"}
-    - {id: 29, cat: Movies/Foreign, desc: "Наше кино"}
-    - {id: 30, cat: Movies, desc: "Фэнтази"}
-    - {id: 31, cat: Movies, desc: "Мистика"}
-    - {id: 33, cat: Movies, desc: "Военный"}
-    - {id: 36, cat: Movies, desc: "Криминал"}
-    - {id: 39, cat: Movies, desc: "Детектив"}
-    - {id: 47, cat: Movies, desc: "Сказки"}
-    - {id: 48, cat: Movies, desc: "Вестерн"}
     - {id: 52, cat: Movies, desc: "Биография"}
+    - {id: 33, cat: Movies, desc: "Военный"}
+    - {id: 45, cat: Audio/Video, desc: "Видеоклипы"}
+    - {id: 48, cat: Movies, desc: "Вестерн"}
+    - {id: 21, cat: Movies, desc: "Драма"}
+    - {id: 32, cat: TV/Documentary, desc: "Документальный"}
+    - {id: 39, cat: Movies, desc: "Детектив"}
+    - {id: 44, cat: Audio, desc: "Зарубежная музыка"}
+    - {id: 5, cat: PC/Games, desc: "Игры"}
+    - {id: 28, cat: Movies, desc: "Исторический"}
+    - {id: 18, cat: Movies, desc: "Катастрофа"}
+    - {id: 24, cat: Movies, desc: "Комедия"}
+    - {id: 36, cat: Movies, desc: "Криминал"}
+    - {id: 38, cat: Books, desc: "Книги и журналы"}
     - {id: 53, cat: Movies, desc: "Классика"}
+    - {id: 54, cat: Audio, desc: "Классическая музыка"}
+    - {id: 19, cat: Movies, desc: "Мелодрама"}
+    - {id: 20, cat: Movies, desc: "Мультфильм"}
+    - {id: 31, cat: Movies, desc: "Мистика"}
+    - {id: 46, cat: Audio, desc: "Муз. сборники"}
+    - {id: 29, cat: Movies/Foreign, desc: "Наше кино"}
+    - {id: 49, cat: TV, desc: "Научно-популярное"}
+    - {id: 50, cat: TV, desc: "Новости"}
+    - {id: 27, cat: Movies, desc: "Приключения"}
+    - {id: 9, cat: Other, desc: "Разное"}
+    - {id: 43, cat: Audio/Foreign, desc: "Русская музыка"}
+    - {id: 1, cat: PC, desc: "Софт"}
+    - {id: 11, cat: TV, desc: "Сериалы"}
+    - {id: 37, cat: TV/Sport, desc: "Спорт"}
+    - {id: 47, cat: Movies, desc: "Сказки"}
+    - {id: 55, cat: Audio, desc: "Саундтрек"}
+    - {id: 25, cat: TV, desc: "ТВ-шоу"}
+    - {id: 22, cat: Movies, desc: "Триллер"}
+    - {id: 26, cat: Movies, desc: "Ужасы"}
+    - {id: 23, cat: Movies, desc: "Фантастика"}
+    - {id: 30, cat: Movies, desc: "Фэнтази"}
+    - {id: 42, cat: XXX, desc: "Эротика"}
     - {id: 14, cat: Movies/HD, desc: "HDTV"}
     - {id: 15, cat: Movies/DVD, desc: "DVD"}
-    - {id: 51, cat: Movies/3D, desc: "3D"}
-    - {id: 20, cat: Movies, desc: "Мультфильм"}
-    # Audio
-    - {id: 35, cat: Audio/Audiobook, desc: "Аудио-книги"}
-    - {id: 43, cat: Audio/Foreign, desc: "Русская музыка"}
-    - {id: 44, cat: Audio, desc: "Зарубежная музыка"}
-    - {id: 45, cat: Audio/Video, desc: "Видеоклипы"}
-    - {id: 46, cat: Audio, desc: "Муз. сборники"}
-    - {id: 54, cat: Audio, desc: "Классическая музыка"}
-    - {id: 55, cat: Audio, desc: "Саундтрек"}
-    # TV
-    - {id: 11, cat: TV, desc: "Сериалы"}
-    - {id: 25, cat: TV, desc: "ТВ-шоу"}
-    - {id: 37, cat: TV/Sport, desc: "Спорт"}
-    - {id: 50, cat: TV, desc: "Новости"}
-    - {id: 49, cat: TV, desc: "Научно-популярное"}
-    - {id: 32, cat: TV/Documentary, desc: "Документальный"}
-    - {id: 12, cat: TV, desc: "Анимация"}
-    # PC
-    - {id: 1, cat: PC, desc: "Софт"}
-    - {id: 5, cat: PC/Games, desc: "Игры"}
-    # Other
-    - {id: 38, cat: Books, desc: "Книги и журналы"}
-    - {id: 42, cat: XXX, desc: "Эротика"}
-    - {id: 9, cat: Other, desc: "Разное"}
 
   modes:
     search: [q]
     tv-search: [q]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: striprussian
@@ -74,19 +70,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seed": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seed: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 search:
   # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
@@ -182,8 +178,10 @@ search:
           args: ["ноября", "November"]
         - name: replace
           args: ["декабря", "December"]
+        - name: append
+          args: " +03:00" # MSK
         - name: dateparse
-          args: "2 January 2006 15:04:05"
+          args: "2 January 2006 15:04:05 -07:00"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/bigtorrent.yml

@@ -25,11 +25,11 @@ caps:
     - {id: 24534, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 65, cat: Other, desc: "Picture"}
     - {id: 64, cat: Other, desc: "Video"}
-    - {id: 68, cat: Console/Xbox360, desc: "Video Game Console"}
+    - {id: 68, cat: Console/XBox 360, desc: "Video Game Console"}
     - {id: 63, cat: Books, desc: "English Books"}
     - {id: 62, cat: Books, desc: "Hungarian Books"}
     - {id: 74, cat: Audio/Lossless, desc: "Lossless"}
-    - {id: 56, cat: PC/Phone-Other, desc: "Mobile"}
+    - {id: 56, cat: PC/Mobile-Other, desc: "Mobile"}
     - {id: 57, cat: PC, desc: "Programs"}
     - {id: 24545, cat: TV/HD, desc: "English HD Series"}
     - {id: 24544, cat: TV/HD, desc: "Hungarian HD Series"}
@@ -44,6 +44,7 @@ caps:
     tv-search: [q]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: login.php

src/Jackett.Common/Definitions/bigtower.yml

@@ -21,22 +21,16 @@ caps:
     - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
     - {id: 6, cat: TV, desc: "Serie TV"}
     - {id: 4, cat: TV/Anime, desc: "Cartoni"}
-
     # GAMES
     - {id: 7, cat: PC/Games, desc: "Giochi"}
-
     # MUSIC
     - {id: 8, cat: Audio, desc: "Musica"}
-
     # SOFTWARE
     - {id: 9, cat: PC/0day, desc: "Software"}
-
     # PHONE
-    - {id: 12, cat: PC/Phone-Other, desc: "Applicazioni"}
-
+    - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"}
     # OTHER
     - {id: 14, cat: Other, desc: "Varie & Altro"}
-
     # EBOOK
     - {id: 13, cat: Books, desc: "Libri & Edicola"}
 
@@ -45,6 +39,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username

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

@@ -31,7 +31,7 @@ caps:
     - {id: 2060, cat: TV/SD, desc: "TV XviD"}
     - {id: 2070, cat: TV/HD, desc: "TV HD Packs"}
     - {id: 2080, cat: TV/SD, desc: "TV SD Packs"}
-    - {id: 2090, cat: TV/FOREIGN, desc: "TV International"}
+    - {id: 2090, cat: TV/Foreign, desc: "TV International"}
     - {id: 3010, cat: TV/Documentary, desc: "Docu 2160p"}
     - {id: 3020, cat: TV/Documentary, desc: "Docu 1080p"}
     - {id: 3030, cat: TV/Documentary, desc: "Docu 720p"}
@@ -59,15 +59,15 @@ caps:
     - {id: 6010, cat: PC/Games, desc: "Games Windows"}
     - {id: 6020, cat: Console, desc: "Games Linux"}
     - {id: 6030, cat: PC/Mac, desc: "Games MacOS"}
-    - {id: 6040, cat: PC/Phone-Android, desc: "Games Android"}
-    - {id: 6050, cat: Console/Xbox, desc: "Games Xbox"}
+    - {id: 6040, cat: PC/Mobile-Android, desc: "Games Android"}
+    - {id: 6050, cat: Console/XBox, desc: "Games Xbox"}
     - {id: 6060, cat: Console/PSP, desc: "Games PlayStation"}
     - {id: 6070, cat: Console/NDS, desc: "Games Nintendo"}
     - {id: 6080, cat: Console, desc: "Games Sonstige"}
     - {id: 7010, cat: PC/0day, desc: "Software Windows"}
     - {id: 7020, cat: PC, desc: "Software Linux"}
     - {id: 7030, cat: PC/Mac, desc: "Software MacOS"}
-    - {id: 7040, cat: PC/Phone-Android, desc: "Software Android"}
+    - {id: 7040, cat: PC/Mobile-Android, desc: "Software Android"}
     - {id: 8010, cat: Audio/MP3, desc: "Music MP3-Album"}
     - {id: 8020, cat: Audio/MP3, desc: "Music MP3-Charts"}
     - {id: 8030, cat: Audio/MP3, desc: "Music MP3-Sampler"}
@@ -78,7 +78,7 @@ caps:
     - {id: 8080, cat: Audio/Lossless, desc: "Music FLAC-Single"}
     - {id: 8090, cat: Audio/Video, desc: "Music Video"}
     - {id: 9010, cat: Audio/Audiobook, desc: "Books A-Book"}
-    - {id: 9020, cat: Books/Ebook, desc: "Books E-Book"}
+    - {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"}
@@ -88,10 +88,11 @@ caps:
     - {id: 9999, cat: Other, desc: "unsort"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -107,19 +108,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "8": "seeders"
-      "6": "size"
-      "2": "title"
+      1: created
+      8: seeders
+      6: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "desc"
-      "2": "asc"
+      1: desc
+      2: asc
 
 login:
   path: login.php
@@ -139,15 +140,6 @@ login:
     path: browse.php
     selector: a[href="logout.php"]
 
-ratio:
-  path: browse.php
-  selector: div#tom-b-t8
-  filters:
-    - name: replace
-      args: [".", ""]
-    - name: replace
-      args: [",", "."]
-
 search:
   paths:
     - path: browse.php
@@ -205,6 +197,8 @@ search:
           args: ["Heute", "Today"]
         - name: replace
           args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
     date:
       # &nbsp;&nbsp;27.05.2019 <b>12:52:11</b>
       selector: div.tor-date:contains(".")
@@ -212,8 +206,10 @@ search:
       filters:
         - name: replace
           args: ["\u00a0", ""]
+        - name: append
+          args: " +01:00" # CET
         - name: dateparse
-          args: "02.01.2006 15:04:05"
+          args: "02.01.2006 15:04:05 -07:00"
     size:
       selector: div.tor-size
       filters:

src/Jackett.Common/Definitions/bithorlo.yml

@@ -13,12 +13,10 @@ caps:
     # E-book
     - {id: 40, cat: Books, desc: "E-book/Eng"}
     - {id: 19, cat: Books, desc: "E-book/Hun"}
-
     # Játék
     - {id: 38, cat: Console, desc: "Játék/Consol"}
     - {id: 15, cat: PC/Games, desc: "Játék/ISO"}
     - {id: 37, cat: PC/Games, desc: "Játék/Rip"}
-
     # Filmek
     - {id: 51, cat: Movies/SD, desc: "Cam/Eng"}
     - {id: 50, cat: Movies/SD, desc: "Cam/Hun"}
@@ -32,19 +30,15 @@ caps:
     - {id: 5, cat: TV, desc: "Sorozat/Hun"}
     - {id: 4, cat: Movies/SD, desc: "Xvid/Eng"}
     - {id: 3, cat: Movies/SD, desc: "Xvid/Hun"}
-
     # Zene
     - {id: 12, cat: Audio, desc: "Zene/Eng"}
     - {id: 13, cat: Audio, desc: "Zene/Hun"}
-
     # Egyéb
     - {id: 20, cat: Other, desc: "Képek"}
-    - {id: 21, cat: PC/Phone-Other, desc: "Mobil"}
-
+    - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
     # Program
     - {id: 22, cat: PC/0day, desc: "Win/Program/ISO"}
     - {id: 23, cat: PC/0day, desc: "Win/Program/Rip"}
-
     # Felnőtt tartalom
     - {id: 9, cat: XXX, desc: "XXX/Film"}
     - {id: 10, cat: XXX, desc: "XXX/Kép"}
@@ -55,6 +49,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: info_alert
@@ -75,19 +70,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   method: cookie
@@ -142,6 +137,11 @@ search:
       selector: td:nth-child(7)
     date:
       selector: "a[style=\"font-size: 8pt;cursor: pointer;\"][title]"
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
     downloadvolumefactor:
       case:
         img[title="Ingyenes letöltés"]: 0
@@ -151,4 +151,5 @@ search:
       filters:
         - name: replace
           args: ["Feltöltési szorzó × ", ""]
+# minimumseedtime: there is no mandatory seed time
 # engine n/a

src/Jackett.Common/Definitions/bithumen.yml

@@ -38,14 +38,15 @@ caps:
     - {id: 38, cat: Audio/Lossless, desc: "Lossless/Eng"}
     - {id: 22, cat: PC, desc: "Programok/egyéb"}
     - {id: 21, cat: PC, desc: "Játékok/Rip/Dox"}
-    - {id: 32, cat: Console/Xbox360, desc: "Játékok/Xbox360"}
+    - {id: 32, cat: Console/XBox 360, desc: "Játékok/Xbox360"}
     - {id: 27, cat: Other, desc: "Klipek"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/bitru.yml

@@ -9,39 +9,41 @@ links:
   - http://bitru.org/ # site forces http, https is not supported
 
 caps:
-  categories:
-    "movie": Movies
-    "serial": TV
-    "music": Audio
-    "game": PC/Games
-    "soft": PC
-    "literature": Books
-    "audiobook": Audio/Audiobook
-    "video": Movies
-    "image": Other
-    "xxx": XXX
+  categorymappings:
+    - {id: movie, cat: Movies, desc: Movie}
+    - {id: serial, cat: TV, desc: Serial}
+    - {id: music, cat: Audio, desc: Music}
+    - {id: game, cat: PC/Games, desc: Game}
+    - {id: soft, cat: PC, desc: Software}
+    - {id: literature, cat: Books, desc: Literature}
+    - {id: audiobook, cat: Audio/Audiobook, desc: Audiobook}
+    - {id: video, cat: Movies, desc: Movies}
+    - {id: image, cat: Other, desc: Image}
+    - {id: xxx, cat: XXX, desc: xxx}
 
   modes:
     search: [q]
+    tv-search: [q]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: adverts
     type: select
     label: Include Advertising
-    default: "_"
+    default: _
     options:
-      "_": "yes"
-      "no": "no"
+      _: yes
+      no: no
   - name: sort
     type: select
     label: Sort requested from site
-    default: "_"
+    default: _
     options:
-      "_": "created"
-      "seeders": "seeders"
-      "size": "size"
+      _: created
+      seeders: seeders
+      size: size
 
 search:
   paths:
@@ -130,8 +132,10 @@ search:
           args: ["ноября", "November"]
         - name: replace
           args: ["декабря", "December"]
+        - name: append
+          args: " +03:00" # MSK
         - name: dateparse
-          args: "02 January 2006 15:04"
+          args: "02 January 2006 15:04 -07:00"
     size:
       selector: td:nth-child(3)
       filters:

src/Jackett.Common/Definitions/bitspyder.yml

@@ -23,14 +23,14 @@ caps:
     - {id: 63, cat: Books, desc: "College"}
     - {id: 53, cat: Books, desc: "Cooking"}
     - {id: 42, cat: Books, desc: "Documentary"}
-    - {id: 37, cat: Books/Ebook, desc: "e-Books"}
+    - {id: 37, cat: Books/EBook, desc: "e-Books"}
     - {id: 65, cat: Books, desc: "Engineering"}
     - {id: 54, cat: Books, desc: "Health-Fitness"}
     - {id: 64, cat: Books, desc: "Kids"}
     - {id: 47, cat: Books, desc: "Languages"}
     - {id: 49, cat: Books, desc: "Linux CBTs"}
     - {id: 43, cat: Books, desc: "Lynda.com"}
-    - {id: 57, cat: Books/Magazines, desc: "Magazines"}
+    - {id: 57, cat: Books/Mags, desc: "Magazines"}
     - {id: 71, cat: Books, desc: "Pluralsight"}
     - {id: 60, cat: Books, desc: "Medical"}
     - {id: 44, cat: Books, desc: "Misc Learning"}
@@ -45,9 +45,9 @@ caps:
     - {id: 45, cat: Books, desc: "Ethical hacking"}
     - {id: 59, cat: Books, desc: "WEB | SocialMedia"}
 
-
   modes:
     search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -59,19 +59,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "8"
+    default: 8
     options:
-      "8": "created"
-      "6": "seeders"
-      "4": "size"
-      "1": "title"
+      8: created
+      6: seeders
+      4: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info
     type: info
     label: Results Per Page
@@ -94,9 +94,9 @@ search:
     - path: browse.php
   inputs:
     search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead
+    # 0 active, 1 incldead, 2 onlydead
     incldead: 1
-    # 0 title 1 default
+    # 0 title, 1 default
     scope: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
@@ -149,7 +149,7 @@ search:
         - name: replace
           args: ["\xA0", " "]
         - name: append
-          args: " +00:00"
+          args: " +00:00" # GMT
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     date:
@@ -159,17 +159,19 @@ search:
       filters:
         - name: replace
           args: ["Upploaded at - ", ""]
+        - name: replace
+          args: ["\xA0", " "]
         - name: append
-          args: " +00:00"
+          args: " +00:00" # GMT
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     downloadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
     description:
       optional: true
       selector: font[color="#990000"]
+    minimumratio:
+      text: 1.0
 # custom v4

src/Jackett.Common/Definitions/bitturk.yml

@@ -42,7 +42,7 @@ caps:
     - {id: 41, cat: Movies, desc: "ViP"}
     - {id: 42, cat: Movies/SD, desc: "XviD"}
     - {id: 43, cat: Movies/SD, desc: "XviD BoX"}
-    - {id: 55, cat: Movies/WEBDL, desc: "WEB-DL"}
+    - {id: 55, cat: Movies/WEB-DL, desc: "WEB-DL"}
     - {id: 7, cat: Audio, desc: "Müzik"}
     - {id: 20, cat: Audio, desc: "Türkçe MüziK"}
     - {id: 46, cat: Audio, desc: "Yab@ncı MüziK"}
@@ -61,6 +61,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -80,18 +81,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
+      added: created
+      seeders: seeders
+      size: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: ?p=home&pid=1
@@ -159,8 +160,10 @@ search:
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04"
+          args: "02-01-2006 15:04 -07:00"
     date:
       optional: true
       # Uploaded Friday at 05:11 by
@@ -172,6 +175,8 @@ search:
           args: "Uploaded (.+?) by"
         - name: replace
           args: [" at ", " "]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
     size:
       selector: a[rel="torrent_size"]
     seeders:

src/Jackett.Common/Definitions/blutopia.yml

@@ -12,12 +12,11 @@ caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Movies, desc: "FANRES"}
-    - {id: 6, cat: TV/Anime, desc: "Anime"}
-    - {id: 7, cat: Movies/Other, desc: "Trailer"}
+    - {id: 3, cat: Movies/Other, desc: "FANRES"}
+    - {id: 5, cat: Movies/Other, desc: "Trailer"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
 
@@ -35,19 +34,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -67,30 +66,30 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
+    # https://blutopia.xyz/torrents/filter?
+    # search=&description=&keywords=&uploader=&imdb=&tvdb=&view=list&tmdb=&mal=&igdb=
+    # &start_year=&end_year=&categories%5B%5D=3&sorting=seeders&direction=asc&page=0&qty=25
     - path: torrents/filter
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     description: ""
+    keywords: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
+    view: list
     tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""
+    start_year: ""
+    end_year: ""
     sorting: "{{ .Config.sort }}"
-    sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    page: 0
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
@@ -146,6 +145,8 @@ search:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
@@ -193,4 +194,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 2.7.0b
+# UNIT3D 3.0.0b

src/Jackett.Common/Definitions/booktracker.yml

@@ -10,10 +10,11 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Books/Ebook, desc: "Ebooks"}
+    - {id: 1, cat: Books/EBook, desc: "Ebooks"}
 
   modes:
     search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -25,19 +26,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -70,8 +71,12 @@ search:
 
   rows:
     selector: tr[id^="tor_"]:has(a[href^="./download.php?id="])
+    filters:
+      - name: andmatch
 
   fields:
+    category:
+      text: 1
     title:
       selector: a.tLink
     details:
@@ -80,8 +85,6 @@ search:
     download:
       selector: a[href^="./download.php?id="]
       attribute: href
-    category:
-      text: 1
     size:
       selector: td:nth-child(6) > u
     seeders:

src/Jackett.Common/Definitions/bootytape.yml

@@ -0,0 +1,137 @@
+---
+id: bootytape
+name: BootyTape
+language: en-us
+description: "BootyTape is a Semi-Private site for 3X"
+type: semi-private
+encoding: UTF-8
+links:
+  - https://ssl.bootytape.com/
+
+caps:
+  categorymappings:
+    - {id: 70, cat: XXX, desc: "Animation"}
+    - {id: 22, cat: XXX, desc: "Girl on Girl"}
+    - {id: 43, cat: XXX, desc: "Images"}
+    - {id: 52, cat: XXX, desc: "Straight"}
+    - {id: 82, cat: XXX, desc: "X Play Hard"}
+    - {id: 92, cat: XXX, desc: "X Play Soft"}
+
+  modes:
+    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.
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    take_login: 1
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.mainouter2:has(h1:contains("Failed"))
+  test:
+    path: my.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://ssl.bootytape.com/torrents.php?search=onlyfans&tagsearch=&cat=0&tags=1
+    - path: torrents.php
+  inputs:
+    search: "{{ .Keywords }}"
+    tagsearch: ""
+    # 0 all
+    cat: 0
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # tags search mode: 1 AND, 2 OR
+    tags: 1
+    # incldead=2 for search unseeded
+    # descr=1 for search description
+    # double=1 for search double seed bonus
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.red > tbody > tr:not(:has(th))
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    description:
+      selector: div.specg
+    banner:
+      selector: img[src*="/thbx/imgx/"]
+      attribute: src
+      optional: true
+    files:
+      text: 1
+    files:
+      selector: a[href$="filelist=1"]
+      optional: true
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      text: 0
+    seeders:
+      selector: a[href$="toseeders=1"]
+      optional: true
+    leechers:
+      text: 0
+    leechers:
+      selector: a[href$="todlers=1"]
+      optional: true
+    date:
+      text: now
+    downloadvolumefactor:
+      case:
+        "img[src$=\"pic/freedownload.gif\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "img[src$=\"pic/double-upload.gif\"]": 2
+        "*": 1
+# engine n/a

src/Jackett.Common/Definitions/borgzelle.yml

@@ -0,0 +1,215 @@
+---
+id: borgzelle
+name: Borgzelle
+description: "Borgzelle is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-de
+type: private
+encoding: UTF-8
+links:
+  - https://borgzelle.borg/
+certificates:
+  - a3f8822c97fbfe5bd00760cf8e6b75c4284f657d # self signed
+
+caps:
+  categorymappings:
+    - {id: 17, cat: TV/Sport, desc: "Sport"}
+    - {id: 32, cat: TV, desc: "Serien-Pakete"}
+    - {id: 12, cat: TV, desc: "Serien"}
+    - {id: 14, cat: Audio/Video, desc: "Musikvideo"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku"}
+    - {id: 16, cat: TV/Other, desc: "Comedy"}
+    - {id: 18, cat: TV/Anime, desc: "Anime"}
+    - {id: 6, cat: Movies/SD, desc: "Movie XviD/DivX"}
+    - {id: 34, cat: Movies/UHD, desc: "Movie UHD"}
+    - {id: 13, cat: Movies, desc: "Movie Kinder"}
+    - {id: 11, cat: Movies/HD, desc: "Movie HD2DVD"}
+    - {id: 9, cat: Movies/HD, desc: "Movie HD"}
+    - {id: 33, cat: Movies/HD, desc: "Movie h265"}
+    - {id: 7, cat: Movies/HD, desc: "Movie h264"}
+    - {id: 10, cat: Movies/DVD, desc: "Movie DVD"}
+    - {id: 28, cat: PC/Games, desc: "Spiele PDA/Handy"}
+    - {id: 25, cat: PC/Games, desc: "Spiele PC"}
+    - {id: 27, cat: PC/Games, desc: "Spiele MAC"}
+    - {id: 26, cat: Console, desc: "Spiele Konsolen"}
+    - {id: 30, cat: Other, desc: "Diverse Wallpaper"}
+    - {id: 31, cat: Other, desc: "Sonstiges"}
+    - {id: 29, cat: Books/EBook, desc: "E-Book"}
+    - {id: 19, cat: Audio, desc: "Musik"}
+    - {id: 20, cat: Audio/Audiobook, desc: "Hörbuch"}
+    - {id: 21, cat: PC/0day, desc: "Software Windows"}
+    - {id: 23, cat: PC/Mobile-Other, desc: "Software PDA/Handy"}
+    - {id: 22, cat: PC/Mac, desc: "Software MAC"}
+    - {id: 24, cat: PC, desc: "Software Linux"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_sitelink
+    type: info
+    label: About Site Link
+    default: If the Site Link domain returns a DNS error then you have not yet been assimilated.
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - 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: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+  error:
+    - selector: font[color="red"]
+  test:
+    path: index.php
+    selector: a[href^="logout.php?auth="]
+
+search:
+  paths:
+    # https://borgzelle.borg/browse.php?action=browse&showsearch=1&c34=1&c9=1&search=&incldead=0&orderby=added&sort=desc
+    - path: browse.php
+  inputs:
+    action: browse
+    showsearch: 1
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 all, 1 active, 2 dead
+    incldead: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # the site does not support imdbid searching or present imdb links in results
+
+  rows:
+    selector: "table[style=\"width: 100%;\"] > tbody > tr{{ if .Config.freeleech }}:has(span:contains(\"[OnlyUpload]\")){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents.php?torrentid="]
+    details:
+      selector: a[href^="torrents.php?torrentid="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    banner:
+      selector: a[href^="torrents.php?torrentid="] span img
+      attribute: src
+    date:
+      # 17.10. 18:34 (vor 2 Stunden und 57 Minuten)
+      selector: td:nth-child(2) > table > tbody > tr > td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "\\((.+?)\\)"
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(und)", ""]
+    size:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) b
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    files:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) a span
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) a span
+      filters:
+        - name: regexp
+          args: (\d+)
+    leechers:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) a span:nth-child(2)
+      filters:
+        - name: regexp
+          args: (\d+)
+    grabs:
+      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) a span
+      filters:
+        - name: regexp
+          args: (\d+)
+    downloadvolumefactor:
+      case:
+        "span:contains(\"[OnlyUpload]\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.7
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Gazelle

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -46,19 +46,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "DESC"
+    default: DESC
     options:
-      "DESC": "desc"
-      "ASC": "asc"
+      DESC: desc
+      ASC: asc
   - name: info_download
     type: info
     label: "Download Restrictions"
@@ -118,8 +118,10 @@ search:
     date:
       selector: td:nth-last-child(6)
       filters:
+        - name: append
+          args: " -07:00" # PDT
         - name: dateparse
-          args: "2006-01-0215:04:05"
+          args: "2006-01-0215:04:05 -07:00"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/brasiltracker.yml

@@ -2,18 +2,18 @@
 id: brasiltracker
 name: BrasilTracker
 description: "BrasilTracker is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-us
+language: pt-br
 encoding: UTF-8
 type: private
 links:
   - https://brasiltracker.org/
 
 caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Filmes/Series/Música"}
+  categories:
+    Other: Other
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep]
     movie-search: [q, imdbid]
 
@@ -24,33 +24,33 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: info_8000
+    type: info
+    label: About BrasilTracker Categories
+    default: BrasilTracker does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
   - name: freeleech
     type: checkbox
-    label: Filter freeleech only
+    label: Search freeleech only
     default: false
   - name: sort
     type: select
     label: Sort requested from site
-    default: "time"
+    default: time
     options:
-      "time": "created"
-      "seeders": "seeders"
-      "size": "size"
+      time: created
+      seeders: seeders
+      size: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info_results
     type: info
     label: "Search results"
     default: "This indexer does not support <b>Torrent Groups</b><br />Un-tick the <b>Torrent grouping</b><i> (Habilitar Grupo de Torrents)</i> checkbox in your <b>Configurações</b>."
-  - name: info_categories
-    type: info
-    label: "About categories"
-    default: "BrasilTracker does not show <b>Categories</b> in its Search Results.<br />To use this indexer with Sonarr/Radarr set your indexer category to <b>7000</b>."
 
 login:
   path: login.php
@@ -68,6 +68,7 @@ login:
 
 search:
   paths:
+    # https://brasiltracker.org/torrents.php?order_by=time&order_way=desc&freetorrent=1&filter_cat[6]=1&filter_cat[3]=1&action=basic&searchsubmit=1
     # https://brasiltracker.org/torrents.php?searchstr=mandalorain&order_by=size&order_way=desc&action=basic&searchsubmit=1
     # https://brasiltracker.org/torrents.php?searchstr=tt8179024&order_by=time&order_way=desc&action=basic&searchsubmit=1
     - path: torrents.php
@@ -76,14 +77,15 @@ search:
     order_by: "{{ .Config.sort }}"
     order_way: "{{ .Config.type }}"
     action: basic
+    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     searchsubmit: 1
 
   rows:
-    selector: "table#torrent_table > tbody > tr.torrent{{ if .Config.freeleech }}:has(strong.tl_free){{ else }}{{ end }}"
+    selector: table#torrent_table > tbody > tr.torrent
 
   fields:
     category:
-      text: 1
+      text: Other
     details:
       selector: a[href^="torrents.php?id="]
       attribute: href
@@ -106,8 +108,10 @@ search:
       selector: span.time
       attribute: title
       filters:
+        - name: append
+          args: " -03:00" # BRT
         - name: dateparse
-          args: "Jan 2 2006, 15:04"
+          args: "Jan 2 2006, 15:04 -07:00"
     size:
       selector: td:nth-child(5)
     grabs:
@@ -130,4 +134,9 @@ search:
       filters:
         - name: append
           args: " {{ .Result.title_details }}"
-# engine n/a
+    minimumratio:
+      text: 0.6
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Project Gazelle

src/Jackett.Common/Definitions/broadcity.yml

@@ -58,13 +58,6 @@ login:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]
 
-ratio:
-  path: index.php
-  selector: div#top div:nth-child(2) span:nth-child(2)
-  filters:
-    - name: regexp
-      args: "Ratio: (.+?) Bonus:"
-
 search:
   paths:
     - path: browse.php

src/Jackett.Common/Definitions/brobits.yml

@@ -1,149 +0,0 @@
----
-id: brobits
-name: BRObits
-description: "BRObits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
-type: private
-encoding: UTF-8
-links:
-  - https://brobits.cc/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 410, cat: TV, desc: "TV Series/剧集"}
-
-  modes:
-    search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker 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
-    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.
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="]
-    title:
-      optional: true
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    imdb:
-      optional: true
-      selector: div.imdb_100 > a
-      attribute: href
-    date:
-      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00"
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    date:
-      # time added
-      selector: td:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00"
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    size:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/btdb.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://btdb.eu/
-  - https://btdb.unblockit.top/
+  - https://btdb.unblockit.lat/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -27,29 +27,32 @@ legacylinks:
   - https://btdb.unblocked.bar/
   - https://btdb.proxyportal.pw/
   - https://btdb.uk-unblock.pro/
+  - https://btdb.unblockit.top/
 
 caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Other"}
+  categories:
+    Other: Other
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
+    book-search: [q]
 
 settings:
-  - name: info
+  - name: info_8000
     type: info
-    label: Category for Sonarr and Radarr
-    default: BTDB does not use categories. In your Sonarr or Radarr Torznab Indexer settings, set the category to 100001.
+    label: About BTDB Categories
+    default: BTDB 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
-    default: "time"
+    default: time
     options:
-      "time": "created"
-      "length": "size"
-      "seeders": "seeders"
+      time: created
+      length: size
+      seeders: seeders
 
 search:
   paths:
@@ -64,7 +67,7 @@ search:
 
   fields:
     category:
-      text: 1
+      text: Other
     title:
       selector: a[href*="/torrent/"]
       attribute: title
@@ -85,6 +88,10 @@ search:
       filters:
         - name: replace
           args: ["https://btdb.io/assets/img/placeholder.png", ""]
+    date:
+      selector: small:nth-of-type(5) strong
+      filters:
+        - name: timeago
     size:
       selector: small:nth-of-type(1) strong
     files:
@@ -99,10 +106,6 @@ search:
       filters:
         - name: replace
           args: [",", ""]
-    date:
-      selector: small:nth-of-type(5) strong
-      filters:
-        - name: timeago
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/btdigg.yml

@@ -10,25 +10,28 @@ links:
 
 caps:
   categories:
-    1: Other
+    Other: Other
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
+    book-search: [q]
 
 settings:
-  - name: info
+  - name: info_8000
     type: info
-    default: BTDigg does not use categories. In your software Indexer settings, set the category to 7000.
+    label: About BTDigg Categories
+    default: BTDigg 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
-    default: "0"
+    default: 0
     options:
-      "0": "relevance"
-      "2": "created"
-      "3": "size"
+      0: relevance
+      2: created
+      3: size
 
 search:
   # https://btdig.com/search?q=test&order=2
@@ -36,7 +39,7 @@ search:
   paths:
     - path: search
   inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{else}}test{{end}}"
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}test{{ end }}"
     # 0 relevance 2 age 3 size 4 files
     order: "{{ .Config.sort }}"
 
@@ -46,10 +49,10 @@ search:
       - name: andmatch
 
   fields:
+    category:
+      text: Other
     title:
       selector: div.torrent_name a
-    category:
-      text: 1
     details:
       selector: div.torrent_name a
       attribute: href

src/Jackett.Common/Definitions/btetree.yml

@@ -12,28 +12,28 @@ legacylinks:
 
 caps:
   categories:
-    "Music": Audio/Lossless
+    Music: Audio/Lossless
 
   modes:
     search: [q]
-    music-search: [q, album, artist, label, year]
+    music-search: [q, artist]
 
 settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "name": "title"
+      added: created
+      seeders: seeders
+      name: title
 
 search:
   paths:
     # http://bt.etree.org/?searchzzzz=&cat=0
     - path: /
   inputs:
-    searchzzzz: "{{ if .Query.Artist }}{{ .Query.Artist }}{{else}}{{ .Keywords }}{{end}}"
+    searchzzzz: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
     cat: 0
     sort: "{{ .Config.sort }}"
 
@@ -44,7 +44,7 @@ search:
 
   fields:
     category:
-      text: "Music"
+      text: Music
     title:
       selector: a.details_link
     details:

src/Jackett.Common/Definitions/btgigs.yml

@@ -50,6 +50,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: takelogin_action.php

src/Jackett.Common/Definitions/btnext.yml

@@ -28,7 +28,7 @@ caps:
     - {id: 91, cat: Movies/Other, desc: "Movies Kids Inglês"}
     - {id: 113, cat: Movies/Other, desc: "Movies Kids PT-BR"}
     - {id: 114, cat: Movies/Other, desc: "Movies Kids PT-PT"}
-    - {id: 77, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
+    - {id: 77, cat: Movies/WEB-DL, desc: "Movies WEB-DL"}
     - {id: 85, cat: Movies/DVD, desc: "Movies Custom-DVDR"}
     - {id: 14, cat: Movies/SD, desc: "Movies DVDRip/XViD"}
     - {id: 98, cat: Movies/Other, desc: "Movies Juvenil"}
@@ -64,24 +64,24 @@ caps:
     - {id: 81, cat: Console/PS3, desc: "Games PS3"}
     - {id: 82, cat: Console/PS4, desc: "Games PS4"}
     - {id: 83, cat: Console/PSP, desc: "Games PSP"}
-    - {id: 95, cat: Console/PSVita, desc: "Games PSVITA"}
+    - {id: 95, cat: Console/PS Vita, desc: "Games PSVITA"}
     - {id: 4, cat: Console/Wii, desc: "Games Wii"}
-    - {id: 26, cat: Console/Xbox360, desc: "Games XBOX360"}
-    - {id: 84, cat: Console/Xbox, desc: "Games XONE"}
+    - {id: 26, cat: Console/XBox 360, desc: "Games XBOX360"}
+    - {id: 84, cat: Console/XBox, desc: "Games XONE"}
     - {id: 6, cat: PC, desc: "Applications"}
     - {id: 18, cat: PC/ISO, desc: "Applications PC"}
     - {id: 19, cat: PC/Mac, desc: "Applications Macintosh"}
     - {id: 34, cat: PC/ISO, desc: "Applications Linux"}
     - {id: 44, cat: Other, desc: "Miscellaneous"}
     - {id: 54, cat: Audio/Audiobook, desc: "Books Audiobook"}
-    - {id: 57, cat: Books/Ebook, desc: "Books E-Books"}
+    - {id: 57, cat: Books/EBook, desc: "Books E-Books"}
     - {id: 58, cat: Books/Comics, desc: "Books Comics"}
     - {id: 59, cat: Books, desc: "Books Educational"}
-    - {id: 60, cat: Books/Magazines, desc: "Books Magazines/Journals"}
+    - {id: 60, cat: Books/Mags, desc: "Books Magazines/Journals"}
     - {id: 61, cat: Other, desc: "Pics/Wallpapers"}
-    - {id: 62, cat: PC/Phone-Android, desc: "Android"}
-    - {id: 63, cat: PC/Phone-IOS, desc: "iOS"}
-    - {id: 66, cat: PC/Phone-Other, desc: "WindowsPhone"}
+    - {id: 62, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 63, cat: PC/Mobile-iOS, desc: "iOS"}
+    - {id: 66, cat: PC/Mobile-Other, desc: "WindowsPhone"}
     - {id: 90, cat: Other, desc: "GPS"}
     - {id: 68, cat: Other, desc: "Others"}
     - {id: 100, cat: Other, desc: "Revistas"}
@@ -92,14 +92,15 @@ caps:
     - {id: 41, cat: XXX, desc: "XXX"}
     - {id: 64, cat: XXX, desc: "XXX-Magazines"}
     - {id: 65, cat: XXX, desc: "XXX-Movies"}
-    - {id: 67, cat: XXX/Packs, desc: "XXX-Packs"}
-    - {id: 69, cat: XXX/Imageset, desc: "XXX-Pics/Wallpapers"}
+    - {id: 67, cat: XXX/Pack, desc: "XXX-Packs"}
+    - {id: 69, cat: XXX/ImageSet, desc: "XXX-Pics/Wallpapers"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -115,18 +116,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
+      added: created
+      seeders: seeders
+      size: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
   - name: info_results
     type: info
     label: Search results

src/Jackett.Common/Definitions/btschool.yml

@@ -23,7 +23,7 @@ caps:
     - {id: 415, cat: Other, desc: "其他/Other"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.online/
+  - https://btsow.work/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -19,17 +19,24 @@ legacylinks:
   - https://btsow.monster/
   - https://btsow.casa/
   - https://btsow.website/
+  - https://btsow.online/
 
 caps:
   categories:
-    "other": Other
+    Other: Other
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
+    book-search: [q]
 
-settings: []
+settings:
+  - name: info_8000
+    type: info
+    label: About BTSOW Categories
+    default: BTSOW does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
 
 download:
   selector: a#magnetOpen
@@ -37,12 +44,12 @@ download:
 
 search:
   paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
   rows:
     selector: div.row:has(a[href*="/detail/hash/"])
   fields:
     category:
-      text: other
+      text: Other
     title:
       selector: a[href*="/detail/hash/"]
       attribute: title
@@ -55,8 +62,10 @@ search:
     date:
       selector: div.date
       filters:
+        - name: append
+          args: " -00:00" # GMT
         - name: dateparse
-          args: "2006-01-02"
+          args: "2006-01-02 -07:00"
     size:
       selector: div.size
     seeders:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -18,25 +18,27 @@ caps:
     - {id: 116, cat: Movies/HD, desc: "Bollywood-1080p BluRay Rips"}
     - {id: 117, cat: Movies/HD, desc: "Bollywood-720p BluRay Rips"}
     - {id: 118, cat: Movies, desc: "Bollywood-Remuxes BluRay"}
-    - {id: 119, cat: Movies/WEBDL, desc: "Bollywood-Untouched WEB-DLs"}
-    - {id: 120, cat: Movies/WEBDL, desc: "Bollywood-1080p WEB-Rips"}
-    - {id: 188, cat: Movies/WEBDL, desc: "Bollywood-720p WEB-Rips"}
+    - {id: 119, cat: Movies/WEB-DL, desc: "Bollywood-Untouched WEB-DLs"}
+    - {id: 120, cat: Movies/WEB-DL, desc: "Bollywood-1080p WEB-Rips"}
+    - {id: 188, cat: Movies/WEB-DL, desc: "Bollywood-720p WEB-Rips"}
     - {id: 121, cat: Movies/DVD, desc: "Bollywood-Untouched DVDs"}
-    - {id: 122, cat: Movies/WEBDL, desc: "Bollywood-DVDRips 1080p/720p"}
-    - {id: 123, cat: Movies/WEBDL, desc: "Bollywood-SDRips WEB/DVD"}
+    - {id: 189, cat: Movies/DVD, desc: "Bollywood-Encoded DVDs"}
+    - {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/WEBDL, desc: "Bollywood-WEB Originals"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"}
     - {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/WEBDL, desc: "Hollywood-Untouched WEB-DLs"}
+    - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
     - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
     - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
-    - {id: 191, cat: Movies/WEBDL, desc: "Hollywood-Encoded DVDs"}
-    - {id: 134, cat: Movies/WEBDL, desc: "Hollywood-DVDRips 1080p/720p"}
+    - {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"}
@@ -52,6 +54,8 @@ caps:
     - {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: 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"}
@@ -84,12 +88,12 @@ caps:
     - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 174, cat: Audio, desc: "Music-Telugu"}
     - {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"}
     - {id: 179, cat: PC, desc: "Appz"}
-    - {id: 180, cat: PC/Phone-Other, desc: "Mobile Stuff"}
+    - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"}
     - {id: 181, cat: Other, desc: "Pics/Wallpapers"}
     - {id: 187, cat: XXX, desc: "Adult XXX 18+"}
 
@@ -98,6 +102,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -156,8 +161,10 @@ search:
     date:
       selector: td:nth-child(5)
       filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-200615:04:05"
+          args: "02-01-200615:04:05 -07:00"
     size:
       selector: td:nth-child(6)
     download:
@@ -171,7 +178,7 @@ search:
       selector: td:nth-child(9)
     downloadvolumefactor:
       case:
-        font:contains("FreeLeech"): 0
+        "font:contains(\"FreeLeech\")": 0
         "*": 1
     uploadvolumefactor:
       case:

src/Jackett.Common/Definitions/byrutor.yml

@@ -0,0 +1,338 @@
+---
+id: byrutor
+name: Byrutor
+description: "Byrutor is a RUSSIAN Public Torrent Tracker for GAMES"
+language: ru-ru
+type: public
+encoding: UTF-8
+links:
+  - https://byrutor.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC/Games, desc: "Экшены"}
+    - {id: 2, cat: PC/Games, desc: "Приключения"}
+    - {id: 3, cat: PC/Games, desc: "Гонки"}
+    - {id: 4, cat: PC/Games, desc: "RPG"}
+    - {id: 5, cat: PC/Games, desc: "Головоломка"}
+    - {id: 6, cat: PC/Games, desc: "Инди"}
+    - {id: 7, cat: PC/Games, desc: "Стратегии"}
+    - {id: 8, cat: PC/Games, desc: "Выживание"}
+    - {id: 9, cat: PC/Games, desc: "Шутеры"}
+    - {id: 10, cat: PC/Games, desc: "Симуляторы"}
+    - {id: 11, cat: PC/Games, desc: "Спортивные"}
+    - {id: 12, cat: PC/Games, desc: "Аркады"}
+    - {id: 13, cat: PC/Games, desc: "Файтинги"}
+    - {id: 14, cat: PC/Games, desc: "Хорроры"}
+    - {id: 15, cat: PC/Games, desc: "Открытый мир"}
+    - {id: 16, cat: PC/Games, desc: "Аниме"}
+    - {id: 17, cat: PC/Games, desc: "Repack от Механики"}
+    - {id: 18, cat: PC/Games, desc: "Repack от Xatab"}
+    - {id: 19, cat: PC/Games, desc: "Repack от Catalyst"}
+    - {id: 20, cat: PC/Games, desc: "RePack от FitGirl"}
+    - {id: 21, cat: PC/Games, desc: "RePack от qoob"}
+    - {id: 232, cat: PC/Games, desc: "RePack от SpaceX"}
+    - {id: 233, cat: PC/Games, desc: "RePack от Pioneer"}
+    - {id: 22, cat: PC/Games, desc: "Русская озвучка"}
+    - {id: 24, cat: PC/Games, desc: "Новинки игр"}
+    - {id: 25, cat: PC/Games, desc: "Старые игры"}
+    - {id: 26, cat: PC/Games, desc: "Игры с геймпадом"}
+    - {id: 27, cat: PC/Games, desc: "Мультиплеер"}
+    - {id: 28, cat: PC/Games, desc: "На двоих"}
+    - {id: 29, cat: PC/Games, desc: "Рогалик"}
+    - {id: 30, cat: PC/Games, desc: "Слэшер"}
+    - {id: 31, cat: PC/Games, desc: "Стелс"}
+    - {id: 32, cat: PC/Games, desc: "Фэнтези"}
+    - {id: 33, cat: PC/Games, desc: "Платформер"}
+    - {id: 34, cat: PC/Games, desc: "Песочница"}
+    - {id: 35, cat: PC/Games, desc: "Игры в 2D"}
+    - {id: 36, cat: PC/Games, desc: "Казуальная"}
+    - {id: 37, cat: PC/Games, desc: "Point and click"}
+    - {id: 38, cat: PC/Games, desc: "Вид сбоку"}
+    - {id: 39, cat: PC/Games, desc: "Вид сверху"}
+    - {id: 40, cat: PC/Games, desc: "Tower Defense"}
+    - {id: 41, cat: PC/Games, desc: "Экономика"}
+    - {id: 42, cat: PC/Games, desc: "Тактика"}
+    - {id: 43, cat: PC/Games, desc: "Пошаговые стратегии (TBS)"}
+    - {id: 44, cat: PC/Games, desc: "Глобальные стратегии"}
+    - {id: 45, cat: PC/Games, desc: "Стратегии в реальном времени"}
+    - {id: 46, cat: PC/Games, desc: "ММО"}
+    - {id: 47, cat: PC/Games, desc: "MMORPG"}
+    - {id: 48, cat: PC/Games, desc: "Для взрослых"}
+    - {id: 49, cat: PC/Games, desc: "От первого лица"}
+    - {id: 50, cat: PC/Games, desc: "От третьего лица"}
+    - {id: 51, cat: PC/Games, desc: "Шутер от первого лица"}
+    - {id: 52, cat: PC/Games, desc: "Шутер от третьего лица"}
+    - {id: 53, cat: PC/Games, desc: "Игры для слабых ПК"}
+    - {id: 54, cat: PC/Games, desc: "Игры для очень слабых ПК"}
+    - {id: 55, cat: PC/Games, desc: "Новинки игр для слабых ПК"}
+    - {id: 56, cat: PC/Games, desc: "Игры для 64 битной системы"}
+    - {id: 57, cat: PC/Games, desc: "Игры для 32 битной системы"}
+    - {id: 58, cat: PC/Games, desc: "Психологический хоррор"}
+    - {id: 59, cat: PC/Games, desc: "Хоррор на выживание"}
+    - {id: 60, cat: PC/Games, desc: "Ролевой экшен"}
+    - {id: 61, cat: PC/Games, desc: "Приключенческий экшен"}
+    - {id: 63, cat: PC/Games, desc: "Головоломка-платформер"}
+    - {id: 64, cat: PC/Games, desc: "Скролл-шутер"}
+    - {id: 65, cat: PC/Games, desc: "Шутер с видом сверху"}
+    - {id: 66, cat: PC/Games, desc: "Градостроительный симулятор"}
+    - {id: 67, cat: PC/Games, desc: "Космический симулятор"}
+    - {id: 68, cat: PC/Games, desc: "Научная фантастика"}
+    - {id: 69, cat: PC/Games, desc: "Ролевая стратегия"}
+    - {id: 70, cat: PC/Games, desc: "Тактическая ролевая игра"}
+    - {id: 71, cat: PC/Games, desc: "Тактика в реальном времени"}
+    - {id: 72, cat: PC/Games, desc: "Японская ролевая игра"}
+    - {id: 73, cat: PC/Games, desc: "Тёмное фэнтези"}
+    - {id: 74, cat: PC/Games, desc: "Сложная"}
+    - {id: 75, cat: PC/Games, desc: "Атмосфера"}
+    - {id: 76, cat: PC/Games, desc: "Смешная"}
+    - {id: 77, cat: PC/Games, desc: "Пиксельная графика"}
+    - {id: 78, cat: PC/Games, desc: "Юмор"}
+    - {id: 79, cat: PC/Games, desc: "Классика"}
+    - {id: 80, cat: PC/Games, desc: "Космос"}
+    - {id: 81, cat: PC/Games, desc: "Зомби"}
+    - {id: 82, cat: PC/Games, desc: "Мрачная"}
+    - {id: 83, cat: PC/Games, desc: "Тайна"}
+    - {id: 84, cat: PC/Games, desc: "Физика"}
+    - {id: 85, cat: PC/Games, desc: "Реализм"}
+    - {id: 86, cat: PC/Games, desc: "Короткая"}
+    - {id: 87, cat: PC/Games, desc: "Строительство"}
+    - {id: 88, cat: PC/Games, desc: "Война"}
+    - {id: 89, cat: PC/Games, desc: "Крафтинг"}
+    - {id: 90, cat: PC/Games, desc: "Будущее"}
+    - {id: 91, cat: PC/Games, desc: "Средневековье"}
+    - {id: 92, cat: PC/Games, desc: "Затягивающая"}
+    - {id: 93, cat: PC/Games, desc: "Строительство базы"}
+    - {id: 94, cat: PC/Games, desc: "Управление ресурсами"}
+    - {id: 95, cat: PC/Games, desc: "Насилие"}
+    - {id: 96, cat: PC/Games, desc: "Для всей семьи"}
+    - {id: 97, cat: PC/Games, desc: "Исследование"}
+    - {id: 98, cat: PC/Games, desc: "Расслабляющая"}
+    - {id: 99, cat: PC/Games, desc: "Реиграбельность"}
+    - {id: 100, cat: PC/Games, desc: "Поиск предметов"}
+    - {id: 101, cat: PC/Games, desc: "Пост-апокалипсис"}
+    - {id: 102, cat: PC/Games, desc: "Вторая мировая война"}
+    - {id: 103, cat: PC/Games, desc: "Военные действия"}
+    - {id: 105, cat: PC/Games, desc: "Вождение"}
+    - {id: 189, cat: PC/Games, desc: "Пошаговая"}
+    - {id: 106, cat: PC/Games, desc: "Пошаговая тактика"}
+    - {id: 107, cat: PC/Games, desc: "3D-платформер"}
+    - {id: 108, cat: PC/Games, desc: "Одна жизнь"}
+    - {id: 109, cat: PC/Games, desc: "Паркур"}
+    - {id: 110, cat: PC/Games, desc: "Детектив"}
+    - {id: 111, cat: PC/Games, desc: "Криминал"}
+    - {id: 112, cat: PC/Games, desc: "Разрушения"}
+    - {id: 113, cat: PC/Games, desc: "90-е"}
+    - {id: 114, cat: PC/Games, desc: "80-е"}
+    - {id: 115, cat: PC/Games, desc: "Разделение экрана"}
+    - {id: 116, cat: PC/Games, desc: "Военные конфликты"}
+    - {id: 117, cat: PC/Games, desc: "Драконы"}
+    - {id: 118, cat: PC/Games, desc: "Пираты"}
+    - {id: 119, cat: PC/Games, desc: "Ниндзя"}
+    - {id: 120, cat: PC/Games, desc: "Поезда"}
+    - {id: 121, cat: PC/Games, desc: "Динозавры"}
+    - {id: 122, cat: PC/Games, desc: "Раннер"}
+    - {id: 123, cat: PC/Games, desc: "Супергерои"}
+    - {id: 124, cat: PC/Games, desc: "По комиксу"}
+    - {id: 125, cat: PC/Games, desc: "Хакерство"}
+    - {id: 126, cat: PC/Games, desc: "Эмоциональная"}
+    - {id: 127, cat: PC/Games, desc: "Футбол"}
+    - {id: 128, cat: PC/Games, desc: "Рыбалка"}
+    - {id: 129, cat: PC/Games, desc: "Бездорожье"}
+    - {id: 130, cat: PC/Games, desc: "Программирование"}
+    - {id: 131, cat: PC/Games, desc: "Вампиры"}
+    - {id: 132, cat: PC/Games, desc: "Снайпер"}
+    - {id: 133, cat: PC/Games, desc: "Ремейк"}
+    - {id: 134, cat: PC/Games, desc: "Отличный саундтрек"}
+    - {id: 135, cat: PC/Games, desc: "Глубокий сюжет"}
+    - {id: 136, cat: PC/Games, desc: "Женщина-протагонист"}
+    - {id: 137, cat: PC/Games, desc: "Кровь"}
+    - {id: 138, cat: PC/Games, desc: "Киберпанк"}
+    - {id: 139, cat: PC/Games, desc: "Эпичная"}
+    - {id: 140, cat: PC/Games, desc: "Мясо"}
+    - {id: 141, cat: PC/Games, desc: "Нагота"}
+    - {id: 142, cat: PC/Games, desc: "Цветастая"}
+    - {id: 143, cat: PC/Games, desc: "Education"}
+    - {id: 144, cat: PC/Games, desc: "Менеджмент"}
+    - {id: 145, cat: PC/Games, desc: "Упрощённый рогалик"}
+    - {id: 146, cat: PC/Games, desc: "Музыка"}
+    - {id: 147, cat: PC/Games, desc: "Кастомизация персонажа"}
+    - {id: 148, cat: PC/Games, desc: "История"}
+    - {id: 149, cat: PC/Games, desc: "Охота"}
+    - {id: 150, cat: PC/Games, desc: "По мотивам книги"}
+    - {id: 151, cat: PC/Games, desc: "Первая мировая война"}
+    - {id: 152, cat: PC/Games, desc: "Тайм-менеджмент"}
+    - {id: 153, cat: PC/Games, desc: "Психоделия"}
+    - {id: 154, cat: PC/Games, desc: "Наука"}
+    - {id: 155, cat: PC/Games, desc: "Морские бои"}
+    - {id: 156, cat: PC/Games, desc: "Сельское хозяйство"}
+    - {id: 157, cat: PC/Games, desc: "Кинематографичная"}
+    - {id: 158, cat: PC/Games, desc: "Вестерн"}
+    - {id: 159, cat: PC/Games, desc: "Три в ряд"}
+    - {id: 160, cat: PC/Games, desc: "Стимпанк"}
+    - {id: 161, cat: PC/Games, desc: "Редактор уровней"}
+    - {id: 162, cat: PC/Games, desc: "Культовая классика"}
+    - {id: 163, cat: PC/Games, desc: "Минимализм"}
+    - {id: 164, cat: PC/Games, desc: "Shoot 'em up"}
+    - {id: 165, cat: PC/Games, desc: "Решения с последствиями"}
+    - {id: 166, cat: PC/Games, desc: "Процедурная генерация"}
+    - {id: 167, cat: PC/Games, desc: "Мультипликация"}
+    - {id: 168, cat: PC/Games, desc: "Мультфильм"}
+    - {id: 169, cat: PC/Games, desc: "Пошаговые сражения"}
+    - {id: 170, cat: PC/Games, desc: "Магия"}
+    - {id: 171, cat: PC/Games, desc: "Изометрия"}
+    - {id: 172, cat: PC/Games, desc: "Карточная игра"}
+    - {id: 173, cat: PC/Games, desc: "Чёрный юмор"}
+    - {id: 174, cat: PC/Games, desc: "Beat 'em up"}
+    - {id: 175, cat: PC/Games, desc: "Свобода выбора"}
+    - {id: 176, cat: PC/Games, desc: "Рисованная графика"}
+    - {id: 177, cat: PC/Games, desc: "Инопланетяне"}
+    - {id: 178, cat: PC/Games, desc: "Твин-стик шутер"}
+    - {id: 179, cat: PC/Games, desc: "Настольная игра"}
+    - {id: 180, cat: PC/Games, desc: "Полёты"}
+    - {id: 181, cat: PC/Games, desc: "Лут"}
+    - {id: 182, cat: PC/Games, desc: "В реальном времени"}
+    - {id: 183, cat: PC/Games, desc: "MOBA"}
+    - {id: 184, cat: PC/Games, desc: "Демоны"}
+    - {id: 185, cat: PC/Games, desc: "Расследование"}
+    - {id: 186, cat: PC/Games, desc: "Мифология"}
+    - {id: 187, cat: PC/Games, desc: "VR"}
+    - {id: 190, cat: PC/Games, desc: "Dungeon Crawler"}
+    - {id: 191, cat: PC/Games, desc: "Психологическая"}
+    - {id: 192, cat: PC/Games, desc: "Нелинейная"}
+    - {id: 193, cat: PC/Games, desc: "Подземелье"}
+    - {id: 194, cat: PC/Games, desc: "Игры по сети"}
+    - {id: 195, cat: PC/Games, desc: "Для нескольких игроков"}
+    - {id: 196, cat: PC/Games, desc: "Шедевр"}
+    - {id: 197, cat: PC/Games, desc: "Ретро"}
+    - {id: 198, cat: PC/Games, desc: "Олдскул"}
+    - {id: 237, cat: PC/Games, desc: "Игры 2023 года"}
+    - {id: 238, cat: PC/Games, desc: "Игры 2024 года"}
+    - {id: 236, cat: PC/Games, desc: "Игры 2022 года"}
+    - {id: 235, cat: PC/Games, desc: "Игры 2021 года"}
+    - {id: 199, cat: PC/Games, desc: "Игры 2020 года"}
+    - {id: 200, cat: PC/Games, desc: "Игры 2019 года"}
+    - {id: 201, cat: PC/Games, desc: "Игры 2018 года"}
+    - {id: 202, cat: PC/Games, desc: "Игры 2017 года"}
+    - {id: 203, cat: PC/Games, desc: "Игры 2016 года"}
+    - {id: 204, cat: PC/Games, desc: "Игры 2015 года"}
+    - {id: 205, cat: PC/Games, desc: "Игры 2014 года"}
+    - {id: 206, cat: PC/Games, desc: "Игры 2013 года"}
+    - {id: 207, cat: PC/Games, desc: "Игры 2012 года"}
+    - {id: 208, cat: PC/Games, desc: "Игры 2011 года"}
+    - {id: 209, cat: PC/Games, desc: "Игры 2010 года"}
+    - {id: 210, cat: PC/Games, desc: "Игры 2009 года"}
+    - {id: 211, cat: PC/Games, desc: "Игры 2008 года"}
+    - {id: 212, cat: PC/Games, desc: "Игры 2007 года"}
+    - {id: 213, cat: PC/Games, desc: "Игры 2006 года"}
+    - {id: 214, cat: PC/Games, desc: "Игры 2005 года"}
+    - {id: 215, cat: PC/Games, desc: "Игры 2004 года"}
+    - {id: 216, cat: PC/Games, desc: "Игры 2003 года"}
+    - {id: 217, cat: PC/Games, desc: "Игры 2002 года"}
+    - {id: 218, cat: PC/Games, desc: "Игры 2001 года"}
+    - {id: 219, cat: PC/Games, desc: "Игры 2000 года"}
+    - {id: 220, cat: PC/Games, desc: "Игры 1999 года"}
+    - {id: 221, cat: PC/Games, desc: "Игры 1998 года"}
+    - {id: 222, cat: PC/Games, desc: "Игры 1997 года"}
+    - {id: 223, cat: PC/Games, desc: "Игры 1996 года"}
+    - {id: 224, cat: PC/Games, desc: "Игры 1995 года"}
+    - {id: 225, cat: PC/Games, desc: "Игры 1994 года"}
+    - {id: 226, cat: PC/Games, desc: "Игры 1993 года"}
+    - {id: 227, cat: PC/Games, desc: "Игры 1992 года"}
+    - {id: 228, cat: PC/Games, desc: "Игры 1991 года"}
+    - {id: 229, cat: PC/Games, desc: "Игры 1990 года"}
+    - {id: 230, cat: PC/Games, desc: "Все Топ игры"}
+    - {id: 231, cat: PC/Games, desc: "Дополнения"}
+    - {id: 23, cat: PC/Games, desc: "Ранний Доступ"}
+    - {id: 239, cat: PC/Games, desc: "Ubisoft"}
+    - {id: 240, cat: PC/Games, desc: "Bethesda"}
+    - {id: 241, cat: PC/Games, desc: "2K"}
+    - {id: 242, cat: PC/Games, desc: "CD Projekt RED"}
+    - {id: 243, cat: PC/Games, desc: "Telltale Games"}
+    - {id: 244, cat: PC/Games, desc: "Capcom"}
+    - {id: 245, cat: PC/Games, desc: "Square Enix"}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selector: a.itemtop_game
+  attribute: href
+
+search:
+  # keywords (any age posts, 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
+  paths:
+    - path: index.php
+  inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    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 }}"
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
+    sortby: date
+    resorder: desc
+
+  rows:
+    selector: div.short_search:has(div.shor_subtitles span:nth-child(2):contains("Б"))
+
+  fields:
+    category:
+      text: 1
+    year:
+      selector: div.shor_subtitles span
+      filters:
+        - name: regexp
+          args: (\d+)
+    title:
+      selector: div.short_titles > a
+      filters:
+        - name: append
+          args: " [{{ .Result.year }}]"
+    details:
+      selector: div.short_titles > a
+      attribute: href
+    download:
+      selector: div.short_titles > a
+      attribute: href
+    banner:
+      selector: img
+      attribute: src
+      optional: true
+    description:
+      selector: div.shor_desc
+      optional: true
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    grabs:
+      selector: li:has(img[alt="Скачиваний"])
+    size:
+      selector: div.shor_subtitles span:nth-child(2)
+      filters:
+        - name: replace
+          args: ["ТБ", "TB"]
+        - name: replace
+          args: ["ГБ", "GB"]
+        - name: replace
+          args: ["МБ", "MB"]
+        - name: replace
+          args: ["КБ", "KB"]
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/carpathians.yml

@@ -26,22 +26,23 @@ caps:
     - {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/XBox, desc: "Játék/XBOX (XBOX360)"}
     - {id: 182, cat: Audio/Lossless, desc: "Lossless"}
     - {id: 90, cat: Audio/MP3, desc: "Mp3/Eng"}
     - {id: 50, cat: Audio/MP3, desc: "Mp3/Hun"}
     - {id: 100, cat: Audio/Video, desc: "Music-Video"}
-    - {id: 180, cat: PC/Phone-Other, desc: "Program/Mobil"}
+    - {id: 180, cat: PC/Mobile-Other, desc: "Program/Mobil"}
     - {id: 170, cat: PC/0day, desc: "Program/PC"}
     - {id: 80, cat: TV, desc: "Sorozat/Eng"}
     - {id: 40, cat: TV, desc: "Sorozat/Hun"}
     - {id: 110, cat: XXX, desc: "XXX"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -53,19 +54,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "5"
+    default: 5
     options:
-      "5": "created"
-      "8": "seeders"
-      "6": "size"
-      "2": "title"
+      5: created
+      8: seeders
+      6: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/carphunter.yml

@@ -36,7 +36,7 @@ caps:
     - {id: 22, cat: Books, desc: "Könyv/Hun"}
     - {id: 35, cat: TV/Anime, desc: "Mese/Eng"}
     - {id: 36, cat: TV/Anime, desc: "Mese/Hun"}
-    - {id: 25, cat: PC/Phone-Other, desc: "Mobil"}
+    - {id: 25, cat: PC/Mobile-Other, desc: "Mobil"}
     - {id: 30, cat: PC/ISO, desc: "Programok/ISO"}
     - {id: 31, cat: PC/0day, desc: "Programok/RIP"}
     - {id: 33, cat: TV, desc: "Sorozat/Eng"}
@@ -53,6 +53,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -68,18 +69,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
+      4: created
+      7: seeders
+      5: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -26,19 +26,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 caps:
   categorymappings:
@@ -55,12 +55,12 @@ caps:
     - {id: 43, cat: Audio/Other, desc: "Misc Audio"}
     - {id: 14, cat: TV, desc: "Banned"}
     - {id: 29, cat: TV, desc: "Public Domain"}
-    - {id: 42, cat: TV/FOREIGN, desc: "Foreign Language"}
+    - {id: 42, cat: TV/Foreign, desc: "Foreign Language"}
     - {id: 28, cat: TV, desc: "Animated Adverts"}
     - {id: 45, cat: TV/Documentary, desc: "Documentaries"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -88,7 +88,7 @@ search:
     category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
     # 0=title, 1=title&descr, 2=descr
     options: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
-    # 0 all 1 activeonly 2 deadonly
+    # 0 all, 1 activeonly, 2 deadonly
     active: 0
     order: "{{ .Config.sort }}"
     by: "{{ .Config.type }}"
@@ -139,6 +139,8 @@ search:
       filters:
         - name: re_replace
           args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
     date:
       # February 09, 2019, 06:35:08 AM
       selector: td:nth-child(5):not(:contains("day"))
@@ -146,8 +148,10 @@ search:
       filters:
         - name: re_replace
           args: ["[,]|[\\s+]|[//\xa0],\\/g", " "]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "January 02  2006  03:04:05 PM"
+          args: "January 02  2006  03:04:05 PM -07:00"
     seeders:
       selector: td:nth-child(6)
     leechers:

src/Jackett.Common/Definitions/casatorrent.yml

@@ -15,9 +15,9 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 65, cat: Movies/HD, desc: "BD: BD"}
-    - {id: 68, cat: Books/Magazines, desc: "Ebooks:  Presse"}
+    - {id: 68, cat: Books/Mags, desc: "Ebooks:  Presse"}
     - {id: 90, cat: Audio/Audiobook, desc: "Ebooks: Audio books"}
-    - {id: 56, cat: Books/Ebook, desc: "Ebooks: Ebooks"}
+    - {id: 56, cat: Books/EBook, desc: "Ebooks: Ebooks"}
     - {id: 95, cat: Books/Comics, desc: "Ebooks: Mangas"}
     - {id: 84, cat: XXX, desc: "Ebooks: XXX"}
     - {id: 54, cat: Movies/3D, desc: "Films: 3D"}
@@ -41,8 +41,8 @@ caps:
     - {id: 98, cat: Movies, desc: "Films: VFSTFR"}
     - {id: 89, cat: Movies, desc: "Films: VO"}
     - {id: 55, cat: Movies, desc: "Films: VOSTFR"}
-    - {id: 58, cat: Movies/WEBDL, desc: "Films: Web - DL"}
-    - {id: 57, cat: Movies/WEBDL, desc: "Films: WebRip"}
+    - {id: 58, cat: Movies/WEB-DL, desc: "Films: Web - DL"}
+    - {id: 57, cat: Movies/WEB-DL, desc: "Films: WebRip"}
     - {id: 72, cat: Movies/HD, desc: "Films: x265"}
     - {id: 1, cat: XXX, desc: "Films: XXX"}
     - {id: 97, cat: Console, desc: "Jeux : Android"}
@@ -69,6 +69,7 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -90,12 +91,12 @@ settings:
     label: Replace MULTI by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
   - name: vostfr
     type: checkbox
     label: Replace VOSTFR with ENGLISH
@@ -103,19 +104,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: account-login.php
@@ -129,10 +130,6 @@ login:
     path: torrents-search.php
     selector: a[href="account-logout.php"]
 
-ratio:
-  path: torrents-search.php
-  selector: div#infobar b
-
 search:
   paths:
     - path: torrents-search.php

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -9,6 +9,8 @@ links:
   - https://casstudio.tk/
 legacylinks:
   - https://casstudio.tv/
+certificates:
+  - 71fe2295b57e6287ce36a39823bee752cbbd9d42 # expired 01 November 2020
 
 caps:
   categorymappings:
@@ -48,7 +50,6 @@ caps:
     - {id: 231, cat: TV, desc: "Моцарт в джунглях / Mozart in the Jungle"}
     - {id: 280, cat: TV, desc: "Тик / The Tick"}
     - {id: 328, cat: TV, desc: "AMC"}
-    - {id: 103, cat: TV, desc: "Ад На Колёсах / Hell On Wheels"}
     - {id: 122, cat: TV, desc: "Безумцы / Mad Men"}
     - {id: 208, cat: TV, desc: "Бойтесь ходячих мертвецов / Fear the Walking Dead"}
     - {id: 219, cat: TV, desc: "В пустыне смерти / Into the Badlands"}
@@ -144,7 +145,6 @@ caps:
     - {id: 294, cat: TV, desc: "Лемони Сникет: 33 несчастья / A Series of Unfortunate Events"}
     - {id: 275, cat: TV, desc: "Оранжевый - хит сезона / Orange is the New Black"}
     - {id: 194, cat: TV, desc: "Сорвиголова / Daredevil"}
-    - {id: 115, cat: TV, desc: "Чёрное зеркало / Black Mirror"}
     - {id: 333, cat: TV, desc: "Showtime"}
     - {id: 154, cat: TV, desc: "Блудливая Калифорния / Californication"}
     - {id: 118, cat: TV, desc: "Веб терапия / Web Therapy"}
@@ -186,14 +186,11 @@ caps:
     - {id: 134, cat: TV, desc: "Белый воротничок / White Collar"}
     - {id: 230, cat: TV, desc: "Колония / Colony"}
     - {id: 291, cat: TV, desc: "Королева Юга / Queen of the South"}
-    - {id: 200, cat: TV, desc: "Мистер робот / Mr. Robot"}
     - {id: 236, cat: TV, desc: "Полицейские на велосипедах / Pacific Blue"}
     - {id: 168, cat: TV, desc: "Форс-мажоры / Костюмы / Suits"}
     - {id: 352, cat: TV, desc: "YouTube"}
     - {id: 370, cat: TV, desc: "Британские сериалы"}
     - {id: 69, cat: TV, desc: "Мушкетеры / The Musketeers"}
-    - {id: 139, cat: TV, desc: "Острые козырьки / Peaky Blinders"}
-    - {id: 165, cat: TV, desc: "Лютер / Luther"}
     - {id: 272, cat: TV, desc: "Поворот / TURN"}
     - {id: 373, cat: TV, desc: "Датские и Шведские сериалы"}
     - {id: 381, cat: TV, desc: "Ирландские сериалы"}
@@ -224,6 +221,8 @@ caps:
     - {id: 265, cat: TV, desc: "V8 supercars"}
     - {id: 31, cat: TV, desc: "Пользователи"}
     - {id: 188, cat: TV, desc: "Поздравления"}
+    - {id: 24, cat: TV, desc: "Чат"}
+    - {id: 23, cat: TV, desc: "Общий"}
 
   modes:
     search: [q]
@@ -240,19 +239,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "t"
+    default: t
     options:
-      "t": "created"
-      "ts": "seeders"
-      "sz": "size"
-      "i": "title"
+      t: created
+      ts: seeders
+      sz: size
+      i: title
   - name: type
     type: select
     label: Order requested from site
-    default: "d"
+    default: d
     options:
-      "d": "desc"
-      "a": "asc"
+      d: desc
+      a: asc
 
 login:
   path: ucp.php?mode=login
@@ -330,6 +329,8 @@ search:
           args: "(Вчера, \\d{2}:\\d{2})"
         - name: replace
           args: ["Вчера", "Today"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     date:
       # Сегодня, 17:54
@@ -340,6 +341,8 @@ search:
           args: "(Сегодня, \\d{2}:\\d{2})"
         - name: replace
           args: ["Сегодня", "Today"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     date:
       # 12 янв 2019, 11:26
@@ -372,8 +375,10 @@ search:
           args: ["ноя", "Nov"]
         - name: replace
           args: ["дек", "Dec"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02 Jan 2006, 15:04"
+          args: "02 Jan 2006, 15:04 -07:00"
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/ccfbits.yml

@@ -15,25 +15,21 @@ caps:
     - {id: 40, cat: Movies/BluRay, desc: "Blu-ray原盘"}
     - {id: 30, cat: Movies/HD, desc: "高清电影1080p"}
     - {id: 2, cat: Movies/HD, desc: "高清电影720p"}
-
     # 高清电视剧
     - {id: 7, cat: TV/HD, desc: "高清欧美剧"}
     - {id: 32, cat: TV/HD, desc: "高清国产剧"}
     - {id: 34, cat: TV/HD, desc: "高清港台剧"}
     - {id: 36, cat: TV/HD, desc: "高清日韩剧"}
-
     # 其他高清视频
     - {id: 12, cat: TV/Documentary, desc: "高清纪录片"}
     - {id: 11, cat: TV/Sport, desc: "高清体育"}
     - {id: 23, cat: TV/Anime, desc: "高清动漫"}
     - {id: 4, cat: Audio/Video, desc: "高清MV/综艺"}
-
     # 电视剧集包
     - {id: 38, cat: TV/HD, desc: "欧美剧包"}
     - {id: 33, cat: TV/HD, desc: "国产剧包"}
     - {id: 35, cat: TV/HD, desc: "港台剧包"}
     - {id: 37, cat: TV/HD, desc: "日韩剧包"}
-
     # 非高清和其他
     - {id: 43, cat: TV/SD, desc: "HR_HDTV"}
     - {id: 20, cat: Movies/DVD, desc: "DVD"}
@@ -42,7 +38,7 @@ caps:
     - {id: 22, cat: Other, desc: "杂项"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -57,19 +53,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "DESC"
+    default: DESC
     options:
-      "DESC": "desc"
-      "ASC": "asc"
+      DESC: desc
+      ASC: asc
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/channelx.yml

@@ -18,7 +18,7 @@ caps:
     - {id: 4, cat: TV/Sport, desc: "Sports"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
 
@@ -36,19 +36,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -68,13 +68,6 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: torrents/filter
@@ -147,6 +140,8 @@ search:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
@@ -191,4 +186,9 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+    minimumratio:
+      text: 0.4
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 2.7.0

src/Jackett.Common/Definitions/chdbits.yml

@@ -25,6 +25,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -33,10 +34,30 @@ settings:
   - 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: 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
 
 login:
   path: takelogin.php
@@ -54,13 +75,6 @@ login:
   test:
     path: torrents.php
 
-ratio:
-  path: torrents.php
-  selector: table#info_block
-  filters:
-    - name: regexp
-      args: "Ratio:\\s(.*?)\\s\\s"
-
 search:
   paths:
     - path: torrents.php
@@ -68,6 +82,14 @@ search:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 1
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -104,7 +126,7 @@ search:
       attribute: title
       filters:
         - name: append
-          args: " +08:00"
+          args: " +08:00" # CST
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     downloadvolumefactor:

src/Jackett.Common/Definitions/chilebt.yml

@@ -23,10 +23,11 @@ caps:
     - {id: 13, cat: XXX, desc: "XXX"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -42,19 +43,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -76,13 +77,6 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: filterTorrents
@@ -150,6 +144,8 @@ search:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace

src/Jackett.Common/Definitions/cilipro.yml

@@ -89,6 +89,8 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
+    book-search: [q]
 
 settings: []
 
@@ -98,7 +100,7 @@ search:
       method: post
       followredirect: true
   inputs:
-    keyword: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}"
+    keyword: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
 
   rows:
     selector: div.list-area > dl.item
@@ -119,8 +121,10 @@ search:
     date:
       selector: dd.attr span:nth-child(1) b
       filters:
+        - name: append
+          args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02"
+          args: "2006-01-02 -07:00"
     size:
       selector: dd.attr span:nth-child(2) b
     seeders:

src/Jackett.Common/Definitions/cinemageddon.yml

@@ -35,7 +35,7 @@ caps:
     - {id: 22, cat: Movies, desc: "Trailers"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     movie-search: [q, imdbid]
 
 login:

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -25,16 +25,17 @@ caps:
     - {id: 25, cat: TV/SD, desc: "TV SD"}
     - {id: 1, cat: PC, desc: "Aplikacje"}
     - {id: 15, cat: PC/Games, desc: "Gry"}
-    - {id: 16, cat: PC/Phone-Other, desc: "Mobile"}
+    - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"}
     - {id: 17, cat: Other, desc: "Inne"}
     - {id: 19, cat: Audio, desc: "Muzyka"}
     - {id: 21, cat: Books, desc: "Book"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: cookie
@@ -55,19 +56,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "created"
-      "5": "seeders"
-      "3": "size"
-      "1": "title"
+      2: created
+      5: seeders
+      3: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   method: cookie
@@ -138,7 +139,7 @@ search:
       selector: td[width="66%"] > span > span
       filters:
         - name: append
-          args: " +00:00"
+          args: " +02:00" # EET
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     size:
@@ -159,4 +160,7 @@ search:
         "*": 1
     minimumratio:
       text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # engine n/a

src/Jackett.Common/Definitions/concen.yml

@@ -19,19 +19,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created"
+    default: created
     options:
-      "created": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "title": "title"
+      created: created
+      seeds: seeders
+      size: size
+      title: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 search:
   paths:
@@ -64,6 +64,7 @@ search:
       selector: td.views-field-name a
       attribute: href
     date:
+      # 3 hours 27 min
       selector: td.views-field-created
     size:
       selector: td.views-field-size

src/Jackett.Common/Definitions/concertos.yml

@@ -19,7 +19,7 @@ caps:
     - {id: 9, cat: Audio, desc: "Podcast"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -38,18 +38,18 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
+      created_at: created
+      seeders: seeders
+      size: size
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -69,13 +69,6 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: span:has(i.fa-percent)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: torrents

src/Jackett.Common/Definitions/cooltorrent.yml

@@ -27,7 +27,7 @@ caps:
     - {id: "Erotyka", cat: XXX, desc: "Erotyka"}
     - {id: "Muzyka", cat: Audio, desc: "Muzyka"}
     - {id: "Programy", cat: PC, desc: "Programy"}
-    - {id: "GSM", cat: PC/Phone-Other, desc: "GSM/PDA"}
+    - {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"}
@@ -43,6 +43,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -106,7 +107,7 @@ search:
         - name: regexp
           args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
         - name: append
-          args: " +00:00"
+          args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
     size:

src/Jackett.Common/Definitions/cpabien.yml

@@ -42,8 +42,8 @@ legacylinks:
   - https://wvw.cpasbien-fr.fr/
 
 caps:
-  categorymappings:
-    - {id: other, cat: Other, desc: "Movies/TV/Other"}
+  categories:
+    Other: Other
 
   modes:
     search: [q]
@@ -66,10 +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: info_categories
+  - name: info_8000
     type: info
-    label: "About categories"
-    default: "cpasbien does not show <b>Categories</b> in its Search Results.<br />To use this indexer with Sonarr/Radarr set your indexer category to <b>7000</b>."
+    label: About cpasbien Categories
+    default: cpasbien does not return categories in its search results page. To add to Sonarr or Radarr replace all categories with 8000(Other).
   - name: multilang
     type: checkbox
     label: Replace MULTI by another language in release name
@@ -79,12 +79,12 @@ settings:
     label: Replace MULTI by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
   - name: vostfr
     type: checkbox
     label: Replace VOSTFR with ENGLISH
@@ -102,18 +102,24 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}index.php?do=search&subaction=search{{else}}{{end}}"
+    - path: "{{ if .Keywords }}index.php?do=search&subaction=search{{ else }}{{ end }}"
       method: post
   inputs:
-    story: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ end }}"
   # does not support imdbid search and does not return imdb link in results.
+  keywordsfilters:
+    # if searching for season packs swith S01 to saison 1 #9712
+    - name: re_replace
+      args: ["(?i)(S0)(\\d{1,2})$", "saison $2"]
+    - name: re_replace
+      args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
     selector: div#gauche > table > tbody > tr:has(a)
 
   fields:
     category:
-      text: other
+      text: Other
     site_date:
       selector: a
       filters:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -21,8 +21,8 @@ legacylinks:
   - https://cpasbiens.ind-unblock.xyz/
 
 caps:
-  categorymappings:
-    - {id: other, cat: Other, desc: "Movies/TV/Other"}
+  categories:
+    Other: Other
 
   modes:
     search: [q]
@@ -30,6 +30,10 @@ caps:
     movie-search: [q]
 
 settings:
+  - name: info_8000
+    type: info
+    label: About cpasbienclone Categories
+    default: cpasbienclone does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
   - name: multilang
     type: checkbox
     label: Replace MULTI by another language in release name
@@ -39,12 +43,12 @@ settings:
     label: Replace MULTI by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
   - name: vostfr
     type: checkbox
     label: Replace VOSTFR with ENGLISH
@@ -52,20 +56,16 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site (Only works for searches with Keywords)
-    default: "?trie-date-d"
+    default: ?trie-date-d
     options:
-      "?trie-date-d": "created desc"
-      "?trie-date-a": "created asc"
-      "?trie-seeds-d": "seeders desc"
-      "?trie-seeds-a": "seeders asc"
-      "?trie-poid-d": "size desc"
-      "?trie-poid-a": "size asc"
-      "?trie-nom-d": "title desc"
-      "?trie-nom-a": "title asc"
-  - name: info_categories
-    type: info
-    label: "About categories"
-    default: "cpasbien clone does not show <b>Categories</b> in its Search Results.<br />To use this indexer with Sonarr/Radarr set your indexer category to <b>7000</b>."
+      ?trie-date-d: created desc
+      ?trie-date-a: created asc
+      ?trie-seeds-d: seeders desc
+      ?trie-seeds-a: seeders asc
+      ?trie-poid-d: size desc
+      ?trie-poid-a: size asc
+      ?trie-nom-d: title desc
+      ?trie-nom-a: title asc
 
 download:
   selector: a[href^="magnet:"]
@@ -73,14 +73,14 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}{{ .Config.sort }}{{else}}home/{{end}}"
+    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}home/{{ end }}"
 
   rows:
     selector: table.table-corps > tbody > tr:has(a)
 
   fields:
     category:
-      text: other
+      text: Other
     site_date:
       selector: a
       filters:

src/Jackett.Common/Definitions/crazyhd.yml

@@ -16,13 +16,13 @@ caps:
     - {id: 16, cat: Movies/BluRay, desc: "Movies English Bluray"}
     - {id: 11, cat: Movies/DVD, desc: "Movies English DVD-RIP"}
     - {id: 14, cat: Movies, desc: "Movies English CAM"}
-    - {id: 60, cat: Movies/WEBDL, desc: "Movies English HD/WEBRIP"}
+    - {id: 60, cat: Movies/WEB-DL, desc: "Movies English HD/WEBRIP"}
     - {id: 19, cat: Movies/DVD, desc: "Movies Hindi DVDRIP"}
     - {id: 52, cat: Movies/BluRay, desc: "Movies Hindi Blu Ray"}
     - {id: 18, cat: Movies/DVD, desc: "Movies Hindi PreDVD"}
     - {id: 17, cat: Movies, desc: "Movies Hindi CAM"}
     - {id: 42, cat: Movies, desc: "Movies Tamil"}
-    - {id: 65, cat: Movies/WEBDL, desc: "Movies Hindi Webrip/HDrip"}
+    - {id: 65, cat: Movies/WEB-DL, desc: "Movies Hindi Webrip/HDrip"}
     - {id: 24, cat: Movies, desc: "Movies UNRATED"}
     - {id: 53, cat: Movies/Foreign, desc: "Movies Other Foreign"}
     - {id: 64, cat: Movies, desc: "Movies Animated"}
@@ -40,17 +40,17 @@ caps:
     - {id: 95, cat: TV, desc: "TV Other Language"}
     # Games
     - {id: 3, cat: PC/Games, desc: "Games PC"}
-    - {id: 75, cat: PC/Phone-Android, desc: "Games Android"}
-    - {id: 77, cat: PC/Phone-IOS, desc: "Games Ipad/Iphone"}
-    - {id: 79, cat: PC/Phone-Other, desc: "Games Other Platforms"}
+    - {id: 75, cat: PC/Mobile-Android, desc: "Games Android"}
+    - {id: 77, cat: PC/Mobile-iOS, desc: "Games Ipad/Iphone"}
+    - {id: 79, cat: PC/Mobile-Other, desc: "Games Other Platforms"}
     - {id: 61, cat: PC/Games, desc: "Games trailer"}
     - {id: 90, cat: Console/PS4, desc: "Games Ps4"}
     - {id: 86, cat: Console/PS3, desc: "Games xbox / ps3"}
     - {id: 92, cat: PC/Games, desc: "Games nrated"}
     # Software
     - {id: 7, cat: PC/0day, desc: "Software Windows"}
-    - {id: 20, cat: PC/Phone-Android, desc: "Software Android Apps"}
-    - {id: 83, cat: PC/Phone-IOS, desc: "Software Iphone Apps"}
+    - {id: 20, cat: PC/Mobile-Android, desc: "Software Android Apps"}
+    - {id: 83, cat: PC/Mobile-iOS, desc: "Software Iphone Apps"}
     - {id: 39, cat: PC, desc: "Software Tutorials"}
     - {id: 63, cat: PC, desc: "Software Linux"}
     - {id: 89, cat: PC/Mac, desc: "Software MAC OSX"}
@@ -78,7 +78,7 @@ caps:
     - {id: 4, cat: Other, desc: "Other"}
     - {id: 44, cat: Other, desc: "Food & Recipes"}
     - {id: 38, cat: Other, desc: "Pictures"}
-    - {id: 54, cat: Books/Magazines, desc: "Magazine"}
+    - {id: 54, cat: Books/Mags, desc: "Magazine"}
     - {id: 88, cat: Books/Comics, desc: "Comics"}
 
   modes:
@@ -86,6 +86,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: cookie
@@ -102,19 +103,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   method: cookie
@@ -124,13 +125,6 @@ login:
     path: index.php
     selector: a[href="logout.php"]
 
-ratio:
-  path: index.php
-  selector: span:contains("Ratio ")
-  filters:
-    - name: replace
-      args: ["Ratio ", ""]
-
 search:
   paths:
     - path: index.php?page=searchlist
@@ -187,8 +181,10 @@ search:
     date:
       selector: div.torrent-time
       filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006"
+          args: "02/01/2006 -07:00"
     seeders:
       selector: div.torrent-seeder
     leechers:

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -35,14 +35,14 @@ caps:
     - {id: 67, cat: Movies, desc: "Films Pack Films"}
     - {id: 68, cat: Movies, desc: "Films VostFR"}
     - {id: 69, cat: Movies, desc: "Films VO"}
-    - {id: 70, cat: Movies/WEBDL, desc: "Films WebRip 1080p"}
-    - {id: 71, cat: Movies/WEBDL, desc: "Films WebRip 720p"}
-    - {id: 73, cat: Movies/WEBDL, desc: "Films Webrip"}
-    - {id: 72, cat: Movies/WEBDL, desc: "Films WEB DL"}
+    - {id: 70, cat: Movies/WEB-DL, desc: "Films WebRip 1080p"}
+    - {id: 71, cat: Movies/WEB-DL, desc: "Films WebRip 720p"}
+    - {id: 73, cat: Movies/WEB-DL, desc: "Films Webrip"}
+    - {id: 72, cat: Movies/WEB-DL, desc: "Films WEB DL"}
     - {id: 99, cat: Movies, desc: "Films Remux"}
     - {id: 98, cat: TV/Anime, desc: "Films Film Animées"}
-    - {id: 122, cat: Movies/WEBDL, desc: "Films Web-DL 1080P"}
-    - {id: 123, cat: Movies/WEBDL, desc: "Films WEB-DL 720p"}
+    - {id: 122, cat: Movies/WEB-DL, desc: "Films Web-DL 1080P"}
+    - {id: 123, cat: Movies/WEB-DL, desc: "Films WEB-DL 720p"}
     - {id: 126, cat: Movies, desc: "Films HDTV"}
     # Jeux
     - {id: 114, cat: PC/Games, desc: "Jeux PC"}
@@ -52,20 +52,20 @@ caps:
     - {id: 118, cat: Console, desc: "Jeux Switch"}
     - {id: 119, cat: Console/Wii, desc: "Jeux Wii"}
     - {id: 120, cat: Console/WiiU, desc: "Jeux WiiU"}
-    - {id: 121, cat: Console/Xbox, desc: "Jeux Xbox"}
+    - {id: 121, cat: Console/XBox, desc: "Jeux Xbox"}
     # Livre
     - {id: 100, cat: Audio/Audiobook, desc: "Livre Audio"}
-    - {id: 101, cat: Books/Ebook, desc: "Livre Epub"}
+    - {id: 101, cat: Books/EBook, desc: "Livre Epub"}
     - {id: 102, cat: Books, desc: "Livre Mangas"}
     - {id: 103, cat: Books, desc: "Livres BD"}
     - {id: 104, cat: Books/Comics, desc: "Livres Comics"}
-    - {id: 105, cat: Books/Magazines, desc: "Livres Press"}
+    - {id: 105, cat: Books/Mags, desc: "Livres Press"}
     - {id: 106, cat: Books, desc: "Livres Romans"}
     # Logiciel
     - {id: 110, cat: PC/0day, desc: "Logiciel Windows"}
     - {id: 111, cat: PC, desc: "Logiciel Linux"}
-    - {id: 113, cat: PC/Phone-IOS, desc: "Logiciel Apple"}
-    - {id: 112, cat: PC/Phone-Other, desc: "Logiciel Smart Phone"}
+    - {id: 113, cat: PC/Mobile-iOS, desc: "Logiciel Apple"}
+    - {id: 112, cat: PC/Mobile-Other, desc: "Logiciel Smart Phone"}
     # Musiques
     - {id: 125, cat: Audio/Video, desc: "Musiques Videos Pack"}
     - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
@@ -104,6 +104,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: cookie
@@ -126,12 +127,12 @@ settings:
     label: Replace MULTI by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
   - name: vostfr
     type: checkbox
     label: Replace VOSTFR with ENGLISH
@@ -139,19 +140,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   method: cookie
@@ -241,11 +242,11 @@ search:
         - name: regexp
           args: "src=(.*?)><"
     grabs:
-      selector: td:nth-last-child(5)
-    seeders:
       selector: td:nth-last-child(4)
-    leechers:
+    seeders:
       selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
     size:
       selector: a[onmouseover][href^="torrents-details.php?id="]
       attribute: onmouseover
@@ -258,8 +259,10 @@ search:
       filters:
         - name: regexp
           args: "Partagé Voilà : </b>(.*?)<br"
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "01-02-2006"
+          args: "01-02-2006 -07:00"
     downloadvolumefactor:
       case:
         img[src="images/Torrents/free.png"]: 0

src/Jackett.Common/Definitions/crnaberza.yml

@@ -49,6 +49,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -68,19 +69,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -99,13 +100,6 @@ login:
     path: browse.php
     selector: a[href$="/logout.php"]
 
-ratio:
-  path: browse.php
-  selector: div div font:contains("Ratio:")
-  filters:
-    - name: regexp
-      args: "Ratio:\\s(.*?)\\s\\s"
-
 search:
   paths:
     # http://www.crnaberza.com/browse.php?c52=1&c20=1&c34=1&incldead=1&search=star+trek
@@ -151,13 +145,17 @@ search:
           args: ["Danas", "Today"]
         - name: replace
           args: ["Juče", "Yesterday"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
     date:
       # Feb 14 2019<br>10:20 AM
       optional: true
       selector: td:nth-of-type(6):not(:contains("Juče")):not(:contains("Danas"))
       filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM"
+          args: "Jan 2 2006 03:04 PM -07:00"
     size:
       selector: td:nth-of-type(7)
     grabs:

src/Jackett.Common/Definitions/cztorrent.yml

@@ -1,168 +0,0 @@
----
-id: cztorrent
-name: CzTorrent
-description: "CzTorrent is a Czech Semi-Private site for TV / MOVIES / GENERAL"
-language: cs-cz
-type: semi-private
-encoding: UTF-8
-links:
-  - https://tracker.cztorrent.net/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: PC, desc: "Aplikace"}
-    - {id: 1, cat: Movies, desc: "Filmy"}
-    - {id: 36, cat: Movies/3D, desc: "Filmy - 3D"}
-    - {id: 35, cat: Movies/Other, desc: "Filmy - anime"}
-    - {id: 37, cat: Movies/BluRay, desc: "Filmy - Blu-ray"}
-    - {id: 33, cat: TV/Documentary, desc: "Filmy - dokument"}
-    - {id: 11, cat: Movies/DVD, desc: "Filmy - DVD"}
-    - {id: 30, cat: Movies/DVD, desc: "Filmy - DVD full"}
-    - {id: 5, cat: Movies, desc: "Filmy - kreslené"}
-    - {id: 31, cat: Movies/HD, desc: "HD"}
-    - {id: 38, cat: Movies/HD, desc: "HD-LQ"}
-    - {id: 3, cat: PC/Games, desc: "Hry"}
-    - {id: 2, cat: Audio, desc: "Hudba"}
-    - {id: 34, cat: Audio/Video, desc: "Hudební video"}
-    - {id: 6, cat: Books, desc: "Knihy"}
-    - {id: 13, cat: Console, desc: "Konzole"}
-    - {id: 32, cat: Audio, desc: "Mluvené slovo"}
-    - {id: 16, cat: PC/Phone-Other, desc: "Mobil, PDA"}
-    - {id: 4, cat: Other, desc: "Ostatní"}
-    - {id: 25, cat: TV, desc: "Seriály"}
-    - {id: 29, cat: Audio, desc: "Soundtrack"}
-    - {id: 24, cat: XXX, desc: "xXx"}
-
-  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: sort
-    type: select
-    label: Sort requested from site
-    default: "7"
-    options:
-      "7": "created"
-      "2": "seeders"
-      "6": "size"
-      "5": "title"
-
-login:
-  path: login-page
-  method: form
-  form: form[action="/login?url=%2F"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    persistent_login: 1
-  error:
-    - selector: div.error
-  test:
-    path: torrents
-
-search:
-  paths:
-    - path: torrents
-  keywordsfilters:
-    - name: re_replace
-      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    s: "{{ .Keywords }}"
-    # 0 approved 1 all 2 not approved
-    t: 1
-    o: "{{ .Config.sort }}"
-    # does not support imdbid search and does not return imdb links
-
-  rows:
-    selector: tr.torr_hover
-
-  fields:
-    title:
-      selector: td.detaily a
-      filters:
-        - name: re_replace
-          args: [".*? / ", ""]
-        - name: diacritics
-          args: replace
-        - name: replace
-          args: ["1080i", "1080p"]
-        - name: replace
-          args: ["720i", "720p"]
-        - name: replace
-          args: ["pLQ", "p"]
-        - name: replace
-          args: ["pHD", "p"]
-        - name: replace
-          args: ["serie", ""]
-        - name: replace
-          args: ["Serie", ""]
-        - name: re_replace
-          args: ["(\\d{2})\\.", "S$1"]
-        - name: re_replace
-          args: ["(\\d{1})\\.", "S0$1"]
-    category:
-      selector: td.categorie
-      case:
-        ":contains(\"Filmy\")": 1
-        ":contains(\"Seriály\")": 25
-        ":contains(\"Filmy - dokument\")": 33
-        ":contains(\"Aplikace\")": 22
-        ":contains(\"Filmy - 3D\")": 36
-        ":contains(\"Filmy - anime\")": 35
-        ":contains(\"Filmy - Blu-ray\")": 37
-        ":contains(\"Filmy - DVD\")": 11
-        ":contains(\"Filmy - DVD full\")": 30
-        ":contains(\"Filmy - kreslené\")": 5
-        ":contains(\"HD\")": 31
-        ":contains(\"HD-LQ\")": 38
-        ":contains(\"Hry\")": 3
-        ":contains(\"Hudba\")": 2
-        ":contains(\"Hudba DVD/HD\")": 34
-        ":contains(\"Hudební video\")": 34
-        ":contains(\"Knihy\")": 6
-        ":contains(\"Konzole\")": 13
-        ":contains(\"Mluvené slovo\")": 32
-        ":contains(\"Mobil, PDA\")": 16
-        ":contains(\"Ostatní\")": 4
-        ":contains(\"Soundtrack\")": 29
-        ":contains(\"Videoklipy\")": 19
-        ":contains(\"xXx\")": 24
-    details:
-      selector: td.detaily a
-      attribute: href
-    download:
-      selector: td.download a
-      attribute: href
-    size:
-      selector: td.detaily
-      filters:
-        - name: split
-          args: ["|", 1]
-    date:
-      selector: td.detaily
-      filters:
-        - name: split
-          args: ["|", 2]
-        - name: append
-          args: " +02:00"
-        - name: dateparse
-          args: "2.1.2006 15:04  -07:00"
-    seeders:
-      selector: td:nth-child(7) span
-    leechers:
-      selector: td:nth-child(8) span
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/dariustracker.yml

@@ -0,0 +1,177 @@
+---
+id: dariustracker
+name: Darius Tracker
+description: "Darius Tracker is a HUNGARIAN Private Tracker for MOVIES / TV / GENERAL"
+language: hu
+type: private
+encoding: UTF-8
+links:
+  - https://dariustracker.hu/
+
+caps:
+  categorymappings:
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 88, cat: XXX, desc: "Film/DVD/XXX"}
+    - {id: 62, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 89, cat: XXX, desc: "Film/HD/XXX"}
+    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
+    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 64, cat: Movies/SD, desc: "Film/XviD/Pack"}
+    - {id: 70, cat: TV/Sport, desc: "Film/XviD/Sport"}
+    - {id: 33, cat: XXX, desc: "Film/XviD/XXX"}
+    - {id: 90, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 31, cat: PC/Games, desc: "Játék/Pc/Iso"}
+    - {id: 29, cat: PC/Games, desc: "Játék/Pc/Rip"}
+    - {id: 54, cat: Console/PS3, desc: "Játék/PS2/PS3"}
+    - {id: 32, cat: Console/XBox, desc: "Játék/XBOX"}
+    - {id: 50, cat: Books, desc: "Könyv/Eng"}
+    - {id: 27, cat: Books, desc: "Könyv/Hun"}
+    - {id: 65, cat: Other, desc: "Képek"}
+    - {id: 66, cat: XXX, desc: "Képek/XXX"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 68, cat: Movies/DVD, desc: "Mese/DVD"}
+    - {id: 69, cat: Movies/SD, desc: "Mese/XviD"}
+    - {id: 67, cat: PC/Mobile-Other, desc: "Mobiltelefon"}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 81, cat: PC/ISO, desc: "Program/Iso"}
+    - {id: 49, cat: PC, desc: "Program/Rip"}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
+
+  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: 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: 4
+    options:
+      1: name
+      5: size
+      4: added
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table[cellpadding="5"]:contains("Hiba")
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    # https://dariustracker.hu/browse.php?viewMode=&c68=1&c69=1&search=&incldead=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c[{{.}}]=1&{{end}}"
+    viewMode: ""
+    search: "{{ .Keywords }}"
+    # 0 active, 1 active and dead, 2 deadonly,  3 my torrents, 4 seedless
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: table[cellpadding="5"] > tbody > tr > td > table[cellpadding="5"] > 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[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    banner:
+      selector: a.preview
+      attribute: href
+      optional: true
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+      optional: true
+    files:
+      selector: td:nth-last-child(7)
+      filters:
+        - name: regexp
+          args: (\d+)
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(4) b
+    grabs:
+      selector: td:nth-last-child(3)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      selector: img[src="skin/vilagos_kek/arrowdown.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    uploadvolumefactor:
+      selector: img[src="skin/vilagos_kek/arrowup.png"] ~ span
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

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

@@ -40,7 +40,7 @@ caps:
     # App
     - {id: 12, cat: PC/0day, desc: "App PC"}
     - {id: 125, cat: PC/Mac, desc: "App MacOS"}
-    - {id: 11, cat: PC/Phone-Other, desc: "App Mobil"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
     # Sport
     - {id: 61, cat: TV/Sport, desc: "Sport HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport SD"}
@@ -52,21 +52,22 @@ caps:
     - {id: 132, cat: Other, desc: "Internal Sonstiges"}
     # Sonstiges
     - {id: 64, cat: TV/Anime, desc: "Anime"}
-    - {id: 96, cat: Books/Ebook, desc: "e-Book"}
+    - {id: 96, cat: Books/EBook, desc: "e-Book"}
     - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
     - {id: 71, cat: Other, desc: "Anderes"}
     # XXX
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
-    - {id: 75, cat: XXX/Packs, desc: "XXX Pack"}
+    - {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"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -89,19 +90,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeds": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeds: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login.php
@@ -124,20 +125,20 @@ login:
 download:
   before:
     path: ajax_det_poll.php
-    method: "post"
+    method: post
     inputs:
-      set_thanks: "thanks"
+      set_thanks: thanks
       det_id: "{{ .DownloadUri.Query.torrent }}"
-      ajax: "yes"
+      ajax: yes
 
 search:
   paths:
     - 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: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 name, 1 descr, 2 both, 4 imdb
+    blah: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
@@ -242,6 +243,8 @@ search:
           args: ["Heute", "Today"]
         - name: replace
           args: ["Gestern", "Yesterday"]
+        - name: append
+          args: " +01:00" # CET
     date:
       # 30.02.2018 um 23:12:50
       selector: div.selection_unter_ab:contains(".")
@@ -249,8 +252,10 @@ search:
       filters:
         - name: replace
           args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
         - name: dateparse
-          args: "02.01.2006 15:04:05"
+          args: "02.01.2006 15:04:05 -07:00"
     description:
       selector: selection_unter_af
       optional: true
@@ -279,4 +284,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# Engine tbd
+# Engine n/a

src/Jackett.Common/Definitions/darktracker.yml

@@ -11,6 +11,7 @@ links:
 
 caps:
   categorymappings:
+    - {id: 511, cat: Movies/HD, desc: "Форум HD Video/RIP"}
     # 3D
     - {id: 801, cat: Movies/3D, desc: " | Фильмы в формате 3D"}
     - {id: 802, cat: Movies/3D, desc: " | Мультфильмы в формате 3D"}
@@ -25,7 +26,7 @@ caps:
     - {id: 1055, cat: Movies, desc: "Новинки проката"}
     - {id: 1058, cat: Movies, desc: " | Портал для новинок"}
     - {id: 1056, cat: Movies/SD, desc: " | Новинки (CamRip|TS)"}
-    - {id: 1057, cat: Movies/WEBDL, desc: " | Новинки (HD|DVD|BD|WEB|TV|SAT|PDTV|-Rip)"}
+    - {id: 1057, cat: Movies/WEB-DL, desc: " | Новинки (HD|DVD|BD|WEB|TV|SAT|PDTV|-Rip)"}
     - {id: 1059, cat: Movies, desc: " | Новинки (BD|HDTV|DVD)"}
     - {id: 57, cat: Movies, desc: "Зарубежные фильмы"}
     - {id: 1021, cat: Movies, desc: " | Фильмы 2011-2020"}
@@ -121,12 +122,12 @@ caps:
     - {id: 269, cat: PC/Games, desc: "Архив"}
     # Консоли
     # Console
-    - {id: 679, cat: Console/Xbox, desc: "XBox"}
-    - {id: 684, cat: Console/Xbox, desc: " | XBox360 | Игры"}
-    - {id: 683, cat: Console/Xbox, desc: " | XBox360 | Демоверсии"}
-    - {id: 682, cat: Console/Xbox, desc: " | Xbox360 | Live"}
-    - {id: 681, cat: Console/Xbox, desc: " | XBox360 | Программы / Прошивки"}
-    - {id: 680, cat: Console/Xbox, desc: " | XBox | Игры"}
+    - {id: 679, cat: Console/XBox, desc: "XBox"}
+    - {id: 684, cat: Console/XBox, desc: " | XBox360 | Игры"}
+    - {id: 683, cat: Console/XBox, desc: " | XBox360 | Демоверсии"}
+    - {id: 682, cat: Console/XBox, desc: " | Xbox360 | Live"}
+    - {id: 681, cat: Console/XBox, desc: " | XBox360 | Программы / Прошивки"}
+    - {id: 680, cat: Console/XBox, desc: " | XBox | Игры"}
     - {id: 685, cat: Console/PS3, desc: "PlayStation"}
     - {id: 694, cat: Console/PS3, desc: " | Playstation 3 | Игры"}
     - {id: 693, cat: Console/PS3, desc: " | Playstation 3 | PSN Игры"}
@@ -517,8 +518,8 @@ caps:
     - {id: 914, cat: PC, desc: " | Справочные системы"}
     - {id: 915, cat: PC, desc: " | Общий архив раздела "Справочно-правовые системы""}
     - {id: 908, cat: PC, desc: "Системы навигации и карты, ГИС"}
-    - {id: 1107, cat: PC/Phone-IOS, desc: " | iOS"}
-    - {id: 1106, cat: PC/Phone-Android, desc: " | Android"}
+    - {id: 1107, cat: PC/Mobile-iOS, desc: " | iOS"}
+    - {id: 1106, cat: PC/Mobile-Android, desc: " | Android"}
     - {id: 1105, cat: PC, desc: " | Garmin"}
     - {id: 1104, cat: PC/0day, desc: " | Windows XP/Vista/7/8/8.1/10"}
     - {id: 1103, cat: PC/0day, desc: " | Windows CE"}
@@ -549,27 +550,27 @@ caps:
     - {id: 909, cat: PC, desc: "Разное"}
     # Смартфоны и Планшеты
     # mobiles
-    - {id: 921, cat: PC/Phone-Other, desc: "Windows Phone 7"}
-    - {id: 936, cat: PC/Phone-Other, desc: " | Прошивки"}
-    - {id: 935, cat: PC/Phone-Other, desc: " | Игры"}
-    - {id: 934, cat: PC/Phone-Other, desc: " | Программы"}
-    - {id: 1079, cat: PC/Phone-Other, desc: " | Архив"}
-    - {id: 922, cat: PC/Phone-Other, desc: "Windows Mobile 5.x - 6.x"}
-    - {id: 927, cat: PC/Phone-Other, desc: " | Прошивки"}
-    - {id: 926, cat: PC/Phone-Other, desc: " | Игры"}
-    - {id: 925, cat: PC/Phone-Other, desc: " | Программы"}
-    - {id: 1080, cat: PC/Phone-Other, desc: " | Архив"}
-    - {id: 923, cat: PC/Phone-Android, desc: "Android"}
-    - {id: 930, cat: PC/Phone-Android, desc: " | Игры"}
-    - {id: 929, cat: PC/Phone-Android, desc: " | Программы"}
-    - {id: 928, cat: PC/Phone-Android, desc: " | Прошивки"}
-    - {id: 1081, cat: PC/Phone-Android, desc: " | Архив"}
-    - {id: 924, cat: PC/Phone-Other, desc: "Symbian"}
-    - {id: 933, cat: PC/Phone-Other, desc: " | Игры"}
-    - {id: 932, cat: PC/Phone-Other, desc: " | Программы"}
-    - {id: 931, cat: PC/Phone-Other, desc: " | Прошивки"}
-    - {id: 1082, cat: PC/Phone-Other, desc: " | Архив"}
-    - {id: 1048, cat: PC/Phone-Other, desc: "Архив"}
+    - {id: 921, cat: PC/Mobile-Other, desc: "Windows Phone 7"}
+    - {id: 936, cat: PC/Mobile-Other, desc: " | Прошивки"}
+    - {id: 935, cat: PC/Mobile-Other, desc: " | Игры"}
+    - {id: 934, cat: PC/Mobile-Other, desc: " | Программы"}
+    - {id: 1079, cat: PC/Mobile-Other, desc: " | Архив"}
+    - {id: 922, cat: PC/Mobile-Other, desc: "Windows Mobile 5.x - 6.x"}
+    - {id: 927, cat: PC/Mobile-Other, desc: " | Прошивки"}
+    - {id: 926, cat: PC/Mobile-Other, desc: " | Игры"}
+    - {id: 925, cat: PC/Mobile-Other, desc: " | Программы"}
+    - {id: 1080, cat: PC/Mobile-Other, desc: " | Архив"}
+    - {id: 923, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 930, cat: PC/Mobile-Android, desc: " | Игры"}
+    - {id: 929, cat: PC/Mobile-Android, desc: " | Программы"}
+    - {id: 928, cat: PC/Mobile-Android, desc: " | Прошивки"}
+    - {id: 1081, cat: PC/Mobile-Android, desc: " | Архив"}
+    - {id: 924, cat: PC/Mobile-Other, desc: "Symbian"}
+    - {id: 933, cat: PC/Mobile-Other, desc: " | Игры"}
+    - {id: 932, cat: PC/Mobile-Other, desc: " | Программы"}
+    - {id: 931, cat: PC/Mobile-Other, desc: " | Прошивки"}
+    - {id: 1082, cat: PC/Mobile-Other, desc: " | Архив"}
+    - {id: 1048, cat: PC/Mobile-Other, desc: "Архив"}
     # Авто и Мото
     # Auto and Bikes
     - {id: 1095, cat: TV/Sport, desc: "Книги по ремонту/обслуживанию/эксплуатации ТС"}
@@ -610,6 +611,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -625,19 +627,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "1"
+    default: 1
     options:
-      "1": "created"
-      "10": "seeders"
-      "7": "size"
-      "2": "title"
+      1: created
+      10: seeders
+      7: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
 
 login:
   path: login.php
@@ -784,6 +786,7 @@ search:
     grabs:
       selector: td:nth-child(9)
     date:
+      # unix
       selector: td:last-child > u
     downloadvolumefactor:
       case:

src/Jackett.Common/Definitions/darmowetorenty.yml

@@ -1,168 +0,0 @@
----
-id: darmowetorenty
-name: Darmowe torrenty
-description: "Darmowe torrenty is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-pl
-type: semi-private
-encoding: iso-8859-2
-links:
-  - https://darmowe-torenty.pl/
-
-caps:
-  categorymappings:
-    - {id: 14, cat: Movies, desc: "Filmy"}
-    - {id: 27, cat: Movies/DVD, desc: "Filmy DVD-R"}
-    - {id: 28, cat: Movies/SD, desc: "Filmy VCD/SVCD"}
-    - {id: 29, cat: Movies/BluRay, desc: "Filmy BluRay/x264"}
-    - {id: 30, cat: Movies/SD, desc: "Filmy DivX/XviD LEKTOR/NAPISY PL"}
-    - {id: 72, cat: Movies/SD, desc: "Filmy DivX/XviD ENG/..."}
-    - {id: 31, cat: Movies, desc: "Filmy RMVB"}
-    - {id: 74, cat: Movies/HD, desc: "Filmy HD"}
-    - {id: 75, cat: Movies/3D, desc: "Filmy 3D"}
-    - {id: 16, cat: TV, desc: "Seriale"}
-    - {id: 25, cat: TV, desc: "Seriale Polskie"}
-    - {id: 26, cat: TV, desc: "Seriale Zagraniczne"}
-    - {id: 17, cat: Movies, desc: "Dla Dzieci"}
-    - {id: 32, cat: Movies, desc: "Bajki Pl/Eng"}
-    - {id: 18, cat: PC/Games, desc: "Gry"}
-    - {id: 34, cat: PC/Games, desc: "Gry PC"}
-    - {id: 35, cat: Console/PSP, desc: "Gry PS2/PS3/PSP"}
-    - {id: 36, cat: Console/Xbox, desc: "Gry Xbox"}
-    - {id: 37, cat: Console, desc: "Gry Inne Konsole"}
-    - {id: 19, cat: Audio, desc: "Muzyka"}
-    - {id: 38, cat: Audio, desc: "Muzyka Polska/Zagraniczna"}
-    - {id: 39, cat: Audio, desc: "Muzyka Soundtracki"}
-    - {id: 40, cat: Audio, desc: "Muzyka Teledyski/Koncerty"}
-    - {id: 20, cat: PC/Phone-Other, desc: "GSM/PDA"}
-    - {id: 42, cat: PC/Phone-Other, desc: " Tapety GSM/PDA"}
-    - {id: 43, cat: PC/Phone-Other, desc: " Programy GSM/PDA"}
-    - {id: 44, cat: PC/Phone-Other, desc: " Filmy GSM/PDA"}
-    - {id: 45, cat: PC/Phone-Other, desc: " Dzwonki GSM/PDA"}
-    - {id: 46, cat: PC/Phone-Other, desc: " Gry GSM/PDA"}
-    - {id: 21, cat: Books, desc: "Książki/Czasopisma"}
-    - {id: 47, cat: Books/Ebook, desc: "Książki/Czasopisma E-Booki"}
-    - {id: 48, cat: Audio/Audiobook, desc: "Książki/Czasopisma Audio-Booki"}
-    - {id: 49, cat: Books/Magazines, desc: "Książki/Czasopisma Czasopisma"}
-    - {id: 50, cat: Books/Comics, desc: "Książki/Czasopisma Komiksy"}
-    - {id: 22, cat: PC, desc: "Programy"}
-    - {id: 51, cat: PC/0day, desc: "Programy Windows"}
-    - {id: 52, cat: PC, desc: "Programy Linux"}
-    - {id: 53, cat: PC/Mac, desc: "Programy Macintosh"}
-    - {id: 23, cat: Other, desc: "Inne"}
-    - {id: 55, cat: Other, desc: "Inne Tapety"}
-    - {id: 54, cat: Other, desc: "Inne Śmieszne"}
-    - {id: 56, cat: TV/Sport, desc: "Inne Sport"}
-    - {id: 57, cat: Other, desc: "Inne Pozostałe"}
-    - {id: 24, cat: XXX, desc: "Erotyka"}
-    - {id: 58, cat: XXX, desc: "Erotyka Czasopisma"}
-    - {id: 59, cat: XXX, desc: "Erotyka Zdjęcia "}
-    - {id: 60, cat: XXX, desc: "Erotyka Filmy"}
-    - {id: 61, cat: XXX, desc: "Erotyka Gry "}
-    - {id: 63, cat: XXX, desc: "Erotyka Hentai+18"}
-    - {id: 68, cat: TV/Anime, desc: "Anime"}
-    - {id: 69, cat: TV/Anime, desc: "Anime Pl"}
-    - {id: 70, cat: TV/Anime, desc: "Anime"}
-    - {id: 76, cat: Other, desc: "Archiwum"}
-
-  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
-
-login:
-  path: login.php
-  method: form
-  form: form[action="login.php"]
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-    returnto: /
-  error:
-    - selector: div:contains("Podany login jest")
-  test:
-    path: index.php
-    selector: a[href^="logout.php?check_hash="]
-
-search:
-  paths:
-    # https://darmowe-torenty.pl/torrenty.php?search=&category=0
-    - path: torrenty.php
-  inputs:
-    # does not support multi cat search
-    category: 0
-    search: "{{ .Keywords }}"
-    erotyka: 1
-    strona: 0
-    # does not support imdbid searching and does not display imdb links in results
-
-  rows:
-    selector: table.header > tbody > tr > td
-    after: 2
-
-  fields:
-    category:
-      selector: a[href^="/torrenty.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href^="details.php?id="]:has(span)
-    details:
-      selector: a[href^="details.php?id="]:has(span)
-      attribute: href
-    id:
-      selector: img[src^="./imgtorrent/"]
-      attribute: src
-      filters:
-        - name: regexp
-          args: "\\.\\/imgtorrent\\/tmp\\/(.+?)-darmowe-torenty.jpg"
-    download:
-      # download link is obfuscated ( decodeURIComponent((atob($link.attr('data-href')))) ) so we create our own
-      text: "download.php?id={{ .Result.id }}&f={{ .Result.title }}.torrent"
-    banner:
-      selector: img[src^="./imgtorrent/"]
-      attribute: src
-    date:
-      selector: p
-      remove: br
-      filters:
-        - name: regexp
-          args: "Dodano: (\\d{2}\\/\\d{2}\\/\\d{4})"
-        - name: dateparse
-          args: "02/01/2006"
-    size:
-      selector: p
-      filters:
-        - name: regexp
-          args: "Rozmiar: (\\d{1,4}\\.\\d{2}\\s[K|M|G][B])"
-    seeders:
-      text: 0
-    seeders:
-      selector: p
-      optional: true
-      filters:
-        - name: regexp
-          args: "Seedów: (\\d+)"
-    leechers:
-      text: 0
-    leechers:
-      selector: p
-      optional: true
-      filters:
-        - name: regexp
-          args: "Leecherów: (\\d+)"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/datascene.yml

@@ -22,7 +22,7 @@ caps:
     - {id: 43, cat: Console, desc: "Games | Console"}
     - {id: 29, cat: Other, desc: "Images"}
     - {id: 2, cat: Other, desc: "MiSC"}
-    - {id: 5, cat: PC/Phone-Other, desc: "Mobile"}
+    - {id: 5, cat: PC/Mobile-Other, desc: "Mobile"}
     - {id: 27, cat: Movies, desc: "Movies | Pack"}
     - {id: 63, cat: Movies, desc: "Movies | Pack-Ro"}
     - {id: 46, cat: Movies/3D, desc: "Movies | 3D"}
@@ -54,10 +54,11 @@ caps:
     - {id: 12, cat: XXX, desc: "XxX"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -73,19 +74,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "4"
+    default: 4
     options:
-      "4": "created"
-      "7": "seeders"
-      "5": "size"
-      "1": "title"
+      4: created
+      7: seeders
+      5: size
+      1: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
@@ -98,10 +99,6 @@ login:
   test:
     path: browse.php
 
-ratio:
-  path: browse.php
-  selector: font:contains("Ratio:") > span
-
 search:
   paths:
     - path: browse.php

src/Jackett.Common/Definitions/deildu.yml

@@ -26,7 +26,7 @@ caps:
     - {id: 8, cat: TV, desc: "TV shows"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
@@ -41,19 +41,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: added
     options:
-      "added": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      added: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: takelogin.php
@@ -70,11 +70,11 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # active 1 incldead 2 onlydead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead
     incldead: 1
     # 1 = look in description
-    Lysing: "{{ if .Query.IMDBID }}1{{else}}{{end}}"
+    Lysing: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     # does not return imdb links
@@ -116,8 +116,10 @@ search:
     date:
       selector: td:nth-child(6)
       filters:
+        - name: append
+          args: " +00:00" # GMT
         - name: dateparse
-          args: "2006-01-0215:04:05"
+          args: "2006-01-0215:04:05 -07:00"
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,7 +10,7 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.top/
+  - https://demonoid.unblockit.lat/
 legacylinks:
   - https://demonoid.unblockit.pro/
   - https://demonoid.unblockit.one/
@@ -23,16 +23,17 @@ legacylinks:
   - https://demonoid.unblockit.pw/
   - https://demonoid.unblockit.id/
   - https://demonoid.unblockit.win/
+  - https://demonoid.unblockit.top/
 
 caps:
   categorymappings:
     # fetch these from https://www.demonoid.is/cached/torrent_categories_script.js?v5
     # Applications
-    - {id: 1, cat: PC/Phone-Android, desc: "Applications Android"}
-    - {id: 2, cat: PC/Phone-IOS, desc: "Applications Iphone / Ipod touch"}
+    - {id: 1, cat: PC/Mobile-Android, desc: "Applications Android"}
+    - {id: 2, cat: PC/Mobile-iOS, desc: "Applications Iphone / Ipod touch"}
     - {id: 3, cat: PC, desc: "Applications Linux"}
     - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
-    - {id: 5, cat: PC/Phone-Other, desc: "Applications Mobile phone"}
+    - {id: 5, cat: PC/Mobile-Other, desc: "Applications Mobile phone"}
     - {id: 6, cat: PC, desc: "Applications PocketPC"}
     - {id: 7, cat: PC/0day, desc: "Applications Windows"}
     # Audio Books
@@ -71,39 +72,39 @@ caps:
     - {id: 40, cat: Audio/Audiobook, desc: "Audio Books Western"}
     - {id: 41, cat: Audio/Audiobook, desc: "Audio Books Young Adult"}
     # Books
-    - {id: 42, cat: Books/Ebook, desc: "Books Action and Adventure"}
-    - {id: 43, cat: Books/Ebook, desc: "Books Biography"}
-    - {id: 44, cat: Books/Ebook, desc: "Books Childrens"}
-    - {id: 45, cat: Books/Ebook, desc: "Books Computers and Technology"}
-    - {id: 46, cat: Books/Ebook, desc: "Books Contemporary"}
-    - {id: 47, cat: Books/Ebook, desc: "Books Cooking"}
-    - {id: 48, cat: Books/Ebook, desc: "Books Crafts and Hobbies"}
-    - {id: 49, cat: Books/Ebook, desc: "Books Educational"}
-    - {id: 50, cat: Books/Ebook, desc: "Books Fantasy"}
-    - {id: 51, cat: Books/Ebook, desc: "Books Fiction"}
-    - {id: 52, cat: Books/Ebook, desc: "Books General"}
-    - {id: 53, cat: Books/Ebook, desc: "Books History"}
-    - {id: 54, cat: Books/Ebook, desc: "Books Horror"}
-    - {id: 55, cat: Books/Ebook, desc: "Books Humor"}
-    - {id: 56, cat: Books/Ebook, desc: "Books Literary"}
-    - {id: 57, cat: Books/Magazines, desc: "Books Magazine"}
-    - {id: 58, cat: Books/Ebook, desc: "Books Mainstream"}
-    - {id: 59, cat: Books/Ebook, desc: "Books Medicine and Health"}
-    - {id: 60, cat: Books/Ebook, desc: "Books Mystery and Suspense"}
-    - {id: 61, cat: Books/Ebook, desc: "Books Newspaper"}
-    - {id: 62, cat: Books/Ebook, desc: "Books Nonfiction"}
-    - {id: 63, cat: Books/Ebook, desc: "Books Other"}
-    - {id: 64, cat: Books/Ebook, desc: "Books Paranormal"}
-    - {id: 65, cat: Books/Ebook, desc: "Books Religion"}
-    - {id: 66, cat: Books/Ebook, desc: "Books Romance"}
-    - {id: 67, cat: Books/Ebook, desc: "Books RPG"}
-    - {id: 68, cat: Books/Ebook, desc: "Books Sci-Fi"}
-    - {id: 69, cat: Books/Ebook, desc: "Books Self-help"}
-    - {id: 70, cat: Books/Ebook, desc: "Books Suspense"}
-    - {id: 71, cat: Books/Ebook, desc: "Books Textbook"}
-    - {id: 72, cat: Books/Ebook, desc: "Books Thriller"}
-    - {id: 73, cat: Books/Ebook, desc: "Books Western"}
-    - {id: 74, cat: Books/Ebook, desc: "Books Young Adult"}
+    - {id: 42, cat: Books/EBook, desc: "Books Action and Adventure"}
+    - {id: 43, cat: Books/EBook, desc: "Books Biography"}
+    - {id: 44, cat: Books/EBook, desc: "Books Childrens"}
+    - {id: 45, cat: Books/EBook, desc: "Books Computers and Technology"}
+    - {id: 46, cat: Books/EBook, desc: "Books Contemporary"}
+    - {id: 47, cat: Books/EBook, desc: "Books Cooking"}
+    - {id: 48, cat: Books/EBook, desc: "Books Crafts and Hobbies"}
+    - {id: 49, cat: Books/EBook, desc: "Books Educational"}
+    - {id: 50, cat: Books/EBook, desc: "Books Fantasy"}
+    - {id: 51, cat: Books/EBook, desc: "Books Fiction"}
+    - {id: 52, cat: Books/EBook, desc: "Books General"}
+    - {id: 53, cat: Books/EBook, desc: "Books History"}
+    - {id: 54, cat: Books/EBook, desc: "Books Horror"}
+    - {id: 55, cat: Books/EBook, desc: "Books Humor"}
+    - {id: 56, cat: Books/EBook, desc: "Books Literary"}
+    - {id: 57, cat: Books/Mags, desc: "Books Magazine"}
+    - {id: 58, cat: Books/EBook, desc: "Books Mainstream"}
+    - {id: 59, cat: Books/EBook, desc: "Books Medicine and Health"}
+    - {id: 60, cat: Books/EBook, desc: "Books Mystery and Suspense"}
+    - {id: 61, cat: Books/EBook, desc: "Books Newspaper"}
+    - {id: 62, cat: Books/EBook, desc: "Books Nonfiction"}
+    - {id: 63, cat: Books/EBook, desc: "Books Other"}
+    - {id: 64, cat: Books/EBook, desc: "Books Paranormal"}
+    - {id: 65, cat: Books/EBook, desc: "Books Religion"}
+    - {id: 66, cat: Books/EBook, desc: "Books Romance"}
+    - {id: 67, cat: Books/EBook, desc: "Books RPG"}
+    - {id: 68, cat: Books/EBook, desc: "Books Sci-Fi"}
+    - {id: 69, cat: Books/EBook, desc: "Books Self-help"}
+    - {id: 70, cat: Books/EBook, desc: "Books Suspense"}
+    - {id: 71, cat: Books/EBook, desc: "Books Textbook"}
+    - {id: 72, cat: Books/EBook, desc: "Books Thriller"}
+    - {id: 73, cat: Books/EBook, desc: "Books Western"}
+    - {id: 74, cat: Books/EBook, desc: "Books Young Adult"}
     # Comics
     - {id: 75, cat: Books/Comics, desc: "Comics Action / Adventure"}
     - {id: 76, cat: Books/Comics, desc: "Comics Crime"}
@@ -125,7 +126,7 @@ caps:
     - {id: 91, cat: Console/Other, desc: "Games GameCube"}
     - {id: 92, cat: PC, desc: "Games Linux"}
     - {id: 93, cat: PC/Mac, desc: "Games Mac"}
-    - {id: 94, cat: PC/Phone-Other, desc: "Games Mobile phone"}
+    - {id: 94, cat: PC/Mobile-Other, desc: "Games Mobile phone"}
     - {id: 95, cat: Console/NDS, desc: "Games Nintendo DS"}
     - {id: 96, cat: Console/Other, desc: "Games Palm"}
     - {id: 97, cat: Console/PS3, desc: "Games Playstation"}
@@ -133,7 +134,7 @@ caps:
     - {id: 99, cat: Console/PSP, desc: "Games PSP"}
     - {id: 100, cat: Console/Wii, desc: "Games Wii / Wii U"}
     - {id: 101, cat: PC/Games, desc: "Games Windows"}
-    - {id: 102, cat: Console/Xbox, desc: "Games XBox"}
+    - {id: 102, cat: Console/XBox, desc: "Games XBox"}
     # Anime
     - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
     - {id: 103, cat: TV/Anime, desc: "Anime Action"}
@@ -276,10 +277,11 @@ caps:
     # cat 7 misc has no subcats
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: cookie
@@ -292,13 +294,13 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "added"
+    default: _
     options:
-      "_": "created"
-      "S": "seeders desc"
-      "s": "seeders asc"
-      "B": "size desc"
-      "b": "size asc"
+      _: created
+      S: seeders desc
+      s: seeders asc
+      B: size desc
+      b: size asc
 
 login:
   method: cookie
@@ -317,15 +319,15 @@ search:
     - path: files/
   inputs:
     $raw: "{{ range .Categories }}c{{.}}&{{end}}"
-    # 0 seeded 1 unseeded 2 both
+    # 0 seeded, 1 unseeded, 2 both
     seeded: 2
     # 0 all
     quality: 0
-    # 0 Demonoid 1 External 2 Both
+    # 0 Demonoid, 1 External, 2 Both
     external: 2
     # search in titles only
-    to: "{{ if .Query.IMDBID }}{{else}}1{{end}}"
-    query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    to: "{{ if .Query.IMDBID }}{{ else }}1{{ end }}"
+    query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
     # does not return imdb link in results
 

src/Jackett.Common/Definitions/desireleasers.yml

@@ -17,7 +17,7 @@ caps:
     - {id: 5, cat: Console, desc: "Game"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
@@ -36,19 +36,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -68,13 +68,6 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: torrents/filter
@@ -147,6 +140,8 @@ search:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace

src/Jackett.Common/Definitions/desitorrents.yml

@@ -29,49 +29,70 @@ caps:
     - {id: 124, cat: Movies, desc: "Movies/Movie Packs"}
     - {id: 128, cat: Movies, desc: "Movies/Dubbed Audio"}
     - {id: 129, cat: Movies, desc: "Movies/Animated"}
+    - {id: 140, cat: Movies, desc: "Movies/Short Films"}
     # tv shows
     - {id: 59, cat: TV, desc: "TV/Colors"}
     - {id: 60, cat: TV, desc: "TV/Sony"}
-    - {id: 61, cat: TV, desc: "TV/& TV"}
-    - {id: 62, cat: TV, desc: "TV/Starplus"}
-    - {id: 63, cat: TV, desc: "TV/ZeeTV"}
-    - {id: 97, cat: TV, desc: "TV/Life Ok"}
-    - {id: 98, cat: TV, desc: "TV/Docu"}
+    - {id: 61, cat: TV, desc: "TV/&TV"}
+    - {id: 62, cat: TV, desc: "TV/StarPlus"}
+    - {id: 63, cat: TV, desc: "TV/ZEE TV"}
+    - {id: 97, cat: TV, desc: "TV/Life OK"}
+    - {id: 98, cat: TV, desc: "TV/Documentary"}
     - {id: 101, cat: TV/Sport, desc: "TV/Sports"}
     - {id: 102, cat: TV/Other, desc: "TV/Others"}
     - {id: 113, cat: TV, desc: "TV/Pak Drama"}
     - {id: 125, cat: TV, desc: "TV/TV Packs"}
     - {id: 130, cat: TV, desc: "TV/Star Bharat"}
-    - {id: 132, cat: TV, desc: "TV/SAB TV"}
+    - {id: 132, cat: TV, desc: "TV/Sab TV"}
+    - {id: 139, cat: TV, desc: "TV/Hollywood"}
     # music
-    - {id: 67, cat: Audio/Video, desc: "Music Video"}
-    - {id: 68, cat: Audio, desc: "Hindi Soundtrack"}
-    - {id: 70, cat: Audio, desc: "Remix"}
-    - {id: 71, cat: Audio, desc: "Ghazal"}
-    - {id: 72, cat: Audio, desc: "Instrumental"}
-    - {id: 105, cat: Audio, desc: "Telugu Music"}
-    - {id: 106, cat: Audio, desc: "Tmil Music"}
-    - {id: 107, cat: Audio, desc: "Punjabi Music"}
-    - {id: 108, cat: Audio, desc: "Gujarati Music"}
-    - {id: 109, cat: Audio, desc: "Compilations"}
-    - {id: 118, cat: Audio, desc: "Kannada Music"}
-    - {id: 126, cat: Audio, desc: "Marathi"}
-    - {id: 127, cat: Audio, desc: "Lollywood"}
-    - {id: 131, cat: Audio, desc: "Classical"}
+    - {id: 67, cat: Audio/Video, desc: "Music/Video"}
+    - {id: 68, cat: Audio, desc: "Music/Hindi Soundtrack"}
+    - {id: 70, cat: Audio, desc: "Music/Remix"}
+    - {id: 71, cat: Audio, desc: "Music/Ghazal"}
+    - {id: 72, cat: Audio, desc: "Music/Instrumental"}
+    - {id: 105, cat: Audio, desc: "Music/Telugu"}
+    - {id: 106, cat: Audio, desc: "Music/Tamil"}
+    - {id: 107, cat: Audio, desc: "Music/Punjabi"}
+    - {id: 108, cat: Audio, desc: "Music/Gujarati"}
+    - {id: 109, cat: Audio, desc: "Music/Compilations"}
+    - {id: 118, cat: Audio, desc: "Music/Kannada"}
+    - {id: 126, cat: Audio, desc: "Music/Marathi"}
+    - {id: 127, cat: Audio, desc: "Music/Lollywood"}
+    - {id: 131, cat: Audio, desc: "Music/Classical"}
+    - {id: 134, cat: Audio, desc: "Music/Desi Pop"}
+    - {id: 136, cat: Audio, desc: "Music/Bengali"}
+    - {id: 137, cat: Audio, desc: "Music/Malayalam"}
     # games
-    - {id: 78, cat: PC/Games, desc: "PC"}
-    - {id: 79, cat: PC/Games, desc: "Mac"}
-    - {id: 80, cat: PC/Games, desc: "IOS"}
-    - {id: 81, cat: PC/Games, desc: "Android"}
-    - {id: 83, cat: PC/Games, desc: "XBOX"}
-    - {id: 86, cat: PC/Games, desc: "Playstation"}
+    - {id: 78, cat: PC/Games, desc: "Games/PC"}
+    - {id: 79, cat: PC/Games, desc: "Games/Mac"}
+    - {id: 80, cat: PC/Games, desc: "Games/IOS"}
+    - {id: 81, cat: PC/Games, desc: "Games/Android"}
+    - {id: 83, cat: PC/Games, desc: "Games/XBOX"}
+    - {id: 86, cat: PC/Games, desc: "Games/Playstation"}
+    # books
+    - {id: 92, cat: Books/Mags, desc: "Books/Magazine"}
+    - {id: 93, cat: Books/EBook, desc: "Books/Novels"}
+    - {id: 95, cat: Books, desc: "Books/Newspapers"}
+    - {id: 133, cat: Audio/Audiobook, desc: "Books/Audiobooks"}
+    # Sport
+    - {id: 114, cat: TV/Sport, desc: "Sport/WWE"}
+    - {id: 115, cat: TV/Sport, desc: "Sport/Cricket"}
+    - {id: 116, cat: TV/Sport, desc: "Sport/Football"}
     # XXX
     - {id: 89, cat: XXX, desc: "Adult Videos"}
     - {id: 90, cat: XXX, desc: "Adult Pics"}
+    # WEB
+    - {id: 135, cat: TV, desc: "Web Series"}
+    # Legact
+    - {id: 30, cat: Other, desc: "Legacy"}
 
   modes:
     search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -80,16 +101,35 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: twofa
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Desitorrents Web Site. Otherwise just leave it empty."
+  - name: sort
+    type: select
+    label: Sort requested from site
+    # while the grabs and date columns are merged due (see #9849), the time sort on the website fails with: "selected sorting wrong: time".
+    # default: time
+    default: relevance
+    options:
+      # time: created
+      seeders: seeders
+      size: size
+      relevance: title
 
 login:
   path: login.php?from=index1
   method: post
   inputs:
-    action: "login"
+    action: login
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    twofa: "{{ .Config.twofa }}"
   error:
-    - selector: ":contains(\"-WARNING-\")"
+    - selector: form#loginform:has(span.warning)
   test:
     path: ajax.php
 
@@ -98,11 +138,12 @@ search:
     - path: ajax.php?action=search_torrent_cats
       method: post
   inputs:
-    search_string: "{{ .Keywords }}"
-    selected_sorting: "relevance"
+    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
+    search_string: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
+    selected_sorting: "{{ .Config.sort }}"
     selected_group: ""
     search_username: ""
-    selected_sub[]: "{{join .Categories \",\"}}"
+    selected_sub[]: "{{ join .Categories \",\" }}"
   error:
     - selector: ":contains(\"Something was wrong with your request\")"
   preprocessingfilters:
@@ -112,36 +153,122 @@ search:
       args: ["\\", ""]
     - name: re_replace
       args: ["\",\"paging.*", ""]
+    - name: re_replace
+      args: ["</th<th>", "</th><th>"] # fix for #9849
     - name: prepend
       args: "<table>"
     - name: append
       args: "</table>"
+
   rows:
     selector: table > tbody > tr
+
   fields:
+    category:
+      selector: th:first-child
+      case:
+        img[src*="Bollywood Movies.png"]: 47
+        img[src*="Bengali Movies.png"]: 48
+        img[src*="Tamil Films.png"]: 49
+        img[src*="Punjabi Movies.png"]: 51
+        img[src*="Marathi Movies.png"]: 52
+        img[src*="Malayalam Movies.png"]: 53
+        img[src*="Kannada Movies.png"]: 54
+        img[src*="Gujarati Movies.png"]: 55
+        img[src*="Foreign Movies.png"]: 56
+        img[src*="Pakistani Movies.png"]: 57
+        img[src*="Hollywood Movies.png"]: 58
+        img[src*="Telugu Movies.png"]: 103
+        img[src*="south-dubbed.png"]: 104
+        img[src*="docmentary.png"]: 110
+        img[src*="Bhojpuri Movies.png"]: 117
+        img[src*="Movie Packs.png"]: 124
+        img[src*="Dubbed Movies.png"]: 128
+        img[src*="Animated Movies.png"]: 129
+        img[src*="Short Films.png"]: 140
+        img[src*="Colors TV.png"]: 59
+        img[src*="Sony TV.png"]: 60
+        img[src*="AndTV.png"]: 61
+        img[src*="Star Plus.png"]: 62
+        img[src*="Zee TV.png"]: 63
+        img[src*="Life OK.png"]: 97
+        img[src*="Documentaries.png"]: 98
+        img[src*="sports.png"]: 101
+        img[src*="Others-png.png"]: 102
+        img[src*="Pak-Drama.png"]: 113
+        img[src*="TV Packs.png"]: 125
+        img[src*="Star Bharat.png"]: 130
+        img[src*="Sab TV.png"]: 132
+        img[src*="Hollywood TV.png"]: 139
+        img[src*="Music Videos.png"]: 67
+        img[src*="Hindi Soundtracks.png"]: 68
+        img[src*="Remix Music.png"]: 70
+        img[src*="Ghazal Music.png"]: 71
+        img[src*="Instrumental Music.png"]: 72
+        img[src*="Telugu Music.png"]: 105
+        img[src*="Tamil Music.png"]: 106
+        img[src*="Punjabi Music.png"]: 107
+        img[src*="Gujarati Music.png"]: 108
+        img[src*="Music Compilations.png"]: 109
+        img[src*="Kannada Music.png"]: 118
+        img[src*="Marathi Gaane.png"]: 126
+        img[src*="Lollywood Music.png"]: 127
+        img[src*="Classical Music.png"]: 131
+        img[src*="Desi Pop Music.png"]: 134
+        img[src*="Bengali Music.png"]: 136
+        img[src*="Malayalam Music.png"]: 137
+        img[src*="PC Games.png"]: 78
+        img[src*="Mac Games.png"]: 79 # unverified
+        img[src*="IOS Games.png"]: 80 # unverified
+        img[src*="Android Games.png"]: 81
+        img[src*="XBOX Games.png"]: 83 # unverified
+        img[src*="Playstation Games.png"]: 86 # unverified
+        img[src*="Magazines.png"]: 92
+        img[src*="Novels.png"]: 93
+        img[src*="Newspapers.png"]: 95
+        img[src*="AudioBooks.png"]: 133
+        img[src*="WWE.png"]: 114
+        img[src*="Cricket.png"]: 115
+        img[src*="Football.png"]: 116
+        img[src*="Adult Videos.png"]: 89 # unverified
+        img[src*="Adult Pics.png"]: 90 # unverified
+        img[src*="Web Series.png"]: 135
+        img[src*="no.png"]: 30
     title:
-      selector: th:nth-child(2) > a[href]
+      selector: a[href^="/torrents.php?id="]
     details:
-      selector: th:nth-child(2) > a[href]
+      selector: a[href^="/torrents.php?id="]
       attribute: href
-    files:
-      selector: th:nth-child(8)
-    # no standard for categories yet :(
     download:
-      selector: th:nth-child(5) > a[href]
+      selector: a[href^="/torrents.php?action=download&id="]
       attribute: href
       filters:
         - name: prepend
           args: "{{ .Config.sitelink }}"
-    grabs:
-      selector: th:nth-child(11)
     size:
       selector: th:nth-child(7)
+    files:
+      selector: th:nth-child(8)
     seeders:
       selector: th:nth-child(9)
     leechers:
       selector: th:nth-child(10)
+    grabs:
+      selector: th:nth-child(11)
+    date:
+      selector: th:nth-child(12)
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
     downloadvolumefactor:
-      text: "0"
+      text: 0
     uploadvolumefactor:
-      text: "1"
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -40,12 +40,12 @@ caps:
     - {id: 29, cat: Other, desc: "Egyéb / Képek"}
     - {id: 12, cat: PC/Games, desc: "Játék / PC"}
     - {id: 14, cat: Console/PS4, desc: "Játék / PS"}
-    - {id: 39, cat: Console/Xbox, desc: "Játék / Xbox"}
+    - {id: 39, cat: Console/XBox, desc: "Játék / Xbox"}
     - {id: 40, cat: Console/Other, desc: "Játék / Egyéb"}
     - {id: 16, cat: PC/ISO, desc: "Programok / PC"}
-    - {id: 24, cat: PC/Phone-Other, desc: "Programok / Mobil"}
+    - {id: 24, cat: PC/Mobile-Other, desc: "Programok / Mobil"}
     - {id: 53, cat: PC/0day, desc: "Programok / Egyéb"}
-    - {id: 17, cat: XXX/Xvid, desc: "Pornó / XviD"}
+    - {id: 17, cat: XXX/XviD, desc: "Pornó / XviD"}
     - {id: 34, cat: XXX/DVD, desc: "Pornó / DVD-R"}
     - {id: 35, cat: XXX, desc: "Pornó / HD"}
     - {id: 36, cat: XXX, desc: "Pornó / Képek"}
@@ -58,6 +58,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 login:
   path: login
@@ -67,10 +68,10 @@ login:
     referer: ""
     nev: "{{ .Config.username }}"
     jelszo: "{{ .Config.password }}"
-    fsv: "0"
-    login: "1"
-    belepes: "1"
-    rhash: "123"
+    fsv: 0
+    login: 1
+    belepes: 1
+    rhash: 123
   test:
     path: browse
 
@@ -80,11 +81,13 @@ search:
   inputs:
     $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
-    s_alapjan: "7"
-    s_sorrend: "desc"
+    s_alapjan: 7
+    s_sorrend: desc
+
   rows:
     selector: div.torrent_row, div.torrent_details
     after: 1
+
   fields:
     download:
       selector: div.box_download > a
@@ -112,7 +115,7 @@ search:
       selector: div.box_uploaded
       filters:
         - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
     size:
@@ -132,7 +135,7 @@ search:
       selector: div.torrent_row_magyarcim
       remove: span.torrent_row_new
     downloadvolumefactor:
-      text: "0"
+      text: 0
     uploadvolumefactor:
-      case:
-        "*": "1"
+      text: 1
+# engine tbd

src/Jackett.Common/Definitions/dimeadozen.yml

@@ -90,7 +90,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    returnto: "index.php"
+    returnto: index.php
     logout: ""
   error:
     - selector: table.message:contains("Error")
@@ -143,8 +143,10 @@ search:
     date:
       selector: td:nth-child(5)
       filters:
+        - name: append
+          args: " -00:00" # GMT
         - name: dateparse
-          args: "2006-01-0215:04:05"
+          args: "2006-01-0215:04:05 -07:00"
     size:
       selector: td:nth-child(6)
     grabs:
@@ -160,4 +162,6 @@ search:
       text: 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.25
 # EzTorrent 0.7

src/Jackett.Common/Definitions/divteam.yml

@@ -17,8 +17,8 @@ caps:
     - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"}
     - {id: 80, cat: Movies/BluRay, desc: "BDRip X265 1080p"}
     - {id: 81, cat: Movies/UHD, desc: "UHDRip x265 4K"}
-    - {id: 82, cat: Movies/WEBDL, desc: "Pelis Web-DL 1080"}
-    - {id: 83, cat: Movies/WEBDL, desc: "Pelis Web-DL 720"}
+    - {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: 23, cat: TV/Sport, desc: "Deportes"}
     - {id: 20, cat: TV/HD, desc: "Series"}
@@ -33,11 +33,11 @@ caps:
     - {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: 6, cat: Books/Ebook, desc: "EBooks"}
-    - {id: 58, cat: Books/Ebook, desc: "Kiosko"}
+    - {id: 6, cat: Books/EBook, desc: "EBooks"}
+    - {id: 58, cat: Books/EBook, 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: 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"}
@@ -56,6 +56,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: cookie
@@ -72,19 +73,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "3"
+    default: 3
     options:
-      "3": "created"
-      "5": "seeders"
-      "4": "size"
-      "2": "title"
+      3: created
+      5: seeders
+      4: size
+      2: title
   - name: type
     type: select
     label: Order requested from site
-    default: "2"
+    default: 2
     options:
-      "2": "desc"
-      "1": "asc"
+      2: desc
+      1: asc
   - name: info_results
     type: info
     label: Results Per Page
@@ -125,13 +126,19 @@ search:
       optional: true
       filters:
         - name: append
-          args: " [English]"
+          args: " English"
     title:
       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] [English]"
+          args: ".Spanish-DivTeam"
+        - name: re_replace
+          args: ["\\.+", "."] # More than 1 dot -> .
+        - name: re_replace
+          args: ["^\\.", ""] # Delete first dot
     banner:
       selector: a[onmouseover][href^="index.php?page=torrent-details"]
       attribute: onmouseover
@@ -152,8 +159,10 @@ search:
     date:
       selector: td:nth-child(6)
       filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006"
+          args: "02/01/2006 -07:00"
     seeders:
       selector: td:nth-last-child(4)
     leechers:
@@ -173,4 +182,9 @@ search:
         img[src="images/4x.png"]: 4
         img[src="images/5x.png"]: 5
         "*": 1
+    minimumratio:
+      text: 0.7
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # xbtit customised

src/Jackett.Common/Definitions/dmhy.yml

@@ -32,7 +32,9 @@ caps:
 
   modes:
     search: [q]
+    tv-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings: []
 

src/Jackett.Common/Definitions/documentarytorrents.yml

@@ -50,9 +50,9 @@ caps:
     - {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: 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: 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"}
@@ -76,6 +76,7 @@ caps:
     search: [q]
     tv-search: [q]
     movie-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -91,19 +92,19 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "id"
+    default: id
     options:
-      "id": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      id: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: account-login.php
@@ -118,10 +119,6 @@ login:
     path: index.php
     selector: a[href$="/account-logout.php"]
 
-ratio:
-  path: index.php
-  selector: img[title="Ratio"]
-
 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

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -47,12 +47,12 @@ caps:
     - {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 "}
+    - {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/Phone-Android, desc: "Appz - Android"}
+    - {id: 106, cat: PC/Mobile-Android, desc: "Appz - Android"}
     # Sport
     - {id: 43, cat: TV/Sport, desc: "Sport - SD"}
     - {id: 50, cat: TV/Sport, desc: "Sport - HD"}
@@ -74,6 +74,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/dxdhd.yml

@@ -15,7 +15,7 @@ caps:
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: TV/Anime, desc: "Anime-TV"}
     - {id: 5, cat: PC/0day, desc: "Apps"}
-    - {id: 6, cat: Books/Ebook, desc: "eBooks"}
+    - {id: 6, cat: Books/EBook, desc: "eBooks"}
     - {id: 7, cat: PC/Games, desc: "Games"}
     - {id: 8, cat: TV/Sport, desc: "Sports"}
     - {id: 9, cat: Other, desc: "Others"}
@@ -24,10 +24,11 @@ caps:
     - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}
 
   modes:
-    search: [q, imdbid]
+    search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -45,17 +46,17 @@ settings:
     label: Sort requested from site
     default: "created_at"
     options:
-      "created_at": "created"
-      "seeders": "seeders"
-      "size": "size"
-      "name": "title"
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
-    default: "desc"
+    default: desc
     options:
-      "desc": "desc"
-      "asc": "asc"
+      desc: desc
+      asc: asc
 
 login:
   path: login
@@ -75,19 +76,12 @@ login:
 #      path: /
 #      selector: a[href$="/logout"]
 
-ratio:
-  path: /
-  selector: li:has(i.fa-sync-alt)
-  filters:
-    - name: regexp
-      args: "Ratio : (\\d+)"
-
 search:
   paths:
     - path: torrents/filter
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
@@ -150,6 +144,8 @@ search:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
@@ -194,6 +190,8 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+    minimumratio:
+      text: 0.5
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200