add swarmazon a private site. resolves #12015

add freeleech
add incldead
add MR and MST
correct date parsing
add sort
add tpp info

README.md

@@ -28,6 +28,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 7torrents
  * ACG.RIP
  * ACGsou (36DM)
+ * AngieTorrents
  * Anidex
  * AniLibria
  * AnimeClipse
@@ -36,6 +37,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AniRena
  * AniSource
  * AudioBook Bay (ABB)
+ * Badass Torrents
  * BigFANGroup
  * BitRu
  * BT.etree
@@ -50,9 +52,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * cpasbien
  * cpasbienClone
  * Demonoid
+ * DivxTotal
  * dmhy
  * E-Hentai
+ * elitetorrent
  * emtrek
+ * EpubLibre
  * Erai-Raws
  * ETTV
  * EXT Torrents
@@ -156,6 +161,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
  * truPornolabs
+ * ttobogo
  * Underverse
  * UnionDHT
  * VSTHouse
@@ -177,7 +183,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BaibaKo
  * BookTracker
  * BootyTape
- * CasStudioTV
  * Catorrent
  * Darmowe torrenty
  * Deildu
@@ -186,6 +191,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EniaHD
  * Erzsebet.pl
  * ExKinoRay
+ * Fou-Du-Cinema
+ * FreeTorrent
+ * Gay-Torrents.net
  * Genesis-Movement
  * HamsterStudio
  * HD-CzTorrent
@@ -205,11 +213,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLab
  * PussyTorrents
  * Rainbow Tracker
+ * RGFootball
  * RiperAM
  * RockBox
  * RuTracker
  * Rustorka
- * SDkino
  * Sharewood
  * SkTorrent
  * SkTorrent-org
@@ -227,13 +235,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * 0day.kiev
  * 1ptbar
