torrentsir: bump domain

https://github.com/Prowlarr/Indexers/pull/263

.github/workflows/winget.yml

@@ -2,11 +2,13 @@ name: Publish to WinGet
 on:
   release:
     types: [released]
+permissions:
+  contents: read
 jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@latest
+      - uses: vedantmgoyal2009/winget-releaser@v1
         with:
           identifier: Jackett.Jackett
           token: ${{ secrets.WINGET }}

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>
 
@@ -46,7 +46,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT4G
  * BTDIGG
  * BTMET
- * BTmirror
  * BTSOW
  * Byrutor
  * CloudTorrents
@@ -99,15 +98,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
- * NewPCT.me
  * Newstudio
  * Nipponsei
- * Nitro
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
  * OneJAV
- * OpenSharing
  * ParnuXi
  * PC-torrent
  * PiratBit
@@ -119,7 +115,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Portugas
  * ProPorn
  * ProStyleX
- * PS4-Torrent
  * Rapidzona
  * RARBG
  * RinTor
@@ -161,6 +156,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
  * Torrentz2eu
+ * Torrentz2nz
+ * TrahT
  * truPornolabs
  * Underverse
  * UnionDHT
@@ -197,7 +194,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
@@ -226,11 +222,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sharewood
  * SkTorrent
  * SkTorrent-org
- * SoundPark
  * themixingbowl (TMB)
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
+ * Torrents-Town (T-T)
  * TribalMixes
  * Union Fansub
  * YggTorrent (YGG)
@@ -245,6 +241,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
@@ -257,10 +254,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Aither
  * AlphaRatio (AR)
  * AmigosShareClub
- * anasch.cc
  * AnimeBytes (AB)
+ * AnimeTracker
  * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
