desireleasers: removed, down for 30 days. resolves #10566 (#12615)

and replace http with https

README.md

@@ -254,11 +254,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Aftershock
  * Aidoru!Online
  * Aither
+ * Alleen Retail
  * AlphaRatio (AR)
  * AmigosShareClub
  * anasch.cc
  * AnimeBytes (AB)
- * AnimeTorrents (AnT)
+ * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
  * AnimeWorld [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
@@ -268,8 +269,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Back-ups
- * bB
+ * Back-ups [![(invite needed)][inviteneeded]](#)
+ * bB [![(invite needed)][inviteneeded]](#)
  * BakaBT
  * BeiTai
  * Best-Core
@@ -281,7 +282,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BiT-TiTAN
  * Bitded
  * Bithorlo (BHO)
- * BitHUmen
+ * BitHUmen [![(invite needed)][inviteneeded]](#)
  * BitSexy
  * Bitspyder
  * BitTorrentFiles
@@ -296,7 +297,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
  * BrSociety
- * BTNext (BTNT)
+ * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
  * BWTorrents
  * BYRBT
@@ -305,17 +306,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
  * Cathode-Ray.Tube (CRT)
- * CCFBits
+ * CCFBits [![(invite needed)][inviteneeded]](#)
  * CeskeForum
- * CGPeers
- * CHDBits
+ * CGPeers [![(invite needed)][inviteneeded]](#)
+ * CHDBits [![(invite needed)][inviteneeded]](#)
  * ChileBT
  * Cinecalidad
  * CinemaMovieS_ZT
  * CinemaZ (EuTorrents)
- * Cinemageddon
- * Cinematik
- * Classix
+ * Cinemageddon [![(invite needed)][inviteneeded]](#)
+ * Cinematik [![(invite needed)][inviteneeded]](#)
+ * Classix [![(invite needed)][inviteneeded]](#)
  * Coastal-Crew
  * Concertos
  * CrazyHD
@@ -328,9 +329,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Dark Tracker
  * DataScene (DS)
  * DataTalli
- * DesiReleasers
  * DesiTorrents
- * Diablo Torrent
+ * Diablo Torrent [![(invite needed)][inviteneeded]](#)
  * DigitalCore
  * DiscFan
  * DivTeam
@@ -346,8 +346,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeBits
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * Falkon Vision Team
- * FANO.IN
- * Fantastic Heaven
+ * FANO.IN [![(invite needed)][inviteneeded]](#)
+ * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
  * Fantastiko [![(invite needed)][inviteneeded]](#)
  * Femdomcult
  * FileList (FL)
@@ -363,7 +363,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Generation-Free [![(invite needed)][inviteneeded]](#)
  * GFXPeers
  * GigaTorrents
- * GimmePeers (formerly ILT)
+ * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
  * GiroTorrent
  * GreekDiamond
  * Greek Team
@@ -371,10 +371,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Haitang
  * HappyFappy
  * HD Dolby
- * HD-Bits.com
+ * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
  * HD-Olimpo
- * HD-Only (HDO)
+ * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
  * HD-Space (HDS)
  * HD-Spain [![(invite needed)][inviteneeded]](#)
  * HD-Torrents (HDT)
@@ -382,17 +382,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDAI
  * HDArea (HDA)
  * HDAtmos
- * HDBits
- * HDC (HDCiTY)
+ * HDBits [![(invite needed)][inviteneeded]](#)
+ * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
  * HDCenter [![(invite needed)][inviteneeded]](#)
- * HDChina (HDWing)
- * HDCity
- * HDHome (HDBigger)
+ * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
+ * HDCity [![(invite needed)][inviteneeded]](#)
+ * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDME
  * HDRoute [![(invite needed)][inviteneeded]](#)
- * HDSky
+ * HDSky [![(invite needed)][inviteneeded]](#)
  * HDTime
- * HDTorrents.it
+ * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
  * HDZone
@@ -402,27 +402,27 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Il Corsaro Verde
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
- * ImmortalSeed (iS)
- * Immortuos
+ * ImmortalSeed (iS) [![(invite needed)][inviteneeded]](#)
+ * Immortuos [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
- * JPopsuki
+ * JPopsuki [![(invite needed)][inviteneeded]](#)
  * JPTV
  * Karagarga
- * Keep Friends
+ * Keep Friends [![(invite needed)][inviteneeded]](#)
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
- * LearnBits
- * LearnFlakes
+ * LearnBits [![(invite needed)][inviteneeded]](#)
+ * LearnFlakes [![(invite needed)][inviteneeded]](#)
  * leech24
  * LegacyHD (HD4Free)
  * LemonHD
- * Libble
+ * Libble [![(invite needed)][inviteneeded]](#)
  * LibraNet (LN)
- * LinkoManija
- * LosslessClub
- * M-Team TP (MTTP)
+ * LinkoManija [![(invite needed)][inviteneeded]](#)
+ * LosslessClub [![(invite needed)][inviteneeded]](#)
+ * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
  * MaDs Revolution [![(invite needed)][inviteneeded]](#)
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
@@ -432,7 +432,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MicroBit (µBit)
  * Milkie
  * MIRcrew
- * MMA-Torrents
+ * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
@@ -447,13 +447,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NetCosmo
  * NetLab
  * NorBits
- * Oasis
  * oMg[WtF]trackr
- * OpenCD
+ * OpenCD [![(invite needed)][inviteneeded]](#)
  * Oppaitime [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
- * Ourbits (HDPter)
+ * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
  * P2PBG
  * P2PElite
  * Partis [![(invite needed)][inviteneeded]](#)
@@ -474,7 +473,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ProAudioTorrents (PAT)
  * PTerClub
  * PTFiles (PTF)
- * PThome
+ * PThome [![(invite needed)][inviteneeded]](#)
  * PTMSG
  * PTSBAO
  * PTtime
@@ -489,7 +488,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RacingForMe (RFM)
  * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
- * Redacted (PassTheHeadphones)
+ * Redacted (PassTheHeadphones) [![(invite needed)][inviteneeded]](#)
  * Renegade
  * Resurrect The Net
  * RetroFlix
@@ -505,7 +504,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Secret Cinema
  * SeedFile (SF)
  * Shareisland
- * Shazbat
+ * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SkipTheCommercials
  * slosoul
@@ -513,12 +512,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
- * Speedmaster HD
- * SpeedTorrent Reloaded
+ * Speedmaster HD [![(invite needed)][inviteneeded]](#)
+ * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
- * SpringSunday
+ * SpringSunday [![(invite needed)][inviteneeded]](#)
  * SugoiMusic
  * Superbits (SBS)
  * Swarmazon
@@ -530,7 +529,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TellyTorrent
  * teracod (Movie Zone)
  * The-Devils-Lounge
- * The Falling Angels (TFA)
+ * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
  * The Horror Charnel (THC)
  * The New Retro
@@ -545,7 +544,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
- * ToTheGlory (TTG)
+ * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent Surf
@@ -559,7 +558,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentDB
  * Torrentech (TTH)
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
- * TorrentHR
+ * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
  * TotallyKids (TK)
  * Torrentland
@@ -569,7 +568,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentSeeds (TS)
  * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
- * Trezzor
+ * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
@@ -584,7 +583,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
- * World-In-HD
+ * World-In-HD [![(invite needed)][inviteneeded]](#)
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)

src/Jackett.Common/Definitions/alleenretail.yml

@@ -0,0 +1,186 @@
+---
+id: alleenretail
+name: Alleen Retail
+description: "Alleen Retail is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: nl-NL
+type: private
+encoding: UTF-8
+links:
+  - http://www.alleenretail.org/ # does not support https ERR_CONNECTION_REFUSED
+
+caps:
+  categorymappings:
+    - {id: 2, cat: Movies/DVD, desc: "Films DVD"}
+    - {id: 17, cat: Movies, desc: "Films Promo"}
+    - {id: 3, cat: Audio/Video, desc: "Muziek Video"}
+    - {id: 4, cat: Audio/Video, desc: "Cabaret"}
+    - {id: 18, cat: Movies, desc: "Films Kids"}
+    - {id: 6, cat: TV, desc: "TV Series"}
+    - {id: 19, cat: Other, desc: "Overigen"}
+    - {id: 20, cat: TV/Documentary, desc: "Documentaire"}
+    - {id: 9, cat: PC/Games, desc: "Games PC"}
+    - {id: 10, cat: Books/Mags, desc: "Magazines"}
+    - {id: 11, cat: Movies/SD, desc: "Films AVI/DivX"}
+    - {id: 22, cat: Movies, desc: "Films Classics"}
+    - {id: 8, cat: Audio, desc: "Muziek"}
+    - {id: 23, cat: PC/Mac, desc: "Software Mac"}
+    - {id: 1, cat: Books/Comics, desc: "Stripboeken"}
+    - {id: 13, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 14, cat: PC/Mobile-Other, desc: "Navigatie"}
+    - {id: 7, cat: PC/0day, desc: "Software PC"}
+    - {id: 12, cat: PC/Mobile-iOS, desc: "iOS"}
+    - {id: 21, cat: Movies/HD, desc: "Films HD"}
+    - {id: 5, cat: Audio/Audiobook, desc: "Luisterboeken"}
+    - {id: 15, cat: XXX, desc: "18+"}
+    - {id: 24, cat: Movies/UHD, desc: "Films Blu-ray/3D/4K"}
+    - {id: 16, cat: Books/EBook, desc: "Ebooks"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+#  - name: thankyou
+#    type: text
+#    label: Thank You Comment
+#  - name: info
+#    type: info
+#    label: Thank you comment
+#    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table.main:contains("Aanmelden mislukt")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+# download:
+#  before:
+#    # /comment.php?action=add&tid=166386
+#    path: comment.php
+#    method: post
+#    inputs:
+#      action: add
+#      tid: "{{ .DownloadUri.Query.id }}"
+#      text: "{{ .Config.thankyou }}"
+#      submit: Opslaan
+#  selectors:
+#    - selector: a[href^="download.php?id="]
+#      attribute: href
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 1
+    # does not support imdbid search and does not return imdb link in results
+
+  rows:
+    selector: table.mainouter
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+        - name: re_replace
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+        - name: re_replace
+          args: ["(?i)compleet", "Complete"]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    size:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "(.+?) in"
+    files:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "in (\\d+) bestan"
+    grabs:
+      selector: table tr:nth-child(2) td:nth-child(1)
+    date:
+      selector: table tr:nth-child(2) td:nth-child(3)
+      filters:
+        - name: replace
+          args: ["januari", "January"]
+        - name: replace
+          args: ["februari", "February"]
+        - name: replace
+          args: ["maart", "March"]
+        - name: replace
+          args: ["april", "April"]
+        - name: replace
+          args: ["mei", "May"]
+        - name: replace
+          args: ["juni", "June"]
+        - name: replace
+          args: ["juli", "July"]
+        - name: replace
+          args: ["augustus", "August"]
+        - name: replace
+          args: ["september", "September"]
+        - name: replace
+          args: ["oktober", "October"]
+        - name: replace
+          args: ["november", "November"]
+        - name: replace
+          args: ["december", "December"]
+        - name: re_replace
+          args: ["\\s*om\\s*", " "]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2 January 2006 15:04:05 -07:00"
+    seeders_optional:
+      optional: true
+      selector: table tr:nth-child(3) td:nth-child(6)  font b
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
+      optional: true
+      selector: table tr:nth-child(3) td:nth-child(6) font b:nth-child(2)
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      # between 1.00 and 1.50 is required, and above 1.50 prohibited
+      text: 1.25
+# engine n/a

src/Jackett.Common/Definitions/desireleasers.yml

@@ -1,186 +0,0 @@
----
-id: desireleasers
-name: DesiReleasers
-description: "DesiReleasers is an INDIAN Private Torrent Tracker for INDIAN MOVIES"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://desireleasers.be/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Movies, TV, Music, MV, Game, Blockbuster"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: 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:
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    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:has(a[href*="/download/"])
-
-  fields:
-    category:
-      text: 1
-    title:
-      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
-    poster:
-      selector: img.tps
-      attribute: src
-      filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
-    date:
-      selector: td:nth-last-child(6)
-      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
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON 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: 0.4
-# UNIT3D 5.1.0 (Customised)

src/Jackett.Common/Definitions/docspedia.yml

@@ -18,13 +18,13 @@ caps:
     - {id: 60, cat: TV/Documentary, desc: "Documentaries"}
     - {id: 71, cat: Other, desc: "Fonts"}
     - {id: 62, cat: Other, desc: "Graphic"}
-    - {id: 63, cat: TV/HD, desc: "HD"}
-    - {id: 57, cat: Books/Mags, desc: "Magazine"}
     - {id: 72, cat: Books, desc: "IT Books"}
+    - {id: 57, cat: Books/Mags, desc: "Magazine"}
     - {id: 58, cat: TV, desc: "Medicine"}
     - {id: 70, cat: Books/EBook, desc: "Occult"}
-    - {id: 73, cat: Audio, desc: "Podcast"}
+    - {id: 74, cat: Audio, desc: "Podcasts"}
     - {id: 69, cat: Other, desc: "PS Resources"}
+    - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
     - {id: 59, cat: TV, desc: "Video"}
     - {id: 61, cat: TV, desc: "Video tutorials"}

src/Jackett.Common/Definitions/glodls.yml

@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gtdb.to/
   - https://glodls.to/
   - https://glotorrents.unblockit.bz/
   - https://glotorrents.nocensor.biz/
@@ -46,6 +45,7 @@ legacylinks:
   - https://glotorrents.unblockit.ws/
   - https://glotorrents.nocensor.work/
   - https://glotorrents.unblockit.kim/
+  - https://www.gtdb.to/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/megamixtracker.yml

@@ -43,6 +43,7 @@ caps:
     - {id: 35, cat: Audio/MP3, desc: "Zene/Mp3/Hun"}
     - {id: 8, cat: Audio/MP3, desc: "Zene/Mp3/Külföldi"}
     - {id: 40, cat: Audio/Other, desc: "Zene/Podcast"}
+    - {id: 83, cat: Movies/HD, desc: "Unknown"} # category has no name and is not listed
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/movietorrent.yml

@@ -46,6 +46,7 @@ caps:
     - {id: 8809, cat: Movies, desc: "2014"}
     - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
     - {id: 10293, cat: Movies, desc: "2021"}
+    - {id: 8569, cat: Movies, desc: "2021"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/oasis.yml

@@ -1,292 +0,0 @@
----
-id: oasis
-name: Oasis
-description: "Oasis is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://oasis-fun.club/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Movies, desc: "Animations - 4K"}
-    - {id: 3, cat: Movies, desc: "Animations - 4K Light"}
-    - {id: 4, cat: Movies, desc: "Animations - BDRIP"}
-    - {id: 6, cat: Movies, desc: "Animations - BluRay-R"}
-    - {id: 5, cat: Movies, desc: "Animations - BRRIP"}
-    - {id: 8, cat: Movies, desc: "Animations - DVD-R"}
-    - {id: 9, cat: Movies, desc: "Animations - DVDRIP"}
-    - {id: 11, cat: Movies, desc: "Animations - HD 1080P"}
-    - {id: 12, cat: Movies, desc: "Animations - HD 720p"}
-    - {id: 13, cat: Movies, desc: "Animations - HDRIP"}
-    - {id: 165, cat: Movies, desc: "Animations - JAP"}
-    - {id: 14, cat: Movies, desc: "Animations - REMUX"}
-    - {id: 15, cat: Movies, desc: "Animations - TVRIP"}
-    - {id: 17, cat: Movies, desc: "Animations - WEB-DL"}
-    - {id: 16, cat: Movies, desc: "Animations - WEBRIP"}
-    - {id: 167, cat: Audio/Audiobook, desc: "Ebook - AUDIO"}
-    - {id: 73, cat: Books/EBook, desc: "Ebook - BD"}
-    - {id: 74, cat: Books/EBook, desc: "Ebook - ENFANTS"}
-    - {id: 168, cat: Books/Mags, desc: "Ebook - MAGAZINE"}
-    - {id: 75, cat: Books/Comics, desc: "Ebook - MANGAS"}
-    - {id: 76, cat: Books, desc: "Ebook - ROMANS"}
-    - {id: 20, cat: Movies, desc: "Film -  DOC.DECOUVERTES"}
-    - {id: 25, cat: Movies/3D, desc: "Film - 3D"}
-    - {id: 26, cat: Movies/UHD, desc: "Film - 4K"}
-    - {id: 27, cat: Movies/UHD, desc: "Film - 4K Light"}
-    - {id: 169, cat: Movies, desc: "Film - AV1"}
-    - {id: 28, cat: Movies/BluRay, desc: "Film - BDRIP"}
-    - {id: 30, cat: Movies/BluRay, desc: "Film - BluRay-R"}
-    - {id: 29, cat: Movies/BluRay, desc: "Film - BRRIP"}
-    - {id: 31, cat: Movies, desc: "Film - Coffret"}
-    - {id: 18, cat: Movies, desc: "Film - DOC.ANIMAUX"}
-    - {id: 19, cat: Movies, desc: "Film - DOC.ANTIQUE"}
-    - {id: 21, cat: Movies, desc: "Film - DOC.DIVERS"}
-    - {id: 22, cat: Movies, desc: "Film - DOC.HISTOIRE"}
-    - {id: 198, cat: Movies, desc: "Film - DOC.SPECTACLE"}
-    - {id: 23, cat: Movies, desc: "Film - DOC.SPORT"}
-    - {id: 24, cat: Movies, desc: "Film - DOC.UNIVERS"}
-    - {id: 32, cat: Movies/DVD, desc: "Film - DVD-R"}
-    - {id: 33, cat: Movies/DVD, desc: "Film - DVDRIP"}
-    - {id: 164, cat: Movies, desc: "Film - EMISSION.TV"}
-    - {id: 35, cat: Movies/HD, desc: "Film - HD 1080P"}
-    - {id: 36, cat: Movies/HD, desc: "Film - HD 720p"}
-    - {id: 37, cat: Movies/HD, desc: "Film - HDRIP"}
-    - {id: 171, cat: Movies/HD, desc: "Film - HDTV 1080P"}
-    - {id: 170, cat: Movies/HD, desc: "Film - HDTV 720P"}
-    - {id: 172, cat: Movies/HD, desc: "Film - M-HD"}
-    - {id: 38, cat: Movies, desc: "Film - REMUX"}
-    - {id: 39, cat: Movies, desc: "Film - TVRIP"}
-    - {id: 41, cat: Movies/WEB-DL, desc: "Film - WEB-DL"}
-    - {id: 200, cat: Movies/WEB-DL, desc: "Film - Webrip"}
-    - {id: 59, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
-    - {id: 60, cat: PC/Mobile-Android, desc: "Jeux - ANDROID"}
-    - {id: 61, cat: PC/Mobile-iOS, desc: "Jeux - IOS-X"}
-    - {id: 62, cat: PC/Games, desc: "Jeux - PC"}
-    - {id: 63, cat: Console/PS4, desc: "Jeux - PS3-4"}
-    - {id: 64, cat: Console/PSP, desc: "Jeux - PSP-X"}
-    - {id: 66, cat: Console/Wii, desc: "Jeux - WII"}
-    - {id: 65, cat: Console/WiiU, desc: "Jeux - WII-U"}
-    - {id: 67, cat: Console/XBox, desc: "Jeux - XBOX"}
-    - {id: 68, cat: PC/Mobile-Android, desc: "Logiciel - ANDROID"}
-    - {id: 69, cat: PC/Mobile-iOS, desc: "Logiciel - APPLE"}
-    - {id: 70, cat: PC/Mobile-iOS, desc: "Logiciel - IPHONE"}
-    - {id: 71, cat: PC, desc: "Logiciel - LINUX"}
-    - {id: 72, cat: PC/0day, desc: "Logiciel - WINDOWS"}
-    - {id: 173, cat: TV/UHD, desc: "Serie - 4K"}
-    - {id: 174, cat: TV/UHD, desc: "Serie - 4k-lLIGHT"}
-    - {id: 85, cat: TV, desc: "Serie - Coffret"}
-    - {id: 7, cat: TV, desc: "Serie - Coffret-Anime"}
-    - {id: 194, cat: TV/Documentary, desc: "Serie - DOCU.DIVERS"}
-    - {id: 195, cat: TV/Documentary, desc: "Serie - DOCU.EMISTV"}
-    - {id: 86, cat: TV/SD, desc: "Serie - DVD-R"}
-    - {id: 87, cat: TV/SD, desc: "Serie  - DVDRIP"}
-    - {id: 197, cat: TV, desc: "Serie - EPISODE"}
-    - {id: 88, cat: TV/HD, desc: "Serie  - HD 1080P"}
-    - {id: 89, cat: TV/HD, desc: "Serie - HD 720p"}
-    - {id: 90, cat: TV/HD, desc: "Serie - HDRIP"}
-    - {id: 176, cat: TV/HD, desc: "Serie - HDTV 1080"}
-    - {id: 175, cat: TV/HD, desc: "Serie - HDTV 720"}
-    - {id: 182, cat: TV/Anime, desc: "Serie - JAP-ANIM"}
-    - {id: 177, cat: TV/HD, desc: "Serie - M-HD"}
-    - {id: 91, cat: TV, desc: "Serie - REMUX"}
-    - {id: 166, cat: TV, desc: "Serie - SERIE  Docu"}
-    - {id: 92, cat: TV, desc: "Serie - TVRIP"}
-    - {id: 199, cat: TV/WEB-DL, desc: "Serie - WebDL"}
-    - {id: 179, cat: TV/WEB-DL, desc: "Serie - WEB-DL 1080"}
-    - {id: 178, cat: TV/WEB-DL, desc: "Serie - WEB-DL 720"}
-    - {id: 93, cat: TV/WEB-DL, desc: "Serie - WEBRIP"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-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
-  - name: torrentlanguage
-    type: select
-    label: Torrent Language
-    default: 0
-    options:
-      0: "Toutes Les Langues"
-      1: Allemand
-      2: Anglais(UK)
-      3: Anglais(US)
-      4: Arabe
-      5: Bengali
-      6: Cantonais
-      7: Coréen
-      8: Danois
-      9: Espagnol
-      10: Flamand
-      11: Français
-      12: Hébreu
-      13: Hindi
-      14: Italien
-      15: Japonais
-      16: Mandarin
-      25: Muet
-      17: Multi
-      26: Musical
-      18: Perse
-      19: Portuguais
-      20: Québécois
-      21: Russe
-      22: Suédois
-      23: Ukrainien
-      24: "VOSTFR"
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: TTV3/Bienvenue
-    selector: a[href$="/TTV3/Deconnexion"]
-
-download:
-  before:
-    # https://galeriens.com/TTV3/Torrents/11222/Remercier
-    # note http GET does not seem to work as the html suggests, so using same as LeChaudron which is also a TT3.00FRENCH engine.
-    path: "/TTV3/Torrents/{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}/Remercier"
-    method: post
-    inputs:
-      torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
-  selectors:
-    - selector: a[href*="/Telechargement/"]
-      attribute: href
-
-search:
-  paths:
-    # https://oasis-fun.club/TTV3/Torrents/Recherche?recherche=&type=tout&endroit=nomtorrent&langue=0&tl=peuimporte
-    # categories for searching are unsupported
-    - path: TTV3/Torrents/Recherche
-  inputs:
-    recherche: "{{ .Keywords }}"
-    # searchtype: un (one word), tout (all words), exacte (exact expression)
-    type: tout
-    # searchin:  nomtorrent (name), desctorrent (descr)
-    endroit: nomtorrent
-    # language: 11 french, 17 multi
-    langue: "{{ .Config.torrentlanguage }}"
-    # freeleech: oui (yes), non (no), peuimporte (ignore)
-    tl: "{{ if .Config.freeleech }}oui{{ else }}peuimporte{{ end }}"
-    # does not support imdbid search and does not return imdb link in results.
-
-  rows:
-    selector: table.sortable tbody tr
-  fields:
-    category:
-      selector: a[href*="/SousCategories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title_phase1:
-      selector: a[onmouseover]
-    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= (.*?)><"
-    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)
-    date:
-      selector: td:nth-child(2) a font[color="#F2F2F2"]
-      filters:
-        - name: replace
-          args: ["il y a ", ""]
-        - name: replace
-          args: [" Jours", " days"]
-        - name: replace
-          args: [" Jour", " day"]
-        - name: replace
-          args: [" heures", " hours"]
-        - name: replace
-          args: [" heure", " hour"]
-        - name: replace
-          args: [" Semaines", " weeks"]
-        - name: replace
-          args: [" Semaine", " week"]
-        - name: replace
-          args: [" mois", " month"]
-        - name: replace
-          args: [" ans", " years"]
-        - name: replace
-          args: [" an", " year"]
-        - name: append
-          args: " ago"
-    downloadvolumefactor:
-      case:
-        img[src$="/images/Torrents/TLibre.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TT3.00 FRENCH

src/Jackett.Common/Definitions/slosoul.yml

@@ -7,35 +7,29 @@ type: private
 encoding: UTF-8
 testlinktorrent: false
 links:
-  - http://slosoul.net/ # site is forcing http
-legacylinks:
   - https://slosoul.net/
+legacylinks:
+  - http://slosoul.net/
 
 caps:
   categorymappings:
-    - {id: 34, cat: Movies/SD, desc: "Filmi - Xvid"}
-    - {id: 35, cat: Movies/DVD, desc: "Filmi - DVD"}
-    - {id: 36, cat: Movies/BluRay, desc: "Filmi - BluRay"}
-    - {id: 37, cat: Movies/HD, desc: "Filmi - X264"}
-    - {id: 38, cat: Audio/MP3, desc: "Glasba - MP3"}
-    - {id: 39, cat: Audio/Lossless, desc: "Glasba - FLAC"}
-    - {id: 40, cat: PC/Games, desc: "Igre - PC"}
-    - {id: 42, cat: TV/Documentary, desc: "Dokumentarni filmi"}
-    - {id: 43, cat: TV/Sport, desc: "Šport"}
-    - {id: 44, cat: TV/Anime, desc: "Risanke"}
-    - {id: 45, cat: TV, desc: "TV - Serije"}
-    - {id: 46, cat: PC, desc: "Programi"}
-    - {id: 47, cat: Books/EBook, desc: "E-Knjige"}
-    - {id: 48, cat: Other, desc: "Slike"}
-    - {id: 49, cat: Other, desc: "Ostalo"}
-    - {id: 50, cat: XXX/XviD, desc: "Erotika - Xvid"}
-    - {id: 51, cat: XXX/DVD, desc: "Erotika - DVD"}
-    - {id: 52, cat: XXX/ImageSet, desc: "Erotika - Slike"}
+    - {id: 5, cat: PC, desc: "Apps"}
+    - {id: 7, cat: Books/EBook, desc: "Ebooks"}
+    - {id: 6, cat: PC/Games, desc: "Games PC"}
+    - {id: 8, cat: Movies, desc: "Movies Packs"}
+    - {id: 1, cat: Movies/SD, desc: "Movies Divx/Xvid"}
+    - {id: 9, cat: Movies/DVD, desc: "Movies DVD-r"}
+    - {id: 11, cat: Movies/BluRay, desc: "Movies BluRay"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: XXX, desc: "Porn"}
+    - {id: 13, cat: TV/Sport, desc: "TV Sport"}
+    - {id: 10, cat: TV, desc: "TV Shows"}
+    - {id: 12, cat: Other, desc: "VIP"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
 
@@ -66,123 +60,109 @@ settings:
       asc: asc
 
 login:
-  path: ?p=home&pid=1
-  method: form
-  form: form#loginbox_form
-  submitpath: ajax/login.php
+  path: takelogin.php
+  method: post
   inputs:
-    action: login
-    loginbox_membername: "{{ .Config.username }}"
-    loginbox_password: "{{ .Config.password }}"
-    loginbox_remember: 1
-  selectorinputs:
-    securitytoken:
-      selector: "script:contains(\"stKey: \")"
-      filters:
-        - name: regexp
-          args: "stKey: \"(.+?)\","
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
   error:
-    - selector: div.error
-    - selector: :contains("-ERROR-")
+    - selector: table:has(td.thead:contains("An error has occured!"))
   test:
-    path: ?p=home&pid=1
-    selector: div#member_info_bar
+    path: index.php
+    selector: a[href*="logout.php?logouthash="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ re_replace  .DownloadUri.PathAndQuery \".*torrent-details-(\\d+).*\" \"$1\"}}"
+  selectors:
+    - selector: a[href*="download-torrent-"]
+      attribute: href
 
 search:
   paths:
-    - path: /
+    - path: browse.php
   inputs:
-    p: torrents
-    pid: 10
-    $raw: "{{ range .Categories }}&cid[]={{.}}{{end}}"
-    keywords: "{{ .Keywords }}"
-    # name, description, both, uploader
-    search_type: name
-    "sortOptions[sortBy]": "{{ .Config.sort }}"
-    "sortOptions[sortOrder]": "{{ .Config.type }}"
-    # does not support imdbid searching
+    do: search
+    # does not support multi categories so defaulting to ALL
+    category: 0
+    # yes incldead, no activeonly
+    include_dead_torrents: yes
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results
+  keywordsfilters:
+    - name: re_replace # replace special characters with "%" (wildcard)
+      args: ["[^a-zA-Z0-9]+", "%"]
 
   rows:
-    selector: "div.torrent-box[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
+    selector: "table#sortabletable tbody tr:has(a[href*=\"download-torrent-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href*="?p=torrents&pid=10&cid="]
+      selector: a[href*="torrent-category-"]
       attribute: href
       filters:
-        - name: querystring
-          args: cid
+        - name: regexp
+          args: (\d+)
+    title_default:
+      # is often abbreviated
+      selector: a[href*="torrent-details-"]
+    title_optional:
+      # usually longer than details title
+      selector: div[id^="port-content-"] div
+      optional: true
     title:
-      selector: a[href*="?p=torrents&pid=10&action=details&tid="]
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     details:
-      selector: a[href*="?p=torrents&pid=10&action=details&tid="]
+      selector: a[href*="torrent-details-"]
       attribute: href
     download:
-      selector: a[href*="?p=torrents&pid=10&action=download&tid="]
+      selector: a[href*="torrent-details-"]
       attribute: href
     magnet:
       selector: a[href^="magnet:?xt="]
       attribute: href
     poster:
-      selector: a[href*="data/torrents/torrent_images/"]
-      attribute: href
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: a[rel="torrent_size"]
-    grabs:
-      selector: a[rel="times_completed"]
-    seeders:
-      selector: a[rel="torrent_seeders"]
-    leechers:
-      selector: a[rel="torrent_leechers"]
-    date_time:
-      selector: div.torrentOwner abbr
-      optional: true
-      attribute: data-time
-    date_day:
-      # Naložil včeraj ob 12:00 by
-      # Naložil danes ob 09:28 by
-      # Uploaded Today at 09:17 by
-      # Uploaded Yesterday at 10:31 by
-      selector: div.torrentOwner:contains("day"), div.torrentOwner:contains("včeraj"), div.torrentOwner:contains("danes")
-      optional: true
+      selector: div[id^="port-content-"] img
+      attribute: src
+    date:
+      selector: td:nth-child(2) > div:last-child
       filters:
         - name: regexp
-          args: " (.+?) by"
-        - name: replace
-          args: [" ob ", " at "]
-        - name: replace
-          args: ["danes", "Today"]
-        - name: replace
-          args: ["včeraj", "Yesterday"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: fuzzytime
-    date_year:
-      # Uploaded 14-11-2021 09:41 by
-      selector: div.torrentOwner:contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: " (.+?) by"
+          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
-    date:
-      text: "{{ if or .Result.date_time .Result.date_year .Result.date_day }}{{ or .Result.date_time .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
-        img[src$="/torrent_free.png"]: 0
+        img[src$="/external.gif"]: 0
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
         "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
 # TBD, Rules and FAQ do not cover this yet
 #    minimumratio:
 #      text: 1.0
 #    minimumseedtime:
 #      # 2 days (as seconds = 2 x 24 x 60 x 60)
 #      text: 172800
-# TSUE 2.2
+#  TS Special Edition v.8.0

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq117.com/
+  - https://torrentqq118.com/
 legacylinks:
   - https://torrentqq100.com/
   - https://torrentqq101.com/
@@ -25,6 +25,7 @@ legacylinks:
   - https://torrentqq113.com/
   - https://torrentqq114.com/
   - https://torrentqq115.com/
+  - https://torrentqq117.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir42.com/
+  - https://torrentsir43.com/
 legacylinks:
   - https://torrentsir31.com/
   - https://torrentsir33.com/
@@ -19,6 +19,7 @@ legacylinks:
   - https://torrentsir39.com/
   - https://torrentsir40.com/
   - https://torrentsir41.com/
+  - https://torrentsir42.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,32 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview45.com/
+  - https://torrentview46.com/
 legacylinks:
   - https://torrentview.net/
-  - https://torrentview3.net/
-  - https://torrentview4.net/
-  - https://torrentview5.net/
-  - https://torrentview6.net/
-  - https://torrentview7.net/
-  - https://torrentview8.net/
-  - https://torrentview9.net/
-  - https://torrentview10.net/
-  - https://torrentview11.net/
-  - https://torrentview12.net/
-  - https://torrentview13.net/
-  - https://torrentview14.net/
-  - https://torrentview15.net/
-  - https://torrentview16.net/
-  - https://torrentview17.net/
-  - https://torrentview18.net/
-  - https://torrentview19.net/
-  - https://torrentview20.net/
-  - https://torrentview21.net/
-  - https://torrentview22.net/
-  - https://torrentview23.net/
-  - https://torrentview24.com/
-  - https://torrentview25.com/
   - https://torrentview26.com/
   - https://torrentview27.com/
   - https://torrentview28.com/
@@ -51,6 +28,7 @@ legacylinks:
   - https://torrentview41.com/
   - https://torrentview42.com/
   - https://torrentview44.com/
+  - https://torrentview45.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentz2eu.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
+  - https://torrentz2.club/
   - https://torrentz2eu.me/ # often rotates between *.me and *.org
   - https://torrentzeu.org/
   - https://torrentz2.unblockninja.com/

src/Jackett.Updater/Program.cs

@@ -300,6 +300,7 @@ namespace Jackett.Updater
                 "Definitions/danishbytes.yml", // migrated to C#
                 "Definitions/DasUnerwartete.yml",
                 "Definitions/demonsite.yml",
+                "Definitions/desireleasers.yml",
                 "Definitions/devils-playground.yml",
                 "Definitions/digbt.yml",
                 "Definitions/documentarytorrents.yml",
@@ -398,6 +399,7 @@ namespace Jackett.Updater
                 "Definitions/nyaa.yml",
                 "Definitions/nyaa-pantsu.yml",
                 "Definitions/nyoo.yml",
+                "Definitions/oasis.yml",
                 "Definitions/onlineselfeducation.yml",
                 "Definitions/onlyscene.yml",
                 "Definitions/obscure.yml",