- * 2 Fast 4 You
+ * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
- * Abnormal [![(invite needed)][inviteneeded]](#)
+ * Abnormal
  * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
@@ -254,7 +262,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Borgzelle
  * Back-ups
  * bB
  * BakaBT
@@ -273,21 +280,22 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BJ-Share (BJ)
  * BlueBird [![(invite needed)][inviteneeded]](#)
  * Blutopia (BLU)
+ * Borgzelle
  * Boxing Torrents
  * Brasil Tracker
- * BroadCity [![(invite needed)][inviteneeded]](#)
  * BroadcasTheNet (BTN)
+ * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
  * BTNext (BTNT)
  * BTSCHOOL
  * BWTorrents
- * CCFBits
- * CGPeers
- * CHDBits
  * Carp-Hunter
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
+ * CCFBits
+ * CGPeers
+ * CHDBits
  * ChileBT
  * Cinecalidad
  * CinemaMovieS_ZT
@@ -312,13 +320,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DICMusic
  * DigitalCore
  * DivTeam
- * DivxTotal
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * Empornium (EMP)
- * EpubLibre
+ * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
  * eStone (XiDER, BeLoad)
  * ExoticaZ (YourExotic)
@@ -332,25 +338,21 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Film-Paleis
  * FinElite (FE)
  * FinVip
- * FocusX
- * Fou-Du-Cinema
- * FreeTorrent
  * FunFile (FF)
- * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
+ * FunkyTorrents (FT)
  * Fuzer (FZ)
- * GFXPeers
- * Gay-Torrents.net
  * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
  * GAYtorrent.ru
  * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
  * Generation-Free
+ * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreekDiamond
  * Greek Team
  * HaiDan
- * HD Dolby [![(invite needed)][inviteneeded]](#)
+ * HD Dolby
  * HD-Bits.com
  * HD-Forever (HDF)
  * HD-Olimpo
@@ -362,9 +364,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDArea (HDA)
  * HDAtmos
  * HDBits
+ * HDC (HDCiTY)
  * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing)
- * HDC (HDCiTY)
  * HDCity
  * HDHome (HDBigger)
  * HDME
@@ -372,8 +374,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDSky
  * HDTime
  * HDTorrents.it
- * HDTurk [![(invite needed)][inviteneeded]](#)
- * HDU [![(invite needed)][inviteneeded]](#)
+ * HDTurk
+ * HDU
  * HDZone
  * Hebits
  * HellasTZ
@@ -392,16 +394,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LastFiles
  * LatinoP2P
  * Le Saloon
- * LeChaudron
- * LemonHD
  * LearnFlakes
  * LegacyHD (HD4Free)
+ * LemonHD
  * Libble
  * LibraNet (LN)
  * LinkoManija
  * LosslessClub
  * M-Team TP (MTTP)
- * MaDs Revolution
+ * MaDs Revolution [![(invite needed)][inviteneeded]](#)
  * magic-heaven
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
@@ -422,8 +423,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NorBits
  * Nordic+
  * Oasis
+ * Obscure
  * oMg[WtF]trackr
  * OpenCD
+ * Oppaitime [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -460,6 +463,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
+ * Resurrect The Net
  * RetroFlix
  * RevolutionTT
  * ROFD
@@ -477,7 +481,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Shazbat
  * SiamBIT
  * SnowPT (SSPT)
- * SoulVoice [![(invite needed)][inviteneeded]](#)
+ * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
  * Speedmaster HD
@@ -488,6 +492,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpringSunday
  * SugoiMusic
  * Superbits (SBS)
+ * Swarmazon
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
  * TeamHD
@@ -496,7 +501,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TellyTorrent
  * teracod (Movie Zone)
  * The Falling Angels (TFA)
- * The Geeks [![(invite needed)][inviteneeded]](#)
+ * The Geeks
  * The Horror Charnel (THC)
  * The New Retro
  * The Occult [![(invite needed)][inviteneeded]](#)
@@ -505,7 +510,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Show [![(invite needed)][inviteneeded]](#)
  * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
- * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheEmpire (TE)
  * TheLeachZone
  * TheScenePlace (TSP)
  * TJUPT
@@ -522,16 +527,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
  * TorrentDB
+ * Torrentech (TTH)
  * TorrentFactory
- * TorrentHR
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
+ * TorrentHR
+ * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
+ * TotallyKids (TK)
+ * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentSeeds (TS)
- * Torrentech (TTH)
- * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
- * Torrentland
- * TotallyKids (TK)
  * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
@@ -549,7 +554,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnlimitZ
  * Vizuk
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
- * Witch-Hunter (Demon-Site)
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * x-ite.me (XM) [![(invite needed)][inviteneeded]](#)
@@ -593,6 +597,7 @@ Filter | Condition
 `tag:<tag>` | where the indexer tags contains `<tag>`
 `lang:<tag>` | where the indexer language start with `<lang>`
 `test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
+`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (succesfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
 
 Supported operators
 Operator | Condition
@@ -601,9 +606,12 @@ Operator | Condition
 `<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
 `<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
 
-Example:
+Example 1:
 The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
 
+Example 2:
+The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
+
 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
 

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

@@ -14,7 +14,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.onl/
+  - https://1337x.unblockit.uno/
   - https://1337x.nocensor.space/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -44,6 +44,8 @@ legacylinks:
   - https://1337x.unblockit.buzz/
   - https://1337x.unblocked.monster/
   - https://1337x.unblockit.club/
+  - https://1337x.unblockit.onl/
+  - https://1337x.unblockit.li/
 
 caps:
   categorymappings:
@@ -142,7 +144,22 @@ settings:
     default: "magnet:"
     options:
       "http://itorrents.org/": iTorrents.org
+      "http://torrage.info/": Torrage
+      "http://btcache.me/": BTcache
       "magnet:": magnet
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "http://itorrents.org/"
+    options:
+      "http://itorrents.org/": iTorrents.org
+      "http://torrage.info/": Torrage
+      "http://btcache.me/": BTcache
+      "magnet:": magnet
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: As the .torrent download links on this site are known to fail from time to time, you can optionally set as a fallback an automatic alternate link. We suggest using the magnet link as a fallback.
   - name: sort
     type: select
     label: Sort requested from site
@@ -160,9 +177,12 @@ settings:
       asc: asc
 
 download:
-  # the .torrent url is on the on the details page
-  selector: ul li a[href^="{{ .Config.downloadlink }}"]
-  attribute: href
+  # the .torrent URL and magnet URI are on the details page
+  selectors:
+    - selector: ul li a[href^="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: ul li a[href^="{{ .Config.downloadlink2 }}"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/acgsou.yml

@@ -51,8 +51,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/aither.yml

@@ -76,25 +76,27 @@ login:
 
 search:
   paths:
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
+    keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    playlistId: ""
+    collectionId: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -119,28 +121,17 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      selector: td:nth-last-child(1)
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -194,9 +185,10 @@ 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
+# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# UNIT3D 5.2.0
+# UNIT3D 5.3.0

src/Jackett.Common/Definitions/angietorrents.yml

@@ -0,0 +1,147 @@
+---
+id: angietorrents
+name: AngieTorrents
+description: "AngieTorrents is a Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://angietorrents.cc/
+
+caps:
+  categorymappings:
+    - {id: 48, cat: XXX/x264, desc: "Adult - HD"}
+    - {id: 47, cat: XXX/SD, desc: "Adult - SD"}
+    - {id: 28, cat: TV/Anime, desc: "Anime - All"}
+    - {id: 18, cat: PC/0day, desc: "Apps - PC"}
+    - {id: 19, cat: PC/Mac, desc: "Apps - Mac"}
+    - {id: 20, cat: PC, desc: "Apps - Linux"}
+    - {id: 21, cat: PC/Mobile-Other, desc: "Apps - Other"}
+    - {id: 54, cat: Books/EBook, desc: "Books - eBooks"}
+    - {id: 55, cat: Audio/Audiobook, desc: "Books - Audio Books"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"}
+    - {id: 51, cat: Movies/Foreign, desc: "Foreign Movies - HD"}
+    - {id: 52, cat: Movies/Foreign, desc: "Foreign Movies - SD"}
+    - {id: 10, cat: PC/Games, desc: "Games - PC"}
+    - {id: 11, cat: Console/Other, desc: "Games - PS2"}
+    - {id: 43, cat: Console/PS3, desc: "Games - PS3"}
+    - {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: 16, cat: Console/Other, desc: "Games - Dreamcast"}
+    - {id: 44, cat: Console/Wii, desc: "Games - Wii"}
+    - {id: 45, cat: Console/Other, desc: "Games - DS"}
+    - {id: 46, cat: Console/Other, desc: "Games - GameCube"}
+    - {id: 17, cat: Console/Other, desc: "Games - Other"}
+    - {id: 50, cat: Movies, desc: "Movies - Packs"}
+    - {id: 1, cat: Movies/DVD, desc: "Movies - DVD"}
+    - {id: 2, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
+    - {id: 3, cat: Movies/SD, desc: "Movies - SD"}
+    - {id: 42, cat: Movies/HD, desc: "Movies - HD"}
+    - {id: 4, cat: Movies/Other, desc: "Movies - Other"}
+    - {id: 22, cat: Audio/MP3, desc: "Music - MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music - Lossless"}
+    - {id: 24, cat: Audio/Video, desc: "Music - DVD"}
+    - {id: 25, cat: Audio/Video, desc: "Music - Video"}
+    - {id: 26, cat: Audio/Other, desc: "Music - Radio"}
+    - {id: 27, cat: Audio/Other, desc: "Music - Other"}
+    - {id: 33, cat: PC, desc: "Other - Emulation"}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Other - PPC/PDA"}
+    - {id: 35, cat: Audio, desc: "Other - Sounds"}
+    - {id: 36, cat: Books/EBook, desc: "Other - E-Books"}
+    - {id: 37, cat: Other, desc: "Other - Images"}
+    - {id: 38, cat: PC/Mobile-Other, desc: "Other - Mobile Phone"}
+    - {id: 39, cat: Other, desc: "Other - Extra Pars/Fills"}
+    - {id: 40, cat: Other, desc: "Other - Other"}
+    - {id: 53, cat: Other, desc: "Tutorials - All"}
+    - {id: 49, cat: TV, desc: "TV - Packs"}
+    - {id: 5, cat: TV/SD, desc: "TV - DVD"}
+    - {id: 41, cat: TV/HD, desc: "TV - HD"}
+    - {id: 6, cat: TV/SD, desc: "TV - Divx/Xvid"}
+    - {id: 7, cat: TV/SD, desc: "TV - SD"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - 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
+
+search:
+  paths:
+    # https://angietorrents.cc/search.php?search=white&cat=42&incldead=1&freeleech=0&inclexternal=0&lang=0
+    - path: search.php
+    # 20 torrents per page
+    - path: search.php
+      inputs:
+        page: 1
+    - path: search.php
+      inputs:
+        page: 2
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    # site supports exact matching only
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: 0
+    # 0 both 1 local 2 external
+    inclexternal: 0
+    # 0 all 1 english etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner tr.t-row
+
+  fields:
+    category:
+      selector: a[href^="/torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="/details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="/download.php?id="]
+      attribute: href
+    size:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    date:
+      text: now
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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

@@ -57,8 +57,9 @@ login:
     selector: a[href$="/index.php?action=logout"]
 
 download:
-  selector: a[href*="/engine/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/engine/download.php?id="]
+      attribute: href
 
 search:
   # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&catlist[]=0

src/Jackett.Common/Definitions/animeworld.yml

@@ -96,7 +96,7 @@ search:
     sortDirection: "{{ .Config.type }}"
     perPage: 100
     page: 1
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr

src/Jackett.Common/Definitions/arabafenice.yml

@@ -121,8 +121,9 @@ download:
       infohash: "{{ .DownloadUri.Query.id }}"
       thanks: 1
       rndval: "1487013827343"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/arenabg.yml

@@ -92,6 +92,17 @@ settings:
     options:
       "/en/torrents/download/?key=": ".torrent"
       "magnet:?xt=": "magnet"
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "/en/torrents/download/?key="
+    options:
+      "/en/torrents/download/?key=": ".torrent"
+      "magnet:?xt=": "magnet"
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: You can optionally set as a fallback an automatic alternate link, so if the .torrent download link fails your download will still be successful.
 
 login:
   path: en/users/signin/
@@ -111,8 +122,11 @@ login:
     selector: a[href="/en/users/logout/"]
 
 download:
-  selector: a[href^="{{ .Config.downloadlink }}"]
-  attribute: href
+  selectors:
+    - selector: a[href^="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: a[href^="{{ .Config.downloadlink2 }}"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.nl/ # site forces http, does not support https
   - http://audiobookbay.net/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.onl/
+  - https://audiobookbay.unblockit.uno/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
@@ -19,6 +19,8 @@ legacylinks:
   - https://audiobookbay.unblockit.link/
   - https://audiobookbay.unblockit.buzz/
   - https://audiobookbay.unblockit.club/
+  - https://audiobookbay.unblockit.onl/
+  - https://audiobookbay.unblockit.li/
 
 caps:
   categorymappings:
@@ -88,12 +90,13 @@ caps:
 settings: []
 
 download:
-  selector: td:contains("Info Hash:") ~ td
-  filters:
-    - name: prepend
-      args: "magnet:?xt=urn:btih:"
-    - name: append
-      args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+  selectors:
+    - selector: td:contains("Info Hash:") ~ td
+      filters:
+        - name: prepend
+          args: "magnet:?xt=urn:btih:"
+        - name: append
+          args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
 
 search:
   paths:

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -0,0 +1,107 @@
+---
+id: badasstorrents
+name: Badass Torrents
+description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://badasstorrents.com/
+
+caps:
+  categories:
+    Anime: TV/Anime
+    Apps: PC
+    Books: Books
+    Games: PC/Games
+    Movies: Movies
+    Music: Audio
+    Other: Other
+    TV: TV
+    XXX: XXX
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q, album, artist]
+    book-search: [q]
+settings:
+  - name: downloadlink
+    type: select
+    label: Download link
+    default: "magnet:?xt="
+    options:
+      "/download/": ".torrent"
+      "magnet:?xt=": "magnet"
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "/download/"
+    options:
+      "/download/": ".torrent"
+      "magnet:?xt=": "magnet"
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: You can optionally set as a fallback an automatic alternate link, so if the .torrent download link fails your download will still be successful.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      seeders: seeds
+      size: size
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+download:
+  selectors:
+    - selector: a[href*="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: a[href*="{{ .Config.downloadlink2 }}"]
+      attribute: href
+
+search:
+  paths:
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}26/{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}51/{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}76/{{ .Config.sort }}/{{ .Config.type }}"
+
+  rows:
+    selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])
+
+  fields:
+    category:
+      selector: a[href*="/cat/"]
+    title:
+      selector: a[href*="/torrent/"]
+    details:
+      selector: a[href*="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href*="/torrent/"]
+      attribute: href
+    date:
+      selector: td:nth-child(4)
+      filters:
+        - name: timeago
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/bigtorrent.yml

@@ -60,8 +60,9 @@ login:
     path: index.php
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/blutopia.yml

@@ -82,11 +82,13 @@ search:
     malId: ""
     startYear: ""
     endYear: ""
+    playlistId: ""
+    collectionId: ""
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
     page: 1
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -181,4 +183,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 5.3.0b
+# UNIT3D 5.3.1b

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -77,8 +77,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php"]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/btdb.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   # update poster placeholder link too
   - https://btdb.eu/
-  - https://btdb.unblockit.onl/
+  - https://btdb.unblockit.uno/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -36,6 +36,8 @@ legacylinks:
   - https://btdb.unblockit.link/
   - https://btdb.unblockit.buzz/
   - https://btdb.unblockit.club/
+  - https://btdb.unblockit.onl/
+  - https://btdb.unblockit.li/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.digital
+  - https://btsow.shop/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -25,6 +25,7 @@ legacylinks:
   - https://btsow.surf/
   - https://btsow.com/
   - https://btsow.cam/
+  - https://btsow.digital/
 
 caps:
   categories:
@@ -44,8 +45,9 @@ settings:
     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
-  attribute: href
+  selectors:
+    - selector: a#magnetOpen
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -67,10 +67,11 @@ caps:
     - {id: 153, cat: TV, desc: "TV-Star Plus"}
     - {id: 154, cat: TV, desc: "TV-Zee TV"}
     - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
-    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
     - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
     - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
     - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
+    - {id: 219, cat: TV, desc: "TV-Bengali Tv"}
     - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
     - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
     - {id: 195, cat: TV, desc: "TV-Tv Packs"}

src/Jackett.Common/Definitions/byrutor.yml

@@ -260,8 +260,9 @@ caps:
 settings: []
 
 download:
-  selector: a.itemtop_game
-  attribute: href
+  selectors:
+    - selector: a.itemtop_game
+      attribute: href
 
 search:
   # keywords (article titles only search)

src/Jackett.Common/Definitions/carphunter.yml

@@ -16,10 +16,6 @@ caps:
     - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"}
     - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"}
     - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 10, cat: Movies/DVD, desc: "Film/DVD5/Eng"}
-    - {id: 9, cat: Movies/DVD, desc: "Film/DVD5/Hun"}
-    - {id: 12, cat: Movies/DVD, desc: "Film/DVD9/Eng"}
-    - {id: 11, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
     - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng"}
     - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"}
     - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"}
@@ -105,14 +101,14 @@ search:
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active, 1 both, 2 onlydead, 3 onlyfree, 4 x2 torrents, 6 mytorrents
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 both, 1 onlyactive, 2 onlydead, 3 onlyfree, 4 x2 torrents, 5 mytorrents, 6 waiting for seeds
+    incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     # does not support imdbid searches
 
   rows:
-    selector: table[width="800"] > tbody > tr:has(a[href^="details.php?id="])
+    selector: table[width="920px"] > tbody > tr:has(a[href^="details.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -1,386 +0,0 @@
----
-id: casstudiotv
-name: CasStudioTV
-description: "CasStudioTV is a RUSSIAN Semi-Private Torrent Tracker for TV"
-language: ru-ru
-type: semi-private
-encoding: UTF-8
-links:
-  - https://casstudio.tk/
-legacylinks:
-  - https://casstudio.tv/
-certificates:
-  - 71fe2295b57e6287ce36a39823bee752cbbd9d42 # expired 01 November 2020
-
-caps:
-  categorymappings:
-    - {id: 259, cat: TV, desc: "Сериалы"}
-    - {id: 372, cat: TV, desc: "Австралийские сериалы"}
-    - {id: 375, cat: TV, desc: "Американские сериалы"}
-    - {id: 343, cat: TV, desc: "A&E"}
-    - {id: 126, cat: TV, desc: "Мотель Бейтс / Bates Motel"}
-    - {id: 317, cat: TV, desc: "ABC"}
-    - {id: 72, cat: TV, desc: "Агент Картер / Agent Carter"}
-    - {id: 120, cat: TV, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
-    - {id: 110, cat: TV, desc: "Американская семейка / Modern Family"}
-    - {id: 70, cat: TV, desc: "Анатомия страсти / Анатомия Грей / Grey's Anatomy"}
-    - {id: 210, cat: TV, desc: "База Куантико / Quantico"}
-    - {id: 65, cat: TV, desc: "Возмездие / Revenge"}
-    - {id: 119, cat: TV, desc: "Бывает и хуже / The Middle"}
-    - {id: 145, cat: TV, desc: "Город Хищниц / Cougar Town"}
-    - {id: 75, cat: TV, desc: "Как избежать наказания за убийство / How to Get Away with Murder"}
-    - {id: 63, cat: TV, desc: "Касл / Castle"}
-    - {id: 222, cat: TV, desc: "Клуб жен астронавтов / The Astronaut Wives Club"}
-    - {id: 147, cat: TV, desc: "Копы-новобранцы / Rookie Blue"}
-    - {id: 276, cat: TV, desc: "Любовницы / Mistresses US"}
-    - {id: 308, cat: TV, desc: "Хороший доктор / The Good Doctor"}
-    - {id: 189, cat: TV, desc: "Шёпот / The Whispers"}
-    - {id: 164, cat: TV, desc: "Нэшвилл / Nashville"}
-    - {id: 303, cat: TV, desc: "Одаренные / The Gifted"}
-    - {id: 92, cat: TV, desc: "Однажды в сказке / Once Upon A Time"}
-    - {id: 163, cat: TV, desc: "Отчаянные домохозяйки / Desperate Housewives"}
-    - {id: 287, cat: TV, desc: "Приговор / Conviction"}
-    - {id: 135, cat: TV, desc: "ПригорАД / Suburgatory"}
-    - {id: 267, cat: TV, desc: "Семья / The Family"}
-    - {id: 64, cat: TV, desc: "Скандал / Scandal"}
-    - {id: 106, cat: TV, desc: "Шпионка / Alias"}
-    - {id: 358, cat: TV, desc: "Adult Swim"}
-    - {id: 323, cat: TV, desc: "Amazon"}
-    - {id: 232, cat: TV, desc: "Десница Божья / Hand of God"}
-    - {id: 231, cat: TV, desc: "Моцарт в джунглях / Mozart in the Jungle"}
-    - {id: 280, cat: TV, desc: "Тик / The Tick"}
-    - {id: 328, cat: TV, desc: "AMC"}
-    - {id: 122, cat: TV, desc: "Безумцы / Mad Men"}
-    - {id: 208, cat: TV, desc: "Бойтесь ходячих мертвецов / Fear the Walking Dead"}
-    - {id: 219, cat: TV, desc: "В пустыне смерти / Into the Badlands"}
-    - {id: 198, cat: TV, desc: "Люди / Humans"}
-    - {id: 274, cat: TV, desc: "Проповедник / Preacher"}
-    - {id: 95, cat: TV, desc: "Убийство / The Killing"}
-    - {id: 59, cat: TV, desc: "Ходячие мертвецы / The Walking Dead"}
-    - {id: 356, cat: TV, desc: "Audience"}
-    - {id: 320, cat: TV, desc: "CBS"}
-    - {id: 87, cat: TV, desc: "В поле зрения / Person of Interest"}
-    - {id: 293, cat: TV, desc: "Голубая кровь / Blue Bloods"}
-    - {id: 108, cat: TV, desc: "Две девицы на мели / 2 Broke Girls"}
-    - {id: 201, cat: TV, desc: "За пределами / Выжившая / Род человеческий / Extant"}
-    - {id: 314, cat: TV, desc: "Звёздный путь / Star Trek"}
-    - {id: 141, cat: TV, desc: "Как Я Встретил Вашу Маму / How I Met Your Mother"}
-    - {id: 127, cat: TV, desc: "Майк и Молли / Mike & Molly"}
-    - {id: 313, cat: TV, desc: "МакГайвер / MacGyver"}
-    - {id: 180, cat: TV, desc: "Миллеры в разводе / The Millers"}
-    - {id: 76, cat: TV, desc: "Мыслить как преступник / Criminal Minds"}
-    - {id: 144, cat: TV, desc: "Полиция Гавайев / Hawaii Five-0"}
-    - {id: 99, cat: TV, desc: "Под куполом / Under The Dome"}
-    - {id: 78, cat: TV, desc: "Помнить все / Незабываемое / Unforgettable"}
-    - {id: 107, cat: TV, desc: "Теория Большого Взрыва / The Big Bang Theory"}
-    - {id: 105, cat: TV, desc: "Элементарно / Elementary"}
-    - {id: 318, cat: TV, desc: "CW"}
-    - {id: 307, cat: TV, desc: "Династия / Dynasty"}
-    - {id: 102, cat: TV, desc: "Дневники вампира / The Vampire Diaries"}
-    - {id: 104, cat: TV, desc: "Древние / The Originals"}
-    - {id: 277, cat: TV, desc: "Карантин / Containment"}
-    - {id: 193, cat: TV, desc: "Красавица и чудовище / Beauty and the Beast"}
-    - {id: 238, cat: TV, desc: "Легенды завтрашнего дня / Legends of Tomorrow"}
-    - {id: 290, cat: TV, desc: "Радиоволна / Frequency"}
-    - {id: 111, cat: TV, desc: "Сверхъестественное / Supernatural"}
-    - {id: 109, cat: TV, desc: "Сотня / 100 / The Hundred"}
-    - {id: 131, cat: TV, desc: "Стрела / Arrow"}
-    - {id: 190, cat: TV, desc: "Супергёрл / Supergirl"}
-    - {id: 142, cat: TV, desc: "Флэш / Flash"}
-    - {id: 124, cat: TV, desc: "Царство / Reign"}
-    - {id: 270, cat: TV, desc: "яЗомби / iZombie"}
-    - {id: 336, cat: TV, desc: "DC"}
-    - {id: 316, cat: TV, desc: "FOX"}
-    - {id: 310, cat: TV, desc: "9-1-1"}
-    - {id: 61, cat: TV, desc: "Готэм / Gotham"}
-    - {id: 182, cat: TV, desc: "Задержка в развитии / Arrested Development"}
-    - {id: 74, cat: TV, desc: "Империя / Empire"}
-    - {id: 247, cat: TV, desc: "Люцифер / Lucifer"}
-    - {id: 157, cat: TV, desc: "Секретные материалы / X-Files"}
-    - {id: 286, cat: TV, desc: "Смертельное Оружие / Lethal Weapon"}
-    - {id: 304, cat: TV, desc: "Орвилл / The Orville"}
-    - {id: 162, cat: TV, desc: "Последователи / The Following"}
-    - {id: 187, cat: TV, desc: "Уэйуорд Пайнс / Wayward Pines"}
-    - {id: 288, cat: TV, desc: "Экзорцист / The Exorcist"}
-    - {id: 327, cat: TV, desc: "FX"}
-    - {id: 62, cat: TV, desc: "Американцы / The Americans"}
-    - {id: 239, cat: TV, desc: "Баскетс / Baskets"}
-    - {id: 300, cat: TV, desc: "Легион / Legion"}
-    - {id: 85, cat: TV, desc: "Штамм / The Strain"}
-    - {id: 82, cat: TV, desc: "Сыны Анархии / Sons of Anarchy"}
-    - {id: 98, cat: TV, desc: "Уилфред / Wilfred"}
-    - {id: 337, cat: TV, desc: "History"}
-    - {id: 91, cat: TV, desc: "Викинги / Vikings"}
-    - {id: 324, cat: TV, desc: "HULU"}
-    - {id: 246, cat: TV, desc: "11.22.63"}
-    - {id: 305, cat: TV, desc: "Беглецы / Runaways"}
-    - {id: 345, cat: TV, desc: "MTV, Sprike"}
-    - {id: 137, cat: TV, desc: "Оборотень / Teen Wolf"}
-    - {id: 237, cat: TV, desc: "Хроники Шаннары / The Shannara Chronicles"}
-    - {id: 319, cat: TV, desc: "NBC"}
-    - {id: 192, cat: TV, desc: "Водолей / Aquarius"}
-    - {id: 166, cat: TV, desc: "Ганнибал / Hannibal"}
-    - {id: 211, cat: TV, desc: "Герои: Возрождение / Heroes Reborn"}
-    - {id: 117, cat: TV, desc: "Гримм / Grimm"}
-    - {id: 285, cat: TV, desc: "Квантовый скачок / Quantum Leap"}
-    - {id: 245, cat: TV, desc: "Медики Чикаго / Chicago Med"}
-    - {id: 234, cat: TV, desc: "Мистер Робинсон / Mr. Robinson"}
-    - {id: 80, cat: TV, desc: "Пересекающиеся линии / Пересекая черту / Crossing Lines"}
-    - {id: 90, cat: TV, desc: "Пожарные Чикаго / Chicago Fire"}
-    - {id: 77, cat: TV, desc: "Полиция Чикаго / Chicago PD"}
-    - {id: 112, cat: TV, desc: "Революция / Revolution"}
-    - {id: 213, cat: TV, desc: "Слепое пятно / Blindspot"}
-    - {id: 93, cat: TV, desc: "Сообщество / Community"}
-    - {id: 273, cat: TV, desc: "Тайны Лауры / The Mysteries of Laura"}
-    - {id: 177, cat: TV, desc: "Черный список / The Blacklist"}
-    - {id: 321, cat: TV, desc: "NETFLIX"}
-    - {id: 281, cat: TV, desc: "Барыги / Narcos"}
-    - {id: 309, cat: TV, desc: "Видоизмененный углерод / Altered Carbon"}
-    - {id: 229, cat: TV, desc: "Джессика Джонс / Jessica Jones"}
-    - {id: 278, cat: TV, desc: "Загадочные события / Stranger Things"}
-    - {id: 301, cat: TV, desc: "Защитники / The Defenders"}
-    - {id: 306, cat: TV, desc: "Каратель / The Punisher"}
-    - {id: 174, cat: TV, desc: "Карточный домик / House of Cards"}
-    - {id: 130, cat: TV, desc: "Лиллехаммер / Lilyhammer"}
-    - {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: 333, cat: TV, desc: "Showtime"}
-    - {id: 154, cat: TV, desc: "Блудливая Калифорния / Californication"}
-    - {id: 118, cat: TV, desc: "Веб терапия / Web Therapy"}
-    - {id: 176, cat: TV, desc: "Декстер / Dexter"}
-    - {id: 282, cat: TV, desc: "Дорожная команда / Roadies"}
-    - {id: 203, cat: TV, desc: "Как бы счастье / Happyish"}
-    - {id: 156, cat: TV, desc: "Мастера Секса / Masters of Sex"}
-    - {id: 244, cat: TV, desc: "Миллиарды / Billions"}
-    - {id: 58, cat: TV, desc: "Обитель лжи / House of Lies"}
-    - {id: 83, cat: TV, desc: "Родина / Homeland"}
-    - {id: 128, cat: TV, desc: "Рэй Донован / Ray Donovan"}
-    - {id: 191, cat: TV, desc: "Страшные сказки / Penny Dreadful"}
-    - {id: 330, cat: TV, desc: "STARZ"}
-    - {id: 204, cat: TV, desc: "Власть в ночном городе / Power"}
-    - {id: 271, cat: TV, desc: "Девушка по вызову / The Girlfriend Experience"}
-    - {id: 218, cat: TV, desc: "Плоть и кости / Flesh and Bone"}
-    - {id: 217, cat: TV, desc: "Эш против Зловещих мертвецов / Ash vs Evil Dead"}
-    - {id: 153, cat: TV, desc: "Спартак / Spartacus"}
-    - {id: 73, cat: TV, desc: "Черные Паруса / Black Sails"}
-    - {id: 326, cat: TV, desc: "SyFy"}
-    - {id: 86, cat: TV, desc: "12 Обезьян / 12 Monkeys"}
-    - {id: 228, cat: TV, desc: "Волшебники / The Magicians"}
-    - {id: 195, cat: TV, desc: "Киллджойс / Killjoys"}
-    - {id: 233, cat: TV, desc: "Конец детства / Childhood's End"}
-    - {id: 235, cat: TV, desc: "Пространство / The Expanse"}
-    - {id: 196, cat: TV, desc: "Тёмная материя / Dark Matter"}
-    - {id: 143, cat: TV, desc: "Хранилище 13 / Warehouse 13"}
-    - {id: 94, cat: TV, desc: "Хэйвен / Haven"}
-    - {id: 351, cat: TV, desc: "TBS"}
-    - {id: 334, cat: TV, desc: "TNT"}
-    - {id: 243, cat: TV, desc: "Библиотекари / The Librarians"}
-    - {id: 220, cat: TV, desc: "Восприятие / Perception"}
-    - {id: 136, cat: TV, desc: "Риццоли и Айлc / Rizzoli & Isles"}
-    - {id: 160, cat: TV, desc: "Рухнувшие Небеса / Falling Skies"}
-    - {id: 341, cat: TV, desc: "TV Land"}
-    - {id: 146, cat: TV, desc: "Красотки в Кливленде / Hot in Cleveland"}
-    - {id: 325, cat: TV, desc: "USA"}
-    - {id: 158, cat: TV, desc: "4400 / The 4400"}
-    - {id: 134, cat: TV, desc: "Белый воротничок / White Collar"}
-    - {id: 230, cat: TV, desc: "Колония / Colony"}
-    - {id: 291, cat: TV, desc: "Королева Юга / Queen of the South"}
-    - {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: 272, cat: TV, desc: "Поворот / TURN"}
-    - {id: 373, cat: TV, desc: "Датские и Шведские сериалы"}
-    - {id: 381, cat: TV, desc: "Ирландские сериалы"}
-    - {id: 367, cat: TV, desc: "Испанские сериалы"}
-    - {id: 380, cat: TV, desc: "Итальянские сериалы"}
-    - {id: 371, cat: TV, desc: "Канадские сериалы"}
-    - {id: 368, cat: TV, desc: "Немецкие сериалы"}
-    - {id: 376, cat: TV, desc: "Нидерландские сериалы"}
-    - {id: 379, cat: TV, desc: "Норвежские сериалы"}
-    - {id: 377, cat: TV, desc: "Российские сериалы"}
-    - {id: 369, cat: TV, desc: "Французкие сериалы"}
-    - {id: 374, cat: TV, desc: "Швейцарские сериалы"}
-    - {id: 382, cat: TV, desc: "Японские сериалы"}
-    - {id: 357, cat: TV, desc: "Сериалы только с субтитрами"}
-    - {id: 378, cat: TV, desc: "Сериалы производства нескольких стран"}
-    - {id: 88, cat: TV, desc: "Мультсериалы"}
-    - {id: 101, cat: TV, desc: "Южный Парк / South Park"}
-    - {id: 89, cat: TV, desc: "Спецагент Арчер / Archer"}
-    - {id: 225, cat: TV, desc: "Стендап / Stand Up"}
-    - {id: 54, cat: TV, desc: "Особый раздел"}
-    - {id: 100, cat: TV, desc: "Короткометражки"}
-    - {id: 60, cat: TV, desc: "Документальные и научно-популярные передачи"}
-    - {id: 159, cat: TV, desc: "Разное"}
-    - {id: 261, cat: TV, desc: "Спорт"}
-    - {id: 262, cat: TV, desc: "Автомотоспорт"}
-    - {id: 263, cat: TV, desc: "Формула 1 / Formula 1"}
-    - {id: 264, cat: TV, desc: "MotoGP / SBK"}
-    - {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]
-    tv-search: [q, season, ep]
-    movie-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: t
-    options:
-      t: created
-      ts: seeders
-      sz: size
-      i: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: d
-    options:
-      d: desc
-      a: asc
-
-login:
-  path: ucp.php?mode=login
-  method: form
-  form: form#login
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: fieldset:has(div.error)
-  test:
-    path: /
-    selector: :has(a[href^="./ucp.php?mode=logout&sid="])
-
-search:
-  paths:
-    # https://casstudio.tv/search.php?tracker_search=torrent&keywords=star&terms=all&author=&sc=1&sf=titleonly&sr=topics&sk=t&sd=d&st=0&ch=300&t=0&submit=Search
-    - path: search.php
-  inputs:
-    tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    terms: all
-    author: ""
-    sc: 1
-    sf: titleonly
-    sr: topics
-    sk: "{{ .Config.sort }}"
-    sd: "{{ .Config.type }}"
-    st: 0
-    ch: 300
-    t: 0
-    submit: Search
-
-  rows:
-    selector: tr.row
-
-  fields:
-    title:
-      selector: a.topictitle
-    details:
-      selector: a.topictitle
-      attribute: href
-    category:
-      selector: a[href^="./viewforum.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    download:
-      selector: a[href^="./download/file.php?id="]
-      attribute: href
-    size:
-      selector: a[href^="./viewforum.php?f="] + b
-      filters:
-        - name: replace
-          args: ["ТБ", "TB"]
-        - name: replace
-          args: ["ГБ", "GB"]
-        - name: replace
-          args: ["МБ", "MB"]
-        - name: replace
-          args: ["КБ", "KB"]
-    seeders:
-      selector: td.forumtopics span.seed
-    leechers:
-      selector: td.forumtopics span.leech
-    grabs:
-      selector: td.forumposts span.complet
-    date:
-      # Вчера, 10:34
-      selector: td.forumdetails span.forum-descriptions:contains("Вчера")
-      optional: true
-      filters:
-        - name: regexp
-          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
-      selector: td.forumdetails span.forum-descriptions:contains("Сегодня")
-      optional: true
-      filters:
-        - name: regexp
-          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
-      selector: td.forumdetails span.forum-descriptions:not(:contains("Сегодня")):not(:contains("Вчера"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(\\d{2} \\D{3} \\d{4}, \\d{2}:\\d{2})"
-        - name: replace
-          args: ["янв", "Jan"]
-        - name: replace
-          args: ["фев", "Feb"]
-        - name: replace
-          args: ["мар", "Mar"]
-        - name: replace
-          args: ["апр", "Apr"]
-        - name: replace
-          args: ["май", "May"]
-        - name: replace
-          args: ["июн", "Jun"]
-        - name: replace
-          args: ["июл", "Jul"]
-        - name: replace
-          args: ["авг", "Aug"]
-        - name: replace
-          args: ["сен", "Sep"]
-        - name: replace
-          args: ["окт", "Oct"]
-        - name: replace
-          args: ["ноя", "Nov"]
-        - name: replace
-          args: ["дек", "Dec"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02 Jan 2006, 15:04 -07:00"
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# phpBB

src/Jackett.Common/Definitions/catorrent.yml

@@ -56,8 +56,9 @@ login:
     selector: a[href$="/index.php?action=logout"]
 
 download:
-  selector: a[href*="/index.php?do=download&id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/index.php?do=download&id="]
+      attribute: href
 
 search:
   # https://catorrent.org/index.php?do=search&subaction=search&story=lovelot

src/Jackett.Common/Definitions/classix.yml

@@ -28,8 +28,9 @@ login:
     path: index.php
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/cpabien.yml

@@ -61,7 +61,6 @@ settings:
   - name: useragent
     type: text
     label: User-Agent
-    label: User-Agent
   - name: info_useragent
     type: info
     label: How to get the User-Agent
@@ -101,8 +100,9 @@ login:
     user-agent: "[ .Config.useragent ]"
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -68,8 +68,9 @@ settings:
       ?trie-nom-a: title asc
 
 download:
-  selector: a[href^="magnet:"]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -175,8 +175,9 @@ download:
       id: "{{ .DownloadUri.Query.id }}"
       to: give
       torrent: "{{ .DownloadUri.Query.id }}"
-  selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]"
-  attribute: href
+  selectors:
+    - selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]"
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/danishbytes.yml

@@ -1,207 +0,0 @@
----
-id: danishbytes
-name: DANISH BYTES
-description: "DANISH BYTES is a Private Danish Tracker"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - https://danishbytes.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: PC/Games, desc: "Games"}
-    - {id: 5, cat: PC/0day, desc: "Appz"}
-    - {id: 8, cat: Books, desc: "Bookz"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    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: created_at
-    options:
-      created_at: 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: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    keywords: ""
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: i.torrent-icon
-      attribute: class
-      case:
-        i.fa-film: 1
-        i.fa-tv-retro: 2
-        i.fa-music: 3
-        i.fa-gamepad: 4
-        i.fa-compact-disc: 5
-        i.fa-book-open: 8
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-# tracker has issue with some magnet downloads failing #10758
-#    magnet:
-#      selector: a[href^="magnet"]
-#      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " 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|minuter)", "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|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "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|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " 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|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " 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)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From PARA Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.1
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# UNIT3D 5.1.0 DBy-edition 0.75

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.onl/
+  - https://demonoid.unblockit.uno/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.space/
 legacylinks:
@@ -33,6 +33,8 @@ legacylinks:
   - https://demonoid.unblockit.link/
   - https://demonoid.unblockit.buzz/
   - https://demonoid.unblockit.club/
+  - https://demonoid.unblockit.onl/
+  - https://demonoid.unblockit.li/
 
 caps:
   categorymappings:
@@ -283,7 +285,7 @@ caps:
     - {id: 233, cat: TV, desc: "TV Trailers"}
     - {id: 234, cat: TV, desc: "TV War"}
     - {id: 235, cat: TV, desc: "TV Western"}
-    # cat 7 misc has no subcats
+    # cat 7 Miscellaneous has no subcats
 
   modes:
     search: [q]
@@ -300,6 +302,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<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: info_themes
+    type: info
+    label: About themes
+    default: Only the default theme <b>Demonoid - v5</b> is supported. If you are using v3 then change it in your <i>User Control Panel</i> or you will get 0 results.
   - name: sort
     type: select
     label: Sort requested from site
@@ -317,8 +323,9 @@ login:
     path: files/
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="/files/download/"]
+      attribute: href
 
 search:
   paths:
@@ -341,10 +348,11 @@ search:
     # does not return imdb link in results
 
   rows:
-    selector: table.font_12px tr:has(td[class^="tone_1"])
+    # only the default theme "Demonoid - v5" is supported
+    selector: table.table:has(td.torrent__table-today) > tbody > tr:has(td[class^="tone_"])
     after: 1
     dateheaders:
-      selector: tr td.added_today:not(:contains("Sponsored links"))
+      selector: tr td.torrent__table-today:not(:contains("Sponsored links"))
       filters:
         - name: replace
           args: ["Added ", ""]
@@ -359,7 +367,7 @@ search:
       optional: true
       attribute: title
     category:
-      selector: span > a[href*="&subcategory="]
+      selector: span.torrent__table-info > a:nth-child(2)
       attribute: href
       optional: true
       filters:
@@ -372,15 +380,15 @@ search:
       selector: a[href^="/files/details/"]
       attribute: href
     description:
-      selector: td:nth-last-child(9)
+      selector: td:nth-last-child(7)
     size:
-      selector: td:nth-last-child(6)
+      selector: td:nth-last-child(5)
     grabs:
-      selector: td:nth-last-child(4)
-    seeders:
       selector: td:nth-last-child(3)
-    leechers:
+    seeders:
       selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -86,22 +86,22 @@ search:
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
-    selector: table > tbody > tr:has(a[href^="magnet:?dn="])
+    selector: table > tbody > tr:has(a[href*="/download/"])
 
   fields:
     category:
       text: 1
     title:
-      selector: a[href*="/torrents/"]
+      selector: span[class="name"]
     details:
       selector: a[href*="/torrents/"]
       attribute: href
     download:
       selector: a[href*="/download/"]
       attribute: href
-    magnet:
-      selector: a[href^="magnet:?dn="]
-      attribute: href
+#    magnet:
+#      selector: a[href^="magnet:?dn="]
+#      attribute: href
     poster:
       selector: img.tps
       attribute: src

src/Jackett.Common/Definitions/desitorrents.yml

@@ -1,274 +0,0 @@
----
-id: desitorrents
-name: DesiTorrents
-description: "Desitorrents is a  Private Torrent Tracker for BOLLYWOOD / TOLLYWOOD / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://desitorrents.tv/
-
-caps:
-  categorymappings:
-    # movies
-    - {id: 47, cat: Movies, desc: "Movies/Bollywood"}
-    - {id: 48, cat: Movies, desc: "Movies/Bengali"}
-    - {id: 49, cat: Movies, desc: "Movies/Tamil"}
-    - {id: 51, cat: Movies, desc: "Movies/Punjabi"}
-    - {id: 52, cat: Movies, desc: "Movies/Marathi"}
-    - {id: 53, cat: Movies, desc: "Movies/Malayalam"}
-    - {id: 54, cat: Movies, desc: "Movies/Kannada"}
-    - {id: 55, cat: Movies, desc: "Movies/Gujarati"}
-    - {id: 56, cat: Movies, desc: "Movies/Foreign"}
-    - {id: 57, cat: Movies, desc: "Movies/Lollywood"}
-    - {id: 58, cat: Movies, desc: "Movies/Hollywood"}
-    - {id: 103, cat: Movies, desc: "Movies/Telugu"}
-    - {id: 104, cat: Movies, desc: "Movies/South Dubbed"}
-    - {id: 110, cat: Movies, desc: "Movies/Documentary"}
-    - {id: 117, cat: Movies, desc: "Movies/Bhojpuri"}
-    - {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/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: 139, cat: TV, desc: "TV/Hollywood"}
-    # music
-    - {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: "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
-    type: text
-    label: Username
-  - 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
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    twofa: "{{ .Config.twofa }}"
-  error:
-    - selector: form#loginform:has(span.warning)
-  test:
-    path: ajax.php
-
-search:
-  paths:
-    - path: ajax.php?action=search_torrent_cats
-      method: post
-  inputs:
-    # 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 \",\" }}"
-  error:
-    - selector: ":contains(\"Something was wrong with your request\")"
-  preprocessingfilters:
-    - name: replace
-      args: ["{\"torrent_html\":\"", ""]
-    - name: replace
-      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: a[href^="/torrents.php?id="]
-    details:
-      selector: a[href^="/torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/torrents.php?action=download&id="]
-      attribute: href
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
-    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
-    uploadvolumefactor:
-      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/dimeadozen.yml

@@ -100,8 +100,9 @@ login:
 
 download:
   # download.php/673256/Talk%20Talk%20-%201986-07-05%20Paris.torrent
-  selector: a[href^="download.php/"]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php/"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/dxp.yml

@@ -79,8 +79,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   # https://dxp.ru/torrents.php?search=&sort=4&type=desc

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -79,8 +79,9 @@ download:
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

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

@@ -308,8 +308,9 @@ login:
     selector: a[href^="account-logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/ehentai.yml

@@ -19,8 +19,9 @@ caps:
     tv-search: [q, season, ep]
 
 download:
-  selector: a[href*="/get/"]
-  attribute: href
+  selectors:
+    - selector: a[href*="/get/"]
+      attribute: href
 
 search:
   paths:

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

@@ -0,0 +1,148 @@
+---
+id: elitetorrent-biz
+name: EliteTorrent.biz
+description: "EliteTorrent.biz is a Public torrent site for TV, movies and documentaries"
+language: es-es
+type: public
+encoding: UTF-8
+links:
+  - https://elitetorrent.app/
+legacylinks:
+  - https://www.elitetorrent.biz/
+  - https://www.elitetorrent.io/
+  - https://www.elitetorrent.one/
+  - https://www.elitetorrent.is/
+  - https://www.elitetorrent.nu/
+  - https://www.elitetorrent.tv/
+  - https://www.elitetorrent.li/
+  - https://www.elitetorrent.bz/
+  - https://www.elitetorrent.nl/
+  - https://wwvv.elitetorrent.nl/
+  - https://wvvw.elitetorrent.nl/
+  - https://vvww.elitetorrent.nl/
+  - https://www.elitetorrent.to/
+  - https://www.elitetorrent.se/
+  - https://www.elitetorrent.com/
+  - https://elitetorrent.com/
+
+caps:
+  categories:
+    "series": TV
+    "peliculas": Movies
+    "other": Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
+
+search:
+  # site returns just 30 results, attempt to fetch upto 90
+  paths:
+    - path: /
+    - path: /page/2/
+    - path: /page/3/
+  keywordsfilters:
+    # most ES/ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})", " $1 "]
+    - name: re_replace
+      args: ["(?i)E(\\d{2,3})", " $1 "]
+  inputs:
+    s: "{{ .Keywords }}"
+    $raw: "&x=0&y=0"
+
+  rows:
+    selector: "#principal .miniboxs-ficha li"
+    filters:
+      - name: andmatch
+
+  fields:
+    quality:
+      selector: span:nth-of-type(2) > i
+      filters:
+        - name: replace
+          args: ["---", ""]
+    language:
+      selector: span#idiomacio > i > img
+      attribute: title
+      filters:
+        - name: replace
+          args: ["Pelicula en ", ""]
+        - name: replace
+          args: ["Español Latino", "LATiN SPANiSH"]
+        - name: replace
+          args: ["Español Castellano", "SPANiSH"]
+        - name: replace
+          args: ["Ingles", "English"]
+        - name: replace
+          args: ["Subtitulado", " SPASUBS"]
+        - name: replace
+          args: ["VOSE", ""]
+    _title:
+      selector: div.imagen > a
+      attribute: title
+      # normalize to SXXEYY format
+      filters:
+        - name: replace
+          args: [" – ", " "]
+        - name: replace
+          args: ["(", ""]
+        - name: replace
+          args: [")", ""]
+        - name: re_replace
+          args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
+        - name: re_replace
+          args: ["(\\d{1})×(\\d{2})", "S0$1E$2"]
+    title:
+      text: "{{ .Result._title}} {{ .Result.language }} {{ .Result.quality }}"
+    details:
+      selector: .meta a
+      attribute: href
+    download:
+      selector: .meta a
+      attribute: href
+    banner:
+      selector: .imagen img
+      attribute: data-src
+    category_movie:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(peliculas)/.*$"
+    category_tv:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(series)/.*$"
+    category:
+      text: "{{ if or .Result.category_movie .Result.category_tv }}{{ or .Result.category_movie .Result.category_tv }}{{ else }}other{{ end }}"
+    size:
+      text: "0 B"
+    size:
+      # size can be missing
+      optional: true
+      selector: .voto1
+      filters:
+        - name: replace
+          args: ["s", ""]
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/ettv.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.onl/
+  - https://ettv.unblockit.uno/
   - https://ettv.nocensor.space/
 legacylinks:
   - https://www.ettv.tv/
@@ -41,6 +41,8 @@ legacylinks:
   - https://ettv.unblockit.buzz/
   - https://ettv.unblocked.monster/
   - https://ettv.unblockit.club/
+  - https://ettv.unblockit.onl/
+  - https://ettv.unblockit.li/
 
 caps:
   categorymappings:
@@ -123,8 +125,9 @@ settings:
       asc: asc
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   path: "{{ if .Keywords }}torrents-search.php{{ else }}torrents.php{{ end }}"

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

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrents.it/
-  - https://extratorrent.unblockit.onl/
+  - https://extratorrent.unblockit.uno/
   - https://extratorrent.nocensor.space/
 legacylinks:
   - https://extratorrent.ag/
@@ -18,6 +18,8 @@ legacylinks:
   - https://extratorrent2.unblockninja.com/
   - https://extratorrent.unblockit.buzz/
   - https://extratorrent.unblockit.club/
+  - https://extratorrent.unblockit.onl/
+  - https://extratorrent.unblockit.li/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -78,8 +78,9 @@ download:
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -38,6 +38,7 @@ caps:
     - {id: "/games/switch/", cat: Console/Other, desc: "Games Switch"}
     - {id: "/games/wii/", cat: Console/Wii, desc: "Games Wii"}
     - {id: "/games/xbox360/", cat: Console/XBox 360, desc: "Games Xbox360"}
+    - {id: "/games/mac/", cat: PC/Mac, desc: "Games Mac"}
     - {id: "/movies/", cat: Movies, desc: Movies}
     - {id: "/movies/3d-movies/", cat: Movies/3D, desc: "Movies 3D"}
     - {id: "/movies/bollywood/", cat: Movies, desc: "Movies Bollywood"}
@@ -48,6 +49,8 @@ caps:
     - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
     - {id: "/movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
     - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
+    - {id: "/movies/music-videos/", cat: Audio/Video, desc: "Movies Music videos"}
+    - {id: "/movies/movie-clips/", cat: Movies/Other, desc: "Movies Movie clips"}
     - {id: "/music/", cat: Audio, desc: Music}
     - {id: "/music/aac/", cat: Audio, desc: "Music AAC"}
     - {id: "/music/lossless/", cat: Audio/Lossless, desc: "Music Lossless"}
@@ -93,8 +96,9 @@ settings:
     default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.onl/
+  - https://eztv.unblockit.uno/
   - https://eztv.nocensor.space/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -44,6 +44,8 @@ legacylinks:
   - https://eztv.unblockit.buzz/
   - https://eztv.unblocked.monster/
   - https://eztv.unblockit.club/
+  - https://eztv.unblockit.onl/
+  - https://eztv.unblockit.li/
 
 caps:
   categories:

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

@@ -74,8 +74,9 @@ download:
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/finvip.yml

@@ -96,8 +96,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/firebit.yml

@@ -57,8 +57,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="/download.php?id="]
+      attribute: href
 
 search:
   # http://firebit.net/index.php?do=search&type=simple&q=2019

src/Jackett.Common/Definitions/focusx.yml

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

src/Jackett.Common/Definitions/fouducinema.yml

@@ -11,21 +11,6 @@ links:
 caps:
   categorymappings:
     # when refreshing categories dont forget to update the category case block
-    - {id: 116, cat: Books, desc: "livres cuisine"}
-    - {id: 125, cat: XXX/Other, desc: "livres XXX"}
-    - {id: 123, cat: Books, desc: "livres roman"}
-    - {id: 113, cat: Books/EBook, desc: "livres Ebook"}
-    - {id: 110, cat: Audio/Audiobook, desc: "livres audio"}
-    - {id: 109, cat: Books/Comics, desc: "livres bd"}
-    - {id: 108, cat: Books/Comics, desc: "livres manga"}
-    - {id: 106, cat: Books, desc: "livres presse"}
-    - {id: 105, cat: Books/Mags, desc: "livres magazine"}
-    - {id: 126, cat: Books, desc: "livres "}
-    - {id: 96, cat: TV/Sport, desc: "sport sport"}
-    - {id: 97, cat: TV/Sport, desc: "sport divers"}
-    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
-    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
-    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
     - {id: 99, cat: Movies/HD, desc: "Film Hdrip"}
     - {id: 98, cat: Movies/WEB-DL, desc: "Film Webrip"}
@@ -56,19 +41,33 @@ caps:
     - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
     - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
     - {id: 112, cat: TV/HD, desc: "Pack_Series HDTV"}
-    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
+    - {id: 105, cat: Books/Mags, desc: "Livres Magazine"}
+    - {id: 116, cat: Books, desc: "Livres Cuisine"}
+    - {id: 123, cat: Books, desc: "Livres Roman"}
+    - {id: 113, cat: Books/EBook, desc: "Livres Ebook"}
+    - {id: 106, cat: Books, desc: "Livres Presse"}
+    - {id: 108, cat: Books/Comics, desc: "Livres Manga"}
+    - {id: 110, cat: Audio/Audiobook, desc: "Livres Audio"}
+    - {id: 109, cat: Books/Comics, desc: "Livres Bd"}
+    - {id: 125, cat: XXX/Other, desc: "livres XXX"}
+    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 13, cat: PC/0day, desc: "Apps Win"}
     - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
     - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"}
     - {id: 53, cat: PC/Mobile-Android, desc: "Apps android"}
+    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
+    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
     - {id: 5, cat: Audio/MP3, desc: "Music Mp3"}
     - {id: 6, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 97, cat: TV/Sport, desc: "Sport Divers"}
+    - {id: 96, cat: TV/Sport, desc: "Sport Sport"}
     - {id: 7, cat: PC/Games, desc: "Jeux Win"}
     - {id: 8, cat: Console/PS3, desc: "Jeux PS3"}
     - {id: 54, cat: PC/Games, desc: "Jeux Pc"}
     - {id: 55, cat: Console/PS4, desc: "Jeux PS4"}
     - {id: 56, cat: Console/XBox 360, desc: "Jeux XBOX 360"}
     - {id: 57, cat: Console/Other, desc: "Jeux androïd"}
+    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
 
   modes:
     search: [q]
@@ -166,21 +165,6 @@ search:
       selector: div.kat_cat_pic
       filters:
       case:
-        ":contains(\"livres\"):contains(\"cuisine\")": 116
-        ":contains(\"livres\"):contains(\"XXX\")": 125
-        ":contains(\"livres\"):contains(\"roman\")": 123
-        ":contains(\"livres\"):contains(\"Ebook\")": 113
-        ":contains(\"livres\"):contains(\"audio\")": 110
-        ":contains(\"livres\"):contains(\"bd\")": 109
-        ":contains(\"livres\"):contains(\"manga\")": 108
-        ":contains(\"livres\"):contains(\"presse\")": 106
-        ":contains(\"livres\"):contains(\"magazine\")": 105
-        ":contains(\"livres\"):contains(\"\")": 126
-        ":contains(\"sport\"):contains(\"sport\")": 96
-        ":contains(\"sport\"):contains(\"divers\")": 97
-        ":contains(\"Animation\"):contains(\"Séries\")": 81
-        ":contains(\"Animation\"):contains(\"Film\")": 79
-        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Film\"):contains(\"DVDRip\")": 2
         ":contains(\"Film\"):contains(\"Hdrip\")": 99
         ":contains(\"Film\"):contains(\"Webrip\")": 98
@@ -211,19 +195,33 @@ search:
         ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
         ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
         ":contains(\"Pack_Series\"):contains(\"HDTV\")": 112
-        ":contains(\"XxX\"):contains(\"Film\")": 10
+        ":contains(\"Livres\"):contains(\"Magazine\")": 105
+        ":contains(\"Livres\"):contains(\"Cuisine\")": 116
+        ":contains(\"Livres\"):contains(\"Roman\")": 123
+        ":contains(\"Livres\"):contains(\"Ebook\")": 113
+        ":contains(\"Livres\"):contains(\"Presse\")": 106
+        ":contains(\"Livres\"):contains(\"Manga\")": 108
+        ":contains(\"Livres\"):contains(\"Audio\")": 110
+        ":contains(\"Livres\"):contains(\"Bd\")": 109
+        ":contains(\"Livres\"):contains(\"XXX\")": 125
+        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Apps\"):contains(\"Win\")": 13
         ":contains(\"Apps\"):contains(\"Mac\")": 14
         ":contains(\"Apps\"):contains(\"Iphone\")": 52
         ":contains(\"Apps\"):contains(\"android\")": 53
+        ":contains(\"Animation\"):contains(\"Séries\")": 81
+        ":contains(\"Animation\"):contains(\"Film\")": 79
         ":contains(\"Music\"):contains(\"Mp3\")": 5
         ":contains(\"Music\"):contains(\"FLAC\")": 6
+        ":contains(\"Sport\"):contains(\"Divers\")": 97
+        ":contains(\"Sport\"):contains(\"Sport\")": 96
         ":contains(\"Jeux\"):contains(\"Win\")": 7
         ":contains(\"Jeux\"):contains(\"PS3\")": 8
         ":contains(\"Jeux\"):contains(\"Pc\")": 54
         ":contains(\"Jeux\"):contains(\"PS4\")": 55
         ":contains(\"Jeux\"):contains(\"XBOX 360\")": 56
         ":contains(\"Jeux\"):contains(\"androïd\")": 57
+        ":contains(\"XxX\"):contains(\"Film\")": 10
     title_phase1:
       selector: a[href^="details.php?id="]
     title_multilang:

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -30,8 +30,9 @@ caps:
 settings: []
 
 download:
-  selector: a#download_torrent
-  attribute: href
+  selectors:
+    - selector: a#download_torrent
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/gay-torrents.yml

@@ -8,6 +8,34 @@ encoding: UTF-8
 links:
   - https://www.gay-torrents.net/
 
+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: 0
+    options:
+      0: created
+      1: title
+      4: size
+      5: seeders
+  - name: order
+    type: select
+    label: Order requested from site
+    default: 0
+    options:
+      0: desc
+      1: asc
+
 caps:
   categorymappings:
     - {id: porn, cat: XXX, desc: "Porn"}
@@ -80,9 +108,26 @@ login:
 search:
   paths:
     - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 1
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 2
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 3
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 4
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 5
   inputs:
     $raw: "{{ range .Categories }}type={{.}}&{{end}}"
     textsearch: "{{ .Keywords }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.order }}"
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
   keywordsfilters:
     - name: re_replace
       args: ["(\\w+)", " +$1"] # prepend + to each word

src/Jackett.Common/Definitions/gay-torrentsorg.yml

@@ -24,6 +24,26 @@ settings:
     type: info
     label: "Search results"
     default: "You can increase the number of search results in your profile.<br />Default is 15."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: data
+    options:
+      data: created
+      seeds: seeders
+      size: size
+      filename: title
+  - name: order
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 caps:
   categorymappings:
@@ -62,6 +82,7 @@ caps:
     - {id: 41, cat: Movies, desc: "Non-Porn"}
     - {id: 41, cat: TV, desc: "Non-Porn"}
     - {id: 41, cat: Other, desc: "Non-Porn"}
+    - {id: 71, cat: XXX, desc: "Fan Sites"}
 
   modes:
     search: [q]
@@ -87,8 +108,10 @@ search:
   inputs:
     $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 both, 1 active, 2 dead
-    active: 0
+    # 0 all, 1 active, 2 dead, 3 free, 4 50%free, 5 25%free, 6 packs
+    active: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.order }}"
 
   rows:
     selector: div.torrent

src/Jackett.Common/Definitions/generationfree.yml

@@ -142,8 +142,9 @@ download:
       id: "{{ .DownloadUri.Query.id }}"
       to: give
       torrent: "{{ .DownloadUri.Query.id }}"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/girotorrent.yml

@@ -136,8 +136,9 @@ download:
       infohash: "{{ .DownloadUri.Query.id }}"
       thanks: 1
       rndval: "1487013827343"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -73,8 +73,9 @@ settings:
     default: false
 
 download:
-  selector: a[href*="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href*="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.unblockit.uno/
   - https://glotorrents.nocensor.space/
 legacylinks:
   - https://glodls.rocks/
@@ -38,6 +38,8 @@ legacylinks:
   - https://glotorrents.unblockit.buzz/
   - https://glodls.unblocked.monster/
   - https://glotorrents.unblockit.club/
+  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.unblockit.li/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gtorrent.yml

@@ -23,8 +23,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="/uploads/torrents/"]
-  attribute: href
+  selectors:
+    - selector: a[href^="/uploads/torrents/"]
+      attribute: href
 
 search:
   # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -23,8 +23,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="/engine/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="/engine/download.php?id="]
+      attribute: href
 
 search:
   # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -6,7 +6,9 @@ language: cs-cz
 type: semi-private
 encoding: UTF-8
 links:
-  - http://www.hd-cztorrent.cz/
+  - https://www.hd-cztorrent.cz/
+legacylinks:
+  - http://www.hd-cztorrent.cz/ # site is forcing https
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdhouse.yml

@@ -15,14 +15,15 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/HD, desc: "Кино HD"}
-    - {id: 2, cat: Movies/UHD, desc: "Кино UHD"}
-    - {id: 3, cat: XXX, desc: "18+ HD"}
-    - {id: 4, cat: Audio/Lossless, desc: "Музыка A"}
-    - {id: 5, cat: PC/Games, desc: "Игры"}
-    - {id: 6, cat: TV/HD, desc: "Сериалы HD"}
-    - {id: 7, cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: 9, cat: Audio/Video, desc: "Музыка V"}
+    - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
+    - {id: 5006, cat: Movies/UHD, desc: "Кино UHD"}
+    - {id: 2007, cat: TV/Anime, desc: "Мультфильмы"}
+    - {id: 2006, cat: TV/HD, desc: "Сериалы HD"}
+    - {id: 2004, cat: Audio/Lossless, desc: "Музыка A"}
+    - {id: 5007, cat: Audio/Video, desc: "Музыка V"}
+    - {id: 2003, cat: XXX, desc: "18+ HD"}
+    - {id: 2005, cat: PC/Games, desc: "Игры"}
+    - {id: 5005, cat: TV/Sport, desc: "Спорт HD"} # not shown in list
 
   modes:
     search: [q]
@@ -51,8 +52,9 @@ settings:
       asc: asc
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   # https://hdreactor.net/index.php?do=search&subaction=search&showposts=1&story=2020&catlist[]=2001&catlist[]=2006
@@ -83,14 +85,15 @@ search:
     category:
       selector: div.movie-item__meta > span > a
       case:
-        a[href$="/1/"]: 1
-        a[href$="/3/"]: 3
-        a[href$="/4/"]: 4
-        a[href$="/4k_uhd/"]: 2
-        a[href$="/5/"]: 5
-        a[href$="/6/"]: 6
-        a[href$="/7/"]: 7
-        a[href$="/9/"]: 9
+        a[href$="/1/"]: 2001
+        a[href$="/4k_uhd/"]: 5006
+        a[href$="/7/"]: 2007
+        a[href$="/6/"]: 2006
+        a[href$="/4/"]: 2004
+        a[href$="/9/"]: 5007
+        a[href$="/3/"]: 2003
+        a[href$="/5/"]: 2005
+        a[href$="/sport-hd/"]: 5005 # not shown in list
     title:
       selector: span.movie-item__title
       filters:

src/Jackett.Common/Definitions/hellastz.yml

@@ -92,8 +92,9 @@ download:
       infohash: "{{ .DownloadUri.Query.id }}"
       thanks: 1
       rndval: "1487013827343"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/ibit.yml

@@ -49,16 +49,17 @@ settings:
       asc: asc
 
 download:
-  selector: script:contains("magnet:?xt=")
-  filters:
-    - name: regexp
-      args: "play\\('(.+?)'"
-    - name: re_replace
-      args: ["X-X", ""]
-    - name: prepend
-      args: "magnet:?xt=urn:btih:"
-    - name: append
-      args: "&dn={{ re_replace .DownloadUri.PathAndQuery \"\\/torrent\\/(.+?)\\/\" \"$1\"}}&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+  selectors:
+    - selector: script:contains("magnet:?xt=")
+      filters:
+        - name: regexp
+          args: "play\\('(.+?)'"
+        - name: re_replace
+          args: ["X-X", ""]
+        - name: prepend
+          args: "magnet:?xt=urn:btih:"
+        - name: append
+          args: "&dn={{ re_replace .DownloadUri.PathAndQuery \"\\/torrent\\/(.+?)\\/\" \"$1\"}}&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
 
 search:
   paths:

src/Jackett.Common/Definitions/isohunt2.yml

@@ -58,11 +58,13 @@ settings:
       size: size
 
 download:
-  selector: a.btn-magnet
-  attribute: href
-  filters:
-    - name: querystring
-      args: url
+  selectors:
+    - selector: a.btn-magnet
+      attribute: href
+      filters:
+        - name: querystring
+          args: url
+
 search:
   paths:
     - path: torrents

src/Jackett.Common/Definitions/itorrent.yml

@@ -50,8 +50,9 @@ settings:
 
 
 download:
-  selector: a[href^="/torrentfiles/"]
-  attribute: href
+  selectors:
+    - selector: a[href^="/torrentfiles/"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/kickasstorrents-to.yml

@@ -51,8 +51,9 @@ settings:
       asc: asc
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/lechaudron.yml

@@ -1,287 +0,0 @@
----
-id: lechaudron
-name: LeChaudron
-description: "Le Chaudron is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-fr
-type: private
-encoding: UTF-8
-links:
-  - https://lechaudron.nl/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: XXX, desc: "Adultes - BD Erotique"}
-    - {id: 4, cat: XXX, desc: "Adultes - Doujin (Manga X)"}
-    - {id: 2, cat: XXX, desc: "Adultes - eBook XXX"}
-    - {id: 3, cat: XXX, desc: "Adultes - Film XXX"}
-    - {id: 5, cat: XXX, desc: "Adultes - Hentai"}
-    - {id: 6, cat: TV/Anime, desc: "Animations - 3D"}
-    - {id: 7, cat: TV/Anime, desc: "Animations - 4K Light"}
-    - {id: 8, cat: TV/Anime, desc: "Animations - 4K UHD"}
-    - {id: 9, cat: TV/Anime, desc: "Animations - BDRIP-BRRIP"}
-    - {id: 10, cat: TV/Anime, desc: "Animations - BluRay-R"}
-    - {id: 11, cat: TV/Anime, desc: "Animations - DVD-R"}
-    - {id: 12, cat: TV/Anime, desc: "Animations - DVDRIP"}
-    - {id: 13, cat: TV/Anime, desc: "Animations - Film Jap-Anim"}
-    - {id: 14, cat: TV/Anime, desc: "Animations - HD 1080P"}
-    - {id: 15, cat: TV/Anime, desc: "Animations - HD 720p"}
-    - {id: 16, cat: TV/Anime, desc: "Animations - HDRIP"}
-    - {id: 17, cat: TV/Anime, desc: "Animations - HDTV"}
-    - {id: 18, cat: TV/Anime, desc: "Animations - HDTV 1080p"}
-    - {id: 19, cat: TV/Anime, desc: "Animations - HDTV 720p"}
-    - {id: 20, cat: TV/Anime, desc: "Animations - MHD 1080p"}
-    - {id: 21, cat: TV/Anime, desc: "Animations - MHD 720p"}
-    - {id: 22, cat: TV/Anime, desc: "Animations - REMUX"}
-    - {id: 23, cat: TV/Anime, desc: "Animations - Serie Animee"}
-    - {id: 24, cat: TV/Anime, desc: "Animations - Serie Jap-Anim"}
-    - {id: 25, cat: TV/Anime, desc: "Animations - TVRIP"}
-    - {id: 26, cat: TV/Anime, desc: "Animations - WEB-DL"}
-    - {id: 27, cat: TV/Anime, desc: "Animations - WEB-DL 1080p"}
-    - {id: 28, cat: TV/Anime, desc: "Animations - WEB-DL 720p"}
-    - {id: 29, cat: TV/Anime, desc: "Animations - WEBRIP"}
-    - {id: 31, cat: TV/Documentary, desc: "Documentaires - Emission TV"}
-    - {id: 32, cat: TV/Documentary, desc: "Documentaires - Film Documentaire"}
-    - {id: 33, cat: TV/Documentary, desc: "Documentaires - Spectacle"}
-    - {id: 34, cat: TV/Documentary, desc: "Documentaires - Sport"}
-    - {id: 41, cat: Movies/3D, desc: "Films - 3D"}
-    - {id: 42, cat: Movies/UHD, desc: "Films - 4K Light"}
-    - {id: 43, cat: Movies/UHD, desc: "Films - 4K UHD"}
-    - {id: 44, cat: Movies/BluRay, desc: "Films - BDRIP-BRRIP"}
-    - {id: 45, cat: Movies/BluRay, desc: "Films - BluRay-R"}
-    - {id: 46, cat: Movies, desc: "Films - Coffret"}
-    - {id: 47, cat: Movies/DVD, desc: "Films - DVD-R"}
-    - {id: 48, cat: Movies/DVD, desc: "Films - DVDRIP"}
-    - {id: 49, cat: Movies/HD, desc: "Films - HD 1080P"}
-    - {id: 50, cat: Movies/HD, desc: "Films - HD 720p"}
-    - {id: 51, cat: Movies/HD, desc: "Films - HDRIP"}
-    - {id: 52, cat: Movies/HD, desc: "Films - HDTV"}
-    - {id: 53, cat: Movies/HD, desc: "Films - HDTV 1080p"}
-    - {id: 54, cat: Movies/HD, desc: "Films - HDTV 720p"}
-    - {id: 55, cat: Movies/HD, desc: "Films - MHD 1080p"}
-    - {id: 56, cat: Movies/HD, desc: "Films - MHD 720p"}
-    - {id: 57, cat: Movies, desc: "Films - REMUX"}
-    - {id: 58, cat: Movies, desc: "Films - TVRIP"}
-    - {id: 59, cat: Movies/WEB-DL, desc: "Films - WEB-DL"}
-    - {id: 60, cat: Movies/WEB-DL, desc: "Films - WEB-DL 1080p"}
-    - {id: 61, cat: Movies/WEB-DL, desc: "Films - WEB-DL 720p"}
-    - {id: 62, cat: Movies/WEB-DL, desc: "Films - WEBRIP"}
-    - {id: 64, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
-    - {id: 65, cat: PC/Mobile-iOS, desc: "Jeux - IOS-OSX"}
-    - {id: 66, cat: PC/Games, desc: "Jeux - PC"}
-    - {id: 67, cat: Console/PSP, desc: "Jeux - PS-PSP-X"}
-    - {id: 68, cat: Console/Wii, desc: "Jeux - Wii - Wii-U"}
-    - {id: 69, cat: Console/XBox, desc: "Jeux - XBOX"}
-    - {id: 35, cat: Audio/Audiobook, desc: "Livres - Audio-Book"}
-    - {id: 36, cat: Books, desc: "Livres - BD"}
-    - {id: 37, cat: Books/Mags, desc: "Livres - Magazine"}
-    - {id: 38, cat: Books/Comics, desc: "Livres - MANGAS"}
-    - {id: 39, cat: Books, desc: "Livres - Presse"}
-    - {id: 40, cat: Books/EBook, desc: "Livres - Roman"}
-    - {id: 70, cat: PC/Mobile-Android, desc: "Logiciels - ANDROID"}
-    - {id: 71, cat: PC/Mac, desc: "Logiciels - APPLE"}
-    - {id: 72, cat: PC/Mobile-iOS, desc: "Logiciels - IPHONE"}
-    - {id: 73, cat: PC, desc: "Logiciels - LINUX"}
-    - {id: 74, cat: PC/0day, desc: "Logiciels - WINDOWS"}
-    - {id: 75, cat: TV, desc: "Pack - 3D"}
-    - {id: 76, cat: TV/UHD, desc: "Pack - 4K Light"}
-    - {id: 77, cat: TV/UHD, desc: "Pack - 4KUHD"}
-    - {id: 78, cat: TV/HD, desc: "Pack - BDRIP-BRRIP"}
-    - {id: 79, cat: TV/HD, desc: "Pack - BluRay-R"}
-    - {id: 80, cat: TV/SD, desc: "Pack - DVD-R"}
-    - {id: 81, cat: TV/SD, desc: "Pack - DVDRIP"}
-    - {id: 82, cat: TV/HD, desc: "Pack - HD 1080P"}
-    - {id: 83, cat: TV/HD, desc: "Pack - HD 720p"}
-    - {id: 84, cat: TV/HD, desc: "Pack - HDRIP"}
-    - {id: 85, cat: TV/HD, desc: "Pack - HDTV"}
-    - {id: 86, cat: TV/HD, desc: "Pack - HDTV 1080p"}
-    - {id: 87, cat: TV/HD, desc: "Pack - HDTV 720p"}
-    - {id: 88, cat: TV/HD, desc: "Pack - MHD 1080p"}
-    - {id: 89, cat: TV/HD, desc: "Pack - MHD 720p"}
-    - {id: 90, cat: TV, desc: "Pack - REMUX"}
-    - {id: 91, cat: TV, desc: "Pack - TVRIP"}
-    - {id: 92, cat: TV/WEB-DL, desc: "Pack - WEB-DL"}
-    - {id: 93, cat: TV/WEB-DL, desc: "Pack - WEB-DL 1080p"}
-    - {id: 94, cat: TV/WEB-DL, desc: "Pack - WEB-DL 720p"}
-    - {id: 95, cat: TV/WEB-DL, desc: "Pack - WEBRIP"}
-    - {id: 97, cat: TV, desc: "Series - 3D"}
-    - {id: 98, cat: TV/UHD, desc: "Series - 4K Light"}
-    - {id: 99, cat: TV/UHD, desc: "Series - 4KUHD"}
-    - {id: 100, cat: TV/HD, desc: "Series - BDRIP-BRRIP"}
-    - {id: 101, cat: TV/HD, desc: "Series - BluRay-R"}
-    - {id: 102, cat: TV/SD, desc: "Series - DVD-R"}
-    - {id: 103, cat: TV/SD, desc: "Series - DVDRIP"}
-    - {id: 104, cat: TV/HD, desc: "Series - HD 1080P"}
-    - {id: 105, cat: TV/HD, desc: "Series - HD 720p"}
-    - {id: 106, cat: TV/HD, desc: "Series - HDRIP"}
-    - {id: 107, cat: TV/HD, desc: "Series - HDTV"}
-    - {id: 108, cat: TV/HD, desc: "Series - HDTV 1080p"}
-    - {id: 109, cat: TV/HD, desc: "Series - HDTV 720p"}
-    - {id: 110, cat: TV/HD, desc: "Series - MHD 1080p"}
-    - {id: 111, cat: TV/HD, desc: "Series - MHD 720p"}
-    - {id: 112, cat: TV, desc: "Series - REMUX"}
-    - {id: 113, cat: TV, desc: "Series - TVRIP"}
-    - {id: 114, cat: TV/WEB-DL, desc: "Series - WEB-DL"}
-    - {id: 115, cat: TV/WEB-DL, desc: "Series - WEB-DL 1080p"}
-    - {id: 116, cat: TV/WEB-DL, desc: "Series - WEB-DL 720p"}
-    - {id: 117, cat: TV/WEB-DL, desc: "Series - WEBRIP"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      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
-    default: false
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: TTV3/Bienvenue
-    selector: a[href$="/TTV3/Deconnexion"]
-
-download:
-  before:
-    # <form method="post" action="https://lechaudron.nl/TTV3/Torrents/5610/remercier">
-    # <input type="hidden" name="torrent" value="5610">
-    path: "/TTV3/Torrents/{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}/remercier"
-    method: post
-    inputs:
-      torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
-  selector: a[href*="/Telechargement/"]
-  attribute: href
-
-search:
-  paths:
-    # https://lechaudron.nl/TTV3/Torrents/Recherche?search=&endroit=nomtorrent&langue=0&tl=oui
-    - path: TTV3/Torrents/Recherche
-  inputs:
-    search: "{{ .Keywords }}"
-    # nomtorrent, desctorrent
-    endroit: nomtorrent
-    # non, oui, peuimporte
-    tl: "{{ if .Config.freeleech }}oui{{ else }}peuimporte{{ end }}"
-    # 0 all, 2 English, etc
-    langue: 0
-    # does not support imdbid searches and does not return imdb link in results
-
-  rows:
-    selector: tr:has(a[onmouseover])
-
-  fields:
-    category:
-      selector: a[href*="/SousCategories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title_phase1:
-      selector: a[href*="/SousCategories/"]
-      attribute: alt
-      filters:
-        - name: regexp
-          args: "^..(.+)"
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[onmouseover]
-      attribute: href
-    download:
-      selector: a[onmouseover]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src= (.*?)><"
-    date:
-      selector: a[onmouseover] font[color="#F2F2F2"]
-      filters:
-        - name: regexp
-          args: "Il y a (.*?)\\s-"
-        - name: replace
-          args: ["heures", "hours"]
-        - name: replace
-          args: ["heure", "hour"]
-        - name: replace
-          args: ["Jours", "days"]
-        - name: replace
-          args: ["Jour", "day"]
-        - name: replace
-          args: ["Semaines", "weeks"]
-        - name: replace
-          args: ["Semaine", "week"]
-        - name: replace
-          args: ["Mois", "months"]
-        - name: replace
-          args: ["Ans", "years"]
-        - name: replace
-          args: ["An", "year"]
-        - name: append
-          args: " ago"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src$="/images/Torrents/freeleech.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.95
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TT3.00 FRENCH

src/Jackett.Common/Definitions/lesaloon.yml

@@ -124,7 +124,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    loginButton: X
+    loginButton: XZ
   error:
     - selector: "p[style=\"color: #B73C38\"]"
   test:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -7,12 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.limetorrents.info/
-  - https://www.limetorrents.asia/
-  - https://www.limetorrents.co/
-  - https://limetor.com/
-  - https://www.limetor.pro/
-  - https://limetorrents.unblockit.onl/
+  - https://www.limetorrents.pro/
+  - https://limetorrents.unblockit.uno/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.space/
 legacylinks:
@@ -42,6 +38,13 @@ legacylinks:
   - https://limetorrents.unblockit.link/
   - https://limetorrents.unblockit.buzz/
   - https://limetorrents.unblockit.club/
+  - https://limetorrents.unblockit.onl/
+  - https://www.limetorrents.info/
+  - https://www.limetorrents.asia/
+  - https://www.limetorrents.co/
+  - https://limetor.com/
+  - https://www.limetor.pro/
+  - https://limetorrents.unblockit.li/
 
 caps:
   categorymappings:
@@ -67,6 +70,17 @@ settings:
     options:
       "http://itorrents.org/": iTorrents.org
       "magnet:": magnet
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "http://itorrents.org/"
+    options:
+      "http://itorrents.org/": iTorrents.org
+      "magnet:": magnet
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: As the .torrent download links on this site are known to fail from time to time, you can optionally set as a fallback an automatic alternate link.
   - name: sort
     type: select
     label: Sort requested from site
@@ -82,8 +96,11 @@ settings:
 
 download:
   # the .torrent url is on the on the details page
-  selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink }}"]
-  attribute: href
+  selectors:
+    - selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink2 }}"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/magicheaven.yml

@@ -14,6 +14,7 @@ caps:
     - {id: 108, cat: Other, desc: "APPS Wallpapers"}
     - {id: 8, cat: Movies/BluRay, desc: "BLU-RAY"}
     - {id: 172, cat: Movies/BluRay, desc: "BLU-RAY 1080p"}
+    - {id: 179, cat: Movies/BluRay, desc: "BLU-RAY 4K"}
     - {id: 176, cat: Movies/BluRay, desc: "BLU-RAY 720p"}
     - {id: 156, cat: Movies/BluRay, desc: "BLU-RAY H264"}
     - {id: 153, cat: Movies/BluRay, desc: "BLU-RAY X264"}
@@ -22,6 +23,7 @@ caps:
     - {id: 164, cat: Movies/Other, desc: "Christmas Music"}
     - {id: 160, cat: Movies/Other, desc: "Classic Movies"}
     - {id: 169, cat: Console, desc: "Console Games"}
+    - {id: 178, cat: PC/Games, desc: "PC GAMES"}
     - {id: 175, cat: Console/XBox, desc: "Console Games XBOX"}
     - {id: 82, cat: Audio/Other, desc: "DJ MUSIC"}
     - {id: 84, cat: Audio/Other, desc: "DJ MUSIC DMC"}
@@ -45,8 +47,8 @@ caps:
     - {id: 150, cat: Audio, desc: "MUSIC Collections"}
     - {id: 96, cat: Audio, desc: "MUSIC Discographys"}
     - {id: 97, cat: Audio/Lossless, desc: "MUSIC Flac"}
+    - {id: 177, cat: Audio, desc: "MUSIC Rock / Metal"}
     - {id: 171, cat: Audio/Video, desc: "Music-Videos"}
-    - {id: 22, cat: PC/Games, desc: "PC GAMES"}
     - {id: 81, cat: Movies, desc: "RatioBoosters"}
     - {id: 26, cat: TV/Sport, desc: "SPORT"}
     - {id: 7, cat: Audio, desc: "Top 40 Albums/Singles"}
@@ -119,8 +121,9 @@ download:
     method: post
     inputs:
       torrentid: "{{ .DownloadUri.Query.id }}"
-  selector: a[href*="/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -58,6 +58,7 @@ caps:
     - {id: 233, cat: Movies, desc: "Video for Seamen-Video for Marine Engineers"}
     - {id: 235, cat: Movies, desc: "Video for Seamen-Other videos"}
     - {id: 102, cat: Books, desc: "Marine Engineer's Library"}
+    - {id: 316, cat: Books, desc: "Marine Engineer's Library-Marine Fuels & Lubricants"}
     - {id: 28, cat: Books, desc: Marine Engineer's Library-Ship's systems and mechanisms"}
     - {id: 22, cat: Books, desc: Marine Engineer's Library-Daihatsu"}
     - {id: 164, cat: Books, desc: Marine Engineer's Library-Operation of ship's power plants"}
@@ -67,7 +68,6 @@ caps:
     - {id: 173, cat: Books, desc: Marine Engineer's Library-MAK & Caterpillar"}
     - {id: 166, cat: Books, desc: Marine Engineer's Library-Ship's steam and gas turbines"}
     - {id: 134, cat: Books, desc: Marine Engineer's Library-Marine Pumps"}
-    - {id: 112, cat: Books, desc: Marine Engineer's Library-AALBORG"}
     - {id: 108, cat: Books, desc: Marine Engineer's Library-Hydraulics"}
     - {id: 16, cat: Books, desc: Marine Engineer's Library-MAN B&W"}
     - {id: 17, cat: Books, desc: Marine Engineer's Library-Wärtsilä & Sulzer"}
@@ -95,7 +95,7 @@ caps:
     - {id: 265, cat: Books, desc: "Section for cadets-Marine dictionaries and glossaries RU↔RU/EN↔EN"}
     - {id: 191, cat: Books, desc: "Maritime Law"}
     - {id: 240, cat: Books, desc: "Maritime Law-IMO Resolutions"}
-    - {id: 38, cat: Books, desc: "Uncategorized"}
+    - {id: 212, cat: Books, desc: "Ship's documentation"}
     - {id: 190, cat: Books, desc: "Catalogs"}
     - {id: 113, cat: Books, desc: "Medicine"}
     - {id: 299, cat: Books, desc: "Sailing Kitchen"}
@@ -111,8 +111,6 @@ caps:
     - {id: 288, cat: Audio, desc: "Audio-♬ Music"}
     - {id: 287, cat: Audio, desc: "Audio-Non-Fiction"}
     - {id: 286, cat: Audio, desc: "Audio-Fiction"}
-    - {id: 212, cat: Books, desc: "Ship's documentation"}
-    - {id: 251, cat: Books, desc: "Diving"}
     - {id: 111, cat: Books, desc: "Yachting, sailing, boating"}
     - {id: 298, cat: Books, desc: "Yachting, sailing, boating-Cruising Guides"}
     - {id: 297, cat: Books, desc: "Yachting, sailing, boating-Weather Sailing"}
@@ -125,6 +123,7 @@ caps:
     - {id: 255, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
     - {id: 256, cat: Books, desc: "Yachting, sailing, boating-Rigging, knots"}
     - {id: 252, cat: Books, desc: "Yachting, sailing, boating-Projects, design, construction"}
+    - {id: 251, cat: Books, desc: "Diving"}
     - {id: 177, cat: Books, desc: "Shipmodeling"}
     - {id: 293, cat: Books, desc: "Shipmodeling-Radio controlled models"}
     - {id: 292, cat: Books, desc: "Shipmodeling-Marine Modelling Magazines"}
@@ -161,6 +160,8 @@ caps:
     - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}
     - {id: 162, cat: Books, desc: "Archive"}
+    - {id: 315, cat: Books, desc: "Archive-Unformed"}
+    - {id: 38, cat: Books, desc: "Archive-Uncategorized"}
     - {id: 295, cat: Books, desc: "Archive-Unregistered releases"}
 
   modes:

src/Jackett.Common/Definitions/mixtapetorrent.yml

@@ -20,8 +20,9 @@ caps:
 settings: []
 
 download:
-  selector: table#attachments > tbody > tr.odd > td > a
-  attribute: href
+  selectors:
+    - selector: table#attachments > tbody > tr.odd > td > a
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/moviesdvdr.yml

@@ -21,8 +21,9 @@ caps:
 settings: []
 
 download:
-  selector: a.torrent_download
-  attribute: href
+  selectors:
+    - selector: a.torrent_download
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/movietorrent.yml

@@ -54,11 +54,12 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
-  filters:
-    - name: append
-      args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+      filters:
+        - name: append
+          args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
 
 search:
   paths:

src/Jackett.Common/Definitions/muziekfabriek.yml

@@ -57,8 +57,9 @@ login:
     selector: :has(a[href="logout.php"])
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/mypornclub.yml

@@ -24,11 +24,12 @@ settings:
     default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
-  filters:
-    - name: re_replace
-      args: ["\\s+", " "]
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+      filters:
+        - name: re_replace
+          args: ["\\s+", " "]
 
 search:
   paths:

src/Jackett.Common/Definitions/nitro.yml

@@ -49,12 +49,13 @@ settings:
       asc: asc
 
 download:
-  selector: script:contains("magnet:")
-  filters:
-    - name: regexp
-      args: "(magnet:[^\"]+)\""
-    - name: append
-      args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+  selectors:
+    - selector: script:contains("magnet:")
+      filters:
+        - name: regexp
+          args: "(magnet:[^\"]+)\""
+        - name: append
+          args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
 
 search:
   paths:

src/Jackett.Common/Definitions/nntt.yml

@@ -672,8 +672,9 @@ settings:
       a: asc
 
 download:
-  selector: a[href^="./download/file.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="./download/file.php?id="]
+      attribute: href
 
 search:
   # http://www.nntt.org/search.php?sr=topics&sf=titleonly&fp=1&tracker_search=torrent&keywords=2020&fid[]=154

src/Jackett.Common/Definitions/nyaasi.yml

@@ -117,16 +117,14 @@ caps:
 
 search:
   paths:
-    - path: /
-  inputs:
-    q: "{{ .Keywords }}"
-    f: "{{ .Config.filter-id }}"
-    c: "{{ .Config.cat-id }}"
-    s: "{{ .Config.sort }}"
-    o: "{{ .Config.type }}"
+    - path: "?q={{ .Keywords }}&f={{ .Config.filter-id }}&c={{ .Config.cat-id }}&s={{ .Config.sort }}&o={{ .Config.type }}"
+    # strip 0 from start of episode number - #11019
+    - path: "?q={{ if .Keywords }}{{ re_replace .Keywords \" 0(\\d{1})\" \" $1\" }}{{ else }}&p=2{{ end }}&f={{ .Config.filter-id }}&c={{ .Config.cat-id }}&s={{ .Config.sort }}&o={{ .Config.type }}"
 
   rows:
     selector: tr.default,tr.danger,tr.success
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/oasis.yml

@@ -196,8 +196,9 @@ download:
     method: post
     inputs:
       torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
-  selector: a[href*="/Telechargement/"]
-  attribute: href
+  selectors:
+    - selector: a[href*="/Telechargement/"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/obscure.yml

@@ -0,0 +1,96 @@
+---
+id: obscure
+name: Obscure
+description: "Obscure is a Private Torrent Tracker for Obscure Stuff."
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://www.obscure.wtf/
+
+caps:
+  categorymappings:
+    - {id: movies, cat: Movies, desc: "Movies"}
+    - {id: tv, cat: TV, desc: "TV Shows"}
+    - {id: music, cat: Audio, desc: "Music"}
+    - {id: books, cat: Books, desc: "Books"}
+    - {id: miscellaneous, cat: Other, desc: "Misc"}
+    - {id: packs, cat: Movies/Other, desc: "Packs"}
+
+  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
+
+login:
+  path: login/login
+  method: post
+  inputs:
+    login: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    remember: 1
+  error:
+    - selector: div.blockMessage--error
+  test:
+    path: /
+    selector: a[href^="/logout/?t="]
+
+search:
+  paths:
+    # 20 results per page
+    - path: "tracker/?filename={{ .Keywords }}&freeleech={{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: tr.dataList-row:has(td.download)
+
+  fields:
+    category:
+      selector: a[href^="/forums/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "\\/(\\w+)\\/$"
+    title:
+      selector: a[href^="/threads/"]
+    details:
+      selector: a[href^="/threads/"]
+      attribute: href
+    download:
+      selector: td.download a
+      attribute: href
+    poster:
+      selector: td:nth-child(2) img
+      attribute: src
+    date:
+      text: now
+    size:
+      selector: td:nth-last-child(4)
+    grabs:
+      selector: td:nth-last-child(3)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      case:
+        i.fa-star: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# engine n/a

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.ph/
+  - https://www.oxtorrent.pe/
   - https://www.oxtorrent.co/
   - https://oxtorrent.nocensor.space/
 legacylinks:
@@ -30,6 +30,7 @@ legacylinks:
   - https://wvw.oxtorrent.ws/
   - https://oxtorrent.unblocked.monster/
   - https://www.oxtorrent.tv/
+  - https://www.oxtorrent.ph/
 
 caps:
   categorymappings:
@@ -71,8 +72,9 @@ settings:
     default: false
 
 download:
-  selector: a[href^="magnet:?"]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/pctorrent.yml

@@ -21,8 +21,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href*="/engine/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/engine/download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/pier720.yml

@@ -108,8 +108,9 @@ login:
     selector: :has(a[href^="./ucp.php?mode=logout&"])
 
 download:
-  selector: a[href*="/download/torrent?id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/download/torrent?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/piratadigital.yml

@@ -10,11 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Filmes"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 6, cat: TV/Anime, desc: "Animes"}
-    - {id: 4, cat: Console, desc: "Games"}
-    - {id: 5, cat: PC, desc: "Software"}
+    - {id: 4, cat: Console, desc: "Jogos"}
+    - {id: 5, cat: PC, desc: "Aplicativos"}
+    - {id: 7, cat: Other, desc: "Cursos"}
 
   modes:
     search: [q]
@@ -177,8 +178,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
+# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000

src/Jackett.Common/Definitions/piratbit.yml

@@ -646,8 +646,9 @@ settings:
 
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/pirateiro.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://pirateiro.com/
   - https://pirateiro.eu/
-  - https://pirateiro.unblockit.onl/
+  - https://pirateiro.unblockit.uno/
 legacylinks:
   - http://pirateiro.com/
   - https://pirateiro.unblockit.pro/
@@ -26,6 +26,8 @@ legacylinks:
   - https://pirateiro.unblockit.link/
   - https://pirateiro.unblockit.buzz/
   - https://pirateiro.unblockit.club/
+  - https://pirateiro.unblockit.onl/
+  - https://pirateiro.unblockit.li/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/polishsource.yml

@@ -15,6 +15,7 @@ caps:
     - {id: 46, cat: Movies/UHD, desc: "Movies/UHD"}
     - {id: 10, cat: TV/SD, desc: "TV/SD"}
     - {id: 39, cat: TV/HD, desc: "TV/HD"}
+    - {id: 47, cat: TV/UHD, desc: "TV/UHD"}
     - {id: 8, cat: PC/Games, desc: "Games/PC"}
     - {id: 3, cat: Console, desc: "Games/Consoles"}
     - {id: 5, cat: Books, desc: "E-Books"}

src/Jackett.Common/Definitions/pornleech.yml

@@ -6,9 +6,10 @@ language: en
 type: public
 encoding: UTF-8
 links:
-  - http://pornleech.io/
+  - https://pornleech.ch/
 legacylinks:
-  - https://pornleech.io/ # site is forcing redirect to http
+  - https://pornleech.io/
+  - http://pornleech.io/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/proporno.yml

@@ -31,8 +31,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/prostylex.yml

@@ -123,8 +123,9 @@ login:
     path: search.php
 
 download:
-  selector: a[href^="magnet:?"]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/pttime.yml

@@ -10,17 +10,24 @@ links:
 
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 402, cat: TV, desc: "TV Series/剧集"}
-    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
-    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 406, cat: Audio/Video, desc: "Games/游戏"}
-    - {id: 407, cat: TV/Sport, desc: "Music/音乐"}
-    - {id: 408, cat: Audio, desc: "Edu/教育"}
-    - {id: 409, cat: Other, desc: "Resource/资源"}
-    - {id: 410, cat: XXX, desc: "9kg/生理"}
-    - {id: 411, cat: Books, desc: "Other/其它"}
+    - {id: 401, cat: Movies, desc: "Movies(电影)"}
+    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
+    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
+    - {id: 406, cat: PC/Games, desc: "Games(游戏)"}
+    - {id: 408, cat: Audio, desc: "Music(音乐)"}
+    - {id: 411, cat: Other, desc: "Ability(技能)"}
+    - {id: 412, cat: Other, desc: "School(考试)"}
+    - {id: 413, cat: Books, desc: "Book(图书)"}
+    - {id: 420, cat: PC, desc: "IT(计算机)"}
+    - {id: 430, cat: TV/Anime, desc: "Animate(3D动画)"}
+    - {id: 431, cat: TV/Anime, desc: "ACGN(二次元)"}
+    - {id: 432, cat: TV/Other, desc: "Baby(婴幼)"}
+    - {id: 440, cat: XXX, desc: "AV(步兵)"}
+    - {id: 441, cat: XXX, desc: "Sex(骑兵)"}
+    - {id: 442, cat: XXX, desc: "III(三级、写真)"}
+    - {id: 450, cat: Other, desc: "Resource(资源)"}
+    - {id: 490, cat: Other, desc: "Other(其它)"}
 
   modes:
     search: [q]
@@ -98,8 +105,11 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: td.torrentimg > img
+      attribute: src
     imdb:
-      selector: div.imdb_100 > a
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     date:
       # time type: time elapsed (default)
@@ -130,17 +140,17 @@ search:
       selector: td:nth-child(9)
     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
+        font.promotion.free: 0
+        font.promotion.twoupfree: 0
+        font.promotion.halfdown: 0.5
+        font.promotion.twouphalfdown: 0.5
+        font.promotion.thirtypercent: 0.3
         "*": 1
     uploadvolumefactor:
       case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
+        font.promotion.twoup: 2
+        font.promotion.twoupfree: 2
+        font.promotion.twouphalfdown: 2
         "*": 1
     description:
       selector: td:nth-child(2)

src/Jackett.Common/Definitions/puurhollands.yml

@@ -55,8 +55,9 @@ download:
       action: add
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/rapidzona.yml

@@ -77,8 +77,9 @@ settings:
 
 
 download:
-  selector: a[href*="/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/resurrectthenet.yml

@@ -0,0 +1,178 @@
+---
+id: resurrectthenet
+name: Resurrect The Net
+description: "Resurrect The Net (RTN) is a Private site for TV / MOVIES / GENERAL"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - http://resurrectthe.net/
+
+caps:
+  categorymappings:
+    - {id: 7, cat: TV/Anime, desc: "Anime"}
+    - {id: 1, cat: PC, desc: "Appz/Misc"}
+    - {id: 2, cat: PC/ISO, desc: "Appz PC ISO"}
+    - {id: 3, cat: Movies, desc: "Boxset/Packs"}
+    - {id: 4, cat: Audio/Audiobook, desc: "Books/Audio Books"}
+    - {id: 23, cat: TV/HD, desc: "Episodes X264"}
+    - {id: 24, cat: TV/SD, desc: "Episodes XviD"}
+    - {id: 5, cat: PC/Games, desc: "Games PC ISO"}
+    - {id: 6, cat: PC/Games, desc: "Games PC Rips"}
+    - {id: 32, cat: Console, desc: "Games Console"}
+    - {id: 9, cat: PC/Mac, desc: "Mac"}
+    - {id: 10, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 11, cat: Movies/HD, desc: "Movies X264"}
+    - {id: 33, cat: Movies, desc: "Movies Classic"}
+    - {id: 12, cat: Movies/BluRay, desc: "Movies Blu-Ray"}
+    - {id: 13, cat: Movies/DVD, desc: "Movies DVDR"}
+    - {id: 14, cat: Movies/HD, desc: "MP4"}
+    - {id: 15, cat: Movies/SD, desc: "Movies XviD"}
+    - {id: 16, cat: Audio, desc: "Music"}
+    - {id: 17, cat: Audio/Video, desc: "Music Video"}
+    - {id: 19, cat: TV/Sport, desc: "Sport"}
+    - {id: 22, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+  - name: info
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: index.php?page=login
+  method: post
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: body[onLoad^="makeAlert('"]
+      message:
+        selector: body[onLoad^="makeAlert('"]
+        attribute: onLoad
+        filters:
+          - name: replace
+            args: ["makeAlert('Error' , '", ""]
+          - name: replace
+            args: ["');", ""]
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    search: "{{ .Keywords }}"
+    page: torrents
+    category: "{{ range .Categories }}{{.}};{{end}}"
+    # 0 filename, 1 file & descr, 2 descr, 3 uploaders, 5 gold, 6 silver, 7 bronze
+    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
+    # 0 all, 1 active, 2 dead
+    active: 0
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+    # while the site does have imdbid in some descriptions, we cannot support both searching with imdbid and freeleech at the same time.
+
+  rows:
+    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+    filters:
+      # searching freeleech and keywords returns unrelated hits
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="index.php?page=torrents&category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+    details:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "15:04:05 02/01/2006 -07:00"
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
+      filters:
+        - name: replace
+          args: ["---", "0"]
+    size:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      case:
+        img[src="images/gold.gif"]: 0
+        img[src="images/silver.gif"]: 0.5
+        img[src="images/bronze.gif"]: 0.75
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[alt="2x Upload Multiplier"]: 2
+        img[alt="3x Upload Multiplier"]: 3
+        img[alt="4x Upload Multiplier"]: 4
+        img[alt="5x Upload Multiplier"]: 5
+        img[alt="6x Upload Multiplier"]: 6
+        img[alt="7x Upload Multiplier"]: 7
+        img[alt="8x Upload Multiplier"]: 8
+        img[alt="9x Upload Multiplier"]: 9
+        img[alt="10x Upload Multiplier"]: 10
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# xbtitFM v1.17

src/Jackett.Common/Definitions/rgfootball.yml

@@ -0,0 +1,614 @@
+---
+id: rgfootball
+name: RGFootball
+description: "RGFootball is a Russian Sports torrent tracker."
+language: ru-ru
+type: semi-private
+encoding: UTF-8
+links:
+  - http://rgfootball.net/ # the site does not support https
+
+caps:
+  categorymappings:
+    # VIP-Архив / VIP-Archive
+    - {id: 224, cat: TV, desc: "VIP January 2021"}
+    - {id: 225, cat: TV, desc: "VIP February 2021"}
+    - {id: 402, cat: TV, desc: "VIP March 2021"}
+    - {id: 403, cat: TV, desc: "VIP April 2021"}
+    - {id: 408, cat: TV, desc: "VIP May 2021"}
+    - {id: 409, cat: TV, desc: "VIP June 2021"}
+    - {id: 436, cat: TV, desc: "VIP July 2021"}
+    - {id: 438, cat: TV, desc: "VIP August 2021"}
+    - {id: 448, cat: TV, desc: "VIP September 2021"}
+    - {id: 449, cat: TV, desc: "VIP October 2021"}
+    - {id: 450, cat: TV, desc: "VIP November 2021"}
+    - {id: 451, cat: TV, desc: "VIP December 2021"}
+    - {id: 235, cat: TV, desc: "VIP January 2020"}
+    - {id: 247, cat: TV, desc: "VIP February 2020"}
+    - {id: 250, cat: TV, desc: "VIP March 2020"}
+    - {id: 252, cat: TV, desc: "VIP April 2020"}
+    - {id: 273, cat: TV, desc: "VIP May 2020"}
+    - {id: 275, cat: TV, desc: "VIP June 2020"}
+    - {id: 375, cat: TV, desc: "VIP July 2020"}
+    - {id: 378, cat: TV, desc: "VIP August 2020"}
+    - {id: 382, cat: TV, desc: "VIP September 2020"}
+    - {id: 384, cat: TV, desc: "VIP October 2020"}
+    - {id: 385, cat: TV, desc: "VIP November 2020"}
+    - {id: 386, cat: TV, desc: "VIP December 2020"}
+    # Футбол / Football
+    - {id: 163, cat: TV, desc: "EURO 2020 / Чемпионат Европы 2020"}
+    - {id: 528, cat: TV, desc: " |- VIP-Extra 4K EURO 2020"}
+    - {id: 521, cat: TV, desc: " |- VIP-Extra SAT FEED EURO 2020"}
+    - {id: 216, cat: TV, desc: " |- VIP UEFA EURO 2020"}
+    - {id: 497, cat: TV, desc: " |- VIP-Light UEFA EURO 2020"}
+    - {id: 395, cat: TV, desc: " |- UEFA EURO 2020"}
+    - {id: 447, cat: TV, desc: " |- UEFA EURO 2020 qualifying"}
+    - {id: 426, cat: TV, desc: " |- VIP-Extra UEFA EURO 2020 qualifying"}
+    - {id: 580, cat: TV, desc: "FIFA WC 2022 / Чемпионат мира 2022"}
+    - {id: 234, cat: TV, desc: " |- VIP-Extra FIFA WC 2022"}
+    - {id: 583, cat: TV, desc: " |- VIP FIFA WC 2022"}
+    - {id: 525, cat: TV, desc: " |- VIP-Light FIFA WC 2022"}
+    - {id: 581, cat: TV, desc: " |- FIFA WC 2022"}
+    - {id: 582, cat: TV, desc: " |- FIFA WC 2022. Qualifiers"}
+    - {id: 432, cat: TV, desc: "FIFA WC 2018 / Чемпионат мира 2018"}
+    - {id: 535, cat: TV, desc: " |- VIP-Extra FIFA WC 2018 4K"}
+    - {id: 559, cat: TV, desc: " |- VIP-Extra FIFA WC 2018 Sat Feed"}
+    - {id: 574, cat: TV, desc: " |- VIP FIFA WC 2018"}
+    - {id: 185, cat: TV, desc: " |- FIFA WC 2018"}
+    - {id: 136, cat: TV, desc: " |- FIFA WC 2018. Qualifiers"}
+    - {id: 217, cat: TV, desc: " |- FIFA WC 2018. Reviews"}
+    - {id: 458, cat: TV, desc: " |- VIP-Extra Archive FIFA WC 2018 Qualifiers"}
+    - {id: 578, cat: TV, desc: "2021-22 UEFA Champions League"}
+    - {id: 13, cat: TV, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
+    - {id: 511, cat: TV, desc: " |- VIP-Extra UCL 2021-22"}
+    - {id: 425, cat: TV, desc: " |- VIP UCL 2021-22"}
+    - {id: 416, cat: TV, desc: " |- VIP-Light UCL 2021-22"}
+    - {id: 344, cat: TV, desc: " |- Play-off"}
+    - {id: 342, cat: TV, desc: " |- Group stage"}
+    - {id: 340, cat: TV, desc: " |- Qualifying Rounds"}
+    - {id: 339, cat: TV, desc: "2021-22 UEFA Europa League"}
+    - {id: 12, cat: TV, desc: " |- VIP-Extra UEL 2021-22"}
+    - {id: 512, cat: TV, desc: " |- VIP UEL 2021-22"}
+    - {id: 576, cat: TV, desc: " |- VIP-Light UEL 2021-22"}
+    - {id: 345, cat: TV, desc: " |- Play-off"}
+    - {id: 343, cat: TV, desc: " |- Group stage"}
+    - {id: 341, cat: TV, desc: " |- Qualifying Rounds"}
+    - {id: 315, cat: TV, desc: "2021–22 UEFA Europa Conference League"}
+    - {id: 419, cat: TV, desc: " |- VIP-Extra UEFA ECL"}
+    - {id: 442, cat: TV, desc: " |- VIP 2021–22 UEFA Europa Conference League"}
+    - {id: 517, cat: TV, desc: " |- VIP-Light 2021–22 UEFA Europa Conference League"}
+    - {id: 132, cat: TV, desc: " |- 2021–22 UEFA Europa Conference League"}
+    - {id: 160, cat: TV, desc: "2020-21 UEFA Europa League"}
+    - {id: 347, cat: TV, desc: " |- VIP-Extra UEL 2020-21"}
+    - {id: 570, cat: TV, desc: " |- VIP-Light UEL 2020-21"}
+    - {id: 161, cat: TV, desc: " |- Qualifying Rounds"}
+    - {id: 162, cat: TV, desc: " |- Group stage"}
+    - {id: 231, cat: TV, desc: " |- Play-off"}
+    - {id: 452, cat: TV, desc: "2020-21 UEFA Champions League"}
+    - {id: 558, cat: TV, desc: " |- VIP-Extra 4k + Sat Feed UCL"}
+    - {id: 346, cat: TV, desc: " |- VIP-Extra UCL 2020-21"}
+    - {id: 415, cat: TV, desc: " |- VIP UCL 2020-21"}
+    - {id: 569, cat: TV, desc: " |- VIP-Light UCL 2020-21"}
+    - {id: 158, cat: TV, desc: " |- Qualifying Rounds"}
+    - {id: 159, cat: TV, desc: " |- Group stage"}
+    - {id: 232, cat: TV, desc: " |- Play-off"}
+    - {id: 3, cat: TV, desc: "Англия/England"}
+    - {id: 407, cat: TV, desc: " |- VIP-Extra 4k England"}
+    - {id: 561, cat: TV, desc: " |- VIP-Extra EPL Classic"}
+    - {id: 223, cat: TV, desc: " |- VIP England"}
+    - {id: 553, cat: TV, desc: " |- VIP-Light England"}
+    - {id: 54, cat: TV, desc: " |- Premier League 2020/21"}
+    - {id: 418, cat: TV, desc: " |- Championship+ 2020/21"}
+    - {id: 412, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 538, cat: TV, desc: " |- Premier League 2019/20"}
+    - {id: 351, cat: TV, desc: " |- Championship+"}
+    - {id: 53, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 55, cat: TV, desc: " |- Previous years matches"}
+    - {id: 2, cat: TV, desc: "Россия/СССР - Russia/USSR"}
+    - {id: 562, cat: TV, desc: " |- VIP-Light Russia"}
+    - {id: 57, cat: TV, desc: " |- RPL 2020/21"}
+    - {id: 423, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 496, cat: TV, desc: " |- FNL 2020/21"}
+    - {id: 56, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 251, cat: TV, desc: " |- RPL 2019/20"}
+    - {id: 46, cat: TV, desc: " |- Previous years matches"}
+    - {id: 8, cat: TV, desc: "Украина/Ukraine"}
+    - {id: 563, cat: TV, desc: " |- VIP-Light Ukraine"}
+    - {id: 72, cat: TV, desc: " |- UPL 2020/21"}
+    - {id: 152, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 410, cat: TV, desc: " |- UPL 2019/20"}
+    - {id: 71, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 348, cat: TV, desc: " |- Lower leagues"}
+    - {id: 70, cat: TV, desc: " |- Previous years matches"}
+    - {id: 4, cat: TV, desc: "Испания/Spain"}
+    - {id: 516, cat: TV, desc: " |- VIP-Extra 4k + Sat Feed"}
+    - {id: 189, cat: TV, desc: " |- VIP-Extra Barca 2020-21"}
+    - {id: 429, cat: TV, desc: " |- VIP-Extra Real Madrid 2020-21"}
+    - {id: 173, cat: TV, desc: " |- VIP-Extra Spain Classic"}
+    - {id: 506, cat: TV, desc: " |- VIP-Extra El Clasico"}
+    - {id: 208, cat: TV, desc: " |- VIP Spain"}
+    - {id: 564, cat: TV, desc: " |- VIP-Light Spain"}
+    - {id: 58, cat: TV, desc: " |- Primera Division 2020/21"}
+    - {id: 424, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 194, cat: TV, desc: " |- Primera Division 2019/20"}
+    - {id: 353, cat: TV, desc: " |- Segunda, Segunda B"}
+    - {id: 59, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 60, cat: TV, desc: " |- Previous years matches"}
+    - {id: 6, cat: TV, desc: "Германия/Germany"}
+    - {id: 555, cat: TV, desc: " |- VIP-Extra 4k+ Germany"}
+    - {id: 210, cat: TV, desc: " |- VIP Germany"}
+    - {id: 565, cat: TV, desc: " |- VIP-Light Germany"}
+    - {id: 66, cat: TV, desc: " |- Bundesliga 2020/21"}
+    - {id: 352, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 175, cat: TV, desc: " |- Bundesliga 2019/20"}
+    - {id: 355, cat: TV, desc: " |- 2. Bundesliga"}
+    - {id: 65, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 427, cat: TV, desc: " |- Lower leagues"}
+    - {id: 64, cat: TV, desc: " |- Previous years matches"}
+    - {id: 5, cat: TV, desc: "Италия/Italy"}
+    - {id: 529, cat: TV, desc: " |- VIP-Extra Italy"}
+    - {id: 209, cat: TV, desc: " |- VIP Italy"}
+    - {id: 566, cat: TV, desc: " |- VIP-Light Italy"}
+    - {id: 63, cat: TV, desc: " |- Serie A 2020/21"}
+    - {id: 196, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 354, cat: TV, desc: " |- Serie B, Lega Pro, Serie D"}
+    - {id: 174, cat: TV, desc: " |- Serie A 2019/20"}
+    - {id: 62, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 540, cat: TV, desc: " |- 1996-97 Juventus Classic"}
+    - {id: 61, cat: TV, desc: " |- Previous years matches"}
+    - {id: 7, cat: TV, desc: "Франция/France"}
+    - {id: 184, cat: TV, desc: " |- VIP-Extra 4k + Sat Feed"}
+    - {id: 515, cat: TV, desc: " |- VIP-Extra Ligue 2"}
+    - {id: 211, cat: TV, desc: " |- VIP France"}
+    - {id: 567, cat: TV, desc: " |- VIP-Light France"}
+    - {id: 69, cat: TV, desc: " |- Ligue 1 2020/21"}
+    - {id: 133, cat: TV, desc: " |- National Cups 2020/21"}
+    - {id: 428, cat: TV, desc: " |- Ligue 2"}
+    - {id: 176, cat: TV, desc: " |- Ligue 1 2019/20"}
+    - {id: 68, cat: TV, desc: " |- National Cups up to 2020"}
+    - {id: 67, cat: TV, desc: " |- Previous years matches"}
+    - {id: 188, cat: TV, desc: "Нидерланды/Netherlands"}
+    - {id: 568, cat: TV, desc: " |- VIP-Light Netherlands"}
+    - {id: 356, cat: TV, desc: " |- Season 2020/21"}
+    - {id: 190, cat: TV, desc: " |- National Cups"}
+    - {id: 191, cat: TV, desc: " |- Previous years matches"}
+    - {id: 9, cat: TV, desc: "Другие национальные чемпионаты..."}
+    - {id: 214, cat: TV, desc: " |- VIP-Extra Others"}
+    - {id: 549, cat: TV, desc: " |- VIP Others"}
+    - {id: 537, cat: TV, desc: " |- VIP-Light All Champs"}
+    - {id: 573, cat: TV, desc: " |- VIP-Extra Argentina"}
+    - {id: 531, cat: TV, desc: " |- VIP-Extra Portugal"}
+    - {id: 546, cat: TV, desc: " |- VIP-Extra Colombia"}
+    - {id: 240, cat: TV, desc: " |- VIP-Extra Belgium"}
+    - {id: 551, cat: TV, desc: " |- VIP-Extra Japan"}
+    - {id: 394, cat: TV, desc: " |- VIP-Extra Brazil"}
+    - {id: 441, cat: TV, desc: " |- Португалия/Portugal"}
+    - {id: 87, cat: TV, desc: " |- Европа/Europe"}
+    - {id: 91, cat: TV, desc: " |- Южная Америка/South America"}
+    - {id: 90, cat: TV, desc: " |- Северная Америка/North America"}
+    - {id: 89, cat: TV, desc: " |- Африка/Africa"}
+    - {id: 88, cat: TV, desc: " |- Азия/Asia"}
+    - {id: 179, cat: TV, desc: " |- Previous years matches"}
+    - {id: 11, cat: TV, desc: "Еврокубки/European Cups"}
+    - {id: 523, cat: TV, desc: " |- VIP-Ultra Archive UEFA"}
+    - {id: 376, cat: TV, desc: " |- VIP-Extra UEFA Classic"}
+    - {id: 212, cat: TV, desc: " |- VIP UEFA"}
+    - {id: 421, cat: TV, desc: " |- VIP-Light UEFA"}
+    - {id: 383, cat: TV, desc: " |- 2020-21 UEFA Youth League"}
+    - {id: 377, cat: TV, desc: " |- UEFA Super Cup"}
+    - {id: 74, cat: TV, desc: " |- UEFA Champions League"}
+    - {id: 75, cat: TV, desc: " |- UEFA Europa League"}
+    - {id: 434, cat: TV, desc: " |- UEFA Youth League"}
+    - {id: 76, cat: TV, desc: " |- UEFA European Cup"}
+    - {id: 78, cat: TV, desc: " |- UEFA Cup"}
+    - {id: 79, cat: TV, desc: " |- Cup Winners Cup"}
+    - {id: 80, cat: TV, desc: " |- Other Compeitions"}
+    - {id: 405, cat: TV, desc: " |- VIP-Extra UCL 2018-19"}
+    - {id: 536, cat: TV, desc: " |- VIP-Extra UEL 2018-19"}
+    - {id: 249, cat: TV, desc: " |- VIP-Extra UCL 2017-18"}
+    - {id: 527, cat: TV, desc: " |- VIP-Extra UEL 2017-18"}
+    - {id: 202, cat: TV, desc: " |- VIP-Extra UCL 2016-17"}
+    - {id: 431, cat: TV, desc: " |- VIP-Extra UEL 2016-17"}
+    - {id: 440, cat: TV, desc: " |- VIP-Extra UСL 2015-16"}
+    - {id: 381, cat: TV, desc: " |- VIP-Extra UEL 2015-16"}
+    - {id: 557, cat: TV, desc: " |- VIP-Extra UCL 2014-15"}
+    - {id: 556, cat: TV, desc: " |- VIP-Extra UEL 2014-15"}
+    - {id: 514, cat: TV, desc: " |- VIP-Extra UСL 2013-14"}
+    - {id: 513, cat: TV, desc: " |- VIP-Extra UEL 2013-14"}
+    - {id: 328, cat: TV, desc: "Лига наций УЕФА / UEFA Nations League"}
+    - {id: 530, cat: TV, desc: " |- VIP-Extra UEFA Nations League"}
+    - {id: 201, cat: TV, desc: " |- VIP UEFA Nations League"}
+    - {id: 572, cat: TV, desc: " |- VIP-Light UEFA Nations League"}
+    - {id: 193, cat: TV, desc: " |- League A"}
+    - {id: 544, cat: TV, desc: " |- League B"}
+    - {id: 543, cat: TV, desc: " |- League C"}
+    - {id: 542, cat: TV, desc: " |- League D"}
+    - {id: 117, cat: TV, desc: " |- Play-off"}
+    - {id: 15, cat: TV, desc: "Чемпионаты Мира/FIFA World Cups"}
+    - {id: 461, cat: TV, desc: " |- VIP-Extra FIFA WC Classic"}
+    - {id: 510, cat: TV, desc: " |- VIP 2019 FIFA U-17 World Cup"}
+    - {id: 443, cat: TV, desc: " |- VIP-Extra 2019 FIFA U-20 World Cup"}
+    - {id: 411, cat: TV, desc: " |- 2019 FIFA U-20 World Cup"}
+    - {id: 454, cat: TV, desc: " |- 2019 FIFA U-17 World Cup"}
+    - {id: 456, cat: TV, desc: " |- FIFA WC 2014. Финальный турнир"}
+    - {id: 168, cat: TV, desc: " |- FIFA WC 2014. Отборочный турнир"}
+    - {id: 495, cat: TV, desc: " |- FIFA WC 2014. Обзорные передачи"}
+    - {id: 178, cat: TV, desc: " |- FIFA WC U-20"}
+    - {id: 153, cat: TV, desc: " |- FIFA WC U-17"}
+    - {id: 218, cat: TV, desc: " |- VIP-Extra FIFA WC Old"}
+    - {id: 14, cat: TV, desc: "Чемпионаты Европы/UEFA European..."}
+    - {id: 242, cat: TV, desc: " |- VIP-Extra EURO Classic"}
+    - {id: 380, cat: TV, desc: " |- VIP-Extra EURO 2016"}
+    - {id: 198, cat: TV, desc: " |- VIP UEFA Euro 2019. U-21"}
+    - {id: 195, cat: TV, desc: " |- UEFA Euro 2019. U-21"}
+    - {id: 552, cat: TV, desc: " |- EURO 2016. Финальный турнир"}
+    - {id: 494, cat: TV, desc: " |- EURO 2016. Отборочный турнир"}
+    - {id: 350, cat: TV, desc: " |- EURO 2012. Финальный турнир"}
+    - {id: 118, cat: TV, desc: " |- EURO 2012. Отборочный турнир"}
+    - {id: 200, cat: TV, desc: " |- EURO U-21"}
+    - {id: 337, cat: TV, desc: " |- EURO U-19"}
+    - {id: 255, cat: TV, desc: " |- EURO U-17"}
+    - {id: 414, cat: TV, desc: "Международные клубные турниры/I..."}
+    - {id: 533, cat: TV, desc: " |- VIP-Extra Clubs International"}
+    - {id: 243, cat: TV, desc: " |- VIP Clubs International"}
+    - {id: 539, cat: TV, desc: " |- VIP-Light Clubs International"}
+    - {id: 401, cat: TV, desc: " |- VIP-Extra Copa Libertadores"}
+    - {id: 526, cat: TV, desc: " |- VIP-Extra Copa Sudamericana"}
+    - {id: 550, cat: TV, desc: " |- VIP-Extra AFC Competitions"}
+    - {id: 399, cat: TV, desc: " |- VIP-Extra CAF Competitions"}
+    - {id: 524, cat: TV, desc: " |- VIP-Extra CONCACAF Competitions"}
+    - {id: 463, cat: TV, desc: " |- 2021 Copa Libertadores"}
+    - {id: 433, cat: TV, desc: " |- 2021 Copa Sudamericana"}
+    - {id: 457, cat: TV, desc: " |- FIFA Club World Cups"}
+    - {id: 472, cat: TV, desc: " |- CONCACAF Champions League"}
+    - {id: 241, cat: TV, desc: " |- Copa Libertadores"}
+    - {id: 367, cat: TV, desc: " |- Copa Sudamericana"}
+    - {id: 390, cat: TV, desc: " |- AFC Club Competitions"}
+    - {id: 10, cat: TV, desc: "Международные турниры/National Team..."}
+    - {id: 230, cat: TV, desc: " |- VIP-Extra Copa America 2021"}
+    - {id: 508, cat: TV, desc: " |- VIP 2021 Copa America"}
+    - {id: 575, cat: TV, desc: " |- VIP-Light Copa America 2021"}
+    - {id: 422, cat: TV, desc: " |- 2021 Copa America"}
+    - {id: 466, cat: TV, desc: " |- VIP-Extra International"}
+    - {id: 213, cat: TV, desc: " |- VIP International"}
+    - {id: 532, cat: TV, desc: " |- 2020 CONMEBOL Pre-Olympic"}
+    - {id: 507, cat: TV, desc: " |- 2019 AFC Asian Cup"}
+    - {id: 155, cat: TV, desc: " |- Copa America"}
+    - {id: 435, cat: TV, desc: " |- CONCACAF Gold Cups"}
+    - {id: 406, cat: TV, desc: " |- FIFA Confederations Cups"}
+    - {id: 239, cat: TV, desc: " |- Africa Cup of Nations"}
+    - {id: 393, cat: TV, desc: " |- Sudamericano U-20"}
+    - {id: 534, cat: TV, desc: " |- VIP-Extra 2019 CONCACAF Gold Cup"}
+    - {id: 560, cat: TV, desc: " |- VIP-Extra 2019 Sudamericano U-20 + U-17"}
+    - {id: 462, cat: TV, desc: " |- VIP-Extra 2020 Africa Cup of Nations"}
+    - {id: 233, cat: TV, desc: " |- VIP-Extra 2020 AFC U-23"}
+    - {id: 16, cat: TV, desc: "Товарищеские турниры и матчи/Frie..."}
+    - {id: 387, cat: TV, desc: " |- VIP-Extra Friendlies"}
+    - {id: 219, cat: TV, desc: " |- VIP  Friendlies"}
+    - {id: 571, cat: TV, desc: " |- VIP-Light Friendlies"}
+    - {id: 554, cat: TV, desc: " |- 2019 International Champions Cup"}
+    - {id: 18, cat: TV, desc: "Мини-футбол/Футзал"}
+    - {id: 19, cat: TV, desc: "Пляжный футбол"}
+    - {id: 499, cat: TV, desc: "Женский футбол"}
+    - {id: 92, cat: TV, desc: " |- Лига Чемпионов"}
+    - {id: 17, cat: TV, desc: "Обзорные и аналитические..."}
+    - {id: 37, cat: TV, desc: "Футбольное видео, прочее о..."}
+    - {id: 199, cat: TV, desc: " |- Видео для мобильных устройств"}
+    - {id: 86, cat: TV, desc: " |- Футбольная графика"}
+    - {id: 43, cat: Other, desc: "Аудиопередачи /Футбольное..."}
+    # Спорт / Sport
+    - {id: 23, cat: TV, desc: "Авто/мотоспорт"}
+    - {id: 492, cat: TV, desc: " |- Formula 1. Season 2021"}
+    - {id: 131, cat: TV, desc: " |- Formula 1. Season 2020"}
+    - {id: 400, cat: TV, desc: " |- Formula 1. Seasons until 2020"}
+    - {id: 21, cat: TV, desc: "Хоккей"}
+    - {id: 420, cat: TV, desc: " |- ЧМ 2021 /  IIHF WС 2021"}
+    - {id: 501, cat: TV, desc: " |- ЧМ 2021 U-20 / IIHF WС 2021 U-20"}
+    - {id: 391, cat: TV, desc: " |- NHL 2020/21"}
+    - {id: 207, cat: TV, desc: " |- КХЛ 2020/21"}
+    - {id: 445, cat: TV, desc: " |- NHL 2019/20"}
+    - {id: 444, cat: TV, desc: " |- КХЛ 2019/20"}
+    - {id: 151, cat: TV, desc: " |- NHL до 2020"}
+    - {id: 47, cat: TV, desc: " |- КХЛ до 2020"}
+    - {id: 460, cat: TV, desc: " |- World Championships until 2021"}
+    - {id: 206, cat: TV, desc: " |- European club championships"}
+    - {id: 222, cat: TV, desc: " |- Euro Hockey Tour"}
+    - {id: 49, cat: TV, desc: " |- International tournaments"}
+    - {id: 468, cat: TV, desc: " |- СССР - Канада"}
+    - {id: 20, cat: TV, desc: "Баскетбол"}
+    - {id: 50, cat: TV, desc: " |- NBA 2020/21"}
+    - {id: 453, cat: TV, desc: " |- NCAA"}
+    - {id: 204, cat: TV, desc: " |- WNBA"}
+    - {id: 150, cat: TV, desc: " |- NBA до 2020"}
+    - {id: 51, cat: TV, desc: " |- European club basketball"}
+    - {id: 197, cat: TV, desc: " |- World Championships. Men"}
+    - {id: 379, cat: TV, desc: " |- World Championships. Women"}
+    - {id: 446, cat: TV, desc: " |- European Championships"}
+    - {id: 171, cat: TV, desc: " |- International tournaments"}
+    - {id: 203, cat: TV, desc: " |- Women's basketball"}
+    - {id: 22, cat: TV, desc: "Теннис"}
+    - {id: 227, cat: TV, desc: " |- Australian Open 2021"}
+    - {id: 248, cat: TV, desc: " |- Roland Garros 2021"}
+    - {id: 388, cat: TV, desc: " |- Wimbledon 2021"}
+    - {id: 459, cat: TV, desc: " |- US Open 2021"}
+    - {id: 505, cat: TV, desc: " |- ATP 1000 WT Masters 2021"}
+    - {id: 502, cat: TV, desc: " |- ATP 250/500 World Tour 2021"}
+    - {id: 504, cat: TV, desc: " |- WTA Tour 2021"}
+    - {id: 503, cat: TV, desc: " |- Team Season 2021"}
+    - {id: 128, cat: TV, desc: " |- Grand Slam Tournaments up to 2020"}
+    - {id: 127, cat: TV, desc: " |- ATP WT Masters 1000 up to 2020"}
+    - {id: 125, cat: TV, desc: " |- ATP World Tour up to 2020"}
+    - {id: 126, cat: TV, desc: " |- WTA Tour up to 2020"}
+    - {id: 130, cat: TV, desc: " |- Team Season up to 2020"}
+    - {id: 129, cat: TV, desc: " |- Matches of previous years"}
+    - {id: 274, cat: TV, desc: " |- VIP-Extra Tennis"}
+    - {id: 44, cat: TV, desc: "Биатлон"}
+    - {id: 498, cat: TV, desc: " |- Season 2021"}
+    - {id: 455, cat: TV, desc: " |- Seasons until 2020"}
+    - {id: 82, cat: TV, desc: "Гандбол"}
+    - {id: 548, cat: TV, desc: " |- VIP-Extra Handball"}
+    - {id: 205, cat: TV, desc: " |- VIP Handball"}
+    - {id: 469, cat: TV, desc: " |- WC's and EURO's. Men"}
+    - {id: 547, cat: TV, desc: " |- WC's and EURO's. Women"}
+    - {id: 397, cat: TV, desc: " |- European club handball"}
+    - {id: 398, cat: TV, desc: " |- International tournaments"}
+    - {id: 38, cat: TV, desc: "Волейбол"}
+    - {id: 261, cat: TV, desc: " |- Лига наций"}
+    - {id: 262, cat: TV, desc: " |- Клубный волейбол"}
+    - {id: 170, cat: TV, desc: " |- Международные турниры"}
+    - {id: 169, cat: TV, desc: " |- Пляжный волейбол"}
+    - {id: 25, cat: TV, desc: "Боевые единоборства"}
+    - {id: 98, cat: TV, desc: " |- Бокс"}
+    - {id: 101, cat: TV, desc: " |- Рестлинг"}
+    - {id: 100, cat: TV, desc: " |- Mixed Martial Arts"}
+    - {id: 99, cat: TV, desc: " |- Ultimate Fighting Championship"}
+    - {id: 97, cat: TV, desc: " |- Боевые искусства"}
+    - {id: 137, cat: TV, desc: "Легкая атлетика"}
+    - {id: 139, cat: TV, desc: "Тяжелая атлетика"}
+    - {id: 122, cat: TV, desc: "Бильярд"}
+    - {id: 123, cat: TV, desc: " |- Снукер"}
+    - {id: 106, cat: TV, desc: "Покер"}
+    - {id: 140, cat: TV, desc: "Велоспорт"}
+    - {id: 141, cat: TV, desc: "Гимнастика"}
+    - {id: 24, cat: TV, desc: "Зимние виды спорта"}
+    - {id: 142, cat: TV, desc: " |- Фигурное катание"}
+    - {id: 105, cat: TV, desc: " |- Лыжи"}
+    - {id: 104, cat: TV, desc: " |- Горные лыжи"}
+    - {id: 149, cat: TV, desc: " |- Фристайл"}
+    - {id: 103, cat: TV, desc: " |- Прыжки с трамплина"}
+    - {id: 148, cat: TV, desc: " |- Кёрлинг"}
+    - {id: 96, cat: TV, desc: " |- Всемирные зимние Универсиады"}
+    - {id: 192, cat: TV, desc: "Летние виды спорта"}
+    - {id: 143, cat: TV, desc: " |- Бадминтон"}
+    - {id: 144, cat: TV, desc: " |- Настольный теннис"}
+    - {id: 147, cat: TV, desc: " |- Гольф"}
+    - {id: 439, cat: TV, desc: " |- Всемирные летние Универсиады"}
+    - {id: 138, cat: TV, desc: "Водные виды спорта"}
+    - {id: 121, cat: TV, desc: "Бейсбол"}
+    - {id: 145, cat: TV, desc: "Американский футбол"}
+    - {id: 541, cat: TV, desc: " |- VIP-Extra American football"}
+    - {id: 26, cat: TV, desc: "Другие виды спорта"}
+    - {id: 146, cat: TV, desc: " |- Регби"}
+    - {id: 95, cat: TV, desc: "Информационно-аналитические..."}
+    - {id: 180, cat: TV, desc: "Разное о спорте"}
+    - {id: 182, cat: Books, desc: " |- Спортивная литература"}
+    - {id: 181, cat: TV, desc: " |- Спортивное видео"}
+    - {id: 183, cat: TV, desc: " |- Обучающее видео"}
+    # Летняя Олимпиада 2016 / Summer Olympic Games 2016
+    - {id: 276, cat: TV, desc: "Футбол"}
+    - {id: 277, cat: TV, desc: " |- VIP-Extra Football"}
+    - {id: 359, cat: TV, desc: " |- Мужчины"}
+    - {id: 360, cat: TV, desc: " |- Женщины"}
+    - {id: 301, cat: TV, desc: "Баскетбол"}
+    - {id: 522, cat: TV, desc: " |- VIP-Extra Basketball"}
+    - {id: 362, cat: TV, desc: " |- Мужчины"}
+    - {id: 361, cat: TV, desc: " |- Женщины"}
+    - {id: 303, cat: TV, desc: "Бокс"}
+    - {id: 518, cat: TV, desc: " |- VIP-Extra Boxing"}
+    - {id: 325, cat: TV, desc: "Теннис"}
+    - {id: 520, cat: TV, desc: " |- VIP-Extra Tennis"}
+    - {id: 326, cat: TV, desc: " |- Настольный теннис"}
+    - {id: 316, cat: TV, desc: "Лёгкая атлетика"}
+    - {id: 318, cat: TV, desc: "Тяжёлая атлетика"}
+    - {id: 278, cat: TV, desc: "Водные виды спорта и гребля"}
+    - {id: 280, cat: TV, desc: " |- Плавание"}
+    - {id: 281, cat: TV, desc: " |- Прыжки в воду"}
+    - {id: 282, cat: TV, desc: " |- Синхронное плавание"}
+    - {id: 279, cat: TV, desc: " |- Водное поло"}
+    - {id: 284, cat: TV, desc: " |- Академическая гребля"}
+    - {id: 285, cat: TV, desc: " |- Гребля на байдарках и каноэ"}
+    - {id: 286, cat: TV, desc: " |- Гребной слалом"}
+    - {id: 287, cat: TV, desc: "Борьба и единоборства"}
+    - {id: 288, cat: TV, desc: " |- Вольная"}
+    - {id: 289, cat: TV, desc: " |- Греко-римская"}
+    - {id: 291, cat: TV, desc: " |- Тхэквондо"}
+    - {id: 290, cat: TV, desc: " |- Дзюдо"}
+    - {id: 294, cat: TV, desc: "Велоспорт"}
+    - {id: 519, cat: TV, desc: " |- VIP-Extra Cycling"}
+    - {id: 296, cat: TV, desc: " |- Трековые гонки"}
+    - {id: 297, cat: TV, desc: " |- Шоссейные гонки"}
+    - {id: 298, cat: TV, desc: " |- Маунтинбайк"}
+    - {id: 299, cat: TV, desc: " |- BMX"}
+    - {id: 305, cat: TV, desc: "Волейбол"}
+    - {id: 368, cat: TV, desc: " |- VIP-Extra Volleyball"}
+    - {id: 364, cat: TV, desc: " |- Мужчины"}
+    - {id: 363, cat: TV, desc: " |- Женщины"}
+    - {id: 306, cat: TV, desc: " |- Пляжный волейбол"}
+    - {id: 308, cat: TV, desc: "Гандбол"}
+    - {id: 245, cat: TV, desc: " |- VIP-Extra Handball"}
+    - {id: 366, cat: TV, desc: " |- Мужчины"}
+    - {id: 365, cat: TV, desc: " |- Женщины"}
+    - {id: 310, cat: TV, desc: "Гимнастика"}
+    - {id: 312, cat: TV, desc: " |- Художественная гимнастика"}
+    - {id: 311, cat: TV, desc: " |- Спортивная гимнастика"}
+    - {id: 313, cat: TV, desc: " |- Прыжки на батуте"}
+    - {id: 322, cat: TV, desc: "Стрельба"}
+    - {id: 254, cat: TV, desc: " |- VIP-Extra Стрельба / Стрельба из..."}
+    - {id: 333, cat: TV, desc: "Другие виды спорта"}
+    - {id: 371, cat: TV, desc: " |- VIP-Extra Hockey+"}
+    - {id: 358, cat: TV, desc: " |- Бадминтон"}
+    - {id: 319, cat: TV, desc: " |- Современное пятиборье"}
+    - {id: 320, cat: TV, desc: " |- Триатлон"}
+    - {id: 283, cat: TV, desc: " |- Парусный спорт"}
+    - {id: 336, cat: TV, desc: " |- Фехтование"}
+    - {id: 335, cat: TV, desc: " |- Хоккей на траве"}
+    - {id: 349, cat: TV, desc: "Обзорные передачи"}
+    # Олимпийские игры / Olympic Games
+    - {id: 465, cat: TV, desc: "Зимние Олимпийские игры 2018 / 2018..."}
+    - {id: 473, cat: TV, desc: " |- Церемонии"}
+    - {id: 483, cat: TV, desc: " |- Биатлон"}
+    - {id: 485, cat: TV, desc: " |- Фигурное катание"}
+    - {id: 467, cat: TV, desc: " |- Лыжный спорт"}
+    - {id: 474, cat: TV, desc: " |- Хоккей"}
+    - {id: 475, cat: TV, desc: " |- Конькобежный спорт"}
+    - {id: 484, cat: TV, desc: " |- Бобслей/Санный спорт/Скелетон"}
+    - {id: 481, cat: TV, desc: " |- Сноуборд/Фристайл/Шорт-трек/Кё..."}
+    - {id: 482, cat: TV, desc: " |- Обзорные и тематические..."}
+    - {id: 476, cat: TV, desc: " |- Архив"}
+    - {id: 464, cat: TV, desc: "Летние Олимпийские игры / Summer..."}
+    - {id: 486, cat: TV, desc: " |- Церемонии"}
+    - {id: 487, cat: TV, desc: " |- Футбол"}
+    - {id: 489, cat: TV, desc: " |- Баскетбол"}
+    - {id: 491, cat: TV, desc: " |- Волейбол"}
+    - {id: 500, cat: TV, desc: " |- Гандбол"}
+    - {id: 488, cat: TV, desc: " |- Теннис"}
+    - {id: 490, cat: TV, desc: " |- Бокс"}
+    - {id: 331, cat: TV, desc: " |- Лёгкая атлетика"}
+    - {id: 330, cat: TV, desc: " |- Тяжёлая атлетика"}
+    - {id: 329, cat: TV, desc: " |- Водные виды спорта и гребля"}
+    - {id: 323, cat: TV, desc: " |- Велоспорт"}
+    - {id: 324, cat: TV, desc: " |- Гимнастика"}
+    - {id: 327, cat: TV, desc: " |- Борьба и единоборства"}
+    - {id: 292, cat: TV, desc: " |- Другие виды спорта"}
+    - {id: 304, cat: TV, desc: " |- Обзорные и тематические..."}
+    # Разное / Other
+    - {id: 229, cat: TV, desc: "Тестовый форум"}
+    # Администраторский / Administrative
+    - {id: 48, cat: TV, desc: "2021-22 UEFA Champions League"}
+    - {id: 417, cat: TV, desc: "2021-22 UEFA Europa League"}
+    # Приватные разделы / Private sections
+    - {id: 369, cat: TV, desc: "VIP-Extra Sat Feed France"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: ignorevip
+    type: checkbox
+    label: Ignore VIP torrents
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 1
+    options:
+      1: created
+      10: seeders
+      7: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action$="/login.php"]
+  inputs:
+    login_username: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    autologin: 1
+  selectorinputs:
+    cookie_test:
+      selector: input[name="cookie_test"]
+      attribute: value
+  error:
+    - selector: h4.warnColor1
+  test:
+    path: index.php
+    selector: a[href="./login.php?logout=1"]
+
+search:
+  paths:
+    - path: tracker.php
+  inputs:
+    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
+    prev_allw: 1
+    prev_a: 0
+    prev_not_checked: 0
+    prev_closed: 0
+    prev_d: 0
+    prev_not_perfect: 0
+    prev_part_perfect: 0
+    prev_fishily: 0
+    prev_copy: 0
+    prev_dla: 0
+    prev_dlc: 0
+    prev_dld: 0
+    prev_dlw: 0
+    prev_my: 0
+    prev_new: 0
+    prev_sd: 0
+    prev_da: 1
+    prev_dc: 0
+    prev_df: 1
+    prev_ds: 0
+    # sort by 1=registered 4=completed 10=seed 11=leech 7=size 8=lastPost
+    o: "{{ .Config.sort }}"
+    # 1=asc 2=desc
+    s: "{{ .Config.type }}"
+    # -1=all time
+    tm: -1
+    nm: "{{ .Keywords }}"
+    # find a username
+    pn: ""
+
+  rows:
+    selector: "tr[id^=\"tor_\"]:has(a[href^=\"./download.php?id=\"]){{ if .Config.ignorevip }}:not(:has(a.gen:contains(\"VIP\"))){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a.gen
+      attribute: href
+      filters:
+        - name: querystring
+          args: f
+    title:
+      selector: a.tLink
+    details:
+      selector: a.tLink
+      attribute: href
+    description:
+      selector: a.gen
+    download:
+      selector: a[href^="./download.php?id="]
+      attribute: href
+    size:
+      selector: td:nth-child(6) > u
+    seeders:
+      selector: td.seedmed > b
+    leechers:
+      selector: td.leechmed > b
+    grabs:
+      selector: td:nth-child(9)
+    date:
+      # unix
+      selector: td:last-child > u
+    downloadvolumefactor:
+      case:
+        img[src="images/tor_gold.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+# TorrentPier

src/Jackett.Common/Definitions/rintornet.yml

@@ -37,8 +37,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/rofd.yml

@@ -100,8 +100,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/rptorrents.yml

@@ -11,18 +11,22 @@ links:
 caps:
   categorymappings:
     - {id: 1, cat: PC/Games, desc: "Games PC"}
+    - {id: 35, cat: PC/Games, desc: "Games Pack"}
     - {id: 2, cat: PC/0day, desc: "Apps Windows"}
     - {id: 3, cat: PC/Mac, desc: "Apps  Mac"}
     - {id: 4, cat: PC, desc: "Apps Linux"}
     - {id: 34, cat: PC/Mobile-Other, desc: "Apps Mobile"}
     - {id: 6, cat: TV/Anime, desc: "Movie Cartoons"}
+    - {id: 37, cat: Movies/SD, desc: "Movies SD"}
     - {id: 7, cat: Movies/WEB-DL, desc: "Movies WEB-DL"}
     - {id: 32, cat: Movies/UHD, desc: "Movies 4k"}
     - {id: 9, cat: Movies/HD, desc: "Movies HD"}
     - {id: 10, cat: Movies/3D, desc: "Movies 3D"}
     - {id: 11, cat: Movies, desc: "Movies Pack"}
     - {id: 12, cat: Movies/BluRay, desc: "Movies Bluray"}
-    - {id: 33, cat: Movies/HD, desc: "Movies  Full-HD"}
+    - {id: 33, cat: Movies/HD, desc: "Movies Full-HD"}
+    - {id: 40, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 41, cat: Movies/SD, desc: "Movies Xvid"}
     - {id: 14, cat: TV/HD, desc: "TV HD"}
     - {id: 15, cat: TV/WEB-DL, desc: "TV WEB-DL"}
     - {id: 16, cat: TV/SD, desc: "TV SD"}
@@ -32,9 +36,7 @@ caps:
     - {id: 20, cat: Audio/Lossless, desc: "Music Flac"}
     - {id: 23, cat: Audio, desc: "Music Pack"}
     - {id: 22, cat: Audio/Video, desc: "Music Video"}
-    - {id: 35, cat: PC/Games, desc: "Games Pack"}
     - {id: 36, cat: XXX, desc: "Movie XXX"}
-    - {id: 37, cat: Movies/SD, desc: "Movies SD"}
     - {id: 38, cat: Books/EBook, desc: "Books eBooks"}
     - {id: 39, cat: Audio/Audiobook, desc: "Books Audio"}
 

src/Jackett.Common/Definitions/rus-media.yml

@@ -297,8 +297,9 @@ settings:
       a: asc
 
 download:
-  selector: a[href^="./download/file.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="./download/file.php?id="]
+      attribute: href
 
 search:
   # http://rus-media.org/search.php?tracker_search=torrent&sr=topics&keywords=2020&fid[]=54

src/Jackett.Common/Definitions/rustorka.yml

@@ -706,6 +706,7 @@ caps:
     - {id: 1430, cat: PC, desc: " |- Windows 7"}
     - {id: 1429, cat: PC, desc: " |- Windows 8"}
     - {id: 1906, cat: PC, desc: " |- Windows 10"}
+    - {id: 2054, cat: PC, desc: " |- Windows 11"}
     - {id: 1428, cat: PC, desc: " |- Серверные (Microsoft Windows OS)"}
     - {id: 1910, cat: PC, desc: " |- Мультисборки Windows OS"}
     - {id: 363, cat: PC, desc: "Системные программы"}

src/Jackett.Common/Definitions/sdkino.yml

@@ -1,158 +0,0 @@
----
-id: sdkino
-name: SDkino
-description: "SDkino is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
-language: ru-ru
-type: semi-private
-encoding: windows-1251
-links:
-  - http://sdkino.net/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Фильмы"}
-    - {id: 2, cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: 3, cat: Other, desc: "Разное"}
-    - {id: 4, cat: TV, desc: "Сериалы"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-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: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(div.error)
-  test:
-    path: /
-    selector: a[href="/logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  keywordsfilters:
-    - name: re_replace # drop S01
-      args: ["(?i)(\\bS0*\\d+\\b)", ""]
-    - name: re_replace # drop S01E01
-      args: ["(?i)(\\bS0*\\d+E0*\\d+\\b)", ""]
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseeds, 5 paid
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    search: "{{ .Keywords }}"
-
-  rows:
-    selector: div.torrents_list > div.film
-
-  fields:
-    category:
-      selector: div.age-of-film a[href^="/browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: div.film-description a[href^="/details.php?id="]
-      filters:
-        # normalize to SXXEYY format
-        - name: re_replace
-          args: ["[\\.\\,\\:\\-\\/\\|\\[\\]\\(\\)]", " "]
-        - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ия]\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
-        - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\s[CСcс]ери[ия]\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
-        - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]езон(.*)", "$1 S$2 rus $3"]
-        - name: re_replace
-          args: ["(.*)(\\d+)\\s*[CСcс]]ери[ия](.*)", "$1 E$2 rus $3"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-    details:
-      selector: div.film-description a[href^="/details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/download.php?id="]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-      optional: true
-    poster:
-      selector: div.film-img a img
-      attribute: src
-    date:
-      selector: span:has(i.fa-calendar-o)
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2006.1.2 -07:00"
-    files:
-      selector: span:has(i.fa-files-o)
-    size:
-      selector: span:has(i.fa-folder-open-o)
-    grabs:
-      selector: span:has(span.fa-check-square-o)
-    seeders:
-      selector: span:has(i.fa-upload)
-    leechers:
-      selector: span:has(i.fa-download)
-    downloadvolumefactor:
-      case:
-        "span:contains(\"Золотой\")": 0
-        "span:contains(\"Серебряный\")": 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-# TBDev

src/Jackett.Common/Definitions/seedfile.yml

@@ -27,12 +27,12 @@ caps:
     - {id: 14, cat: PC/Games, desc: "Jocuri PC"}
     - {id: 15, cat: Audio, desc: "Muzică"}
     - {id: 16, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 17, cat: PC, desc: "Programe	"}
+    - {id: 17, cat: PC, desc: "Programe"}
     - {id: 18, cat: TV/HD, desc: "Seriale HD"}
-    - {id: 19, cat: TV/HD, desc: "Seriale HD-RO	"}
+    - {id: 19, cat: TV/HD, desc: "Seriale HD-RO"}
     - {id: 20, cat: TV/SD, desc: "Seriale TV"}
-    - {id: 21, cat: TV/SD, desc: "Seriale TV-RO "}
-    - {id: 22, cat: TV/Sport, desc: "Sport "}
+    - {id: 21, cat: TV/SD, desc: "Seriale TV-RO"}
+    - {id: 22, cat: TV/Sport, desc: "Sport"}
     - {id: 23, cat: Audio/Video, desc: "Video Clip"}
     - {id: 24, cat: XXX, desc: "Adult 18+"}
     - {id: 36, cat: Movies/3D, desc: "Video 3D"}
@@ -69,8 +69,9 @@ login:
     path: profile.php
 
 download:
-  selector: a[href^="download.php/"]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php/"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/selezen.yml

@@ -80,8 +80,9 @@ login:
     selector: a[href$="/index.php?action=logout"]
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   # do=search&subaction=search&story=greyhound&titleonly=0&sortby=date&resorder=desc&showposts=0&catlist[]=45&catlist[]=46&catlist[]=47

src/Jackett.Common/Definitions/shareisland.yml

@@ -91,11 +91,13 @@ search:
     malId: ""
     startYear: ""
     endYear: ""
+    playlistId: ""
+    collectionId: ""
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
     page: 1
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
   keywordsfilters:
     - name: diacritics
       args: replace