- * AnimeWorld [![(invite needed)][inviteneeded]](#)
+ * AnimeWorld
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
@@ -288,7 +285,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BiTTuRK
  * BJ-Share (BJ)
  * BlueBird [![(invite needed)][inviteneeded]](#)
- * Blues-Brothers
  * Blutopia (BLU)
  * Borgzelle [![(invite needed)][inviteneeded]](#)
  * Boxing Torrents
@@ -296,7 +292,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadcasTheNet (BTN)
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BreizhPeers
  * BrSociety
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
@@ -323,7 +318,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
- * CrypticHaven Comedy Club (CCC)
  * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
@@ -336,7 +330,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DivTeam
  * DocsPedia
  * Dream Tracker
- * EbookParadijs
  * Ebooks-Shares
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
@@ -346,11 +339,10 @@ 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)
- * Film-Paleis
  * FinElite (FE)
  * FinVip
  * FunFile (FF)
@@ -362,7 +354,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,20 +364,18 @@ 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]](#)
  * HD-Space (HDS)
  * HD-Spain [![(invite needed)][inviteneeded]](#)
  * HD-Torrents (HDT)
+ * HD-UNiT3D
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDAI
  * 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,8 +389,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
+ * HellasHut
+ * HHanClub
  * House of Devil
- * HQSource (HQS)
+ * iHDBits
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -429,14 +421,12 @@ 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]](#)
@@ -453,8 +443,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NorBits
+ * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
- * Oppaitime
  * Orpheus
  * OshenPT
  * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
@@ -463,7 +453,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Partis
  * PassThePopcorn (PTP)
  * Peeratiko
- * PeerJunkies
  * Peers.FM
  * PigNetwork
  * PirateTheNet (PTN)
@@ -488,7 +477,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PuntoTorrent
  * PuroVicio
  * PuTao
- * Puur-Hollands
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
@@ -512,16 +500,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SiamBIT
  * SkipTheCommercials
  * SkipTheTrailers
- * slosoul
  * SnowPT (SSPT)
  * SoulVoice
  * 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
@@ -537,9 +524,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * teracod (Movie Zone)
  * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
- * The Horror Charnel (THC)
  * The New Retro
  * The Occult [![(invite needed)][inviteneeded]](#)
+ * The Old School
  * The Place [![(invite needed)][inviteneeded]](#)
  * The Shinning (TsH)
  * The Show
@@ -563,7 +550,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentBytes (TBy)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
- * TorrentDB
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)
@@ -578,7 +564,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 +571,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 +712,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).
@@ -834,7 +820,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 
 -   `-d, --DataFolder`         Specify the location of the data folder (Must be an admin on Windows)
     - e.g. --DataFolder="D:\Your Data\Jackett\".
-    - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the datadir or set the XDG_CONFIG_HOME environment variable.
+    - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the data folder or set the XDG_CONFIG_HOME environment variable.
 
 -   `--NoRestart`              Don't restart after update
 
@@ -850,7 +836,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source
 
 ### Windows
-* Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
+* Install the .NET 6 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
 * Open PowerShell and from the `src` directory:
 * - run `dotnet msbuild /restore`

install_service_macos

@@ -5,8 +5,11 @@ BOLDRED="$(printf '\033[1;31m')"
 BOLDGREEN="$(printf '\033[1;32m')"
 NC="$(printf '\033[0m')" # No Color
 
+
+userid=$(id -u)
+
 # Stop and unload the service if it's running
-launchctl unload ~/Library/LaunchAgents/org.user.Jackett.plist &>/dev/null
+launchctl bootout gui/${userid}/org.user.Jackett &>/dev/null
 
 # Move working directory to Jackett's
 cd "$(dirname "$0")"
@@ -64,11 +67,14 @@ if [[ $qstr ]]; then
 fi
 
 # Run the agent
-launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
+echo "Launching agent..."
+#launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
+launchctl bootstrap gui/${userid} ~/Library/LaunchAgents/org.user.Jackett.plist
+sleep .5
 
-# Check that it's launched
-userid=$(id -u)
+# Check that it's loaded
 if [[ $(launchctl list | grep org.user.Jackett) ]]; then
+# Check that service is running
     if [[ $(launchctl print gui/${userid}/org.user.Jackett | grep 'state') =~ "running" ]]; then
         echo "${BOLDGREEN}Agent successfully installed and running!${NC}"
         echo "Jackett location: ${jackettdir}"

src/Jackett.Common/Content/custom.js

@@ -1238,6 +1238,59 @@ function clearSearchResultTable(element) {
     element.find("#jackett-search-results-datatable_paginate").empty();
 }
 
+function getSavedPresets() {
+    var lsKey = "jackett_saved_presets";
+    if (JSON !== undefined && localStorage !== undefined) {
+        var lsSavedPresets = localStorage.getItem(lsKey);
+        var presets = lsSavedPresets !== null ? JSON.parse(lsSavedPresets) : [];
+        return presets;
+    } else {
+        return [];
+    }
+}
+
+function setSavedPresets(presets) {
+    var lsKey = "jackett_saved_presets";
+    if (JSON !== undefined && localStorage !== undefined) {
+        localStorage.setItem(lsKey, JSON.stringify(presets));
+    }
+}
+
+function setSavePresetsButtonState(table, element, state = false) {
+    var button = element.find("button[id=jackett-search-results-datatable_savepreset_button]")    
+    if (state) {
+        button.attr("class", "btn btn-danger btn-sm");
+        button.on("click", function () {
+            var inputSearch = element.find("input[type=search]");
+            var preset = inputSearch.val().trim();
+            if (preset !== "") {
+                var presets = getSavedPresets();
+                if (presets.includes(preset)) {
+                    presets = presets.filter(item => item != preset);
+                    setSavedPresets(presets);
+                    var datalist = element.find("datalist[id=jackett-search-saved-presets]")
+                    datalist.empty();
+                    table.api().draw();
+                }
+            }
+        });
+    } else {
+        button.attr("class", "btn btn-success btn-sm");
+        button.on("click", function () {
+            var inputSearch = element.find("input[type=search]");
+            var preset = inputSearch.val().trim();
+            if (preset !== "") {
+                var presets = getSavedPresets();
+                if (!presets.includes(preset)) {
+                    presets.push(preset);
+                    setSavedPresets(presets);
+                    table.api().draw();
+                }
+            }
+        });
+    }
+}
+
 // dataTable dead torrent filter
 $.fn.dataTable.ext.search = [
     function (settings, data, dataIndex) {
@@ -1313,16 +1366,34 @@ function updateSearchResultTable(element, results) {
         ],
         fnPreDrawCallback: function () {
             var table = this;
+            var datalist = element.find("datalist[id=jackett-search-saved-presets]")
+
+            var presets = getSavedPresets();
+            if (presets.length > 0) {
+                datalist.empty();
+                presets.forEach(preset => {
+                    var option = $('<option></option>');
+                    option.attr("value", preset);
+                    datalist.append(option);
+                })
+            }
 
             var inputSearch = element.find("input[type=search]");
+            setSavePresetsButtonState(table, element, presets.includes(inputSearch.val().trim()));
+
             if (!inputSearch.attr("custom")) {
                 var newInputSearch = inputSearch.clone();
                 newInputSearch.attr("custom", "true");
                 newInputSearch.attr("data-toggle", "tooltip");
-                newInputSearch.attr("title", "Search query consists of several keywords.\nKeyword starting with \"-\" is considered a negative match.");
+                newInputSearch.attr("title", "Search query consists of several keywords.\nKeyword starting with \"-\" is considered a negative match.\nKeywords separated by \"|\" are considered as OR filters.");
+                newInputSearch.attr("list", "jackett-search-saved-presets");
                 newInputSearch.on("input", function () {
                     var newKeywords = [];
-                    var filterTextKeywords = $(this).val().split(" ");
+                    var filterText = $(this).val().trim();
+                    var presets = getSavedPresets();
+                    setSavePresetsButtonState(table, element, presets.includes(filterText));
+
+                    var filterTextKeywords = filterText.split(" ");
                     $.each(filterTextKeywords, function (index, keyword) {
                         if (keyword === "" || keyword === "+" || keyword === "-")
                             return;
@@ -1332,7 +1403,7 @@ function updateSearchResultTable(element, results) {
                         else if (keyword.startsWith("-"))
                             newKeyword = "^((?!" + $.fn.dataTable.util.escapeRegex(keyword.substring(1)) + ").)*$";
                         else
-                            newKeyword = $.fn.dataTable.util.escapeRegex(keyword);
+                            newKeyword = '(' + keyword.split('|').map(k => $.fn.dataTable.util.escapeRegex(k)).join('|') + ')';
                         newKeywords.push(newKeyword);
                     });
                     var filterText = newKeywords.join(" ");
@@ -1352,6 +1423,10 @@ function updateSearchResultTable(element, results) {
                     table.api().draw();
                 });
                 deadfiltercheckbox.prop('checked', settings.deadfilter);
+
+                savepresetlabel = $('<button id="jackett-search-results-datatable_savepreset_button" title="Save Search Preset" class="btn btn-success btn-sm" style="margin-left: 10px;"><span class="fa fa-save"></span></button>');
+                var searchfilterdiv = element.find("#jackett-search-results-datatable_filter");
+                searchfilterdiv.append(savepresetlabel);
             }
         },
         initComplete: function () {

src/Jackett.Common/Content/index.html

@@ -565,6 +565,7 @@
             {{/if}}
             , {{/each}}
         </p>
+        <datalist id="jackett-search-saved-presets"></datalist>
         <table id="jackett-search-results-datatable" class="dataTable compact cell-border hover stripe">
             <thead>
                 <tr>
@@ -754,6 +755,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20220721002"></script>
+    <script type="text/javascript" src="../custom.js?changed=20221003"></script>
 </body>
 </html>

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

@@ -6,19 +6,18 @@ language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
+requestDelay: 2
 links:
   - https://1337x.to/
   - https://1337x.st/
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.bet/
+  - https://1337x.unblockit.page/
   - https://1337x.nocensor.world/
   - https://1337x.unblockninja.com/
 legacylinks:
   - https://1337x.unblocked.monster/
-  - https://1337x.unblockit.li/
-  - https://1337x.unblockit.uno/
   - https://1337x.is/
   - https://1337x.unblockit.ch/
   - https://1337x.nocensor.space/
@@ -37,6 +36,9 @@ legacylinks:
   - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
   - https://1337x.unblockit.ist/
+  - https://1337x.unblockit.bet/
+  - https://1337x.unblockit.cat/
+  - https://1337x.unblockit.nz/
 
 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/abnormal.yml

@@ -128,16 +128,16 @@ search:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)(\\.multi\\.)", " {{ .Config.multilanguage }} "]
     title_phase2:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     title_vostfr:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+          args: ["(?i)(\\.vostfr\\.)", " ENGLISH "]
         - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+          args: ["(?i)(\\.subfrench\\.)", " ENGLISH "]
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:

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/aidoruonline.yml

@@ -27,7 +27,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
 

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/amigosshare.yml

@@ -5,6 +5,7 @@ description: "Amigos Share Club is a Brazilian Private site for TV / MOVIES / GE
 language: pt-BR
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://cliente.amigos-share.club/
 legacylinks:

src/Jackett.Common/Definitions/anaschcc.yml

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

src/Jackett.Common/Definitions/anilibria.yml

@@ -51,8 +51,9 @@ search:
       selector: quality.string
     _series:
       selector: series.string
+      optional: true
     title:
-      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}] - {{ .Result._series }}"
+      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}]{{ if .Result._series }} - {{ .Result._series }}{{ else }}{{ end }}"
     _code:
       selector: ..code
     details:

src/Jackett.Common/Definitions/animetracker.yml

@@ -0,0 +1,166 @@
+---
+id: animetracker
+name: AnimeTracker (API)
+description: "AnimeTracker is a Private Torrent Tracker for HD ANIME / MANGA / HENTAI"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://animetracker.cc/
+
+caps:
+  categorymappings:
+    - {id: 7, cat: TV/Anime, desc: "Series English"}
+    - {id: 16, cat: TV/Anime, desc: "ongoing"}
+    - {id: 11, cat: TV/Anime, desc: "Series Non-English"}
+    - {id: 1, cat: TV/Anime, desc: "Raws"}
+    - {id: 2, cat: TV/Anime, desc: "OVA"}
+    - {id: 4, cat: Movies, desc: "Movie"}
+    - {id: 15, cat: Books/Comics, desc: "Manga"}
+    - {id: 6, cat: XXX, desc: "Hentai Censored"}
+    - {id: 14, cat: XXX, desc: "Hentai Uncensored"}
+    - {id: 9, cat: XXX, desc: "Hentai Manga"}
+    - {id: 10, cat: Movies, desc: "Live Action"}
+    - {id: 3, cat: Audio, desc: "Music"}
+
+  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://animetracker.cc/\" target =_blank>AnimeTracker</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
+    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)(Science Fiction)", "Science_Fiction"]
+        - 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
+# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 5 day (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.4.0

src/Jackett.Common/Definitions/anisource.yml

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

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

@@ -77,6 +77,7 @@ search:
           args: [",", -1]
     year:
       selector: year
+      optional: true
     _codec:
       selector: codec
     _container:
@@ -119,6 +120,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/arenabg.yml

@@ -5,6 +5,8 @@ description: "ArenaBG is a BULGARIAN Semi-Private Torrent Tracker for 0DAY / GEN
 language: bg-BG
 type: semi-private
 encoding: UTF-8
+certificates:
+  - d5d96eaf33f4b7470a7009f1e591a45f6af0430d # expired 15 Oct 2022
 links:
   - https://arenabg.com/
 legacylinks:
@@ -158,18 +160,18 @@ search:
       attribute: title
       optional: true
     title:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       filters:
         - name: append
           args: "{{ if .Result._bulgarian }} {{ .Result._bulgarian }}{{ else }}{{ end }}{{ if .Result._english }} {{ .Result._english }}{{ else }}{{ end }}"
     details:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       attribute: href
     download:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       attribute: href
     poster:
-      selector: td.filename a[href^="/en/torrents/"]
+      selector: td.filename a.title
       attribute: onmouseover
       filters:
         - name: regexp

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -5,13 +5,13 @@ description: "AudioBook Bay (ABB) is a public Torrent Tracker for AUDIOBOOKS"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://audiobookbay.fi/
   - https://audiobookbay.se/
