psytorrents: ignore expired certificate. resolves #9479

Until Sonarr add double language managment at titles like radarr, it is better to removed.

README.md

@@ -34,7 +34,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * AniRena
  * AniSource
  * AudioBook Bay (ABB)
- * Badass Torrents
  * BigFANGroup
  * BitRu
  * BT.etree
@@ -107,9 +106,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Rapidzona
  * RARBG
  * RinTor
+ * RinTorNeT
  * Rus-media
  * RuTor
  * RuTracker.RU
+ * seleZen
  * Sexy-Pics
  * shokweb
  * ShowRSS
@@ -133,7 +134,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentDownload
  * TorrentFunk
  * TorrentGalaxy (TGx)
- * TorrentHane
  * TorrentKitty
  * TorrentParadise
  * TorrentProject2
@@ -143,9 +143,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentView (토렌트뷰)
  * Torrentz2
  * Torrentz2k
+ * truPornolabs
  * Underverse
  * UnionDHT
  * XFSUB
+ * xxxAdultTorrent
  * xxxtor
  * xxxtorrents
  * YourBittorrent
@@ -193,10 +195,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * NetHD (VietTorrent)
  * PornoLab
  * PussyTorrents
+ * Rainbow Tracker
  * RiperAM
  * RockBox
  * RuTracker
  * Rustorka
+ * SDkino
  * Sharewood
  * SkTorrent
  * SkTorrent-org
@@ -206,7 +210,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torrents-Local
  * TribalMixes
  * Union Fansub
- * UniOtaku
  * YggTorrent (YGG)
  * Ztracker
 </details>
@@ -338,6 +341,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
+ * GreekDiamond
  * Greek Team
  * HD-Bits.com
  * HD-Forever (HDF)
@@ -368,6 +372,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HQSource (HQS)
  * HacheDe
  * Hebits
+ * HellasTZ
  * Hon3y HD
  * Horror Site
  * HuSh
@@ -377,6 +382,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Immortuos
  * Insane Tracker
  * JPopsuki
+ * JPTV
  * Kapaki
  * Karagarga
  * Keep Friends
@@ -425,9 +431,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Partis
  * PassThePopcorn (PTP)
  * Peers.FM
- * PiXELHD (PxHD)
+ * Pirata Digital
  * PirateTheNet (PTN)
  * PixelCove (Ultimate Gamer)
+ * PiXELHD (PxHD)
  * Pleasuredome
  * PolishSource (PS)
  * PolishTracker
@@ -471,7 +478,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Speedmaster HD
  * SpeedTorrent Reloaded
  * Spirit of Revolution
- * SportHD
  * SportsCult
  * SpringSunday
  * Superbits (SBS)
@@ -525,20 +531,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TranceTraffic
  * Trezzor
  * TurkSeed
- * TurkNova
  * TurkTorrent (TT)
  * Twilight Torrents
  * Twilights Zoom
- * U-Torrents
- * u-torrents (SceneFZ)
  * U2 (U2分享園@動漫花園)
  * UHDBits
  * UnionGang
  * UnlimitZ
- * VHSTAPES (The Archive / Nostalgic)
  * Vizuk
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * World-In-HD
+ * Witch-Hunter (Demon-Site)
  * World-of-Tomorrow
  * x-ite.me (XM)
  * xBytesV2
@@ -547,7 +550,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * XWTorrents (XWT)
  * Xthor
  * XtreMeZone (MYXZ)
- * XtremeFile
  * YDYPT
  * YingK
  * Zamunda.net

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

@@ -51,6 +51,10 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: true
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -97,9 +101,9 @@ search:
   inputs:
     $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead 3 gold 4 noseed 5 silver
-    incldead: 1
-    # 0 title 1 title and descr
+    # 0 active, 1 incldead, 2 onlydead, 3 gold, 4 noseed, 5 silver
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 title, 1 title and descr
     where: 0
     sort: "{{ .Config.sort}}"
     type: "{{ .Config.type}}"

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

@@ -14,8 +14,9 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.id/
   - https://1337.root.yt/
+  - https://1337x.unblockit.top/
+  - https://1337x.unblocked.rest/
 legacylinks:
   - https://1337x.unblocked.earth/
   - https://1337x.unblockit.pro/
@@ -28,9 +29,11 @@ legacylinks:
   - https://1337x.unblockninja.com/ # 403 Forbidden
   - https://1337x.unblockit.me/
   - https://1337x.unblockit.pw/
-  - https://1337x.unblocked.bar/ # currently down
-  - https://1337x.proxyportal.pw/ # currently down
-  - https://1337x.uk-unblock.pro/ # currently down
+  - https://1337x.unblockit.id/
+  - https://1337x.unblockit.win/
+  - https://1337x.unblocked.bar/
+  - https://1337x.proxyportal.pw/
+  - https://1337x.uk-unblock.pro/
 
 caps:
   categorymappings:

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

@@ -90,6 +90,10 @@ settings:
   - 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
@@ -127,11 +131,11 @@ search:
   inputs:
     $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active 1 incldead 2 onlydead
+    # 0 active, 1 incldead, 2 onlydead
     incldead: 1
-    # 0 all 1 notfree 2 onlyfree
-    freeleech: 0
-    # 0 any 1 French 2 English 3 Multi 4-8 32-41
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 any, 1 French, 2 English, 3 Multi, 4-8 32-41
     lang: 0
     sort: "{{ .Config.sort}}"
     order: "{{ .Config.order}}"

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

@@ -35,6 +35,10 @@ settings:
   - 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
@@ -83,14 +87,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploader 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

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

@@ -39,6 +39,10 @@ settings:
   - 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
@@ -77,10 +81,11 @@ search:
   inputs:
     $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
     search: "{{.Keywords}}"
-    # title descr genre all
+    # title, descr, genre, all
     searchin: title
-    # 0 active 1 incldead 2 onlydead
+    # 0 active, 1 incldead, 2 onlydead
     incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 

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

@@ -34,6 +34,10 @@ settings:
   - 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
@@ -81,14 +85,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/aftershock.yml

@@ -6,6 +6,8 @@ language: hu-hu
 type: private
 encoding: iso-8859-1
 links:
+  - https://aftershock-tracker.net/
+legacylinks:
   - https://aftershock-tracker.eu/
 
 caps:

src/Jackett.Common/Definitions/aither.yml

@@ -11,25 +11,19 @@ links:
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 15, cat: Movies, desc: "Movie Packs"}
-    - {id: 7, cat: TV/Documentary, desc: "Documentary"}
     - {id: 9, cat: TV/Sport, desc: "Sports"}
-    - {id: 12, cat: TV/Anime, desc: "Anime Movies"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 13, cat: TV/Anime, desc: "Anime TV"}
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: Console, desc: "Games"}
     - {id: 10, cat: PC, desc: "Apps"}
     - {id: 11, cat: Books, desc: "Ebooks & Magazines"}
     - {id: 14, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 8, cat: Other, desc: "Unrated"}
     - {id: 6, cat: XXX, desc: "XXX"}
-    - {id: 5, cat: Other, desc: "Test"}
 
   modes:
     search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: username
@@ -38,6 +32,10 @@ settings:
   - 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
@@ -85,18 +83,19 @@ search:
     - path: torrents/filter
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""
     sorting: "{{ .Config.sort }}"
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -141,34 +140,38 @@ search:
       optional: true
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    tmdbid:
+      optional: true
+      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
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -191,4 +194,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.2.7
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# UNIT3D 2.7.0

src/Jackett.Common/Definitions/amigosshare.yml

@@ -85,6 +85,7 @@ caps:
     - {id: 39, cat: Audio, desc: "Musica: Dance"}
     - {id: 40, cat: Audio, desc: "Musica: Discografia"}
     - {id: 43, cat: Audio, desc: "Musica: Dubstep"}
+    - {id: 30, cat: Audio, desc: "Musica: Eletronica"}
     - {id: 41, cat: Audio, desc: "Musica: Erudita"}
     - {id: 42, cat: Audio, desc: "Musica: Forró"}
     - {id: 31, cat: Audio, desc: "Musica: Funk"}
@@ -107,7 +108,14 @@ caps:
     - {id: 62, cat: TV/Sport, desc: "Tv: Esportes"}
     - {id: 64, cat: TV, desc: "Tv: Fechada"}
     - {id: 73, cat: TV, desc: "Video Aula: Video Aula"}
-    - {id: 999, cat: Other, desc: "Error Cat not Found"}
+    - {id: 127, cat: Other, desc: "Outros: Add-ons"}
+    - {id: 126, cat: Other, desc: "Outros: Extensões"}
+    - {id: 129, cat: Other, desc: "Outros: Fonts"}
+    - {id: 130, cat: Other, desc: "Outros: MOD"}
+    - {id: 125, cat: Other, desc: "Outros: Pack de Imagens"}
+    - {id: 122, cat: Other, desc: "Outros: Plug-ins"}
+    - {id: 128, cat: Other, desc: "Outros: Scripts"}
+    - {id: 124, cat: Other, desc: "Outros: Vetores"}
 
   modes:
     search: [q]
@@ -134,9 +142,9 @@ ratio:
 
 search:
   paths:
-    # http://amigos-share.club/torrents-search.php?search=&c1=1&c19=1&c36=1&incldead=0&freeleech=0&lang=0sort=id&order=desc&page=1
+    # http://amigos-share.club/torrents-search.php?search=&sort=id&order=desc&page=1
     - path: torrents-search.php
-    # site displays just 9 results, no profile options found to change this, so we attempt to fetch 5 pages
+    # site displays just 20 results, no profile options found to change this, so we attempt to fetch 5 pages
     - path: torrents-search.php
       inputs:
         page: 1
@@ -150,16 +158,16 @@ search:
       inputs:
         page: 4
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    # note: site does not support multi cat search.
+    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
     search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
-    incldead: 1
-    freeleech: 0
-    lang: 0
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"
+  # torrents-search.php does not support imdbid search or return imdb links.
   keywordsfilters:
+  # drop the year from searches since site titles do not include year
     - name: re_replace
-      args: ["([12][0-9]{3})", ""]
+      args: ["(19|20[0-9]{2})", ""]
 
   rows:
     selector: div#fancy-list-group ul.list-group li.list-group-item
