pornotorrent: redirect to magnet link. resolves #13591 (#13596)

we're no longer falling back to magnets, so no need to access the details page

.github/workflows/winget.yml

@@ -2,6 +2,8 @@ name: Publish to WinGet
 on:
   release:
     types: [released]
+permissions:
+  contents: read
 jobs:
   publish:
     runs-on: windows-latest

README.md

@@ -21,7 +21,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 #### Supported Systems
 * Windows 7 SP1 or greater
 * Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux)
-* macOS 10.13 or greater
+* macOS 10.15+ or greater
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
 
@@ -99,7 +99,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
- * NewPCT.me
  * Newstudio
  * Nipponsei
  * Nitro
@@ -119,7 +118,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Portugas
  * ProPorn
  * ProStyleX
- * PS4-Torrent
  * Rapidzona
  * RARBG
  * RinTor
@@ -197,7 +195,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Fou-Du-Cinema
  * Gay-Torrents.net
  * Genesis-Movement
- * HamsterStudio
  * HD-CzTorrent
  * HDGalaKtik
  * HunTorrent
@@ -231,6 +228,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
+ * Torrents-Town (T-T)
  * TribalMixes
  * Union Fansub
  * YggTorrent (YGG)
@@ -245,6 +243,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT)
+ * 3Evils
  * 4thD (4th Dimension)
  * 52PT
  * Abnormal