-  - https://audiobookbay.unblockit.bet/
+  - https://audiobookbay.unblockit.page/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.uno/
   - https://audiobookbay.unblockit.ch/
   - https://audiobookbay.unblockit.ws/
   - http://audiobookbay.net/
@@ -31,6 +31,9 @@ legacylinks:
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
   - https://audiobookbay.unblockit.ist/
+  - https://audiobookbay.unblockit.bet/
+  - https://audiobookbay.unblockit.cat/
+  - https://audiobookbay.unblockit.nz/
 
 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/badasstorrents.yml

@@ -5,6 +5,7 @@ description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://badasstorrents.com/
   - https://badasstorrents.nocensor.world/

src/Jackett.Common/Definitions/bangumi-moe.yml

@@ -21,7 +21,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

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/bigfangroup.yml

@@ -57,7 +57,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/bitbazis.yml

@@ -12,16 +12,18 @@ caps:
   categorymappings:
     - {id: 85, cat: Movies/SD, desc: "Film/Cam/Hun"}
     - {id: 86, cat: Movies/SD, desc: "Film/Cam/Eng"}
-    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
-    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 15, cat: Movies/SD, desc: "Film/SD/Hun"}
+    - {id: 16, cat: Movies/SD, desc: "Film/SD/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng"}
     - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
     - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
     - {id: 94, cat: Movies/HD, desc: "Film/FHD/Hun"}
     - {id: 95, cat: Movies/HD, desc: "Film/FHD/Eng"}
     - {id: 92, cat: Movies/UHD, desc: "Film/UHD/Hun"}
     - {id: 93, cat: Movies/UHD, desc: "Film/UHD/Eng"}
+    - {id: 64, cat: Movies, desc: "Film/Pack"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklip"}
     - {id: 22, cat: TV, desc: "Sorozat/Hun"}
     - {id: 58, cat: TV, desc: "Sorozat/Eng"}
     - {id: 69, cat: TV/Anime, desc: "Mese/SD"}
@@ -32,23 +34,19 @@ caps:
     - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
     - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
     - {id: 31, cat: PC/Games, desc: "Játék/PC"}
-    - {id: 54, cat: Console, desc: "Játék/Konzol"}
     - {id: 81, cat: PC/0day, desc: "Program/PC"}
     - {id: 49, cat: PC/0day, desc: "Program/Rip"}
-    - {id: 14, cat: PC, desc: "Program/Egyéb"}
-    - {id: 64, cat: Movies, desc: "Film/Pack"}
-    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
     - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
     - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
     - {id: 65, cat: Other, desc: "Egyéb"}
-    # the following are no longer in the cat list in the search page, but are still in the profile cat list
-    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
-    - {id: 17, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 19, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
-    - {id: 33, cat: XXX/SD, desc: "Film/SD/XXX"}
-    - {id: 89, cat: XXX/x264, desc: "Film/HD/XXX"}
+    - {id: 33, cat: XXX/SD, desc: "SD/XXX"}
+    - {id: 89, cat: XXX/x264, desc: "HD/XXX"}
     - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"}
+    # the following are no longer in the cat list in the search page, but are still in the profile cat list
+    - {id: 54, cat: Console, desc: "Játék/Konzol"}
+    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Mobil"}
+    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
 
   modes:
     search: [q]
@@ -95,17 +93,17 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
-    selector: a[href^="logout.php?k="]
+    selector: i[onclick^="window.open('logout.php?k="]
 
 search:
   paths:
     - path: browse.php
-      categories: ["!", 33, 66, 99]
+      categories: ["!", 33, 66, 89]
       inputs:
         # 0 all, 1 active, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
         incldead: 0
     - path: browse_xxx.php
-      categories: [33, 66, 99]
+      categories: [33, 66, 89]
       inputs:
         # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed, 6 re-seeded
         incldead: 1
@@ -118,15 +116,12 @@ search:
     # can support genre searching but you need to know the id, eg &genre23=1 for Comedy (id is 23)
 
   rows:
-    selector: "table[width=\"100%\"]:last-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
+    selector: "table[width=\"100%\"][align=\"center\"]:first-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
 
   fields:
-    category:
-      selector: a[href*=".php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
+    categorydesc:
+      selector: img[src^="pic/kategoria/"]
+      attribute: title
     genre:
       selector: span.tooltiptext
     description:

src/Jackett.Common/Definitions/bitturk.yml

@@ -6,9 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - http://bitturk.net/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://bitturk.net/
 legacylinks:
   - http://www.bitturk.net/
+  - http://bitturk.net/
 
 caps:
   categorymappings:
@@ -25,6 +26,7 @@ caps:
     - {id: 79, cat: TV, desc: "BLUTV"}
     - {id: 90, cat: TV, desc: "Disney+"}
     - {id: 91, cat: TV, desc: "Prime Video"}
+    - {id: 93, cat: TV, desc: "Gain"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}

src/Jackett.Common/Definitions/bluesbrothers.yml

@@ -1,192 +0,0 @@
----
-id: bluesbrothers
-name: Blues-Brothers
-description: "Blues-Brothers is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://blues-brothers.biz/
-
-caps:
-  categorymappings:
-    - {id: 9, cat: TV/Anime, desc: "Anime"}
-    - {id: 1, cat: PC/0day, desc: "Apps"}
-    - {id: 17, cat: Audio/Audiobook, desc: "AudioBooks"}
-    - {id: 16, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 12, cat: PC/Games, desc: "Games PC"}
-    - {id: 7, cat: Console/PS3, desc: "Games PS3"}
-    - {id: 19, cat: Console/Wii, desc: "Games Wii"}
-    - {id: 8, cat: Console/XBox 360, desc: "Games XBOX360"}
-    - {id: 18, cat: PC/Mac, desc: "MAC"}
-    - {id: 41, cat: PC/Mobile-Android, desc: "Mobile"}
-    - {id: 26, cat: Movies, desc: "Movie BDRip"}
-    - {id: 29, cat: Movies/HD, desc: "Movie BluRay 1080p"}
-    - {id: 28, cat: Movies/HD, desc: "Movie BluRay 720p"}
-    - {id: 27, cat: Movies/SD, desc: "Movie BRRip"}
-    - {id: 24, cat: Movies/SD, desc: "Movie CAM/TS"}
-    - {id: 23, cat: Movies/DVD, desc: "Movie DVD-R"}
-    - {id: 11, cat: Movies/SD, desc: "Movie DVDRip"}
-    - {id: 25, cat: Movies/SD, desc: "Movie DVDSCR/R5"}
-    - {id: 30, cat: Movies, desc: "Movie Packs"}
-    - {id: 10, cat: Movies/HD, desc: "Movie XviD x264"}
-    - {id: 6, cat: XXX, desc: "Movie XXX"}
-    - {id: 22, cat: Audio/Lossless, desc: "Music Flac"}
-    - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 14, cat: Audio, desc: "Music Packs"}
-    - {id: 20, cat: Audio/Video, desc: "Music Videos"}
-    - {id: 34, cat: TV, desc: "TV Packs"}
-    - {id: 36, cat: TV/HD, desc: "TV X264 HD"}
-    - {id: 37, cat: TV/SD, desc: "TV X264 SD"}
-    - {id: 35, cat: TV/SD, desc: "TV XviD"}
-    - {id: 38, cat: Other, desc: "VIP"}
-    - {id: 40, cat: Other, desc: "VIP ONLY"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, genre]
-    movie-search: [q, genre]
-    music-search: [q, genre]
-    book-search: [q, genre]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-    returnto: /
-  error:
-    - selector: table.main:contains("Login failed!")
-      message:
-        selector: table tr td.colhead2
-  test:
-    path: /
-    selector: a[href*="logout.php?hash_please="]
-
-search:
-  paths:
-    # https://blues-brothers.biz/browse.php?c27=1&c28=1&c29=1&search=&searchin=title&incldead=1&sort=4&type=desc
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.Genre }}{{ .Query.Genre }} {{ else }}{{ end }}{{ .Keywords }}"
-    # title, descr, genre, all
-    searchin: "{{ if .Query.Genre }}all{{ else }}title{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.+?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: src=\\'(.+?)\\'
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    genre:
-      selector: i
-    description:
-      text: "{{ .Result.genre }}"
-    files:
-      selector: td:nth-child(5)
-    date_day:
-      selector: td:nth-child(7):contains("day")
-      optional: true
-      filters:
-        - name: fuzzytime
-    date_year:
-      selector: td:nth-child(7):not(:contains("day"))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-child(8)
-    grabs:
-      selector: td:nth-child(9)
-    seeders:
-      selector: td:nth-child(10)
-    leechers:
-      selector: td:nth-child(11)
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "a.info:contains(\"[SILVER]\")": 0.5
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5

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