@@ -178,42 +186,44 @@ search:
       selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#b6249d;"]
       optional: true
     title:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href*="torrents-details.php?id="]
       filters:
         # strip out the non-english title [to the left of the brackets] and drop the brackets enclosing the english title
         - name: re_replace
           args: ["^(.*?)[\\(](.*?)[\\)](.*?)$", "$2$3"]
         # add the year to the title
         - name: append
-          args: "{{if .Result._year}} {{.Result._year}}{{else}}{{end}}"
+          args: "{{ if .Result._year }} {{ .Result._year }}{{ else }}{{ end }}"
         # add the quality to the title
         - name: append
-          args: "{{if .Result._quality}} {{.Result._quality}}{{else}}{{end}}"
+          args: "{{ if .Result._quality }} {{ .Result._quality }}{{ else }}{{ end }}"
         # add the type to the title
         - name: append
-          args: "{{if .Result._type}} {{.Result._type}}{{else}}{{end}}"
+          args: "{{ if .Result._type }} {{ .Result._type }}{{ else }}{{ end }}"
         # add audio to the title
         - name: append
-          args: "{{if .Result._language}} {{.Result._language}}{{else}}{{end}}"
+          args: "{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
         - name: re_replace
           args: ["(Dual-Audio|Dublado)", "Brazilian $1"]
     details:
-      selector: a[href^="torrents-details.php?id="]
+      selector: a[href*="torrents-details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?id="]
+      selector: a[href*="download.php?id="]
       attribute: href
     category:
       selector: div.list-group-item-addon img
       attribute: src
       case:
-        # unfortunately the site does not have category numbers on the results page, just a .png which can apply to both movies and tv.
-        # therefore I've order the list to favour movies,
-        # also, not all .png have been verified as the site has many empty categories. their image names have been extrapolated from the cat desc.
-        "[src$=\"/XXXZ.png\"]": 74
+        # unfortunately the site does not have category numbers on the results page, just a image which can apply to both movies and tv.
+        # therefore I've order the list to favour movies.
+        # also, not all images have been verified as the site has many empty categories. their image names have been extrapolated from the cat desc.
+        "[src$=\"/Adultos.fw.png\"]": 74
+        "[src$=\"/Gay.jpeg\"]": 107
+        "[src$=\"/Trans.jpeg\"]": 108
         "[src$=\"/Hentai.png\"]": 75
-        "[src$=\"/Anime.png\"]": 69
-        "[src$=\"/Windows.png\"]": 21
+        "[src$=\"/Anime2.fw.png\"]": 69
+        "[src$=\"/aplicativos.fw.png\"]": 21
         "[src$=\"/Mac.png\"]": 22
         "[src$=\"/Android.png\"]": 23
         "[src$=\"/Linux.png\"]": 25
@@ -225,7 +235,7 @@ search:
         "[src$=\"/E-books.png\"]": 67
         "[src$=\"/Revista.png\"]": 68
         "[src$=\"/HQ.png\"]": 112
-        "[src$=\"/Filmes.png\"]": 119
+        "[src$=\"/filmes2.fw.png\"]": 119
         "[src$=\"/Revistas-XXX.png\"]": 70
         "[src$=\"/PS4.png\"]": 79
         "[src$=\"/Jogos-PC.png\"]": 47
@@ -241,10 +251,11 @@ search:
         "[src$=\"/Jogos-Wii.png\"]": 55
         "[src$=\"/Jogos-DS.png\"]": 58
         "[src$=\"/jogosandroid.png\"]": 57
-        "[src$=\"/Jogos-PSP.png\"]": 82
+        "[src$=\"/PSP.png\"]": 82
         "[src$=\"/Jogos-NS.png\"]": 110
         "[src$=\"/Jogos-XboxOne.png\"]": 78
         "[src$=\"/Axe.png\"]": 29
+        "[src$=\"/Eletronica.png\"]": 30
         "[src$=\"/Funk.png\"]": 31
         "[src$=\"/Pagode.png\"]": 32
         "[src$=\"/HIP_HOP.png\"]": 33
@@ -265,13 +276,20 @@ search:
         "[src$=\"/POP.png\"]": 115
         "[src$=\"/MPB.png\"]": 114
         "[src$=\"/OST.png\"]": 84
-        "[src$=\"/Seriados.png\"]": 120
-        "[src$=\"/Shows.png\"]": 65
+        "[src$=\"/seriados.fw.png\"]": 120
+        "[src$=\"/show.fw.png\"]": 65
         "[src$=\"/Aberta.png\"]": 63
         "[src$=\"/Esporte.png\"]": 62
         "[src$=\"/Fechada.png\"]": 64
-        "[src$=\"/Videoaula.png\"]": 73
-        "*": 999
+        "[src$=\"/video aula4.fw.png\"]": 73
+        "[src$=\"/Add-ons.png\"]": 127
+        "[src$=\"/Extensões.png\"]": 126
+        "[src$=\"/Fonts.png\"]": 129
+        "[src$=\"/MOD.png\"]": 130
+        "[src$=\"/Imagens.png\"]": 125
+        "[src$=\"/Plug-ins.png\"]": 122
+        "[src$=\"/Scripts.png\"]": 128
+        "[src$=\"/Vetores.png\"]": 124
     date:
       text: now
     date:

src/Jackett.Common/Definitions/arabp2p.yml

@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
   - https://www.arabp2p.com/
+legacylinks:
+  - http://www.arabp2p.com/
 
 settings:
   - name: username

src/Jackett.Common/Definitions/asiancinema.yml

@@ -27,6 +27,10 @@ settings:
   - 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
@@ -86,6 +90,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -151,4 +156,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 2.2.7

src/Jackett.Common/Definitions/audiobooktorrents.yml

@@ -156,4 +156,7 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumseedtime:
+      # 14 days (as seconds = 14 x 24 x 60 x 60)
+      text: 1209600
 # U-232 V4.5

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -1,74 +0,0 @@
----
-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]
-
-settings:
-  - name: downloadlink
-    type: select
-    label: Download link
-    default: "magnet:?xt="
-    options:
-      "/download/": ".torrent"
-      "magnet:?xt=": "magnet"
-
-download:
-  selector: a[href*="{{ .Config.downloadlink }}"]
-  attribute: href
-
-search:
-  paths:
-    - path: "torrents/search/{{ .Keywords }}"
-
-  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/beitai.yml

@@ -33,6 +33,10 @@ settings:
   - 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
@@ -75,14 +79,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
-    search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

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

@@ -8,6 +8,16 @@ encoding: UTF-8
 links:
   - https://beyond-hd.me/
 
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+
+  modes:
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+
 settings:
   - name: oneurl
     type: text
@@ -29,16 +39,6 @@ settings:
       "desc": "desc"
       "asc": "asc"
 
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-
-  modes:
-    search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-
 login:
   method: oneurl
   inputs:
@@ -51,8 +51,7 @@ search:
     - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    description: ""
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tmdb: ""
@@ -61,7 +60,7 @@ search:
     qty: 100
 
   rows:
-    selector: table > tbody > tr
+    selector: div.table-torrents > table > tbody > tr
     after: 1
 
   fields:
@@ -73,7 +72,7 @@ search:
         - name: regexp
           args: "/categories/.*?\\.(\\d+)"
     category:
-      text: "{{if .Result._category}}{{.Result._category}}{{else}}1{{end}}"
+      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
     title:
       selector: a.torrent-name
     download:
@@ -115,4 +114,4 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-# UNIT3D
+# UNIT3D (custom)

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

@@ -71,8 +71,7 @@ search:
     - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    description: ""
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tmdb: ""
@@ -81,7 +80,7 @@ search:
     qty: 100
 
   rows:
-    selector: table > tbody > tr
+    selector: div.table-torrents > table > tbody > tr
     after: 1
 
   fields:
@@ -93,7 +92,7 @@ search:
         - name: regexp
           args: "/categories/.*?\\.(\\d+)"
     category:
-      text: "{{if .Result._category}}{{.Result._category}}{{else}}1{{end}}"
+      text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
     title:
       selector: a.torrent-name
     download:
@@ -135,4 +134,4 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-# UNIT3D
+# UNIT3D (custom)

src/Jackett.Common/Definitions/bibliotik.yml

@@ -18,6 +18,7 @@ caps:
 
   modes:
     search: [q]
+    book-search: [q, author, title]
 
 settings:
   - name: username
@@ -51,14 +52,12 @@ settings:
 
 login:
   path: /
-  method: form
-  form: form#loginform
-  submitpath: /
+  method: post
   inputs:
-    action: login
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    keeploggedin: 1
+    keeplogged: 1
+    login: "Log In!"
   error:
     - selector: center:first-of-type
   test:
@@ -69,7 +68,7 @@ search:
   paths:
     - path: torrents/
   inputs:
-    search: "{{ .Keywords }}"
+    search: "{{ if .Query.Author }} @authors {{ .Query.Author }}{{else}}{{end}}{{ if .Query.Title }} @title {{ .Query.Title }}{{else}}{{end}}{{ .Keywords }}"
     $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
     orderby: "{{ .Config.orderby }}"
     order: "{{ .Config.order }}"
@@ -86,39 +85,48 @@ search:
         div[title="Comics"]: 4
         div[title="Ebooks"]: 5
         div[title="Magazines"]: 7
+    _author:
+      selector: .authorLink
+      optional: true
+    _editor:
+      selector: .editorLink
+      optional: true
+    author:
+      text: "{{ or (.Result._author) (.Result._editor) }}"
     _year:
       selector: .torYear
       optional: true
     _filetype:
       selector: .torFormat
       optional: true
-    title:
+    _retail:
+      selector: .torRetail
+      optional: true
+    booktitle:
       selector: .title a
+    title:
+      text: "{{.Result.booktitle}}"
       filters:
         - name: append
-          args: "{{ if .Result._year }} {{ .Result._year }}{{else}}{{end}}{{ if .Result._filetype }} {{ .Result._filetype }}{{else}}{{end}}"
+          args: "{{ if .Result.author }} by {{ .Result.author }}{{else}}{{end}}{{ if .Result._year }} {{ .Result._year }}{{else}}{{end}}{{ if .Result._filetype }} {{ .Result._filetype }}{{else}}{{end}}{{ if .Result._retail }} {{ .Result._retail }}{{else}}{{end}}"
     details:
       selector: .title a
       attribute: href
     date:
       optional: true
       selector: .t_files_size_added time
-      filters:
-        - name: timeago
+      attribute: datetime
     download:
       selector: a[title="Download"]
       attribute: href
