oncesearch: change to public

This reverts commit 24cdbf9e1c.

README.md

@@ -39,6 +39,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BigFANGroup
  * BitRu
  * BT.etree
+ * BT4G
  * BTDB
  * BTDIGG
  * BTSOW
@@ -72,7 +73,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * kickasstorrents (kickass.ws)
+ * kickasstorrents.ws
  * kickasstorrents.to
  * Legit Torrents
  * LePorno.info
@@ -82,8 +83,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Magnet4You
  * MejorTorrent
  * MixTapeTorrent
- * Monova
- * MovCr
+ * Montorrent
  * MoviesDVDR
  * MyPornClub
  * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
@@ -93,6 +93,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NoNaMe Club (NNM-Club)
  * Nyaa-Pantsu
  * Nyaa.si
+ * OnceSearch
  * OneJAV
  * OxTorrent
  * ParnuXi
@@ -104,6 +105,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLive
  * PornoRip
  * PornoTor
+ * Portugas
  * ProPorn
  * ProStyleX
  * Rapidzona
@@ -118,23 +120,23 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ShizaProject
  * shokweb
  * ShowRSS
- * SkyTorrentsClone (*.lol)
- * SkyTorrentsClone2 (*.to)
+ * SkyTorrents.to
  * Solid Torrents
  * sosulki
+ * SubsPlease
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
  * Tokyo Tosho
  * Torlock
  * TOROS
- * Torrent Bomb (토렌트봄)
  * Torrent Downloads (TD)
  * Torrent Oyun indir
+ * Torrent Paradise (ML)
  * torrent-pirat
  * Torrent4You
  * Torrent9
- * Torrent9Clone
+ * Torrent9 clone
  * TorrentDownload
  * TorrentFunk
  * TorrentGalaxy (TGx)
@@ -220,17 +222,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2 Fast 4 You
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
- * 3evils
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
  * Abnormal [![(invite needed)][inviteneeded]](#)
+ * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
+ * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
  * Aidoru!Online
  * Aither
  * AlphaRatio (AR)
  * AmigosShareClub
+ * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
  * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
@@ -240,9 +244,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AsianCinema
  * Asylum Share
  * AudioNews (AN)
- * Audiobook Torrents (ABT + RNS)
  * AvistaZ (AsiaTorrents)
- * Awesome-HD (AHD)
  * Borgzelle
  * Back-ups
  * bB
@@ -251,7 +253,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BeyondHD (BHD)
  * Bibliotik
  * BIGTorrent
- * BigTower
  * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
  * BIT-HDTV
  * BiT-TiTAN
@@ -286,10 +287,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Cinemageddon
  * Cinematik
  * Classix
+ * Coastal-Crew
  * Concertos
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
+ * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
  * Dark Tracker
@@ -302,7 +305,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DigitalCore
  * DivTeam
  * DivxTotal
- * DocumentaryTorrents (DT)
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * DXDHD
  * EbookParadijs
@@ -318,6 +320,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * FANO.IN
  * Fantastic Heaven
+ * FeedUrNeed
  * Femdomcult
  * FileList (FL)
  * Film-Paleis
@@ -326,7 +329,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FocusX
  * Fou-Du-Cinema
  * FreeTorrent
- * FullMixMusic
  * FunFile (FF)
  * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
  * FunReleases [![(invite needed)][inviteneeded]](#)
@@ -344,7 +346,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GreekDiamond
  * Greek Team
  * HaiDan
- * HacheDe
  * HD Dolby [![(invite needed)][inviteneeded]](#)
  * HD-Bits.com
  * HD-Forever (HDF)
@@ -355,17 +356,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HD-Torrents (HDT)
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDArea (HDA)
+ * HDAtmos
  * HDBits
  * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing)
  * HDC (HDCiTY)
  * HDCity
- * HDDisk (HDD)
  * HDHome (HDBigger)
  * HDME
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky
- * HDStreet
  * HDTime
  * HDTorrents.it
  * HDTurk [![(invite needed)][inviteneeded]](#)
@@ -416,12 +416,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NetLab
- * New Real World [![(invite needed)][inviteneeded]](#)
  * NorBits
  * notwhat.cd
  * oMg[WtF]trackr
  * OnlineSelfEducation
- * ONLYscene
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -442,7 +440,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
- * Psytorrents [![(invite needed)][inviteneeded]](#)
  * PTerClub
  * PTFiles (PTF)
  * PThome
@@ -483,6 +480,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
  * SpringSunday
+ * SugoiMusic
  * Superbits (SBS)
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
@@ -501,6 +499,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
  * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheLeachZone
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * ToTheGlory (TTG)
@@ -525,6 +524,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
  * Torrentland
  * TotallyKids (TK)
+ * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
  * TTsWEB

azure-pipelines.yml

@@ -301,14 +301,14 @@ stages:
               targetType: inline
               failOnStderr: true
               script: |
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/DateTimeRoutines
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Common
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Server
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Service
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Test
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Tray
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Updater
+                dotnet-format --check --verbosity diagnostic --folder ./src/DateTimeRoutines
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Common
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Server
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Service
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Test
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Tray
+                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Updater
 
       - job: Linting_YAML
         displayName: Linting YAML

src/Jackett.Common/Content/index.html

@@ -25,7 +25,7 @@
     <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
     <script type="text/javascript" src="../libs/handlebars.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/moment.min.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=20210117"></script>
     <script type="text/javascript" src="../libs/handlebarsextend.js?changed=2017083001"></script>
     <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>

src/Jackett.Common/Content/libs/handlebarsmoment.js

@@ -33,5 +33,5 @@ Handlebars.registerHelper('jacketTimespan', function (context, block) {
 });
 
 Handlebars.registerHelper('jacketSize', function (context, block) {
-    return filesize(context, { round: 1 });
+    return filesize(context, { round: 2 });
 });

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

@@ -14,7 +14,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.dev/
+  - https://1337x.unblockit.link/
   - https://1337x.unblocked.monster/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -36,8 +36,10 @@ legacylinks:
   - https://1337x.unblockit.top/
   - https://1337x.unblockit.lat/
   - https://1337x.unblockit.app/
-  - https://1337x.unblocked.rest/
   - https://1337.root.yt/
+  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.dev/
+  - https://1337x.unblockit.ltd/
 
 caps:
   categorymappings:

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

@@ -1,188 +0,0 @@
----
-id: 3evils
-name: 3evils
-description: "3evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
-type: private
-encoding: UTF-8
-links:
-  - https://www.3evils.net/
-legacylinks:
-  - https://www.3evils.com/
-  - https://the-unknown.xyz/
-
-caps:
-  categorymappings:
-    - {id: 73, cat: PC, desc: "Appz/Linux"}
-    - {id: 42, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 65, cat: Books/EBook, desc: "Books"}
-    - {id: 80, cat: Console/NDS, desc: "Games/Nintendo"}
-    - {id: 78, cat: Console/PS4, desc: "Games/PS4"}
-    - {id: 77, cat: PC/Games, desc: "Games/Windows"}
-    - {id: 79, cat: Console/XBox, desc: "Games/XBOX"}
-    - {id: 13, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 71, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 72, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
-    - {id: 14, cat: Movies, desc: "Movies/Packs"}
-    - {id: 70, cat: Movies/SD, desc: "Movies/Screeners & Cams"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
-    - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 11, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 74, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 33, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 32, cat: Audio, desc: "Music/Packs"}
-    - {id: 75, cat: Audio/Video, desc: "Music/Videos"}
-    - {id: 6, cat: TV, desc: "TV/Packs"}
-    - {id: 3, cat: TV/HD, desc: "TV/x264"}
-    - {id: 4, cat: TV/HD, desc: "TV/x265"}
-    - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-  error:
-    - selector: div.callout:contains("Login failed!")
-  test:
-    path: /
-    selector: a[href*="/logout.php?hash_please="]
-
-search:
-  paths:
-    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # title, descr, genre, all
-    searchin: title
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.unstriped tbody tr:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.*?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
-        # <img src=\'./pic/noposter.png\'
-        - name: regexp
-          args: "src=\\\\'(.+?)\\\\'"
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    files:
-      selector: td[data-label="Files"]
-    # 2 flavours of dates
-    date:
-      # Today<br> 10:20 AM
-      # Yesterday<br> 08:03 PM
-      optional: true
-      selector: td[data-label="Added"]:contains("day")
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-    date:
-      # Feb 14 2019<br> 10:20 AM
-      optional: true
-      selector: td[data-label="Added"]:not(:contains("day"))
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
-    size:
-      selector: td[data-label="Size"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td[data-label="Seeders"]
-    leechers:
-      selector: td[data-label="Leechers"]
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5 (customised)

src/Jackett.Common/Definitions/DasUnerwartete.yml

@@ -61,6 +61,9 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: pin
+    type: text
+    label: Pin
 
 login:
   path: login.php
@@ -69,8 +72,9 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
   error:
-    - selector: .tablea:contains("Benutzername oder Passwort ungültig")
+    - selector: .tablea:contains("Benutzername, Passwort oder Pin ungültig")
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/abtorrents.yml

@@ -1,7 +1,7 @@
----
-id: audiobooktorrents
-name: Audiobook Torrents
-description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
+---
+id: abtorrents
+name: ABtorrents
+description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
 language: en-us
 type: private
 encoding: UTF-8
@@ -80,12 +80,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -96,17 +97,7 @@ settings:
     default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."
 
 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: 1
-    submitme: X
-  error:
-    - selector: td.embedded:has(h2:contains("Oops"))
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/acrossthetasman.yml

@@ -0,0 +1,83 @@
+---
+id: acrossthetasman
+name: Across The Tasman
+description: "ATT is a torrent site for Rugby and other sports played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://acrossthetasman.com/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    default: date
+    options:
+      date: created
+      filename: title
+      size: size
+      seeders: seeders
+  - name: order
+    type: select
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: post
+  path: login.php
+  inputs:
+    vb_login_username: "{{ .Config.username }}"
+    vb_login_password: "{{ .Config.password }}"
+    cookieuser: 1
+    do: login
+  test:
+    path: torrents.php
+
+search:
+  paths:
+    - path: "torrents.php?sort={{ .Config.sort }}&order={{ .Config.order}}&query={{ .Keywords }}"
+
+  rows:
+    selector: table[width='100%'][align='center']:not([class]) > tbody > tr
+
+  fields:
+    category:
+      text: 1
+    date:
+      # Feb 12, 2021
+      selector: td:nth-child(1)
+      filters:
+        - name: dateparse
+          args: "Jan 02, 2006"
+    title:
+      selector: td:nth-child(4) > span:nth-child(1)
+      filters:
+        - name: re_replace
+          args: ["[\\s]+Uploaded.*", ""]
+    download:
+      selector: a[href*="attachment.php?attachmentid="]
+      attribute: href
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    size:
+      selector: td:nth-child(10)
+# engine n/a

src/Jackett.Common/Definitions/aither.yml

@@ -199,4 +199,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# UNIT3D 4.0.0
+# UNIT3D 5.1.0

src/Jackett.Common/Definitions/anaschcc.yml

@@ -0,0 +1,158 @@
+---
+id: anaschcc
+name: anasch.cc
+description: "anasch.cc is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://anasch.cc/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: Movies}
+    - {id: 2, cat: TV, desc: TV}
+    - {id: 3, cat: TV, desc: Animation}
+    - {id: 5, cat: Audio, desc: Music}
+    - {id: 12, cat: XXX, desc: Porn}
+    - {id: 29, cat: TV/Sport, desc: Sports}
+    - {id: 37, cat: PC, desc: Software}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+
+login:
+  path: index.php?page=login
+  method: form
+  form: form[action^="index.php?page=login"]
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: div[data-validate^="Valid"]
+      message:
+        selector: div[data-validate^="Valid"]
+        attribute: data-validate
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    page: torrents
+    active: 0
+    search: "{{ .Keywords }}"
+    $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
+    # 1 freeleech, 2 2x upload, 3 featured
+    discount[]: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: "table.lista tbody tr:has(a[href^=\"index.php?page=torrent-details\"])"
+
+  fields:
+    category:
+      selector: td a[href^="index.php?page=torrents&category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: td a[href^="index.php?page=torrent-details"]
+    details:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: td a[href^="download.php"]
+      attribute: href
+    imdb:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: replace
+          args: ["javascript:ShowImage('/images/imdb/", "tt"]
+        - name: replace
+          args: [".jpg')", ""]
+        - name: replace
+          args: ["tt0000000", ""]
+    poster:
+      selector: td a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: replace
+          args: ["javascript:ShowImage('", ""]
+        - name: replace
+          args: ["')", ""]
+        - name: replace
+          args: ["/images/imdb/0000000.jpg", ""]
+    size:
+      selector: td:nth-child(5)
+    date:
+      # 22/01/2021 01:28
+      selector: td:nth-child(6)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
+        - name: dateparse
+          args: "02/01/2006 15:04 -07:00"
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+      filters:
+        - name: replace
+          args: ["---", "0"]
+    downloadvolumefactor:
+      case:
+        img[src*="freeleech.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src*="x2u.png"]: 2
+        "*": 1
+    minimumratio:
+      text: 3.0
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# xbtit

src/Jackett.Common/Definitions/anirena.yml

@@ -8,7 +8,11 @@ encoding: UTF-8
 links:
   - https://www.anirena.com/
 
-settings: []
+settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -7,11 +7,15 @@ type: public
 encoding: UTF-8
 links:
   - http://audiobookbay.nl/ # site forces http, does not support https
-  - https://audiobookbay.unblockit.dev/
+  - http://audiobookbay.net/
+  - http://audiobookbayabb.com/
+  - https://audiobookbay.unblockit.link/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
   - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
+  - https://audiobookbay.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/bigtower.yml

@@ -1,141 +0,0 @@
----
-id: bigtower
-name: BigTower
-description: "Big Tower is an ITALIAN Private site for TV / MOVIES / GENERAL"
-language: it-it
-type: private
-encoding: UTF-8
-links:
-  - http://bigtower.info/ # site does not support https NET::ERR_CERT_DATE_INVALID
-legacylinks:
-  - https://bigtower.info/
-
-caps:
-  categorymappings:
-
-    - {id: 11, cat: Movies/HD, desc: "DSS"}
-    - {id: 1, cat: Movies, desc: "Screener"}
-    - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
-    - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
-    - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
-    - {id: 6, cat: TV, desc: "Serie TV"}
-    - {id: 4, cat: TV/Anime, desc: "Cartoni"}
-    - {id: 7, cat: PC/Games, desc: "Giochi"}
-    - {id: 8, cat: Audio, desc: "Musica"}
-    - {id: 9, cat: PC/0day, desc: "Software"}
-    - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"}
-    - {id: 14, cat: Other, desc: "Varie & Altro"}
-    - {id: 13, cat: Books, desc: "Libri & Edicola"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: donor
-    type: checkbox
-    label: Show donor torrent? (Enable if you're a donor)
-    default: false
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: span:contains("Nome Utente non corretto")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    page: torrents
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    options: 0
-    active: 0
-
-  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{ if .Config.donor }}{{ else }}:not(:has(img[src*="keditbookmarks.png"])){{ end }}
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      filters:
-        - name: re_replace # rimozioni varie
-          args: ["(?i)(\\[Richiesta\\])", ""]
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["index.php?page=torrent-details&id=", "download.php?id="]
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    size:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(8)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    grabs:
-      selector: td:nth-last-child(5)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    seeders:
-      selector: td:nth-last-child(7)
-    leechers:
-      selector: td:nth-last-child(6)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-#  xbtitFM v3.0.00

src/Jackett.Common/Definitions/blutopia.yml

@@ -103,12 +103,12 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
       attribute: href
     poster:
       selector: div.torrent-poster img
@@ -193,4 +193,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 4.0.0b
+# UNIT3D 5.1.0b

src/Jackett.Common/Definitions/broadcity.yml

@@ -6,9 +6,9 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - http://broadcity.in/ # site is forcing to http
+  - https://broadcity.in/ # site is forcing to https
 legacylinks:
-  - https://broadcity.in/
+  - http://broadcity.in/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/bt4g.yml

@@ -0,0 +1,77 @@
+---
+id: bt4g
+name: BT4G
+description: "BT4G is a Public metadata crawler for magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://bt4g.org/
+
+caps:
+  categories:
+    Application: PC
+    Archive file: Other
+    Audio: Audio
+    Doc: Books
+    Other: Other
+    Video: Movies
+    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://bt4g.org/search/2021
+    # site does not support cat search
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.row > div.col > div:has(h5)
+
+  fields:
+    title:
+      selector: a
+    category:
+      selector: span.cpill
+    category:
+      # add tv to video
+      optional: true
+      selector: span.cpill
+      filters:
+        - name: replace
+          args: ["Video", "TV"]
+    details:
+      selector: a
+      attribute: href
+    infohash:
+      selector: a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/magnet/", ""]
+    date:
+      selector: span:nth-last-child(5) b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    files:
+      selector: span:nth-last-child(4) b
+    size:
+      selector: span:nth-last-child(3) b
+    seeders:
+      selector: span:nth-last-child(2) b
+    leechers:
+      selector: span:nth-last-child(1) b
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/btdb.yml

@@ -7,8 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
+  # update poster placeholder link too
   - https://btdb.eu/
-  - https://btdb.unblockit.dev/
+  - https://btdb.unblockit.link/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -30,6 +31,8 @@ legacylinks:
   - https://btdb.unblockit.top/
   - https://btdb.unblockit.lat/
   - https://btdb.unblockit.app/
+  - https://btdb.unblockit.dev/
+  - https://btdb.unblockit.ltd/
 
 caps:
   categories:
@@ -43,6 +46,10 @@ caps:
     book-search: [q]
 
 settings:
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: info_8000
     type: info
     label: About BTDB Categories
@@ -89,7 +96,7 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["https://btdb.io/assets/img/placeholder.png", ""]
+          args: ["https://btdb.eu/assets/img/placeholder.png", ""]
     date:
       selector: small:nth-of-type(5) strong
       filters:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -43,8 +43,6 @@ caps:
     - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
     - {id: 194, cat: Movies, desc: "Hollywood-Movies packs"}
     - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
-    - {id: 138, cat: Movies, desc: "Telugu-Movies"}
-    - {id: 139, cat: Movies, desc: "Tamil-Movies"}
     - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
     - {id: 141, cat: Movies, desc: "Kannada-Movies"}
     - {id: 142, cat: Movies, desc: "Lollywood-Movies"}
@@ -96,6 +94,26 @@ caps:
     - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"}
     - {id: 181, cat: Other, desc: "Pics/Wallpapers"}
     - {id: 187, cat: XXX, desc: "Adult XXX 18+"}
+    # Telugu-Movies
+    - {id: 199, cat: Movies, desc: "Telgu-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 200, cat: Movies, desc: "Telgu-Movies | Untouched WEB-DLs"}
+    - {id: 201, cat: Movies, desc: "Telgu-Movies | 1080p/720p WEBRips"}
+    - {id: 202, cat: Movies, desc: "Telgu-Movies | Untouched BluRay"}
+    - {id: 208, cat: Movies, desc: "Telgu-Movies | Remuxes BluRay"}
+    - {id: 207, cat: Movies, desc: "Telgu-Movies | BluRay Rips"}
+    - {id: 203, cat: Movies, desc: "Telgu-Movies | Untouched DVDs"}
+    - {id: 204, cat: Movies, desc: "Telgu-Movies | SD-WEBRips / DVDRips"}
+    - {id: 205, cat: Movies, desc: "Telgu-Movies | Movie Packs"}
+    # Tamil-Movies
+    - {id: 209, cat: Movies, desc: "Tamil-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 210, cat: Movies, desc: "Tamil-Movies | Untouched WEB-DLs"}
+    - {id: 211, cat: Movies, desc: "Tamil-Movies | 1080p/720p WEBRips"}
+    - {id: 212, cat: Movies, desc: "Tamil-Movies | Untouched BluRay"}
+    - {id: 217, cat: Movies, desc: "Tamil-Movies | Remuxes BluRay"}
+    - {id: 216, cat: Movies, desc: "Tamil-Movies | BluRay Rips"}
+    - {id: 213, cat: Movies, desc: "Tamil-Movies | Untouched DVDs"}
+    - {id: 214, cat: Movies, desc: "Tamil-Movies | SD-WEBRips / DVDRips"}
+    - {id: 215, cat: Movies, desc: "Tamil-Movies | Movie Packs"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -18,7 +18,7 @@ caps:
     - {id: 12, cat: Movies/Other, desc: "Filmy Inne"}
     - {id: 32, cat: Movies/UHD, desc: "Filmy UHD"}
     - {id: 2, cat: TV/Anime, desc: "Anime"}
-    - {id: 2, cat: TV/Documentary, desc: "TV Dokumentalne"}
+    - {id: 10, cat: TV/Documentary, desc: "TV Dokumentalne"}
     - {id: 20, cat: TV, desc: "TV Paczki"}
     - {id: 22, cat: TV/Sport, desc: "TV Sport"}
     - {id: 24, cat: TV/HD, desc: "TV HD"}

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -0,0 +1,236 @@
+---
+id: coastalcrew
+name: Coastal-Crew
+description: "Coastal-Crew is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: de-de
+type: private
+encoding: UTF-8
+links:
+  - https://coastal-crew.bounceme.net/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Movie - Xvid/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Movie - 720p/1080p"}
+    - {id: 130, cat: Movies, desc: "Movie - Pack"}
+    - {id: 155, cat: Movies/DVD, desc: "Movie - DVD"}
+    - {id: 154, cat: Movies/UHD, desc: "Movie - UHD/4K"}
+    # Serien
+    - {id: 60, cat: TV/SD, desc: "Serien - Xvid/x264"}
+    - {id: 157, cat: TV/HD, desc: "Serien - 720p/1080p"}
+    - {id: 57, cat: TV/SD, desc: "Serien - Pack/SD"}
+    - {id: 59, cat: TV/HD, desc: "Serien - Pack/720p"}
+    - {id: 156, cat: TV/HD, desc: "Serien - Pack/1080p"}
+    - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
+    # Doku
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Xvid/x264"}
+    - {id: 14, cat: TV/Documentary, desc: "Doku - 720p/1080p"}
+    - {id: 13, cat: TV/Documentary, desc: "Doku - Pack"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App - Win"}
+    - {id: 11, cat: PC, desc: "App - Other"}
+    - {id: 10, cat: PC/Mac, desc: "App - Mac"}
+    - {id: 9, cat: PC/Mobile-Android, desc: "App - Linux/Android"}
+    # Game
+    - {id: 131, cat: Console, desc: "Game - Nintendo"}
+    - {id: 17, cat: PC/Games, desc: "Game - PC"}
+    - {id: 18, cat: Console, desc: "Game - PS"}
+    - {id: 24, cat: Console/Other, desc: "Game - Wimmelbild"}
+    # Music
+    - {id: 48, cat: Audio/MP3, desc: "Music - mp3"}
+    - {id: 53, cat: Audio/Lossless, desc: "Music - Flac"}
+    - {id: 52, cat: Audio, desc: "Music - Pack"}
+    - {id: 109, cat: Audio/Video, desc: "Music - Video-HD/SD"}
+    # Sport
+    - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
+    # Sonstiges
+    - {id: 64, cat: Books/Comics, desc: "Sonstiges - Anime"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges - A-Book"}
+    - {id: 96, cat: Books/EBook, desc: "Sonstiges - E-Book"}
+    - {id: 69, cat: Books, desc: "Sonstiges - Tutorial"}
+    - {id: 71, cat: Books/Other, desc: "Sonstiges - Other"}
+    # Kinder
+    - {id: 102, cat: Movies, desc: "Kinder - Alles"}
+    # XXX
+    - {id: 113, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 76, cat: XXX, desc: "XXX - HD-SD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX - Pack"}
+    # Request
+    - {id: 151, cat: Other, desc: "Request - spritti01"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: pin
+    type: text
+    label: Pin
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+    loggiin: "einloggen"
+  error:
+    - selector: div#login_error
+  test:
+    path: selection.php
+
+download:
+  before:
+    path: ajax_det_poll.php
+    method: post
+    inputs:
+      set_thanks: thanks
+      det_id: "{{ .DownloadUri.Query.torrent }}"
+      ajax: yes
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    search: "{{ .Keywords }}"
+    blah: "0"
+    orderby: "added"
+    sort: "desc"
+  rows:
+    selector: div.selection_wrap
+  fields:
+    title:
+      selector: a.selection_a
+    details:
+      selector: a.selection_a
+      attribute: href
+    download:
+      selector: a.selection_a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
+    category:
+      selector: div.kat_cat_pic
+      case:
+        # Movie
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "28"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "32"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "130"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "155"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "154"
+        # Serien
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "60"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "157"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/SD\"))": "57"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/720p\"))": "59"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/1080p\"))": "156"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
+        # Doku
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "15"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "14"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "13"
+        # App
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "10"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": "9"
+        # Game
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": "131"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": "18"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "24"
+        # Music
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": "48"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "53"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": "109"
+        # Sport
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "62"
+        # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Tutorial\"))": "69"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "71"
+        # Kinder
+        ":has(div.kat_cat_pic_name:contains(\"Kinder\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "102"
+        # XXX
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "113"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": "76"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
+        # Request
+        ":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": "151"
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ag
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    grabs:
+      text: 0
+    seeders:
+      selector: div.selection_unter_aa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    leechers:
+      selector: div.selection_unter_aaa
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: [",", "."]
+    date:
+      # Heute 13:30:04
+      # Gestern 09:10:10
+      selector: div.selection_unter_ab:not(:contains("."))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Heute", "Today"]
+        - name: replace
+          args: ["Gestern", "Yesterday"]
+    date:
+      # 30.02.2018 um 23:12:50
+      selector: div.selection_unter_ab:contains(".")
+      optional: true
+      filters:
+        - name: replace
+          args: [" um", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02.01.2006 15:04:05 -07:00"
+    description:
+      selector: selection_unter_af
+      optional: true
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine tbd

src/Jackett.Common/Definitions/danishbytes.yml

@@ -0,0 +1,210 @@
+---
+id: danishbytes
+name: DANISH BYTES
+description: "DANISH BYTES is a Private Danish Tracker"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://danishbytes.org/
+
+caps:
+  categorymappings:
+    - {id: 7, cat: TV, desc: "Dansk / TV & Serier"}
+    - {id: 6, cat: Movies, desc: "Dansk / Film"}
+    - {id: 2, cat: TV, desc: "TV & Serier"}
+    - {id: 1, cat: Movies, desc: "Film"}
+    - {id: 10, cat: Movies, desc: "Film Boxset"}
+    - {id: 13, cat: TV/Anime, desc: "Cartoon & Anime / TV & Serier"}
+    - {id: 12, cat: TV/Anime, desc: "Cartoon & Anime / Film"}
+    - {id: 5, cat: PC/0day, desc: "Applikationer"}
+    - {id: 4, cat: PC/Games, desc: "Spil"}
+    - {id: 3, cat: Audio, desc: "Musik"}
+    - {id: 14, cat: Audio/Video, desc: "Musik / Videoer"}
+    - {id: 9, cat: Audio/Audiobook, desc: "Lydbøger"}
+    - {id: 8, cat: Books, desc: "E    -Books, Magasiner, osv."}
+    - {id: 11, cat: XXX, desc: "XXX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login
+  method: form
+  form: form[action$="/login"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    remember: on
+  selectorinputs:
+    _token:
+      selector: input[name="_token"]
+      attribute: value
+  error:
+    - selector: div#ERROR_COPY
+#    test:
+#      path: /
+#      selector: a[href$="/logout"]
+
+search:
+  paths:
+    - path: torrents/filter
+  inputs:
+    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    description: ""
+    keywords: ""
+    uploader: ""
+    imdb: "{{ .Query.IMDBIDShort }}"
+    tvdb: "{{ .Query.TVDBID }}"
+    tmdb: "{{ .Query.TMDBID }}"
+    mal: ""
+    igdb: ""
+    start_year: ""
+    end_year: ""
+    sorting: "{{ .Config.sort }}"
+    direction: "{{ .Config.type }}"
+    qty: 100
+    page: 0
+    view: list
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+
+  rows:
+    selector: table > tbody > tr
+
+  fields:
+    category:
+      selector: a[href*="/categories/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "/categories/(\\d+)"
+    title:
+      selector: a.view-torrent
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet"]
+      attribute: href
+    details:
+      selector: a.view-torrent
+      attribute: href
+    poster:
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+    size:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    grabs:
+      selector: td:nth-last-child(1)
+      filters:
+        - name: regexp
+          args: (\d+)
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
+    date:
+      selector: time
+      filters:
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
+    downloadvolumefactor:
+      case:
+        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From PARA Store
+        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+        i[class*="fa-star text-gold"]: 0 # Freeleech
+        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+        "*": 1
+    uploadvolumefactor:
+      case:
+        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+        i[class*="fa-globe text-green"]: 2 # Global Double Upload
+        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        "*": 1
+    minimumratio:
+      text: 1.1
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# UNIT3D 3.1.0 DB-edition

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

@@ -13,59 +13,59 @@ legacylinks:
 caps:
   categorymappings:
     # Film
-    - {id: 32, cat: Movies/HD, desc: "Film 720p/1080p"}
-    - {id: 28, cat: Movies/SD, desc: "Film XviD/x264"}
     - {id: 119, cat: Movies/DVD, desc: "Film DVD"}
     - {id: 114, cat: Movies/UHD, desc: "Film 4K/2160p"}
+    - {id: 28, cat: Movies/SD, desc: "Film XviD/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Film 720p/1080p"}
     - {id: 26, cat: Movies/3D, desc: "Film 3D"}
     # Serien
     - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 59, cat: TV, desc: "Serien Pack"}
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 122, cat: TV, desc: "Serien Show"}
     - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
+    # Audio
+    - {id: 120, cat: Audio/Video, desc: "Audio Video"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
+    - {id: 52, cat: Audio, desc: "Audio Pack"}
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App PC"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
+    - {id: 125, cat: PC/Mac, desc: "App macOS"}
     # Doku
     - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
     - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
-    # Spiele
-    - {id: 17, cat: PC/Games, desc: "Spiele PC"}
-    - {id: 24, cat: Console, desc: "Spiele Konsole"}
-    - {id: 121, cat: Console, desc: "Spiele Wimmelbild"}
-    - {id: 126, cat: Console/Other, desc: "Spiele Mobil"}
-    # Musik
-    - {id: 110, cat: Audio/MP3, desc: "Musik MP3"}
-    - {id: 52, cat: Audio, desc: "Musik Pack"}
-    - {id: 48, cat: Audio/Lossless, desc: "Musik Flac"}
-    - {id: 120, cat: Audio/Video, desc: "Musik Video"}
-    # App
-    - {id: 12, cat: PC/0day, desc: "App PC"}
-    - {id: 125, cat: PC/Mac, desc: "App MacOS"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
+    # Spiel
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
+    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
+    - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
     # Sport
     - {id: 61, cat: TV/Sport, desc: "Sport HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport SD"}
-    #  Internal
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
-    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
     # Sonstiges
     - {id: 64, cat: TV/Anime, desc: "Anime"}
-    - {id: 96, cat: Books/EBook, desc: "e-Book"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
-    - {id: 71, cat: Other, desc: "Anderes"}
+    - {id: 96, cat: Books/EBook, desc: "E-Book"}
+    - {id: 71, cat: Other, desc: "Other"}
     # XXX
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
     - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
     - {id: 133, cat: XXX/Other, desc: "XXX A/E-book"}
+    #  Internal
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
@@ -136,9 +136,9 @@ search:
     - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name, 1 descr, 2 both, 4 imdb
-    blah: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    search: "{{ .Keywords }}}"
+    # 0 name, 1 descr, 2 both
+    blah: "0"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
@@ -151,7 +151,7 @@ search:
       case:
         # Movies
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "119"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"4K/2160p\"))": "114"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"2160p\"))": "114"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"x264\"))": "28"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": "32"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "26"
@@ -161,7 +161,7 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "60"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Show\"))": "122"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": "123"
-        # Musik
+        # Audio
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "120"
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "48"
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
@@ -170,15 +170,15 @@ search:
         # App
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "12"
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "11"
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"MacOS\"))": "125"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"macOS\"))": "125"
         # Doku
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "14"
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "15"
-        # Games
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
+        # Spiel
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
         # Sport
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "61"
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,7 +10,7 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.dev/
+  - https://demonoid.unblockit.link/
   - https://demonoid.torrentbay.to/
 legacylinks:
   - https://demonoid.unblockit.pro/
@@ -27,6 +27,8 @@ legacylinks:
   - https://demonoid.unblockit.top/
   - https://demonoid.unblockit.lat/
   - https://demonoid.unblockit.app/
+  - https://demonoid.unblockit.dev/
+  - https://demonoid.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -183,4 +183,4 @@ search:
         "*": 1
     minimumratio:
       text: 0.4
-# UNIT3D 2.7.0 (Customised)
+# UNIT3D 5.1.0 (Customised)

src/Jackett.Common/Definitions/divteam.yml

@@ -12,18 +12,18 @@ caps:
   categorymappings:
     - {id: 60, cat: Movies/HD, desc: "MicroHD 720p"}
     - {id: 77, cat: Movies/HD, desc: "MicroHD 1080p"}
-    - {id: 78, cat: Movies/HD, desc: "MicroHD 4K"}
+    - {id: 78, cat: Movies/UHD, desc: "MicroHD 4K"}
     - {id: 64, cat: TV/HD, desc: "Pack Series"}
     - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"}
-    - {id: 80, cat: Movies/BluRay, desc: "BDRip X265 1080p"}
+    - {id: 80, cat: Movies/HD, desc: "BDRip X265 1080p"}
     - {id: 81, cat: Movies/UHD, desc: "UHDRip x265 4K"}
     - {id: 82, cat: Movies/WEB-DL, desc: "Pelis Web-DL 1080"}
     - {id: 83, cat: Movies/WEB-DL, desc: "Pelis Web-DL 720"}
     - {id: 84, cat: Movies/UHD, desc: "UHD Remux x265"}
     - {id: 91, cat: Movies/HD, desc: "BDRip x264"}
     - {id: 89, cat: Movies/HD, desc: "BDRemux"}
-    - {id: 88, cat: Movies/HD, desc: "Full HD"}
-    - {id: 90, cat: Movies/UHD, desc: "UHD Full"}
+    - {id: 88, cat: Movies/BluRay, desc: "Full HD"}
+    - {id: 90, cat: Movies/BluRay, desc: "UHD Full"}
     - {id: 23, cat: TV/Sport, desc: "Deportes"}
     - {id: 20, cat: TV/HD, desc: "Series"}
     - {id: 31, cat: TV/HD, desc: "Series VOSE"}
@@ -38,11 +38,11 @@ caps:
     - {id: 76, cat: Movies, desc: "x-men saga"}
     - {id: 85, cat: Movies, desc: "Sean Connery"}
     - {id: 6, cat: Books/EBook, desc: "EBooks"}
-    - {id: 58, cat: Books/EBook, desc: "Kiosko"}
+    - {id: 58, cat: Books/Mags, desc: "Kiosko"}
     - {id: 24, cat: TV/Documentary, desc: "Documentales"}
     - {id: 32, cat: TV/Documentary, desc: "Documentales VOSE"}
-    - {id: 49, cat: Books/EBook, desc: "eLearning"}
-    - {id: 68, cat: Books/EBook, desc: "eLearning Multimedia"}
+    - {id: 49, cat: Books/Technical, desc: "eLearning"}
+    - {id: 68, cat: Books/Technical, desc: "eLearning Multimedia"}
     - {id: 87, cat: Audio/Audiobook, desc: "Audiolibros"}
 
   modes:
@@ -125,16 +125,16 @@ search:
       selector: a[href^="index.php?page=torrent-details"][onmouseover]:not(:contains("VOSE"))
       optional: true
       filters:
-        - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
         - name: append
-          args: ".Spanish-DivTeam"
+          args: " MULTi/SPANiSH" # DivTeam doesn't bring languages. Usually Original + Spanish.
         - name: re_replace
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
+        - name: replace
+          args: ["UHDRip", "Bluray-2160p"] # Fix for Radarr
+        - name: replace
+          args: ["2160p BDRip", "Bluray-2160p"] # Fix for Radarr
     poster:
       selector: a[onmouseover][href^="index.php?page=torrent-details"]
       attribute: onmouseover

src/Jackett.Common/Definitions/documentarytorrents.yml

@@ -1,177 +0,0 @@
----
-id: documentarytorrents
-name: DocumentaryTorrents
-description: "Documentary Torrents (DT) is a Private Torrent Tracker for E-LEARNING MOVIES / TV"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - http://www.documentarytorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 128, cat: TV/HD, desc: "Adventure: HD"}
-    - {id: 129, cat: TV/SD, desc: "Adventure: Xvid / x264"}
-    - {id: 85, cat: TV/SD, desc: "Biography: Xvid / x264"}
-    - {id: 86, cat: TV/HD, desc: "Biography: HD"}
-    - {id: 60, cat: TV/HD, desc: "Computers: HD"}
-    - {id: 58, cat: TV/SD, desc: "Computers: Xvid / x264"}
-    - {id: 103, cat: TV/SD, desc: "Crime: Xvid / x264"}
-    - {id: 105, cat: TV/HD, desc: "Crime: HD"}
-    - {id: 64, cat: TV/SD, desc: "Culture: Xvid / x264"}
-    - {id: 66, cat: TV/HD, desc: "Culture: HD"}
-    - {id: 122, cat: TV/SD, desc: "Discovery: Xvid / x264"}
-    - {id: 123, cat: TV/HD, desc: "Discovery: HD"}
-    - {id: 98, cat: TV/HD, desc: "Drugs: HD"}
-    - {id: 97, cat: TV/SD, desc: "Drugs: Xvid / x264"}
-    - {id: 92, cat: TV/HD, desc: "Economy: HD"}
-    - {id: 91, cat: TV/SD, desc: "Economy: Xvid / x264"}
-    - {id: 83, cat: TV/HD, desc: "Food: HD"}
-    - {id: 82, cat: TV/SD, desc: "Food: Xvid / x264"}
-    - {id: 124, cat: TV/HD, desc: "HBO: HD"}
-    - {id: 125, cat: TV/SD, desc: "HBO: Xvid / x264"}
-    - {id: 76, cat: TV/SD, desc: "Health: Xvid / x264"}
-    - {id: 78, cat: TV/HD, desc: "Health: HD"}
-    - {id: 67, cat: TV/SD, desc: "History: Xvid / x264"}
-    - {id: 69, cat: TV/HD, desc: "History: HD"}
-    - {id: 79, cat: TV/SD, desc: "Humor: Xvid / x264"}
-    - {id: 80, cat: TV/HD, desc: "Humor: HD"}
-    - {id: 116, cat: TV/HD, desc: "Music: HD"}
-    - {id: 115, cat: TV/SD, desc: "Music: Xvid / x264"}
-    - {id: 118, cat: TV/HD, desc: "NatGeo: HD"}
-    - {id: 119, cat: TV/SD, desc: "NatGeo: Xvid / x264"}
-    - {id: 63, cat: TV/HD, desc: "Nature: HD"}
-    - {id: 61, cat: TV/SD, desc: "Nature: Xvid / x264"}
-    - {id: 109, cat: TV/SD, desc: "New World Order: Xvid / x264"}
-    - {id: 111, cat: TV/HD, desc: "New World Order: HD"}
-    - {id: 48, cat: TV/HD, desc: "Other: HD"}
-    - {id: 50, cat: TV/HD, desc: "Other: DVD"}
-    - {id: 9, cat: TV/SD, desc: "Other: Xvid / x264"}
-    - {id: 126, cat: TV/HD, desc: "PBS: HD"}
-    - {id: 127, cat: TV/SD, desc: "PBS: Xvid / x264"}
-    - {id: 72, cat: TV/HD, desc: "Politics: HD"}
-    - {id: 112, cat: Books/EBook, desc: "Politics: Ebook"}
-    - {id: 70, cat: TV/SD, desc: "Politics: Xvid / x264"}
-    - {id: 114, cat: Books/EBook, desc: "Reference: Ebook"}
-    - {id: 117, cat: Audio/Audiobook, desc: "Reference: Audio Book"}
-    - {id: 56, cat: TV/HD, desc: "Religion: HD"}
-    - {id: 54, cat: TV/SD, desc: "Religion: Xvid / x264"}
-    - {id: 94, cat: TV/SD, desc: "Science: Xvid / x264"}
-    - {id: 95, cat: TV/HD, desc: "Science: HD"}
-    - {id: 75, cat: TV/HD, desc: "Space: HD"}
-    - {id: 73, cat: TV/SD, desc: "Space: Xvid / x264"}
-    - {id: 113, cat: TV/HD, desc: "Space: DVD"}
-    - {id: 100, cat: TV/SD, desc: "Sports: Xvid / x264"}
-    - {id: 102, cat: TV/HD, desc: "Sports: HD"}
-    - {id: 106, cat: TV/SD, desc: "Technology: Xvid / x264"}
-    - {id: 108, cat: TV/HD, desc: "Technology: HD"}
-    - {id: 121, cat: TV/SD, desc: "Transport: Xvid / x264"}
-    - {id: 120, cat: TV/HD, desc: "Transport: HD"}
-    - {id: 57, cat: TV/HD, desc: "Travel: HD"}
-    - {id: 52, cat: TV/SD, desc: "Travel: Xvid / x264"}
-    - {id: 89, cat: TV/HD, desc: "War: HD"}
-    - {id: 88, cat: TV/SD, desc: "War: Xvid / x264"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: form
-  form: form[action="account-login.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.myBlock:has(font.error)
-  test:
-    path: index.php
-    selector: a[href$="/account-logout.php"]
-
-search:
-  paths:
-    # http://documentarytorrents.com/torrents.php?c123=1&c69=1&c67=1&c89=1&c88=1&search=grow+old&cat=0&incldead=1&freeleech=0&lang=0
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 english, 2 french, etc
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not support imdbid search and does not return imdb link in results
-
-  rows:
-    selector: table.ttable_headinner tr.t-row
-    filters:
-      - name: andmatch
-
-  fields:
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    title:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: title
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="torrents-details.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    date:
-      text: now
-    downloadvolumefactor:
-      case:
-        img[src="images/freeleech_star.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 0.4
-# TorrentTrader v2-svn

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

@@ -44,6 +44,7 @@ caps:
     - {id: 276, cat: Audio/Audiobook, desc: "Audio: Military Fiction"}
     - {id: 299, cat: Audio/Audiobook, desc: "Audio: Magazines"}
     - {id: 301, cat: Audio/Audiobook, desc: "Audio: Collections"}
+    - {id: 314, cat: Audio/Audiobook, desc: "Audio: Dystopian/Post Apocalyptic Bks"}
     - {id: 47, cat: Books/EBook, desc: "Children's: Adventure"}
     - {id: 48, cat: Books/EBook, desc: "Children's: Novels"}
     - {id: 49, cat: Books/EBook, desc: "Children's: Collections"}

src/Jackett.Common/Definitions/eniahd.yml

@@ -6,6 +6,8 @@ language: ru-ru
 type: semi-private
 encoding: UTF-8
 links:
+  - https://eniatv.com/
+legacylinks:
   - https://eniahd.com/
 
 caps:
@@ -16,6 +18,8 @@ caps:
     - {id: 12, cat: Movies, desc: "Наше кино"}
     # TV
     - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+    - {id: 31, cat: TV/HD, desc: "Американские боги / American Gods"}
+    - {id: 30, cat: TV/HD, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
     - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
     - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
     - {id: 3, cat: TV, desc: "Зарубежные сериалы"}

src/Jackett.Common/Definitions/ettv.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.dev/
+  - https://ettv.unblockit.link/
   - https://ettv.unblocked.monster/
 legacylinks:
   - https://www.ettv.tv/
@@ -35,6 +35,8 @@ legacylinks:
   - https://ettv.unblockit.lat/
   - https://ettv.unblockit.app/
   - https://ettv.unblocked.rest/
+  - https://ettv.unblockit.dev/
+  - https://ettv.unblockit.ltd/
 
 caps:
   categorymappings:

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

@@ -7,11 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrents.it/
-  - https://extratorrent.unblockit.dev/
+  - https://extratorrent.unblockit.link/
   - https://extratorrent2.unblockninja.com/
 legacylinks:
   - https://extratorrent.ag/
   - https://extratorrent.unblockit.app/
+  - https://extratorrent.unblockit.dev/
+  - https://extratorrent.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -46,6 +46,7 @@ caps:
     - {id: "/movies/dvd/", cat: Movies/DVD, desc: "Movies DVD"}
     - {id: "/movies/highres-movies/", cat: Movies/HD, desc: "Movies Highres"}
     - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
+    - {id: "/movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
     - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
     - {id: "/music/", cat: Audio, desc: Music}
     - {id: "/music/aac/", cat: Audio, desc: "Music AAC"}
@@ -61,6 +62,7 @@ caps:
     - {id: "/xxx/magazines/", cat: XXX/Other, desc: "XXX Magazines"}
     - {id: "/xxx/pictures/", cat: XXX/ImageSet, desc: "XXX Pictures"}
     - {id: "/xxx/video/", cat: XXX, desc: "XXX Video"}
+    - {id: "/video/", cat: XXX, desc: "XXX Video"}
 
   modes:
     search: [q]
@@ -101,6 +103,10 @@ search:
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/3/&{{ else }}latest/3/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/4/&{{ else }}latest/4/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
 
+  headers:
+    # site presents hcaptcha challenge for Jackett's User-Agent, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
   rows:
     selector: table.table-striped > tbody > tr
 

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.dev/
+  - https://eztv.unblockit.link/
   - https://eztv.unblocked.monster/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -38,6 +38,8 @@ legacylinks:
   - https://eztv.unblockit.app/
   - https://eztv.root.yt/
   - https://eztv.unblocked.rest/
+  - https://eztv.unblockit.dev/
+  - https://eztv.unblockit.ltd/
 
 caps:
   categories:

src/Jackett.Common/Definitions/feedurneed.yml

@@ -0,0 +1,208 @@
+---
+id: feedurneed
+name: FeedUrNeed
+description: "FeedUrNeed (FuN) is a Private Torrent Tracker for MOVIES / TV / General"
+language: en-us
+type: private
+encoding: utf-8
+links:
+  - https://feedurneed.xyz/
+
+caps:
+  categorymappings:
+    - {id: 12, cat: TV/Anime, desc: Anime}
+    - {id: 82, cat: PC/0day, desc: Apps/0day}
+    - {id: 1, cat: PC/ISO, desc: Apps/ISO}
+    - {id: 63, cat: Audio/Audiobook, desc: Audiobooks}
+    - {id: 66, cat: Console/Other, desc: Console/NSW}
+    - {id: 67, cat: Console/PS4, desc: Console/PS4}
+    - {id: 68, cat: Console/Other, desc: Console/PS5}
+    - {id: 24, cat: Books/EBook, desc: E-Books}
+    - {id: 64, cat: PC/Games, desc: Games/ISO}
+    - {id: 65, cat: PC/Games, desc: Games/Rips}
+    - {id: 28, cat: Movies/3D, desc: Movies/3D}
+    - {id: 30, cat: Movies, desc: Movies/Cam-TS}
+    - {id: 15, cat: Movies/DVD, desc: Movies/DVDR}
+    - {id: 58, cat: Movies/Foreign, desc: Movies/DVDR-Foreign}
+    - {id: 31, cat: Movies, desc: Movies/FooKaS RG}
+    - {id: 70, cat: Movies/BluRay, desc: Movies/HD-Blu-Ray}
+    - {id: 60, cat: Movies/HD, desc: Movies/HD-Foreign}
+    - {id: 18, cat: Movies/HD, desc: Movies/HD-Retail-X264}
+    - {id: 56, cat: Movies/HD, desc: Movies/HD-Retail-X265}
+    - {id: 55, cat: Movies/WEB-DL, desc: Movies/HD-Web}
+    - {id: 23, cat: Movies/BluRay, desc: Movies/Remuxes}
+    - {id: 59, cat: Movies/Foreign, desc: Movies/SD-Foreign}
+    - {id: 74, cat: Movies/WEB-DL, desc: Movies/SD-Web}
+    - {id: 72, cat: Movies/SD, desc: Movies/SD-X264}
+    - {id: 13, cat: Movies/SD, desc: Movies/SD-XviD}
+    - {id: 71, cat: Movies/BluRay, desc: Movies/UHD-Blu-Ray}
+    - {id: 78, cat: Movies/Foreign, desc: Movies/UHD-Foreign}
+    - {id: 57, cat: Movies/UHD, desc: Movies/UHD-Retail}
+    - {id: 69, cat: Movies/WEB-DL, desc: Movies/UHD-Web}
+    - {id: 26, cat: Audio/Lossless, desc: Music/FLAC}
+    - {id: 10, cat: Audio/MP3, desc: Music/MP3}
+    - {id: 43, cat: Audio/Video, desc: Music/Mvids}
+    - {id: 29, cat: Movies, desc: Packs/Movies}
+    - {id: 19, cat: Audio/MP3, desc: Packs/MP3}
+    - {id: 62, cat: TV/HD, desc: Packs/TV-HD}
+    - {id: 61, cat: TV/SD, desc: Packs/TV-SD}
+    - {id: 76, cat: TV/HD, desc: TV/Blu-Ray}
+    - {id: 81, cat: TV/SD, desc: TV/DVDR}
+    - {id: 77, cat: TV/Foreign, desc: TV/Foreign}
+    - {id: 45, cat: TV/HD, desc: TV/HD}
+    - {id: 80, cat: TV/HD, desc: TV/HD-Retail}
+    - {id: 36, cat: TV/SD, desc: TV/SD}
+    - {id: 79, cat: TV/SD, desc: TV/SD-Retail}
+    - {id: 73, cat: TV/Sport, desc: TV/Sports}
+    - {id: 75, cat: TV/UHD, desc: TV/UHD}
+    - {id: 17, cat: XXX, desc: XXX}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>25</i>.
+  - name: info_pm
+    type: info
+    label: Force Read PM
+    default: To prevent being redirected to the mailbox when you have unread PMs, the setting <b>Force read pm:</b> should be set to <b>No</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.embedded:has(h2:contains("failed"))
+  test:
+    path: index.php
+    selector: a[href*="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered > tbody > tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[onmouseover][href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=\\\\'(.*?)\\\\'"
+        - name: replace
+          args: ["./pic/noposter.png", ""]
+    imdb:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "(\\d{6,8})"
+        - name: prepend
+          args: "tt"
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: a[href^="snatches.php?id="]
+      filters:
+        - name: replace
+          args: ["Times", ""]
+    downloadvolumefactor:
+      case:
+        "a.info:contains(\"FREE\")": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "a.info:contains(\"Double\")": 2
+        "*": 1
+    date:
+      selector: td:nth-child(7):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(7):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 pm +00:00"
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
+      # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
+      case:
+        "a.info:contains(\"FREE\")": 172800
+        "*": 129600
+# U-232 V5

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

@@ -95,6 +95,8 @@ search:
     title:
       selector: a[href^="details.php?id="]
       filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
         - name: re_replace
           args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
         - name: re_replace

src/Jackett.Common/Definitions/focusx.yml

@@ -13,6 +13,7 @@ caps:
     - {id: 111, cat: Movies, desc: "1922"}
     - {id: 135, cat: Movies, desc: "Анон"}
     - {id: 213, cat: Movies, desc: "Борат 2"}
+    - {id: 222, cat: Movies, desc: "Траффик"}
     - {id: 206, cat: Movies, desc: "Брачная история"}
     - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
     - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}

src/Jackett.Common/Definitions/fullmixmusic.yml

@@ -1,89 +0,0 @@
----
-id: fullmixmusic
-name: FullMixMusic
-description: "FullMixMusic is a HUNGARIAN Private Torrent Tracker for MUSIC"
-language: hu-hu
-type: private
-encoding: UTF-8
-links:
-  - https://fullmixmusic.org/
-legacylinks:
-  - http://fullmixmusic.org/
-
-caps:
-  categories:
-    1: Audio
-
-  modes:
-    search: [q]
-    music-search: [q, artist]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("Művelet!")
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    showsearch: 1
-    incldead: 1
-
-  rows:
-    selector: table.tablak > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: a[href^="details.php?id="][title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: ^(.*?)<br />
-    details:
-      selector: a[href^="details.php?id="][title]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="][title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: "src=\"(.*?)\">"
-    description:
-      selector: td:nth-child(2) > i > font
-    date:
-      selector: td:nth-child(6)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    grabs:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      case:
-        font[title^="Dupla feltöltésű torrent!"]: 2
-        font[title^="x3 feltöltésű torrent!"]: 3
-        font[title^="x4 feltöltésű torrent!"]: 4
-        "*": 1
-# engine tbd

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -95,8 +95,9 @@ caps:
     book-search: [q]
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 81, cat: TV/SD, desc: "Sorozat/SD-x264/Hun"}
+    - {id: 91, cat: Movies/UHD, desc: "4K Blu-Ray"}
     - {id: 62, cat: Movies/BluRay, desc: "Bluray Disc"}
     - {id: 80, cat: Movies/SD, desc: "CAM/Eng"}
     - {id: 79, cat: Movies/SD, desc: "CAM/Hun"}
@@ -39,6 +39,7 @@ caps:
     - {id: 85, cat: TV/HD, desc: "Sorozat HD/Eng"}
     - {id: 84, cat: TV/HD, desc: "Sorozat HD/Hun"}
     - {id: 8, cat: TV/SD, desc: "Sorozat/SD-x264/Eng"}
+    - {id: 81, cat: TV/SD, desc: "Sorozat/SD-x264/Hun"}
     - {id: 83, cat: TV/SD, desc: "Sorozat/SD-Xvid/Eng"}
     - {id: 7, cat: TV/SD, desc: "Sorozat/SD-Xvid/Hun"}
     - {id: 46, cat: XXX, desc: "XXX"}

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://vww.gktorrent.pw/
+  - https://www.gktorrent.cc/
 legacylinks:
   - https://www.gktorrent.com/
   - http://www.gktorrent.com/
@@ -30,6 +30,7 @@ legacylinks:
   - https://www.gktorrent.io/
   - https://www.gktorrent.pw/
   - https://wvw.gktorrent.pw/
+  - https://vww.gktorrent.pw/
 
 caps:
   categorymappings:
@@ -85,7 +86,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a)
+    selector: table.table-hover > tbody > tr:has(a[href*=torrent])
 
   fields:
     category:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.dev/
+  - https://glotorrents.unblockit.link/
   - https://glodls.unblocked.monster/
 legacylinks:
   - https://glodls.rocks/
@@ -32,6 +32,8 @@ legacylinks:
   - https://glotorrents.unblockit.lat/
   - https://glotorrents.unblockit.app/
   - https://glodls.unblocked.rest/
+  - https://glotorrents.unblockit.dev/
+  - https://glotorrents.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hachede.yml

@@ -1,305 +0,0 @@
----
-id: hachede
-name: HacheDe
-description: "HacheDe is a SPANISH site for HD content"
-language: es-es
-type: private
-encoding: UTF-8
-links:
-  - https://hachede.me/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 46, cat: Movies/3D, desc: "Películas 3D"}
-    - {id: 52, cat: Movies/BluRay, desc: "Películas Full Bluray"}
-    - {id: 33, cat: Movies/BluRay, desc: "Películas BDRemux"}
-    - {id: 120, cat: Movies/BluRay, desc: "Películas JMBD"}
-    - {id: 34, cat: Movies/HD, desc: "Películas BDrip 1080p"}
-    - {id: 99, cat: Movies/HD, desc: "Películas BDrip 720p"}
-    - {id: 140, cat: Movies/WEB-DL, desc: "Películas WEB-DL AMAZON"}
-    - {id: 141, cat: Movies/WEB-DL, desc: "Películas WEB-DL APPLE TV+"}
-    - {id: 142, cat: Movies/WEB-DL, desc: "Películas WEB-DL HBO"}
-    - {id: 143, cat: Movies/WEB-DL, desc: "Películas WEB-DL NETFLIX"}
-    - {id: 37, cat: Movies/Other, desc: "Películas HDTVrip"}
-    - {id: 119, cat: Movies/HD, desc: "Películas HDiTunes"}
-    - {id: 84, cat: Movies/HD, desc: "Películas MicroHD 1080p"}
-    - {id: 100, cat: Movies/HD, desc: "Películas MicroHD 720p"}
-    - {id: 16, cat: TV/HD, desc: "Series"}
-    - {id: 133, cat: TV/HD, desc: "Series WEB-DL AMAZON"}
-    - {id: 134, cat: TV/HD, desc: "Series WEB-DL HBO"}
-    - {id: 135, cat: TV/HD, desc: "Series WEB-DL NETFLIX"}
-    - {id: 136, cat: TV/HD, desc: "Series WEB-DL STARZ"}
-    - {id: 137, cat: TV/HD, desc: "Series WEB-DL DISNEY PLUS"}
-    - {id: 139, cat: TV/HD, desc: "Series WEB-DL APPLE TV+"}
-    - {id: 44, cat: TV/Other, desc: "Series HDTVrip"}
-    - {id: 144, cat: TV/HD, desc: "Series WEB-DL ATRESPLAYER PREMIUM"}
-    - {id: 89, cat: TV/HD, desc: "Series HDiTunes"}
-    - {id: 57, cat: TV/HD, desc: "Series Full Bluray"}
-    - {id: 40, cat: TV/HD, desc: "Series BDRemux"}
-    - {id: 121, cat: TV/HD, desc: "Series JMBD"}
-    - {id: 41, cat: TV/HD, desc: "Series BDrip 1080p"}
-    - {id: 101, cat: TV/HD, desc: "Series BDrip 720p"}
-    - {id: 45, cat: TV/HD, desc: "Series MicroHD 1080p"}
-    - {id: 102, cat: TV/HD, desc: "Series MicroHD 720p"}
-    - {id: 90, cat: Movies, desc: "Animación"}
-    - {id: 91, cat: Movies/3D, desc: "Animación 3D"}
-    - {id: 92, cat: Movies/BluRay, desc: "Animación Full Bluray"}
-    - {id: 93, cat: Movies/HD, desc: "Animación BDrip 1080p"}
-    - {id: 104, cat: Movies/HD, desc: "Animación BDrip 720p"}
-    - {id: 94, cat: Movies/BluRay, desc: "Animación BDRemux"}
-    - {id: 123, cat: Movies/BluRay, desc: "Animación JMBD"}
-    - {id: 96, cat: Movies/Other, desc: "Animación HDTVrip"}
-    - {id: 98, cat: Movies/HD, desc: "Animación MicroHD 1080p"}
-    - {id: 105, cat: Movies/HD, desc: "Animación MicroHD 720p"}
-    - {id: 32, cat: Movies, desc: "Documentales"}
-    - {id: 53, cat: Movies/BluRay, desc: "Documentales Full Bluray"}
-    - {id: 59, cat: Movies/3D, desc: "Documentales 3D"}
-    - {id: 64, cat: Movies/BluRay, desc: "Documentales BDremux"}
-    - {id: 138, cat: Movies/WEB-DL, desc: "Documentales WEB-DL"}
-    - {id: 122, cat: Movies/BluRay, desc: "Documentales JMBD"}
-    - {id: 68, cat: Movies/HD, desc: "Documentales BDrip 1080p"}
-    - {id: 106, cat: Movies/HD, desc: "Documentales BDrip 720p"}
-    - {id: 80, cat: Movies/Other, desc: "Documentales HDTVrip"}
-    - {id: 85, cat: Movies/HD, desc: "Documentales MicroHD 1080p"}
-    - {id: 107, cat: Movies/HD, desc: "Documentales MicroHD 720p"}
-    - {id: 114, cat: TV, desc: "TV"}
-    - {id: 115, cat: TV/Other, desc: "TV HDTVrip 1080p"}
-    - {id: 116, cat: TV/Other, desc: "TV HDTVrip 720p"}
-    - {id: 50, cat: Other, desc: "Deportes"}
-    - {id: 55, cat: Other/Misc, desc: "Deportes Full Bluray"}
-    - {id: 60, cat: Other/Misc, desc: "Deportes 3D"}
-    - {id: 65, cat: Other/Misc, desc: "Deportes BDremux"}
-    - {id: 69, cat: Other/Misc, desc: "Deportes BDrip 1080p"}
-    - {id: 108, cat: Other/Misc, desc: "Deportes BDrip 720p"}
-    - {id: 81, cat: Other/Misc, desc: "Deportes HDTVrip"}
-    - {id: 86, cat: Other/Misc, desc: "Deportes MicroHD 1080p"}
-    - {id: 109, cat: Other/Misc, desc: "Deportes MicroHD 720p"}
-    - {id: 51, cat: Movies, desc: "Conciertos"}
-    - {id: 56, cat: Movies/BluRay, desc: "Conciertos Full Bluray"}
-    - {id: 61, cat: Movies/3D, desc: "Conciertos 3D"}
-    - {id: 66, cat: Movies/HD, desc: "Conciertos BDremux"}
-    - {id: 70, cat: Movies/HD, desc: "Conciertos BDrip 1080p"}
-    - {id: 110, cat: Movies/HD, desc: "Conciertos BDrip 720p"}
-    - {id: 82, cat: Movies/Other, desc: "Conciertos HDTVrip"}
-    - {id: 87, cat: Movies/HD, desc: "Conciertos MicroHD 1080p"}
-    - {id: 111, cat: Movies/HD, desc: "Conciertos MicroHD 720p"}
-    - {id: 49, cat: XXX, desc: "Adultos"}
-    - {id: 54, cat: XXX/x264, desc: "Adultos Full Bluray"}
-    - {id: 62, cat: XXX/x264, desc: "Adultos 3D"}
-    - {id: 67, cat: XXX/x264, desc: "Adultos BDremux"}
-    - {id: 71, cat: XXX/x264, desc: "Adultos BDrip 1080p"}
-    - {id: 112, cat: XXX/x264, desc: "Adultos BDrip 720p"}
-    - {id: 83, cat: XXX/XviD, desc: "Adultos HDTVrip"}
-    - {id: 88, cat: XXX/x264, desc: "Adultos MicroHD 1080p"}
-    - {id: 113, cat: XXX/x264, desc: "Adultos MicroHD 720p"}
-    - {id: 124, cat: Movies, desc: "H265"}
-    - {id: 126, cat: Movies/HD, desc: "H265 Peliculas"}
-    - {id: 127, cat: TV/HD, desc: "H265 Series"}
-    - {id: 130, cat: Movies/3D, desc: "H265 3D"}
-    - {id: 128, cat: Movies/HD, desc: "H265 Animación"}
-    - {id: 129, cat: Movies/HD, desc: "H265 Documentales"}
-    - {id: 125, cat: Movies/UHD, desc: "UHD"}
-    - {id: 131, cat: Movies/UHD, desc: "UHD Películas"}
-    - {id: 132, cat: TV/UHD, desc: "UHD Series"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: ?p=home&pid=1
-    selector: div#member_info_bar
-
-search:
-  path: /
-  keywordsfilters:
-    - name: re_replace
-      args: ["S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-  inputs:
-    p: torrents
-    page: 1
-    pid: 10
-    $raw: "{{ range .Categories }}&cid[]={{.}}{{end}}"
-    keywords: "{{ .Keywords }}"
-    # name description both uploader
-    search_type: name
-    "sortOptions[sortBy]": "{{ .Config.sort }}"
-    "sortOptions[sortOrder]": "{{ .Config.type }}"
-
-  rows:
-    selector: "table#torrents_table_classic > tbody > tr:not(:first-child), .torrent-box[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: td.torrent_image div.category_image a, .categoryImage a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cid
-    title:
-      selector: td.torrent_name > a, .newIndicator > a
-      filters:
-        - name: re_replace
-          args: ["(?i)full", "BRDISK."] # FULL(BR/UHD) -> BRDISK
-        - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
-        - name: append
-          args: ".Spanish-HacheDe"
-        - name: re_replace
-          args: ["\\.+", "."] # More than 1 dot -> .
-        - name: re_replace
-          args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: [".BR.", ".BDRip."] # Fix for Radarr
-        - name: re_replace
-          args: ["(?i)m720p", "MicroHD.720p"] # Fix for Radarr
-        - name: re_replace
-          args: ["(?i)m1080p", "MicroHD.1080p"] # Fix for Radarr
-    details:
-      selector: td.torrent_name > a, .newIndicator > a
-      attribute: href
-    download:
-      selector: .torrentImages > span:first-child a
-      attribute: href
-    poster:
-      selector: td.torrent_image div.relativeDiv div:not(.category_image) a, .previewImage a
-      attribute: href
-    imdb:
-      selector: .torrentFlags a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: td.torrent_name:contains("Subido"):contains("-"), .torrentOwner:contains("Subido"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Subido )(.*)(?= por)"
-        - name: replace
-          args: [": ", ":"]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    date:
-      selector: td.torrent_name:contains("Subido"):not(:contains("-")), .torrentOwner:contains("Subido"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Subido )(.*)(?= por)"
-        - name: replace
-          args: [": ", ":"]
-        - name: replace
-          args: ["Ayer a las", "Yesterday"]
-        - name: replace
-          args: ["Hoy en", "Today"]
-        - name: replace
-          args: ["Lunes a las", "Monday at"]
-        - name: replace
-          args: ["Martes a las", "Tuesday at"]
-        - name: replace
-          args: ["Miércoles a las", "Wednesday at"]
-        - name: replace
-          args: ["Jueves a las", "Thursday at"]
-        - name: replace
-          args: ["Viernes a las", "Friday at"]
-        - name: replace # WTF?
-          args: ["Friday a las", "Friday at"]
-        - name: replace
-          args: ["Sábado a las", "Saturday at"]
-        - name: replace
-          args: ["Domingo a las", "Sunday at"]
-        - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    date:
-      selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    date:
-      selector: td.torrent_name:contains("Uploaded"):not(:contains("-")), .torrentOwner:contains("Uploaded"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: replace
-          args: ["Yesterday at", "Yesterday"]
-        - name: replace
-          args: ["Today at", "Today"]
-        - name: fuzzytime # eg: Yesterday 14:22 or Monday at 14:22
-    size:
-      selector: td.size a, .torrentInfo a[rel="torrent_size"]
-    grabs:
-      selector: td.completed a, .torrentInfo a[rel="times_completed"]
-    seeders:
-      selector: td.seeders a, .torrentInfo a[rel="torrent_seeders"]
-    leechers:
-      selector: td.leechers a, .torrentInfo a[rel="torrent_leechers"]
-    downloadvolumefactor:
-      text: 1
-    downloadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_free.png"]
-      attribute: title
-      filters:
-        - name: replace
-          args: ["FREE LEECH!", "0"]
-    downloadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_multiple_download.png"]
-      attribute: title
-      filters:
-        - name: split
-          args: [":", 1]
-        - name: trim
-    uploadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      optional: true
-      selector: img[src$="torrent_multiple_upload.png"]
-      attribute: title
-      filters:
-        - name: split
-          args: [":", 1]
-        - name: trim
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      text: 259200 # 3 day (72h)
-# TSUE 2.2

src/Jackett.Common/Definitions/haidan.yml

@@ -104,7 +104,7 @@ search:
     # supports search using imdbid, does not return imdb links in results
 
   rows:
-    selector: div.group_content
+    selector: div.group_content:has(a[href^="download.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/hdatmos.yml

@@ -1,12 +1,12 @@
 ---
-id: hddisk
-name: HDDisk
-description: "HDDisk (HDD) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hdatmos
+name: HDAtmos
+description: "HDAtmos is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: zh-cn
 type: private
 encoding: UTF-8
 links:
-  - https://hddisk.life/
+  - https://hdatmos.club/
 
 caps:
   categorymappings:
@@ -14,19 +14,20 @@ caps:
     - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
     - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
     - {id: 402, cat: TV, desc: "TV Series/电视剧"}
-    - {id: 422, cat: Console, desc: "Games/游戏"}
+    - {id: 422, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 423, cat: TV, desc: "TV Shows/综艺"}
     - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV演唱会"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 409, cat: PC, desc: "Software/软件"}
+    - {id: 409, cat: PC/0day, desc: "Software/软件"}
+    - {id: 424, cat: Other, desc: "Misc/其他"}
     - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
-    - {id: 423, cat: TV, desc: "TV Shows/综艺"}
-    - {id: 424, cat: Other, desc: "Other/其他"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -39,6 +40,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -55,10 +60,6 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
@@ -74,10 +75,11 @@ login:
     logout: ""
     securelogin: ""
     ssl: yes
-    trackerssl: yes
+    trackerssl: ""
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("登录失败"))
+      message:
+        selector: td.text
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -165,9 +167,9 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    minimumratio:
-      text: 0.8
     description:
       selector: td:nth-child(2)
       remove: a, img
+    minimumratio:
+      text: 0.81
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -104,19 +104,51 @@ search:
       selector: a.view-torrent
       filters:
         - name: re_replace
-          args: ["(?i)full", "BRDISK."] # FULL(BR/UHD) -> BRDISK
+          args: ["\\[", " "]
         - name: re_replace
+          args: ["\\]", " "]
+        - name: re_replace
+          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
+        - name: replace
           args: ["HDOlimpo", ""] # Delete HDOlimpo
-        - name: re_replace
+        - name: replace
           args: ["HD-Olimpo", ""] # Delete HD-Olimpo
         - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
-        - name: append
-          args: ".Spanish-HDOlimpo"
+          args: ["[ -](?i)español[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)spa[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)esp[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)[ei]ng[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)cat[ -]", " Catalan "]
+        - name: re_replace
+          args: ["[ -](?i)vas[ -]", " Basque "]
+        - name: re_replace
+          args: ["[ -](?i)fr[ae][ -]", " French "]
+        - name: re_replace
+          args: ["[ -](?i)jap[ -]", " Japanese "]
+        - name: re_replace
+          args: ["[ -](?i)ita[ -]", " Italian "]
+        - name: re_replace
+          args: ["[ -](?i)rus[ -]", " Russian "]
+        - name: re_replace
+          args: ["[ -](?i)ger[ -]", " German "]
+        - name: re_replace
+          args: ["(?i)(triaudio)", "MULTi/SPANiSH/English"]
+        - name: re_replace
+          args: ["(?i)(dual)", " MULTi/SPANiSH "]
         - name: re_replace
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
+        - name: re_replace
+          args: ["\\s+", " "] # More than 1 space to 1 space
 
     download:
       selector: a[href*="/download/"]

src/Jackett.Common/Definitions/hdreactor.yml

@@ -6,11 +6,11 @@ language: ru-ru
 type: public
 encoding: windows-1251
 links:
-  - https://hdreactor.net/
   - https://hdreactor.club/
   - https://hdreactor.su/
 legacylinks:
   - https://hdreactor.guru/
+  - https://hdreactor.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdstreet.yml

@@ -1,171 +0,0 @@
----
-id: hdstreet
-name: HDStreet
-description: "HDStreet is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
-language: zh-cn
-type: private
-encoding: UTF-8
-links:
-  - https://hdstreet.club/
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies(D)/华语电影", default: true}
-    - {id: 403, cat: Movies, desc: "Movies(F)/外语电影", default: true}
-    - {id: 402, cat: TV, desc: "TV Series(D)/华语电视剧", default: true}
-    - {id: 404, cat: TV, desc: "TV Series(F)/外语电视剧", default: true}
-    - {id: 406, cat: TV, desc: "TV Shows(D)/华语综艺", default: true}
-    - {id: 405, cat: TV, desc: "TV Shows(F)/外语综艺", default: true}
-    - {id: 408, cat: TV/Anime, desc: "TV Anime(D)/华语动漫", default: true}
-    - {id: 411, cat: TV/Anime, desc: "TV Anime(F)/外语动漫", default: true}
-    - {id: 409, cat: Audio/Video, desc: "MusicVideo(D)/华语音乐MV", default: true}
-    - {id: 412, cat: Audio/Video, desc: "MusicVideo(F)/外语音乐MV", default: true}
-    - {id: 407, cat: TV/Documentary, desc: "Documentaries(D)/华语纪录片", default: true}
-    - {id: 413, cat: TV/Documentary, desc: "Documentaries(F)/外语纪录片", default: true}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    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
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    logintype: username
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    thispagewidth: yes
-  error:
-    - selector: td.embedded:has(h2:contains("姿势不正确"))
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: torrents.php
-      categories: [401, 402, 406, 408, 409, 407]
-    - path: torrentsasia.php
-      categories: [403, 404, 405, 411, 412, 413]
-  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 onlydead
-    incldead: 0
-    # 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 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_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # can search for imdbid but does not show imdb link in search results.
-
-  rows:
-    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="]), table.torrents > tbody > tr:has(a[href^="comment.php?"])
-    after: 1
-
-  fields:
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    title:
-      optional: true
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      # downloads can be missing but we can exclude them due to after:1
-      selector: a[href^="download.php?id="]
-      attribute: href
-      optional: true
-    seeders:
-      selector: td:nth-child(3)
-    leechers:
-      selector: td:nth-child(4)
-    grabs:
-      selector: td:nth-child(5)
-    date:
-      # time type: time elapsed (default)
-      selector: td:nth-child(9) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    date:
-      # time added
-      selector: td:nth-child(9):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    size:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP V1.5.β5

src/Jackett.Common/Definitions/idope.yml

@@ -59,6 +59,10 @@ settings:
       3: "created asc"
       1: "seeders asc"
       2: "size asc"
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   paths:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -85,6 +85,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: sort
     type: select
     label: Sort requested from site

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

@@ -137,10 +137,10 @@ caps:
     - {id: 729, cat: Other, desc: " |- Работа со звуком"}
     - {id: 766, cat: Other, desc: " |- ZBrush"}
     - {id: 473, cat: Other, desc: " |- Работа с видео"}
-    - {id: 426, cat: Other, desc: " |- Autodesk 3ds Max"}
-    - {id: 425, cat: Other, desc: " |- Adobe Photoshop"}
-    - {id: 427, cat: Other, desc: " |- Инженерные и научные программы (видеоуроки)"}
-    - {id: 424, cat: Other, desc: " |- WEB, SMM, SEO, интернет-маркетинг"}
+    - {id: 726, cat: Other, desc: " |- Autodesk 3ds Max"}
+    - {id: 725, cat: Other, desc: " |- Adobe Photoshop"}
+    - {id: 727, cat: Other, desc: " |- Инженерные и научные программы (видеоуроки)"}
+    - {id: 724, cat: Other, desc: " |- WEB, SMM, SEO, интернет-маркетинг"}
     - {id: 472, cat: Other, desc: " |- Веб-дизайн, Программирование"}
     - {id: 474, cat: Other, desc: " |- Компьютерные сети и безопасность"}
     # Игры Games

src/Jackett.Common/Definitions/jptv.yml

@@ -194,4 +194,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 4.0.0
+# UNIT3D 5.1.0

src/Jackett.Common/Definitions/karagarga.yml

@@ -42,7 +42,7 @@ login:
   captcha:
     type: image
     selector: img#captcha_img
-    input: imagestring
+    input: captcha
   error:
     - selector: table:contains("Login failed!")
   test:

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

@@ -1,7 +1,7 @@
 ---
-id: kickasstorrent-kathow
-name: kickasstorrents (kickass.ws)
-description: "kickasstorrents (kickass.ws) is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
+id: kickasstorrents-ws
+name: kickasstorrents.ws
+description: "kickasstorrents.ws is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
 language: en-us
 type: public
 encoding: UTF-8

src/Jackett.Common/Definitions/lastfiles.yml

@@ -4,82 +4,94 @@ name: LastFiles
 description: "LastFiles (LF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
 language: ro-ro
 type: private
-encoding: windows-1252
+encoding: utf-8
+followredirect: true
 links:
-  - http://last-torrents.org/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://www.lastfiles.ro/
+  - http://www.lastfiles.ro/
+  - https://www.last-torrents.org/
+  - http://www.last-torrents.org/
+legacylinks:
+  - http://last-torrents.org/
+  - https://last-torrents.org/
 
 caps:
   categorymappings:
-    - {id: 31, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 5, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 9, cat: Movies/DVD, desc: "Movies/DVD"}
-    - {id: 11, cat: Movies/HD, desc: "Movies/HD"}
+    - {id: 31, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay"}
+    - {id: 9, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 11, cat: Movies/HD, desc: "Movies: HD"}
     - {id: 58, cat: Movies/SD, desc: "Movies/Cam"}
     - {id: 61, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 24, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 16, cat: Movies, desc: "Old Movies"}
+    - {id: 24, cat: Movies/SD, desc: "Movies: XVID"}
+    - {id: 16, cat: Movies, desc: "Movies: Old"}
     - {id: 15, cat: Movies, desc: "Movies Mobile"}
     - {id: 54, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"}
     - {id: 56, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 18, cat: Movies, desc: "Movie Packs"}
-    - {id: 32, cat: Movies/UHD, desc: "Movies/4K-RO"}
-    - {id: 6, cat: Movies/BluRay, desc: "Movies/BluRay-Ro"}
-    - {id: 12, cat: Movies/HD, desc: "Movies/HD-Ro"}
-    - {id: 81, cat: Movies/HD, desc: "Movies/x265-Ro"}
-    - {id: 82, cat: Movies/HD, desc: "Movies/x265"}
-    - {id: 10, cat: Movies/DVD, desc: "Movies/DVD-Ro"}
-    - {id: 59, cat: Movies/SD, desc: "Movies/Cam-Ro"}
-    - {id: 25, cat: Movies/SD, desc: "Movies/XVID-Ro"}
-    - {id: 17, cat: Movies, desc: "Old Movies Ro"}
+    - {id: 18, cat: Movies, desc: "Movies: Pack"}
+    - {id: 32, cat: Movies/UHD, desc: "Movies:4KRO"}
+    - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro"}
+    - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro"}
+    - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro"}
+    - {id: 82, cat: Movies/HD, desc: "Movies: x265"}
+    - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro"}
+    - {id: 59, cat: Movies/SD, desc: "Movies/Cam-RO"}
+    - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro"}
+    - {id: 17, cat: Movies, desc: "Movies: Old-Ro"}
     - {id: 55, cat: Movies/WEB-DL, desc: "Movies/WEB-DL Ro"}
     - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro"}
-    - {id: 62, cat: Movies/3D, desc: "Movies/3D-RO"}
-    - {id: 19, cat: Movies, desc: "Movie Packs Ro"}
+    - {id: 62, cat: Movies/3D, desc: "Movies/3D-Ro"}
+    - {id: 19, cat: Movies, desc: "Movies: Pack-Ro"}
     - {id: 20, cat: TV, desc: "TV Episodes"}
-    - {id: 21, cat: TV, desc: "TV Episodes Ro"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 14, cat: TV/HD, desc: "HDTV-Ro"}
+    - {id: 21, cat: TV, desc: "TV Episodes-Ro"}
+    - {id: 13, cat: TV/HD, desc: "HDTV Episodes"}
+    - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro"}
     - {id: 28, cat: Audio, desc: "Music"}
-    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps & Games"}
+    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps"}
     - {id: 26, cat: PC/0day, desc: "Software"}
-    - {id: 30, cat: PC/ISO, desc: "Games PC-ISO"}
-    - {id: 33, cat: PC/Games, desc: "Game Packs"}
-    - {id: 1, cat: TV/Anime, desc: "Anime/Hentai"}
-    - {id: 2, cat: TV/Anime, desc: "Anime-Ro"}
+    - {id: 30, cat: PC/Games, desc: "Games: PC-ISO"}
+    - {id: 33, cat: PC/Games, desc: "Games: Packs"}
+    - {id: 1, cat: TV/Anime, desc: "Movies: Anime"}
+    - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro"}
     - {id: 42, cat: TV/Sport, desc: "Sport"}
-    - {id: 43, cat: Books, desc: "Books"}
+    - {id: 43, cat: Books, desc: "Documents"}
     - {id: 44, cat: Other, desc: "Images"}
     - {id: 49, cat: Other, desc: "Diverse"}
     - {id: 22, cat: Other, desc: "RoContent"}
-    - {id: 60, cat: XXX, desc: "Images/XXX"}
-    - {id: 27, cat: XXX, desc: "XXX"}
+    - {id: 60, cat: XXX, desc: "ImagesXXX"}
+    - {id: 27, cat: XXX, desc: "Movies: XXX"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
 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>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
   - name: sort
     type: select
     label: Sort requested from site
-    default: 4
+    default: 3
     options:
-      4: created
-      7: seeders
-      5: size
+      3: created
+      6: seeders
+      4: size
       1: title
   - name: type
     type: select
@@ -90,13 +102,7 @@ settings:
       asc: asc
 
 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
   test:
     path: browse.php
 
@@ -105,16 +111,20 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name 1 genre 2 descr
-    genre: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 free, 4 double
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
 
   rows:
-    selector: table.browser > tbody > tr:has(a[href^="download.php/"])
+    selector: tbody > tr:has(a[href^="download.php"])
 
   fields:
     category:
@@ -133,40 +143,57 @@ search:
       attribute: onmouseover
       filters:
         - name: regexp
-          args: src=([^\s]+)
+          args: src=\\'(http.+?\.jpg)\\'
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(http.+?\.png)\\'
     download:
-      selector: a[href^="download.php/"]
+      selector: a[href^="download.php"]
       attribute: href
     date:
-      selector: td:nth-child(3)
+      selector: td:nth-child(4) span:not(:contains("day"))
+      optional: true
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-200615:04:05 -07:00"
+          args: "Jan 2 2006 03:04 PM -07:00"
+    date:
+      selector: td:nth-child(4) span:contains("day")
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: fuzzytime
     size:
-      selector: td:nth-child(4)
-    grabs:
       selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
       filters:
         - name: regexp
           args: (\d+)
     seeders:
-      selector: td:nth-child(6)
-    leechers:
       selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
-        "span:contains(\"FREE\")": 0
-        "span:contains(\"Half\")": 0.5
+        "a.info > b:contains(\"FREE\")": 0
+#        "a.info > b:contains(\"Half\")": 0.5
         "*": 1
     uploadvolumefactor:
       case:
-        "span:contains(\"2XUP\")": 2
+#        "a.info > b:contains(\"2XUP\")": 2
         "*": 1
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 36 hours (as seconds = 36 x 60 x 60)
-      text: 129600
-# engine n/a
+      # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
+      # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
+      case:
+        "a.info > b:contains(\"FREE\")": 172800
+        "*": 129600
+# U-232 V5

src/Jackett.Common/Definitions/lemonhd.yml

@@ -12,27 +12,13 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 300, cat: Movies/UHD, desc: "Movies UHD-4K"}
-    - {id: 301, cat: Movies/UHD, desc: "Movies 2160p"}
-    - {id: 420, cat: Movies/UHD, desc: "Movies 2160p REMUX"}
-    - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-    - {id: 410, cat: Movies/HD, desc: "Movies 1080p"}
-    - {id: 415, cat: Movies, desc: "Movies 1080p REMUX"}
-    - {id: 416, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 411, cat: Movies/HD, desc: "Movies 720p"}
-    - {id: 412, cat: Movies/WEB-DL, desc: "Movies WEB-DL"}
-    - {id: 413, cat: TV/HD, desc: "Movies HDTV"}
-    - {id: 417, cat: Movies, desc: "Movies iPad"}
-    - {id: 414, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
-    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)"}
-    - {id: 407, cat: TV/Sport, desc: "Sports(体育)"}
-    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)"}
-    - {id: 421, cat: Books, desc: "Book(学习资料)"}
-    - {id: 422, cat: Console, desc: "Game(游戏)"}
-    - {id: 409, cat: Other, desc: "Misc(其他)"}
+    - {id: animate, cat: TV/Anime, desc: "动漫 Anime"}
+    - {id: doc, cat: TV/Documentary, desc: "纪录片 Documentary"}
+    - {id: movie, cat: Movies, desc: "电影 Movie"}
+    - {id: mv, cat: Audio/Video, desc: "MV Music Video"}
+    - {id: music, cat: Audio, desc: "音乐 Music"}
+    - {id: tv, cat: TV, desc: "剧集综艺 TV"}
+    - {id: other, cat: Other, desc: "艺术 Other"}
 
   modes:
     search: [q]
@@ -85,7 +71,6 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
@@ -103,19 +88,19 @@ search:
 
   fields:
     category:
-      selector: a[href^="?cat="]
-      attribute: href
+      selector: img[class^="cat_"]
+      attribute: class
       filters:
-        - name: querystring
-          args: cat
+        - name: regexp
+          args: "cat_(.+?)$"
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details_"] > b
     title:
       optional: true
-      selector: a[title][href^="details.php?id="]
+      selector: a[title][href^="details_"] > b
       attribute: title
     details:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details_"]
       attribute: href
     download:
       selector: a[href^="download.php?"]

src/Jackett.Common/Definitions/lepornoinfo.yml

@@ -13,6 +13,7 @@ caps:
     - {id: 1, cat: XXX/XviD, desc: "Videos SD"}
     - {id: 2, cat: XXX/x264, desc: "Videos HD"}
     - {id: 3, cat: XXX/WMV, desc: "Movies"}
+    - {id: 17, cat: XXX/ImageSet, desc: "SiteRip's Picture Packs"}
     - {id: 6, cat: XXX/Other, desc: "Porn (Other)"}
     - {id: 4, cat: XXX, desc: "AV CENSORED (JAV)"}
     - {id: 5, cat: XXX, desc: "AV UNCENSORED (JAV)"}
@@ -26,6 +27,7 @@ caps:
     - {id: 15, cat: XXX, desc: "Pregnant"}
     - {id: 16, cat: XXX, desc: "Fetish"}
     - {id: 9, cat: XXX, desc: "Gay Forum"}
+    - {id: 18, cat: XXX, desc: "Incest and Taboo"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/lesaloon.yml

@@ -120,7 +120,7 @@ login:
   # https://lesaloonv2-0.net/yupy_login.php
   path: yupy_login.php
   method: form
-  form: form[action^="index.php?page=login"]
+  form: form[action^="login"]
   inputs:
     uid: "{{ .Config.username }}"
     pwd: "{{ .Config.password }}"

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.dev/
+  - https://limetorrents.unblockit.link/
   - https://limetorrents.unblockninja.com/
 legacylinks:
   - https://www.limetorrents.io/
@@ -36,6 +36,8 @@ legacylinks:
   - https://limetorrents.unblockit.top/
   - https://limetorrents.unblockit.lat/
   - https://limetorrents.unblockit.app/
+  - https://limetorrents.unblockit.dev/
+  - https://limetorrents.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/magico.yml

@@ -6,11 +6,12 @@ language: el-gr
 type: private
 encoding: UTF-8
 links:
-  - https://magico.fun/
+  - https://trellas.info/
 legacylinks:
   - https://magico.info/
   - https://magico.one/
   - https://magico.club/
+  - https://magico.fun/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -98,12 +98,15 @@ caps:
     - {id: 212, cat: Books, desc: "Ship's documentation"}
     - {id: 251, cat: Books, desc: "Diving"}
     - {id: 111, cat: Books, desc: "Yachting, sailing, boating"}
+    - {id: 298, cat: Books, desc: "Yachting, sailing, boating-Cruising Guides"}
+    - {id: 297, cat: Books, desc: "Yachting, sailing, boating-Weather Sailing"}
+    - {id: 296, cat: Books, desc: "Yachting, sailing, boating-How to Buy a Boat?"}
     - {id: 258, cat: Books, desc: "Yachting, sailing, boating-Inflatable boats, boats, kayaks"}
     - {id: 237, cat: Books, desc: "Yachting, sailing, boating-Yachting, sailing videos"}
     - {id: 257, cat: Books, desc: "Yachting, sailing, boating-Motor Boat & Yachting magazines"}
     - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Seamanship practice"}
     - {id: 254, cat: Books, desc: "Yachting, sailing, boating-Repair and Restoration"}
-    - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
+    - {id: 255, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
     - {id: 256, cat: Books, desc: "Yachting, sailing, boating-Rigging, knots"}
     - {id: 252, cat: Books, desc: "Yachting, sailing, boating-Projects, design, construction"}
     - {id: 177, cat: Books, desc: "Shipmodeling"}
@@ -142,6 +145,7 @@ caps:
     - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}
     - {id: 162, cat: Books, desc: "Archive"}
+    - {id: 295, cat: Books, desc: "Archive-Unregistered releases"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/mesevilag.yml

@@ -12,17 +12,24 @@ caps:
   categorymappings:
     - {id: 1, cat: TV/Anime, desc: "Anime/Cam"}
     - {id: 2, cat: TV/Anime, desc: "Anime/Eng"}
+    - {id: 21, cat: TV/Anime, desc: "Anime/HD"}
     - {id: 3, cat: TV/Anime, desc: "Anime/Hun"}
     - {id: 13, cat: TV/Anime, desc: "Anime/Sorozat(Series)"}
     - {id: 4, cat: Movies, desc: "Családi/Cam(Family)"}
     - {id: 5, cat: Movies, desc: "Családi/Eng(Family)"}
+    - {id: 19, cat: Movies/HD, desc: "Családi/HD(Family)"}
     - {id: 6, cat: Movies, desc: "Családi/Hun(Family)"}
+    - {id: 17, cat: Movies, desc: "Családi/Romantikus/Cam(Family Romantic)"}
+    - {id: 16, cat: Movies, desc: "Családi/Romantikus/Eng(Family Romantic)"}
+    - {id: 15, cat: Movies, desc: "Családi/Romantikus/Hun(Family Romantic)"}
+    - {id: 18, cat: TV, desc: "Családi/Romantikus/Sorozat(Family Romantic Series)"}
     - {id: 14, cat: TV, desc: "Családi/Sorozat(Family Series)"}
     - {id: 8, cat: Audio/Audiobook, desc: "Hangoskönyv(Audiobooks)"}
     - {id: 9, cat: PC/Games, desc: "Játék/ISO(Games)"}
     - {id: 11, cat: Console, desc: "Játék/Konzol(Console)"}
-    - {id: 10, cat: PC/Games, desc: "Játék/RIP(Games RIP)"}
+    - {id: 10, cat: PC/Games, desc: "Játék/RIP(Games)"}
     - {id: 7, cat: Books, desc: "Könyv(Books)"}
+    - {id: 20, cat: Movies/HD, desc: "Romantikus/HD(Romantic)"}
     - {id: 12, cat: Audio, desc: "Zene/Hun(Music)"}
 
   modes:

src/Jackett.Common/Definitions/mononokebt.yml

@@ -6,7 +6,9 @@ language: fr-fr
 type: private
 encoding: iso-8859-15
 links:
-  - http://mononoke-bt.org/ # site does not support https NET::ERR_CERT_DATE_INVALID expired 10 Dec 2018
+  - http://mononoke-bt.org/
+legacylinks:
+  - https://mononoke-bt.org/ # downloads do not supported https
 
 caps:
   categories:
@@ -16,17 +18,41 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
 
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: vostfr
+    type: checkbox
+    label: Add VOSTFR to titles
+    default: false
+  - name: IMPORTANT_FR
+    type: info
+    label: (FR) Informations Importantes
+    default: Avant de pouvoir télécharger un torrent depuis Jackett, allez dans la <a href="https://mononoke-bt.org/faq.php" target="_blank">FAQ</a> et cliquer tous les 'Lu et Approuvé' de la page.
+  - name: IMPORTANT_EN
+    type: info
+    label: (EN) Important infos
+    default: Before you can even begin to download anything you need to go to the <a href="https://mononoke-bt.org/faq.php" target="_blank">FAQ</a> and click every 'Lu et Approuvé' present on the page.
+
 login:
-  path: takelogin.php
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("l'authentification"))
+    cookie: "{{ .Config.cookie }}"
   test:
     path: browse2.php
 
+download:
+  before:
+    path: gettorrent.php
+    method: get
+    inputs:
+      id: "{{ .DownloadUri.Query.id }}"
+
 search:
   paths:
     - path: browse2.php
@@ -40,8 +66,12 @@ search:
   fields:
     category:
       text: 1
-    title:
+    title_normal:
       selector: a[href^="details.php?id="]
+    title_vostfr:
+      text: "{{ .Result.title_normal }} VOSTFR"
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_normal }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/monova.yml

@@ -1,116 +0,0 @@
----
-id: monova
-name: Monova
-description: "Monova is a Public torrent index"
-language: en-us
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://monova.org/
-  - https://monova.to/
-  - https://monova.unblockit.dev/
-  - https://monova.unblocked.monster/
-  - https://monova.unblockninja.com/
-legacylinks:
-  - https://monova.unblockit.pro/
-  - https://monova.unblockit.one/
-  - https://monova.black-mirror.xyz/
-  - https://monova.unblocked.casa/
-  - https://monova.proxyportal.fun/
-  - https://monova.uk-unblock.xyz/
-  - 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/
-  - https://monova.unblockit.id/
-  - https://monova.unblockit.lat/
-  - https://monova.unblockit.app/
-  - https://monova.unblocked.rest/
-
-caps:
-  categorymappings:
-    - {id: venus-mars, cat: XXX, desc: Adult}
-    - {id: video-camera, cat: Movies, desc: Video}
-    - {id: music, cat: Audio, desc: Audio}
-    - {id: book, cat: Books, desc: Books}
-    - {id: gamepad, cat: PC/Games, desc: Games}
-    - {id: cog, cat: PC/0day, desc: Software}
-    - {id: list, cat: Other, desc: Others}
-    - {id: picture-o, cat: Other/Misc, desc: Photos}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # https://monova.to/search?term=vikings+s05e05
-    # https://monova.to/video
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}{{ else }}video{{ end }}"
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}&{{ else }}video?{{ end }}page=2"
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}&{{ else }}video?{{ end }}page=3"
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}&{{ else }}video?{{ end }}page=4"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
-
-  rows:
-    selector: tr.desktop:not(tr[class="desktop  success"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td.torrent_name i
-      attribute: class
-      filters:
-        # remove fa fa- prefix
-        - name: replace
-          args: ["fa fa-", ""]
-    title:
-      selector: td.torrent_name a
-    details:
-      selector: td.torrent_name a
-      attribute: href
-    infohash:
-      selector: td.torrent_name a
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([0-9A-Fa-f]{40})
-    size:
-      optional: true
-      selector: td.center-align
-      filters:
-        - name: replace
-          args: ["N/A", "512 MB"]
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    date:
-      optional: true
-      selector: td.torrent_name
-      remove: a
-      filters:
-        - name: replace
-          args: ["added ", ""]
-        - name: replace
-          args: [" ago.*$", ""]
-        - name: replace
-          args: ["min.", "minutes"]
-        - name: timeago
-# engine n/a

src/Jackett.Common/Definitions/montorrent.yml

@@ -0,0 +1,185 @@
+---
+id: montorrent
+name: MonTorrent
+description: "MonTorrent is a FRENCH Public Indexer"
+language: fr-fr
+type: public
+encoding: UTF-8
+followredirect: true
+links:
+  - https://www.montorrent.com/
+
+caps:
+  categorymappings:
+    - {id: "vo", cat: Movies, desc: "Films VO"}
+    - {id: "vostfr", cat: Movies, desc: "Films VOSTFR"}
+    - {id: "dvdrip", cat: Movies, desc: "Films DVDRIP"}
+    - {id: "bdrip", cat: Movies, desc: "Films BDRIP"}
+    - {id: "webrip", cat: Movies, desc: "Films WEBRIP"}
+    - {id: "hdrip", cat: Movies, desc: "Films HDRIP"}
+    - {id: "dvdscreener", cat: Movies, desc: "Films DVD Screener"}
+    - {id: "screener", cat: Movies, desc: "Films Screener"}
+    - {id: "hd2160p", cat: Movies, desc: "Films 2160p"}
+    - {id: "hd1080p", cat: Movies, desc: "Films 1080p"}
+    - {id: "hd720p", cat: Movies, desc: "Films 720p"}
+    - {id: "hd2160p-hdlight", cat: Movies, desc: "Films 2160p HD Light"}
+    - {id: "hd1080p-hdlight", cat: Movies, desc: "Films 1080p HD Light"}
+    - {id: "hd720p-hdlight", cat: Movies, desc: "Films 720p HD Light"}
+    - {id: "hd3d", cat: Movies, desc: "Films 3D"}
+    - {id: "serie-vostfr", cat: TV, desc: "Emission TV VOSTFR"}
+    - {id: "serie-vf", cat: TV, desc: "Emission TV VF"}
+    - {id: "pack-vf", cat: TV, desc: "Emission TV Pack VF"}
+    - {id: "pack-vostfr", cat: TV, desc: "Emission TV Pack VOSTFR"}
+    - {id: "pack-vo", cat: TV, desc: "Emission TV VO"}
+    - {id: "albums", cat: Audio, desc: "Audio"}
+    - {id: "jeux", cat: PC/Games, desc: "Jeu vidéo"}
+    - {id: "jeux-pc", cat: PC/Games, desc: "Jeu vidéo PC"}
+    - {id: "jeux-console", cat: PC/Games, desc: "Jeu vidéo Consoles"}
+    - {id: "logiciels", cat: PC, desc: "Application"}
+    - {id: "ebooks", cat: Books, desc: "eBook"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: filter_title
+    type: checkbox
+    label: Try to normalize releases names by moving year after the title
+    default: false
+  - name: langfilter
+    type: select
+    label: Lang Filter / Filtre Langue
+    default: on
+    options:
+      on: Tous
+      french: French
+      truefrench: TrueFrench
+      vostfr: VOSTFR
+      vo: VO
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
+  - name: enhancedAnime
+    type: checkbox
+    label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
+    default: false
+  - name: order
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: id
+      seeders: seeders
+      size: taille
+      rls: name
+  - name: orderby
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}/recherche/?query={{ .Keywords }}&{{ else }}/torrents/?{{ end }}langue={{ .Config.langfilter }}&order={{ .Config.order }}&orderby={{ .Config.orderby }}"
+    - path: "{{ if .Keywords }}/recherche/?query={{ .Keywords }}&{{ else }}/torrents/?{{ end }}langue={{ .Config.langfilter }}&order={{ .Config.order }}&orderby={{ .Config.orderby }}&page=2"
+
+  rows:
+    selector: div.t-details
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      optional: true
+      selector: a[href*="id_cat"]
+      attribute: class
+      filters:
+        - name: replace
+          args: ["liste-categorie-couleur ", ""]
+    title_normal:
+      selector: a[href^="/torrent/"]
+    title_filtered:
+      text: "{{ .Result.title_normal }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)^(?:(.+?)((?:[\\.\\-\\s_\\[]+(?:imax|(?:dvd|bd|tv)(?:rip|scr)|bluray(?:\\-?rip)?|720\\s*p?|1080\\s*p?|vof?|vost(?:fr)?|multi|vf(?:f|q)?[1-3]?|(?:true)?french|eng?)[\\.\\-\\s_\\]]*)*)([\\(\\[]?(?:20|1[7-9])\\d{2}[\\)\\]]?)(.*)$|(.*))$", "$1 $3 $2 $4 $5"]
+        - name: replace
+          args: [".", " "]
+        - name: trim
+        - name: re_replace
+          args: ["(?i)\\s(mkv|avi|divx|xvid|mp4)$", ""]
+        - name: re_replace
+          args: ["(\\s{2,5})", " "]
+        - name: trim
+    title_phase1:
+      text: "{{ if .Config.filter_title }}{{ .Result.title_filtered }}{{ else }}{{ .Result.title_normal }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)[\\.\\s\\[\\-]multi[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)[\\.\\s\\[\\-]vostfr[\\.\\s\\]\\-]", ".ENGLISH."]
+        - name: re_replace
+          args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."]
+    title_phase3:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    title_anime:
+      text: "{{ .Result.title_phase3 }}"
+      filters:
+        # Sonarr need E in front of 3 digit number or else it thinks it is episode
+        # S01E10 for number 110 for example ==> enhancedAnime
+        - name: re_replace
+          args: ["(.*)(\\.| |\\-)(\\d{2,3})(\\.| |\\-)(.*)", "$1 E$3 $5"]
+    title:
+      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/telechargement/"]
+      attribute: href
+    size:
+      selector: div.t-taille
+    seeders:
+      text: 0
+    seeders:
+      selector: div.t-sources
+      optional: true
+    leechers:
+      text: 0
+    leechers:
+      selector: div.t-clients
+      optional: true
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/movcr.yml

@@ -1,95 +0,0 @@
----
-id: movcr
-name: MovCr
-description: "MovCr is an Indian Public torrent site"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://movcr.st/
-legacylinks:
-  - https://movcr.tv/
-  - https://movcr.black-mirror.xyz/
-  - https://movcr.unblocked.casa/
-  - https://movcr.proxyportal.fun/
-  - https://movcr.uk-unblock.xyz/
-  - https://movcr.ind-unblock.xyz/
-  - 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:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About MovCr Categories
-    default: MovCr does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-download:
-  selector: a[href^="/torrents/"]
-  attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/search.php?q={{ .Keywords }}{{ else }}/{{ end }}"
-
-  rows:
-    selector: tr:has(td.name a[href^="/download-"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: td.name a:nth-child(2)
-    details:
-      selector: td.name a
-      attribute: href
-    download:
-      selector: td.name a
-      attribute: href
-    date:
-      selector: td.seeds:contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +05:30" # IST
-        - name: dateparse
-          args: "2006-01-02 -07:00"
-    date:
-      selector: td.seeds:not(:contains("-"))
-      optional: true
-      filters:
-        - name: timeago
-    size:
-      selector: td.leeches:not(:contains("B"))
-      optional: true
-      text: "0 B"
-    size:
-      selector: td.leeches:contains("B")
-      optional: true
-    seeders:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["/", 0]
-    leechers:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["/", 1]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/nethd.yml

@@ -1,12 +1,14 @@
 ---
 id: nethd
 name: NetHD
-description: "NetHD (VietTorrent) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
+description: "NetHD (VietTorrent) is a VIETNAMESE Semi-Private Torrent Tracker for HD MOVIES / TV"
 language: vi-vn
 type: semi-private
 encoding: UTF-8
 links:
-  - http://nethd.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
+  - https://nethd.org/
+legacylinks:
+  - http://nethd.org/ # site forces https
 
 caps:
   categorymappings:
@@ -118,33 +120,19 @@ search:
         - name: prepend
           args: "download.php?id="
     date:
-      # 2020-10-05<br/>14:43:24
-      selector: td:nth-child(5):contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    date:
-      # 2 days<br/>23 hours
-      selector: td:nth-child(5):not(:contains("-"))
-      optional: true
+      # 2 ngày<br/>23 giờ
+      selector: td:nth-child(5)
       filters:
         - name: re_replace
-          args: ["year|years", "years "]
+          args: ["năm", "years "]
         - name: re_replace
-          args: ["month|months", "months "]
+          args: ["tháng", "months "]
         - name: re_replace
-          args: ["week|weeks", "weeks "]
+          args: ["ngày", "days "]
         - name: re_replace
-          args: ["day|days", "days "]
+          args: ["phút", "minutes "]
         - name: re_replace
-          args: ["second|seconds", "seconds "]
-        - name: re_replace
-          args: ["minute|minutes", "minutes "]
-        - name: re_replace
-          args: ["hour|hours", "hours "]
+          args: ["giờ", "hours "]
         - name: timeago
     size:
       selector: td:nth-child(6)

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

@@ -501,6 +501,12 @@ caps:
     - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
     - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
     - {id: 324, cat: Audio, desc: "Electronic"}
+    - {id: 1327, cat: Audio, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
+    - {id: 1328, cat: Audio, desc: " |- Psybient, Psychill, Psydub"}
+    - {id: 1325, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
+    - {id: 1326, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge"}
+    - {id: 1323, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
+    - {id: 1324, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical"}
     - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
     - {id: 346, cat: Audio, desc: " |- Trance"}
     - {id: 1243, cat: Audio, desc: " |- Trance (Singles, EPs)"}
@@ -765,7 +771,7 @@ search:
     sha: 1
     ta: -1
     sns: -1
-    sds: -1
+    sds: 4 # only freeleech available for download without account
     nm: "{{ .Keywords }}"
     pn: ""
     submit: "Поиск"

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

@@ -507,6 +507,12 @@ caps:
     - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
     - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
     - {id: 324, cat: Audio, desc: "Electronic"}
+    - {id: 1327, cat: Audio, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
+    - {id: 1328, cat: Audio, desc: " |- Psybient, Psychill, Psydub"}
+    - {id: 1325, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
+    - {id: 1326, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge"}
+    - {id: 1323, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
+    - {id: 1324, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical"}
     - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
     - {id: 346, cat: Audio, desc: " |- Trance"}
     - {id: 1243, cat: Audio, desc: " |- Trance (Singles, EPs)"}

src/Jackett.Common/Definitions/oncesearch.yml

@@ -0,0 +1,137 @@
+---
+id: oncesearch
+name: OnceSearch
+description: "OnceSearch is a Public Torrent Tracker for 3X"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - http://oncesearch.com/ # https is not supported
+
+caps:
+  categories:
+    Amateur: XXX
+    Anal: XXX
+    Anime: XXX
+    Asian: XXX
+    Ass Lick: XXX
+    BBW: XXX
+    BDSM: XXX
+    Bi-Sexual: XXX
+    Big Ass: XXX
+    Big Butts: XXX
+    Big Dick: XXX
+    Big Tits: XXX
+    Blonde: XXX
+    Blowjob: XXX
+    Brunette: XXX
+    Busty: XXX
+    Classic: XXX
+    Comics: XXX
+    Creampie: XXX
+    Cumshot: XXX
+    Deepthroat: XXX
+    Ebony: XXX
+    Erotic: XXX
+    Facial: XXX
+    Fetish: XXX
+    Fishnets: XXX
+    Fisting: XXX
+    Foot: XXX
+    Foreign: XXX
+    Gangbang: XXX
+    Gay: XXX
+    Glamour Girls: XXX
+    Gonzo: XXX
+    Group Sex: XXX
+    Hairy: XXX
+    Handjob: XXX
+    Hardcore: XXX
+    Homemade: XXX
+    Interracial: XXX
+    Latin: XXX
+    Lesbian: XXX
+    Lingerie: XXX
+    Massage: XXX
+    Masturbation: XXX
+    Mature: XXX
+    MILF: XXX
+    Nude Photography: XXX
+    Nylons: XXX
+    Oiled: XXX
+    Oral: XXX
+    Orgy: XXX
+    Outdoor: XXX
+    Pissing: XXX
+    Pregnant: XXX
+    Public: XXX
+    Redhead: XXX
+    Retro: XXX
+    Sex Toys: XXX
+    Shemale: XXX
+    Solo: XXX
+    Squirt: XXX
+    Tattoo: XXX
+    Teen: XXX
+    Threesome: XXX
+    Uncensored: XXX
+    XXX: XXX
+    Porno Clips: XXX
+    Porno HD Movies: XXX
+    Porno Other: XXX
+    Porno Pics: XXX
+
+  modes:
+    search: [q]
+
+settings: []
+
+search:
+  paths:
+    # http://oncesearch.com/search/advanced/-/Olivia%20Sin%20Deep/0/any
+    # http://oncesearch.com/category/latest-torrents
+    # site supports only single cat search so we default to all
+    - path: "{{ if .Keywords }}search/advanced/-/{{ .Keywords }}/0/any{{ else }}category/latest-torrents{{ end }}"
+
+  rows:
+    selector: table.table-striped > tbody > tr
+
+  fields:
+    title:
+      selector: span
+    category:
+      selector: p > a:last-of-type
+    details:
+      selector: a[href^="/details/"]
+      attribute: href
+    download:
+      selector: a[href$=".torrent"]
+      attribute: href
+      optional: true
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+      optional: true
+    date:
+      selector: td:nth-child(3)
+      filters:
+        - name: timeago
+    files:
+      text: 1
+    files:
+      selector: td:nth-child(4)
+      optional: true
+    size:
+      text: "256 MB"
+    size:
+      selector: td:nth-child(5)
+      optional: true
+    seeders:
+      text: 1
+    leechers:
+      text: 0
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/onejav.yml

@@ -15,7 +15,11 @@ caps:
   modes:
     search: [q]
 
-settings: []
+settings:
+  - name: flaresolverr-onejav
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.<br><br>If you have issues downloading, perform a keyword search (e.g. <b>video</b>) so FlareSolverr can grab new cookies.
 
 search:
   paths:

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.cc/
+  - https://wvw.oxtorrent.ws/
   - https://www.oxtorrent.co/
   - https://oxtorrent.unblocked.monster/
 legacylinks:
@@ -24,6 +24,9 @@ legacylinks:
   - https://oxtorrent.proxyportal.pw/
   - https://oxtorrent.uk-unblock.pro/
   - https://oxtorrent.unblocked.rest/
+  - https://www.oxtorrent.cc/
+  - https://www.oxtorrent.bz/
+  - https://www.oxtorrent.ws/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/piratbit.yml

@@ -25,7 +25,9 @@ caps:
     - {id: 1700, cat: Movies, desc: "Оформление раздач (Кино, Видео и ТВ)"}
     - {id: 3, cat: Movies, desc: "арубежные Фильмы (DVDrip, WEB-DLRip, HDrip)"}
     - {id: 1845, cat: Movies, desc: " |- Фильмы (мультфильмы) cо спонсором показа (Новинки AVI/MKV)"}
-    - {id: 1856, cat: Movies, desc: " |- Фильмы 2019 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
+    - {id: 1860, cat: Movies, desc: " |- Фильмы 2021 (Звук TS, Cam, VO, DVO)"}
+    - {id: 1859, cat: Movies, desc: " |- Фильмы 2021 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
+    - {id: 1856, cat: Movies, desc: " |- Фильмы 2019-2020 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1849, cat: Movies, desc: " |- Фильмы 2018 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1848, cat: Movies, desc: " |- Фильмы 2018-2019 (Звук TS, Cam, VO, DVO)"}
     - {id: 1838, cat: Movies, desc: " |- Фильмы 2017 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}

src/Jackett.Common/Definitions/piratbitl.yml

@@ -25,7 +25,9 @@ caps:
     - {id: 1700, cat: Movies, desc: "Оформление раздач (Кино, Видео и ТВ)"}
     - {id: 3, cat: Movies, desc: "арубежные Фильмы (DVDrip, WEB-DLRip, HDrip)"}
     - {id: 1845, cat: Movies, desc: " |- Фильмы (мультфильмы) cо спонсором показа (Новинки AVI/MKV)"}
-    - {id: 1856, cat: Movies, desc: " |- Фильмы 2019 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
+    - {id: 1860, cat: Movies, desc: " |- Фильмы 2021 (Звук TS, Cam, VO, DVO)"}
+    - {id: 1859, cat: Movies, desc: " |- Фильмы 2021 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
+    - {id: 1856, cat: Movies, desc: " |- Фильмы 2019-2020 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1849, cat: Movies, desc: " |- Фильмы 2018 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1848, cat: Movies, desc: " |- Фильмы 2018-2019 (Звук TS, Cam, VO, DVO)"}
     - {id: 1838, cat: Movies, desc: " |- Фильмы 2017 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}

src/Jackett.Common/Definitions/pirateiro.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://pirateiro.com/
   - https://pirateiro.eu/
-  - https://pirateiro.unblockit.dev/
+  - https://pirateiro.unblockit.link/
 legacylinks:
   - http://pirateiro.com/
   - https://pirateiro.unblockit.pro/
@@ -21,6 +21,8 @@ legacylinks:
   - https://pirateiro.unblockit.top/
   - https://pirateiro.unblockit.lat/
   - https://pirateiro.unblockit.app/
+  - https://pirateiro.unblockit.dev/
+  - https://pirateiro.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pleasuredome.yml

@@ -10,7 +10,7 @@ links:
 legacylinks:
   - http://www.pleasuredome.org.uk/
 certificates:
-  - eb27d56880fa073cd9ddd040d9a7f101d4868f53 # self signed
+  - 50BC58CBC5B822A879E14EF59BA8EC0B92F63F2B # self signed
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/portugas.yml

@@ -1,30 +1,23 @@
 ---
-id: onlyscene
-name: ONLYscene
-description: "ONLYscene is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-fr
+id: portugas
+name: Portugas
+description: "Portugas is a Private Portoguese Tracker"
+language: pt-pt
 type: private
 encoding: UTF-8
 links:
-  - https://www.onlyscene.org/
+  - https://portugas.org/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Filmes"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 9, cat: TV/Anime, desc: "TV Anime"}
-    - {id: 10, cat: TV/Documentary, desc: "DOC"}
-    - {id: 12, cat: Other, desc: "Attente-Classement"}
-    - {id: 13, cat: PC/Games, desc: "jeux"}
-    - {id: 14, cat: Other, desc: "Dox"}
-    - {id: 15, cat: PC/0day, desc: "APPS"}
-    - {id: 16, cat: Books/Mags, desc: "Journaux-Mags"}
-    - {id: 17, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 18, cat: TV, desc: "Spectacles"}
-    - {id: 19, cat: TV, desc: "TV Spectacles"}
-    - {id: 20, cat: TV/Documentary, desc: "TV DOC"}
+    - {id: 3, cat: Audio, desc: "Músicas"}
+    - {id: 4, cat: PC/Games, desc: "Jogos"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 7, cat: XXX, desc: "XXX"}
+    - {id: 10, cat: TV/Anime, desc: "Animação"}
+    - {id: 9, cat: Books, desc: "E-Books"}
 
   modes:
     search: [q]
@@ -44,25 +37,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -105,6 +79,7 @@ search:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    keywords: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
@@ -130,27 +105,8 @@ search:
       filters:
         - name: regexp
           args: "/categories/(\\d+)"
-    title_phase1:
-      selector: a.view-torrent
-      filters:
-        - name: re_replace
-          args: ["([\\.]+)", " "]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
     title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+      selector: a.view-torrent
     download:
       selector: a[href*="/download/"]
       attribute: href
@@ -161,12 +117,10 @@ search:
       selector: div.torrent-poster img
       attribute: src
       filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
         - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:
@@ -225,7 +179,7 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From PARA Store
         i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
         i[class*="fa-star text-bold"]: 0 # Freeleech From Token
         i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
@@ -240,8 +194,8 @@ search:
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
     minimumratio:
-      text: 1.0
+      text: 1.1
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# UNIT3D 2.3.0
+# UNIT3D 4.0.0

src/Jackett.Common/Definitions/pthome.yml

@@ -123,4 +123,7 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
 # NexusPHP

src/Jackett.Common/Definitions/retroflix.yml

@@ -1,181 +0,0 @@
----
-id: retroflix
-name: RetroFlix
-description: "Private Torrent Tracker for Classic Movies / TV / General Releases."
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - https://retroflix.club/
-legacylinks:
-  - https://retroflix.net/
-
-caps:
-  categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies"}
-    - {id: 402, cat: TV, desc: "TV Series"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 407, cat: TV/Sport, desc: "Sports"}
-    - {id: 409, cat: Books, desc: "Books"}
-    - {id: 408, cat: Audio, desc: "HQ Audio"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: torrents.php
-    selector: a[href*="/logout?"]
-
-search:
-  # https://retroflix.club/torrents.php?incldead=0&spstate=0&inclbookmarked=0&search=tt0055254&search_area=4&search_mode=0
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 Exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
-
-  fields:
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    release_year:
-      selector: a[href^="/torrents.php?processing="]
-      optional: true
-    quality:
-      selector: a[href^="/torrents.php?standard="]
-      optional: true
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: append
-          args: " {{ .Result.release_year }}"
-        - name: append
-          args: " {{ .Result.quality }}"
-    title:
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " {{ .Result.release_year }}"
-        - name: append
-          args: " {{ .Result.quality }}"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: tr[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
-      attribute: title
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04:05 -07:00"
-    date:
-      # time added
-      selector: td:nth-child(4):not(:has(span))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-200615:04:05 -07:00"
-    size:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img.pro_free: 0
-        img.pro_free2up: 0
-        img.pro_50pctdown: 0.5
-        img.pro_50pctdown2up: 0.5
-        img.pro_30pctdown: 0.3
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img.pro_50pctdown2up: 2
-        img.pro_free2up: 2
-        img.pro_2up: 2
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# NexusPHP

src/Jackett.Common/Definitions/rutor.yml

@@ -36,6 +36,7 @@ caps:
     search: [q]
     tv-search: [q]
     movie-search: [q]
+    music-search: [q]
 
 settings:
   - name: info

src/Jackett.Common/Definitions/sdbits.yml

@@ -17,6 +17,7 @@ caps:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 4, cat: Audio, desc: "Music"}
     - {id: 5, cat: TV/Sport, desc: "Sports"}
+    - {id: 7, cat: TV/Other, desc: "Stand-up Comedy"}
     - {id: 2, cat: TV, desc: "TV"}
 
   modes:
@@ -41,7 +42,6 @@ login:
 search:
   paths:
     - path: browse.php
-      method: post
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"

src/Jackett.Common/Definitions/selezen.yml

@@ -6,8 +6,11 @@ language: ru-ru
 type: public
 encoding: UTF-8
 links:
-  - https://www.selezen.net/
+  - https://mel.selezen.net/
   - https://s1.selezen.site/
+legacylinks:
+  - https://www.selezen.site/
+  - https://www.selezen.net/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/shareisland.yml

@@ -229,4 +229,4 @@ search:
     minimumseedtime:
       # 6 days (as seconds = 6 x 24 x 60 x 60)
       text: 518400
-# UNIT3D 4.0.0
+# UNIT3D 5.1.0

src/Jackett.Common/Definitions/sharewood.yml

@@ -11,7 +11,7 @@ links:
 caps:
   categorymappings:
     - {id: "Films", cat: Movies, desc: "Films"}
-    - {id: "Films_Animations", cat: TV/Anime, desc: "Films Animation"}
+    - {id: "Films_Animations", cat: Movies, desc: "Films Animation"}
     - {id: "Animes", cat: TV/Anime, desc: " Séries Animations"}
     - {id: "Series", cat: TV, desc: "TV Series"}
     - {id: "Documentaires", cat: TV/Documentary, desc: "TV Documentaires"}

src/Jackett.Common/Definitions/sktorrent.yml

@@ -93,20 +93,98 @@ search:
       selector: a[href^="details.php?name="]
       filters:
         - name: re_replace
-          args: [".*? / ", ""]
+          args: ["^VA\\s*\\|", "VA -"]
+        - name: re_replace
+          args: ["^.*? \\/\\s*|^.*? \\|\\s*", ""]
         - name: diacritics
           args: replace
         - name: re_replace
-          args: ["( = CSFD \\d+\\%)", ""]
+          args: ["\\|\\s*\\d+\\% CSFD\\.cz\\/|\\s*=*\\s*CSFD\\s*\\d+\\%|\\s*CSFD\\s*=*\\s*\\d+\\%|\\s*CSFD", ""]
         - name: re_replace
-          args: ["(?i)serie", ""]
+          args: ["(\\d{1})\\s*\\.*\\s*az*\\s*(\\d{2,})\\s*\\.*\\s(?i)serie\\.*", "S0$1-S$2"]
         - name: re_replace
-          args: ["(\\d{2})\\.", "S$1"]
+          args: ["(\\d{1})\\s*\\.*\\s*az*\\s*(\\d{1})\\s*\\.*\\s(?i)serie\\.*", "S0$1-S$2"]
         - name: re_replace
-          args: ["(\\d{1})\\.", "S0$1"]
+          args: ["(?i)serie\\s*(\\d{1})\\s*\\.*\\s*az*\\s*(\\d{2,})\\s*\\.*", "S0$1-S$2"]
+        - name: re_replace
+          args: ["(?i)serie\\s*(\\d{1})\\s*\\.*\\s*az*\\s*(\\d{1})\\s*\\.*", "S0$1-S$2"]
+        - name: re_replace
+          args: ["(?i)season\\,*\\s*(\\d{1})\\,\\s*\\d{1}\\,\\s*(\\d{2,})", "S0$1-S$2"]
+        - name: re_replace
+          args: ["(?i)season\\,*\\s*(\\d{1})\\,\\s*\\d{1}\\,\\s*(\\d{1})", "S0$1-S0$2"]
+        - name: re_replace
+          args: ["(?i)season\\s*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{2,})\\s*\\.*", "S0$1-S$2"]
+        - name: re_replace
+          args: ["(?i)season\\s*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{1})\\s*\\.*", "S0$1-S0$2"]
+        - name: re_replace
+          args: ["^GRID\\:*\\s(?i)season", "GRID Seasson"]
+        - name: re_replace
+          args: ["(?i)season\\s*(\\d{2,})\\.*", "S$1"]
+        - name: re_replace
+          args: ["(?i)season\\s*(\\d{1})\\.*", "S0$1"]
+        - name: re_replace
+          args: ["GRID Seasson", "GRID Season"]
+        - name: re_replace
+          args: ["\\sPES\\s(\\d{4})\\s(?i)season", " PES $1 Seasson"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{2,})\\.*\\s*(?i)season\\)*", " S$1"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{2,})\\.*\\s(?i)season\\)*", " S0$1-S$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{1})\\.*\\s(?i)season\\)*", " S0$1-S0$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\.*\\s*(?i)season\\)*", " S0$1"]
+        - name: re_replace
+          args: [" PES (\\d{4}) Seasson", " PES $1 Season"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\,\\s*\\d{1}\\,\\s*(\\d{2,})\\,*\\s*(?i)serie\\)*", " S0$1-S$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\,\\s*\\d{1}\\,\\s*(\\d{1})\\,*\\s*(?i)serie\\)*", " S0$1-S0$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{2,})\\.*\\s*(?i)serie\\)*", " S$1"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{2,})\\.*\\s(?i)serie\\)*", " S0$1-S$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{1})\\.*\\s(?i)serie\\)*", " S0$1-S0$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\.*\\s*(?i)serie\\)*", " S0$1"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\,\\s*\\d{1}\\,\\s*(\\d{2,})\\,*\\s*(?i)seria\\)*", " S0$1-S$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\,\\s*\\d{1}\\,\\s*(\\d{1})\\,*\\s*(?i)seria\\)*", " S0$1-S0$2"]
+        - name: re_replace
+          args: ["\\s\\d{2,}\\.*\\s*(?i)seria\\s\\((?i)s(\\d{2,})", " (S$1"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{2,})\\.*\\s(?i)seria\\)*", " S0$1-S$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\s*\\.*\\-*\\,*\\+*\\s*(\\d{1})\\.*\\s(?i)seria\\)*", " S0$1-S0$2"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{2,})\\.*\\s*(?i)seria\\)*", " S$1"]
+        - name: re_replace
+          args: ["\\s\\(*(\\d{1})\\.*\\s*(?i)seria\\)*", " S0$1"]
+        - name: re_replace
+          args: ["\\s\\d{1}\\.*\\s*(?i)seria\\s*\\((?i)s(\\d{1})", " (S0$1"]
+        - name: re_replace
+          args: ["(\\d{2,})\\.*\\s*(?i)serii\\)*", "S01-S$1"]
+        - name: re_replace
+          args: ["(\\d{1})\\.*\\s*(?i)serii\\)*", "S01-S0$1"]
+        - name: re_replace
+          args: ["(?i)pouze (\\d{1})\\-(\\d{2,})", "pouze S0$1-S$2"]
+        - name: re_replace
+          args: ["(?i)pouze (\\d{1})\\-(\\d{1})", "pouze S0$1-S0$2"]
+        - name: re_replace
+          args: ["(?i)komplet (\\d{1})\\-(\\d{2,})", "komplet S0$1-S$2"]
+        - name: re_replace
+          args: ["(?i)komplet (\\d{1})\\-(\\d{1})", "komplet S0$1-S0$2"]
     details:
       selector: a[href^="details.php?name="]
       attribute: href
+    poster:
+      selector: img[class="lozad"]
+      attribute: data-src
+    poster:
+      selector: img[src="//cdn.sktorrent.eu/obrazky/xXx.jpg"]
+      attribute: src
     download:
       selector: a[href^="details.php?name="]
       attribute: href

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

@@ -1,6 +1,6 @@
 ---
-id: skytorrentsclone2
-name: SkyTorrentsClone2
+id: skytorrents-to
+name: SkyTorrents.to
 description: "SkyTorrents.to is a Public SkyTorrents clone for TV / MOVIES / GENERAL"
 language: en-us
 type: public
@@ -50,6 +50,10 @@ settings:
     options:
       created: created
       seeders: seeders
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   # https://skytorrents.to/?search=mr+mercedes+s02e05&sort=created

src/Jackett.Common/Definitions/skytorrentsclone.yml

@@ -1,102 +0,0 @@
----
-id: skytorrentsclone
-name: SkyTorrentsClone
-description: "SkyTorrents.lol is a Public SkyTorrents clone for TV / MOVIES / GENERAL"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://www.skytorrents.lol/
-legacylinks:
-  - https://www.skytorrents.to/
-  - https://skytorrents.black-mirror.xyz/
-  - https://skytorrents.unblocked.casa/
-  - https://skytorrents.proxyportal.fun/
-  - https://skytorrents.uk-unblock.xyz/
-  - https://skytorrents.ind-unblock.xyz/
-  - https://skytorrents.unblocked.bar/ # Jackett search fails 'Returning Redirect' & 'Relogin required' loop
-  - https://skytorrents.proxyportal.pw/ # Jackett search fails 'Returning Redirect' & 'Relogin required' loop
-  - https://skytorrents.uk-unblock.pro/ # Jackett search fails 'Returning Redirect' & 'Relogin required' loop
-  - https://skytorrents.to/ # skytorrentsclone2 #10000
-  - https://skytorrents.org/ # skytorrentsclone2 #10000
-  - https://skytorrents.net/ # skytorrentsclone2 #10000
-
-caps:
-  categorymappings:
-    - {id: other, cat: Other, desc: Other}
-    # category=
-    - {id: album, cat: Audio, desc: Album}
-    - {id: ebook, cat: Books, desc: Ebook}
-    - {id: movie, cat: Movies, desc: Movie}
-    - {id: show, cat: TV, desc: Show}
-    # type=
-    - {id: audio, cat: Audio, desc: Audio}
-    - {id: doc, cat: Books, desc: Doc}
-    - {id: games, cat: PC/Games, desc: Games}
-    - {id: software, cat: PC, desc: Software}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created
-    options:
-      created: created
-      seeders: seeders
-
-search:
-  # https://www.skytorrents.lol/?query=mr+mercedes+s02e05&sort=created
-  # https://www.skytorrents.lol/top100?sort=created
-  paths:
-    - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort={{ .Config.sort }}{{ else }}top100?sort={{ .Config.sort }}{{ end }}"
-    - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort={{ .Config.sort }}&page=2{{ else }}{{ end }}"
-    - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort={{ .Config.sort }}&page=3{{ else }}{{ end }}"
-    - path: "{{ if .Keywords }}?query={{ .Keywords }}&sort={{ .Config.sort }}&page=4{{ else }}{{ end }}"
-
-  rows:
-    selector: tr.result
-
-  fields:
-    category:
-      text: other
-    category|noappend:
-      # try category=
-      selector: a.label[href*="category="]
-      optional: true
-    category|noappend:
-      # try type=
-      selector: a.label[href*="type="]
-      optional: true
-    title:
-      selector: td a
-    details:
-      selector: td a
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?"]
-      attribute: href
-    size:
-      selector: td:nth-child(2)
-    files:
-      selector: td:nth-child(3)
-    date:
-      # 20 Minutes ago
-      selector: td:nth-child(4)
-      filters:
-        - name: timeago
-    seeders:
-      selector: td:nth-child(5)
-    leechers:
-      selector: td:nth-child(6)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/speedmasterhd.yml

@@ -71,8 +71,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
@@ -129,9 +129,9 @@ search:
     - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name, 1 descr, 2 both, 3 imdb
-    blah: "{{ if .Query.IMDBID }}3{{ else }}0{{ end }}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: "0"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 

src/Jackett.Common/Definitions/sugoimusic.yml

@@ -0,0 +1,182 @@
+---
+id: sugoimusic
+name: SugoiMusic
+description: "SugoiMusic is a Private Torrent Tracker for Asian MUSIC / TV"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://sugoimusic.me/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Audio, desc: Album}
+    - {id: 2, cat: Audio, desc: EP}
+    - {id: 3, cat: Audio, desc: Single}
+    - {id: 4, cat: Audio/Video, desc: Bluray}
+    - {id: 5, cat: Audio/Video, desc: DVD}
+    - {id: 6, cat: Audio/Video, desc: PV}
+    - {id: 7, cat: Audio/Video, desc: "Music Performance"}
+    - {id: 8, cat: Audio/Video, desc: "TV Music"}
+    - {id: 9, cat: TV, desc: "TV Variety"}
+    - {id: 10, cat: TV, desc: "TV Drama"}
+    - {id: 11, cat: Other, desc: Pictures}
+    - {id: 12, cat: Other/Misc, desc: Misc}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the SugoiMusic Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Covers per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="login.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    twofa: "{{ .Config.2facode }}"
+    login: ""
+  error:
+    - selector: span.warning
+      message:
+        selector: span[class="warning"]:not(:contains("JavaScript"))
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    searchstr: "{{ .Keywords }}"
+    # we can only grab the first release if group_results=1
+    group_results: 0
+    action: basic
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    # 0 normal, 1 freeleech, 2 neutral leech, 3 either
+    freetorrent: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
+    searchsubmit: 1
+
+  rows:
+    selector: tr.torrent
+
+  fields:
+    category:
+      selector: div:nth-child(1)
+      case:
+        "div[title=\"Album\"]": 1
+        "div[title=\"EP\"]": 2
+        "div[title=\"Single\"]": 3
+        "div[title=\"Bluray\"]": 4
+        "div[title=\"DVD\"]": 5
+        "div[title=\"PV\"]": 6
+        "div[title=\"Music Performance\"]": 7
+        "div[title=\"TV Music\"]": 8
+        "div[title=\"TV Variety\"]": 9
+        "div[title=\"TV Drama\"]": 10
+        "div[title=\"Pictures\"]": 11
+        "div[title=\"Misc\"]": 12
+    _title_artist:
+      selector: div.torrent_artists > a
+      optional: true
+      filters:
+        - name: append
+          args: " - "
+    _title_name:
+      selector: a.torrent_name
+    _title_date:
+      selector: div.group_info.clear
+      filters:
+        - name: regexp
+          args: "(\\[.+?\\])"
+    title:
+      text: "{{ .Result._title_artist }}{{ .Result._title_name }} {{ .Result._title_date }}"
+    details:
+      selector: a.torrent_name[href^="torrents.php?id="]
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["/static/common/noartwork/nocover.png", ""]
+    download:
+      selector: span > a[href^="torrents.php?action=download&id="]
+      attribute: href
+    magnet:
+      # magnet links can be enabled/disabled in account settings
+      optional: true
+      selector: span > a[href^="magnet:?dn="]
+      attribute: href
+    date:
+      selector: span.time.tooltip
+      filters:
+        - name: timeago
+    size:
+      selector: td.number_column.nobr
+    files:
+      selector: td:nth-last-child(6)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    grabs:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        div.torrent_info:contains("Freeleech"): 0
+        div.torrent_info:contains("Neutral Leech"): 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        div.torrent_info:contains("Neutral Leech"): 0
+        "*": 1
+    minimumratio:
+      text: 0.95
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+    description:
+      selector: div.torrent_info
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/teamos.yml

@@ -162,5 +162,8 @@ search:
     uploadvolumefactor:
       text: 1
     minimumratio:
-      text: 0.4
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # engine n/a

src/Jackett.Common/Definitions/tellytorrent.yml

@@ -197,4 +197,4 @@ search:
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
-# UNIT3D 4.0.0
+# UNIT3D 5.1.0

src/Jackett.Common/Definitions/theempire.yml

@@ -72,10 +72,12 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
+    titleonly: 1
+    # 0 Exact, 1 Fuzzy, 3 Parsed, 4 Simple # 2 Pure is not used
+    nonboolean: 0
+
   rows:
     selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])
-    filters:
-      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/thegeeks.yml

@@ -115,6 +115,9 @@ search:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
     incldead: 1
+    titleonly: 1
+    # 0 Exact, 1 Fuzzy, 3 Parsed, 4 Simple # 2 Pure is not used
+    nonboolean: 0
 
   rows:
     selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])

src/Jackett.Common/Definitions/theleachzone.yml

@@ -0,0 +1,161 @@
+---
+id: theleachzone
+name: TheLeachZone
+description: "The Leach Zone is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://tlz.digital/
+
+caps:
+  categorymappings:
+    - {id: 21, cat: PC, desc: "Appz"}
+    - {id: 22, cat: PC/Games, desc: "Games"}
+    - {id: 23, cat: Other, desc: "Misc."}
+    - {id: 24, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 11, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 3, cat: Movies, desc: "Movies Packs"}
+    - {id: 20, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 4, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 17, cat: Audio, desc: "Music Packs"}
+    - {id: 18, cat: TV/HD, desc: "TV HD"}
+    - {id: 16, cat: TV, desc: "TV Packs"}
+    - {id: 19, cat: TV/SD, desc: "TV SD"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    perm_ssl: ""
+    returnto: /
+  error:
+    - selector: table.main:contains("Login failed!")
+      message:
+        selector: table tr td.colhead2
+  test:
+    path: /
+    selector: a[href*="logout.php?hash_please="]
+
+search:
+  paths:
+    # https://tlz.digital/browse.php?c21=1&c22=1&c23=1&search=&searchin=title&incldead=0&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Tip\\('<b>(.+?)</b>"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    files:
+      selector: td:nth-child(5)
+    date:
+      selector: td:nth-child(7):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(7):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -07:00"
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    downloadvolumefactor:
+      case:
+        "a.info:contains(\"[FREE]\")": 0
+        "a.info:contains(\"[SILVER]\")": 0.5
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# U-232 V5

src/Jackett.Common/Definitions/theoccult.yml

@@ -89,6 +89,9 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
+    titleonly: 1
+    # 0 Exact, 1 Fuzzy, 3 Parsed, 4 Simple # 2 Pure is not used
+    nonboolean: 0
 
   rows:
     selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])

src/Jackett.Common/Definitions/theplace.yml

@@ -70,11 +70,12 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
+    titleonly: 1
+    # 0 Exact, 1 Fuzzy, 3 Parsed, 4 Simple # 2 Pure is not used
+    nonboolean: 0
 
   rows:
     selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])
-    filters:
-      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/theshow.yml

@@ -89,6 +89,9 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
+    titleonly: 1
+    # 0 Exact, 1 Fuzzy, 3 Parsed, 4 Simple # 2 Pure is not used
+    nonboolean: 0
 
   rows:
     selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])

src/Jackett.Common/Definitions/thevault.yml

@@ -88,6 +88,9 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
+    titleonly: 1
+    # 0 Exact, 1 Fuzzy, 3 Parsed, 4 Simple # 2 Pure is not used
+    nonboolean: 0
 
   rows:
     selector: table[border="0"] > tbody > tr.ttable:has(a[href^="browse.php?cat="])

src/Jackett.Common/Definitions/tlfbits.yml

@@ -10,29 +10,18 @@ links:
 
 caps:
   categorymappings:
-    - {id: 426, cat: Movies/SD, desc: "TLF-MiniSD"}
-    - {id: 432, cat: TV/Documentary, desc: "TLF-Fayea"}
-    - {id: 436, cat: Movies, desc: "TLF-iNT"}
-    - {id: 411, cat: Movies/SD, desc: "Movie/XviD"}
-    - {id: 430, cat: Movies/HD, desc: "Movie/X264"}
-    - {id: 415, cat: TV/SD, desc: "TV/XviD"}
-    - {id: 413, cat: TV/SD, desc: "TV/DVDRip"}
-    - {id: 414, cat: TV/HD, desc: "TV/x264"}
-    - {id: 416, cat: PC/Games, desc: "Game/PC"}
-    - {id: 417, cat: Console/PS3, desc: "Game/PS2"}
-    - {id: 418, cat: Console/PS3, desc: "Game/PS3"}
-    - {id: 419, cat: Console/PSP, desc: "Game/PSP"}
-    - {id: 420, cat: Console/Wii, desc: "Game/WII"}
-    - {id: 421, cat: Console/XBox 360, desc: "Game/Xbox360"}
-    - {id: 429, cat: Console, desc: "Game/Archive"}
-    - {id: 422, cat: PC, desc: "APPS"}
-    - {id: 423, cat: PC/0day, desc: "0day"}
-    - {id: 428, cat: PC, desc: "0day/Archive"}
-    - {id: 424, cat: Audio/MP3, desc: "MP3"}
-    - {id: 425, cat: Audio/Video, desc: "MVID"}
-    - {id: 435, cat: Audio/Lossless, desc: "Lossless"}
-    - {id: 427, cat: Other, desc: "MISC"}
-    - {id: 437, cat: Other, desc: "Unknown"}
+    - {id: 438, cat: Movies, desc: "电影 (Movie)"}
+    - {id: 440, cat: TV, desc: "电视剧(TV series)"}
+    - {id: 441, cat: TV, desc: "综艺 (TV Show)"}
+    - {id: 442, cat: TV/Anime, desc: "动漫 (Anime)"}
+    - {id: 443, cat: TV/Documentary, desc: "纪录片 (Documentary)"}
+    - {id: 444, cat: TV/Sport, desc: "体育 (Sport)"}
+    - {id: 445, cat: Audio/Video, desc: "音乐视频 (Music Video)"}
+    - {id: 446, cat: Audio, desc: "音乐(Music)"}
+    - {id: 447, cat: PC/Games, desc: "游戏 (Game)"}
+    - {id: 448, cat: PC/0day, desc: "软件 (Software)"}
+    - {id: 449, cat: Other/Misc, desc: "资料（E-Learning）"}
+    - {id: 450, cat: Other, desc: "其它 (Other)"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/torlock.yml

@@ -10,7 +10,7 @@ links:
   - https://www.torlock.com/
   - https://www.torlock2.com/
   - https://www.torlock.icu/
-  - https://torlock.unblockit.dev/
+  - https://torlock.unblockit.link/
 legacylinks:
   - https://torlock.com/
   - https://torlock.unblockit.pro/
@@ -22,6 +22,8 @@ legacylinks:
   - https://torlock.unblockit.top/
   - https://torlock.unblockit.lat/
   - https://torlock.unblockit.app/
+  - https://torlock.unblockit.dev/
+  - https://torlock.unblockit.ltd/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrent-pirat.yml

@@ -84,6 +84,7 @@ caps:
     - {id: 647, cat: XXX, desc: "    Толстушки / BBW & Plump Woman - Ролики и сцены"}
     - {id: 648, cat: XXX, desc: "    Худенькие / Skinny & Petite - Ролики и сцены"}
     - {id: 672, cat: XXX, desc: "    Foot Fetish & Footjob - Ролики и сцены"}
+    - {id: 690, cat: XXX, desc: "    Glory Hole - Сцены и ролики"}
     - {id: 674, cat: XXX, desc: "    Fetish Wear / Uniform, Lingerie, Pantyhose & Stockings - Ролики и сцены"}
     - {id: 673, cat: XXX, desc: "    Hairy Pussy - Ролики и сцены"}
     - {id: 399, cat: XXX, desc: "    Сквирт & Золотой дождь - Ролики и сцены"}
@@ -168,7 +169,7 @@ search:
     - path: search.php
   inputs:
     tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}2020{{ end }}"
+    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     terms: all
     fp: 1
     author: ""