@@ -16,10 +16,11 @@ caps:
     - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
     - {id: 6, cat: Other, desc: "Graduação"}
+    - {id: 7, cat: TV/Documentary, desc: "Documentários"}
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     book-search: [q]
 
 settings:

src/Jackett.Common/Definitions/bt4g.yml

@@ -20,7 +20,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/btmirror.yml

@@ -1,100 +0,0 @@
----
-id: btmirror
-name: BTmirror
-description: "BTmirror is a Public BitTorrent DHT search engine."
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://btsao.com/
-  - https://btmirror.unblockit.bet/
-legacylinks:
-  - https://btmirror.unblockit.blue/
-  - https://btmirror.unblockit.name/
-  - https://btmirror.unblockit.ist/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About BTmirror Categories
-    default: BTmirror does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: create_time
-    options:
-      relavance: relevance
-      create_time: created
-      length: size
-
-download:
-  infohash:
-    hash:
-      selector: p.magnet a
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: p.magnet a
-      attribute: href
-      filters:
-        - name: regexp
-          args: "&dn=(.+?)$"
-        - name: validfilename
-
-search:
-  # https://btsao.com/en/search/2022/?c=&s=create_time
-  # returns 10 results per page
-  paths:
-    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/"
-    - path: "en/search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/2"
-  inputs:
-    c: ""
-    s: "{{ .Config.sort }}"
-
-  rows:
-    selector: div.ssbox
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: h3
-    details:
-      selector: h3 a
-      attribute: href
-    download:
-      selector: h3 a
-      attribute: href
-    date:
-      selector: span:contains("date:") b
-      filters:
-        - name: dateparse
-          args: "2006-01-02"
-    size:
-      selector: span:contains("size:") b
-    files:
-      selector: span:contains("files:") b
-    grabs:
-      selector: span:contains("人气:") b
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine: n/a

src/Jackett.Common/Definitions/btsow.yml

@@ -7,12 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.click/
+  - https://btsow.autos/
 legacylinks:
-  - https://btsow.monster/
-  - https://btsow.casa/
-  - https://btsow.website/
-  - https://btsow.online/
   - https://btsow.work/
   - https://btsow.store/
   - https://btsow.surf/
@@ -24,6 +20,10 @@ legacylinks:
   - https://btsow.one/
   - https://btsow.rest/
   - https://btsow.bar/
+  - https://btsow.click/
+  - https://btsow.cfd/
+  - https://btsow.sbs/
+  - https://btsow.quest/
 
 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/comicat.yml

@@ -5,6 +5,7 @@ description: "comicat is a CHINESE Public tracker for Anime / Hentai / Manga"
 language: zh-CN
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.comicat.org/
 
@@ -21,7 +22,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/cpabien.yml

@@ -3,11 +3,11 @@ id: cpasbien
 name: cpasbien
 description: "cpasbien is a FRENCH Public site for TV / MOVIES / GENERAL"
 language: fr-FR
-type: semi-private
+type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://vwwvwvwvvw.cpasbien-fr.nz/
+  - https://cpasbiens3.fr/
 legacylinks:
   - http://www.cpasbiens.cc/
   - http://www.cpabien.cm/
@@ -43,6 +43,7 @@ legacylinks:
   - https://wwwv.cpasbien-fr.fr/
   - https://www2.cpasbien-fr.fr/
   - https://www.cpasbien-fr.nz/
+  - https://vwwvwvwvvw.cpasbien-fr.nz/
 
 caps:
   categories:
@@ -54,13 +55,6 @@ caps:
     movie-search: [q]
 
 settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: flaresolverr
     type: info
     label: FlareSolverr
@@ -89,11 +83,6 @@ settings:
     label: Replace VOSTFR with ENGLISH
     default: false
 
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-
 download:
   selectors:
     - selector: a[href^="magnet:?xt="]
@@ -114,7 +103,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: div#gauche > table > tbody > tr:has(a)
+    selector: div#gauche > table > tbody > tr:has(a), div#dle-content > table > tbody > tr:has(a)
 
   fields:
     category:

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/crazyhd.yml

@@ -90,12 +90,20 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -118,19 +126,16 @@ settings:
       1: asc
 
 login:
-  path: index.php
-  method: form
-  form: form[action="index.php?page=login"]
+  method: cookie
   inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: td.lista span[style="color:#FF0000;"]
+    cookie: "{{ .Config.cookie }}"
   test:
-    path: index.php
+    path: /
     selector: a[href="logout.php"]
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
   paths:
     - path: index.php?page=searchlist
       method: post

src/Jackett.Common/Definitions/crnaberza.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 61, cat: Movies/HD, desc: "HD Mesano"}
     - {id: 50, cat: PC/Games, desc: "Igre"}
     - {id: 44, cat: Books, desc: "Knjige"}
+    - {id: 80, cat: TV, desc: "Paketi"}
     - {id: 46, cat: Audio, desc: "Koncerti"}
     - {id: 58, cat: Audio/Lossless, desc: "Lossless/Domaće"}
     - {id: 59, cat: Audio/Lossless, desc: "Lossless/Strano"}

src/Jackett.Common/Definitions/cryptichaven.yml