-#      files:
-#        selector: .t_files_size_added
-#        filters:
-#          - name: regexp
-#            args: "^\\s*(\\d+)\\s*file"
-    size:
+    files:
       selector: .t_files_size_added
       filters:
-        - name: split
-          args: [",", 1]
-        - name: trim
+        - name: regexp
+          args: "^\\s*(\\d+)\\s*file"
+    size:
+      selector: .t_files_size_added span
+      attribute: data-bytecount
     seeders:
       text: 0
     seeders:

src/Jackett.Common/Definitions/bitru.yml

@@ -30,9 +30,9 @@ settings:
   - name: adverts
     type: select
     label: Include Advertising
-    default: "yes"
+    default: "_"
     options:
-      "yes": "yes"
+      "_": "yes"
       "no": "no"
   - name: sort
     type: select
@@ -48,8 +48,8 @@ search:
     - path: browse.php
   inputs:
     s: "{{ .Keywords }}"
-    rek: "{{ .Config.adverts }}"
-    sort: "{{ re_replace .Config.sort \"_\" \"\"}}"
+    rek: "{{ re_replace .Config.adverts \"_\" \"\" }}"
+    sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
 
   rows:
     selector: table.browse-list > tbody > tr
@@ -111,7 +111,7 @@ search:
         - name: replace
           args: ["февраля", "February"]
         - name: replace
-          args: ["марта ", "March"]
+          args: ["марта", "March"]
         - name: replace
           args: ["апреля", "April"]
         - name: replace

src/Jackett.Common/Definitions/blutopia.yml

@@ -18,8 +18,8 @@ caps:
 
   modes:
     search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: username
@@ -28,6 +28,10 @@ settings:
   - 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
@@ -79,14 +83,15 @@ search:
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""
     sorting: "{{ .Config.sort }}"
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -131,34 +136,38 @@ search:
       optional: true
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    tmdbid:
+      optional: true
+      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
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -181,4 +190,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.3.0
+    minimumseedtime:
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# UNIT3D 2.7.0b

src/Jackett.Common/Definitions/broadcity.yml

@@ -42,31 +42,18 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
   - name: info
     type: info
-    label: Captcha Text Note
-    default: The <i>Captcha Text</i> code is <b>case sensitive</b>.
+    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>"
 
 login:
-  path: login.php
-  method: form
-  form: form[action$="takelogin.php"]
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  captcha:
-    type: image
-    selector: img#regimage
-    input: imagestring
-  error:
-    - selector: table:contains("Hata")
-    - selector: table:contains("Login Giriş Kilitlendi!")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]

src/Jackett.Common/Definitions/brobits.yml

@@ -27,7 +27,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,14 +64,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploader 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/btdb.yml

@@ -8,10 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://btdb.eu/
-  - https://btdb.unblocked.bar/
-  - https://btdb.proxyportal.pw/
-  - https://btdb.uk-unblock.pro/
-  - https://btdb.unblockit.id/
+  - https://btdb.unblockit.top/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -25,6 +22,11 @@ legacylinks:
   - https://btdb.io/ # ERR_NAME_NOT_RESOLVED
   - https://btdb.unblockit.me/
   - https://btdb.unblockit.pw/
+  - https://btdb.unblockit.id/
+  - https://btdb.unblockit.win/
+  - https://btdb.unblocked.bar/
+  - https://btdb.proxyportal.pw/
+  - https://btdb.uk-unblock.pro/
 
 caps:
   categorymappings:
@@ -65,6 +67,7 @@ search:
       text: 1
     title:
       selector: a[href*="/torrent/"]
+      attribute: title
     details:
       selector: a[href*="/torrent/"]
       attribute: href

src/Jackett.Common/Definitions/btdigg.yml

@@ -24,8 +24,9 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "2"
+    default: "0"
     options:
+      "0": "relevance"
       "2": "created"
       "3": "size"
 

src/Jackett.Common/Definitions/btgigs.yml

@@ -79,8 +79,6 @@ search:
   rows:
     selector: table[border="1"][cellpadding=5] > tbody > tr:has(a[href^="details.php?id="])
   fields:
-    is_polish: # Workaround: https://github.com/Jackett/Jackett/issues/8068#issuecomment-610222414
-      text: ""
     is_polish:
       optional: true
       selector: img[src*="cat_pl"]

src/Jackett.Common/Definitions/btschool.yml

@@ -36,7 +36,10 @@ settings:
     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: info_tpp
     type: info
     label: Results Per Page
@@ -55,16 +58,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 justdead
+    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 justdead
     incldead: 0
-    # promotion: 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x 50% 7 30%
-    spstate: 0
-    # 0 all 1 bookmarked 2 not
-    inclbookmarked: 0
-    # 0 title 1 descr 3 uploaded 4 imdb
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 and 1 or 2 exact
+    # promotion: 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x 50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: 4
     type: desc

src/Jackett.Common/Definitions/btsow.yml

@@ -6,13 +6,18 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.space/
+  - https://btsow.website/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
   - https://btsow.club/
   - https://bteve.com/
   - https://btsow.fun/
+  - https://btsow.space/
+  - https://btsow.site/
+  - https://btsow.cyou/
+  - https://btsow.monster/
+  - https://btsow.casa/
 
 caps:
   categories:

src/Jackett.Common/Definitions/channelx.yml

@@ -19,8 +19,8 @@ caps:
 
   modes:
     search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: username
@@ -29,6 +29,10 @@ settings:
   - 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
@@ -80,14 +84,15 @@ search:
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""
     sorting: "{{ .Config.sort }}"
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -132,34 +137,38 @@ search:
       optional: true
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    tmdbid:
+      optional: true
+      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
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -182,4 +191,4 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.2.7
+# UNIT3D 2.7.0

src/Jackett.Common/Definitions/chilebt.yml

@@ -35,6 +35,10 @@ settings:
   - 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
@@ -95,6 +99,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -142,31 +147,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace

src/Jackett.Common/Definitions/cztorrent.yml

@@ -72,6 +72,9 @@ login:
 search:
   paths:
     - path: torrents
+  keywordsfilters:
+    - name: re_replace
+      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     s: "{{ .Keywords }}"
@@ -83,10 +86,6 @@ search:
   rows:
     selector: tr.torr_hover
 
-  keywordsfilters:
-    - name: re_replace
-      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
-
   fields:
     title:
       selector: td.detaily a

src/Jackett.Common/Definitions/demonoid.yml

@@ -8,9 +8,10 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.demonoid.is/
-  - https://demonoid.unblockit.id/
-legacylinks:
   - https://www.dnoid.to/
+  - https://www.dnoid.pw/
+  - https://demonoid.unblockit.top/
+legacylinks:
   - https://demonoid.unblockit.pro/
   - https://demonoid.unblockit.one/
   - https://demonoid.unblockit.me/
@@ -20,6 +21,8 @@ legacylinks:
   - https://dnoid.uk-unblock.xyz/
   - https://dnoid.ind-unblock.xyz/
   - https://demonoid.unblockit.pw/
+  - https://demonoid.unblockit.id/
+  - https://demonoid.unblockit.win/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -18,8 +18,8 @@ caps:
 
   modes:
     search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 
 settings:
@@ -29,6 +29,10 @@ settings:
   - 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
@@ -80,14 +84,15 @@ search:
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""
     sorting: "{{ .Config.sort }}"
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 50
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -132,34 +137,38 @@ search:
       optional: true
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    tmdbid:
+      optional: true
+      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
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -182,4 +191,6 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.2.7
+    minimumratio:
+      text: 0.4
+# UNIT3D 2.7.0

src/Jackett.Common/Definitions/dxdhd.yml

@@ -36,6 +36,10 @@ settings:
   - 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
@@ -95,6 +99,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -142,31 +147,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -189,4 +194,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.2.7
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# UNIT3D 2.3.0

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -19,19 +19,42 @@ caps:
     - {id: 10, cat: Books/Ebook, desc: "Stripboeken"}
     - {id: 11, cat: Books/Ebook, desc: "Crime"}
     - {id: 13, cat: Books/Ebook, desc: "Detective"}
-    - {id: 15, cat: Books/Ebook, desc: "erothiek"}
-    - {id: 16, cat: Books/Ebook, desc: "tijdschriften"}
-    - {id: 17, cat: Books/Ebook, desc: "hobby"}
-    - {id: 19, cat: Books/Ebook, desc: "medisch"}
-    - {id: 21, cat: Books/Ebook, desc: "sport"}
+    - {id: 15, cat: Books/Ebook, desc: "Erothiek"}
+    - {id: 16, cat: Books/Ebook, desc: "Tijdschriften"}
+    - {id: 17, cat: Books/Ebook, desc: "Hobby"}
+    - {id: 19, cat: Books/Ebook, desc: "Medisch"}
+    - {id: 21, cat: Books/Ebook, desc: "Sport"}
     - {id: 50, cat: Books/Ebook, desc: "Kookboeken"}
     - {id: 51, cat: Books/Ebook, desc: "Fantasy"}
     - {id: 52, cat: Books/Ebook, desc: "Kerst"}
     - {id: 53, cat: Books/Ebook, desc: "Waargebeurd"}
+    - {id: 56, cat: Books/Ebook, desc: "Engels"}
+    - {id: 57, cat: Books/Ebook, desc: "Maatschappij"}
+    - {id: 58, cat: Books/Ebook, desc: "Biografie"}
+    - {id: 61, cat: Books/Ebook, desc: "Geschiedenis"}
+    - {id: 60, cat: Books/Ebook, desc: "Sci-Fi"}
+    - {id: 64, cat: Books/Ebook, desc: "Literatuur"}
+    - {id: 65, cat: Books/Ebook, desc: "Non-Fiction"}
+    - {id: 66, cat: Books/Ebook, desc: "Bladmuziek"}
 
   modes:
     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
@@ -42,7 +65,20 @@ login:
     - selector: table[border="0"][cellspacing="0"][cellpadding="10"] tr td font[color="orange"]
   test:
     path: /
-    selector: :has(a[href="logout.php"])
+    selector: a[href="logout.php"]
+
+download:
+  before:
+    # https://www.ebookparadijs.org/comment.php?action=add&tid=23079
+    path: comment.php
+    method: post
+    inputs:
+      action: add
+      tid: "{{ .DownloadUri.Query.id }}"
+      text: "{{ .Config.thankyou }}"
+      submit: Opslaan
+  selector: a[href^="download.php?id="]
+  attribute: href
 
 search:
   paths:
