trezzor: update, add separate cookie indexer. resolves #14376 (#14379)

not a fix for the problem, but eliminating some errors as reported by browser  development tools

README.md

@@ -14,7 +14,7 @@ Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) be
 
 Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar3](https://github.com/mylar3/mylar3), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc.) into tracker-site-specific http queries, parses the html or json response, and then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
 
-Developer note: The software implements the [Torznab](https://web.archive.org/web/20220517013745/https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with hybrid [nZEDb](https://github.com/nZEDb/nZEDb/blob/b485fa326a0ff1f47ce144164eb1f070e406b555/resources/db/schema/data/10-categories.tsv)/[Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) [category numbering](https://github.com/Jackett/Jackett/wiki/Jackett-Categories)) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
+Developer note: The software implements the [Torznab](https://torznab.github.io/spec-1.3-draft/index.html) (with hybrid [nZEDb](https://github.com/nZEDb/nZEDb/blob/b485fa326a0ff1f47ce144164eb1f070e406b555/resources/db/schema/data/10-categories.tsv)/[Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) [category numbering](https://github.com/Jackett/Jackett/wiki/Jackett-Categories)) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)
 
@@ -188,7 +188,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Il CorSaRo Blu
  * Kinorun
  * Kinozal
- * Lightning-Tor
  * LostFilm.tv
  * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
  * Marine Tracker
@@ -237,14 +236,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 1ptbar
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
  * 2xFree
- * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
+ * 3ChangTrai (3CT)
  * 3D Torrents (3DT)
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
  * Abnormal
  * ABtorrents (ABT + RNS)
- * Acervos [![(invite needed)][inviteneeded]](#)
  * Acid Lounge (A-L)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
@@ -267,7 +265,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Back-ups [![(invite needed)][inviteneeded]](#)
+ * Back-ups
  * BakaBT
  * BeiTai
  * Best-Core
@@ -353,7 +351,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GainBound [![(invite needed)][inviteneeded]](#)
  * Gay-Torrents.org
  * GAYtorrent.ru
- * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
+ * GazelleGames (GGn)
  * Generation-Free
  * GigaTorrents
  * GimmePeers (formerly ILT)
@@ -428,7 +426,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Locadora
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * LST
- * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
+ * M-Team TP (MTTP)
  * MaDs Revolution
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
@@ -503,14 +501,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RevolutionTT
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
  * RPTorrents
- * SceneHD  [![(invite needed)][inviteneeded]](#)
+ * SceneHD [![(invite needed)][inviteneeded]](#)
  * SceneRush
  * SceneTime
  * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile
  * Shareisland
- * Shazbat [![(invite needed)][inviteneeded]](#)
+ * Shazbat
  * SiamBIT
  * SkipTheCommercials
  * SkipTheTrailers
@@ -577,8 +575,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentSeeds (TS)
  * TotallyKids (TK)
  * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
- * TranceTraffic [![(invite needed)][inviteneeded]](#)
- * Trezzor [![(invite needed)][inviteneeded]](#)
+ * TranceTraffic
+ * TreZzoR [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
@@ -592,6 +590,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnleashTheCartoons
  * UnlimitZ
  * Uploads
+ * UTOPIA
  * White Angel
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow

src/Jackett.Common/Content/index.html

@@ -529,10 +529,10 @@
                     </div>
                     <div class="modal-body">
                         <p>You can search all configured indexers from this screen.</p>
-                        <label for="text">Query</label>
+                        <label for="searchquery">Query</label>
                         <input class="form-control" type="text" name="query" id="searchquery" />
                         {{#if filters}}
-                        <label for="filter">Filter</label>
+                        <label for="searchFilter">Filter</label>
                         <select name="filter" id="searchFilter">
                           <option value="all">all</option>
                           {{#each filters}}
@@ -540,9 +540,9 @@
                           {{/each}}
                         </select>
                         {{/if}}
-                        <label for="tracker">Tracker</label>
+                        <label for="searchTracker">Tracker</label>
                         <select name="tracker" id="searchTracker" multiple="multiple"></select>
-                        <label for="category">Category</label>
+                        <label for="searchCategory">Category</label>
                         <select name="category" id="searchCategory" multiple="multiple"></select>
                         <button id="jackett-search-perform" class="btn btn-success btn-sm"><span class="fa fa-search"></span></button>
                         <div id="searchResults"></div>

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

@@ -89,7 +89,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -98,8 +97,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/animetracker.yml

@@ -91,7 +91,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -100,8 +99,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -94,13 +94,10 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/anisource.yml

@@ -6,8 +6,6 @@ language: en-US
 type: public
 encoding: UTF-8
 requestDelay: 2
-certificates:
-  - 7b36f0dc75d3340727b6f74bbdbde46ec59b7037 # expired 12 Feb 2023
 links:
   - https://asnet.pw/
 

src/Jackett.Common/Definitions/arabp2p.yml

@@ -2,7 +2,7 @@
 id: arabp2p
 name: ArabP2P
 description: "ArabP2P is an ARABIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ar-AR
+language: ar-AE
 type: private
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/arabtorrents.yml

@@ -2,7 +2,7 @@
 id: arabtorrents
 name: ArabTorrents
 description: "ArabTorrents is an ARABIC Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ar-AR
+language: ar-AE
 type: private
 encoding: windows-1256
 requestDelay: 2

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

@@ -78,7 +78,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -87,8 +86,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/chilebt.yml

@@ -2,7 +2,7 @@
 id: chilebt
 name: ChileBT
 description: "ChileBT is a CHILEAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: es-419
+language: es-CL
 type: private
 encoding: UTF-8
 links:

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

@@ -90,7 +90,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -99,8 +98,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -83,7 +83,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -92,8 +91,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -77,7 +77,10 @@ settings:
     options:
       desc: desc
       asc: asc
-
+  - name: info_news
+    type: info
+    label: Reminder from GF-Free Admin
+    default: "Attention users of third-party software like Jackett or Radarr, Sonarr or similar:<br>Despite your seed downloads you must physically connect to the web site with your browser or risk being <b>Banned for non-participation</b>...<br><ol>We ask :<li>Remain in seed at least 48 hours on the media to avoid H$R</li><li>And much more depending on your storage means</li><li>Participate in the life of the site shout forum...</li><li>Connect regularly to possibly read your private messages.</li></ol>"
 login:
   path: /api/torrents
   method: get
@@ -106,11 +109,10 @@ search:
     imdbId: "{{ .Query.IMDBIDShort }}"
     tmdbId: "{{ .Query.TMDBID }}"
     tvdbId: "{{ .Query.TVDBID }}"
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    free[]: "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -119,8 +121,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/hawke-uno.yml

@@ -76,7 +76,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -85,8 +84,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/hd-unit3d-api.yml

@@ -82,7 +82,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -91,8 +90,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -85,13 +85,10 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/itatorrents.yml

@@ -88,7 +88,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -99,8 +98,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/jme-reunit3d-api.yml

@@ -90,7 +90,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -99,8 +98,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/korsar.yml

@@ -2,7 +2,7 @@
 id: korsar
 name: Korsar
 description: "Korsar is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-ru
+language: ru-RU
 type: private
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/lat-team-api.yml

@@ -94,7 +94,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -103,8 +102,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/lightning-tor.yml

@@ -1,172 +0,0 @@
----
-id: lightning-tor
-name: Lightning-Tor
-description: "Lightning-Tor  is a DUTCH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: nl-NL
-type: semi-private
-encoding: UTF-8
-links:
-  - https://lightning-tor.org/
-
-caps:
-  categorymappings:
-    # the search pull down cats disagrees with the prior category count links, so merged the two lists, with count overriding pull
-    - {id: 2, cat: Movies/DVD, desc: "DVD Retail"}
-    - {id: 17, cat: Movies/Other, desc: "DVD Promo/R5"}
-    - {id: 3, cat: Audio/Video, desc: "DVD Muziek"}
-    - {id: 4, cat: Movies/SD, desc: " DVD Cam"}
-    - {id: 18, cat: Movies/Other, desc: "DVD Kinderen"}
-    - {id: 6, cat: TV, desc: "Tv Serie"}
-    - {id: 19, cat: XXX/DVD, desc: "DVD XXX"}
-    - {id: 20, cat: TV/Documentary, desc: "Docomentaire"}
-    - {id: 45, cat: Audio/Video, desc: "Cabaret Div."}
-    - {id: 9, cat: PC/Games, desc: "Spelletjes Pc"}
-    - {id: 10, cat: Console/NDS, desc: "Ps2/NDS"}
-    - {id: 11, cat: Console/XBox, desc: "XBoX"}
-    - {id: 22, cat: Console/Wii, desc: "Wii"}
-    - {id: 8, cat: Audio, desc: "Muziek Album"}
-    - {id: 23, cat: Audio/Other, desc: "Muziek Diversen"}
-    - {id: 1, cat: Other, desc: "Kinderen Diversen"}
-    - {id: 13, cat: Other, desc: "Afbeeldingen"}
-    - {id: 14, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
-    - {id: 7, cat: PC, desc: "Software PC"}
-    - {id: 12, cat: PC/0day, desc: "Microsoft"}
-    - {id: 21, cat: PC/Mobile-Other, desc: "Software PDA"}
-    - {id: 5, cat: Movies/SD, desc: "Xvid Film"}
-    - {id: 15, cat: XXX/SD, desc: "Xvid XXX"}
-    - {id: 24, cat: Other, desc: "Xvid Diversen"}
-    - {id: 16, cat: Other/Misc, desc: "Overigen"}
-    - {id: 50, cat: Books, desc: "E-books"}
-    - {id: 48, cat: Movies/HD, desc: "movies 264"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: thankyou
-    type: text
-    label: Thank You Comment
-  - name: info
-    type: info
-    label: Thank you comment
-    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("Aanmelden mislukt")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    # https://lightning-tor.org/comment.php?action=add&tid=166386
-    path: comment.php
-    method: post
-    inputs:
-      action: add
-      tid: "{{ .DownloadUri.Query.id }}"
-      text: "{{ .Config.thankyou }}"
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    # does not support imdbid search and does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # S01E02 to 1 2
-      args: ["(?i)\\bS0*(\\d{1,2})\\s*E0*(\\d{1,2})\\b", "$1 $2"]
-    - name: re_replace # S01 to 1
-      args: ["(?i)\\bS0*(\\d{1,2})\\b", "$1"]
-
-  rows:
-    selector: table.embedded[width="99%"][border="1"][cellspacing="0"][cellpadding="0"]
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "S$2-$4"]
-        - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
-        - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "E$2-$4"]
-        - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})", "E$2"]
-        - name: re_replace
-          args: ["(?i)compleet", "Complete"]
-    details:
-      # using the download link because the details link has an error
-      selector: a[href^="download.php?id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["download", "details"]
-    download:
-      # need to say thanks first
-      text: "{{ .Result.details }}"
-    size:
-      selector: a[href^="details_bestanden.php?torrent_id="]
-      filters:
-        - name: regexp
-          args: "(.+?) in"
-    files:
-      selector: a[href^="details_bestanden.php?torrent_id="]
-      filters:
-        - name: regexp
-          args: "in (\\d+) bestan"
-    grabs:
-      selector: table table tr:nth-child(2) td:nth-child(1)
-    date:
-      selector: table tr:nth-child(3) td:nth-child(7)
-      filters:
-        - name: regexp
-          args: (\d+)
-        - name: append
-          args: " hours ago"
-        - name: timeago
-    seeders:
-      selector: table tr:nth-child(3) td:nth-child(5)  font b
-      optional: true
-      default: 0
-    leechers:
-      selector: table tr:nth-child(3) td:nth-child(5) font b:nth-child(2)
-      optional: true
-      default: 0
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-# engine n/a

src/Jackett.Common/Definitions/locadora.yml

@@ -1,7 +1,7 @@
 ---
 id: locadora
 name: Locadora
-description: "Locadora is a Brazilian tracker for Movies and TV Shows"
+description: "Locadora is a BRAZILIAN Private Tracker for MOVIES and TV"
 language: pt-BR
 type: private
 encoding: UTF-8
@@ -12,15 +12,16 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies}
-    - {id: 2, cat: TV}
-    - {id: 6, cat: TV/Anime}
-    - {id: 7, cat: Movies, desc: "Concerts"}
+    - {id: 1, cat: Movies, desc: "Filmes"}
+    - {id: 2, cat: TV, desc: "Series"}
+    - {id: 6, cat: TV/Anime, desc: "Animes"}
+    - {id: 7, cat: Audio/Video, desc: "Shows"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
 
 settings:
   - name: apikey
@@ -83,7 +84,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -92,8 +92,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/lst.yml

@@ -88,7 +88,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -97,8 +96,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -87,7 +87,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -96,8 +95,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/ntelogo.yml

@@ -89,7 +89,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -98,8 +97,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -88,7 +88,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -97,8 +96,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/ptfiles.yml

@@ -5,6 +5,8 @@ description: "PTFiles (PTF) is a Private site for TV / MOVIES / GENERAL"
 language: en-US
 type: private
 encoding: windows-1252
+certificates:
+  - 69901C31636B4D413903F4B32573ED6E8F5961FE # expired 26 May 2023
 links:
   - https://ptfiles.net/
 
@@ -42,13 +44,12 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    label: Username
+  - name: password
+    type: password
+    label: Password
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -71,9 +72,20 @@ settings:
       asc: asc
 
 login:
-  method: cookie
+  path: loginproc/
+  method: form
+  form: form#login
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    force_ssl: on
+    ssl: ""
+  selectorinputs:
+    hash:
+      selector: input[name="hash"]
+      attribute: value
+  error:
+    - selector: p.error:contains(strong)
   test:
     path: browse.php
 

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

@@ -112,7 +112,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -121,8 +120,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/rareshare2.yml

@@ -98,7 +98,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -107,8 +106,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -86,7 +86,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -95,8 +94,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -82,7 +82,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -91,8 +90,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/rptorrents.yml

@@ -5,8 +5,6 @@ description: "RPTorrents is a Private tracker for MOVIES / TV / GENERAL"
 language: en-US
 type: private
 encoding: UTF-8
-certificates:
-  - e674aa17bf38af08a119626025298e1bb4d2d5cb # Expired 29 April 2023
 links:
   - https://rptorrents.com/
 

src/Jackett.Common/Definitions/schema.json

@@ -16,7 +16,8 @@
                     "type": "string"
                 },
                 "language": {
-                    "type": "string"
+                    "type": "string",
+                    "enum": ["af", "af-ZA", "ar", "ar-AE", "ar-BH", "ar-DZ", "ar-EG", "ar-IQ", "ar-JO", "ar-KW", "ar-LB", "ar-LY", "ar-MA", "ar-OM", "ar-QA", "ar-SA", "ar-SY", "ar-TN", "ar-YE", "az", "az-AZ", "be", "be-BY", "bg", "bg-BG", "bs-BA", "ca", "ca-ES", "cs", "cs-CZ", "cy", "cy-GB", "da", "da-DK", "de", "de-AT", "de-CH", "de-DE", "de-LI", "de-LU", "dv", "dv-MV", "el", "el-GR", "en", "en-AU", "en-BZ", "en-CA", "en-CB", "en-GB", "en-IE", "en-JM", "en-NZ", "en-PH", "en-TT", "en-US", "en-ZA", "en-ZW", "eo", "es", "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC", "es-ES", "es-GT", "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY", "es-SV", "es-UY", "es-VE", "et", "et-EE", "eu", "eu-ES", "fa", "fa-IR", "fi", "fi-FI", "fo", "fo-FO", "fr", "fr-BE", "fr-CA", "fr-CH", "fr-FR", "fr-LU", "fr-MC", "gl", "gl-ES", "gu", "gu-IN", "he", "he-IL", "hi", "hi-IN", "hr", "hr-BA", "hr-HR", "hu", "hu-HU", "hy", "hy-AM", "id", "id-ID", "is", "is-IS", "it", "it-CH", "it-IT", "ja", "ja-JP", "ka", "ka-GE", "kk", "kk-KZ", "kn", "kn-IN", "ko", "ko-KR", "kok", "kok-IN", "ky", "ky-KG", "lt", "lt-LT", "lv", "lv-LV", "mi", "mi-NZ", "mk", "mk-MK", "mn", "mn-MN", "mr", "mr-IN", "ms", "ms-BN", "ms-MY", "mt", "mt-MT", "nb", "nb-NO", "nl", "nl-BE", "nl-NL", "nn-NO", "ns", "ns-ZA", "pa", "pa-IN", "pl", "pl-PL", "ps", "ps-AR", "pt", "pt-BR", "pt-PT", "qu", "qu-BO", "qu-EC", "qu-PE", "ro", "ro-RO", "ru", "ru-RU", "sa", "sa-IN", "se", "se-FI", "se-NO", "se-SE", "sk", "sk-SK", "sl", "sl-SI", "sq", "sq-AL", "sr-BA", "sr-SP", "sv", "sv-FI", "sv-SE", "sw", "sw-KE", "syr", "syr-SY", "ta", "ta-IN", "te", "te-IN", "th", "th-TH", "tl", "tl-PH", "tn", "tn-ZA", "tr", "tr-TR", "tt", "tt-RU", "ts", "uk", "uk-UA", "ur", "ur-PK", "uz", "uz-UZ", "vi", "vi-VN", "xh", "xh-ZA", "zh", "zh-CN", "zh-HK", "zh-MO", "zh-SG", "zh-TW", "zu", "zu-ZA", "af", "af-ZA", "ar", "ar-AE", "ar-BH", "ar-DZ", "ar-EG", "ar-IQ", "ar-JO", "ar-KW", "ar-LB", "ar-LY", "ar-MA", "ar-OM", "ar-QA", "ar-SA", "ar-SY", "ar-TN", "ar-YE", "az", "az-AZ", "be", "be-BY", "bg", "bg-BG", "bs-BA", "ca", "ca-ES", "cs", "cs-CZ", "cy", "cy-GB", "da", "da-DK", "de", "de-AT", "de-CH", "de-DE", "de-LI", "de-LU", "dv", "dv-MV", "el", "el-GR", "en", "en-AU", "en-BZ", "en-CA", "en-CB", "en-GB", "en-IE", "en-JM", "en-NZ", "en-PH", "en-TT", "en-US", "en-ZA", "en-ZW", "eo", "es", "es-AR", "es-BO", "es-CL", "es-CO", "es-CR", "es-DO", "es-EC", "es-ES", "es-GT", "es-HN", "es-MX", "es-NI", "es-PA", "es-PE", "es-PR", "es-PY", "es-SV", "es-UY", "es-VE", "et", "et-EE", "eu", "eu-ES", "fa", "fa-IR", "fi", "fi-FI", "fo", "fo-FO", "fr", "fr-BE", "fr-CA", "fr-CH", "fr-FR", "fr-LU", "fr-MC", "gl", "gl-ES", "gu", "gu-IN", "he", "he-IL", "hi", "hi-IN", "hr", "hr-BA", "hr-HR", "hu", "hu-HU", "hy", "hy-AM", "id", "id-ID", "is", "is-IS", "it", "it-CH", "it-IT", "ja", "ja-JP", "ka", "ka-GE", "kk", "kk-KZ", "kn", "kn-IN", "ko", "ko-KR", "kok", "kok-IN", "ky", "ky-KG", "lt", "lt-LT", "lv", "lv-LV", "mi", "mi-NZ", "mk", "mk-MK", "mn", "mn-MN", "mr", "mr-IN", "ms", "ms-BN", "ms-MY", "mt", "mt-MT", "nb", "nb-NO", "nl", "nl-BE", "nl-NL", "nn-NO", "ns", "ns-ZA", "pa", "pa-IN", "pl", "pl-PL", "ps", "ps-AR", "pt", "pt-BR", "pt-PT", "qu", "qu-BO", "qu-EC", "qu-PE", "ro", "ro-RO", "ru", "ru-RU", "sa", "sa-IN", "se", "se-FI", "se-NO", "se-SE", "sk", "sk-SK", "sl", "sl-SI", "sq", "sq-AL", "sr-BA", "sr-SP", "sv", "sv-FI", "sv-SE", "sw", "sw-KE", "syr", "syr-SY", "ta", "ta-IN", "te", "te-IN", "th", "th-TH", "tl", "tl-PH", "tn", "tn-ZA", "tr", "tr-TR", "tt", "tt-RU", "ts", "uk", "uk-UA", "ur", "ur-PK", "uz", "uz-UZ", "vi", "vi-VN", "xh", "xh-ZA", "zh", "zh-CN", "zh-HK", "zh-MO", "zh-SG", "zh-TW", "zu", "zu-ZA"]
                 },
                 "type": {
                     "type": "string",

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

@@ -90,7 +90,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: diacritics
@@ -105,8 +104,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -78,7 +78,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -87,8 +86,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/skipthetrailers.yml

@@ -78,7 +78,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -87,8 +86,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/superbits.yml

@@ -2,7 +2,7 @@
 id: superbits
 name: Superbits
 description: "Superbits is a SWEDISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: sv-SW
+language: sv-SE
 type: private
 encoding: UTF-8
 links:

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

@@ -90,7 +90,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -99,8 +98,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -79,7 +79,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -88,8 +87,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

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

@@ -92,7 +92,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -101,8 +100,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:

src/Jackett.Common/Definitions/torrentproject2.yml

@@ -84,6 +84,17 @@ search:
     download:
       selector: span > a
       attribute: href
+    date_day:
+      # 10am May. 24th
+      selector: div > span:nth-child(4):contains("."):not(:contains(":"))
+      optional: true
+      filters:
+        - name: re_replace
+          args: ["(?i)(st|nd|rd|th)", ""]
+        - name: append
+          args: " -07:00" # PDT
+        - name: dateparse
+          args: "htt MMM. d zzz"
     date_year:
       # Sep. 7th '10
       selector: div > span:nth-child(4):not(:contains(":"))
@@ -107,7 +118,7 @@ search:
         - name: dateparse
           args: "yyyy-MM-dd HH:mm:ss zzz"
     date:
-      text: "{{ if or .Result.date_year .Result.date_time }}{{ or .Result.date_year .Result.date_time }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_time }}{{ or .Result.date_day .Result.date_year .Result.date_time }}{{ else }}now{{ end }}"
     size:
       selector: div > span:nth-child(5)
     seeders:

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq257.com/
+  - https://torrentqq258.com/
 legacylinks:
-  - https://torrentqq242.com/
   - https://torrentqq243.com/
   - https://torrentqq244.com/
   - https://torrentqq245.com/. # typo
@@ -25,6 +24,7 @@ legacylinks:
   - https://torrentqq254.com/
   - https://torrentqq255.com/
   - https://torrentqq256.com/
+  - https://torrentqq257.com/
 
 caps:
   categorymappings:

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

@@ -89,7 +89,6 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: replace # avoid conflict when prepending + to words
@@ -102,8 +101,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     categorydesc:

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,11 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir105.com/
+  - https://torrentsir106.com/
 legacylinks:
-  - https://torrentsir90.com/
-  - http://torrentsir91.com/
-  - https://torrentsir91.com/
   - http://torrentsir92.com/
   - https://torrentsir92.com/
   - http://torrentsir93.com/
@@ -33,6 +30,8 @@ legacylinks:
   - http://torrentsir104.com/
   - https://torrentsir104.com/
   - http://torrentsir105.com/
+  - https://torrentsir105.com/
+  - http://torrentsir106.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/trezzor.yml

@@ -1,7 +1,7 @@
 ---
 id: trezzor
-name: Trezzor
-description: "Trezzor is a CZECH Private site for TV / MOVIES / GENERAL"
+name: TreZzoR
+description: "TreZzoR is a CZECH Private site for TV / MOVIES / GENERAL"
 language: cs-CZ
 type: private
 encoding: windows-1250
@@ -10,74 +10,103 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/DVD, desc: "DVD CZ/SK dabing"}
-    - {id: 2, cat: Movies/DVD, desc: "DVD CZ/SK titulky"}
-    - {id: 3, cat: Audio/Video, desc: "DVD Hudební video"}
-    - {id: 4, cat: Movies/SD, desc: "XviD, DivX CZ/SK dabing"}
-    - {id: 13, cat: Audio, desc: "Hudba CZ/SK scéna"}
-    - {id: 24, cat: Audio, desc: "Mluv. slovo CZ/SK dabing"}
-    - {id: 10, cat: Audio/Other, desc: "DTS audio"}
-    - {id: 14, cat: PC/Games, desc: "Hry"}
-    - {id: 17, cat: PC, desc: "Programy"}
-    - {id: 14, cat: PC, desc: "Cestiny,patche,upgrady"}
-    - {id: 18, cat: Books, desc: "Knihy CZ/SK lokalizace"}
-    - {id: 18, cat: Books/Comics, desc: "Komiks CZ/SK lokalizace"}
-    - {id: 16, cat: Other, desc: "Foto,obrázky"}
-    - {id: 20, cat: Console, desc: "Konzole"}
-    - {id: 21, cat: PC/Mobile-Other, desc: "Mobilmánia"}
-    - {id: 22, cat: Other, desc: "Ostatní CZ/SK scéna"}
-    - {id: 23, cat: Other, desc: "Na prani non CZ/SK"}
-    - {id: 27, cat: Other, desc: "TreZzoR rls"}
-    - {id: 35, cat: Audio/Video, desc: "HDTV Hudební video"}
-    - {id: 36, cat: Movies/SD, desc: "XviD, DivX CZ/SK titulky"}
-    - {id: 31, cat: Movies/HD, desc: "HDTV CZ/SK Dabing"}
-    - {id: 33, cat: Movies/HD, desc: "HDTV CZ/SK Titulky"}
-    - {id: 39, cat: Movies/3D, desc: "3D HDTV CZ/SK Dabing"}
-    - {id: 40, cat: Movies/3D, desc: "3D HDTV CZ/SK Titulky"}
-    - {id: 5, cat: Movies/SD, desc: "TV-rip CZ/SK dabing"}
+    - {id: 31, cat: Movies/HD, desc: "HD CZ/SK Dabing"}
+    - {id: 33, cat: Movies/HD, desc: "HD CZ/SK Titulky"}
     - {id: 41, cat: TV/HD, desc: "HD Seriály CZ/SK dabing"}
     - {id: 42, cat: TV/HD, desc: "HD Seriály CZ/SK titulky"}
+    - {id: 1, cat: Movies/BluRay, desc: "Full disc CZ/SK dabing"}
+    - {id: 2, cat: Movies/BluRay, desc: "Full disc CZ/SK titulky"}
+    - {id: 4, cat: Movies/SD, desc: "SD CZ/SK dabing"}
+    - {id: 36, cat: Movies/SD, desc: "SD CZ/SK titulky"}
     - {id: 7, cat: TV/SD, desc: "Seriály CZ/SK dabing"}
     - {id: 37, cat: TV/SD, desc: "Seriály CZ/SK titulky"}
-    - {id: 9, cat: XXX/XviD, desc: "XXX CZ/SK dabing"}
-    - {id: 32, cat: XXX/x264, desc: "XXX HD CZ/SK dabing"}
+    - {id: 35, cat: Audio/Video, desc: "Hudebni video"}
+    - {id: 32, cat: XXX, desc: "XXX CZ/SK"}
+    - {id: 13, cat: Audio, desc: "Hudba"}
+    - {id: 24, cat: Audio/Audiobook, desc: "Mluv. slovo CZ/SK dabing"}
+    - {id: 14, cat: PC/Games, desc: "Hry"}
+    - {id: 17, cat: PC/0day, desc: "Programy"}
+    - {id: 15, cat: PC/Games, desc: "Cestiny,patche,upgrady"}
+    - {id: 18, cat: Books, desc: "Knihy CZ/SK lokalizace"}
+    - {id: 19, cat: Books/Comics, desc: "Komiks CZ/SK lokalizace"}
+    - {id: 16, cat: Other, desc: "Foto,obrázky"}
+    - {id: 21, cat: PC/Mobile-Android, desc: "Mobilmánia"}
+    - {id: 20, cat: Console, desc: "Konzole"}
+    - {id: 22, cat: Other, desc: "Ostatní CZ/SK scéna"}
+    - {id: 23, cat: Other, desc: "Na prani non CZ/SK"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, year]
+    movie-search: [q, year]
     music-search: [q]
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
+    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: data
+    options:
+      data: created
+      seeds: seeders
+      size: size
+      filename: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: DESC
+    options:
+      DESC: desc
+      ASC: asc
+  - name: info_tpp
     type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+    label: Results Per Page
+    default: For best results, change the <b>Torrentu na strance:</b> setting to <b>100</b> on your account profile.
+  - name: info_xxx
+    type: info
+    label: XXX Results
+    default: To include XXX in results, click <b>Kategoria XXX sa nezobrazuje!!!. povolit zobrazenie</b> on the tracker search page.
 
 login:
-  method: cookie
+  path: prihlasenie.php
+  method: post
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: div > font:has(a[href="neregpodp.php"])
   test:
-    path: torrents.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: torrents.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)S(\\d{2})E(\\d{2})", "$1 $2"]
   inputs:
     search: "{{ .Keywords }}"
     category: 0
-    active: 1
+    # 0 all, 1 active, 2 dead
+    active: 0
+    rok: "{{ .Query.Year }}"
+    # can search for genre but you need to know the id. &genres=57466 for Akční
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(?i)S(\\d{2})E(\\d{2})", "$1 $2"]
 
   rows:
-    selector: tr.torrenty_lista
+    selector: "tr.torrenty_lista{{ if .Config.freeleech }}:has(a[href^=\"details.php?slug=\"] b span[style=\"color:darkmagenta\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -90,17 +119,36 @@ search:
       selector: a[href^="details.php?slug="]
       attribute: title
       filters:
-        # Czech, English
         - name: re_replace
-          args: ["(?i)(Zobrazit detaily: |View details: )", ""]
+          args: ["(?i)^(Zobrazit detaily|View details|Detaily): ", ""]
         - name: re_replace
-          args: ["(Detaily: )", ""]
+          args: ["(?i)[\\s\\->]*FREELEECH.*", ""]
         - name: re_replace
-          args: ["(\\w)\\.(\\w)", "$1 $2"]
+          args: [".*?/ ", ""]
         - name: re_replace
-          args: [".*? / ", ""]
-        - name: diacritics
-          args: replace
+          args: ["(?i)\\b(\\d{1,3})x(\\d{1,3})\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3}(?:-\\d+)?)[\\.,\\s]*Epizoda[\\s\\.]*(\\d+(?:-\\d+)?)\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3}(?:-\\d+)?)[\\s\\.]*(?:Sezona|Series?|Seria|Season)[\\.,\\s]*(\\d+(?:-\\d+)?)[\\s\\.]*Epizoda\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3}(?:-\\d+)?)[\\.,\\s]+(\\d+(?:-\\d+)?)[\\s\\.]*Epizoda\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3})[-\\+\\.,\\s]+(\\d+)\\b", "S$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3})[-\\+\\.\\s]+(\\d+)[\\s\\.]*(?:Sezona|Series?|Seria|Season)\\b", "S$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3}(?:-\\d+)?)\\b", "S$1"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3}(?:-\\d+)?)[\\s\\.]*(?:Sezona|Series?|Seria|Season)\\b", "S$1"]
+        - name: re_replace
+          args: ["(?i)\\bEpizoda[\\s\\.]*(\\d+)[-\\+\\.,\\s]+(\\d+)\\b", "E$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+)[-\\+\\.,\\s]+(\\d+)[\\s\\.]*Epizoda\\b", "E$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\bEpizoda[\\s\\.]*(\\d+(?:-\\d+)?)\\b", "E$1"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+(?:-\\d+)?)[\\s\\.]*Epizoda\\b", "E$1"]
     details:
       selector: a[href^="details.php?slug="]
       attribute: href
@@ -123,7 +171,17 @@ search:
     grabs:
       selector: td:nth-child(10)
     downloadvolumefactor:
-      text: 1
+      case:
+        a[href^="details.php?slug="] b span[style="color:darkmagenta"]: 0
+        "*": 1
     uploadvolumefactor:
       text: 1
+    description:
+      selector: a[href^="details.php?slug="]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)^(Zobrazit detaily|View details|Detaily): ", ""]
+        - name: re_replace
+          args: ["(?i)[\\s\\->]*FREELEECH.*", ""]
 # engine tbd

src/Jackett.Common/Definitions/trezzorcookie.yml

@@ -0,0 +1,184 @@
+---
+id: trezzorcookie
+name: TreZzoRCookie
+description: "TreZzoR is a CZECH Private site for TV / MOVIES / GENERAL. This uses the cookie method for access"
+language: cs-CZ
+type: private
+encoding: windows-1250
+links:
+  - https://tracker.czech-server.com/
+
+caps:
+  categorymappings:
+    - {id: 31, cat: Movies/HD, desc: "HD CZ/SK Dabing"}
+    - {id: 33, cat: Movies/HD, desc: "HD CZ/SK Titulky"}
+    - {id: 41, cat: TV/HD, desc: "HD Seriály CZ/SK dabing"}
+    - {id: 42, cat: TV/HD, desc: "HD Seriály CZ/SK titulky"}
+    - {id: 1, cat: Movies/BluRay, desc: "Full disc CZ/SK dabing"}
+    - {id: 2, cat: Movies/BluRay, desc: "Full disc CZ/SK titulky"}
+    - {id: 4, cat: Movies/SD, desc: "SD CZ/SK dabing"}
+    - {id: 36, cat: Movies/SD, desc: "SD CZ/SK titulky"}
+    - {id: 7, cat: TV/SD, desc: "Seriály CZ/SK dabing"}
+    - {id: 37, cat: TV/SD, desc: "Seriály CZ/SK titulky"}
+    - {id: 35, cat: Audio/Video, desc: "Hudebni video"}
+    - {id: 32, cat: XXX, desc: "XXX CZ/SK"}
+    - {id: 13, cat: Audio, desc: "Hudba"}
+    - {id: 24, cat: Audio/Audiobook, desc: "Mluv. slovo CZ/SK dabing"}
+    - {id: 14, cat: PC/Games, desc: "Hry"}
+    - {id: 17, cat: PC/0day, desc: "Programy"}
+    - {id: 15, cat: PC/Games, desc: "Cestiny,patche,upgrady"}
+    - {id: 18, cat: Books, desc: "Knihy CZ/SK lokalizace"}
+    - {id: 19, cat: Books/Comics, desc: "Komiks CZ/SK lokalizace"}
+    - {id: 16, cat: Other, desc: "Foto,obrázky"}
+    - {id: 21, cat: PC/Mobile-Android, desc: "Mobilmánia"}
+    - {id: 20, cat: Console, desc: "Konzole"}
+    - {id: 22, cat: Other, desc: "Ostatní CZ/SK scéna"}
+    - {id: 23, cat: Other, desc: "Na prani non CZ/SK"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, year]
+    movie-search: [q, year]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: freeleech
+    type: checkbox
+    label: Filter FreeLeech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: data
+    options:
+      data: created
+      seeds: seeders
+      size: size
+      filename: title
+  - name: 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>Torrentu na strance:</b> setting to <b>100</b> on your account profile.
+  - name: info_xxx
+    type: info
+    label: XXX Results
+    default: To include XXX in results, click <b>Kategoria XXX sa nezobrazuje!!!. povolit zobrazenie</b> on the tracker search page.
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    search: "{{ .Keywords }}"
+    category: 0
+    # 0 all, 1 active, 2 dead
+    active: 0
+    rok: "{{ .Query.Year }}"
+    # can search for genre but you need to know the id. &genres=57466 for Akční
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(?i)S(\\d{2})E(\\d{2})", "$1 $2"]
+
+  rows:
+    selector: "tr.torrenty_lista{{ if .Config.freeleech }}:has(a[href^=\"details.php?slug=\"] b span[style=\"color:darkmagenta\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?onlycat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: onlycat
+    title:
+      selector: a[href^="details.php?slug="]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)^(Zobrazit detaily|View details|Detaily): ", ""]
+        - name: re_replace
+          args: ["(?i)[\\s\\->]*FREELEECH.*", ""]
+        - name: re_replace
+          args: [".*?/ ", ""]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3})x(\\d{1,3})\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3}(?:-\\d+)?)[\\.,\\s]*Epizoda[\\s\\.]*(\\d+(?:-\\d+)?)\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3}(?:-\\d+)?)[\\s\\.]*(?:Sezona|Series?|Seria|Season)[\\.,\\s]*(\\d+(?:-\\d+)?)[\\s\\.]*Epizoda\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3}(?:-\\d+)?)[\\.,\\s]+(\\d+(?:-\\d+)?)[\\s\\.]*Epizoda\\b", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3})[-\\+\\.,\\s]+(\\d+)\\b", "S$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3})[-\\+\\.\\s]+(\\d+)[\\s\\.]*(?:Sezona|Series?|Seria|Season)\\b", "S$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\b(?:Sezona|Series?|Seria|Season)[\\s\\.]*(\\d{1,3}(?:-\\d+)?)\\b", "S$1"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d{1,3}(?:-\\d+)?)[\\s\\.]*(?:Sezona|Series?|Seria|Season)\\b", "S$1"]
+        - name: re_replace
+          args: ["(?i)\\bEpizoda[\\s\\.]*(\\d+)[-\\+\\.,\\s]+(\\d+)\\b", "E$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+)[-\\+\\.,\\s]+(\\d+)[\\s\\.]*Epizoda\\b", "E$1-$2"]
+        - name: re_replace
+          args: ["(?i)\\bEpizoda[\\s\\.]*(\\d+(?:-\\d+)?)\\b", "E$1"]
+        - name: re_replace
+          args: ["(?i)\\b(\\d+(?:-\\d+)?)[\\s\\.]*Epizoda\\b", "E$1"]
+    details:
+      selector: a[href^="details.php?slug="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?slug="]
+      attribute: href
+    date:
+      selector: td:nth-child(6)
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "d/M/yyyy HH:mm zzz"
+    size:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8) a
+    leechers:
+      selector: td:nth-child(9) a
+    grabs:
+      selector: td:nth-child(10)
+    downloadvolumefactor:
+      case:
+        a[href^="details.php?slug="] b span[style="color:darkmagenta"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    description:
+      selector: a[href^="details.php?slug="]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)^(Zobrazit detaily|View details|Detaily): ", ""]
+        - name: re_replace
+          args: ["(?i)[\\s\\->]*FREELEECH.*", ""]
+# engine tbd

src/Jackett.Common/Definitions/turktorrent.yml

@@ -35,6 +35,7 @@ caps:
     - {id: 39, cat: TV, desc: "Netflix Film"}
     - {id: 38, cat: TV, desc: "Netflix Dizi"}
     - {id: 40, cat: TV, desc: "Netflix Belgesel"}
+    - {id: 104, cat: TV, desc: "Netflix Reality/Yarışma"}
     - {id: 47, cat: PC, desc: "Programlar"}
     - {id: 48, cat: PC, desc: "Programlar Windows"}
     - {id: 96, cat: PC, desc: "Programlar Linux"}

src/Jackett.Common/Definitions/tvchaosuk.yml

@@ -92,6 +92,12 @@ search:
     qty: 100
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     # can search by genre but need range support. &genres[]=Action&genres[]=Comedy for Action and Comedy
+  keywordsfilters:
+    # if searching for season packs switch S01 to Series 1 #14369
+    - name: re_replace
+      args: ["(?i)(S0)(\\d{1,2})$", "Series $2"]
+    - name: re_replace
+      args: ["(?i)(S)(\\d{1,3})$", "Series $2"]
 
   rows:
     selector: table > tbody > tr
@@ -105,6 +111,9 @@ search:
           args: "/categories/(\\d+)"
     title:
       selector: a.view-torrent
+      filters:
+        - name: re_replace
+          args: ["(?i)Series[\\s]+(\\d+)", "S$1"]
     download:
       selector: a[href*="/download/"]
       attribute: href

src/Jackett.Common/Definitions/utopia.yml

@@ -1,32 +1,22 @@
 ---
-id: acervos
-name: Acervos (API)
-description: "Acervos is a Brazilian tracker for movies, tv shows, and others."
-language: pt-BR
+id: utopia
+name: UTOPIA
+description: "UTOPIA is a UKRAINIAN Private Tracker for HD MOVIES and TV"
+language: uk-UA
 type: private
 encoding: UTF-8
 links:
-  - https://acervos.cc/
+  - https://utp.to/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "Séries"}
-    - {id: 6, cat: TV/Anime, desc: "Animes"}
-    - {id: 3, cat: TV/Documentary, desc: "Documentários"}
-    - {id: 7, cat: Audio/Video, desc: "Shows"}
-    - {id: 4, cat: Console, desc: "Games"}
-    - {id: 8, cat: Other, desc: "Cursos"}
-    - {id: 9, cat: Books, desc: "eBooks / Revistas / Apostilas"}
-    - {id: 5, cat: PC, desc: "Programas"}
-    - {id: 10, cat: Other, desc: "Materiais de Apoio"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
-    book-search: [q]
-    music-search: [q]
 
 settings:
   - name: apikey
@@ -35,7 +25,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://acervos.cc/\" target=\"_blank\">Acervos</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://utp.to/\" target=\"_blank\">UTOPIA</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -89,19 +79,14 @@ search:
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
       args: ["\\.", " "]
-    - name: re_replace
-      args: ["(?i)\\bS(\\d+)", "T$1"]
 
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:
@@ -110,27 +95,15 @@ search:
       selector: name
       filters:
         - name: re_replace
-          args:
-            - "\\bDUAL\\b"
-            - "Portuguese (Brazil) English"
+          args: ["\\.", " "]
     details:
       selector: details_link
-    _cat:
-      selector: category
-    _type:
-      selector: type
-    _res:
-      selector: resolution
-      optional: true
-    _reg:
-      selector: region
-      optional: true
     download:
       selector: download_link
     infohash:
       selector: info_hash
     poster:
-      selector: meta.poster
+      selector: poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -140,15 +113,6 @@ search:
       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: replace
-          args: [" & ", "_&_"]
-    description:
-      text: "{{ .Result._cat }} {{ .Result._type }} {{ .Result._res }} {{ .Result._reg }} {{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -183,10 +147,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
-# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
+# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# json UNIT3D 6.4.1 (custom)
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 6.2.1

src/Jackett.Common/Indexers/BakaBT.cs

@@ -164,6 +164,14 @@ namespace Jackett.Common.Indexers
 
                 foreach (var row in rows)
                 {
+                    var downloadVolumeFactor = row.QuerySelector("span.freeleech") != null ? 0 : 1;
+
+                    // Skip non-freeleech results when freeleech only is set
+                    if (configData.FreeleechOnly.Value && downloadVolumeFactor != 0)
+                    {
+                        continue;
+                    }
+
                     var qTitleLink = row.QuerySelector("a.title, a.alt_title");
                     if (qTitleLink == null)
                         continue;
@@ -247,7 +255,7 @@ namespace Jackett.Common.Indexers
                         else
                             release.PublishDate = DateTime.ParseExact(dateStr, "dd MMM yy", CultureInfo.InvariantCulture);
 
-                        release.DownloadVolumeFactor = row.QuerySelector("span.freeleech") != null ? 0 : 1;
+                        release.DownloadVolumeFactor = downloadVolumeFactor;
                         release.UploadVolumeFactor = 1;
 
                         releases.Add(release);

src/Jackett.Common/Indexers/DonTorrent.cs

@@ -25,10 +25,10 @@ namespace Jackett.Common.Indexers
         public override string Id => "dontorrent";
         public override string Name => "DonTorrent";
         public override string Description => "DonTorrent is a SPANISH public tracker for MOVIES / TV / GENERAL";
-        public override string SiteLink { get; protected set; } = "https://dontorrent.discount/";
+        public override string SiteLink { get; protected set; } = "https://dontorrent.dad/";
         public override string[] AlternativeSiteLinks => new[]
         {
-            "https://dontorrent.discount/",
+            "https://dontorrent.dad/",
             "https://todotorrents.net/",
             "https://tomadivx.net/",
             "https://seriesblanco.one/",
@@ -37,7 +37,6 @@ namespace Jackett.Common.Indexers
         };
         public override string[] LegacySiteLinks => new[]
         {
-            "https://dontorrent.surf/",
             "https://dontorrent.how/",
             "https://dontorrent.casa/",
             "https://dontorrent.chat/",
@@ -51,8 +50,8 @@ namespace Jackett.Common.Indexers
             "https://dontorrent.care/",
             "https://dontorrent.cash/",
             "https://dontorrent.observer/",
-            "https://dontorrent.company/"
-
+            "https://dontorrent.company/",
+            "https://dontorrent.discount/",
         };
         public override string Language => "es-ES";
         public override string Type => "public";

src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataBakaBT.cs

@@ -5,12 +5,14 @@ namespace Jackett.Common.Models.IndexerConfig.Bespoke
     [ExcludeFromCodeCoverage]
     internal class ConfigurationDataBakaBT : ConfigurationDataBasicLogin
     {
+        public BoolConfigurationItem FreeleechOnly { get; private set; }
         public BoolConfigurationItem AddRomajiTitle { get; private set; }
         public BoolConfigurationItem AppendSeason { get; private set; }
 
         public ConfigurationDataBakaBT(string instructionMessageOptional = null)
             : base(instructionMessageOptional)
         {
+            FreeleechOnly = new BoolConfigurationItem("Show freeleech only") { Value = false };
             AddRomajiTitle = new BoolConfigurationItem("Add releases for Romaji Title") { Value = true };
             AppendSeason = new BoolConfigurationItem("Append Season for Sonarr Compatibility") { Value = false };
         }

src/Jackett.Updater/Program.cs

@@ -262,6 +262,7 @@ namespace Jackett.Updater
                 "Definitions/7torrents.yml",
                 "Definitions/DasUnerwartete.yml",
                 "Definitions/academictorrents.yml",
+                "Definitions/acervos-api.yml",
                 "Definitions/aither.yml", // switch to *-API #8682
                 "Definitions/alein.yml",
                 "Definitions/alexfilm.yml",
@@ -440,6 +441,7 @@ namespace Jackett.Updater
                 "Definitions/leparadisdunet.yml",
                 "Definitions/leporno.yml",
                 "Definitions/liaorencili.yml", // renamed to cilipro
+                "Definitions/lightning-tor.yml",
                 "Definitions/mactorrents.yml",
                 "Definitions/magnet4you.yml",
                 "Definitions/magnetdl.yml",