@@ -1,184 +0,0 @@
----
-id: cryptichaven
-name: CrypticHaven
-description: "CrypticHaven Comedy Club (CCC) is a Private Torrent Tracker dedicated to sharing the joy of Comedy."
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - http://www.cryptichaven.org/ # https not supported ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    # Stand-up
-    - {id: 23, cat: TV, desc: "Stand-up DVD5/9"}
-    - {id: 24, cat: TV, desc: "Stand-up AVI"}
-    - {id: 25, cat: TV, desc: "Stand-up MKV"}
-    - {id: 63, cat: TV, desc: "Stand-up MP4"}
-    - {id: 72, cat: TV, desc: "Stand-up WMV"}
-    - {id: 73, cat: TV, desc: "Stand-up MPG"}
-    # TV Shows Seasons
-    - {id: 27, cat: TV, desc: "USA/Canadian DVD5/9"}
-    - {id: 28, cat: TV, desc: "USA/Canadian AVI"}
-    - {id: 29, cat: TV, desc: "USA/Canadian MKV"}
-    - {id: 66, cat: TV, desc: "USA/Canadian MP4"}
-    - {id: 30, cat: TV, desc: "UK/Europe DVD5/9"}
-    - {id: 31, cat: TV, desc: "UK/Europe AVI"}
-    - {id: 32, cat: TV, desc: "UK/Europe MKV"}
-    - {id: 67, cat: TV, desc: "UK/Europe MP4"}
-    - {id: 33, cat: TV, desc: "NZ/Aussie DVD5/9"}
-    - {id: 34, cat: TV, desc: "NZ/Aussie AVI"}
-    - {id: 35, cat: TV, desc: "NZ/Aussie MKV"}
-    - {id: 68, cat: TV, desc: "NZ/Aussie MP4"}
-    # TV Shows Episodes
-    - {id: 76, cat: TV, desc: "UK/Europe DVD"}
-    - {id: 37, cat: TV, desc: "USA/Canadian eps AVI"}
-    - {id: 38, cat: TV, desc: "USA/Canadian eps MKV"}
-    - {id: 69, cat: TV, desc: "USA/Canadian eps MP4"}
-    - {id: 39, cat: TV, desc: "UK/Europe eps AVI"}
-    - {id: 40, cat: TV, desc: "UK/Europe eps MKV"}
-    - {id: 70, cat: TV, desc: "UK/Europe eps MP4"}
-    - {id: 41, cat: TV, desc: "NZ/Aussie eps AVI"}
-    - {id: 42, cat: TV, desc: "NZ/Aussie eps MKV"}
-    - {id: 71, cat: TV, desc: "NZ/Aussie eps MP4"}
-    # Audio Comedy
-    - {id: 54, cat: Audio, desc: "Comedy Albums"}
-    - {id: 44, cat: Audio, desc: "Radio Shows"}
-    - {id: 45, cat: Audio, desc: "Audio Stand-up"}
-    - {id: 55, cat: Audio, desc: "Bootleg"}
-    - {id: 47, cat: Audio, desc: "Musical Comedy"}
-    - {id: 46, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 56, cat: Audio, desc: "Prank Calls"}
-    - {id: 57, cat: Audio, desc: "Skit/Sketch"}
-    - {id: 58, cat: Audio, desc: "Compilations"}
-    - {id: 61, cat: Audio, desc: "PodCast"}
-    # Comics
-    - {id: 49, cat: Books/Comics, desc: "Comics"}
-    # Books
-    - {id: 51, cat: Books/EBook, desc: "Books"}
-    # Random Oddities
-    - {id: 53, cat: TV, desc: "Random Oddities"}
-    - {id: 59, cat: TV, desc: "Late Night Talkshows"}
-    - {id: 77, cat: TV, desc: "Non-English language"}
-    # BY REQUEST ONLY
-    - {id: 19, cat: Movies, desc: "Movie DVD5/9"}
-    - {id: 20, cat: Movies, desc: "Movie AVI"}
-    - {id: 21, cat: Movies, desc: "Movie MKV"}
-    - {id: 62, cat: Movies, desc: "Movie MP4"}
-    - {id: 74, cat: Movies, desc: "Movie Xvid"}
-    - {id: 75, cat: Movies, desc: "Movie Other"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 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
-
-login:
-  path: index.php?page=login
-  method: form
-  form: form[action^="index.php?page=login"]
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: span[style="color:#FF0000;"]
-  test:
-    path: index.php
-    selector: a[href="/logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    page: torrents
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    search: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
-    fl: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-
-  rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details\"])"
-
-  fields:
-    category:
-      selector: td a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: td a[href^="index.php?page=torrent-details"]
-    details:
-      selector: td a[href^="index.php?page=torrent-details"]
-      attribute: href
-    description:
-      selector: td a[href^="index.php?page=torrents&category="]
-      attribute: title
-    download:
-      selector: td a[href^="/download.php"]
-      attribute: href
-    date:
-      # 22/01/21 01:28
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    grabs:
-      selector: td:nth-child(8)
-    size:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      case:
-        "strong:contains(\"FreeLeech\")": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 14 days (as seconds = 14 x 24 x 60 x 60)
-      text: 1209600
-# xbtit

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"}
@@ -167,7 +168,7 @@ search:
       attribute: href
       filters:
         - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
+          args: ["details.php?id=", "download_ssl.php?torrent="]
     poster:
       selector: div[id^="details"] img
       attribute: src

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

@@ -106,7 +106,7 @@ search:
     download:
       selector: download_link
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -116,6 +116,19 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(All Sex)", "All_Sex"]
+        - 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:
@@ -151,4 +164,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.3.0
+# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/demonoid.yml

@@ -12,13 +12,11 @@ links:
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
-  - https://demonoid.unblockit.bet/
+  - https://demonoid.unblockit.page/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.world/
 legacylinks:
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.li/
-  - https://demonoid.unblockit.uno/
   - https://demonoid.unblockit.ch/
   - https://demonoid.nocensor.space/
   - https://demonoid.unblockit.ws/
@@ -35,6 +33,9 @@ legacylinks:
   - https://demonoid.unblockit.name/
   - https://demonoid.nocensor.sbs/
   - https://demonoid.unblockit.ist/
+  - https://demonoid.unblockit.bet/
+  - https://demonoid.unblockit.cat/
+  - https://demonoid.unblockit.nz/
 
 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/dmhy.yml

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/docspedia.yml

@@ -29,10 +29,11 @@ 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]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     book-search: [q]
     music-search: [q]
 

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -1,181 +0,0 @@
----
-id: ebookparadijs
-name: EbookParadijs
-description: "EbookParadijs is a DUTCH Private Tracker for EBOOKS"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
-  - https://www.ebookparadijs.org/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Books/EBook, desc: "Roman"}
-    - {id: 3, cat: Books/EBook, desc: "Thriller"}
-    - {id: 4, cat: Books/EBook, desc: "Diverse"}
-    - {id: 7, cat: Books/EBook, desc: "Jeugd"}
-    - {id: 8, cat: Books/EBook, desc: "Oorlog"}
-    - {id: 9, cat: Books/EBook, desc: "Luisterboeken"}
-    - {id: 10, cat: Books/EBook, desc: "Stripboeken"}
-    - {id: 11, cat: Books/EBook, desc: "Crime"}
-    - {id: 13, cat: Books/EBook, desc: "Detective"}
-    - {id: 15, cat: Books/EBook, desc: "Erothiek"}
-    - {id: 16, cat: Books/EBook, desc: "Tijdschriften"}
-    - {id: 17, cat: Books/EBook, desc: "Hobby"}
-    - {id: 19, cat: Books/EBook, desc: "Medisch"}
-    - {id: 21, cat: Books/EBook, desc: "Sport"}
-    - {id: 50, cat: Books/EBook, desc: "Kookboeken"}
-    - {id: 51, cat: Books/EBook, desc: "Fantasy"}
-    - {id: 52, cat: Books/EBook, desc: "Kerst"}
-    - {id: 53, cat: Books/EBook, desc: "Waargebeurd"}
-    - {id: 56, cat: Books/EBook, desc: "Engels"}
-    - {id: 57, cat: Books/EBook, desc: "Maatschappij"}
-    - {id: 58, cat: Books/EBook, desc: "Biografie"}
-    - {id: 61, cat: Books/EBook, desc: "Geschiedenis"}
-    - {id: 60, cat: Books/EBook, desc: "Sci-Fi"}
-    - {id: 64, cat: Books/EBook, desc: "Literatuur"}
-    - {id: 65, cat: Books/EBook, desc: "Non-Fiction"}
-    - {id: 66, cat: Books/EBook, desc: "Bladmuziek"}
-    - {id: 67, cat: Books/EBook, desc: "young Adult"}
-    - {id: 68, cat: Books/EBook, desc: "feelgood romans"}
-
-  modes:
-    search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: thankyou
-    type: text
-    label: Thank You Comment
-  - name: info_comment
-    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:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    # https://www.ebookparadijs.org/comment.php?action=add&tid=23079
-    path: comment.php
-    method: post
-    inputs:
-      action: add
-      tid: "{{ .DownloadUri.Query.id }}"
-      text: "{{ .Config.thankyou }}"
-      submit: Opslaan
-  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
-
-  rows:
-    selector: "table.mainouter{{ if .Config.freeleech }}:has(img[src=\"pic/freedlfsu.gif\"]){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    poster:
-      selector: img[src*="/covers/"]
-      attribute: src
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    size:
-      selector: td:nth-child(4) table tr td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "(.+?) in"
-    files:
-      selector: td:nth-child(4) table tr td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "in (\\d+) bestan"
-    grabs:
-      selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
-    date:
-      selector: td:nth-child(4) table tr:nth-child(2) td:last-child
-      filters:
-        - name: replace
-          args: ["januari", "January"]
-        - name: replace
-          args: ["februari", "February"]
-        - name: replace
-          args: ["maart", "March"]
-        - name: replace
-          args: ["april", "April"]
-        - name: replace
-          args: ["mei", "May"]
-        - name: replace
-          args: ["juni", "June"]
-        - name: replace
-          args: ["juli", "July"]
-        - name: replace
-          args: ["augustus", "August"]
-        - name: replace
-          args: ["september", "September"]
-        - name: replace
-          args: ["oktober", "October"]
-        - name: replace
-          args: ["november", "November"]
-        - name: replace
-          args: ["december", "December"]
-        - name: re_replace
-          args: ["\\s*om\\s*", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
-    seeders_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  font b
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      case:
-        img[src="pic/freedlfsu.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# minimumratio: ratioless site, uses credit points instead.
-# engine n/a

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/ehentai.yml

@@ -5,6 +5,7 @@ description: "E-Hentai is a Public site for Hentai doujinshi, manga."
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://e-hentai.org/
 

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

@@ -5,6 +5,7 @@ description: "EliteTorrent.biz is a Public torrent site for TV, movies and docum
 language: es-ES
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.elitetorrent.com/
   - https://elitetorrent.nocensor.world/

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.page/
   - https://extratorrent.nocensor.world/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -23,6 +23,9 @@ legacylinks:
   - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
   - https://extratorrent.unblockit.ist/
+  - https://extratorrent.unblockit.bet/
+  - https://extratorrent.unblockit.cat/
+  - https://extratorrent.unblockit.nz/
 
 caps:
   categorymappings:
@@ -69,6 +72,7 @@ caps:
     - {id: Comics, cat: Books/Comics, desc: Books Comics}
     - {id: Ebooks, cat: Books/EBook, desc: Books Ebook}
     - {id: Other, cat: Other/Misc, desc: Other}
+    - {id: Other Applications, cat: PC, desc: Other Applications}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/extremebits.yml

@@ -41,7 +41,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
 

src/Jackett.Common/Definitions/exttorrents.yml

@@ -5,6 +5,7 @@ description: "EXT Torrents is a Public torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://ext.to/
   - https://site.extto.com/

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.page/
   - https://eztv.nocensor.world/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -21,8 +21,6 @@ legacylinks:
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
   - https://eztv.unblocked.monster/
-  - https://eztv.unblockit.li/
-  - https://eztv.unblockit.uno/
   - https://eztv.unblockit.ch/
   - https://eztv.nocensor.space/
   - https://eztv.unblockit.ws/
@@ -39,6 +37,9 @@ legacylinks:
   - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
   - https://eztv.unblockit.ist/
+  - https://eztv.unblockit.bet/
+  - https://eztv.unblockit.cat/
+  - https://eztv.unblockit.nz/
 
 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/film-paleis.yml

@@ -1,199 +0,0 @@
----
-id: film-paleis
-name: Film-Paleis
-description: "Film-Paleis is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
-  - https://www.film-paleis.me/
-legacylinks:
-  - http://www.film-paleis.me/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Movies/BluRay, desc: "Bluray/HD"}
-    - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
-    - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
-    - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
-    - {id: 7, cat: Movies/UHD, desc: "4K films"}
-    - {id: 8, cat: XXX, desc: "Erotiek"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
-    - {id: 10, cat: Audio, desc: "Muziek Album"}
-    - {id: 11, cat: Audio/Other, desc: "Muziek Diverse"}
-    - {id: 12, cat: Console/NDS, desc: "Nintendo"}
-    - {id: 13, cat: Movies, desc: "Classic"}
-    - {id: 15, cat: Other, desc: "Overige"}
-    - {id: 16, cat: PC/0day, desc: "PC Software"}
-    - {id: 17, cat: PC, desc: "PC Spellen"}
-    - {id: 19, cat: TV, desc: "TV Series"}
-    - {id: 21, cat: Movies/SD, desc: "Divx/Xvid"}
-    - {id: 24, cat: Books/EBook, desc: "E-Books"}
-    - {id: 26, cat: Audio/Other, desc: "Cabaret"}
-    - {id: 27, cat: TV/Documentary, desc: "Documentaire"}
-    - {id: 31, cat: Movies/HD, desc: "FP-release"}
-    - {id: 32, cat: Audio/Audiobook, desc: "Luister Boeken"}
-
-  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: flaresolverr
-    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.
-  - 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. Minimum of at least 10 characters.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    returnto: "/"
-  error:
-    - selector: td.embedded:contains("fout")
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    path: comment.php
-    method: post
-    inputs:
-      action: add
-      tid: "{{ .DownloadUri.Query.id }}"
-      text: "{{ .Config.thankyou }}"
-      submit: Opslaan
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: 1
-    # 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.mainouter
-    filters:
-      - name: andmatch
-
-  fields:
-    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:
-      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^="details.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/covers/"]
-      attribute: src
-    size:
-      selector: td:nth-child(4) table tr td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "(.+?) in"
-    files:
-      selector: td:nth-child(4) table tr td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "in (\\d+) bestan"
-    grabs:
-      selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
-    date:
-      selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(2)
-      filters:
-        - name: replace
-          args: ["januari", "January"]
-        - name: replace
-          args: ["februari", "February"]
-        - name: replace
-          args: ["maart", "March"]
-        - name: replace
-          args: ["april", "April"]
-        - name: replace
-          args: ["mei", "May"]
-        - name: replace
-          args: ["juni", "June"]
-        - name: replace
-          args: ["juli", "July"]
-        - name: replace
-          args: ["augustus", "August"]
-        - name: replace
-          args: ["september", "September"]
-        - name: replace
-          args: ["oktober", "October"]
-        - name: replace
-          args: ["november", "November"]
-        - name: replace
-          args: ["december", "December"]
-        - name: re_replace
-          args: ["\\s*om\\s*", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
-    seeders_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  font b
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      case:
-        img[src="pic/freedlfsu.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/finelite.yml

@@ -88,8 +88,8 @@ search:
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name&descr, 1 name, 2 descr, 3 tags
-    hae: 1
+    # 0 name, 1 name&desc, 2 descr, 3 tags, 4 imdb with rating
+    hae: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
     # 0 active, 1 incldead, 2 deadonly
     incldead: 1
     freeleech: "{{ if .Config.freeleech }}yes{{ else }}{{ end }}"
@@ -98,8 +98,6 @@ search:
 
   rows:
     selector: table.main > tbody >  tr:has(a[href^="/lataa.php/"])
-    filters:
-      - name: andmatch
 
   fields:
     category:
@@ -110,7 +108,6 @@ search:
           args: cat
     title:
       selector: a[href^="julkaisu.php?id="]
-      attribute: title
     details:
       selector: a[href^="julkaisu.php?id="]
       attribute: href
@@ -120,10 +117,8 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
-    files:
-      selector: td:nth-last-child(6)
     date:
-      # 26.03.2020 <br/>3:53
+      # 26.3.2022 <br/>3:53
       selector: td:nth-last-child(4)
       filters:
         - name: re_replace
@@ -131,7 +126,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2.01.2006 15:04 -07:00"
+          args: "2.1.2006 15:04 -07:00"
     size:
       selector: td:nth-last-child(3)
     seeders:

src/Jackett.Common/Definitions/firebit.yml

@@ -5,6 +5,7 @@ description: "FireBit is an UKRAINIAN / RUSSIAN Public Torrent Tracker for MOVIE
 language: ru-RU
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://firebit.net/
 legacylinks:
@@ -50,7 +51,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -63,12 +64,10 @@ download:
       attribute: href
 
 search:
-  # http://firebit.net/index.php?do=search&type=simple&q=2019
-  # http://firebit.net/%D1%84%D0%B8%D0%BB%D1%8C%D0%BC/  # movies
-  # http://firebit.net/%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/ # tv
+  # http://firebit.net/index.php?do=search&type=simple&q=2022
   paths:
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}%D1%84%D0%B8%D0%BB%D1%8C%D0%BC/{{ end }}"
-    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q=abcd1234{{ else }}%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/{{ end }}"
+    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}index.php?do=search&type=simple&q={{ .Keywords }}&cstart=2{{ else }}%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0/2/{{ end }}"
 
   rows:
     selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
@@ -77,6 +76,9 @@ search:
 
   fields:
     category:
+      text: "-"
+    category|noappend:
+      optional: true
       selector: td:nth-child(1), div.article-indent div b
       filters:
         - name: replace

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/frozenlayer.yml

@@ -5,6 +5,7 @@ description: "Frozen Layer is a SPANISH Public torrent site focused on ANIME"
 language: es-ES
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.frozen-layer.com/
 
@@ -39,7 +40,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
 
 search:
   paths:

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

@@ -5,6 +5,7 @@ description: "Gay-Torrents.net is a Private Torrent Tracker for GAY 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.gay-torrents.net/
 
@@ -87,7 +88,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     book-search: [q]
 

src/Jackett.Common/Definitions/gay-torrentsorg.yml

@@ -86,7 +86,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     book-search: [q]
 

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

@@ -186,4 +186,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.2.2
+# json UNIT3D 6.3.0

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/girotorrent.yml

@@ -221,18 +221,18 @@ search:
         - name: regexp
           args: "src=(.+?) "
     date:
-      selector: td:nth-last-child(8)
+      selector: td:nth-last-child(9)
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02/01/2006 -07:00"
     seeders:
-      selector: td:nth-last-child(7)
+      selector: td:nth-last-child(8)
     leechers:
-      selector: td:nth-last-child(6)
+      selector: td:nth-last-child(7)
     grabs:
-      selector: td:nth-last-child(5)
+      selector: td:nth-last-child(6)
     size:
       selector: td:nth-last-child(4)
     downloadvolumefactor:

src/Jackett.Common/Definitions/glodls.yml

@@ -10,15 +10,13 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.bet/
+  - https://glotorrents.unblockit.page/
   - https://glotorrents.nocensor.world/
   - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
   - https://glodls.unblocked.monster/
-  - https://glotorrents.unblockit.li/
-  - https://glotorrents.unblockit.uno/
   - https://glotorrents.unblockit.ch/
   - https://glotorrents.nocensor.space/
   - https://glotorrents.unblockit.ws/
@@ -35,6 +33,9 @@ legacylinks:
   - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
   - https://glotorrents.unblockit.ist/
+  - https://glotorrents.unblockit.bet/
+  - https://glotorrents.unblockit.cat/
+  - https://glotorrents.unblockit.nz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/haitang.yml

@@ -22,7 +22,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     music-search: [q]
 
 settings:

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/hd-unit3d-api.yml

@@ -0,0 +1,143 @@
+---
+id: hd-unit3d-api
+name: HD-UNiT3D (API)
+description: "HD-UNiT3D is a Private Torrent Tracker for HD MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://hd-united.vn/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Audio"}
+
+  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://hd-united.vn/\" target =_blank>HD-UNiT3D</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
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 6.3.0

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

@@ -20,7 +20,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
 
 settings:
@@ -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/hdgalaktik.yml

@@ -6,9 +6,10 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - https://hdgalaktik.com/
-  - https://freetmd.com/
   - https://www.trackerpmr.com/
+  - https://freetmd.com/
+legacylinks:
+  - https://hdgalaktik.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdonly.yml

@@ -26,7 +26,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
 
 settings:
@@ -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/hdturk.yml

@@ -105,6 +105,16 @@ login:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]
 
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="download.php?id="]
+      attribute: href
+
 search:
   paths:
     - path: browse.php