@@ -75,9 +111,6 @@ search:
     download:
       selector: a[href^="details.php?id="]
       attribute: href
-      filters:
-        - name: replace
-          args: ["details", "download"]
     size:
       selector: td:nth-child(4) table tr td:nth-child(2)
       filters:

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

@@ -6,7 +6,7 @@ language: es-es
 type: public
 encoding: UTF-8
 links:
-  - https://www.elitetorrent.se/
+  - https://www.elitetorrent.com/
 legacylinks:
   - https://www.elitetorrent.biz/
   - https://www.elitetorrent.io/
@@ -21,6 +21,7 @@ legacylinks:
   - https://wvvw.elitetorrent.nl/
   - https://vvww.elitetorrent.nl/
   - https://www.elitetorrent.to/
+  - https://www.elitetorrent.se/
 
 caps:
   categories:

src/Jackett.Common/Definitions/esharenet.yml

@@ -53,6 +53,10 @@ settings:
   - 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
@@ -112,6 +116,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 50
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -159,31 +164,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -206,4 +211,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.4.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# UNIT3D 2.5.0

src/Jackett.Common/Definitions/ethor.yml

@@ -104,12 +104,14 @@ search:
       filters:
         - name: replace
           args: ["/details.php", "/download.php"]
-    _title_original:
-      selector: a[href^="/details.php"]:has(b)
-    _title_original: # long titles (shortened with ...)
+    _title_original_b:
+      selector: a[href^="/details.php"] b
+    _title_original_title: # long titles (shortened with ...)
       selector: a[href^="/details.php"][title]
       attribute: title
       optional: true
+    _title_original:
+      text: "{{ if .Result._title_original_title }}{{ .Result._title_original_title }}{{ else }}{{ .Result._title_original_b }}{{ end }}"
     _title_normalized:
       text: "{{ .Result._title_original }}"
       filters:

src/Jackett.Common/Definitions/ettv.yml

@@ -7,13 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.ettvdl.com/
-  - https://ettv.unblockit.id/
+  - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.root.yt/
-  - https://ettv.unblocked.bar/
-  - https://ettv.proxyportal.pw/
-  - https://ettv.uk-unblock.pro/
+  - https://ettv.unblockit.top/
+  - https://ettv.unblocked.rest/
 legacylinks:
   - https://www.ettv.tv/
   - https://www.ettv.to/
@@ -26,6 +23,14 @@ legacylinks:
   - https://ettv.ind-unblock.xyz/
   - https://ettv.unblockit.me/
   - https://ettv.unblockit.pw/
+  - https://ettv.unblockit.id/
+  - https://ettv.unblockit.win/
+  - https://www.ettvdl.com/
+  - https://ettv.unblocked.bar/
+  - https://ettv.proxyportal.pw/
+  - https://ettv.uk-unblock.pro/
+  - https://ettv.root.yt/ # currently redirects to ettvcentral.com
+  - https://www.ettv.be/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -8,11 +8,11 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://eztv.io/
+  - https://eztv.yt/
   - https://eztv.root.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblocked.bar/
-  - https://eztv.proxyportal.pw/
-  - https://eztv.uk-unblock.pro/
+  - https://eztv.unblockit.top/
+  - https://eztv.unblocked.rest/
 legacylinks:
   - https://eztv.ag/ # redirects to .io
   - https://eztv.re/ # redirects to .io
@@ -27,7 +27,11 @@ legacylinks:
   - https://eztv.ind-unblock.xyz/
   - https://eztv.unblockit.me/
   - https://eztv.unblockit.pw/
-  - https://eztv.unblockit.id/ # Error 502
+  - https://eztv.unblockit.id/
+  - https://eztv.unblockit.win/
+  - https://eztv.unblocked.bar/
+  - https://eztv.proxyportal.pw/
+  - https://eztv.uk-unblock.pro/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -125,11 +125,16 @@ login:
   method: form
   form: form[action="/login.php"]
   cookies: ["JAVA=OK"] # avoid jscheck redirect
+  captcha:
+    type: image
+    selector: img[src^="cap/captcha_math.php?codeCaptcha="]
+    input: stringCaptcha
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     loggiin: "einloggen"
-
+  error:
+    - selector: div#login_error
   test:
     path: index.php
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/finvip.yml

@@ -5,6 +5,8 @@ description: "FinVip is a FINNISH Private Torrent Tracker for MOVIES / TV / GENE
 language: fi-fi
 type: private
 encoding: UTF-8
+certificates:
+  - 646731cb7f3a332c1a1442302589480c46152ef6 # expired ‎Tuesday, ‎8 ‎September ‎2020 10:58:46
 links:
   - https://finvip.org/
 

src/Jackett.Common/Definitions/freetorrent.yml

@@ -20,17 +20,14 @@ caps:
     - {id: 5, cat: Books, desc: "Ebook"}
     - {id: 6, cat: PC/Games, desc: "Games"}
     - {id: 7, cat: TV, desc: "Animations"}
-    - {id: 8, cat: PC, desc: "Linux"}
-    - {id: 9, cat: PC/Mac, desc: "MacOS"}
     - {id: 12, cat: TV/Documentary, desc: "Documentaries"}
     - {id: 13, cat: TV, desc: "Shows"}
     - {id: 14, cat: Audio/Video, desc: "Music clips"}
-    - {id: 15, cat: PC/Phone-Android, desc: "Apps APK"}
 
   modes:
     search: [q, imdbid]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
     music-search: [q]
 
 settings:
@@ -91,8 +88,8 @@ search:
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: ""
-    tmdb: ""
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""
     sorting: "{{ .Config.sort }}"
@@ -143,34 +140,38 @@ search:
       optional: true
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    tmdbid:
+      optional: true
+      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
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -193,4 +194,4 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.2.5
+# UNIT3D 2.7.0

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gktorrent.io/
+  - https://wvw.gktorrent.pw/
 legacylinks:
   - https://www.gktorrent.com/
   - http://www.gktorrent.com/
@@ -27,6 +27,8 @@ legacylinks:
   - https://www.gktorrent.tv/
   - https://www.gktorrent.net/
   - https://www.gktorrent.biz/
+  - https://www.gktorrent.io/
+  - https://www.gktorrent.pw/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,10 +9,8 @@ followredirect: true
 links:
   - https://gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.id/
-  - https://glodls.unblocked.bar/
-  - https://glodls.proxyportal.pw/
-  - https://glodls.uk-unblock.pro/
+  - https://glotorrents.unblockit.top/
+  - https://glodls.unblocked.rest/
 legacylinks:
   - https://glodls.rocks/
   - https://glotorrents.unblockit.pro/
@@ -24,6 +22,11 @@ legacylinks:
   - https://glodls.ind-unblock.xyz/
   - https://glotorrents.unblockit.me/
   - https://glotorrents.unblockit.pw/
+  - https://glotorrents.unblockit.id/
+  - https://glotorrents.unblockit.win/
+  - https://glodls.unblocked.bar/
+  - https://glodls.proxyportal.pw/
+  - https://glodls.uk-unblock.pro/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/greekdiamond.yml

@@ -0,0 +1,179 @@
+---
+id: greekdiamond
+name: GreekDiamond
+description: "GreekDiamond is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-gr
+type: private
+encoding: UTF-8
+links:
+  - https://greekdiamond.info/
+
+caps:
+  categorymappings:
+    - {id: 22, cat: TV, desc: "TV Greek series"}
+    - {id: 23, cat: TV, desc: "TV series packs"}
+    - {id: 21, cat: Movies, desc: "Movies World series"}
+    - {id: 12, cat: Movies/DVD, desc: "Movies DVDRIp"}
+    - {id: 13, cat: Movies/HD, desc: "Movies Hd rip x264"}
+    - {id: 14, cat: Movies/SD, desc: "Movies Cam-Ts-R6"}
+    - {id: 10, cat: Movies/HD, desc: "Movies 720p-1080p"}
+    - {id: 16, cat: Movies/BluRay, desc: "Movies Blue Ray"}
+    - {id: 17, cat: Movies, desc: "Movies pack"}
+    - {id: 18, cat: TV/Documentary, desc: "TV Documentary"}
+    - {id: 19, cat: Movies, desc: "Movies Greek"}
+    - {id: 51, cat: TV, desc: "TV Greek Packs"}
+    - {id: 52, cat: Movies, desc: "Movies Greek Packs"}
+    - {id: 53, cat: Movies/HD, desc: "BDRIP-BRRIP"}
+    - {id: 24, cat: Audio, desc: "Music Greek"}
+    - {id: 25, cat: Audio, desc: "Music Greek discografy"}
+    - {id: 26, cat: Audio, desc: "Music Rock"}
+    - {id: 27, cat: Audio, desc: "Music Rock discografy"}
+    - {id: 28, cat: Audio, desc: "Music Compat Disc Club"}
+    - {id: 29, cat: Audio, desc: "Music HipHop/Rap/RnB"}
+    - {id: 30, cat: Audio, desc: "Music Pop/Electronic"}
+    - {id: 31, cat: Audio, desc: "Music Soundtracks-VArtists"}
+    - {id: 32, cat: Audio/Video, desc: "Music videos"}
+    - {id: 50, cat: Audio, desc: "Music Διάφορα (Other)"}
+    - {id: 33, cat: PC/Games, desc: "Games PC"}
+    - {id: 34, cat: Console/PSP, desc: "Games Playstation/PSP"}
+    - {id: 35, cat: Console/Xbox, desc: "Games Xbox"}
+    - {id: 36, cat: TV/Anime, desc: "Anime /Μεταγλωτισμένα"}
+    - {id: 37, cat: TV/Anime, desc: "Anime /Subtitled"}
+    - {id: 40, cat: Books/Comics, desc: "Comics"}
+    - {id: 41, cat: Books/Magazines, desc: "Magazines"}
+    - {id: 42, cat: Books/Ebook, desc: "E-books"}
+    - {id: 43, cat: Books/Ebook, desc: "PDF"}
+    - {id: 44, cat: Other, desc: "Images"}
+    - {id: 45, cat: TV/Sport, desc: "Football Leagues"}
+    - {id: 46, cat: TV/Sport, desc: "Formula 1"}
+    - {id: 48, cat: PC/0day, desc: "Apps Win"}
+    - {id: 8, cat: PC, desc: "Apps Linux"}
+    - {id: 9, cat: PC/Mac, desc: "Apps Mac"}
+    - {id: 49, cat: PC/Phone-Other, desc: "Apps Mobile"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: uid
+    type: text
+    label: Username
+  - name: pwd
+    type: password
+    label: Password
+  - 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
+  form: form[action="index.php?page=login"]
+  inputs:
+    uid: "{{ .Config.uid }}"
+    pwd: "{{ .Config.pwd }}"
+  error:
+    - selector: form[action="index.php?page=login&returnto=index.php"] table tr:nth-of-type(2) td span
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ range .Categories }}{{.}};{{end}}"
+    # 0 title 1 title&descr 2 descr
+    options: 0
+    # 0 all, 1 activeonly, 2 deadonly
+    active: 0
+    # 0 all, 1 classic, 2 silver, 3 gold, 4 silver&gold
+    gold: 0
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+    # does not support imdbid search and does not ruturn imdb link in results
+
+  rows:
+    selector: table > tbody > tr > td > table.lista > tbody > tr:has(td[onmouseover="this.className='post'"])
+
+  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
+    banner:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
+    date: # some users will have a extra wait time column before the bookmark column, so use last-of-type
+      selector: td:nth-last-of-type(11)
+      filters:
+        - name: append
+          args: " 12:00:00 +02:00"
+        - name: dateparse
+          args: "02/01/2006 15:04:05 -07:00"
+    seeders:
+      selector: td:nth-last-of-type(9)
+    leechers:
+      selector: td:nth-last-of-type(8)
+    grabs:
+      selector: td:nth-last-of-type(7)
+      filters:
+        - name: replace
+          args: ["---", "0"]
+    size:
+      selector: td:nth-last-of-type(5)
+      filters:
+        - name: replace
+          args: [",", ""]
+    description:
+      selector: td:nth-last-of-type(3) img
+      attribute: title
+      filters:
+        - name: prepend
+          args: "Language: "
+    downloadvolumefactor:
+      case:
+        img[src="images/freeleech.gif"]: 0
+        img[src="gold/gold.gif"]: 0
+        img[src="gold/slver.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# xbtit dt fm v20.0

src/Jackett.Common/Definitions/hachede.yml

@@ -170,7 +170,7 @@ search:
       selector: td.torrent_name > a, .newIndicator > a
       filters:
         - name: append
-          args: " [spanish]"
+          args: " SPANISH"
     details:
       selector: td.torrent_name > a, .newIndicator > a
       attribute: href

src/Jackett.Common/Definitions/haidan.yml

@@ -35,6 +35,10 @@ settings:
   - 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
@@ -86,14 +90,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploader 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hd4fans.yml

@@ -33,6 +33,10 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -70,14 +74,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0=including dead 1=active 2=dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
-    # show promotions: 0=all 1=normal 2=free 3=2x 4=2xFree 5=50% 6=2x50% 7=30%
-    spstate: 0
-    # 0=title 1=descr 3=uploader 4=imdb URL
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0=AND 1=OR 2=Exact
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
 
   rows:

src/Jackett.Common/Definitions/hdarea.yml

@@ -42,6 +42,10 @@ settings:
   - 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
@@ -92,14 +96,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 onlydead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 onlydead
     incldead: 1
-    # 0 all 1 normal 2 free 2 2x 4 2xFree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 Exact
+    # 0 all, 1 normal, 2 free, 2 2x, 4 2xFree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 Exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hdc.yml

@@ -40,7 +40,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -77,13 +80,13 @@ search:
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     iwannaseethis: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead 1 active 2 dead
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploader 4 imdb number
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb number
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND 1 OR 2 exact
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hdchina.yml

@@ -53,7 +53,10 @@ settings:
     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: info_tpp
     type: info
     label: Results Per Page
@@ -71,11 +74,10 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 0
-    spstate: 0
-    inclbookmarked: 0
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     search_mode: 0
 
   rows:

src/Jackett.Common/Definitions/hdcity.yml

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

src/Jackett.Common/Definitions/hddisk.yml

@@ -35,6 +35,10 @@ settings:
   - 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
@@ -83,14 +87,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hddolby.yml

@@ -42,6 +42,10 @@ settings:
     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 HDDolby Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -85,14 +89,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0=including dead 1=active 2=dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
-    # show promotions: 0=all 1=normal 2=free 3=2x 4=2xFree 5=50% 6=2x50% 7=30%
-    spstate: 0
-    # 0=title 1=descr 3=uploader 4=imdb URL
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0=AND 1=OR 2=Exact
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
 
   rows:

src/Jackett.Common/Definitions/hdhome.yml

@@ -77,7 +77,10 @@ settings:
     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: info_tpp
     type: info
     label: Results Per Page
@@ -95,11 +98,11 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 1
-    spstate: 0
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     inclbookmarked: 0
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     search_mode: 0
 
   rows:

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -29,6 +29,10 @@ settings:
   - 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
@@ -88,6 +92,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -135,31 +140,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -182,4 +187,4 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.3.0
+# UNIT3D 2.4.0

src/Jackett.Common/Definitions/hdsky.yml

@@ -35,7 +35,10 @@ settings:
     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: info_tpp
     type: info
     label: Results Per Page
@@ -63,16 +66,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0=including dead 1=active 2=dead
+    search: "{{if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
-    # show promotions 0=all 1=normal 2=free 3=2x 4=2x free 5=50% 6=2x50% 7=30%
-    spstate: 0
-    # 0=all 1=bookmarked 2=not
-    inclbookmarked: 0
-    # 0=title 1=descr 3=uploaded 4=imdb url
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0=AND 1=OR 2=exact
+    # show promotions 0=all, 1=normal, 2=free, 3=2x, 4=2xfree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb url
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=exact
     search_mode: 0
 
   rows:
@@ -94,7 +95,7 @@ search:
       selector: a[title][href^="details.php?id="]
       attribute: href
     download:
-      selector: form[action^="download.php?id="]
+      selector: form[action*="/download.php?id="]
       attribute: action
     imdb:
       selector: a[href*="imdb.com/title/tt"]

src/Jackett.Common/Definitions/hdspain.yml

@@ -61,8 +61,6 @@ search:
       filters:
         - name: querystring
           args: cat
-    extras:
-      text: ""
     extras:
       optional: true
       selector: td.titulo a[class]

src/Jackett.Common/Definitions/hdstreet.yml

@@ -35,6 +35,10 @@ settings:
   - 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
@@ -80,16 +84,16 @@ search:
       categories: [403, 404, 405, 411, 412, 413]
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 dead, 3 noimdb, 4 onlydead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%, 8 all promotions
-    spstate: 0
+    spstate: "{{ if .Config.freeleech }}8{{ else }}0{{ end }}"
     # 0 all, 1 popular, 2 classic, 3 recommended, 4 normal
     picktype: 0
     # 0 title, 3 uploader, 4 movie info, 5 imdbid, 6 torrent hash, 7 activity seed
-    search_area: "{{ if .Query.IMDBID }}5{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    search_area: "{{ if .Query.IMDBID }}5{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hdtime.yml

@@ -37,6 +37,10 @@ settings:
   - 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
@@ -79,14 +83,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
-    search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hdturk.yml

@@ -81,19 +81,19 @@ caps:
     movie-search: [q]
     music-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>"
+
 login:
-  path: login.php
-  method: form
-  form: form[action$="takelogin.php"]
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  captcha:
-    type: image
-    selector: img#regimage2
-    input: imagestring
-  error:
-    - selector: table:contains("hata")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]
@@ -169,3 +169,4 @@ search:
       case:
         img[src$="/x2.gif"]: "2"
         "*": "1"
+# TS Special Edition v.7.5

src/Jackett.Common/Definitions/hdu.yml

@@ -36,6 +36,10 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: info_tpp
     type: info
     label: Results Per Page
@@ -74,14 +78,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0=including dead 1=active 2=dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
-    # show promotions: 0=all 1=normal 2=free 3=2x 4=2xFree 5=50% 6=2x50% 7=30% 8 free forever
-    spstate: 0
-    # 0=title 1=descr 3=uploader 4=imdb URL
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0=AND 1=OR 2=Exact
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%, 8 all promotions
+    spstate: "{{ if .Config.freeleech }}8{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
 
   rows:

src/Jackett.Common/Definitions/hdzone.yml

@@ -75,7 +75,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -110,16 +113,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 onlydead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 onlydead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 all 1 bookm 2 notbookm
-    inclbookmarked: 0
-    # 0 title 1 descr 3 uploader 4 imdb
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/hellastz.yml

@@ -0,0 +1,176 @@
+---
+id: hellastz
+name: HellasTZ
+description: "HellasTZ is an Greek Private site for TV / MOVIES / GENERAL"
+language: el-gr
+type: private
+encoding: UTF-8
+links:
+  - https://hellastz.com/
+
+caps:
+  categorymappings:
+    - {id: 11, cat: Movies, desc: "Movies Αποκλειστικά του HTz (HTz only)"}
+    - {id: 54, cat: Movies/BluRay, desc: "Movies Blu-Ray 720p-1080p"}
+    - {id: 232, cat: Movies/UHD, desc: "Movies Full-HD - 4K"}
+    - {id: 234, cat: Movies/HD, desc: "Movies BDRip-BRRip-HDRip"}
+    - {id: 233, cat: Movies/DVD, desc: "Movies DvdRip Full"}
+    - {id: 213, cat: Movies, desc: "Movies Ελληνικές Ταινιίες (Greek)"}
+    - {id: 236, cat: Movies/SD, desc: "Movies Cam - HDcam-HDts"}
+    - {id: 235, cat: Movies/WEBDL, desc: "Movies WEB-720-1080p -HDrip"}
+    - {id: 90, cat: TV, desc: "TV Ελληνικές Σειρές (Greek)"}
+    - {id: 96, cat: TV, desc: "TV Ξένες Σειρές (Foreign)"}
+    - {id: 219, cat: Audio, desc: "Music Ξένη μουσική (Foreign)"}
+    - {id: 220, cat: Audio, desc: "Music Ελληνική Μουσική (Greek)"}
+    - {id: 240, cat: PC/Phone-Other, desc: "Android - Linux"}
+    - {id: 230, cat: TV/Anime, desc: "Παιδικα μεταγλωτισμε (Children)"}
+    - {id: 231, cat: TV/Anime, desc: "Παιδικα υποτιτλους (Children w/ subs)"}
+    - {id: 221, cat: Console, desc: "Παιχνίδια (Games)"}
+    - {id: 228, cat: TV/Anime, desc: "Animation"}
+    - {id: 223, cat: Books/Ebook, desc: "Βιβλία (Books)"}
+    - {id: 100, cat: Books/Comics, desc: "Comics &Περιοδικά"}
+    - {id: 227, cat: PC, desc: "Pc Software"}
+    - {id: 225, cat: TV/Documentary, desc: "Ντοκιμαντερ (Documentaries)"}
+    - {id: 241, cat: Audio/Audiobook, desc: "Audio Books"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: "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: form[action="index.php?page=login&returnto=index.php"] table tr td span
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+download:
+  before:
+    path: thanks.php
+    method: post
+    inputs:
+      infohash: "{{ .DownloadUri.Query.id }}"
+      thanks: 1
+      rndval: "1487013827343"
+  selector: a[href^="download.php?id="]
+  attribute: href
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ range .Categories }}{{.}};{{end}}"
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+    # does not support imdbid search and does not ruturn imdb link in results
+
+  rows:
+    selector: table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
+
+  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="]
+    banner:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
+    details:
+      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
+      attribute: href
+    download:
+      selector: a[href^="index.php?page=downloadcheck&id="]
+      attribute: href
+    size:
+      selector: p:contains("Μέγεθος:")
+      filters:
+        - name: replace
+          args: ["Μέγεθος: ", ""]
+    date:
+      selector: p:contains("Προστέθηκε:")
+      filters:
+        - name: replace
+          args: ["Προστέθηκε: ", ""]
+        - name: append
+          args: " +02:00"
+        - name: dateparse
+          args: "15:04:05 02/01/2006 -07:00"
+    seeders:
+      selector: p:has(a[href^="index.php?page=peers&id="]) > a:first-child
+    leechers:
+      selector: p:has(a[href^="index.php?page=peers&id="]) > a:nth-child(2)
+    grabs:
+      selector: p:has(a[href^="index.php?page=peers&id="]) > a:last-child
+      filters:
+        - name: replace
+          args: ["---", "0"]
+    downloadvolumefactor:
+      case:
+        img[alt="Gold 100% Free"]: 0
+        img[alt="Silver 50% Free"]: 0.5
+        img[alt="Bronze 25% Free"]: 0.75
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[alt="2x Upload Multiplier"]: 2
+        img[alt="3x Upload Multiplier"]: 3
+        img[alt="4x Upload Multiplier"]: 4
+        img[alt="5x Upload Multiplier"]: 5
+        img[alt="6x Upload Multiplier"]: 6
+        img[alt="7x Upload Multiplier"]: 7
+        img[alt="8x Upload Multiplier"]: 8
+        img[alt="9x Upload Multiplier"]: 9
+        img[alt="10x Upload Multiplier"]: 10
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+#  xbtitFM v3.0.00

src/Jackett.Common/Definitions/hon3yhd.yml

@@ -14,9 +14,11 @@ caps:
     - {id: 70, cat: Movies/3D, desc: "3D Movies"}
     - {id: 30, cat: Movies/BluRay, desc: "720p BluRay"}
     - {id: 68, cat: TV/Anime, desc: "Animation"}
+    - {id: 73, cat: TV/Anime, desc: "Anime"}
     - {id: 9, cat: Movies/BluRay, desc: "BD25"}
     - {id: 10, cat: Movies/BluRay, desc: "BD50"}
     - {id: 8, cat: Movies/DVD, desc: "DVD5"}
+    - {id: 71, cat: Movies, desc: "Bengali Movies"}
     - {id: 7, cat: Movies/DVD, desc: "DvD9"}
     - {id: 1, cat: Movies/SD, desc: "DVDRips"}
     - {id: 26, cat: Books, desc: "Ebooks"}
@@ -28,6 +30,7 @@ caps:
     - {id: 21, cat: TV, desc: "Hollywood TV"}
     - {id: 20, cat: TV, desc: "Indian TV"}
     - {id: 18, cat: Movies, desc: "Malayalam Movies"}
+    - {id: 72, cat: Movies, desc: "Marathi Movies"}
     - {id: 25, cat: Audio, desc: "Music"}
     - {id: 24, cat: Audio/Video, desc: "Music Videos"}
     - {id: 5, cat: Movies, desc: "Pakistani Movies"}
@@ -69,12 +72,14 @@ search:
   paths:
     - path: browse.php
   inputs:
-    $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    searchin: "title"
-    incldead: "1"
+    # title, descr, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
   keywordsfilters:
-    # by default the search returns unordered resuts of an OR query making the results useless in many cases, adding + to the keywords improves the situration (Issue #1859)
+    # by default the search returns unordered resuts of an OR query making the results useless in many cases, adding + to the keywords improves the situation (Issue #1859)
     - name: re_replace # replace special characters with " +"
       args: ["[^\\w\\d]+", " +"]
     - name: prepend
@@ -122,8 +127,15 @@ search:
       selector: td:nth-child(6)
     downloadvolumefactor:
       case:
-        "a.info > b:contains(\"Free\")": "0"
-        "*": "1"
+        "a.info > b:contains(\"Free\")": 0
+        "*": 1
     uploadvolumefactor:
       case:
-        "*": "1"
+        "a.info > b:contains(\"Double Upload\")": 2
+        "*": 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/hush.yml

@@ -22,6 +22,18 @@ caps:
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
 
+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
   method: form
@@ -65,6 +77,7 @@ search:
     sort: created_at
     direction: desc
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -112,31 +125,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace

src/Jackett.Common/Definitions/idope.yml

@@ -7,15 +7,16 @@ type: public
 encoding: UTF-8
 links:
   - https://idope.se/
-  - https://idope.unblocked.bar/
-  - https://idope.proxyportal.pw/
-  - https://idope.uk-unblock.pro/
+  - https://idope.unblocked.rest/
 legacylinks:
   - https://idope.black-mirror.xyz/
   - https://idope.unblocked.casa/
   - https://idope.proxyportal.fun/
   - https://idope.uk-unblock.xyz/
   - https://idope.ind-unblock.xyz/
+  - https://idope.unblocked.bar/
+  - https://idope.proxyportal.pw/
+  - https://idope.uk-unblock.pro/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/immortuos.yml

@@ -28,6 +28,18 @@ caps:
     movie-search: [q, imdbid]
     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
+
 login:
   path: login
   method: form
@@ -70,6 +82,7 @@ search:
     sort: created_at
     direction: desc
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -117,31 +130,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace

src/Jackett.Common/Definitions/isohunt2.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://isohunt.nz/
+  - https://isohunt.tv/
 legacylinks:
   - https://isohunt2.net/
 

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

@@ -523,12 +523,21 @@ caps:
     music-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+
+#  - name: username
+#    type: text
+#    label: Username
+#  - name: password
+#    type: password
+#    label: Password
+
   - name: striprussian
     type: checkbox
     label: Strip Russian Letters
@@ -551,20 +560,28 @@ settings:
       "1": "asc"
 
 login:
-  path: login.php
-  method: form
-  form: form[action="login.php"]
+  method: cookie
   inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    redirect: /
-    autologin: on
-  error:
-    - selector: table.error
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href="./login.php?logout=1"]
 
+# login:
+#  path: login.php
+#  method: form
+#  form: form[action="login.php"]
+#  inputs:
+#    login_username: "{{ .Config.username }}"
+#    login_password: "{{ .Config.password }}"
+#    redirect: /
+#    autologin: on
+#  error:
+#    - selector: table.error
+#  test:
+#    path: index.php
+#    selector: a[href="./login.php?logout=1"]
+
 search:
   paths:
     - path: tracker.php

src/Jackett.Common/Definitions/jptv.yml

@@ -0,0 +1,190 @@
+---
+id: jptv
+name: JPTV
+description: "JPTV is a JAPANESE Private Torrent Tracker for JAPANESE TV / MOVIES"
+language: ja-JP
+type: private
+encoding: UTF-8
+links:
+  - https://jptv.club/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 6, cat: TV, desc: "ts Firehose (RAW TS)"}
+    - {id: 7, cat: TV/Anime, desc: "Anime Movies"}
+    - {id: 9, cat: TV/Anime, desc: "Anime Series"}
+    - {id: 8, cat: Audio, desc: "Music"}
+
+  modes:
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+
+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"]
+
+ratio:
+  path: /
+  selector: li:has(i.fa-sync-alt)
+  filters:
+    - name: regexp
+      args: "Ratio : (\\d+)"
+
+search:
+  paths:
+    - path: torrents/filter
+  inputs:
+    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    description: ""
+    uploader: ""
+    imdb: "{{ .Query.IMDBIDShort }}"
+    tvdb: ""
+    tmdb: ""
+    mal: ""
+    igdb: ""
+    sorting: "{{ .Config.sort }}"
+    sort: "{{ .Config.sort }}"
+    direction: "{{ .Config.type }}"
+    qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table > tbody > tr
+
+  fields:
+    category:
+      selector: a[href*="/categories/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "/categories/(\\d+)"
+    title:
+      selector: a.view-torrent
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    details:
+      selector: a.view-torrent
+      attribute: href
+    banner:
+      optional: true
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/600x900", ""]
+    comments:
+      selector: a[href*="#comments"]
+      attribute: href
+    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:
+      optional: true
+      selector: a[href*="imdb.com/title/tt"]
+      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
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+    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
+# UNIT3D 2.5.0

src/Jackett.Common/Definitions/karagarga.yml

@@ -118,21 +118,15 @@ search:
       selector: td:nth-child(13)
     leechers:
       selector: td:nth-child(14)
-    subs:
-      text: ""
     subs:
       selector: span:contains("Subs:")
       optional: true
-    genre:
-      text: ""
     genre:
       selector: td:nth-child(5)
       optional: true
       filters:
         - name: prepend
           args: "Genre: "
-    mom:
-      text: ""
     mom:
       selector: img[title^="CURRENT"]
       attribute: title

src/Jackett.Common/Definitions/keepfriends.yml

@@ -50,6 +50,10 @@ settings:
     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 KeepFriends Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: english_title
     type: checkbox
     label: "Use English titles instead of Chinese ones (when available)."
@@ -94,14 +98,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: 0
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl, 5 douban keywords
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/kickasstorrent-kathow.yml

@@ -8,7 +8,8 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://kickass.ws/
-  - https://kickass.unblockit.id/
+  - https://kickass.unblockit.top/
+  - https://kickasstorrents.unblockninja.com/
 legacylinks:
   - https://kickass.gg/
   - https://katcr.io/
@@ -16,13 +17,14 @@ legacylinks:
   - https://thekat.se/
   - https://kat.how/
   - https://kat.li/
-  - https://kickasstorrents.unblockninja.com/ # kickasstorrent proxy, not kickasstorrent-kathow
   - https://katcr.to/ # possible 3rd kickasstorrent site/clone?
   - https://kickasstorrent.cr/ # possible 3rd kickasstorrent site/clone?
   - https://kickass.unblockit.pro/
   - https://kickass.unblockit.one/
   - https://kickass.unblockit.me/
   - https://kickass.unblockit.pw/
+  - https://kickass.unblockit.id/
+  - https://kickass.unblockit.win/
 
 caps:
   categories:

src/Jackett.Common/Definitions/kickasstorrent.yml

@@ -8,6 +8,9 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://newkatcr.co/
+  - https://kat.root.yt/
+  - https://kat.unblockit.top/
+  - https://katcr.unblocked.rest/
 legacylinks:
   - https://kickasstorrent.cr/ # possible 3rd kickasstorrent site/clone?
   - https://katcr.to/ # possible 3rd kickasstorrent site/clone?
@@ -19,10 +22,10 @@ legacylinks:
   - https://katcr.ind-unblock.xyz/
   - https://kat.unblockit.me/
   - https://kat.unblockit.pw/
-  - https://kickasstorrents.unblockninja.com/ # down
   - https://katcr.co/
-  - https://kat.root.yt/
   - https://kat.unblockit.id/
+  - https://kat.unblockit.win/
+  - https://kickasstorrents.unblockninja.com/ # now kickasstorrent-kathow proxy
   - https://katcr.unblocked.bar/
   - https://katcr.proxyportal.pw/
   - https://katcr.uk-unblock.pro/

src/Jackett.Common/Definitions/korsar.yml

@@ -6,10 +6,11 @@ language: ru-ru
 type: semi-private
 encoding: UTF-8
 links:
-  - https://korsar.info/
-legacylinks:
   - http://korsar.tv/
+legacylinks:
+  - https://korsar.tv/
   - http://korsar.info/
+  - https://korsar.info/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/leaguehd.yml

@@ -46,7 +46,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -80,14 +83,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/learnflakes.yml

@@ -65,6 +65,10 @@ settings:
     options:
       "desc": "desc"
       "asc": "asc"
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are getting the error <b>Found no results while trying to browse this tracker</b> then first access the site with your browser and check that you are not being forced to change your password because it has expired after 180 days."
 
 login:
   path: ?p=home&pid=1

src/Jackett.Common/Definitions/legacyhd.yml

@@ -33,6 +33,10 @@ settings:
   - 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
@@ -92,6 +96,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -139,31 +144,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace
@@ -186,4 +191,7 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-# UNIT3D 2.2.7
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# UNIT3D 2.3.0

src/Jackett.Common/Definitions/liaorencili.yml

@@ -6,6 +6,28 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
+  - http://www.cilinb1.xyz/
+  - http://www.cilinb2.xyz/
+  - http://www.cilinb3.xyz/
+  - http://www.cilinb4.xyz/
+  - http://www.cilinb5.xyz/
+  - http://www.cilinb6.xyz/
+  - http://www.cilinb7.xyz/
+  - http://www.cilinb8.xyz/
+  - http://www.cilinb9.xyz/
+  - http://www.cilinb10.xyz/
+legacylinks:
+  - http://www.cili180.com/
+  - https://www.cilijj.xyz/
+  - https://www.liaorenso.xyz/
+  - https://www.liaorenso11.xyz/
+  - https://www.liaorenso12.xyz/
+  - https://www.liaorenso19.xyz/
+  - http://lrcili.xyz/ # proxy list only
+  - http://www.lrcili.xyz/ # proxy list only
+  - https://www.lrcili1.xyz/ # ERR_CONNECTION_TIMED_OUT
+  - https://www.lrcili2.xyz/ # ERR_CONNECTION_TIMED_OUT
+  - https://www.lrcili7.xyz/ # 404 Not Found
   - https://www.lrcili3.xyz/
   - https://www.lrcili4.xyz/
   - https://www.lrcili5.xyz/
@@ -38,29 +60,7 @@ links:
   - http://www.lrsoso8.xyz/
   - http://www.lrsoso9.xyz/
   - http://www.lrsoso10.xyz/
-  - http://www.cilinb1.xyz/
-  - http://www.cilinb2.xyz/
-  - http://www.cilinb3.xyz/
-  - http://www.cilinb4.xyz/
-  - http://www.cilinb5.xyz/
-  - http://www.cilinb6.xyz/
-  - http://www.cilinb7.xyz/
-  - http://www.cilinb8.xyz/
-  - http://www.cilinb9.xyz/
-  - http://www.cilinb10.xyz/
   - http://www.cilijj.xyz/
-legacylinks:
-  - http://www.cili180.com/
-  - https://www.cilijj.xyz/
-  - https://www.liaorenso.xyz/
-  - https://www.liaorenso11.xyz/
-  - https://www.liaorenso12.xyz/
-  - https://www.liaorenso19.xyz/
-  - http://lrcili.xyz/ # proxy list only
-  - http://www.lrcili.xyz/ # proxy list only
-  - https://www.lrcili1.xyz/ # ERR_CONNECTION_TIMED_OUT
-  - https://www.lrcili2.xyz/ # ERR_CONNECTION_TIMED_OUT
-  - https://www.lrcili7.xyz/ # 404 Not Found
 
 caps:
   categories:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -12,7 +12,7 @@ links:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.unblockit.id/
+  - https://limetorrents.unblockit.top/
 legacylinks:
   - https://www.limetorrents.io/
   - https://www.limetorrents.cc/
@@ -31,6 +31,8 @@ legacylinks:
   - https://limetorrents.unblockninja.com/ # search fails in Jackett and browser
   - https://limetorrents.unblockit.me/
   - https://limetorrents.unblockit.pw/
+  - https://limetorrents.unblockit.id/
+  - https://limetorrents.unblockit.win/
 
 caps:
   categories:

src/Jackett.Common/Definitions/magico.yml

@@ -126,10 +126,12 @@ search:
   paths:
     - path: /
   keywordsfilters:
+    - name: re_replace # add brackets to year on searchquery if missing
+      args: ["\\(*((19|20)\\d{2})\\)*", "($1)"]
     - name: replace # use this as a workaround till #893 is implemented
       args: ["Greys Anatomy", "Grey's Anatomy"]
     - name: re_replace
-      args: ["[^\\w\\d]+", "%"]
+      args: ["[^\\w\\d\\(\\)]+", "%"]
   inputs:
     p: torrents
     pid: 32
@@ -195,9 +197,15 @@ search:
       attribute: data-time
     date:
       optional: true
-      selector: div.torrentOwner:not(:has(abbr.timeago))
+      selector: div.torrentOwner:not(:has(abbr.timeago)):contains("day"), div.torrentOwner:not(:has(abbr.timeago)):contains("σήμερα"), div.torrentOwner:not(:has(abbr.timeago)):contains("εχθές"), div.torrentOwner:not(:has(abbr.timeago)):contains("Δευτέρα"), div.torrentOwner:not(:has(abbr.timeago)):contains("Τρίτη"), div.torrentOwner:not(:has(abbr.timeago)):contains("Τετάρτη"), div.torrentOwner:not(:has(abbr.timeago)):contains("Πέμπτη"), div.torrentOwner:not(:has(abbr.timeago)):contains("Παρασκευή"), div.torrentOwner:not(:has(abbr.timeago)):contains("Σάββατο"), div.torrentOwner:not(:has(abbr.timeago)):contains("Κυριακή")
       remove: span
       filters:
+        - name: replace
+          args: ["Uploaded ", ""]
+        - name: replace
+          args: [" by", ""]
+        - name: replace
+          args: ["at ", ""]
         - name: replace
           args: ["Ανέβηκε ", ""] # Uploaded
         - name: replace
@@ -224,6 +232,26 @@ search:
           args: ["Σάββατο", "Saturday"]
         - name: replace
           args: ["Κυριακή", "Sunday"]
+        - name: fuzzytime
+    date:
+      optional: true
+      selector: div.torrentOwner:not(:has(abbr.timeago)):contains("-")
+      remove: span
+      filters:
+        - name: replace
+          args: ["Uploaded ", ""]
+        - name: replace
+          args: [" by", ""]
+        - name: replace
+          args: ["at ", ""]
+        - name: replace
+          args: ["Ανέβηκε ", ""] # Uploaded
+        - name: replace
+          args: [" από", ""] # by
+        - name: replace
+          args: [" τον/την", ""] # him/her
+        - name: replace
+          args: ["στις ", ""] # at
         - name: dateparse
           args: "02-01-2006 15:04"
     date:

src/Jackett.Common/Definitions/magnet4you.yml

@@ -7,9 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://magnet4you.me/
-  - https://magnet4you.unblocked.bar/
-  - https://magnet4you.proxyportal.pw/
-  - https://magnet4you.uk-unblock.pro/
+  - https://magnet4you.unblocked.rest/
 legacylinks:
   - http://magnet4you.me/
   - https://magnet4you.black-mirror.xyz/
@@ -17,6 +15,9 @@ legacylinks:
   - https://magnet4you.proxyportal.fun/
   - https://magnet4you.uk-unblock.xyz/
   - https://magnet4you.ind-unblock.xyz/
+  - https://magnet4you.unblocked.bar/
+  - https://magnet4you.proxyportal.pw/
+  - https://magnet4you.uk-unblock.pro/
 
 caps:
   categories:

src/Jackett.Common/Definitions/magnetdl.yml

@@ -10,7 +10,7 @@ links:
   - https://www.magnetdl.com/
   - https://www.magnetdl.org/
   - https://magnetdl.unblockninja.com/
-  - https://magnetdl.unblockit.id/
+  - https://magnetdl.unblockit.top/
 legacylinks:
   - http://www.magnetdl.com/
   - https://www.magnetdl.me/ # fake
@@ -18,6 +18,8 @@ legacylinks:
   - https://magnetdl.unblockit.one/
   - https://magnetdl.unblockit.me/
   - https://magnetdl.unblockit.pw/
+  - https://magnetdl.unblockit.id/
+  - https://magnetdl.unblockit.win/
 
 caps:
   categories:

src/Jackett.Common/Definitions/moecat.yml

@@ -42,7 +42,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -77,16 +80,16 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead 3 noimdb 4 seedless
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead, 3 noimdb, 4 seedless
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30% 8 all promotions
-    spstate: 0
-    # 0 all 1 hot 2 classic 3 recomended 4 normal
+    # 0 all, 1 norma,l 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%, 8 all promotions
+    spstate: "{{ if .Config.freeleech }}8{{ else }}0{{ end }}"
+    # 0 all, 1 hot, 2 classic, 3 recomended, 4 normal
     picktype: 0
-    # 0 title 3 uploaded 4 movie info 5 video id 6 torrent hash 7 seed activity
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 title, 3 uploader, 4 movie info, 5 video id, 6 torrent hash, 7 seed activity
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/monova.yml

@@ -10,9 +10,7 @@ links:
   - https://monova.org/
   - https://monova.to/
   - https://monova.unblockit.id/
-  - https://monova.unblocked.bar/
-  - https://monova.proxyportal.pw/
-  - https://monova.uk-unblock.pro/
+  - https://monova.unblocked.rest/
 legacylinks:
   - https://monova.unblockninja.com/ # currently redirects to https://monova.org/
   - https://monova.unblockit.pro/
@@ -24,6 +22,9 @@ legacylinks:
   - https://monova.ind-unblock.xyz/
   - https://monova.unblockit.me/
   - https://monova.unblockit.pw/
+  - https://monova.unblocked.bar/
+  - https://monova.proxyportal.pw/
+  - https://monova.uk-unblock.pro/
 
 caps:
   categories:

src/Jackett.Common/Definitions/movcr.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://movcr.to/
+  - https://movcr.st/
 legacylinks:
   - https://movcr.tv/
   - https://movcr.black-mirror.xyz/
@@ -17,6 +17,7 @@ legacylinks:
   - https://movcr.unblocked.bar/ # some torrent links are broken if 'movcr.to' is in its name
   - https://movcr.proxyportal.pw/ # some torrent links are broken if 'movcr.to' is in its name
   - https://movcr.uk-unblock.pro/ # some torrent links are broken if 'movcr.to' is in its name
+  - https://movcr.to/
 
 caps:
   categories:

src/Jackett.Common/Definitions/mteamtp.yml

@@ -61,6 +61,10 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: info
     type: info
     label: ""
@@ -116,14 +120,14 @@ search:
       categories: [406, 408, 434]
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdb url
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 and 1 or 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb url
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 and, 1 or, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -62,7 +62,10 @@ settings:
     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: infotitle
     type: info
     label: About Titles
@@ -113,14 +116,14 @@ search:
       categories: [406, 408, 434]
   inputs:
     $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-    search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdb url
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0 and 1 or 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdb url
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/muziekfabriek.yml

@@ -1,9 +1,9 @@
 ---
 id: muziekfabriek
 name: MuziekFabriek
-description: "MuziekFabriek is a DUTCH Semi-Private Torrent Tracker for MUSIC"
+description: "MuziekFabriek is a DUTCH Private Torrent Tracker for MUSIC"
 language: nl-NL
-type: semi-private
+type: private
 encoding: UTF-8
 links:
   - https://www.muziekfabriek.org/
@@ -51,6 +51,10 @@ login:
     path: /
     selector: :has(a[href="logout.php"])
 
+download:
+  selector: a[href^="download.php?id="]
+  attribute: href
+
 search:
   paths:
     - path: browse.php
@@ -77,7 +81,7 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      selector: a[href^="download.php?id="]
+      selector: a[href^="details.php?id="]
       attribute: href
     banner:
       selector: div[id^="Style"] img

src/Jackett.Common/Definitions/mypornclub.yml

@@ -7,6 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://myporn.club/
+certificates:
+  - da470bec581812000ee09a68fd62dff7a3f50127 # expired 05 aug 20
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/noname-club.yml

@@ -74,6 +74,7 @@ caps:
     - {id: 1300, cat: TV, desc: " |- Сериалы ближнего зарубежья"}
     - {id: 770, cat: TV, desc: " |- Латиноамериканские сериалы"}
     - {id: 922, cat: TV, desc: " |- Азиатские сериалы"}
+    - {id: 1320, cat: TV, desc: " |- Турецкие сериалы"}
     - {id: 780, cat: TV, desc: " |- Сериалы без перевода (украинская звуковая дорожка)"}
     - {id: 781, cat: TV, desc: " |- Сериалы без перевода"}
     - {id: 769, cat: TV, desc: "Отечественные сериалы"}
@@ -89,7 +90,6 @@ caps:
     - {id: 796, cat: TV, desc: " |- Солдаты"}
     - {id: 792, cat: TV, desc: " |- Счастливы вместе"}
     - {id: 795, cat: TV, desc: " |- Универ"}
-    - {id: 1307, cat: TV, desc: "Релизы от FTP85"}
     # anime
     - {id: 615, cat: TV/Anime, desc: "Манга и Арт"}
     - {id: 616, cat: TV/Anime, desc: " |- Манга"}

src/Jackett.Common/Definitions/nyaasi.yml

@@ -14,9 +14,9 @@ legacylinks:
   - https://nyaa.proxyportal.fun/
   - https://nyaa.uk-unblock.xyz/
   - https://nyaa.ind-unblock.xyz/
-  - https://nyaa.unblocked.bar/ # only magnets work in Jackett
-  - https://nyaa.proxyportal.pw/ # only magnets work in Jackett
-  - https://nyaa.uk-unblock.pro/ # only magnets work in Jackett
+  - https://nyaa.unblocked.bar/
+  - https://nyaa.proxyportal.pw/
+  - https://nyaa.uk-unblock.pro/
 
 settings:
   - name: filter-id

src/Jackett.Common/Definitions/onejav.yml

@@ -42,24 +42,18 @@ search:
       selector: img
       attribute: src
       optional: true
-    actress:
-      text: ""
     actress:
       selector: a[href^="/actress/"]
       optional: true
       filters:
         - name: prepend
           args: "Actress: "
-    tags:
-      text: ""
     tags:
       selector: div.tags
       optional: true
       filters:
         - name: prepend
           args: "Tags: "
-    descr:
-      text: ""
     descr:
       selector: p.level
       optional: true

src/Jackett.Common/Definitions/onlyscene.yml

@@ -30,6 +30,10 @@ settings:
   - 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
@@ -89,6 +93,7 @@ search:
     sort: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -136,31 +141,31 @@ search:
     date:
       selector: time
       filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese
         - name: re_replace
           args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
         - name: re_replace
           args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
         - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
         - name: re_replace
           args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
         - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
         - name: re_replace
           args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
         - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
         - name: re_replace
           args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
         - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
         - name: re_replace
           args: ["(?i) (ay)", "month"]
         - name: re_replace
           args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
         - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
         - name: re_replace
           args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
         - name: re_replace

src/Jackett.Common/Definitions/oshenpt.yml

@@ -36,6 +36,10 @@ settings:
   - 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
@@ -78,14 +82,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0 incldead 1 active 2 dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
-    spstate: 0
-    # 0 title 1 descr 3 uploaded 4 imdburl # imdburl daos not find tt1634106 but description does.
-    search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
-    # 0 AND 1 OR 2 exact
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (imdburl does not find tt1634106 but description does).
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"

src/Jackett.Common/Definitions/ourbits.yml

@@ -36,6 +36,10 @@ settings:
     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: info_tpp
     type: info
     label: Results Per Page
@@ -63,14 +67,14 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-    # 0=including dead 1=active 2=dead
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
     incldead: 0
-    # show promotions: 0=all 1=normal 2=free 3=2x 4=2xFree 5=50% 6=2x50% 7=30%
-    spstate: 0
-    # 0=title 1=descr 3=uploader 4=imdb URL
-    search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
-    # 0=AND 1=OR 2=Exact
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
     search_mode: 0
 
   rows:

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,11 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.pw/
+  - https://www.oxtorrent.cc/
   - https://www.oxtorrent.co/
-  - https://oxtorrent.unblocked.bar/
-  - https://oxtorrent.proxyportal.pw/
-  - https://oxtorrent.uk-unblock.pro/
+  - https://oxtorrent.unblocked.rest/
 legacylinks:
   - https://wwv.oxtorrent.com/
   - https://www.smartorrent.tv/
@@ -21,6 +19,10 @@ legacylinks:
   - https://oxtorrent.uk-unblock.xyz/
   - https://oxtorrent.ind-unblock.xyz/
   - https://www.oxtorrent.com/
+  - https://www.oxtorrent.pw/
+  - https://oxtorrent.unblocked.bar/
+  - https://oxtorrent.proxyportal.pw/
+  - https://oxtorrent.uk-unblock.pro/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pctorrent.yml

@@ -6,6 +6,8 @@ language: ru-ru
 type: public
 encoding: windows-1251
 links:
+  - https://pc-torrent.pro/
+legacylinks:
   - https://pc-torrent.org/
 
 caps:

src/Jackett.Common/Definitions/piratadigital.yml

@@ -0,0 +1,196 @@
+---
+id: piratadigital
+name: Pirata Digital
+description: "Pirata Digital (PD) is a Private Torrent Tracker for HD MOVIES / TV"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://pirata.digital/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {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"}
+
+  modes:
+    search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+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"]
+
+ratio:
+  path: /
+  selector: li:has(i.fa-sync-alt)
+  filters:
+    - name: regexp
+      args: "Ratio : (\\d+)"
+
+search:
+  paths:
+    - path: torrents/filter
+  inputs:
+    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+    description: ""
+    uploader: ""
+    imdb: "{{ .Query.IMDBIDShort }}"
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
+    mal: ""
+    igdb: ""
+    sorting: "{{ .Config.sort }}"
+    sort: "{{ .Config.sort }}"
+    direction: "{{ .Config.type }}"
+    qty: 100
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table > tbody > tr
+
+  fields:
+    category:
+      selector: a[href*="/categories/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "/categories/(\\d+)"
+    title:
+      selector: a.view-torrent
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    details:
+      selector: a.view-torrent
+      attribute: href
+    banner:
+      optional: true
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/600x900", ""]
+    comments:
+      selector: a[href*="#comments"]
+      attribute: href
+    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:
+      optional: true
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    tmdbid:
+      optional: true
+      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
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+    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
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# UNIT3D 2.7.0