@@ -260,7 +259,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
- * AnimeWorld [![(invite needed)][inviteneeded]](#)
+ * AnimeWorld
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
@@ -346,7 +345,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeTorrents
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
+ * Fantastic Heaven
  * Fantastiko
  * Femdomcult
  * FileList (FL)
@@ -362,7 +361,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Generation-Free
  * GFXPeers
  * GigaTorrents
- * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
+ * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
@@ -372,7 +371,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HappyFappy
  * Hawke-uno
  * HD Dolby
- * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
  * HD-Olimpo
  * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
@@ -384,8 +382,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDArea (HDA)
  * HDAtmos
  * HDBits [![(invite needed)][inviteneeded]](#)
- * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
- * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDFans
@@ -399,6 +395,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
+ * HHanClub
  * House of Devil
  * HQSource (HQS)
  * ImmortalSeed (iS)
@@ -429,14 +426,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * LST
  * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
- * MaDs Revolution [![(invite needed)][inviteneeded]](#)
+ * MaDs Revolution
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
  * MediaMaatjes
  * MegamixTracker
  * MeseVilág (Fairytale World)
- * MicroBit (µBit)
  * Milkie
  * MIRcrew
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
@@ -518,10 +514,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
- * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
+ * SpeedTorrent Reloaded
  * SpiderTK
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
- * SportHD [![(invite needed)][inviteneeded]](#)
+ * SportHD
  * SportsCult
  * SpringSunday [![(invite needed)][inviteneeded]](#)
  * SugoiMusic
@@ -578,7 +574,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
- * turktracker
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
@@ -586,12 +581,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Twilights Zoom
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UHDBits
- * UnionGang [![(invite needed)][inviteneeded]](#)
+ * UnionGang
  * UnlimitZ
- * Vizuk
+ * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)
+ * World-of-Tomorrow
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
@@ -726,7 +722,7 @@ On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chri
 ## Installation on macOS
 
 ### Prerequisites
-macOS 10.13 or greater
+macOS 10.15+ or greater
 
 ### Install as service
 1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).

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

@@ -12,7 +12,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.bet/
+  - https://1337x.unblockit.cat/
   - https://1337x.nocensor.world/
   - https://1337x.unblockninja.com/
 legacylinks:
@@ -37,6 +37,7 @@ legacylinks:
   - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
   - https://1337x.unblockit.ist/
+  - https://1337x.unblockit.bet/
 
 caps:
   categorymappings:

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

@@ -0,0 +1,147 @@
+---
+id: 3evils-api
+name: 3Evils (API)
+description: "3Evils is a Private site for MOVIES / TV / MUSIC "
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://3evils.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: PC/Games, desc: "Game"}
+    - {id: 5, cat: PC/0day, desc: "Application"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://3evils.net/\" target =_blank>3Evils</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+#    minimumseedtime:
+#      # 2 days (as seconds = 2 x 24 x 60 x 60)
+#      text: 172800
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -130,11 +130,11 @@ settings:
 
 login:
   path: signin.php
-  method: form
-  form: form
+  method: post
   inputs:
     user: "{{ .Config.user }}"
     pass: "{{ .Config.pass }}"
+    returnto: "%2Fbrowse.php"
   error:
     - selector: .error
   test:

src/Jackett.Common/Definitions/abtorrents.yml

@@ -128,18 +128,15 @@ search:
         - name: querystring
           args: cat
     title:
-      selector: div.torrent-name
+      selector: a[href^="details.php?id="]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
-    poster:
-      selector: img[src*="/img.php?"]
-      attribute: src
     files:
-      selector: td:nth-last-child(8)
+      selector: td:nth-last-child(9)
     date_yday:
       # Yesterday<br/>6:00 AM
       selector: td:nth-last-child(7):contains("day")

src/Jackett.Common/Definitions/aither-api.yml

@@ -107,7 +107,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -117,6 +117,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -152,4 +163,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.2.1
+# json UNIT3D 6.4.0

src/Jackett.Common/Definitions/anisource.yml

@@ -5,6 +5,8 @@ description: "AniSource is a Public site for HD Anime raws."
 language: en-US
 type: public
 encoding: UTF-8
+certificates:
+  - f400d50a4dac4dd6546c869ac75669846205a0d2 # expired 26 Aug 2022
 links:
   - https://asnet.pw/
 

src/Jackett.Common/Definitions/anthelion-api.yml

@@ -119,6 +119,15 @@ search:
       selector: imdb
     tmdbid:
       selector: tmdb
+    genre:
+      selector: tags
+      filters:
+        - name: replace
+          args: [".", "_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: fileCount
     seeders:
       selector: seeders
     leechers:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - https://audiobookbay.fi/
   - https://audiobookbay.se/
-  - https://audiobookbay.unblockit.bet/
+  - https://audiobookbay.unblockit.cat/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.uno/
@@ -31,6 +31,7 @@ legacylinks:
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
   - https://audiobookbay.unblockit.ist/
+  - https://audiobookbay.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/audionews.yml

@@ -176,6 +176,8 @@ caps:
     - {id: 233, cat: Other, desc: "GFXNEWS GAME DEVELOPMENT"}
     - {id: 226, cat: Other, desc: "GFXNEWS MAGAZINE"}
     - {id: 234, cat: Other, desc: "GFXNEWS MATERIAL"}
+    - {id: 243, cat: Other, desc: "GFXNEWS OTHER GRAPHICS"}
+    - {id: 244, cat: Other, desc: "GFXNEWS OTHER GRAPHICS Zbrush, Substance tools"}
     - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
     - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
     - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
@@ -183,10 +185,10 @@ caps:
     - {id: 229, cat: Other, desc: "GFXNEWS PHOTOSHOP Background & PSD Source"}
     - {id: 230, cat: Other, desc: "GFXNEWS PHOTOSHOP Brushes & Gradient"}
     - {id: 231, cat: Other, desc: "GFXNEWS PHOTOSHOP Toolkits, Papers & Objects"}
+    - {id: 245, cat: Other, desc: "GFXNEWS PLUGINS"}
     - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
     - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
     - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
-    - {id: 236, cat: Other, desc: "GFXNEWS POSER"}
     - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
     - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
     - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}

src/Jackett.Common/Definitions/bestcore.yml

@@ -124,8 +124,11 @@ search:
 
   fields:
     category:
+      text: 38
+    category|noappend:
       selector: a[href^="browse.php?cat="]
       attribute: href
+      optional: true
       filters:
         - name: querystring
           args: cat

src/Jackett.Common/Definitions/breizhpeers.yml

@@ -136,13 +136,10 @@ search:
       selector: details_link
     download:
       selector: download_link
-    magnet:
-      selector: magnet_link
-      optional: true
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -152,6 +149,13 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -184,4 +188,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.2.1 custom
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/btmirror.yml

@@ -7,11 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://btsao.com/
-  - https://btmirror.unblockit.bet/
+  - https://btmirror.unblockit.cat/
 legacylinks:
   - https://btmirror.unblockit.blue/
   - https://btmirror.unblockit.name/
   - https://btmirror.unblockit.ist/
+  - https://btmirror.unblockit.bet/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btsow.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.click/
+  - https://btsow.cfd/
 legacylinks:
   - https://btsow.monster/
   - https://btsow.casa/
@@ -24,6 +24,7 @@ legacylinks:
   - https://btsow.one/
   - https://btsow.rest/
   - https://btsow.bar/
+  - https://btsow.click/
 
 caps:
   categories:

src/Jackett.Common/Definitions/carphunter.yml

@@ -35,12 +35,12 @@ caps:
     - {id: 31, cat: PC/0day, desc: "Programok/RIP"}
     - {id: 33, cat: TV, desc: "Sorozat/Eng"}
     - {id: 32, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
-    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
     - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"}
     - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"}
     - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"}
     - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun"}
+    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
+    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
 
   modes:
     search: [q]
@@ -87,7 +87,12 @@ login:
 
 search:
   paths:
-    - path: letoltes.php
+    - path: browse.php
+      categories: ["!", 34, 39]
+    - path: browse.php
+      categories: [34, 39]
+      inputs:
+        xxx: 1
   keywordsfilters:
     # the site uses % for wildcard
     - name: re_replace
@@ -98,16 +103,16 @@ search:
     # 0 both, 1 onlyactive, 2 onlydead, 3 onlyfree, 4 x2 torrents, 5 mytorrents, 6 waiting for seeds
     incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
     sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
+    order: "{{ .Config.type }}"
     # does not support imdbid searches
     # can support genre searching but you need to know the id, eg &genre2=1 for Comedy (id is 2)
 
   rows:
-    selector: "table[border=\"1\"][cellpadding=\"3\"][style=\"width: 920px;\"] > tbody > tr:has(a[href^=\"letoltes.php?cat=\"])"
+    selector: "table[border=\"1\"][cellpadding=\"3\"][style=\"width: 920px;\"] > tbody > tr:has(a[href^=\"browse.php?cat=\"])"
 
   fields:
     category:
-      selector: a[href^="letoltes.php?cat="]
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
@@ -137,7 +142,7 @@ search:
       attribute: onmouseover
       filters:
         - name: regexp
-          args: "src=(.*?) width"
+          args: "showTorrentThumb\\('(.*?)', "
     date:
       selector: td:nth-last-child(8)
       filters:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -71,9 +71,12 @@ settings:
       trie-nom-a: title asc
 
 download:
+  before:
+    # request target
+    path: "download_magnet?id={{ re_replace .DownloadUri.AbsoluteUri \"^.*-(\\d+)\\.html\" \"$1\" }}"
   selectors:
-    - selector: a[href^="magnet:"]
-      attribute: href
+    - selector: body
+      usebeforeresponse: true
 
 search:
   paths:

src/Jackett.Common/Definitions/cryptichaven.yml

@@ -60,6 +60,8 @@ caps:
     - {id: 53, cat: TV, desc: "Random Oddities"}
     - {id: 59, cat: TV, desc: "Late Night Talkshows"}
     - {id: 77, cat: TV, desc: "Non-English language"}
+    - {id: 78, cat: TV, desc: "Video Musical Comedy"}
+    - {id: 79, cat: TV, desc: "Video Podcasts"}
     # BY REQUEST ONLY
     - {id: 19, cat: Movies, desc: "Movie DVD5/9"}
     - {id: 20, cat: Movies, desc: "Movie AVI"}

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

@@ -54,6 +54,7 @@ caps:
     - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
     #  Internal
     - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
     - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}

src/Jackett.Common/Definitions/demonoid.yml

@@ -12,7 +12,7 @@ links:
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
-  - https://demonoid.unblockit.bet/
+  - https://demonoid.unblockit.cat/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.world/
 legacylinks:
@@ -35,6 +35,7 @@ legacylinks:
   - https://demonoid.unblockit.name/
   - https://demonoid.nocensor.sbs/
   - https://demonoid.unblockit.ist/
+  - https://demonoid.unblockit.bet/
 
 caps:
   categorymappings:
@@ -319,13 +320,20 @@ settings:
 
 login:
   method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
   test:
     path: files/
 
 download:
-  selectors:
-    - selector: a[href^="/files/download/"]:has(i.fa-download)
-      attribute: href
+  infohash:
+    hash:
+      selector: div:contains("Torrent hash") > div.col-md-5 > div
+      filters:
+        - name: replace
+          args: [" ", ""]
+    title:
+      selector: h1[id="torrent--title"]
 
 search:
   paths:

src/Jackett.Common/Definitions/desitorrents-api.yml

@@ -8,6 +8,7 @@ encoding: UTF-8
 links:
   - https://desitorrents.tv/
   - https://desitorrents.rocks/
+  - https://torrent.desi/
 
 caps:
   categorymappings:
@@ -64,13 +65,23 @@ search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
     # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
 
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
   keywordsfilters:
     - name: re_replace
-      args: [^$, "%"]
+      args: ["\\.", " "]
 
   rows:
     selector: data
@@ -79,8 +90,8 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
@@ -88,7 +99,7 @@ search:
     download:
       selector: download_link
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -98,6 +109,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -112,11 +134,15 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
       # api returns 0=false, 1=true
       selector: double_upload
@@ -128,4 +154,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 5.3.0 (custom)
+# json UNIT3D 6.4.1 (custom)

src/Jackett.Common/Definitions/digitalcore.yml

@@ -10,23 +10,23 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/DVD, desc: Movies/DVDR}
     - {id: 2, cat: Movies/SD, desc: Movies/SD}
-    - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
-    - {id: 4, cat: Movies/UHD, desc: Movies/4K}
-    - {id: 38, cat: Movies/UHD, desc: Movies/UHD}
+    - {id: 1, cat: Movies/DVD, desc: Movies/DVDR}
     - {id: 5, cat: Movies/HD, desc: Movies/720p}
     - {id: 6, cat: Movies/HD, desc: Movies/1080p}
+    - {id: 4, cat: Movies/UHD, desc: Movies/2160p}
+    - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
+    - {id: 38, cat: Movies/UHD, desc: Movies/Bluray/UHD}
     - {id: 7, cat: Movies/HD, desc: Movies/PACKS}
-    - {id: 8, cat: TV/HD, desc: TV/720p}
-    - {id: 9, cat: TV/HD, desc: TV/1080p}
-    - {id: 10, cat: TV/SD, desc: TV/SD}
-    - {id: 11, cat: TV/SD, desc: TV/DVDR}
-    - {id: 12, cat: TV/HD, desc: TV/PACKS}
-    - {id: 13, cat: TV/UHD, desc: TV/4K}
-    - {id: 14, cat: TV/HD, desc: TV/BluRay}
+    - {id: 10, cat: TV/SD, desc: Tv/SD}
+    - {id: 11, cat: TV/SD, desc: Tv/DVDR}
+    - {id: 8, cat: TV/HD, desc: Tv/720p}
+    - {id: 9, cat: TV/HD, desc: Tv/1080p}
+    - {id: 13, cat: TV/UHD, desc: Tv/2160p}
+    - {id: 14, cat: TV/HD, desc: Tv/BluRay}
+    - {id: 12, cat: TV/HD, desc: Tv/PACKS}
     - {id: 17, cat: Other, desc: Unknown}
-    - {id: 18, cat: PC/0day, desc: Apps/0day}
+    - {id: 18, cat: PC/0day, desc: Apps/0DAY}
     - {id: 20, cat: PC/ISO, desc: Apps/PC}
     - {id: 21, cat: PC/Mac, desc: Apps/Mac}
     - {id: 33, cat: PC, desc: Apps/Tutorials}

src/Jackett.Common/Definitions/docspedia.yml

@@ -29,6 +29,7 @@ caps:
     - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
     - {id: 61, cat: Other, desc: "Tutorials"}
+    - {id: 81, cat: Books, desc: "Wordpress"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -44,13 +44,16 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info_cookie
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
     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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: freeleech
     type: checkbox
     label: Filter freeleech only
@@ -64,9 +67,15 @@ settings:
     default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
   test:
     path: /
     selector: a[href="logout.php"]

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

@@ -349,17 +349,17 @@ search:
     download:
       selector: a[href^="torrents-details.php?id="]
       attribute: href
-    seeders:
-      selector: td:nth-child(4)
-    leechers:
-      selector: td:nth-child(5)
     size:
+      selector: td:nth-child(5)
+    seeders:
       selector: td:nth-child(6)
-    description:
+    leechers:
       selector: td:nth-child(7)
+    description:
+      selector: td:nth-child(4)
       filters:
         - name: prepend
-          args: "wait: "
+          args: "uploader: "
     date:
       text: now
     downloadvolumefactor:

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

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.bet/
+  - https://extratorrent.unblockit.cat/
   - https://extratorrent.nocensor.world/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -23,6 +23,7 @@ legacylinks:
   - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
   - https://extratorrent.unblockit.ist/
+  - https://extratorrent.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,7 +13,7 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.bet/
+  - https://eztv.unblockit.cat/
   - https://eztv.nocensor.world/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -39,6 +39,7 @@ legacylinks:
   - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
   - https://eztv.unblockit.ist/
+  - https://eztv.unblockit.bet/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -10,53 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: 58, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
-    - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
-    - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
-    - {id: 170, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 169, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 183, cat: Movies/SD, desc: "Filme Packs SD"}
-    - {id: 184, cat: Movies/HD, desc: "Filme Packs 720p"}
-    - {id: 185, cat: Movies/HD, desc: "Filme Packs 1080p"}
-    - {id: 186, cat: Movies/UHD, desc: "Filme Packs 2160p"}
-    - {id: 172, cat: Movies/SD, desc: "Film-Klassiker SD"}
-    - {id: 173, cat: Movies/HD, desc: "Film-Klassiker 720p"}
-    - {id: 174, cat: Movies/HD, desc: "Film-Klassiker 1080p"}
-    - {id: 175, cat: Movies/UHD, desc: "Film-Klassiker 2160p"}
-    - {id: 180, cat: Movies/DVD, desc: "Film-Klassiker DVD"}
-    - {id: 181, cat: Movies/BluRay, desc: "Film-Klassiker Bluray"}
-    - {id: 182, cat: Movies/3D, desc: "Film-Klassiker 3D"}
-    - {id: 176, cat: Movies/SD, desc: "Film-Klassiker Pack SD"}
-    - {id: 177, cat: Movies/HD, desc: "Film-Klassiker Pack 720p"}
-    - {id: 178, cat: Movies/HD, desc: "Film-Klassiker Pack 1080p"}
-    - {id: 179, cat: Movies/UHD, desc: "Film-Klassiker Pack 2160p"}
-    - {id: 64, cat: TV/SD, desc: "Serien SD"}
-    - {id: 65, cat: TV/HD, desc: "Serien 720p"}
-    - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
-    - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
-    - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"}
-    - {id: 167, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 187, cat: TV/SD, desc: "Serienpacks SD"}
-    - {id: 188, cat: TV/HD, desc: "Serienpacks 720p"}
-    - {id: 189, cat: TV/HD, desc: "Serienpacks 1080p"}
-    - {id: 190, cat: TV/UHD, desc: "Serienpacks 2160p"}
-    - {id: 191, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"}
-    - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
-    - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 73, cat: Audio, desc: "Audio Packs"}
-    - {id: 153, cat: Audio/Audiobook, desc: "Hörbücher"}
-    - {id: 192, cat: PC/Games, desc: "Spiele Windows"}
-    - {id: 193, cat: PC, desc: "Software Windows"}
-    - {id: 90, cat: Books/Mags, desc: "Zeitschriften"}
-    - {id: 89, cat: Books/EBook, desc: "E-Books"}
-    - {id: 91, cat: XXX/SD, desc: "XXX SD"}
-    - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
-    - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
-    - {id: 171, cat: XXX/Pack, desc: "XXX Packs"}
-    - {id: 94, cat: XXX/ImageSet, desc: "XXX Magazine"}
+    - {id: 152, cat: Books, desc: "E-Books"}
+    - {id: 141, cat: Movies/HD, desc: "Filme 1080p"}
+    - {id: 140, cat: Movies/UHD, desc: "Filme 2160p"}
+    - {id: 131, cat: Movies/3D, desc: "Filme 3D"}
+    - {id: 154, cat: Movies/HD, desc: "Filme 720p"}
+    - {id: 142, cat: Movies/BluRay, desc: "Filme Bluray"}
+    - {id: 120, cat: Movies/DVD, desc: "Filme DVD"}
+    - {id: 101, cat: Movies/Foreign, desc: "Filme International"}
+    - {id: 139, cat: Movies/HD, desc: "Filme Packs 1080p"}
+    - {id: 119, cat: Movies/UHD, desc: "Filme Packs 2160p"}
+    - {id: 106, cat: Movies/HD, desc: "Filme Packs 720p"}
+    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD"}
+    - {id: 153, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 104, cat: Movies/HD, desc: "Filmklassiker 1080p"}
+    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker 2160p"}
+    - {id: 122, cat: Movies/3D, desc: "Filmklassiker 3D"}
+    - {id: 103, cat: Movies/HD, desc: "Filmklassiker 720p"}
+    - {id: 134, cat: Movies/BluRay, desc: "Filmklassiker Bluray"}
+    - {id: 130, cat: Movies/DVD, desc: "Filmklassiker DVD"}
+    - {id: 136, cat: Movies/Foreign, desc: "Filmklassiker International"}
+    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs 1080p"}
+    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs 2160p"}
+    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs 720p"}
+    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs SD"}
+    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD"}
+    - {id: 118, cat: Audio/Audiobook, desc: "Hörbücher"}
+    - {id: 109, cat: Audio/Lossless, desc: "Musik Flac"}
+    - {id: 129, cat: Audio/MP3, desc: "Musik MP3"}
+    - {id: 111, cat: Audio/Lossless, desc: "Musik Packs Flac"}
+    - {id: 112, cat: Audio/MP3, desc: "Musik Packs MP3"}
+    - {id: 110, cat: Audio/Video, desc: "Musik Videos"}
+    - {id: 113, cat: TV/HD, desc: "Serie 1080p"}
+    - {id: 114, cat: TV/UHD, desc: "Serie 2160p"}
+    - {id: 125, cat: TV/HD, desc: "Serie 720p"}
+    - {id: 115, cat: TV/Foreign, desc: "Serie International"}
+    - {id: 138, cat: TV/HD, desc: "Serie Packs 1080p"}
+    - {id: 143, cat: TV/UHD, desc: "Serie Packs 2160p"}
+    - {id: 116, cat: TV/HD, desc: "Serie Packs 720p"}
+    - {id: 144, cat: TV/Foreign, desc: "Serie Packs International"}
+    - {id: 137, cat: TV/SD, desc: "Serie Packs SD"}
+    - {id: 133, cat: TV/SD, desc: "Serie SD"}
+    - {id: 150, cat: PC/0day, desc: "Windows Apps"}
+    - {id: 149, cat: PC/Games, desc: "Windows Spiele"}
+    - {id: 147, cat: XXX/x264, desc: "XXX 1080p"}
+    - {id: 146, cat: XXX/x264, desc: "XXX 720p"}
+    - {id: 148, cat: XXX/Pack, desc: "XXX Packs"}
+    - {id: 69, cat: XXX/SD, desc: "XXX SD"}
+    - {id: 151, cat: Books/Mags, desc: "Zeitschriften"}
 
   modes:
     search: [q]
@@ -72,6 +73,21 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: pin
+    type: text
+    label: Pin
+  - name: freeleech
+    type: checkbox
+    label: Filter FreeLeech only
+    default: false
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech and OnlyUpload at Fantastic Heaven
+    default: <li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
   - name: sort
     type: select
     label: Sort requested from site
@@ -88,75 +104,84 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
 
 login:
   path: login.php
   method: form
-  form: form[action="/login.php"]
+  form: form[action="../takelogin.php"]
   cookies: ["JAVA=OK"] # avoid jscheck redirect
-  captcha:
-    type: image
-    selector: img[src^="cap/captcha_math.php?codeCaptcha="]
-    input: stringCaptcha
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    loggiin: "einloggen"
+    secure_pin: "{{ .Config.pin }}"
   error:
-    - selector: div#login_error
+    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
   test:
     path: index.php
     selector: a[href="logout.php"]
 
 search:
   paths:
-    - path: selection.php
+    - path: browse.php
   inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
     search: "{{ .Keywords }}"
-    blah: 0
+    # 0 active, 1 all, 2 dead
+    incldead: 1
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
   rows:
-    selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"] > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href^="selection.php?cat="]
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
-        - name: replace
-          args: ["#2", ""]
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details.php?id="] > b
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
-    grabs:
-      selector: div.selection_unter_ae
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
     size:
-      selector: div.selection_unter_ad
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
     seeders:
-      selector: div.selection_unter_aa > b
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
     leechers:
-      selector: div.selection_unter_aaa > b
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
     date:
-      selector: div.selection_unter_ab
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(5)
       filters:
-        - name: replace
-          args: ["um ", ""]
         - name: append
           args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
         - name: dateparse
           args: "02.01.2006 15:04:05 -07:00"
     downloadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/oupic.gif"]: 0 # only upload is counted
+        "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/freeleech.gif"]: 0 # nothing is counted
+        "*": 1
 # engine n/a

src/Jackett.Common/Definitions/file-tracker.yml

@@ -27,6 +27,7 @@ caps:
     - {id: 988, cat: Movies, desc: " |- Кино России и СНГ"}
     - {id: 337, cat: Movies, desc: " |- Мультфильмы"}
     - {id: 72, cat: Movies, desc: " |- DVD, HD Видео (фильмы , мультфильмы)"}
+    - {id: 1001, cat: Movies, desc: " |- UHD Видео (фильмы , мультфильмы)"}
     - {id: 999, cat: Movies, desc: " |- Фильмы (2021-2022)"}
     - {id: 996, cat: Movies, desc: " |- Фильмы (2019-2020)"}
     - {id: 921, cat: Movies, desc: " |- Фильмы (2016-2018)"}
@@ -83,11 +84,11 @@ caps:
     - {id: 744, cat: Movies/3D, desc: " |- 3D | Спорт"}
     - {id: 335, cat: Movies/DVD, desc: " |- Наше кино (DVD)"}
     - {id: 336, cat: Movies/HD, desc: " |- Наше кино (HD Video)"}
-    - {id: 747, cat: Movies/BluRay, desc: " |- Наше кино (Blu-ray и BD Remux)"}
+    - {id: 747, cat: Movies/BluRay, desc: " |- Наше кино (Blu-ray и BD Remux) [HD/UHD]"}
     - {id: 985, cat: Movies/UHD, desc: " |- Наше кино (Ultra HD)"}
     - {id: 69, cat: Movies/DVD, desc: " |- Зарубежное кино (DVD)"}
     - {id: 70, cat: Movies/HD, desc: " |- Зарубежное кино (HD Video)"}
-    - {id: 748, cat: Movies/BluRay, desc: " |- Зарубежное кино (Blu-ray и BD Remux)"}
+    - {id: 748, cat: Movies/BluRay, desc: " |- Зарубежное кино (Blu-ray и BD Remux) [HD/UHD]"}
     - {id: 984, cat: Movies/UHD, desc: " |- Зарубежное кино (Ultra HD)"}
     - {id: 907, cat: Movies, desc: " |- Кино для детей (DVD, HD Video, Blu-ray, BD Remux, Ultra HD)"}
     - {id: 339, cat: Movies, desc: " |- Мультфильмы (DVD, HD Video и Blu-ray)"}
@@ -239,7 +240,7 @@ caps:
     - {id: 526, cat: PC/0day, desc: " |- Графика / Просмотрщики графики"}
     - {id: 525, cat: PC/0day, desc: " |- Для работы с аудио"}
     - {id: 524, cat: PC/0day, desc: " |- Для работы с видео"}
-    - {id: 887, cat: PC/0day, desc: " |- Интернет TV &Radio"}
+    - {id: 887, cat: PC/0day, desc: " |- Интернет TV & Radio"}
     - {id: 561, cat: PC/0day, desc: " |- Удаленный доступ и ПО для свободного доступа в интернет"}
     - {id: 555, cat: PC/0day, desc: " |- 3G USB-модем и Webcam"}
     - {id: 537, cat: PC/0day, desc: " |- Утилиты для удаления всплывающих окон и баннерной рекламы"}
@@ -374,7 +375,7 @@ caps:
     - {id: 850, cat: Audio/MP3, desc: " |- Этническая музыка Африки и Азии (mp3)"}
     - {id: 849, cat: Audio/MP3, desc: " |- Country, Bluegrass (mp3)"}
     - {id: 848, cat: Audio/MP3, desc: " |- Этническая музыка Кавказа и Закавказья (mp3)"}
-    - {id: 847, cat: Audio/MP3, desc: " |- NewAge &Meditative (mp3)"}
+    - {id: 847, cat: Audio/MP3, desc: " |- NewAge & Meditative (mp3)"}
     - {id: 846, cat: Audio/MP3, desc: " |- Folk и neo-folk, celtic, medieval (mp3)"}
     - {id: 935, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
     - {id: 945, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
@@ -471,9 +472,9 @@ caps:
     - {id: 751, cat: Audio, desc: " |- Аудио юмористические концерты (выступления)"}
     # Эротика
     # Erotica
-    - {id: 483, cat: Other, desc: "Правила, FAQ и Предложения по улучшению раздела "Эротик.."}
+    - {id: 483, cat: Other, desc: "Правила, FAQ и Предложения по улучшению раздела 'Эротик.."}
     - {id: 484, cat: Other, desc: " |- Правила и FAQ"}
-    - {id: 485, cat: Other, desc: " |- Предложения по улучшению раздела "Эротика"и форум.."}
+    - {id: 485, cat: Other, desc: " |- Предложения по улучшению раздела 'Эротика'и форум.."}
     - {id: 688, cat: Other, desc: " |- Ищу / Предлагаю"}
     - {id: 963, cat: XXX, desc: "Эротические художественные фильмы"}
     - {id: 964, cat: XXX, desc: "Эротические документальные фильмы"}

src/Jackett.Common/Definitions/fouducinema.yml

@@ -12,9 +12,13 @@ legacylinks:
 
 caps:
   categorymappings:
+    - {id: 80, cat: Movies, desc: "Enfants Film"}
+    - {id: 82, cat: TV, desc: "Enfants Série"}
     - {id: 1, cat: Movies/SD, desc: "FILM Xvid"}
-    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 101, cat: TV/Documentary, desc: "FILM Documentaire"}
+    - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
     - {id: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
     - {id: 66, cat: Movies/HD, desc: "FILM HDRip"}
     - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
     - {id: 33, cat: Movies/HD, desc: "FILM HDTV"}
@@ -27,10 +31,10 @@ caps:
     - {id: 25, cat: Movies/BluRay, desc: "FILM ISO"}
     - {id: 4, cat: Movies/HD, desc: "FILM 1080"}
     - {id: 2, cat: Movies/DVD, desc: "FILM DVD"}
-    - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
+    - {id: 103, cat: Movies, desc: "FILM Pack"}
     - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
     - {id: 65, cat: TV/HD, desc: "SERIE HDRip"}
-    - {id: 37, cat: TV, desc: "SERIE EPISODE"}
     - {id: 21, cat: TV/HD, desc: "SERIE HDTV.1080p"}
     - {id: 20, cat: TV/HD, desc: "SERIE HDTV.720p"}
     - {id: 19, cat: TV/SD, desc: "SERIE HDTV"}
@@ -40,19 +44,19 @@ caps:
     - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
     - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
     - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
-    - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
+    - {id: 102, cat: TV/Documentary, desc: "SERIE Documentaire"}
     - {id: 67, cat: TV/Anime, desc: "ANIMEE films"}
     - {id: 70, cat: TV/Anime, desc: "ANIMEE Series"}
+    - {id: 95, cat: TV/Anime, desc: "ANIMEE Animée"}
     - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
     - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
     - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
-    - {id: 59, cat: PC, desc: "LOGICIELS "}
     - {id: 44, cat: Books/Mags, desc: "EBOOK Journaux"}
     - {id: 46, cat: Books/Technical, desc: "EBOOK Documents"}
     - {id: 48, cat: XXX/Other, desc: "EBOOK XXX"}
     - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
     - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
-    - {id: 7, cat: PC/Games, desc: "JEUX Win"}
+    - {id: 96, cat: PC/Games, desc: "JEUX Apple"}
     - {id: 8, cat: Console/PS3, desc: "JEUX PS3"}
     - {id: 45, cat: PC/Games, desc: "JEUX PC"}
 

src/Jackett.Common/Definitions/gimmepeers.yml

@@ -0,0 +1,162 @@
+---
+id: gimmepeers
+name: GimmePeers
+description: "GimmePeers (formerly ILT) is a Paid Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: iso-8859-1
+links:
+  - https://www.gimmepeers.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "Anime"}
+    - {id: 4, cat: PC/0day, desc: "App-WIN"}
+    - {id: 2, cat: PC/Mac, desc: "App-MAC"}
+    - {id: 27, cat: PC, desc: "App-LINUX"}
+    - {id: 29, cat: Audio/Audiobook, desc: "Books (a)"}
+    - {id: 5, cat: Books/EBook, desc: "Books (e)"}
+    - {id: 6, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 7, cat: Audio, desc: "Music"}
+    - {id: 28, cat: TV/Sport, desc: "Sports"}
+    - {id: 3, cat: Books/Other, desc: "Tutorials"}
+    - {id: 8, cat: Other, desc: "Other"}
+    - {id: 9, cat: Console/NDS, desc: "Game-NIN"}
+    - {id: 11, cat: Console/PS3, desc: "Game-PS"}
+    - {id: 10, cat: PC/Games, desc: "Game-WIN"}
+    - {id: 12, cat: Console/XBox, desc: "Game-XBOX"}
+    - {id: 13, cat: Movies/3D, desc: "Movie-3D"}
+    - {id: 26, cat: Movies/UHD, desc: "Movie-4K"}
+    - {id: 14, cat: Movies/BluRay, desc: "Movie-Bluray"}
+    - {id: 15, cat: Movies/DVD, desc: "Movie-DVDR"}
+    - {id: 16, cat: Movies/HD, desc: "Movie-x264"}
+    - {id: 17, cat: Movies/HD, desc: "Movie-x265"}
+    - {id: 19, cat: Movies/SD, desc: "Movie-XVID"}
+    - {id: 18, cat: Movies, desc: "Movie-Packs"}
+    - {id: 30, cat: TV/UHD, desc: "TV-4K"}
+    - {id: 22, cat: TV/HD, desc: "TV-x265"}
+    - {id: 20, cat: TV/HD, desc: "TV-x264-HD"}
+    - {id: 21, cat: TV/SD, desc: "TV-x264-SD"}
+    - {id: 25, cat: TV/HD, desc: "TV-Retail-HD"}
+    - {id: 24, cat: TV/SD, desc: "TV-Retail-SD"}
+    - {id: 23, cat: TV, desc: "TV-Packs"}
+    - {id: 50, cat: XXX/x264, desc: "xXx-HD"}
+    - {id: 49, cat: XXX/SD, desc: "xXx-SD"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, genre]
+    movie-search: [q, imdbid, genre]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: td:contains("Login failed!")
+      message:
+        selector: table tbody tr td font
+  test:
+    path: browse.php
+    selector: a[href="/logout.php"]
+
+search:
+  paths:
+    # https://www.gimmepeers.com/browse.php?search=2022&c13=1&blah=0&incldead=0
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.Genre }} genre:{{ .Query.Genre }}{{ else }}{{ end }}"
+    # 0 title, 1 nfo, 2 filelist, 3 title+nfo
+    blah: "{{ if or .Query.IMDBID .Query.Genre }}3{{ else }}0{{ end }}"
+    # 0 active only, 1 dead only
+    incldead: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.browsetable:not(:has(td.gp_sub_nav):contains("Top 20")) tbody tr:has(a[href^="download.php"])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/redir.php?url=", ""]
+    genre:
+      selector: span:has(a[title="search by genre"])
+      filters:
+        - name: replace
+          args: ["votes", ""]
+        - name: re_replace
+          args: ["\\d+", ""]
+    description:
+      text: "{{ .Result.genre }}"
+    date:
+      selector: td:nth-child(7) nobr
+      filters:
+        - name: replace
+          args: ["\xA0", ""]
+        - name: append
+          args: " -04:00" # AST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-child(6)
+    files:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(10)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/glodls.yml

@@ -10,7 +10,7 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.bet/
+  - https://glotorrents.unblockit.cat/
   - https://glotorrents.nocensor.world/
   - https://glodls.unblockninja.com/
 legacylinks:
@@ -35,6 +35,7 @@ legacylinks:
   - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
   - https://glotorrents.unblockit.ist/
+  - https://glotorrents.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hamsterstudio.yml

@@ -1,383 +0,0 @@
----
-id: hamsterstudio
-name: HamsterStudio
-description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
-language: ru-RU
-type: semi-private
-encoding: windows-1251
-links:
-  - http://hamsterstudio.org/ # site does not support https ERR_CONNECTION_TIMED_OUT
-
-caps:
-  categorymappings:
-    - {id: 23, cat: Movies, desc: "Кино"}
-    - {id: 18, cat: TV/WEB-DL, desc: "Веб-сериалы"}
-    - {id: 19, cat: TV/Other, desc: "Разные сериалы"}
-    - {id: 10, cat: Audio, desc: "Музыка"}
-    - {id: 29, cat: TV, desc: "Лечение (Пациенты)"}
-    - {id: 37, cat: TV, desc: "Сериалы с ТВ"}
-    - {id: 21, cat: TV, desc: "Полуночный зверь"}
-    - {id: 11, cat: TV, desc: "Милые обманщицы"}
-    - {id: 27, cat: TV, desc: "Девочки"}
-    - {id: 20, cat: TV, desc: "Умерь Свой Пыл"}
-    - {id: 24, cat: TV, desc: "Ийон Тихий, космический пилот"}
-    - {id: 25, cat: TV, desc: "Красный карлик"}
-    - {id: 22, cat: TV, desc: "Тримей"}
-    - {id: 26, cat: TV, desc: "На дне"}
-    - {id: 38, cat: TV, desc: "Галактика: Кровь и Хром"}
-    - {id: 39, cat: TV, desc: "Супертюрьма"}
-    - {id: 40, cat: TV, desc: "Семерка Блэйка"}
-    - {id: 42, cat: TV, desc: "Западное крыло"}
-    - {id: 43, cat: TV, desc: "Убойный Отдел: Уличные Будни"}
-    - {id: 47, cat: TV, desc: "Это Англия"}
-    - {id: 48, cat: TV, desc: "Бенидорм"}
-    - {id: 49, cat: TV, desc: "Сайнфелд"}
-    - {id: 51, cat: TV, desc: "Вице"}
-    - {id: 52, cat: TV, desc: "За кадром о кадре"}
-    - {id: 54, cat: TV, desc: "Хемлок Гроув"}
-    - {id: 56, cat: TV, desc: "Семейное древо"}
-    - {id: 57, cat: TV, desc: "Мэрон"}
-    - {id: 59, cat: TV, desc: "Спецнах"}
-    - {id: 60, cat: TV, desc: "Работа не волк"}
-    - {id: 64, cat: TV, desc: "Дивизион "}
-    - {id: 66, cat: TV, desc: "Кошмары Фредди"}
-    - {id: 67, cat: TV, desc: "Все дома"}
-    - {id: 69, cat: TV, desc: "Бездельницы"}
-    - {id: 70, cat: TV, desc: "Реальные люди"}
-    - {id: 71, cat: TV, desc: "Трофеи Вавилона"}
-    - {id: 72, cat: TV, desc: "Постфактум"}
-    - {id: 73, cat: TV, desc: "Детектив Босх"}
-    - {id: 74, cat: TV, desc: "В девятом номере"}
-    - {id: 75, cat: TV, desc: "Верь"}
-    - {id: 76, cat: TV, desc: "Семь дней"}
-    - {id: 77, cat: TV, desc: "Красная дорога"}
-    - {id: 78, cat: TV, desc: "Борджиа"}
-    - {id: 79, cat: TV, desc: "Вдовец"}
-    - {id: 80, cat: TV, desc: "Безумцы"}
-    - {id: 81, cat: TV, desc: "Убийство первой степени"}
-    - {id: 82, cat: TV, desc: "Мистер Слоун"}
-    - {id: 83, cat: TV, desc: "Путеводитель по семейной жизни"}
-    - {id: 84, cat: TV, desc: "Агенты"}
-    - {id: 85, cat: TV, desc: "Блюз Хилл-Стрит"}
-    - {id: 86, cat: TV, desc: "В погоне за тенями"}
-    - {id: 87, cat: TV, desc: "Константин"}
-    - {id: 88, cat: TV, desc: "Готэм"}
-    - {id: 89, cat: TV, desc: "Клей"}
-    - {id: 90, cat: TV, desc: "Скорострел"}
-    - {id: 91, cat: TV, desc: "Водитель"}
-    - {id: 92, cat: TV, desc: "Очевидное"}
-    - {id: 93, cat: TV, desc: "Красные дубы"}
-    - {id: 94, cat: TV, desc: "Жизнь начинается в 18"}
-    - {id: 95, cat: TV, desc: "Безрассудный"}
-    - {id: 96, cat: TV, desc: "Пропавший без вести"}
-    - {id: 97, cat: TV, desc: "Взгляд в прошлое"}
-    - {id: 98, cat: TV, desc: "Королевская семья"}
-    - {id: 99, cat: TV, desc: "Одиночки с причудами"}
-    - {id: 101, cat: TV, desc: "CSI: Киберпространство"}
-    - {id: 102, cat: TV, desc: "Сорвиголова"}
-    - {id: 103, cat: TV, desc: "Осадок"}
-    - {id: 104, cat: TV, desc: "Призраки Энфилда"}
-    - {id: 105, cat: TV, desc: "Ошибки прошлого"}
-    - {id: 106, cat: TV, desc: "Восьмое чувство"}
-    - {id: 107, cat: TV, desc: "Вызов"}
-    - {id: 108, cat: TV, desc: "Настоящий детектив"}
-    - {id: 109, cat: TV, desc: "Звездный охотник"}
-    - {id: 110, cat: TV, desc: "Это не моя жизнь"}
-    - {id: 111, cat: TV, desc: "Человек в высоком замке"}
-    - {id: 112, cat: TV, desc: "Бойтесь Ходячих мертвецов"}
-    - {id: 113, cat: TV, desc: "Стражи галактики"}
-    - {id: 114, cat: TV, desc: "Герои: Возрождение"}
-    - {id: 115, cat: TV, desc: "Заключенный"}
-    - {id: 116, cat: TV, desc: "Родина"}
-    - {id: 117, cat: TV, desc: "Фарго"}
-    - {id: 118, cat: TV, desc: "Американская история ужасов"}
-    - {id: 119, cat: TV, desc: "Оставленные"}
-    - {id: 121, cat: TV, desc: "Любовники"}
-    - {id: 122, cat: TV, desc: "Агенты Щит"}
-    - {id: 123, cat: TV, desc: "Эш против зловещих мертвецов"}
-    - {id: 124, cat: TV, desc: "Ходячие мертвецы"}
-    - {id: 125, cat: TV, desc: "Демоны Да Винчи"}
-    - {id: 120, cat: TV, desc: "Сонная лощина"}
-    - {id: 126, cat: TV, desc: "Джекил и Хайд"}
-    - {id: 127, cat: TV, desc: "Джессика Джонс"}
-    - {id: 128, cat: TV, desc: "Лондонский шпион"}
-    - {id: 129, cat: TV, desc: "Мост"}
-    - {id: 130, cat: TV, desc: "Хроники Франкенштейна"}
-    - {id: 131, cat: TV, desc: "Пространство"}
-    - {id: 132, cat: TV, desc: "Конец детства"}
-    - {id: 133, cat: TV, desc: "Путь к выздоровлению"}
-    - {id: 134, cat: TV, desc: "Старость не радость"}
-    - {id: 135, cat: TV, desc: "Пьяная история"}
-    - {id: 136, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 137, cat: TV, desc: "Сумеречные охотники"}
-    - {id: 138, cat: TV, desc: "Клоун (Баскетс)"}
-    - {id: 139, cat: TV, desc: "Черные паруса"}
-    - {id: 140, cat: TV, desc: "Секретные материалы"}
-    - {id: 141, cat: TV, desc: "Изгои"}
-    - {id: 143, cat: TV, desc: "Куку"}
-    - {id: 144, cat: TV, desc: "Долл и Эм"}
-    - {id: 145, cat: TV, desc: "Банши "}
-    - {id: 146, cat: TV, desc: " Шоу Джимма Гаффигана"}
-    - {id: 147, cat: TV, desc: "Все кувырком"}
-    - {id: 148, cat: TV, desc: "Сожители"}
-    - {id: 149, cat: TV, desc: "Внутри Эми Шумер"}
-    - {id: 150, cat: TV, desc: "С чистого листа"}
-    - {id: 151, cat: TV, desc: "Хофф в записи"}
-    - {id: 152, cat: TV, desc: "Жевательная резинка"}
-    - {id: 153, cat: TV, desc: "Охотники"}
-    - {id: 154, cat: TV, desc: "Даркнет"}
-    - {id: 155, cat: TV, desc: "Бонг для путешествий во времен"}
-    - {id: 156, cat: TV, desc: "Бульварные ужасы"}
-    - {id: 157, cat: TV, desc: "Флауэрсы"}
-    - {id: 158, cat: TV, desc: "Грейс и Фрэнки "}
-    - {id: 159, cat: TV, desc: "Проповедник"}
-    - {id: 142, cat: TV, desc: "Принц из Беверли Хиллз"}
-    - {id: 160, cat: TV, desc: "Сосны"}
-    - {id: 161, cat: TV, desc: "Истории Нила Геймана"}
-    - {id: 162, cat: TV, desc: "Подчинение"}
-    - {id: 163, cat: TV, desc: "Обвиняемая"}
-    - {id: 164, cat: TV, desc: "Безмозглые"}
-    - {id: 165, cat: TV, desc: "Гастролеры"}
-    - {id: 166, cat: TV, desc: "Завучи"}
-    - {id: 167, cat: TV, desc: "Отжиг"}
-    - {id: 169, cat: TV, desc: "Человек-клещ"}
-    - {id: 168, cat: TV, desc: "Трагедия в Кеттеринге"}
-    - {id: 170, cat: TV, desc: "Я люблю Дика"}
-    - {id: 171, cat: TV, desc: "Жан-Клод Ван Джонсон "}
-    - {id: 173, cat: TV, desc: "Небезопасно для работы"}
-    - {id: 174, cat: TV, desc: "Граница "}
-    - {id: 175, cat: TV, desc: "Дрянь"}
-    - {id: 176, cat: TV, desc: "Сложные люди"}
-    - {id: 177, cat: TV, desc: "Девочки Гилмор"}
-    - {id: 178, cat: TV, desc: "Возвращение  в Миссисипи "}
-    - {id: 179, cat: TV, desc: "В хлам"}
-    - {id: 180, cat: TV, desc: "Бунтарь"}
-    - {id: 182, cat: TV, desc: "Слепое пятно"}
-    - {id: 183, cat: TV, desc: "Королевы крика"}
-    - {id: 184, cat: TV, desc: "Черный список"}
-    - {id: 185, cat: TV, desc: "Однажды в сказке"}
-    - {id: 186, cat: TV, desc: "Звездные войны: повстанцы"}
-    - {id: 187, cat: TV, desc: "Скорпион"}
-    - {id: 188, cat: TV, desc: "Безбашенные"}
-    - {id: 189, cat: TV, desc: "Черное зеркало"}
-    - {id: 190, cat: TV, desc: "Стэн против сил зла"}
-    - {id: 191, cat: TV, desc: "Удалённые"}
-    - {id: 192, cat: TV, desc: "Сирены"}
-    - {id: 193, cat: TV, desc: "По ту сторону"}
-    - {id: 194, cat: TV, desc: "ОА"}
-    - {id: 195, cat: TV, desc: "Табу"}
-    - {id: 196, cat: TV, desc: "Колония"}
-    - {id: 197, cat: TV, desc: "Волшебники"}
-    - {id: 198, cat: TV, desc: "24 часа"}
-    - {id: 199, cat: TV, desc: "Миллиарды"}
-    - {id: 200, cat: TV, desc: "Большая маленькая ложь"}
-    - {id: 201, cat: TV, desc: "Легион"}
-    - {id: 202, cat: TV, desc: "Сан рекордз"}
-    - {id: 203, cat: TV, desc: "Заложница"}
-    - {id: 204, cat: TV, desc: "Убийство на пляже"}
-    - {id: 205, cat: TV, desc: "Подземка"}
-    - {id: 206, cat: TV, desc: "Любовь"}
-    - {id: 207, cat: TV, desc: "Преступление по-американски "}
-    - {id: 208, cat: TV, desc: "Большой куш"}
-    - {id: 209, cat: TV, desc: "Побег"}
-    - {id: 210, cat: TV, desc: "Я Зомби"}
-    - {id: 211, cat: TV, desc: "Лучше звоните Солу"}
-    - {id: 212, cat: TV, desc: "Арчер"}
-    - {id: 213, cat: TV, desc: "Дорогие белые"}
-    - {id: 214, cat: TV, desc: "Американские боги"}
-    - {id: 215, cat: TV, desc: "Брокмайр"}
-    - {id: 216, cat: TV, desc: "Энджи Трайбека"}
-    - {id: 217, cat: TV, desc: "Уэнтуорт "}
-    - {id: 218, cat: TV, desc: "Звери."}
-    - {id: 219, cat: TV, desc: "Упадок и разрушение"}
-    - {id: 220, cat: TV, desc: "Просто парочка"}
-    - {id: 221, cat: TV, desc: "Твин Пикс"}
-    - {id: 222, cat: TV, desc: "Умираю со смеху"}
-    - {id: 223, cat: TV, desc: "По волчьим законам"}
-    - {id: 224, cat: TV, desc: "Карточный домик"}
-    - {id: 225, cat: TV, desc: "Приключения Тедди Ракспина"}
-    - {id: 226, cat: TV, desc: "Темная материя"}
-    - {id: 227, cat: TV, desc: "Вайнона Эрп"}
-    - {id: 228, cat: TV, desc: "Киллджойс"}
-    - {id: 229, cat: TV, desc: "Кровавая гонка"}
-    - {id: 230, cat: TV, desc: "Сшиватели"}
-    - {id: 231, cat: TV, desc: "Ночная смена"}
-    - {id: 232, cat: TV, desc: "Мгла"}
-    - {id: 233, cat: TV, desc: "Зверинец"}
-    - {id: 234, cat: TV, desc: "Снегопад"}
-    - {id: 235, cat: TV, desc: "Спасение"}
-    - {id: 236, cat: TV, desc: "По болезни"}
-    - {id: 237, cat: TV, desc: "Кастлвания"}
-    - {id: 238, cat: TV, desc: "Штамм"}
-    - {id: 239, cat: TV, desc: "Игра престолов"}
-    - {id: 240, cat: TV, desc: "Мстители"}
-    - {id: 241, cat: TV, desc: "Комната 104"}
-    - {id: 242, cat: TV, desc: "Миднайт, Техас"}
-    - {id: 243, cat: TV, desc: "Человек-паук"}
-    - {id: 244, cat: TV, desc: "Рэй Донован"}
-    - {id: 245, cat: TV, desc: "Мистер Мерседес"}
-    - {id: 246, cat: TV, desc: "Эпизоды"}
-    - {id: 247, cat: TV, desc: "Охота на Унабомбера "}
-    - {id: 248, cat: TV, desc: "Защитники"}
-    - {id: 249, cat: TV, desc: "Раскосяченные"}
-    - {id: 250, cat: TV, desc: "Двойка"}
-    - {id: 251, cat: TV, desc: "Нарко"}
-    - {id: 252, cat: TV, desc: "Ты — воплощение порока"}
-    - {id: 253, cat: TV, desc: "Конь БоДжек"}
-    - {id: 254, cat: TV, desc: "Орвилл"}
-    - {id: 256, cat: TV, desc: "Южный парк"}
-    - {id: 257, cat: TV, desc: "Звездный путь: Дискавери"}
-    - {id: 258, cat: TV, desc: "Мик"}
-    - {id: 259, cat: TV, desc: "Морская полиция"}
-    - {id: 260, cat: TV, desc: "Смертельное оружие"}
-    - {id: 261, cat: TV, desc: "Сверхлюди"}
-    - {id: 262, cat: TV, desc: "Одарённые"}
-    - {id: 263, cat: TV, desc: "Полиция Чикаго"}
-    - {id: 264, cat: TV, desc: "Это Мы"}
-    - {id: 265, cat: TV, desc: "Империя"}
-    - {id: 266, cat: TV, desc: "Мыслить как преступник"}
-    - {id: 267, cat: TV, desc: "Экзорцист"}
-    - {id: 268, cat: TV, desc: "Люцифер"}
-    - {id: 269, cat: TV, desc: "Нация Z"}
-    - {id: 270, cat: TV, desc: "Сверхестественое"}
-    - {id: 273, cat: TV, desc: "Доктор Шанс"}
-    - {id: 271, cat: TV, desc: "Мистер Робот"}
-    - {id: 272, cat: TV, desc: "Очень странные дела"}
-    - {id: 274, cat: TV, desc: "Стрела"}
-    - {id: 275, cat: TV, desc: "Флэш"}
-    - {id: 276, cat: TV, desc: "Супердевушка"}
-    - {id: 277, cat: TV, desc: "Легенды завтрашнего дня "}
-    - {id: 278, cat: TV, desc: "Суеверие"}
-    - {id: 279, cat: TV, desc: "Конец ёбанного мира"}
-    - {id: 280, cat: TV, desc: "Спецназ"}
-    - {id: 281, cat: TV, desc: "Бесстыдники "}
-    - {id: 282, cat: TV, desc: "Проклятая нация"}
-    - {id: 283, cat: TV, desc: "Человек будущего"}
-    - {id: 284, cat: TV, desc: "Каратель"}
-    - {id: 285, cat: TV, desc: "Фантастика"}
-    - {id: 286, cat: TV, desc: "Ужасы/триллер"}
-    - {id: 287, cat: TV, desc: "Драма"}
-    - {id: 288, cat: TV, desc: "Комедия"}
-    - {id: 289, cat: TV, desc: "Боевик"}
-    - {id: 290, cat: TV, desc: "Детектив"}
-
-  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: 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
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.error
-  test:
-    path: browse.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incdead, 2 onlydead, 3 gold, 4 seedfree
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.embedded > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["\\b(\\d)\\b", "0$1"]
-        - name: re_replace
-          args: [".+Сезон\\s+(\\d+)(?:.+Серия\\s+(\\d+))*[\\s\\S]*\\/\\s+(.+)\\s+\\(\\d+\\)\\s+(\\S*)\\s*(\\w*\\d*).*", "$3 - S$1E$2 - rus $5 $4 newstudio"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-        - name: replace
-          args: ["E -", "E01-99 -"]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    size:
-      selector: td:nth-child(5)
-    date:
-      selector: i
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    seeders:
-      selector: td:nth-child(6)
-      filters:
-        - name: split
-          args: ["|", 0]
-    leechers:
-      selector: td:nth-child(6)
-      filters:
-        - name: split
-          args: ["|", 1]
-    downloadvolumefactor:
-      case:
-        img[src="pic/diamond.png"]: 0
-        img[src="pic/freedownload.gif"]: 0
-        img[src="pic/silver.gif"]: 0.5
-        img[src="pic/bronze.gif"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="pic/diamond.png"]: 2
-        "*": 1
-# minimumratio: ratioless
-# TBDev v2.1.12

src/Jackett.Common/Definitions/hdbitscom.yml

@@ -1,95 +0,0 @@
----
-id: hdbitscom
-name: HD-Bits.com
-description: "HD tracker"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.hd-bits.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Music"}
-    - {id: 2, cat: Movies, desc: "Movies"}
-    - {id: 3, cat: TV, desc: "TV-Series"}
-    - {id: 4, cat: PC, desc: "Applications"}
-    - {id: 5, cat: XXX, desc: "Adult"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-    login: "Log in"
-  error:
-    - selector: form#loginform > span.warning
-  test:
-    path: torrents.php
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    order_by: time
-    order_way: desc
-    action: basic
-    searchsubmit: 1
-
-  rows:
-    selector: table#torrent_table > tbody > tr.torrent
-
-  fields:
-    category:
-      selector: td.cats_col
-      case:
-        div.cats_music: 1
-        div.cats_movies: 2
-        div.cats_tvseries: 3
-        div.cats_applications: 4
-        div.cats_xxx: 5
-    title:
-      selector: div.group_info a[href^="torrents.php?id="]
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.group_info div.tags
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    poster:
-      selector: img[alt="Cover"]
-      attribute: src
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4)
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        "div.freeleech:contains('Freeleech!')": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/hdcenter.yml

@@ -1,108 +0,0 @@
----
-id: hdcenter
-name: HDCenter
-description: "An German HD tracker"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://hdcenter.cc/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/HD, desc: "Movies"}
-    - {id: 2, cat: Movies/3D, desc: "3D"}
-    - {id: 3, cat: TV/HD, desc: "Series"}
-    - {id: 4, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 5, cat: TV/Sport, desc: "Sport"}
-    - {id: 6, cat: XXX, desc: "XXX"}
-    - {id: 7, cat: Audio/Lossless, desc: "Audio"}
-    - {id: 8, cat: PC/0day, desc: "Appz"}
-    - {id: 9, cat: Movies/HD, desc: "HDC"}
-    - {id: 10, cat: Movies/HD, desc: "TvR"}
-    - {id: 11, cat: Movies/HD, desc: "10Bit"}
-    - {id: 12, cat: Movies/HD, desc: "jTV"}
-    - {id: 13, cat: TV/HD, desc: "NERDS"}
-    - {id: 14, cat: Audio/Lossless, desc: "dOWnb3At"}
-    - {id: 15, cat: Movies/Other, desc: "Anime"}
-    - {id: 16, cat: Audio/Video, desc: "Live"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    timeout: 1
-  error:
-    - selector: div#error-text
-  test:
-    path: torrents.php
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-  rows:
-    selector: table#torrent_table > tbody > tr.torrent
-  fields:
-    download:
-      selector: a[title="download"]
-      attribute: href
-      optional: true
-    details:
-      selector: a.torrent_link_title
-      attribute: href
-    title_default:
-      selector: a.torrent_link_title
-    title_hdc: # special selector which only matches HDC releases not containing "English" and "only" tags and doesn't contain English in the title
-      selector: td.cats_col:has(a[href*="filter_cat[9]=1"]) + td.title_col:not(:has(span.tags_inner:contains("English"):contains("only"))):not(:has(span.tags_inner:contains("English"):contains("Only"))):not(:has(span.tags_inner:contains("english"):contains("only"))) a.torrent_link_title:not(:contains("English"))
-      optional: true
-      filters:
-        - name: replace # add GERMAN tag
-          args: ["-HDC", ".GERMAN-HDC"]
-    title_tvr: # special selector which only matches TvR releases not containing "GERMAN" already
-      selector: td.cats_col:has(a[href*="filter_cat[10]=1"]) + td.title_col a.torrent_link_title:not(:contains("GERMAN"))
-      optional: true
-      filters:
-        - name: replace # add GERMAN tag
-          args: [".DL", ".GERMAN.DL"]
-    title:
-      text: "{{ if or .Result.title_tvr .Result.title_hdc }}{{ or .Result.title_tvr .Result.title_hdc }}{{ else }}{{ .Result.title_default }}{{ end }}"
-    category:
-      selector: td.cats_col > a
-      attribute: href
-      filters:
-        - name: regexp
-          args: "\\[(\\d+?)\\]"
-    date:
-      selector: td.time_col > .time
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
-    size:
-      selector: td.size_col
-    grabs:
-      selector: td.snatcher_col
-    seeders:
-      selector: td.seeder_col
-    leechers:
-      selector: td.leecher_col
-    downloadvolumefactor:
-      case:
-        "span.freeleech_slot": 0 # 24h freeelech slot
-        "span.freeleech": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/hdcity.yml

@@ -1,242 +0,0 @@
----
-id: hdcity
-name: HDCity
-description: "HDCity is a SPANISH site for HD content"
-language: es-ES
-type: private
-encoding: ISO-8859-1
-certificates:
-  - a10f2f7a863cd3fba9663185b0943cde01698451 # expired  ‎25 ‎October ‎2021
-links:
-  - https://hdcity.li/
-
-caps:
-  categorymappings:
-    - {id: 12, cat: Movies/BluRay, desc: "Peliculas - Full BluRay"}
-    - {id: 13, cat: Movies/HD, desc: "Peliculas - BluRay Rip 1080p"}
-    - {id: 14, cat: Movies/HD, desc: "Peliculas - BluRay Rip 720p"}
-    - {id: 15, cat: Movies/HD, desc: "Peliculas - HDTV & WEB-DL 1080p"}
-    - {id: 16, cat: Movies/HD, desc: "Peliculas - HDTV & WEB-DL 720p"}
-    - {id: 17, cat: Movies/HD, desc: "Peliculas - BDRemux"}
-    - {id: 18, cat: Movies/HD, desc: "Peliculas - JMBD"}
-    - {id: 19, cat: Movies/3D, desc: "Peliculas - Full BluRay 3D"}
-    - {id: 20, cat: Movies/3D, desc: "Peliculas - 3D"}
-    - {id: 67, cat: Movies/BluRay, desc: "Peliculas - Bluray 4K"}
-    - {id: 68, cat: Movies/3D, desc: "Peliculas - Bluray 3D 4K"}
-    - {id: 69, cat: Movies/HD, desc: "Peliculas - JMBD 4K"}
-    - {id: 72, cat: Movies/HD, desc: "Peliculas - BDREMUX 4K"}
-    - {id: 73, cat: Movies/BluRay, desc: "Peliculas - BluRay Rip 4K"}
-    - {id: 110, cat: Movies/HD, desc: "Peliculas - HDTV WEB-DL 4K"}
-    - {id: 21, cat: TV/HD, desc: "TV/Series - Full BluRay"}
-    - {id: 22, cat: TV/HD, desc: "TV/Series - BluRay Rip 1080p"}
-    - {id: 23, cat: TV/HD, desc: "TV/Series - BluRay Rip 720p"}
-    - {id: 24, cat: TV/HD, desc: "TV/Series - HDTV & WEB-DL 1080p"}
-    - {id: 25, cat: TV/HD, desc: "TV/Series - HDTV & WEB-DL 720p"}
-    - {id: 74, cat: TV/HD, desc: "TV/Series - Bluray 4K"}
-    - {id: 75, cat: TV/HD, desc: "TV/Series - JMDB 4K"}
-    - {id: 76, cat: TV/HD, desc: "TV/Series - BDREMUX 4K"}
-    - {id: 77, cat: TV/HD, desc: "TV/Series - BluRay Rip 4K"}
-    - {id: 111, cat: TV/HD, desc: "TV/Series - HDTV WEB-DL 4K"}
-    - {id: 26, cat: TV/Anime, desc: "Anime - Full BluRay"}
-    - {id: 28, cat: TV/Anime, desc: "Anime - BluRay Rip 1080p"}
-    - {id: 29, cat: TV/Anime, desc: "Anime - BluRay Rip 720p"}
-    - {id: 32, cat: TV/Anime, desc: "Anime - BDRemux"}
-    - {id: 107, cat: TV/Anime, desc: "Anime - HDTV 4K"}
-    - {id: 34, cat: TV/Documentary, desc: "Documental - Full BluRay"}
-    - {id: 36, cat: TV/Documentary, desc: "Documental - BluRay Rip 1080p"}
-    - {id: 37, cat: TV/Documentary, desc: "Documental - BluRay Rip 720p"}
-    - {id: 38, cat: TV/Documentary, desc: "Documental - Full BluRay 3D"}
-    - {id: 40, cat: TV/Documentary, desc: "Documental - 3D"}
-    - {id: 65, cat: TV/Documentary, desc: "Documental - HDTV 720p"}
-    - {id: 66, cat: TV/Documentary, desc: "Documental - HDTV 1080p"}
-    - {id: 87, cat: TV/Documentary, desc: "Documental - Bluray 4K"}
-    - {id: 88, cat: TV/Documentary, desc: "Documental - Bluray 3D 4K"}
-    - {id: 89, cat: TV/Documentary, desc: "Documental - JMBD 4K"}
-    - {id: 90, cat: TV/Documentary, desc: "Documental - BDREMUX 4K"}
-    - {id: 91, cat: TV/Documentary, desc: "Documental - BluRay Rip 4K"}
-    - {id: 112, cat: TV/Documentary, desc: "Documental - HDTV WEB-DL 4K"}
-    - {id: 117, cat: TV/Documentary, desc: "Documental - BDRemux"}
-    - {id: 48, cat: Audio/Lossless, desc: "Música - Full BluRay"}
-    - {id: 50, cat: Audio/Lossless, desc: "Música - BluRay Rip 1080p"}
-    - {id: 51, cat: Audio/Lossless, desc: "Música - BluRay Rip 720p"}
-    - {id: 61, cat: Audio/Lossless, desc: "Música - Full bluray 3D"}
-    - {id: 62, cat: Audio/Lossless, desc: "Música - 3D"}
-    - {id: 97, cat: Audio/Lossless, desc: "Música - Bluray 4K"}
-    - {id: 98, cat: Audio/Lossless, desc: "Música - Bluray 3D 4K"}
-    - {id: 99, cat: Audio/Lossless, desc: "Música - JMBD 4K"}
-    - {id: 100, cat: Audio/Lossless, desc: "Música - BDREMUX 4K"}
-    - {id: 101, cat: Audio/Lossless, desc: "Música - BluRay Rip 4K"}
-    - {id: 113, cat: Audio/Lossless, desc: "Música - HDTV WEB-DL 4K"}
-    - {id: 116, cat: Audio/Lossless, desc: "Música - HDTV WEB-DL 720p"}
-    - {id: 54, cat: TV/Sport, desc: "Deporte - BluRay Rip 1080p"}
-    - {id: 55, cat: TV/Sport, desc: "Deporte - BluRay Rip 720p"}
-    - {id: 57, cat: TV/Sport, desc: "Deporte - HDTV 1080p"}
-    - {id: 59, cat: TV/Sport, desc: "Deporte - HDTV 720p"}
-    - {id: 92, cat: TV/Sport, desc: "Deporte - Bluray 4K"}
-    - {id: 93, cat: TV/Sport, desc: "Deporte - Bluray 3D 4K"}
-    - {id: 94, cat: TV/Sport, desc: "Deporte - JMBD 4K"}
-    - {id: 95, cat: TV/Sport, desc: "Deporte - BDREMUX 4K"}
-    - {id: 96, cat: TV/Sport, desc: "Deporte - BluRay Rip 4K"}
-    - {id: 114, cat: TV/Sport, desc: "Deporte - HDTV WEB-DL 4K"}
-    - {id: 47, cat: XXX/x264, desc: "XXX - Full BluRay"}
-    - {id: 49, cat: XXX/x264, desc: "XXX - BluRay Rip 1080p"}
-    - {id: 52, cat: XXX/x264, desc: "XXX - BluRay Rip 720p"}
-    - {id: 56, cat: XXX/x264, desc: "XXX - HDTV & WEB-DL 1080p"}
-    - {id: 60, cat: XXX/x264, desc: "XXX - HDTV & WEB-DL 720p"}
-    - {id: 64, cat: XXX/x264, desc: "XXX - Full BluRay 3D"}
-    - {id: 102, cat: XXX/x264, desc: "XXX - Bluray 4K"}
-    - {id: 103, cat: XXX/x264, desc: "XXX - Bluray 3D 4K"}
-    - {id: 104, cat: XXX/x264, desc: "XXX - JMBD 4K"}
-    - {id: 105, cat: XXX/x264, desc: "XXX - BDREMUX 4K"}
-    - {id: 106, cat: XXX/x264, desc: "XXX - BluRay Rip 4K"}
-    - {id: 115, cat: XXX/x264, desc: "XXX - HDTV WEB-DL 4K"}
-    - {id: 39, cat: Movies/BluRay, desc: "Animación - Full BluRay"}
-    - {id: 41, cat: Movies/HD, desc: "Animación - BluRay Rip 1080p"}
-    - {id: 42, cat: Movies/HD, desc: "Animación - BluRay Rip 720p"}
-    - {id: 43, cat: Movies/HD, desc: "Animación - HDTV & WEB-DL 1080p"}
-    - {id: 44, cat: Movies/HD, desc: "Animación - HDTV & WEB-DL 720p"}
-    - {id: 45, cat: Movies/3D, desc: "Animación - Full BluRay 3D"}
-    - {id: 46, cat: Movies/3D, desc: "Animación - 3D"}
-    - {id: 63, cat: Movies/HD, desc: "Animación - BDRemux"}
-    - {id: 78, cat: Movies/BluRay, desc: "Animación - Bluray 4K"}
-    - {id: 79, cat: Movies/3D, desc: "Animación - Bluray 3D 4K"}
-    - {id: 80, cat: Movies/HD, desc: "Animación - JMBD 4K"}
-    - {id: 81, cat: Movies/BluRay, desc: "Animación - BDREMUX 4K"}
-    - {id: 82, cat: Movies/BluRay, desc: "Animación - BluRay Rip 4K"}
-    - {id: 108, cat: Movies/HD, desc: "Animación - HDTV WEB-DL 4K"}
-    - {id: 83, cat: Movies/BluRay, desc: "Animación - Bluray 4k"}
-    - {id: 27, cat: TV/HD, desc: "Series Animación - Full Bluray"}
-    - {id: 30, cat: TV/HD, desc: "Series Animación - BluRay Rip 1080p"}
-    - {id: 31, cat: TV/HD, desc: "Series Animación - BluRay Rip 720p"}
-    - {id: 33, cat: TV/HD, desc: "Series Animación - HDTV & WEB-DL 1080p"}
-    - {id: 35, cat: TV/HD, desc: "Series Animación - HDTV & WEB-DL 720p"}
-    - {id: 84, cat: TV/HD, desc: "Series Animación - JMBD 4K"}
-    - {id: 85, cat: TV/HD, desc: "Series Animación - BDREMUX 4K"}
-    - {id: 86, cat: TV/HD, desc: "Series Animación - BluRay Rip 4K"}
-    - {id: 109, cat: TV/HD, desc: "Series Animación - HDTV WEB-DL 4K"}
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: info
-    type: info
-    label: "IP requirement"
-    default: "This site accepts only users with Spanish IP addresses.<br>For others it will return error: 403 Forbidden."
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: .lista>span
-  test:
-    path: index.php
-    selector: form[name="jump1"]
-
-search:
-  path: index.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})", " $1 "]
-    - name: re_replace
-      args: ["[^a-zA-Z0-9]+", " "]
-  inputs:
-    page: torrents
-    $raw: "&category={{ range .Categories }}{{.}};{{end}}"
-    active: 1
-    search: "{{ .Keywords }}"
-
-  rows:
-    selector: "#category+table table tr:not(:first-child):not(:last-child)"
-
-  fields:
-    category:
-      selector: td:nth-child(1) a
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_vose:
-      selector: td[valign="middle"] a:contains("VOSE")
-      optional: true
-      filters:
-        - name: append
-          args: " English"
-        - name: re_replace
-          args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b", " S$1 "]
-    title_notvose:
-      selector: td[valign="middle"] a:not(:contains("VOSE"))
-      optional: true
-      filters:
-        - name: append
-          args: " Spanish"
-        - name: re_replace
-          args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b", " S$1 "]
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-    details:
-      selector: td[valign="middle"] a
-      attribute: href
-    poster:
-      selector: td[valign="middle"] a
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    size:
-      selector: td:nth-child(10)
-    seeders:
-      selector: td:nth-child(6) a
-    leechers:
-      selector: td:nth-child(7) a
-    grabs:
-      selector: td:nth-child(8)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    download:
-      selector: a[href^="download.php"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        img[src$="freeleech.gif"]: 0
-        img[src$="gold.gif"]: 0
-        img[src$="silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="2x.gif"]: 2
-        img[src$="3x.gif"]: 3
-        img[src$="4x.gif"]: 4
-        img[src$="5x.gif"]: 5
-        img[src$="6x.gif"]: 6
-        img[src$="7x.gif"]: 7
-        img[src$="8x.gif"]: 8
-        img[src$="9x.gif"]: 9
-        "*": 1
-# engine tbd

src/Jackett.Common/Definitions/hdforever.yml

@@ -240,16 +240,16 @@ search:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*multi[\\s|\\.|-]*)", ".{{ .Config.multilanguage }}."]
+          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."]
+          args: ["(?i)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*subfrench[\\s|\\.|-]*)", ".ENGLISH."]
+          args: ["(?i)([\\s|\\.|-]subfrench[\\s|\\.|-])", ".ENGLISH."]
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     description:

src/Jackett.Common/Definitions/hdonly.yml

@@ -241,16 +241,16 @@ search:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*multi[\\s|\\.|-]*)", ".{{ .Config.multilanguage }}."]
+          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."]
+          args: ["(?i)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*subfrench[\\s|\\.|-]*)", ".ENGLISH."]
+          args: ["(?i)([\\s|\\.|-]subfrench[\\s|\\.|-])", ".ENGLISH."]
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     description:

src/Jackett.Common/Definitions/hebits.yml

@@ -129,9 +129,9 @@ search:
       selector: a[data-cover^="/images/"]
       attribute: data-cover
     files:
-      selector: td:nth-child(3)
+      selector: td:nth-child(4)
     date:
-      selector: td:nth-child(4) span
+      selector: td:nth-child(5) span
       attribute: title
       filters:
         - name: append
@@ -139,13 +139,13 @@ search:
         - name: dateparse
           args: "02/01/2006, 15:04 -07:00"
     size:
-      selector: td:nth-child(5)
-    grabs:
       selector: td:nth-child(6)
-    seeders:
+    grabs:
       selector: td:nth-child(7)
-    leechers:
+    seeders:
       selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
     downloadvolumefactor:
       case:
         "strong.tl_notice[title*=\"חצי פריליץ'\"]": 0.5 # 50%

src/Jackett.Common/Definitions/hhanclub.yml

@@ -0,0 +1,192 @@
+---
+id: hhanclub
+name: HHanClub
+description: "HHanClub (猪猪网) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://hhanclub.top/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/连续剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "Music/音乐"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    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 HHanClub 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: 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"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 (not working)
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > 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_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow: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:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.24 2022-08-30

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

@@ -33,8 +33,13 @@ search:
       selector: h5 a
       attribute: href
     download:
+      selector: a[href*="/download/torrent/"]
+      attribute: href
+      optional: true
+    magnet:
       selector: a[href^="magnet:?xt="]
       attribute: href
+      optional: true
     date:
       text: now
     size:

src/Jackett.Common/Definitions/keepfriends.yml

@@ -130,9 +130,13 @@ search:
     doubanid:
       selector: a[href*="movie.douban.com/subject/"]
       attribute: href
+    _staff_edit:
+      selector: a[href^="edit.php?"]
+      attribute: href
+      optional: true
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: "{{ if .Result._staff_edit }}td:nth-child(5) > span[title]{{ else }}td:nth-child(4) > span[title]{{ end }}"
       attribute: title
       optional: true
       filters:
@@ -142,7 +146,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: "{{ if .Result._staff_edit }}td:nth-child(5):not(:has(span)){{ else }}td:nth-child(4):not(:has(span)){{ end }}"
       optional: true
       filters:
         - name: append
@@ -152,13 +156,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(5)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(6){{ else }}td:nth-child(5){{ end }}"
     seeders:
-      selector: td:nth-child(6)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(7){{ else }}td:nth-child(6){{ end }}"
     leechers:
-      selector: td:nth-child(7)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(8){{ else }}td:nth-child(7){{ end }}"
     grabs:
-      selector: td:nth-child(8)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(9){{ else }}td:nth-child(8){{ end }}"
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -174,7 +178,7 @@ search:
         img.pro_2up: 2
         "*": 1
     description:
-      selector: td:nth-child(2)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(3){{ else }}td:nth-child(2){{ end }}"
       remove: a, img
     title_english:
       selector: table.torrentname > tbody > tr > td.embedded

src/Jackett.Common/Definitions/knaben.yml

@@ -10,71 +10,78 @@ links:
 
 caps:
   categorymappings:
-    # Cat ids used for filtering /browse/ are not consistent with those for results, so double-check when updating.
-    # They appear to be using nZEDb/Newznab/Jackett cat ids, so if there are empty categories, resort to those.
-    # Audio
-    - {id: 3000, cat: Audio, desc: "Audio"}
-    - {id: 3010, cat: Audio/MP3, desc: "Audio/MP3"}
-    - {id: 3020, cat: Audio/Video, desc: "Audio/Video"}
-    - {id: 3030, cat: Audio/Audiobook, desc: "Audio/Audiobook"}
-    - {id: 3040, cat: Audio/Lossless, desc: "Audio/Lossless"}
-    - {id: 3050, cat: Audio/Other, desc: "Audio/Other"}
-    # Console
-    - {id: 1000, cat: Console, desc: "Console"}
-    - {id: 1010, cat: Console/NDS, desc: "Console/NDS"}
-    - {id: 1020, cat: Console/PSP, desc: "Console/PSP"}
-    - {id: 1030, cat: Console/Wii, desc: "Console/Wii"}
-    - {id: 1040, cat: Console/XBox, desc: "Console/Xbox"}
-    - {id: 1050, cat: Console/XBox 360, desc: "Console/Xbox 360"}
-    - {id: 1080, cat: Console/PS3, desc: "Console/PS3"}
-    - {id: 1110, cat: Console/3DS, desc: "Console/3DS"}
-    - {id: 1120, cat: Console/PS Vita, desc: "Console/PS Vita"}
-    - {id: 1180, cat: Console/PS4, desc: "Console/PS4"}
-    - {id: 1090, cat: Console/Other, desc: "Console/Other"}
-    # Movies
-    - {id: 2000, cat: Movies, desc: "Movies"}
-    - {id: 2010, cat: Movies/Foreign, desc: "Movies/Foreign"}
-    - {id: 2030, cat: Movies/SD, desc: "Movies/SD"}
-    - {id: 2040, cat: Movies/HD, desc: "Movies/HD"}
-    - {id: 2045, cat: Movies/UHD, desc: "Movies/UHD"}
-    - {id: 2060, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 2050, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 2070, cat: Movies/DVD, desc: "Movies/DVD"}
-    - {id: 2020, cat: Movies/Other, desc: "Movies/Other"}
-    # PC
-    - {id: 4000, cat: PC, desc: "PC/PC"}
-    - {id: 4020, cat: PC/ISO, desc: "PC/ISO"}
-    - {id: 4030, cat: PC/Mac, desc: "PC/Mac"}
-    - {id: 4040, cat: PC/Mobile-Other, desc: "PC/Mobile-Other"}
-    - {id: 4050, cat: PC/Games, desc: "PC/Games"}
-    - {id: 4060, cat: PC/Mobile-iOS, desc: "PC/Mobile-iOS"}
-    - {id: 4070, cat: PC/Mobile-Android, desc: "PC/Mobile-Android"}
-    # Anime
-    - {id: 5070, cat: TV/Anime, desc: "Anime"}
-    # TV
-    - {id: 5000, cat: TV, desc: "TV"}
-    - {id: 5020, cat: TV/Foreign, desc: "TV/FOREIGN"}
-    - {id: 5030, cat: TV/SD, desc: "TV/SD"}
-    - {id: 5040, cat: TV/HD, desc: "TV/HD"}
-    - {id: 5045, cat: TV/UHD, desc: "TV/UHD"}
-    - {id: 5060, cat: TV/Sport, desc: "TV/Sport"}
-    - {id: 5080, cat: TV/Documentary, desc: "TV/Documentary"}
-    - {id: 5050, cat: TV/Other, desc: "TV/OTHER"}
-    # XXX
-    - {id: 6000, cat: XXX, desc: "XXX"}
-    - {id: 6010, cat: XXX/DVD, desc: "XXX/DVD"}
-    - {id: 6060, cat: XXX/ImageSet, desc: "XXX/Imageset"}
-    - {id: 6070, cat: XXX/Other, desc: "XXX/Other"}
-    # Books
-    - {id: 7000, cat: Books, desc: "Books"}
-    - {id: 7020, cat: Books/EBook, desc: "Books/Ebook"}
-    - {id: 7030, cat: Books/Comics, desc: "Books/Comics"}
-    - {id: 7010, cat: Books/Mags, desc: "Books/Magazines"}
-    - {id: 7040, cat: Books/Technical, desc: "Books/Technical"}
-    - {id: 7050, cat: Books/Other, desc: "Books/Other"}
-    # Other
-    - {id: 8000, cat: Other, desc: "Other"}
-    - {id: 8010, cat: Other/Misc, desc: "Other/Misc"}
+    - {id: 1000000, cat: Audio, desc: "Audio"}
+    - {id: 1001000, cat: Audio/MP3, desc: "MP3"}
+    - {id: 1002000, cat: Audio/Lossless, desc: "Lossless"}
+    - {id: 1003000, cat: Audio/Audiobook, desc: "Audiobook"}
+    - {id: 1004000, cat: Audio/Video, desc: "Video"}
+    - {id: 1005000, cat: Audio/Other, desc: "Radio"}
+    - {id: 1006000, cat: Audio/Other, desc: "Other"}
+    - {id: 2000000, cat: TV, desc: "TV"}
+    - {id: 2001000, cat: TV/HD, desc: "HD"}
+    - {id: 2002000, cat: TV/SD, desc: "SD"}
+    - {id: 2003000, cat: TV/UHD, desc: "UHD"}
+    - {id: 2004000, cat: TV/Documentary, desc: "Documentary"}
+    - {id: 2005000, cat: TV/Foreign, desc: "Foreign"}
+    - {id: 2006000, cat: TV/Sport, desc: "Sport"}
+    - {id: 2007000, cat: TV/Other, desc: "Cartoon"}
+    - {id: 2008000, cat: TV/Other, desc: "Other"}
+    - {id: 3000000, cat: Movies, desc: "Movies"}
+    - {id: 3001000, cat: Movies/HD, desc: "HD"}
+    - {id: 3002000, cat: Movies/SD, desc: "SD"}
+    - {id: 3003000, cat: Movies/UHD, desc: "UHD"}
+    - {id: 3004000, cat: Movies/DVD, desc: "DVD"}
+    - {id: 3005000, cat: Movies/Foreign, desc: "Foreign"}
+    - {id: 3006000, cat: Movies/Foreign, desc: "Bollywood"}
+    - {id: 3007000, cat: Movies/3D, desc: "3D"}
+    - {id: 3008000, cat: Movies/Other, desc: "Other"}
+    - {id: 4000000, cat: PC, desc: "PC"}
+    - {id: 4001000, cat: PC/Games, desc: "Games"}
+    - {id: 4002000, cat: PC/0day, desc: "Software"}
+    - {id: 4003000, cat: PC/Mac, desc: "Mac"}
+    - {id: 4004000, cat: PC/ISO, desc: "Unix"}
+    - {id: 5000000, cat: XXX, desc: "XXX"}
+    - {id: 5001000, cat: XXX/x264, desc: "Video"}
+    - {id: 5002000, cat: XXX/ImageSet, desc: "ImageSet"}
+    - {id: 5003000, cat: XXX/Other, desc: "Games"}
+    - {id: 5004000, cat: XXX/Other, desc: "Hentai"}
+    - {id: 5005000, cat: XXX/Other, desc: "Other"}
+    - {id: 6000000, cat: TV/Anime, desc: "Anime"}
+    - {id: 6001000, cat: TV/Anime, desc: "Subbed"}
+    - {id: 6002000, cat: TV/Anime, desc: "Dubbed"}
+    - {id: 6003000, cat: TV/Anime, desc: "Dual audio"}
+    - {id: 6004000, cat: TV/Anime, desc: "Raw"}
+    - {id: 6005000, cat: Audio/Video, desc: "Music Video"}
+    - {id: 6006000, cat: Books/Other, desc: "Literature"}
+    - {id: 6007000, cat: Audio/Other, desc: "Music"}
+    - {id: 7000000, cat: Console, desc: "Console"}
+    - {id: 7001000, cat: Console/PS4, desc: "PS4"}
+    - {id: 7002000, cat: Console/PS3, desc: "PS3"}
+    - {id: 7003000, cat: Console/PS3, desc: "PS2"}
+    - {id: 7004000, cat: Console/PS3, desc: "PS1"}
+    - {id: 7005000, cat: Console/PS Vita, desc: "PS Vita"}
+    - {id: 7006000, cat: Console/PSP, desc: "PSP"}
+    - {id: 7007000, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: 7008000, cat: Console/XBox, desc: "Xbox"}
+    - {id: 7009000, cat: Console/NDS, desc: "Switch"}
+    - {id: 7010000, cat: Console/NDS, desc: "NDS"}
+    - {id: 7011000, cat: Console/Wii, desc: "Wii"}
+    - {id: 7012000, cat: Console/WiiU, desc: "WiiU"}
+    - {id: 7013000, cat: Console/3DS, desc: "3DS"}
+    - {id: 7014000, cat: Console/Wii, desc: "GameCube"}
+    - {id: 7015000, cat: Console/Other, desc: "Other"}
+    - {id: 8000000, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 8001000, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 8002000, cat: PC/Mobile-iOS, desc: "IOS"}
+    - {id: 8003000, cat: PC/Mobile-Other, desc: "Other"}
+    - {id: 9000000, cat: Books, desc: "Books"}
+    - {id: 9001000, cat: Books/EBook, desc: "EBooks"}
+    - {id: 9002000, cat: Books/Comics, desc: "Comics"}
+    - {id: 9003000, cat: Books/Mags, desc: "Magazines"}
+    - {id: 9004000, cat: Books/Technical, desc: "Technical"}
+    - {id: 9005000, cat: Books/Other, desc: "Other"}
+    - {id: 10000000, cat: Other, desc: "Other"}
+    - {id: 10001000, cat: Other/Misc, desc: "Misc"}
 
   modes:
     search: [q]
@@ -87,27 +94,37 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: Date
+    default: date
     options:
-      Date: created
-      Seeders: seeders
-      Size: size
-      Title: title
+      date: created
+      seeders: seeders
+      bytes: size
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: +
+    options:
+      +: desc
+      -: asc
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&p=1&cat=All&s={{ else }}browse/1/0/{{ end }}{{ .Config.sort }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}browse{{ end }}/0/1/{{ .Config.type }}{{ .Config.sort }}"
 
   rows:
-    selector: tr[title^="Cached at"]
+    selector: tr[title^="Cached "]
 
   fields:
     category:
-      selector: a[href^="/browse/"]
+      selector: a[href^="/browse/"]:last-child
       attribute: href
       filters:
         - name: split
-          args: ["/", 3]
+          args: ["/", 2]
+        # replace subcat with cat: 1001069 > 1001000
+        - name: re_replace
+          args: ["(\\d{3})$", "000"]
     title:
       selector: td:nth-child(2) a
     details:
@@ -128,7 +145,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02T15:04:05 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
     size:
       selector: td:nth-child(3)
     seeders:

src/Jackett.Common/Definitions/krazyzone.yml

@@ -57,6 +57,7 @@ caps:
     - {id: 94, cat: Other, desc: "Xmas Music Packs"}
     - {id: 95, cat: Other/Misc, desc: "Unsorted To Be Edited"}
     - {id: 97, cat: Other, desc: "VIP Exclusive"}
+    - {id: 99, cat: Other, desc: "Krazy-Internal"}
 
   modes:
     search: [q]
@@ -129,7 +130,7 @@ search:
       args: ["(\\w+)", " +$1"] # prepend + to each word
 
   rows:
-    selector: table.ttable_headinner > tbody > tr
+    selector: table.ttable_headinner > tbody > tr:has(a[href^="download.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,7 +9,7 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.bet/
+  - https://limetorrents.unblockit.cat/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.world/
 legacylinks:
@@ -40,6 +40,7 @@ legacylinks:
   - https://limetorrents.unblockit.name/
   - https://limetorrents.nocensor.sbs/
   - https://limetorrents.unblockit.ist/
+  - https://limetorrents.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/linuxtracker.yml

@@ -69,12 +69,14 @@ caps:
     - {id: 2273, cat: PC/ISO, desc: "Cryptocurrency OS"}
     - {id: 2245, cat: PC/ISO, desc: "Cucumber Linux"}
     - {id: 2285, cat: PC/ISO, desc: "DRBL Live"}
+    - {id: 123, cat: PC/ISO, desc: "Damnsmall"}
     - {id: 128, cat: PC/ISO, desc: "Debian"}
     - {id: 131, cat: PC/ISO, desc: "Deepin"}
     - {id: 2038, cat: PC/ISO, desc: "Deft"}
     - {id: 2192, cat: PC/ISO, desc: "Devuan"}
     - {id: 2287, cat: PC/ISO, desc: "Doge Linux"}
     - {id: 144, cat: PC/ISO, desc: "DragonFly BSD"}
+    - {id: 2215, cat: PC/ISO, desc: "Dragora GNU/Linux"}
     - {id: 2226, cat: PC/ISO, desc: "DuZeru OS"}
     - {id: 148, cat: PC/ISO, desc: "Dynebolic"}
     - {id: 2261, cat: PC/ISO, desc: "Eagle Mode"}
@@ -85,6 +87,7 @@ caps:
     - {id: 2041, cat: PC/ISO, desc: "Elementary OS"}
     - {id: 161, cat: PC/ISO, desc: "Elive"}
     - {id: 2042, cat: PC/ISO, desc: "Emmabuntus"}
+    - {id: 2231, cat: PC/ISO, desc: "Emmi OS"}
     - {id: 2278, cat: PC/ISO, desc: "EndeavourOS"}
     - {id: 164, cat: PC/ISO, desc: "Endian"}
     - {id: 2179, cat: PC/ISO, desc: "Endless OS"}
@@ -133,6 +136,7 @@ caps:
     - {id: 2054, cat: PC/ISO, desc: "Kolibri"}
     - {id: 287, cat: PC/ISO, desc: "Kubuntu"}
     - {id: 2057, cat: PC/ISO, desc: "Kwort Linux"}
+    - {id: 2058, cat: PC/ISO, desc: "Kxstudio"}
     - {id: 2068, cat: PC/ISO, desc: "LXLE"}
     - {id: 2258, cat: PC/ISO, desc: "Lakka"}
     - {id: 2176, cat: PC/ISO, desc: "LibreELEC"}
@@ -150,6 +154,7 @@ caps:
     - {id: 1218, cat: PC/ISO, desc: "Lubuntu"}
     - {id: 2163, cat: PC/ISO, desc: "MOFO Linux"}
     - {id: 2177, cat: PC/ISO, desc: "MX Linux"}
+    - {id: 2296, cat: PC/ISO, desc: "Mabox Linux"}
     - {id: 1228, cat: PC/ISO, desc: "Mageia"}
     - {id: 2071, cat: PC/ISO, desc: "MakuluLinux"}
     - {id: 2073, cat: PC/ISO, desc: "Manjaro"}
@@ -157,8 +162,10 @@ caps:
     - {id: 2075, cat: PC/ISO, desc: "Minino"}
     - {id: 2076, cat: PC/ISO, desc: "Minix"}
     - {id: 2241, cat: PC/ISO, desc: "MorpheusArch Linux"}
+    - {id: 369, cat: PC/ISO, desc: "Musix"}
     - {id: 373, cat: PC/ISO, desc: "Mythbuntu"}
     - {id: 2078, cat: PC/ISO, desc: "NAS4Free"}
+    - {id: 2217, cat: PC/ISO, desc: "Namib GNU/Linux"}
     - {id: 2079, cat: PC/ISO, desc: "Neptune"}
     - {id: 380, cat: PC/ISO, desc: "NetBSD"}
     - {id: 2080, cat: PC/ISO, desc: "Nethserver"}
@@ -253,9 +260,11 @@ caps:
     - {id: 2134, cat: PC/ISO, desc: "SuperX"}
     - {id: 2189, cat: PC/ISO, desc: "SwagArch"}
     - {id: 2267, cat: PC/ISO, desc: "Symphony OS"}
+    - {id: 2295, cat: PC/ISO, desc: "SysLinuxOS"}
     - {id: 2135, cat: PC/ISO, desc: "SystemRescueCD"}
     - {id: 2188, cat: PC/ISO, desc: "TENS"}
     - {id: 2136, cat: PC/ISO, desc: "Tails"}
+    - {id: 2170, cat: PC/ISO, desc: "TalkingArch"}
     - {id: 542, cat: PC/ISO, desc: "Thinstation"}
     - {id: 2279, cat: PC/ISO, desc: "TinyPaw Linux"}
     - {id: 2138, cat: PC/ISO, desc: "Tinycore"}
@@ -286,6 +295,7 @@ caps:
     - {id: 2281, cat: PC/ISO, desc: "Web Security Dojo"}
     - {id: 2246, cat: PC/ISO, desc: "Whonix"}
     - {id: 2155, cat: PC/ISO, desc: "Wifislax"}
+    - {id: 2229, cat: PC/ISO, desc: "XiVa Studio"}
     - {id: 2251, cat: PC/ISO, desc: "XigmaNAS"}
     - {id: 607, cat: PC/ISO, desc: "Xubuntu"}
     - {id: 612, cat: PC/ISO, desc: "Zen"}

src/Jackett.Common/Definitions/madsrevolution.yml

@@ -62,15 +62,15 @@ caps:
     - {id: 33, cat: XXX, desc: "XXX DVD-R"}
     - {id: 10, cat: XXX, desc: "XXX Unsorted"}
     - {id: 5, cat: TV/Anime, desc: "Misc Anime"}
-    - {id: 6, cat: TV/Anime, desc: "Misc Hentai"}
+    - {id: 6, cat: XXX, desc: "Misc Hentai"}
     - {id: 19, cat: Other, desc: "Misc Other"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
+    tv-search: [q, season, ep, genre]
+    movie-search: [q, genre]
+    music-search: [q, genre]
+    book-search: [q, genre]
 
 settings:
   - name: username
@@ -123,6 +123,11 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if .Config.freeleech }}action=uploadonly&{{ else }}{{ end }}"
     searchstr: "{{ .Keywords }}"
+    searchtags: "{{ if .Query.Genre }}{{ .Query.Genre }}{{ else }}{{ end }}"
+    # 0 any, 1 all
+    tags_type: 0
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
     # site does not support imdbid searching or present imdb links in results.
 
   rows:
@@ -149,6 +154,10 @@ search:
       filters:
         - name: regexp
           args: "src=(.+?) "
+    genre:
+      selector: div.tags
+    description:
+      text: "{{ .Result.genre }}"
     date:
       selector: td:nth-last-child(5)
       filters:

src/Jackett.Common/Definitions/mediamaatjes.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 45, cat: Console/Other, desc: "Retro-spellen"}
+    - {id: 46, cat: Movies/SD, desc: "avi/xvideo"}
     - {id: 43, cat: Movies/UHD, desc: "4k Films"}
     - {id: 41, cat: TV/Documentary, desc: "Documentaire"}
     - {id: 40, cat: Other, desc: "kerst"}

src/Jackett.Common/Definitions/megapeer.yml

@@ -84,6 +84,8 @@ search:
 
   rows:
     selector: table#tor-tbl > tbody > tr.hl-tr
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/mesevilag.yml

@@ -165,8 +165,8 @@ search:
       selector: td:nth-last-child(5)
       remove: font
     minimumratio:
-      text: 0.7
+      text: 1.0
     minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # engine n/a

src/Jackett.Common/Definitions/microbit.yml

@@ -1,166 +0,0 @@
----
-id: microbit
-name: MicroBit
-description: "MicroBit (µBit) is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hu-HU
-type: private
-encoding: UTF-8
-links:
-  - http://microbit.eu/ # site does not support https ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: 37, cat: TV/Anime, desc: "Animációk"}
-    - {id: 12, cat: Books, desc: "E-book/Eng"}
-    - {id: 13, cat: Books, desc: "E-book/Hun"}
-    - {id: 36, cat: Movies/DVD, desc: "Film/DVD-9/Eng"}
-    - {id: 38, cat: Movies/DVD, desc: "Film/DVD-9/Hun"}
-    - {id: 6, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 31, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 39, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 4, cat: Movies/SD, desc: "Film/Xvid/Eng"}
-    - {id: 2, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 24, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 23, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 17, cat: Console, desc: "Játék/Konzol"}
-    - {id: 18, cat: PC/Games, desc: "Játék/Rip"}
-    - {id: 19, cat: Other, desc: "Képek"}
-    - {id: 11, cat: Audio/Video, desc: "Klippek/Videók"}
-    - {id: 8, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 35, cat: Books, desc: "Oktató Anyagok"}
-    - {id: 28, cat: PC, desc: "PC/Egyéb"}
-    - {id: 21, cat: PC/ISO, desc: "PC/ISO"}
-    - {id: 1, cat: PC, desc: "PC/Rip"}
-    - {id: 20, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 14, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 29, cat: Movies/UHD, desc: "UHD"}
-    - {id: 22, cat: Audio/Lossless, desc: "Zene/Lossless"}
-    - {id: 10, cat: Audio/MP3, desc: "Zene/MP3"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    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: added
-    options:
-      name: name
-      size: size
-      added: added
-      seeders: seeders
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    return: "/"
-  error:
-    - selector: fieldset.stderr
-  test:
-    path: index.php
-    selector: img[onclick="window.location='logout.php'"]
-
-search:
-  paths:
-    # http://microbit.eu/browse.php?searchOpened=1&search=&searchWhat=0&filterOptions=0&orderby=added&ordertype=DESC
-    # http://microbit.eu/browse.php?searchOpened=1&cat[12]=12&cat[13]=13&search=&searchWhat=0&filterOptions=0
-    - path: browse.php
-  inputs:
-    # note: range categories does not support specifying the range value more than once so "{{ range .Categories }}cat[{{.}}]={{.}}&{{end}}" is not valid
-    # $raw: "{{ range .Categories }}cat[{{.}}]=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    searchOpened: 1
-    # 0 title, 1 descr, 2 uploader
-    searchWhat: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
-    # 0 active, 1 active&dead, 2 dead, 3 dl multiplier, 4 ul multiplier, 5 dl&ul multiplier, 6 bad torrent, 7 unverified torrent, 8 my torrent
-    filterOptions: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    orderby: "{{ .Config.sort }}"
-    ordertype: "{{ .Config.type }}"
-    # does not return imdb link in results
-
-  rows:
-    selector: table.torrentList > tbody > tr:has(a[href^="download.php?id="]), table.torrentList > tbody > tr:has(td[onclick^="window.location='download.php?id="])
-    after: 1
-
-  fields:
-    category:
-      selector: a[href^="browse.php?searchOpened=1&cat["]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title:
-      selector: a[onclick^="getTorrentInfo("]
-      attribute: title
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    details:
-      selector: a[href^="torrentdetails.php?id="]
-      attribute: href
-    poster:
-      selector: a.poster
-      attribute: href
-    grabs:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    size:
-      selector: td:nth-child(8)
-    date:
-      selector: td:nth-child(9)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006.01.02. 15:04 -07:00"
-    downloadvolumefactor_optional:
-      optional: true
-      selector: b:has(img[src="templates/default/images/header/arrowdown.gif"])
-      filters:
-        - name: regexp
-          args: (\d+\.*\d*)
-    downloadvolumefactor:
-      text: "{{ if .Result.downloadvolumefactor_optional }}{{ .Result.downloadvolumefactor_optional }}{{ else }}1{{ end }}"
-    uploadvolumefactor_optional:
-      optional: true
-      selector: b:has(img[src="templates/default/images/header/arrowup.gif"])
-      filters:
-        - name: regexp
-          args: (\d+)
-    uploadvolumefactor:
-      text: "{{ if .Result.uploadvolumefactor_optional }}{{ .Result.uploadvolumefactor_optional }}{{ else }}1{{ end }}"
-    minimumratio:
-      text: 0.6
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# custom 3.0

src/Jackett.Common/Definitions/movietorrent.yml

@@ -47,6 +47,7 @@ caps:
     - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
     - {id: 10293, cat: Movies, desc: "2021"}
     - {id: 8569, cat: Movies, desc: "2021"}
+    - {id: 8610, cat: Movies, desc: "2022"}
 
   modes:
     search: [q]
@@ -64,16 +65,10 @@ download:
         - name: regexp
           args: ([A-F|a-f|0-9]{40})
     title:
-      selector: h2
+      selector: th[colspan="5"]
       filters:
         - name: replace
-          args: ["Full Movie ", ""]
-        - name: replace
-          args: ["Torrent Magnet ", ""]
-        - name: replace
-          args: ["Download", ""]
-        - name: replace
-          args: ["…", ""]
+          args: [" – movietorrent", ""]
         - name: trim
         - name: validfilename
 

src/Jackett.Common/Definitions/muziekfabriek.yml

@@ -40,27 +40,18 @@ caps:
     music-search: [q, artist]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: flaresolverr
+    label: Cookie
+  - name: info
     type: info
-    label: FlareSolverr
-    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
 
 login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: "/"
-  error:
-    - selector: td.embedded:contains("fout")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: /
     selector: :has(a[href="logout.php"])

src/Jackett.Common/Definitions/nbtorrents-api.yml

@@ -0,0 +1,148 @@
+---
+id: nbtorrents-api
+name: NBTorrents (API)
+description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.nbtorrents.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: PC/Games, desc: "Game"}
+    - {id: 5, cat: PC/0day, desc: "Application"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://www.nbtorrents.com/\" target =_blank>NBTorrents</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/nbtorrents.yml

@@ -1,150 +0,0 @@
----
-id: nbtorrents
-name: NBTorrents
-description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.nbtorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: TV/Anime, desc: "Anime & Cartoon"}
-    - {id: 26, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 1, cat: Movies/UHD, desc: "Movies UHD & BluRay"}
-    - {id: 3, cat: Movies/BluRay, desc: "Movies BDRips"}
-    - {id: 6, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 7, cat: Movies/DVD, desc: "Movies DVDRip"}
-    - {id: 8, cat: Movies, desc: "Movies Pre"}
-    - {id: 2, cat: Movies, desc: "Movies Remux"}
-    - {id: 4, cat: Movies/WEB-DL, desc: "Movies Web"}
-    - {id: 5, cat: Movies/WEB-DL, desc: "Movies WebRip"}
-    - {id: 15, cat: Audio/Lossless, desc: "Music CD & FLAC"}
-    - {id: 17, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 18, cat: Audio, desc: "Music Pack"}
-    - {id: 20, cat: Audio, desc: "Music Podcast"}
-    - {id: 19, cat: Audio/Video, desc: "Music Video"}
-    - {id: 16, cat: Audio, desc: "Music Web"}
-    - {id: 25, cat: TV/Sport, desc: "Sports"}
-    - {id: 10, cat: TV/UHD, desc: "TV UHD & BluRay"}
-    - {id: 11, cat: TV, desc: "TV BDRips"}
-    - {id: 14, cat: TV, desc: "TV packs"}
-    - {id: 12, cat: TV/WEB-DL, desc: "TV Web"}
-    - {id: 13, cat: TV/WEB-DL, desc: "TV WebRips"}
-
-  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: 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
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.colhead:contains("failed")
-      message:
-        selector: table tr td.text
-  test:
-    path: browse.php
-    selector: a[href*="logout.php?hash_insert="]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    searchin: title
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.mainouter tr table tr:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td a[href^="details.php?id="]
-    details:
-      selector: td a[href^="details.php?id="]
-      attribute: href
-    poster:
-      selector: td a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=\\\\'(.*?)\\\\' "
-    download:
-      selector: td a[href^="download.php?torrent="]
-      attribute: href
-    imdbid:
-      selector: td a[href*="imdb.com/title/tt"]
-      attribute: href
-    files:
-      selector: td:nth-of-type(5)
-    date:
-      selector: td:nth-of-type(7)
-      filters:
-        - name: append
-          args: " +05:30" # IST
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
-    size:
-      selector: td:nth-of-type(8)
-    grabs:
-      selector: td:nth-of-type(9)
-    seeders:
-      selector: td:nth-of-type(10)
-    leechers:
-      selector: td:nth-of-type(11)
-    downloadvolumefactor:
-      case:
-        "img[title=\"Free Torrent\"]": 0 # torrent specific free leech (icon)?
-        "a.info:contains(\"Free\")": 0 # global freeleech note?
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/newpct-me.yml

@@ -1,113 +0,0 @@
----
-id: newpct-me
-name: NewPCT.me
-description: "NewPCT.me is a SPANISH Public torrent site for MOVIES"
-language: es-ES
-type: public
-encoding: UTF-8
-links:
-  - https://www1.newpct.net/
-  - https://newpct.nocensor.world/
-legacylinks:
-  - https://www.newpct.me/
-  - https://newpct.nocensor.biz/
-  - https://newpct.nocensor.sbs/
-  - https://www.newpct.net/
-  - http://www1.newpct.net/
-
-caps:
-  categories:
-    peliculas: Movies
-    series: TV
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href$=".torrent"]
-      attribute: href
-    - selector: a[href^="magnet:?"]
-      attribute: href
-
-search:
-  # site returns just 30 results but we don't fetch more pages because site will return page1 if keywords not found, so we could end up with duplicates.
-  paths:
-    - path: /
-  inputs:
-    s: "{{ .Keywords }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1 $2"]
-
-  rows:
-    selector: ul.miniboxs-ficha li
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a.nombre
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 3]
-    _quality:
-      selector: span.estreno
-      filters:
-        - name: replace
-          args: ["---", ""]
-    _language:
-      selector: a.complets-left
-      filters:
-        - name: replace
-          args: ["Latino", "LATiN SPANiSH"]
-        - name: replace
-          args: ["Castellano", "SPANiSH"]
-        - name: replace
-          args: ["Ingles", "English"]
-        - name: replace
-          args: ["Subtitulado", " SPASUBS"]
-        - name: replace
-          args: ["Vose", ""]
-    title:
-      selector: a.nombre
-      attribute: title
-      filters:
-        - name: re_replace
-          args: ["(\\d{2})[×|x|X](\\d{2})", "S$1E$2"]
-        - name: re_replace
-          args: ["(\\d{1})[×|x|X](\\d{2})", "S0$1E$2"]
-        - name: append
-          args: " {{ .Result._quality }} {{ .Result._language }}"
-    details:
-      selector: a.nombre
-      attribute: href
-    download:
-      selector: a.nombre
-      attribute: href
-    poster:
-      selector: img.lazyload
-      attribute: data-src
-    size:
-      selector: a.complets-right
-      filters:
-        - name: replace
-          args: ["desc.", "0 B"]
-        - name: replace
-          args: ["s", ""]
-    date:
-      text: now
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# Google 1.39.0

src/Jackett.Common/Definitions/newretro.yml

@@ -67,6 +67,34 @@ settings:
   - name: pin
     type: text
     label: Pin
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at The New Retro
+    default: <li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
 
 login:
   path: login.php
@@ -89,12 +117,14 @@ search:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     showsearch: 1
-    orderby: added
-    sort: desc
+    # 0 active, 1 all, 2 dead
     incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid searching or display imdb links in results.
 
   rows:
-    selector: table.tableinborder > tbody > tr:has(a[href^="download.php?torrent="])
+    selector: "table.tableinborder > tbody > tr:has(a[href^=\"download.php?torrent=\"]){{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
     filters:
       - name: andmatch
 
@@ -134,9 +164,10 @@ search:
           args: "02.01.2006 15:04:05 -07:00"
     downloadvolumefactor:
       case:
-        "font[color=\"red\"]:contains(\"Only Upload\")": 0
+        img[src="pic/oupic.gif"]: 0 # only upload is counted
         "*": 1
     uploadvolumefactor:
-      text: 1
-# MR and MST tbd
+      case:
+        img[src="pic/freeleech.gif"]: 0 # nothing is counted
+        "*": 1
 # engine tbd

src/Jackett.Common/Definitions/p2pbg.yml

@@ -80,7 +80,7 @@ settings:
   - name: info_results
     type: info
     label: "Search results"
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+    default: "Only the <b>Base</b> style is supported with this indexer.<br />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

src/Jackett.Common/Definitions/piratbit.yml

@@ -654,9 +654,18 @@ settings:
       1: asc
 
 download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
+  infohash:
+    hash:
+      selector: a[href^="magnet:"]
       attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: "span[style=\"font-family: Georgia;\"]"
+      filters:
+        - name: trim
+        - name: validfilename
 
 search:
   paths:
@@ -694,7 +703,7 @@ search:
     submit: "Поиск"
 
   rows:
-    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"])):not(:has(span[title="неоформлено"]))
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/piratbitl.yml

@@ -674,13 +674,6 @@ login:
     path: index.php
     selector: li a[href="/login.php?logout=1"]
 
-download:
-  selectors:
-    - selector: a[class="btn btn-sm btn-success"][href^="/dl.php?id="]
-      attribute: href
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
 search:
   paths:
     - path: tracker.php
@@ -717,7 +710,7 @@ search:
     submit: "Поиск"
 
   rows:
-    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"])):not(:has(span[title="неоформлено"]))
     filters:
       - name: andmatch
 
@@ -768,7 +761,7 @@ search:
       selector: td a.genmed
       attribute: href
     download:
-      selector: td a.genmed
+      selector: td div a.dLink
       attribute: href
     description:
       selector: td:first-child span

src/Jackett.Common/Definitions/pixelados-html.yml

@@ -221,4 +221,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# html UNIT3D 6.2.1 custom
+# html UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/pixelados.yml

@@ -139,7 +139,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -149,6 +149,13 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -184,4 +191,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.2.1 custom
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/polishsource.yml

@@ -122,7 +122,7 @@ search:
         - name: re_replace
           args: ["(?i)(\\.multi\\.)", ".{{ .Config.multilanguage }}."]
         - name: re_replace
-          args: ["(?i)(\\.pl\\.)", ".{{ .Config.multilanguage }}."]
+          args: ["(?i)(\\.pl\\.)", ".POLISH."]
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:

src/Jackett.Common/Definitions/polishtracker-api.yml

@@ -0,0 +1,147 @@
+---
+id: polishtracker-api
+name: PolishTracker (API)
+description: "PolishTracker is a POLISH Private site for 0DAY / MOVIES / GENERAL"
+language: pl-PL
+type: private
+encoding: UTF-8
+links:
+  - https://pte.nu/
+legacylinks:
+  - https://polishtracker.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC/0day, desc: "0-Day"}
+    - {id: 2, cat: Audio/Video, desc: "Music Video"}
+    - {id: 3, cat: PC/0day, desc: "Apps"}
+    - {id: 4, cat: Console, desc: "Consoles"}
+    - {id: 5, cat: Books, desc: "E-book"}
+    - {id: 6, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 7, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 8, cat: Audio, desc: "Music"}
+    - {id: 9, cat: Movies/UHD, desc: "Movies UHD"}
+    - {id: 10, cat: PC/Games, desc: "PC Games"}
+    - {id: 11, cat: TV/HD, desc: "TV HD"}
+    - {id: 12, cat: TV/SD, desc: "TV SD"}
+    - {id: 13, cat: XXX, desc: "XXX"}
+    - {id: 14, cat: TV/UHD, desc: "TV-UHD"}
+    - {id: 15, cat: Audio/Audiobook, desc: "Audiobook"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find your API Key by accessing your <a href=\"https://pte.nu/\" target =_blank>PolishTracker</a> account <i>Settings</i> page and clicking on the <b>API</b> section."
+  - 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: POLISH
+    options:
+      POLISH: POLISH
+      MULTI.POLISH: MULTI.POLISH
+
+#login:
+#  path: "https://api-test.pte.nu/api/v1/torrents"
+#  method: get
+#  inputs:
+#    tpage: 1
+#  error:
+#    - selector: ":root:contains(\"ACCESS_DENIED\")"
+#      message:
+#        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # docs: https://cdn.pte.nu/docs/index.html
+    - path: "https://api-test.pte.nu/api/v1/torrents"
+      response:
+        type: json
+
+  inputs:
+    search: "{{ .Keywords }}"
+    tpage: 1
+    imdb_id: "{{ .Query.IMDBIDShort }}"
+    # search in nfo text also - broken
+    # nfo: false
+    # search is more broad - broken
+    # wide: false
+    $raw: "{{ range .Categories }}&cat[]={{.}}{{end}}"
+    # can search by genre but need range support. &tags[]=Action&tags[]=Comedy for Action and Comedy
+
+  headers:
+    API-Key: ["{{ .Config.apikey }}"]
+
+  rows:
+    selector: torrents
+    filters:
+      - name: andmatch
+    count:
+      selector: count
+
+  fields:
+    _id:
+      selector: id
+    category:
+      selector: category
+    _language:
+      selector: language
+    title_phase1:
+      selector: name
+    title_multilang:
+      selector: name
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\.multi\\.)", ".{{ .Config.multilanguage }}."]
+        - name: re_replace
+          args: ["(?i)(\\.pl\\.)", ".POLISH."]
+    title:
+      text: "{{ if eq .Result._language \"pl\" }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    details:
+      text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}"
+    download:
+      text: "https://api.pte.nu/torrents/download/{{ .Result._id }}"
+    imdbid:
+      selector: imdb_id
+    genre:
+      selector: tags
+      filters:
+        - name: validate
+          args: "Animation, Comedy, Family, Strategy, Action, Adventure, Indie, RPG, Simulation, Early, Crime, Thriller, Drama, Rock, Fantasy, Sci-Fi, Horror, Pop, War, Mystery, Oldies, Hardcore, Sport, Biography, Music, Rap, Romance, Dance, Hip-Hop, House, Punk Rock, Disco, Casual, Bass, History, Racing, Metal, Electronic, Alternative, Funk, Short, Classical, Acoustic, Soundtrack, Punk, Ambient, Talk-Show, Sports, Reggae, Documentary, Progressive Rock, Other, Western, Dance Hall, Trance, Folk, Classic Rock, Jazz, Hard Rock, Trip-Hop, R&B, Blues, Musical, Club, Techno, Cabaret, Black Metal, Easy Listening, Goa, Free, Massively, Reality-TV, Grunge, SynthPop, Ballad, Top 40, News, Industrial, Psychedelic Rock, Heavy Metal, Beat, Alternative Rock, Drum & Bass, Film-Noir, Rock & Roll, Death Metal, Lo-Fi, Country, Instrumental Pop, Game-Show, Soul, Retro, Noise, Latin, Design, Education, Software, Utilities, Pop-Folk, Instrumental, Game, Acid Jazz, Acid, Gothic Rock, Fusion, Darkwave, Meditative, Crossover, Thrash Metal, New Wave, Opera, Ethnic, Instrumental Rock, New Age, Gangsta, Speech, Gothic, Gospel, Symphonic Rock, Ska, JPop, Avantgarde, Tango, Vocal, Folk-Rock, Celtic"
+    description:
+      text: "{{ .Result.genre }}"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: completed
+    date:
+      # 2022-08-09T17:37:03.23587+02:00
+      selector: added
+    size:
+      selector: size
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json api

src/Jackett.Common/Definitions/pornotorrent.yml

@@ -5,6 +5,7 @@ description: "PornoTorrent is a SPANISH Public Torrent Tracker for 3X"
 language: en-US
 type: public
 encoding: UTF-8
+testlinktorrent: false
 links:
   - https://www.pornotorrent.eu/
 
@@ -19,8 +20,11 @@ settings: []
 
 download:
   selectors:
-    - selector: a[href^="magnet:?xt="]
+    - selector: a.button_link
       attribute: href
+      filters:
+        - name: replace
+          args: ["////", "//"]
 
 search:
   paths:

src/Jackett.Common/Definitions/portugas-api.yml

@@ -0,0 +1,169 @@
+---
+id: portugas-api
+name: Portugas (API)
+description: "Portugas is a Private Portoguese Tracker"
+language: pt-PT
+type: private
+encoding: UTF-8
+links:
+  - https://portugas.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Filmes"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {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: 9, cat: Books, desc: "E-Books"}
+    - {id: 10, cat: Movies, desc: "Animação Filmes"}
+    - {id: 11, cat: TV/Anime, desc: "Animação TV"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://portugas.org/\" target =_blank>Portugas</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - 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: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    _audiopt:
+      selector: audio_pt
+    title:
+      selector: name
+      filters:
+        - name: append
+          args: "{{ if eq .Result._audiopt \"1\" }} Portuguese PT-PT{{ else }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+        - name: re_replace
+          args: ["(?i)(Cinema TV)", "Cinema_TV"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/portugas.yml

@@ -1,193 +0,0 @@
----
-id: portugas
-name: Portugas
-description: "Portugas is a Private Portuguese Tracker"
-language: pt-PT
-type: private
-encoding: UTF-8
-links:
-  - https://portugas.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {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: 9, cat: Books, desc: "E-Books"}
-    - {id: 10, cat: Movies, desc: "Animação Filmes"}
-    - {id: 11, cat: TV/Anime, desc: "Animação TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    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: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    # genre has been disabled by admin
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.text-bright
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.text-bright
-      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)
-    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:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 4.0.0

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

@@ -1,71 +0,0 @@
----
-id: ps4-torrent
-name: PS4-Torrent
-description: "PS4-Torrent is a Public Russian site for PS4 Games"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - https://ps4-torrent.ru/
-legacylinks:
-  - http://ps4-torrent.ru/ # site forces https
-
-caps:
-  categories:
-    Console/PS4: Console/PS4
-
-  modes:
-    search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a.down-game
-      attribute: href
-
-search:
-  paths:
-    # http://ps4-torrent.ru/search/?q=%&t=0
-    - path: search/
-  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
-    t: 0
-
-  rows:
-    selector: table.eBlock
-
-  fields:
-    category:
-      text: Console/PS4
-    title:
-      selector: div.eTitle a
-    details:
-      selector: div.eTitle a
-      attribute: href
-    download:
-      selector: div.eTitle a
-      attribute: href
-    description:
-      selector: div.eDetails
-    date:
-      selector: div.eDetails
-      remove: a, span
-      filters:
-        - name: replace
-          args: ["- ", ""]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine uCoz

src/Jackett.Common/Definitions/pterclub.yml

@@ -124,7 +124,7 @@ search:
       selector: a[href^="details.php?id="]
     title_optional:
       optional: true
-      selector: a[title][href^="details.php?id="]
+      selector: a[title][href^="details.php?id="],a[title][href^="detailsgame.php?id="]
       attribute: title
     title:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
@@ -192,7 +192,7 @@ search:
         "*": 1
     description:
       selector: td:has(table.torrentname)
-      remove: a, img
+      remove: a, b, font, img
     minimumratio:
       text: 0.9
 # NexusPHP custom v2019.12

src/Jackett.Common/Definitions/ptsbao.yml

@@ -121,7 +121,7 @@ search:
           args: ["pic/imdb_pic/nophoto.gif", ""]
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(6) > span[title]
+      selector: td.rowfollow:nth-child(5) > span[title]
       attribute: title
       optional: true
       filters:
@@ -131,7 +131,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(6):not(:has(span))
+      selector: td.rowfollow:nth-child(5):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -141,13 +141,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(6)
     seeders:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(7)
     leechers:
-      selector: td:nth-child(9)
+      selector: td.rowfollow:nth-child(8)
     grabs:
-      selector: td:nth-child(10)
+      selector: td.rowfollow:nth-child(9)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -162,4 +162,4 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-# NexusPHP custom
+# NexusPHP custom 22082802

src/Jackett.Common/Definitions/pttime.yml

@@ -95,7 +95,7 @@ search:
     search_mode: 0
 
   rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/puurhollands.yml

@@ -23,13 +23,16 @@ caps:
     music-search: [q, artist]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
     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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: thankyou
     type: text
     label: Thank You Comment
@@ -39,9 +42,15 @@ settings:
     default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
   test:
     path: index.php
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/pwtorrents.yml

@@ -12,11 +12,16 @@ legacylinks:
 
 caps:
   categorymappings:
+    - {id: 26, cat: TV/Sport, desc: "AEW Dark"}
+    - {id: 21, cat: TV/Sport, desc: "AEW Dynamite"}
+    - {id: 20, cat: TV/Sport, desc: "AEW PPV"}
+    - {id: 23, cat: TV/Sport, desc: "AEW Rampage"}
     - {id: 1, cat: TV/Sport, desc: "Boxing"}
     - {id: 2, cat: TV/Sport, desc: "Documentaries"}
     - {id: 3, cat: TV/Sport, desc: "DVD"}
     - {id: 4, cat: TV/Sport, desc: "ECW"}
-    - {id: 5, cat: TV/Sport, desc: "Games and Software"}
+    - {id: 13, cat: TV/Sport, desc: "Impact PPV"}
+    - {id: 14, cat: TV/Sport, desc: "Impact Weekly"}
     - {id: 6, cat: TV/Sport, desc: "Indy's"}
     - {id: 7, cat: TV/Sport, desc: "Matches"}
     - {id: 8, cat: TV/Sport, desc: "Misc."}
@@ -24,14 +29,13 @@ caps:
     - {id: 11, cat: TV/Sport, desc: "Puro"}
     - {id: 10, cat: TV/Sport, desc: "PWT Packs"}
     - {id: 12, cat: TV/Sport, desc: "Ring Of Honor"}
-    - {id: 13, cat: TV/Sport, desc: "TNA PPV's"}
-    - {id: 14, cat: TV/Sport, desc: "TNA Weekly"}
     - {id: 15, cat: TV/Sport, desc: "WCW"}
     - {id: 18, cat: TV/Sport, desc: "WWE Network"}
-    - {id: 16, cat: TV/Sport, desc: "WWE PPV's"}
+    - {id: 16, cat: TV/Sport, desc: "WWE PPV"}
+    - {id: 24, cat: TV/Sport, desc: "WWE RAW"}
+    - {id: 25, cat: TV/Sport, desc: "WWE Smackdown"}
     - {id: 17, cat: TV/Sport, desc: "WWE Weekly"}
-    - {id: 19, cat: TV/Sport, desc: "AEW Weekly"}
-    - {id: 20, cat: TV/Sport, desc: "AEW PPV's"}
+    - {id: 27, cat: TV/Sport, desc: "WWE NXT"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/scenerush.yml

@@ -128,8 +128,15 @@ search:
       filters:
         - name: querystring
           args: cat
+    _audiopt:
+      selector: i.fg-audiopt
+      attribute: title
+      optional: true
     title:
       selector: a[href^="details.php?id="]
+      filters:
+        - name: append
+          args: "{{ if .Result._audiopt }} Portuguese PT-PT{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/selezen.yml

@@ -17,6 +17,8 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 0, cat: Movies, desc: "Movies"}
+    - {id: 40, cat: Movies/BluRay, desc: "Blu-Ray"}
+    - {id: 78, cat: Other, desc: "RePack от селезень"}
     - {id: 45, cat: Movies/HD, desc: "WEBRip 720p"}
     - {id: 46, cat: Movies/HD, desc: "WEBRip 1080p"}
     - {id: 47, cat: Movies/UHD, desc: "WEBRip 2160p"}
@@ -38,6 +40,14 @@ caps:
     - {id: 63, cat: Movies/UHD, desc: "Blu-Ray 2160p"}
     - {id: 64, cat: Movies/3D, desc: "3D BDRemux 1080p"}
     - {id: 65, cat: Movies/3D, desc: "3D Blu-Ray 1080p"}
+    - {id: 74, cat: Movies/HD, desc: "WEBRip"}
+    - {id: 75, cat: Movies/HD, desc: "BDRip"}
+    - {id: 76, cat: Movies/HD, desc: "WEB-DLRip"}
+    - {id: 77, cat: Movies/HD, desc: "HDRip"}
+    - {id: 69, cat: Movies, desc: "WEB-DLRip-AVC"}
+    - {id: 70, cat: Movies, desc: "HDRip-AVC"}
+    - {id: 71, cat: Movies, desc: "BDRip-AVC"}
+    - {id: 72, cat: Movies/HD, desc: "WEB-DLRip 720p"}
 
   modes:
     search: [q]
@@ -94,7 +104,7 @@ download:
       attribute: href
 
 search:
-  # do=search&subaction=search&story=greyhound&titleonly=0&sortby=date&resorder=desc&showposts=0&catlist[]=45&catlist[]=46&catlist[]=47
+  # do=search&subaction=search&story=greyhound&titleonly=3&sortby=date&resorder=desc&showposts=1&catlist[]=49
   paths:
     - path: index.php
   inputs:
@@ -109,38 +119,47 @@ search:
     resorder: "{{ .Config.type }}"
 
   rows:
-    selector: div.card-default:has(i.fa-file-video-o)
+    selector: div.card:has(h4)
 
   fields:
     category:
-      text: 0
-    category|noappend:
-      selector: div.noimg > a
-      optional: true
+      selector: h4
       case:
-        a[href$="/webrip720p/"]: 45
-        a[href$="/webrip1080p/"]: 46
-        a[href$="/webrip2160p/"]: 47
-        a[href$="/web-dl720p/"]: 48
-        a[href$="/web-dl1080p/"]: 49
-        a[href$="/sdrweb-dl2160p/"]: 50
-        a[href$="/hdrweb-dl2160p/"]: 51
-        a[href$="/bdrip720p/"]: 52
-        a[href$="/bdrip1080p/"]: 53
-        a[href$="/sdrbdrip2160p/"]: 54
-        a[href$="/hdrbdrip2160p/"]: 55
-        a[href$="/uhdbdrip-720p/"]: 56
-        a[href$="/uhdbdrip1080p/"]: 57
-        a[href$="/bdremux1080p/"]: 58
-        a[href$="/sdrbdremux2160p/"]: 59
-        a[href$="/hdrbdremux2160p/"]: 60
-        a[href$="/dvbdremux2160p/"]: 61
-        a[href$="/blu-ray1080p/"]: 62
-        a[href$="/blu-ray2160p/"]: 63
-        a[href$="/3dbdremux1080p/"]: 64
-        a[href$="/3dblu-ray1080p/"]: 65
+        "h4:contains(\"WEBRip 720p\")": 45
+        "h4:contains(\"WEBRip 1080p\")": 46
+        "h4:contains(\"WEBRip 2160p\")": 47
+        "h4:contains(\"SDR WEB-DL 2160p\")": 50
+        "h4:contains(\"HDR WEB-DL 2160p\")": 51
+        "h4:contains(\"WEB-DL 720p\")": 48
+        "h4:contains(\"WEB-DL 1080p\")": 49
+        "h4:contains(\"SDR BDRip 2160p\")": 54
+        "h4:contains(\"HDR BDRip 2160p\")": 55
+        "h4:contains(\"UHD BDRip 720p\")": 56
+        "h4:contains(\"UHD BDRip 1080p\")": 57
+        "h4:contains(\"SDR BDRemux 2160p\")": 59
+        "h4:contains(\"HDR BDRemux 2160p\")": 60
+        "h4:contains(\"DV BDRemux 2160p\")": 61
+        "h4:contains(\"3D BDRemux 1080p\")": 64
+        "h4:contains(\"3D Blu-Ray 1080p\")": 65
+        "h4:contains(\"BDRemux 1080p\")": 58
+        "h4:contains(\"Blu-Ray 1080p\")": 62
+        "h4:contains(\"Blu-Ray 2160p\")": 63
+        "h4:contains(\"BDRip 720p\")": 52
+        "h4:contains(\"BDRip 1080p\")": 53
+        "h4:contains(\"WEB-DLRip-AVC\")": 69
+        "h4:contains(\"HDRip-AVC\")": 70
+        "h4:contains(\"BDRip-AVC\")": 71
+        "h4:contains(\"WEB-DLRip 720p\")": 72
+        "h4:contains(\"WEBRip\")": 74
+        "h4:contains(\"WEB-DLRip\")": 76
+        "h4:contains(\"WEB-DL\")": 74
+        "h4:contains(\"BDRip\")": 75
+        "h4:contains(\"HDRip\")": 77
+        "h4:contains(\"Blu-Ray\")": 40
+        "h4:contains(\"RePack\")": 78
+        "*": 0
     title:
-      selector: div.short-title > a
+      selector: h4
       filters:
         - name: replace
           args: ["Лицензия", "Lic"]
@@ -158,48 +177,47 @@ search:
           args: ["WEB DL", "WEBDL"]
         - name: replace
           args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
     details:
-      selector: div.short-title > a
+      selector: a:has(h4)
       attribute: href
     download:
-      selector: div.short-title > a
+      selector: a:has(h4)
       attribute: href
     poster:
-      selector: img.poster
+      selector: img.card-img
       attribute: src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
     genre:
-      selector: li.linka2
+      selector: div.cats
       filters:
         - name: validate
           args: "Аниме, Биографический, Боевик, Вестерн, Военный, Детектив, Документальный, Драма, Исторический, Комедия, Короткометражный, Криминал, Мелодрама, Мистика, Музыкальный, Мультфильм, Приключения, Семейный, Спорт, Триллер, Ужасы, Фантастика, Фэнтези"
     description:
-      selector: span.noimg
+      selector: p.card-text
       filters:
         - name: append
           args: "{{ if .Result.genre }}</br>{{ .Result.genre }}{{ else }}{{ end }}"
     date:
-      selector: a:has(span.glyphicon-time)
-      filters:
-        # 30.10.2019 14:49
-        - name: regexp
-          args: "(\\d{1,2}\\.\\d{2}\\.\\d{4} \\d{1,2}\\:\\d{2})"
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2.01.2006 15:04 -07:00"
+      text: now
     seeders:
-      selector: i.fa-arrow-up ~ span
+      selector: a:has(i.bx-chevrons-up)
+      filters:
+        - name: split
+          args: [" ", 0]
     leechers:
-      selector: i.fa-arrow-down ~ span
+      selector: a:has(i.bx-chevrons-up)
+      filters:
+        - name: split
+          args: [" ", 1]
     grabs:
-      selector: i.fa-download ~ span
+      selector: a:has(i.bx-chevrons-up)
+      filters:
+        - name: split
+          args: [" ", -1]
     size:
-      selector: i.fa-file-video-o ~ b
+      selector: a:has(span.bx-download)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/shanaproject.yml

@@ -71,34 +71,64 @@ search:
       selector: a[href^="/download/"]
       attribute: href
     date_full:
-      # May 8, 2022, 6:25 a.m.
+      # Dec. 8, 2022, 6:25 a.m.
       selector: div.release_20:contains(".m."):contains(":")
       optional: true
       filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["Sept", "Sep"]
+        - name: replace
+          args: ["July", "Jul"]
+        - name: replace
+          args: ["June", "Jun"]
         - name: re_replace
-          args: ["\\.", ""]
+          args: ["April", "Apr"]
+        - name: re_replace
+          args: ["March", "Mar"]
         - name: dateparse
-          args: "January 2, 2006, 3:04 PM"
+          args: "Jan 2, 2006, 3:04 PM"
     date_abbr:
       # May 8, 2022, 6 a.m.
       selector: div.release_20:contains(".m."):not(:contains(":"))
       optional: true
       filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["Sept", "Sep"]
+        - name: replace
+          args: ["July", "Jul"]
+        - name: replace
+          args: ["June", "Jun"]
         - name: re_replace
-          args: ["\\.", ""]
+          args: ["April", "Apr"]
+        - name: re_replace
+          args: ["March", "Mar"]
         - name: dateparse
-          args: "January 2, 2006, 3 PM"
+          args: "Jan 2, 2006, 3 PM"
     date_noon:
-      # April 30, 2022, noon
+      # Sept. 30, 2022, noon
       selector: div.release_20:contains(", noon")
       optional: true
       filters:
         - name: replace
-          args: ["Aug.", "August"]
+          args: [".", ""]
+        - name: replace
+          args: ["Sept", "Sep"]
+        - name: replace
+          args: ["July", "Jul"]
+        - name: replace
+          args: ["June", "Jun"]
+        - name: re_replace
+          args: ["April", "Apr"]
+        - name: re_replace
+          args: ["March", "Mar"]
         - name: re_replace
           args: [" noon", " 12 pm"]
         - name: dateparse
-          args: "January 2, 2006, 3 PM"
+          args: "Jan 2, 2006, 3 PM"
     date:
       text: "{{ if or .Result.date_full .Result.date_abbr .Result.date_noon }}{{ or .Result.date_full .Result.date_abbr .Result.date_noon }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/shareisland-api.yml

@@ -89,6 +89,8 @@ search:
   keywordsfilters:
     - name: diacritics
       args: replace
+    - name: re_replace
+      args: ["\\.", " "]
     - name: re_replace # S01 to 1
       args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
     - name: re_replace # S01E01 to 1 1
@@ -136,7 +138,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -146,6 +148,15 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(televisione film)", "televisione_film"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -181,4 +192,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.2.1
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/skipthecommercials-api.yml

@@ -96,7 +96,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -106,6 +106,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -138,4 +149,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.2.1
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/skipthetrailers.yml

@@ -16,8 +16,6 @@ caps:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
 
 settings:
   - name: apikey
@@ -98,7 +96,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -108,6 +106,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -142,4 +151,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.0.8
+# json UNIT3D 6.4.0

src/Jackett.Common/Definitions/sosulki.yml

@@ -6,8 +6,9 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - http://sosulki.net/ # site does not support https NET::ERR_CERT_COMMON_NAME_INVALID
-
+  - http://sosulki.com/
+legacylinks:
+  - http://sosulki.net/
 caps:
   categorymappings:
     - {id: 12, cat: XXX, desc: "Порно категории"}

src/Jackett.Common/Definitions/speedtorrentreloaded.yml

@@ -1,7 +1,7 @@
 ---
 id: speedtorrentreloaded
 name: SpeedTorrent Reloaded
-description: "SpeedTorrent Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+description: "SpeedTorrent Reloaded (ST-Tracker) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
 language: de-DE
 type: private
 encoding: UTF-8
@@ -13,43 +13,53 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 89, cat: Movies/UHD, desc: "Movies-4K"}
     - {id: 47, cat: Movies/BluRay, desc: "Movies-Bluray"}
-    - {id: 62, cat: Movies/SD, desc: "Movies-SD"}
     - {id: 48, cat: Movies/HD, desc: "Movies-720p"}
     - {id: 49, cat: Movies/HD, desc: "Movies-1080p"}
     - {id: 11, cat: Movies/DVD, desc: "Movies DVD / HD2DVD"}
-    - {id: 90, cat: Movies/3D, desc: "Movies-3-D"}
     - {id: 60, cat: Movies/HD, desc: "Movies-HDTV"}
+    - {id: 62, cat: Movies/SD, desc: "Movies-SD"}
+    - {id: 89, cat: Movies/UHD, desc: "Movies-4K"}
+    - {id: 90, cat: Movies/3D, desc: "Movies-3-D"}
     - {id: 91, cat: Movies, desc: "Movies-Packs"}
-    - {id: 77, cat: TV/SD, desc: "Serien-SD"}
-    - {id: 78, cat: TV/HD, desc: "Serien-720p"}
-    - {id: 79, cat: TV/HD, desc: "Serien-1080p"}
-    - {id: 16, cat: TV, desc: "Serien-Packs"}
-    - {id: 100, cat: TV/HD, desc: "Staffel-HD"}
-    - {id: 99, cat: TV/SD, desc: "Staffel-SD"}
-    - {id: 95, cat: TV/UHD, desc: "Serien-4K"}
-    - {id: 64, cat: TV/Documentary, desc: "Serien-Doku"}
-    - {id: 4, cat: PC/Games, desc: "PC-Games"}
-    - {id: 84, cat: Console/PS3, desc: "PS3/PS4"}
-    - {id: 84, cat: Console/PS4, desc: "PS3/PS4"}
-    - {id: 85, cat: Console/XBox 360, desc: "Xbox-360"}
-    - {id: 28, cat: PC/0day, desc: "Windows-Programme"}
-    - {id: 18, cat: PC/0day, desc: "Appz-Sonstige"}
+    - {id: 108, cat: Movies, desc: "Movies Remux"}
     - {id: 14, cat: Audio/Other, desc: "Alben / Sampler / Singles"}
-    - {id: 98, cat: Audio, desc: "Discografie"}
-    - {id: 93, cat: Audio/Video, desc: "Musik-Videos"}
     - {id: 36, cat: Audio/Audiobook, desc: "Hörbuch"}
     - {id: 71, cat: Audio/Other, desc: "Soundtracks"}
     - {id: 70, cat: Audio/Lossless, desc: "Flac"}
     - {id: 72, cat: Audio, desc: "Musik-Packs"}
-    - {id: 19, cat: Books/EBook, desc: "EBooks"}
-    - {id: 87, cat: TV/Anime, desc: "Anime"}
-    - {id: 96, cat: Other, desc: "Sonstiges"}
+    - {id: 93, cat: Audio/Video, desc: "Musik-Videos"}
+    - {id: 98, cat: Audio, desc: "Discografie"}
+    - {id: 18, cat: PC/0day, desc: "Appz-Sonstige"}
+    - {id: 28, cat: PC/0day, desc: "Windows-Programme"}
+    - {id: 105, cat: PC, desc: "Linux-Programme"}
+    - {id: 107, cat: PC, desc: "WebScripts"}
     - {id: 23, cat: TV/Sport, desc: "Wrestling"}
     - {id: 74, cat: TV/Sport, desc: "Fussball"}
     - {id: 75, cat: TV/Sport, desc: "Formel 1"}
+    - {id: 16, cat: TV, desc: "Serien-Packs"}
+    - {id: 77, cat: TV/SD, desc: "Serien-SD"}
+    - {id: 78, cat: TV/HD, desc: "Serien-720p"}
+    - {id: 79, cat: TV/HD, desc: "Serien-1080p"}
+    - {id: 95, cat: TV/UHD, desc: "Serien-4K"}
+    - {id: 99, cat: TV/SD, desc: "Staffel-SD"}
+    - {id: 100, cat: TV/HD, desc: "Staffel-HD"}
+    - {id: 109, cat: TV/UHD, desc: "Staffel-UHD"}
+    - {id: 4, cat: PC/Games, desc: "PC-Games"}
+    - {id: 84, cat: Console/PS3, desc: "PS3/PS4"}
+    - {id: 84, cat: Console/PS4, desc: "PS3/PS4"}
+    - {id: 85, cat: Console/XBox 360, desc: "Xbox-360"}
+    - {id: 101, cat: PC/Games, desc: "Mac-Games"}
+    - {id: 104, cat: Console/NDS, desc: "Nintendo"}
+    - {id: 106, cat: PC/Games, desc: "Linux-Games"}
     - {id: 88, cat: XXX, desc: "XXX"}
+    - {id: 19, cat: Books/EBook, desc: "EBooks"}
+    - {id: 87, cat: TV/Anime, desc: "Anime"}
+    - {id: 96, cat: Other, desc: "Sonstiges"}
+    - {id: 102, cat: Books/Mags, desc: "Zeitung/Zeitschrift"}
+    - {id: 113, cat: XXX/Other, desc: "Hentai"}
+    - {id: 111, cat: TV/Documentary, desc: "Doku-HD"}
+    - {id: 112, cat: TV/Documentary, desc: "Doku-SD"}
 
   modes:
     search: [q]
@@ -106,6 +116,7 @@ search:
     search: "{{ .Keywords }}"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
+    # 0 active, 1 all, 2 dead
     incldead: 1
 
   rows:
@@ -163,4 +174,6 @@ search:
     minimumratio:
       text: 0.7
     minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
+# D€ Source 2017 Version 1.0

src/Jackett.Common/Definitions/spidertk.yml

@@ -165,14 +165,8 @@ search:
       filters:
         - name: querystring
           args: cat
-    title_default:
-      selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
-      selector: a[title][href^="details.php?id="]
-      attribute: title
     title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      selector: a[href^="details.php?id="]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -181,7 +175,7 @@ search:
       attribute: href
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(4) > span[title]
       attribute: title
       optional: true
       filters:
@@ -191,7 +185,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(4):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -201,13 +195,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(5)
     seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(6)
     leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(7)
     grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(8)
     downloadvolumefactor:
       case:
         img[src="pic/freeleech.png"]: 0
@@ -224,4 +218,4 @@ search:
         "*": 1
     minimumratio:
       text: 0.81
-# NexusPHP Custom 1.7.7 2022-04-30
+# NexusPHP Custom 1.7.24 2022-09-11

src/Jackett.Common/Definitions/sporthd.yml

@@ -12,6 +12,7 @@ legacylinks:
 
 caps:
   categorymappings:
+    - {id: 97, cat: TV/Sport, desc: "J.League"}
     - {id: 83, cat: TV/Sport, desc: "AFC Champions League"}
     - {id: 50, cat: TV/Sport, desc: "Australian Open"}
     - {id: 32, cat: TV/Sport, desc: "Basketball"}
@@ -39,8 +40,10 @@ caps:
     - {id: 40, cat: TV/Sport, desc: "Coppa Italia"}
     - {id: 51, cat: TV/Sport, desc: "Coupe de France"}
     - {id: 79, cat: TV/Sport, desc: "cyclisme"}
+    - {id: 94, cat: TV/Sport, desc: "Danish Superliga"}
     - {id: 39, cat: TV/Sport, desc: "DFB Pokal"}
     - {id: 72, cat: TV/Sport, desc: "EFL"}
+    - {id: 96, cat: TV/Sport, desc: "Ekstraklasa"}
     - {id: 49, cat: TV/Sport, desc: "English League Cup"}
     - {id: 8, cat: TV/Sport, desc: "EPL"}
     - {id: 13, cat: TV/Sport, desc: "Eredivisie"}
@@ -50,6 +53,7 @@ caps:
     - {id: 53, cat: TV/Sport, desc: "Euroleague ULEB"}
     - {id: 86, cat: TV/Sport, desc: "Europe Cup FIBA"}
     - {id: 38, cat: TV/Sport, desc: "FA Cup"}
+    - {id: 103, cat: TV/Sport, desc: "FIBA Euro Basket"}
     - {id: 59, cat: TV/Sport, desc: "FIFA U-20 World Cup"}
     - {id: 69, cat: TV/Sport, desc: "FIFA World Clup Cup"}
     - {id: 19, cat: TV/Sport, desc: "Football League Championship"}
@@ -57,30 +61,38 @@ caps:
     - {id: 81, cat: TV/Sport, desc: "France Ligue 2"}
     - {id: 7, cat: TV/Sport, desc: "Friendly matches"}
     - {id: 91, cat: TV/Sport, desc: "Greece Basket"}
+    - {id: 100, cat: TV/Sport, desc: "Greece Super League"}
     - {id: 30, cat: TV/Sport, desc: "Handball"}
     - {id: 31, cat: TV/Sport, desc: "IIHF"}
     - {id: 15, cat: TV/Sport, desc: "IndyCar"}
+    - {id: 95, cat: TV/Sport, desc: "J Liga Japan"}
     - {id: 20, cat: TV/Sport, desc: "KHL"}
     - {id: 10, cat: TV/Sport, desc: "La Liga"}
+    - {id: 12, cat: TV/Sport, desc: "League 1"}
     - {id: 89, cat: TV/Sport, desc: "liga Endesa"}
+    - {id: 98, cat: TV/Sport, desc: "Liga MX"}
     - {id: 84, cat: TV/Sport, desc: "Liga Sudamericana"}
-    - {id: 12, cat: TV/Sport, desc: "Ligue 1"}
     - {id: 21, cat: TV/Sport, desc: "Major League Soccer"}
     - {id: 67, cat: TV/Sport, desc: "MLB"}
     - {id: 63, cat: TV/Sport, desc: "MMA"}
     - {id: 58, cat: TV/Sport, desc: "MotoGP"}
+    - {id: 92, cat: TV/Sport, desc: "Motorsport"}
     - {id: 16, cat: TV/Sport, desc: "NBA"}
     - {id: 57, cat: TV/Sport, desc: "NBA Playoffs"}
     - {id: 14, cat: TV/Sport, desc: "NCAA"}
     - {id: 34, cat: TV/Sport, desc: "NFL"}
     - {id: 17, cat: TV/Sport, desc: "NHL"}
+    - {id: 99, cat: TV/Sport, desc: "NordicBet 1st division Danish"}
     - {id: 36, cat: TV/Sport, desc: "Old classic games"}
     - {id: 68, cat: TV/Sport, desc: "Olympic Games 2016"}
+    - {id: 106, cat: TV/Sport, desc: "Olympic games in tokyo 2021"}
     - {id: 28, cat: TV/Sport, desc: "Other domestic leagues"}
     - {id: 55, cat: TV/Sport, desc: "Paulista A1"}
     - {id: 26, cat: TV/Sport, desc: "Portuguese League"}
+    - {id: 104, cat: TV/Sport, desc: "Qatar Stars League"}
     - {id: 65, cat: TV/Sport, desc: "ROH"}
     - {id: 61, cat: TV/Sport, desc: "Rollan Garros"}
+    - {id: 105, cat: TV/Sport, desc: "RPFL"}
     - {id: 29, cat: TV/Sport, desc: "Rugby"}
     - {id: 82, cat: TV/Sport, desc: "Scotland Premiership"}
     - {id: 9, cat: TV/Sport, desc: "Serie A"}
@@ -93,11 +105,15 @@ caps:
     - {id: 24, cat: TV/Sport, desc: "Tennis"}
     - {id: 64, cat: TV/Sport, desc: "TNA"}
     - {id: 56, cat: TV/Sport, desc: "Torneo Premiera A"}
+    - {id: 102, cat: TV/Sport, desc: "Turkish Basketball Super Leagu"}
     - {id: 75, cat: TV/Sport, desc: "Turkish Super Lig"}
     - {id: 3, cat: TV/Sport, desc: "UCL"}
+    - {id: 107, cat: TV/Sport, desc: "UEFA Conference League"}
     - {id: 4, cat: TV/Sport, desc: "UEL"}
     - {id: 60, cat: TV/Sport, desc: "UFC"}
+    - {id: 93, cat: TV/Sport, desc: "UFS"}
     - {id: 35, cat: TV/Sport, desc: "Volleyball"}
+    - {id: 101, cat: TV/Sport, desc: "VTB United League"}
     - {id: 5, cat: TV/Sport, desc: "WC Qualification"}
     - {id: 1, cat: TV/Sport, desc: "World Cup"}
     - {id: 27, cat: TV/Sport, desc: "World Cup 2014"}
@@ -115,7 +131,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -156,7 +175,7 @@ search:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
     search: "{{ .Keywords }}"
     # 1 active, 2 dead, 3 free
-    incldead: 1
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
     # 0 match again, 1 match like
     s: 0
     # 0 name, 1 description
@@ -174,8 +193,15 @@ search:
       filters:
         - name: querystring
           args: cat
+    _vip:
+      selector: img[src="/pic/vipbig.gif"]
+      attribute: alt
+      optional: true
     title:
       selector: a[href^="details.php?id="]
+      filters:
+        - name: append
+          args: "{{ if .Result._vip }} VIP ONLY{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -212,5 +238,4 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-# minimumratio: tbd
 # engine n/a

src/Jackett.Common/Definitions/tekno3d.yml

@@ -10,22 +10,13 @@ links:
 
 caps:
   categorymappings:
-    - {id: 9, cat: TV/Anime, desc: "Anime"}
-    - {id: 1, cat: PC/0day, desc: "Apps"}
     - {id: 29, cat: Audio, desc: "Audio Tracks"}
     - {id: 26, cat: Movies/UHD, desc: "BETA UHD HDR-X"}
     - {id: 32, cat: Movies, desc: "Dolby Vision"}
-    - {id: 5, cat: TV, desc: "Episodes"}
     - {id: 28, cat: Movies, desc: "INTERNAL HDR-X"}
-    - {id: 3, cat: Movies, desc: "Movies"}
-    - {id: 17, cat: Movies/HD, desc: "Movies/1080p BACKUP"}
-    - {id: 18, cat: Movies/HD, desc: "Movies/1080p HDR"}
-    - {id: 11, cat: Movies/HD, desc: "Movies/HDTV"}
-    - {id: 16, cat: Movies/UHD, desc: "Movies/UltraHD 4K HDR"}
-    - {id: 19, cat: Movies/UHD, desc: "Movies/UltraHD 4K SDR"}
-    - {id: 21, cat: TV/HD, desc: "TV Series/1080p SDR"}
-    - {id: 22, cat: TV/UHD, desc: "TV Series/Ultra HD 4K HDR"}
-    - {id: 20, cat: TV/UHD, desc: "TV Series/Ultra HD 4K SDR"}
+    - {id: 37, cat: Movies, desc: "Member Grades"}
+    - {id: 37, cat: TV, desc: "Member Grades"}
+    - {id: 37, cat: Audio/Video, desc: "Member Grades"}
     - {id: 31, cat: Other, desc: "YouTube HDR"}
     - {id: 30, cat: Other, desc: "[SAMPLES] INTERNAL HDR-X"}
 
@@ -33,6 +24,7 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+    music-search: [q]
 
 settings:
   - name: username
@@ -45,6 +37,22 @@ settings:
     type: checkbox
     label: Show only Free torrents
     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
     type: info
     label: Results Per Page
@@ -73,10 +81,13 @@ search:
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
-    # title descr genre all
+    # title, descr, genre, all
     searchin: title
+    # 0 active, 1 incldead, 2 onlydead
     incldead: 1
     only_free: "{{ if .Config.onlyfree }}1{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
   keywordsfilters:
     - name: re_replace
       args: ["(\\w+)", " +$1"] # prepend + to each word
@@ -100,18 +111,20 @@ search:
           args: [">", "1"]
         - name: replace
           args: ["</b", ""]
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=\\\'(.+?)\\\'
     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=\\\'(.+?)\\\'
+    genre:
+      selector: a[href$="searchin=genre"]
     files:
       selector: td:nth-of-type(5)
     date_day:
@@ -140,10 +153,12 @@ search:
       filters:
         - name: replace
           args: ["\n", "<br>\n"]
+        - name: prepend
+          args: "{{ if .Result.genre }}{{ .Result.genre }}</br>{{ else }}{{ end }}"
     downloadvolumefactor:
       case:
         a.info:contains("FREE"): 0
         "*": 1
     uploadvolumefactor:
       text: 1
-# engine tbd
+# engine n/a

src/Jackett.Common/Definitions/tjupt.yml

@@ -114,6 +114,9 @@ search:
       attribute: title
     title:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: ["^\\[([^\\]]+)\\]\\[([^\\]]+)\\]\\[([^\\]]+)\\](.*)$", "$3 [$1][$2]$4"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/torlock.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torlock2.com/
   - https://www.torlock.com/
-  - https://torlock.unblockit.bet/
+  - https://torlock.unblockit.cat/
   - https://torlock.nocensor.world/
 legacylinks:
   - https://torlock.com/
@@ -32,6 +32,7 @@ legacylinks:
   - https://torlock.unblockit.name/
   - https://torlock.nocensor.sbs/
   - https://torlock.unblockit.ist/
+  - https://torlock.unblockit.bet/
 
 caps:
   # dont forget to update the search fields category case block

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

@@ -0,0 +1,189 @@
+---
+id: torrent-town
+name: Torrent-Town
+description: "Torrent-Town (T-T) is a German Private site for TV / MOVIES / GENERAL"
+language: de-DE
+type: private
+encoding: UTF-8
+links:
+  - https://torrent-town.hopto.org/
+
+caps:
+  categorymappings:
+    # Movie
+    - {id: 28, cat: Movies/SD, desc: "Movie SD"}
+    - {id: 166, cat: Movies/HD, desc: "Movie HD"}
+    - {id: 170, cat: Movies/UHD, desc: "Movie U-HD"}
+    - {id: 172, cat: Movies/BluRay, desc: "Movie Bluray"}
+    - {id: 183, cat: Movies, desc: "Movie Remux"}
+    - {id: 175, cat: Movies, desc: "Movie Kids"}
+    - {id: 155, cat: Movies/DVD, desc: "Movie DVD"}
+    - {id: 171, cat: Movies/3D, desc: "Movie Pack 3-D"}
+    - {id: 130, cat: Movies/HD, desc: "Movie Packs"}
+    - {id: 186, cat: Movies/Foreign, desc: "Movie Englisch"}
+    # Serien
+    - {id: 158, cat: TV/SD, desc: "Serien SD-Folgen"}
+    - {id: 167, cat: TV/HD, desc: "Serien HD-Folgen"}
+    - {id: 60, cat: TV/SD, desc: "Serien Packs-SD"}
+    - {id: 177, cat: TV/HD, desc: "Serien Packs-HD"}
+    - {id: 185, cat: TV, desc: "Serien TV-Shows"}
+    - {id: 157, cat: TV/UHD, desc: "Serien U-HD"}
+    - {id: 187, cat: TV/Foreign, desc: "Serien Englisch"}
+    # Musik
+    - {id: 159, cat: Audio/Audiobook, desc: "Musik Hörbuch"}
+    - {id: 174, cat: Audio, desc: "Musik Soundtracks"}
+    - {id: 48, cat: Audio/MP3, desc: "Musik mp3"}
+    - {id: 53, cat: Audio/Lossless, desc: "Musik Flac"}
+    - {id: 52, cat: Audio, desc: "Musik Pack"}
+    - {id: 109, cat: Audio/Video, desc: "Musik Musik Videos"}
+    # Software
+    - {id: 12, cat: PC/0day, desc: "Appz Windows"}
+    - {id: 179, cat: PC/Mac, desc: "Appz Mac"}
+    - {id: 178, cat: PC, desc: "Appz Linux"}
+    - {id: 184, cat: PC/Mobile-Other, desc: "Appz Handy"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "Appz Sonstiges"}
+    # Sport
+    - {id: 62, cat: TV/Sport, desc: "Sport Fussball"}
+    - {id: 161, cat: TV/Sport, desc: "Sport Formel 1"}
+    - {id: 174, cat: TV/Sport, desc: "Sport Wrestling"}
+    # Game
+    - {id: 17, cat: PC/Games, desc: "Game Windows"}
+    - {id: 131, cat: Console, desc: "Game Konsole"}
+    - {id: 24, cat: Console, desc: "Game Wimmelbild"}
+    # Ebooks
+    - {id: 163, cat: Books/Other, desc: "Paper Zeitungen"}
+    - {id: 63, cat: Books/Comics, desc: "Paper Comic"}
+    - {id: 96, cat: Books/EBook, desc: "Paper E-Book"}
+    # Doku
+    - {id: 181, cat: TV/Documentary, desc: "Doku SD"}
+    - {id: 182, cat: TV/Documentary, desc: "Doku HD"}
+    # XXX
+    - {id: 176, cat: XXX/x264, desc: "XXX HD"}
+    - {id: 76, cat: XXX/SD, desc: "XXX SD"}
+    - {id: 76, cat: XXX/DVD, desc: "XXX DVD"}
+    - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+
+  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
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="/login.php"]
+  cookies: ["JAVA=OK"] # avoid jscheck redirect
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
+  error:
+    - selector: div#login_error
+  test:
+    path: selection.php
+
+search:
+  paths:
+    - path: selection.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 both
+    blah: 0
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+
+  rows:
+    selector: div.selection_wrap
+
+  fields:
+    category_p1:
+      selector: div.kat_cat_pic_name
+    category_p2:
+      selector: div.kat_cat_pic_name_b
+    categorydesc:
+      text: "{{ .Result.category_p1 }} {{ .Result.category_p2 }}"
+    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="]
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
+    size:
+      selector: div.selection_unter_ag
+    date_day:
+      # 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_year:
+      # 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"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.selection_unter_aa
+    leechers:
+      selector: div.selection_unter_aaa
+    downloadvolumefactor:
+      case:
+        ":root:has(div.onlyup)": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# 3xT

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -6,17 +6,11 @@ language: fr-FR
 type: public
 encoding: UTF-8
 followredirect: true
-# to fetch current domain use https://www.protege-liens.com/torrent9
+# to fetch current domain use https://www.protege-torrent.com/Torrent9
 links:
-  - https://ww1.torrent9.re/
+  - https://ww2.torrent9.re/
   - https://torrent9.nocensor.world/
 legacylinks:
-  - https://www.t9.vc/
-  - https://www.torrent9.ai/
-  - https://www.torrent9.pl/
-  - https://www.torrent9.ac/
-  - https://www.torrent9.so/
-  - https://wvw.torrent9.sh/
   - https://www.torrent9.sh/
   - https://www.torrent9.one/
   - https://wvw.torrent9.one/
@@ -34,6 +28,8 @@ legacylinks:
   - https://www.torrent9.nl/
   - https://www.torrent9.re/
   - https://torrent9.nocensor.sbs/
+  - https://ww1.torrent9.re/
+  - http://ww2.torrent9.re/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentcore.yml

@@ -61,13 +61,16 @@ search:
     # search is an exact match, there are no wild cards, or +word or AND/OR, and spaces and dots are treated uniquely
 
   rows:
-    selector: div.content font[color="purple"], div.content font[color="orange"]:has(img), div.content font[color="gray"], div.content font[color="white"]
+    selector: div.content font[color="purple"], div.content font[color="orange"]:has(a), div.content font[color="gray"], div.content font[color="white"]
     after: 3
 
   fields:
     category:
+      text: "UNKNOWN"
+    category|noappend:
       selector: img[src^="./cat/"]
       attribute: src
+      optional: true
       filters:
         - name: regexp
           args: "cat/(.+?).png"

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.bet/
+  - https://torrentdownload.unblockit.cat/
   - https://torrentdownload.nocensor.world/
 legacylinks:
   - https://torrentdownload.unblocked.rest/
@@ -31,6 +31,7 @@ legacylinks:
   - https://torrentdownload.unblockit.name/
   - https://torrentdownload.nocensor.sbs/
   - https://torrentdownload.unblockit.ist/
+  - https://torrentdownload.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.bet/
+  - https://torrentdownloads.unblockit.cat/
   - https://torrentdownloads.nocensor.world/
   - https://torrentdownloads.unblockninja.com/
 legacylinks:
@@ -33,6 +33,7 @@ legacylinks:
   - https://torrentdownloads.unblockit.name/
   - https://torrentdownloads.nocensor.sbs/
   - https://torrentdownloads.unblockit.ist/
+  - https://torrentdownloads.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.bet/
+  - https://torrentfunk.unblockit.cat/
   - https://torrentfunk.nocensor.world/
 legacylinks:
   - https://torrentfunk.unblockit.li/
@@ -30,6 +30,7 @@ legacylinks:
   - https://torrentfunk.unblockit.name/
   - https://torrentfunk.nocensor.sbs/
   - https://torrentfunk.unblockit.ist/
+  - https://torrentfunk.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,7 +11,7 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.bet/
+  - https://torrentgalaxy.unblockit.cat/
   - https://torrentgalaxy.nocensor.world/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
@@ -35,6 +35,7 @@ legacylinks:
   - https://torrentgalaxy.unblockit.name/
   - https://torrentgalaxy.nocensor.sbs/
   - https://torrentgalaxy.unblockit.ist/
+  - https://torrentgalaxy.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,13 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq218.com/
+  - https://torrentqq223.com/
 legacylinks:
-  - https://torrentqq142.com/
-  - https://torrentqq143.com/
-  - https://torrentqq144.com/
-  - https://torrentqq145.com/
-  - https://torrentqq146.com/
   - https://torrentqq147.com/
   - https://torrentqq148.com/
   - https://torrentqq149.com/
@@ -24,6 +19,11 @@ legacylinks:
   - https://torrentqq215.com/
   - https://torrentqq216.com/
   - https://torrentqq217.com/
+  - https://torrentqq218.com/
+  - https://torrentqq219.com/
+  - https://torrentqq220.com/
+  - https://torrentqq221.com/
+  - https://torrentqq222.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentsectorcrew.yml

@@ -17,11 +17,12 @@ caps:
     - {id: 107, cat: PC/0day, desc: "Apps Linux"}
     - {id: 48, cat: PC/Mac, desc: "Apps MAC"}
     - {id: 109, cat: PC, desc: "Apps Sonstige"}
+    - {id: 134, cat: PC, desc: "Apps Tutorial"}
     - {id: 22, cat: PC/0day, desc: "Apps Win"}
     # Audio
     - {id: 24, cat: Audio/Audiobook, desc: "Audio aBooks"}
     - {id: 104, cat: Audio, desc: "Audio Disco's"}
-    - {id: 38, cat: Audio/Audiobook, desc: "Audio Hörspiel"}
+    - {id: 38, cat: Audio/Audiobook, desc: "Audio Hoerspiel"}
     - {id: 6, cat: Audio, desc: "Audio Musik"}
     - {id: 29, cat: Audio/Video, desc: "Audio Videos"}
     # Doku
@@ -34,32 +35,36 @@ caps:
     - {id: 54, cat: Movies/HD, desc: "Filme 1080p"}
     - {id: 5, cat: Movies/3D, desc: "Filme 3D"}
     - {id: 55, cat: Movies/HD, desc: "Filme 720p"}
+    - {id: 135, cat: Movies/Other, desc: "Filme Anime"}
     - {id: 43, cat: Movies/BluRay, desc: "Filme BluRay"}
     - {id: 20, cat: Movies/DVD, desc: "Filme DVDR"}
-    - {id: 120, cat: Movies/Foreign, desc: "Filme Int."}
+    - {id: 120, cat: Movies/Foreign, desc: "Filme Int"}
     - {id: 119, cat: Movies, desc: "Filme Remux"}
     - {id: 36, cat: Movies/HD, desc: "Filme SD"}
     - {id: 121, cat: Movies/UHD, desc: "Filme UHD"}
     - {id: 124, cat: Movies/UHD, desc: "Filme UHD Remux"}
     # Serien
-    - {id: 112, cat: TV/Anime, desc: "Serien Anime"}
+    - {id: 143, cat: TV/Anime, desc: "Serien Anime HD"}
+    - {id: 138, cat: TV/Anime, desc: "Serien Anime Pack HD"}
+    - {id: 139, cat: TV/Anime, desc: "Serien Anime Pack SD"}
+    - {id: 112, cat: TV/Anime, desc: "Serien Anime SD"}
     - {id: 128, cat: TV/HD, desc: "Serien Bluray"}
     - {id: 129, cat: TV/SD, desc: "Serien DVDR"}
-    - {id: 69, cat: TV/HD, desc: "Serien HD"}
-    - {id: 72, cat: TV/Foreign, desc: "Serien Int."}
+    - {id: 140, cat: TV/HD, desc: "Serien HD 1080p"}
+    - {id: 141, cat: TV/HD, desc: "Serien HD 720p"}
+    - {id: 72, cat: TV/Foreign, desc: "Serien Int"}
+    - {id: 125, cat: TV/HD, desc: "Serien Pack HD"}
+    - {id: 68, cat: TV/SD, desc: "Serien Pack SD"}
+    - {id: 126, cat: TV/UHD, desc: "Serien Pack UHD"}
     - {id: 66, cat: TV/SD, desc: "Serien SD"}
-    - {id: 125, cat: TV/HD, desc: "Serien Packs HD"}
-    - {id: 68, cat: TV/SD, desc: "Serien Packs SD"}
-    - {id: 126, cat: TV/UHD, desc: "Serien Packs UHD"}
-    - {id: 108, cat: TV, desc: "Serien TV-Shows"}
-    - {id: 127, cat: TV/UHD, desc: "Serien TV-Shows UHD"}
+    - {id: 127, cat: TV/UHD, desc: "Serien UHD"}
     # Sonstige
-    - {id: 133, cat: PC/0day, desc: "Sonstige 0day"}
+    - {id: 133, cat: PC/0day, desc: "Sonstige 0Day"}
     - {id: 117, cat: Other, desc: "Sonstige Diverses"}
     - {id: 28, cat: Books, desc: "Sonstige eBooks"}
     - {id: 42, cat: TV/Sport, desc: "Sonstige Sport"}
+    - {id: 137, cat: TV/Sport, desc: "Sonstige Sport-Int"}
     - {id: 103, cat: Other, desc: "Sonstige Tutorials"}
-    - {id: 9, cat: Other, desc: "Sonstige Wallpaper"}
     - {id: 64, cat: XXX, desc: "Sonstige XXX"}
     # Spiele
     - {id: 37, cat: Console/NDS, desc: "Spiele Nintendo"}

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,10 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir65.com/
+  - https://torrentsir75.com/
 legacylinks:
-  - http://torrentsir58.com/
-  - https://torrentsir58.com/
   - http://torrentsir59.com/
   - https://torrentsir59.com/
   - http://torrentsir60.com/
@@ -24,6 +22,14 @@ legacylinks:
   - http://torrentsir64.com/
   - https://torrentsir64.com/
   - http://torrentsir65.com/
+  - https://torrentsir65.com/
+  - http://torrentsir72.com/
+  - https://torrentsir72.com/
+  - http://torrentsir73.com/
+  - https://torrentsir73.com/
+  - http://torrentsir74.com/
+  - https://torrentsir74.com/
+  - http://torrentsir75.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,12 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview66.com/
+  - https://torrentview67.com/
 legacylinks:
   - https://torrentview.net/
   - https://torrentview.co/
-  - https://torrentview42.com/
-  - https://torrentview44.com/
   - https://torrentview45.com/
   - https://torrentview46.com/
   - https://torrentview47.com/
@@ -25,6 +23,7 @@ legacylinks:
   - https://torrentview62.com/
   - https://torrentview63.com/
   - https://torrentview65.com/
+  - https://torrentview66.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentz2eu.yml

@@ -42,7 +42,7 @@ search:
     q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
 
   rows:
-    selector: table.table-bordered > tbody > tr
+    selector: table.table-bordered > tbody > tr:has(a[href^="magnet"])
 
   fields:
     category:

src/Jackett.Common/Definitions/turktracker.yml

@@ -1,175 +0,0 @@
----
-id: turktracker
-name: turktracker
-description: "turktracker is a TURKISH Private Torrent Tracker for MOVIES / TV"
-language: tr-TR
-type: private
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://turktracker.net/
-
-caps:
-  categorymappings:
-    - {id: 8, cat: TV, desc: "Altyazılı Diziler (Subtitled Series)"}
-    - {id: 7, cat: Movies, desc: "Altyazılı Filmler (Subtitled Movies)"}
-    - {id: 5, cat: TV/Documentary, desc: "Belgesel (Documentary)"}
-    - {id: 9, cat: TV, desc: "BluTV"}
-    - {id: 3, cat: Movies, desc: "Boxset"}
-    - {id: 11, cat: TV, desc: "Dublaj Dizi(Dubbing Series)"}
-    - {id: 10, cat: Movies, desc: "Dublaj Film (Dubbing Movie)"}
-    - {id: 12, cat: Books, desc: "E-Kitap (E-Book)"}
-    - {id: 6, cat: TV, desc: "Eğitim (education)"}
-    - {id: 13, cat: TV, desc: "EXXEN"}
-    - {id: 26, cat: TV, desc: "Gain"}
-    - {id: 14, cat: Audio, desc: "Müzik (Music)"}
-    - {id: 21, cat: TV, desc: "Netflix"}
-    - {id: 15, cat: Console, desc: "Oyunlar (Games)"}
-    - {id: 16, cat: PC, desc: "Program"}
-    - {id: 19, cat: XXX, desc: "XXX"}
-    - {id: 18, cat: TV, desc: "Yerli Diziler (Domestic TV Series)"}
-    - {id: 17, cat: Movies, desc: "Yerli Filmler (Domestic Movies)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-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: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: 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.php
-  method: form
-  form: form[action="takelogin.php"]
-  captcha:
-    type: image
-    selector: img#regimage
-    input: imagestring
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-  error:
-    - selector: table:has(td.thead:contains("An error has occured!"))
-    - selector: table:has(td.thead:contains("Bir hata oluştu!"))
-  test:
-    path: index.php
-    selector: a[href*="logout.php?logouthash="]
-
-download:
-  before:
-    path: takethanks.php
-    method: post
-    inputs:
-      torrentid: "{{ re_replace  .DownloadUri.PathAndQuery \".*torrent-details-(\\d+).*\" \"$1\"}}"
-  selectors:
-    - selector: a[href*="download-torrent-"]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    do: search
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
-    # yes incldead, no activeonly
-    include_dead_torrents: yes
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # replace special characters with "%" (wildcard)
-      args: ["[^a-zA-Z0-9]+", "%"]
-
-  rows:
-    selector: "table#sortabletable tbody tr:has(a[href*=\"download-torrent-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="torrent-category-"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)
-    title_default:
-      # is often abbreviated
-      selector: a[href*="torrent-details-"]
-    title_optional:
-      # usually longer than details title
-      selector: div[id^="port-content-"] div:nth-child(2)
-      optional: true
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
-    details:
-      selector: a[href*="torrent-details-"]
-      attribute: href
-    download:
-      selector: a[href*="torrent-details-"]
-      attribute: href
-    poster:
-      selector: div[id^="port-content-"] div img
-      attribute: src
-    date:
-      selector: td:nth-child(2) > div:last-child
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="/external.gif"]: 0
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-#  TS Special Edition v.8.0

src/Jackett.Common/Definitions/vizuk.yml

@@ -1,252 +0,0 @@
----
-id: vizuk
-name: Vizuk
-description: "Vizuk is a SPANISH private site for HD content"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://torrent.vizuk.li/
-legacylinks:
-  - http://torrent.vizuk.li/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 43, cat: Movies/UHD, desc: "Películas UHDFull 4K"}
-    - {id: 44, cat: Movies/UHD, desc: "Películas UHDRemux 4K"}
-    - {id: 51, cat: Movies/UHD, desc: "Películas UHDRip 4K"}
-    - {id: 66, cat: Movies/UHD, desc: "Películas UHDWebDL 4K"}
-    - {id: 34, cat: Movies/UHD, desc: "Películas FullBR 1080p"}
-    - {id: 94, cat: Movies/BluRay, desc: "Películas Remux 1080p"}
-    - {id: 36, cat: Movies/HD, desc: "Películas BDRip 1080p"}
-    - {id: 98, cat: Movies/HD, desc: "Películas BDRip 1080p x265"}
-    - {id: 42, cat: Movies/HD, desc: "Películas BDRip 720p"}
-    - {id: 37, cat: Movies/HD, desc: "Películas Micro 1080p"}
-    - {id: 45, cat: Movies/HD, desc: "Películas Micro 720p"}
-    - {id: 46, cat: Movies/HD, desc: "Películas M2TS-MTS-AVCHD-HDTV"}
-    - {id: 65, cat: Movies/3D, desc: "Películas 3D FullBR"}
-    - {id: 67, cat: Movies/3D, desc: "Películas 3D Remux"}
-    - {id: 68, cat: Movies/3D, desc: "Películas 3D Rip (SBS/OU)"}
-    - {id: 64, cat: Movies/HD, desc: "Películas Web-DL-2.0"}
-    - {id: 47, cat: Movies, desc: "Animación"}
-    - {id: 69, cat: Movies/UHD, desc: "Animación UHDFull 4K"}
-    - {id: 72, cat: Movies/UHD, desc: "Animación UHDRemux 4K"}
-    - {id: 71, cat: Movies/UHD, desc: "Animación UHDRip 4K"}
-    - {id: 70, cat: Movies/UHD, desc: "Animación UHDWebDL 4K"}
-    - {id: 73, cat: Movies/HD, desc: "Animación FullBR 1080p"}
-    - {id: 74, cat: Movies/BluRay, desc: "Animación Remux 1080p"}
-    - {id: 53, cat: Movies/HD, desc: "Animación BDRip 1080p"}
-    - {id: 99, cat: Movies/HD, desc: "Animación Rip 1080p x265"}
-    - {id: 54, cat: Movies/HD, desc: "Animación BDRip 720p"}
-    - {id: 55, cat: Movies/HD, desc: "Animación Micro 1080p"}
-    - {id: 56, cat: Movies/HD, desc: "Animación Micro 720p"}
-    - {id: 75, cat: Movies/HD, desc: "Animación M2TS-MTS-AVCHD-HDTV"}
-    - {id: 76, cat: Movies/3D, desc: "Animación 3D FullBR"}
-    - {id: 77, cat: Movies/3D, desc: "Animación 3D Remux"}
-    - {id: 78, cat: Movies/3D, desc: "Animación 3D Rip (SBS/OU)"}
-    - {id: 79, cat: Movies/HD, desc: "Animación Web-DL-2.0"}
-    - {id: 48, cat: Movies, desc: "Documentales"}
-    - {id: 80, cat: Movies/UHD, desc: "Documentales UHDFull 4K"}
-    - {id: 81, cat: Movies/UHD, desc: "Documentales UHDRemux 4K"}
-    - {id: 82, cat: Movies/UHD, desc: "Documentales UHDRip 4K"}
-    - {id: 83, cat: Movies/UHD, desc: "Documentales UHDWebDL 4K"}
-    - {id: 84, cat: Movies/HD, desc: "Documentales FullBR 1080p"}
-    - {id: 85, cat: Movies/BluRay, desc: "Documentales Remux 1080p"}
-    - {id: 57, cat: Movies/HD, desc: "Documentales BDRip 1080p"}
-    - {id: 58, cat: Movies/HD, desc: "Documentales BDRip 720p"}
-    - {id: 86, cat: Movies/3D, desc: "Documentales 3D FullBR"}
-    - {id: 87, cat: Movies/3D, desc: "Documentales 3D Remux"}
-    - {id: 88, cat: Movies/3D, desc: "Documentales 3D Rip (SBS/OU)"}
-    - {id: 89, cat: Movies/HD, desc: "Documentales Web-DL-2.0"}
-    - {id: 96, cat: TV/HD, desc: "Documentales HDTV 1080p"}
-    - {id: 97, cat: TV/HD, desc: "Documentales HDTV 720p"}
-    - {id: 49, cat: TV/HD, desc: "Series"}
-    - {id: 59, cat: TV/HD, desc: "Series UHD F/R/Rip 4K"}
-    - {id: 61, cat: TV/HD, desc: "Series Full/Remux 1080p"}
-    - {id: 90, cat: TV/HD, desc: "Series BDRip 1080p"}
-    - {id: 91, cat: TV/HD, desc: "Series BDRip 720p"}
-    - {id: 92, cat: TV/HD, desc: "Series Web-DL-2.0"}
-    - {id: 95, cat: TV/HD, desc: "Series HDTV"}
-    - {id: 50, cat: Other/Misc, desc: "Música , Conciertos, Teatro y Deportes"}
-    - {id: 62, cat: Audio/MP3, desc: "Música"}
-    - {id: 63, cat: TV/Sport, desc: "Deporte"}
-    - {id: 21, cat: Movies/HD, desc: "Teatro"}
-    - {id: 93, cat: XXX, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: 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:
-  path: ajax/login.php
-  method: post
-  inputs:
-    loginbox_membername: "{{ .Config.username }}"
-    loginbox_password: "{{ .Config.password }}"
-    action: login
-    loginbox_remember: 1
-  error:
-    - selector: div.error
-  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"]
-    - name: re_replace
-      args: ["\\s*(19|20)\\d{2}$", ""] # Fix for Radarr. Remove the year
-  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){{ if .Config.freeleech }}:has(img[src$=\"torrent_free.png\"]){{ else }}{{ end }}, .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: append
-          args: " SPANiSH"
-    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
-    imdbid:
-      selector: .torrentFlags a[href*="www.imdb.com/title/tt"]
-      attribute: href
-    date_1:
-      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: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    date_2:
-      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 at"]
-        - name: replace
-          args: ["Hoy en", "Today at"]
-        - name: replace
-          args: ["Lunes a", "Monday at"]
-        - name: replace
-          args: ["Martes a", "Tuesday at"]
-        - name: replace
-          args: ["Miércoles a", "Wednesday at"]
-        - name: replace
-          args: ["Jueves a", "Thursday at"]
-        - name: replace
-          args: ["Viernes a", "Friday at"]
-        - name: replace # WTF?
-          args: ["Friday a", "Friday at"]
-        - name: replace
-          args: ["Sábado a", "Saturday at"]
-        - name: replace
-          args: ["Domingo a", "Sunday at"]
-        - name: fuzzytime # eg: Yesterday at 14:22 or Monday at 14:22
-    date_3:
-      selector: td.torrent_name:contains("Uploaded"):contains("-"), .torrentOwner:contains("Uploaded"):contains("-")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    date_4:
-      selector: td.torrent_name:contains("Uploaded"):not(:contains("-")), .torrentOwner:contains("Uploaded"):not(:contains("-"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(?<=Uploaded )(.*)(?= by)"
-        - name: fuzzytime # eg: Yesterday at 14:22 or Monday at 14:22
-    date:
-      text: "{{ if or .Result.date_1 .Result.date_2 .Result.date_3 .Result.date_4 }}{{ or .Result.date_1 .Result.date_2 .Result.date_3 .Result.date_4 }}{{ else }}now{{ end }}"
-    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:
-      case:
-        img[src$="torrent_free.png"][title*="No cuenta"]: 0
-        img[src$="torrent_free.png"][title="Free!"]: 0
-        img[src$="torrent_free.png"][title*="0.5"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="torrent_multiple_upload.png"]: 2
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TSUE 2.2