@@ -150,7 +160,7 @@ search:
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     download:
-      selector: a[href*="download.php?id="]
+      selector: div[id^="port-target-"] a
       attribute: href
     size:
       selector: td:nth-child(5)

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/hellashut.yml

@@ -0,0 +1,188 @@
+---
+id: hellashut
+name: HellasHut
+description: "HellasHut is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+testlinktorrent: false
+links:
+  - https://hellashut.de/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: TV/Anime, desc: "Anime/Cartoon HD"}
+    - {id: 47, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
+    - {id: 48, cat: TV/Anime, desc: "Anime/Cartoon SD"}
+    - {id: 50, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
+    - {id: 51, cat: TV/Anime, desc: "Anime/Cartoon TV"}
+    - {id: 77, cat: PC, desc: "Applications DOS"}
+    - {id: 20, cat: PC, desc: "Applications Linux"}
+    - {id: 19, cat: PC/Mac, desc: "Applications MAC"}
+    - {id: 68, cat: PC, desc: "Applications OS2 WARP"}
+    - {id: 21, cat: PC, desc: "Applications Other"}
+    - {id: 18, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 52, cat: Books, desc: "Books/Magazines All"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries All"}
+    - {id: 53, cat: TV/Documentary, desc: "Documentaries Greek"}
+    - {id: 54, cat: TV/Documentary, desc: "Documentaries HD"}
+    - {id: 55, cat: Movies/DVD, desc: "DVD-R All"}
+    - {id: 17, cat: Console/Other, desc: "Games Other"}
+    - {id: 11, cat: Console/PS4, desc: "Games PSX"}
+    - {id: 10, cat: PC/Games, desc: "Games Windows"}
+    - {id: 13, cat: Console/XBox, desc: "Games Xbox"}
+    - {id: 56, cat: Other, desc: "Miscellaneous All"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Mobile All"}
+    - {id: 1, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 2, cat: Movies/UHD, desc: "Movies 4K"}
+    - {id: 42, cat: Movies/BluRay, desc: "Movies BluRay"}
+    - {id: 58, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 4, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 69, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 3, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 67, cat: Movies/SD, desc: "Movies SD Packs"}
+    - {id: 71, cat: Audio, desc: "Music CDA"}
+    - {id: 59, cat: Audio, desc: "Music Discographies"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 22, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 25, cat: Audio/Video, desc: "Music Video"}
+    - {id: 75, cat: Movies/HD, desc: "NO IN SUBS Movies HD"}
+    - {id: 76, cat: Movies/UHD, desc: "NO SUBS IN Movies 4K"}
+    - {id: 35, cat: TV/Sport, desc: "Sports HD"}
+    - {id: 34, cat: TV/Sport, desc: "Sports SD"}
+    - {id: 5, cat: TV, desc: "TV Greek Movies"}
+    - {id: 6, cat: TV, desc: "TV Greek Series"}
+    - {id: 7, cat: TV, desc: "TV Greek Series Packs"}
+    - {id: 60, cat: TV, desc: "TV Greek Shows"}
+    - {id: 41, cat: TV/HD, desc: "TV HD"}
+    - {id: 61, cat: TV, desc: "TV Series"}
+    - {id: 62, cat: TV, desc: "TV Series Emb"}
+    - {id: 63, cat: TV, desc: "TV Series Emb Packs"}
+    - {id: 64, cat: TV/HD, desc: "TV Series HD"}
+    - {id: 65, cat: TV/HD, desc: "TV Series HD Packs"}
+    - {id: 66, cat: TV, desc: "TV Series Packs"}
+    - {id: 73, cat: Movies/BluRay, desc: "UNTOUCHED BluRay"}
+    - {id: 72, cat: Movies/DVD, desc: "UNTOUCHED DVD"}
+
+  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: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: td.embedded:contains("Access Denied")
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+download:
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    # https://hellashut.de/torrents-search.php?c52=1&search=&cat=0&incldead=1&advanced=1&lang=0&blah=0&freeleech=0&sort=id&order=desc
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    advanced: 1
+    # 0 all, 1 English, 2 French, 3 German, 4 Italian, 5 Japanese, 6 Spanish, 7 Russian, 8 Greek
+    lang: 0
+    # 0 name, 1 descr, 2 uploader
+    blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.ttable_headinner tr.t-row
+
+  fields:
+    category:
+      selector: a[href*="cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["&hit=1", ""] # avoid redirect
+    download:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["&hit=1", ""] # avoid redirect
+    size:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(6)
+    grabs:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src="pic/freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# TorrentTrader v2-svn

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/hqsource.yml

@@ -1,138 +0,0 @@
----
-id: hqsource
-name: HQSource
-description: "HQSource (HQS) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pl-PL
-type: private
-encoding: ISO-8859-2
-links:
-  - https://hqsource.org/
-legacylinks:
-  - http://hqsource.org/
-
-caps:
-  categorymappings:
-    - {id: 36, cat: Movies/3D, desc: "3D"}
-    - {id: 3, cat: Movies/UHD, desc: "4K/UHD"}
-    - {id: 2, cat: Movies/HD, desc: "BDRip"}
-    - {id: 1, cat: Movies/HD, desc: "BRRip"}
-    - {id: 49, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 8, cat: Movies/SD, desc: "DVD"}
-    - {id: 4, cat: TV/HD, desc: "HDTV"}
-    - {id: 7, cat: Movies/SD, desc: "HQDVDRip"}
-    - {id: 45, cat: Movies/HD, desc: "MKV"}
-    - {id: 11, cat: Audio, desc: "Music"}
-    - {id: 6, cat: Other, desc: "Special"}
-    - {id: 46, cat: PC, desc: "Tools"}
-    - {id: 9, cat: TV, desc: "TV-Series"}
-    - {id: 5, cat: Movies, desc: "WEB-DL"}
-    - {id: 35, 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: pin
-    type: text
-    label: Pin
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    pin: "{{ .Config.pin }}"
-    returnto: /
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
-    - selector: td.embedded:has(h2:contains("Error"))
-  test:
-    selector: a[href^="logout.php"]
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 1
-    polish: 0
-    # 0 both, 1 name, 2 desc
-    blah: 1
-
-  rows:
-    selector: table#line > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="]
-    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/"]
-      attribute: href
-    _language:
-      optional: true
-      selector: img[src="pic/pl.png"]
-      filters:
-        - name: append
-          args: "Language: polish\n<br>"
-    _subbed:
-      optional: true
-      selector: img[src="pic/napisy.png"]
-      filters:
-        - name: append
-          args: "Subbed\n<br>"
-    description:
-      text: "{{ .Result._language }}{{ .Result._subbed }}"
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-    grabs:
-      selector: td:nth-child(6)
-    size:
-      selector: td:nth-child(5)
-    date:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        "img[src=\"pic/download2.gif\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "img[src=\"pic/double.png\"]": 2
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine tbd

src/Jackett.Common/Definitions/idope.yml

@@ -5,6 +5,7 @@ description: "iDope is a Public torrent search engine presenting direct magnet l
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://idope.se/
 legacylinks:

src/Jackett.Common/Definitions/ihdbits.yml

@@ -0,0 +1,192 @@
+---
+id: ihdbits
+name: iHDBits
+description: "iHDBits is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://ihdbits.me/
+
+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 iHDBits 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:
+      # 5 day (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP 1.7.29 2022-10-13

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -6,6 +6,7 @@ language: it-IT
 type: public
 encoding: Windows-1252
 followredirect: true
+requestDelay: 2
 links:
   - https://ilcorsaronero.link/
   - https://ilcorsaronero.fun/

src/Jackett.Common/Definitions/internetarchive.yml

@@ -25,7 +25,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

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/jpopsuki.yml

@@ -5,6 +5,8 @@ description: "JPopSuki is a Private Torrent Tracker for ASIAN MUSIC"
 language: en-US
 type: private
 encoding: UTF-8
+certificates:
+  - 23b2a81c132d993d90cb5c7f1a28225bb8ab6d83 # expired 7th Oct 2022
 links:
   - https://jpopsuki.eu/
 

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/kickasstorrents-to.yml

@@ -5,6 +5,7 @@ description: "kickasstorrents.to is a Public KickAssTorrent clone for TV / MOVIE
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://kickasstorrents.to/
   - https://kickasstorrent.cr/

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/kufirc.yml

@@ -5,6 +5,8 @@ description: "Kufirc is a HUNGARIAN Private tracker for 3X"
 language: hu-HU
 type: private
 encoding: UTF-8
+certificates:
+  - 1a528cffb19a5306daa44f99e6cce5d2a3c657c1 # Expired 24 Oct 2022
 links:
   - https://kufirc.com/
 

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

@@ -15,20 +15,16 @@ caps:
     - {id: 3, cat: Audio, desc: "Musica"}
     - {id: 4, cat: Console, desc: "Juegos"}
     - {id: 5, cat: TV/Anime, desc: "Anime"}
-    - {id: 6, cat: Movies/Other, desc: "Retro Pelicula"}
-    - {id: 7, cat: TV/Other, desc: "Retro Serie TV"}
-    - {id: 8, cat: TV/Foreign, desc: "Telenovelas y Teleseries"}
+    - {id: 8, cat: TV/Foreign, desc: "Telenovelas"}
     - {id: 9, cat: Audio/Video, desc: "Conciertos"}
-    - {id: 10, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 11, cat: Other, desc: "Videotutoriales y Educativo"}
+    - {id: 11, cat: Audio/Audiobook, desc: "Audiolibros"}
     - {id: 12, cat: XXX, desc: "XXX"}
-    - {id: 16, cat: TV/Sport, desc: "Deportes"}
-    - {id: 17, cat: PC, desc: "Sistemas Operativos"}
+    - {id: 16, cat: TV/Sport, desc: "Eventos Deportivos"}
+    - {id: 17, cat: PC, desc: "Software & O.S."}
     - {id: 18, cat: Books, desc: "E-Books"}
-    - {id: 19, cat: Audio/Audiobook, desc: "Audiolibros"}
-    - {id: 20, cat: Movies/Other, desc: "Películas Oscars"}
-    - {id: 21, cat: Audio/Video, desc: "VideoMixes"}
+    - {id: 20, cat: TV/Foreign, desc: "Doramas & Turcas"}
     - {id: 22, cat: TV/Other, desc: "Playlist_Collection"}
+    - {id: 24, cat: Other, desc: "Cursos"}
 
   modes:
     search: [q]
@@ -97,8 +93,6 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["\\.", " "]
-    - name: re_replace
-      args: ["(?i)\\bS(\\d+)", "T$1"]
 
   rows:
     selector: data
@@ -113,24 +107,12 @@ search:
       selector: name:contains(VOSE)
       optional: true
       filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
         - name: append
           args: " ENGLiSH"
     title_notvose:
       selector: name:not(:contains(VOSE))
       optional: true
       filters:
-        - name: re_replace
-          args: ["^ *\\[[^\\]]*\\] *", ""] # Remove prefix tags
-        - name: re_replace
-          args: ["(?i)\\bT(\\d+)", "S$1"]
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
         - name: append
           args: " SPANiSH"
     title:
@@ -142,7 +124,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -152,6 +134,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:
@@ -181,9 +174,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
-    minimumratio:
-      text: 1.0
+# global MR is 0.4 but torrents must be seeded for 2 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 4 days (as seconds = 4 x 24 x 60 x 60)
-      text: 345600
-# json UNIT3D 6.2.1
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/learnflakes.yml

@@ -5,6 +5,7 @@ description: "LearnFlakes is a Private Torrent Tracker for CERTIFICATE / TRAININ
 language: en-US
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://learnflakes.net/
 

src/Jackett.Common/Definitions/legittorrents.yml

@@ -24,7 +24,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

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.page/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.world/
 legacylinks:
@@ -22,7 +22,6 @@ legacylinks:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.unblockit.uno/
   - https://limetorrents.unblockit.ch/
   - https://limetorrents.nocensor.space/
   - https://limetorrents.unblockit.ws/
@@ -40,6 +39,9 @@ legacylinks:
   - https://limetorrents.unblockit.name/
   - https://limetorrents.nocensor.sbs/
   - https://limetorrents.unblockit.ist/
+  - https://limetorrents.unblockit.bet/
+  - https://limetorrents.unblockit.cat/
+  - https://limetorrents.unblockit.nz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/linuxtracker.yml

@@ -5,6 +5,7 @@ description: "LinuxTracker is a Public Linux ISO Torrent Repository"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://linuxtracker.org/
 
@@ -69,12 +70,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 +88,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 +137,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 +155,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 +163,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"}
@@ -247,15 +255,18 @@ caps:
     - {id: 2126, cat: PC/ISO, desc: "Solus"}
     - {id: 2127, cat: PC/ISO, desc: "Solydxk"}
     - {id: 1236, cat: PC/ISO, desc: "SparkyLinux"}
+    - {id: 2297, cat: PC/ISO, desc: "SpiralLinux"}
     - {id: 2225, cat: PC/ISO, desc: "Star"}
     - {id: 2132, cat: PC/ISO, desc: "Steamos"}
     - {id: 2174, cat: PC/ISO, desc: "Super Grub2 Disk"}
     - {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 +297,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/locadora.yml

@@ -147,4 +147,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# json UNIT3D 6.2.1
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/lst.yml

@@ -148,10 +148,10 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
-# global MR is 1.0 but torrents must be seeded for 3 days regardless of ratio
+# global MR is 1.0 but torrents must be seeded for 5 days regardless of ratio
 #    minimumratio:
 #      text: 1.0
     minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# json UNIT3D 6.2.1
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.3.0

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: