trackeors: fix cats. resolves #12808

untested, the categories need to be confirmed.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -51,6 +51,7 @@ body:
     description: |
       Place any relevant error messages you noticed from the logs here.
       Make sure you attach the full logs with your personal information removed in case we need more information.
+    render: text
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/indexer-request.yml

@@ -32,11 +32,11 @@ body:
       - Minimum Seeding Time and Minimum Ratio (if Private): MST 24hrs, MR 1.0
       - Additional Comments: IMDB search has to be enabled in account settings, often has hcaptcha at login
     value: |
-      - Name:
-      - URL:
-      - Description:
-      - Minimum Seeding Time and Minimum Ratio (if Private):
-      - Additional Comments:
+      - Name: 
+      - URL: 
+      - Description: 
+      - Minimum Seeding Time and Minimum Ratio (if Private): 
+      - Additional Comments: 
     render: markdown
   validations:
     required: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,89 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - src/**/*.cs
+      - src/**/*.js
+      - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.IntegrationTests/**'
+      - '!src/Jackett.Test/**'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+    paths:
+      - src/**/*.cs
+      - src/**/*.js
+      - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.IntegrationTests/**'
+      - '!src/Jackett.Test/**'
+  schedule:
+    - cron: '00 00 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Set up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.*'
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      

CONTRIBUTING.md

@@ -104,24 +104,31 @@ We've developed the guide below to make sure we're all on the same page because
 The following guide assumes you've never worked with a Visual Studio project with GitHub before.
 This will give you the minimum necessary tools to get started. There are plenty of optional tools that may help you, but we won't cover those here.
 
-- The guide is currently only geared towards developing on Windows using Visual Studio Community 2019.
+- The guide is currently only geared towards developing on Windows using Visual Studio Community 2022.
 If you use something else, please add it here for others.
 
 <details open=true> <summary> Windows </summary>
 
-<details open=true> <summary> Visual Studio 2019 </summary>
+<details open=true> <summary> Visual Studio 2022 </summary>
 
-- Install [Visual Studio Community 2019](http://visualstudio.com) for free.
+- Install [Visual Studio Community 2022](https://visualstudio.microsoft.com/vs/) for free.
   - About 2GB download. 8GB installed.
-  -  Make sure it includes the following Workloads/Components:
-     -  .Net Desktop Development
-     -  .Net Core Cross-Platform Development
-     -  GitHub extension for Visual Studio
-- [Connect and synchronize your forked repository to Visual Studio](https://doc.fireflymigration.com/working-with-github-fork-in-visual-studio.html)
-- Open  `Tools -> NuGet Package Manager -> Package Manager Console`
-- From the PMC, run `dotnet tool install -g dotnet-format` and `dotnet restore`
-- Run `Build -> Rebuild Solution` to restore NuGet packages
-- Ensure `Jackett.Server` is the Startup Project (instead of `Jackett.Service`), and the Run Target (instead of `IIS Express`)
+  -  Make sure it includes the following Workload and Individual Components:
+     -  .NET desktop development
+     -  .Net Framework 4.6.1 SDK
+     -  .Net Framework 4.6.1 targeting pack
+- From the `Get Started` screen:
+  - `Clone a repository -> Browse a repository -> GitHub -> Sign in -> clone your forked repository`
+- Double-click `Jackett.sln` in `Solution Explorer` to load your project
+- Ensure `Jackett.Server` is the Startup Project (instead of `Jackett.Service`) and the Run Target (instead of `IIS Express`)
+- Open `Tools -> NuGet Package Manager -> Package Manager Console`
+- From the PMC, with `Jackett.Service` as the default project, run:
+  - `dotnet tool install -g dotnet-format`
+  - `dotnet msbuild /restore`
+  - `dotnet restore`
+  - `dotnet build`
+- [For more information on working with your forked GitHub repository in Visual Studio](https://doc.fireflymigration.com/working-with-github-fork-in-visual-studio.html)
+  - UPDATE: changes are now made in `Git Changes` and `Git Repository` (instead of `Team Explorer`)
 
 </details>
 

README.md

@@ -66,6 +66,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EZTV
  * FileListing
  * FireBit
+ * freshMeat
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -103,7 +104,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
- * OnceSearch
  * OneJAV
  * OpenSharing
  * OxTorrent
@@ -114,7 +114,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Pornforall
  * PornLeech
  * PornoLive
- * PornoRip
  * PornosLab
  * PornoTor
  * PornoTorrent
@@ -132,12 +131,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sexxi
  * Sexy-Pics
  * ShizaProject
- * shokweb
  * ShowRSS
  * Solid Torrents
  * sosulki
  * SubsPlease
  * sukebei.Nyaa.si
+ * TodoTorrents
  * The Pirate Bay (TPB)
  * Tokyo Tosho
  * Torlock
@@ -181,8 +180,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
+ * 720pier
  * AniDUB
  * Anime-Free
+ * AnimeLayer
  * ArenaBG
  * BaibaKo
  * BookTracker
@@ -245,7 +246,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
  * 4thD (4th Dimension)
  * 52PT
- * 720pier
  * Abnormal
  * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L)
@@ -264,7 +264,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * AsianCinema
- * AsianDVDClub
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
@@ -288,6 +287,7 @@ 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
@@ -337,7 +337,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * EbookParadijs
  * Ebooks-Shares
- * EfectoDoppler
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
  * eStone (XiDER, BeLoad, BigTorrent)
@@ -369,6 +368,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HaiDan
  * Haitang
  * HappyFappy
+ * Hawke-uno
  * HD Dolby
  * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
@@ -388,6 +388,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDME
+ * HDMonkey
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
  * HDTime
@@ -401,7 +402,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Il Corsaro Verde
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
- * ImmortalSeed (iS) [![(invite needed)][inviteneeded]](#)
+ * ImmortalSeed (iS)
  * Immortuos [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
@@ -409,6 +410,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * JPTV
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * KrazyZone
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
@@ -426,6 +428,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
+ * MediaMaatjes
  * MegamixTracker
  * MeseVilág (Fairytale World)
  * MicroBit (µBit)
@@ -436,11 +439,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
+ * Movie-Torrentz
  * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
- * Nbytez
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
@@ -456,6 +459,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * P2PElite
  * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
+ * Peeratiko
  * PeerJunkies
  * Peers.FM
  * Pirata Digital
@@ -487,8 +491,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RacingForMe (RFM)
  * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
- * Redacted (PassTheHeadphones) [![(invite needed)][inviteneeded]](#)
- * Renegade
+ * Redacted (PassTheHeadphones)
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
@@ -513,6 +516,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpeedCD
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
  * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
+ * SpiderTK
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
@@ -571,6 +575,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
+ * TvRoad
  * TVstore
  * Twilight Torrents
  * Twilights Zoom
@@ -730,7 +735,7 @@ Detailed instructions are available at [LinuxServer.io Jackett Docker](https://h
 
 
 ## Installation on Synology
-Jackett is available as a beta package from [SynoCommunity](https://synocommunity.com/)
+Jackett is available as a [beta package](https://synocommunity.com/package/jackett) from [SynoCommunity](https://synocommunity.com/)
 
 
 ## Running Jackett behind a reverse proxy
@@ -774,6 +779,7 @@ For these cases, [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) ha
 Setting up this service is optional, most indexers don't need it.
 * Install FlareSolverr service (following their instructions)
 * Configure **FlareSolverr API URL** in Jackett. For example: http://172.17.0.2:8191
+* It is recommended to keep the default value in **FlareSolverr Max Timeout (ms)**
 
 ## Configuring OMDb
 This feature is used as a fallback (when using the aggregate Indexer) to get the movie/series title if only the IMDB ID is provided in the request.

src/Jackett.Common/Content/custom.css

@@ -247,7 +247,7 @@ pre {
     white-space: nowrap;
 }
 
-.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+.dataTables_filter input, select {
     display: inline-block;
     height: 26px;
     padding: 0 8px;

src/Jackett.Common/Content/custom.js

@@ -130,6 +130,7 @@ function loadJackettSettings() {
         }
 
         $("#jackett-flaresolverrurl").val(data.flaresolverrurl);
+        $("#jackett-flaresolverr-maxtimeout").val(data.flaresolverr_maxtimeout);
         $("#jackett-omdbkey").val(data.omdbkey);
         $("#jackett-omdburl").val(data.omdburl);
         var password = data.password;
@@ -1500,6 +1501,7 @@ function bindUIButtons() {
         var jackett_cache_ttl = $("#jackett-cache-ttl").val();
         var jackett_cache_max_results_per_indexer = $("#jackett-cache-max-results-per-indexer").val();
         var jackett_flaresolverr_url = $("#jackett-flaresolverrurl").val();
+        var jackett_flaresolverr_maxtimeout = $("#jackett-flaresolverr-maxtimeout").val();
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();
 
@@ -1522,6 +1524,7 @@ function bindUIButtons() {
             cache_ttl: jackett_cache_ttl,
             cache_max_results_per_indexer: jackett_cache_max_results_per_indexer,
             flaresolverrurl: jackett_flaresolverr_url,
+            flaresolverr_maxtimeout: jackett_flaresolverr_maxtimeout,
             omdbkey: jackett_omdb_key,
             omdburl: jackett_omdb_url,
             proxy_type: jackett_proxy_type,

src/Jackett.Common/Content/custom_mobile.css

@@ -231,7 +231,7 @@ pre {
     white-space: nowrap;
 }
 
-.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+.dataTables_filter input, select {
     display: inline-block;
     height: 26px;
     padding: 0 8px;

src/Jackett.Common/Content/index.html

@@ -28,8 +28,8 @@
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=PR12083" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=11662" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=PR12772" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=PR12772" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -191,16 +191,20 @@
         </div>
         <div class="input-area">
             <span class="input-header">Cache TTL (seconds): </span>
-            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="">
+            <input id="jackett-cache-ttl" class="form-control input-right" type="text" value="" placeholder="2100">
         </div>
         <div class="input-area">
             <span class="input-header">Cache max results per indexer: </span>
-            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="">
+            <input id="jackett-cache-max-results-per-indexer" class="form-control input-right" type="text" value="" placeholder="1000">
         </div>
         <div class="input-area">
           <span class="input-header">FlareSolverr API URL: </span>
           <input id="jackett-flaresolverrurl" class="form-control input-right" type="text" value="" placeholder="Blank for default">
         </div>
+        <div class="input-area">
+          <span class="input-header">FlareSolverr Max Timeout (ms): </span>
+          <input id="jackett-flaresolverr-maxtimeout" class="form-control input-right" type="text" value="" placeholder="55000">
+        </div>
         <div class="input-area">
             <span class="input-header">OMDB API key: </span>
             <input id="jackett-omdbkey" class="form-control input-right" type="text" value="" placeholder="">
@@ -732,6 +736,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2021103101"></script>
+    <script type="text/javascript" src="../custom.js?changed=2022010901"></script>
 </body>
 </html>

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

@@ -13,27 +13,9 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.tv/
+  - https://1337x.unblockit.how/
   - https://1337x.nocensor.biz/
 legacylinks:
-  - https://1337x.unblocked.earth/
-  - https://1337x.unblockit.pro/
-  - https://1337x.unblockit.one/
-  - https://1337x.black-mirror.xyz/
-  - https://1337x.unblocked.casa/
-  - https://1337x.proxyportal.fun/
-  - https://1337x.uk-unblock.xyz/
-  - https://1337x.ind-unblock.xyz/
-  - https://1337x.unblockninja.com/ # 403 Forbidden
-  - https://1337x.unblockit.me/
-  - https://1337x.unblockit.pw/
-  - https://1337x.unblockit.id/
-  - https://1337x.unblockit.win/
-  - https://1337x.unblocked.bar/
-  - https://1337x.proxyportal.pw/
-  - https://1337x.uk-unblock.pro/
-  - https://1337x.unblockit.top/
-  - https://1337x.unblockit.lat/
   - https://1337x.unblockit.app/
   - https://1337.root.yt/
   - https://1337x.unblocked.rest/
@@ -53,6 +35,7 @@ legacylinks:
   - https://1337x.nocensor.work/
   - https://1337x.unblockit.kim/
   - https://1337x.unblockit.bz/
+  - https://1337x.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/24rolika.yml

@@ -10,7 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: xxx, cat: XXX, desc: xxx}
+    # only subcategories of Порно фильмы (Movies) have torrents
+    - {id: 94, cat: XXX, desc: "4K порно фильмы", default: true}
+    - {id: 76, cat: XXX, desc: "Японские порно фильмы", default: true}
+    - {id: 81, cat: XXX, desc: "Бразильские порно фильмы", default: true}
+    - {id: 41, cat: XXX, desc: "Итальянские порно фильмы", default: true}
+    - {id: 42, cat: XXX, desc: "Американские порно фильмы", default: true}
+    - {id: 43, cat: XXX, desc: "Немецкие порно фильмы", default: true}
+    - {id: 44, cat: XXX, desc: "Французские порно фильмы", default: true}
+    - {id: 45, cat: XXX, desc: "Русские порно фильмы", default: true}
+    - {id: 47, cat: XXX, desc: "Порно фильмы 2018 года", default: true}
+    - {id: 75, cat: XXX, desc: "Порно фильмы 2019 года", default: true}
+    - {id: 92, cat: XXX, desc: "Порно фильмы 2020 года", default: true}
+    - {id: 93, cat: XXX, desc: "Порно фильмы 2021 года", default: true}
+    - {id: 48, cat: XXX, desc: "Ретро / Классика", default: true}
+    - {id: 49, cat: XXX, desc: "С русским переводом", default: true}
+    - {id: 82, cat: XXX, desc: "С сюжетом", default: true}
+    - {id: 91, cat: XXX, desc: "Пародии", default: true}
+    - {id: 51, cat: XXX, desc: "Brazzers", default: true}
+    - {id: 52, cat: XXX, desc: "BangBros", default: true}
+    - {id: 53, cat: XXX, desc: "Marc Dorcel", default: true}
+    - {id: 54, cat: XXX, desc: "Evil Angel", default: true}
+    - {id: 55, cat: XXX, desc: "Tushy", default: true}
+    - {id: 56, cat: XXX, desc: "Blacked", default: true}
+    - {id: 57, cat: XXX, desc: "Evil Playgrounds", default: true}
+    - {id: 58, cat: XXX, desc: "Reality Kings", default: true}
+    - {id: 59, cat: XXX, desc: "New Sensations", default: true}
+    - {id: 60, cat: XXX, desc: "Wicked Pictures", default: true}
+    - {id: 61, cat: XXX, desc: "21Sextury", default: true}
+    - {id: 62, cat: XXX, desc: "PornPros", default: true}
+    - {id: 63, cat: XXX, desc: "Private", default: true}
+    - {id: 64, cat: XXX, desc: "DD Busty", default: true}
+    - {id: 65, cat: XXX, desc: "Naughty America", default: true}
+    - {id: 66, cat: XXX, desc: "Third Degree Films", default: true}
+    - {id: 67, cat: XXX, desc: "Hustler", default: true}
+    - {id: 68, cat: XXX, desc: "Blacks on Blondes", default: true}
+    - {id: 69, cat: XXX, desc: "Team Skeet", default: true}
+    - {id: 70, cat: XXX, desc: "Mofos", default: true}
+    - {id: 71, cat: XXX, desc: "Vixen", default: true}
+    - {id: 72, cat: XXX, desc: "Jules Jordan", default: true}
+    - {id: 73, cat: XXX, desc: "Nubile Films", default: true}
+    - {id: 74, cat: XXX, desc: "Digital Playground", default: true}
+    - {id: 83, cat: XXX, desc: "Zero Tolerance", default: true}
+    - {id: 84, cat: XXX, desc: "Pure Taboo", default: true}
+    - {id: 85, cat: XXX, desc: "Devil's Film", default: true}
+    - {id: 86, cat: XXX, desc: "Sweet Sinner", default: true}
+    - {id: 87, cat: XXX, desc: "Penthouse", default: true}
+    - {id: 88, cat: XXX, desc: "Elegant Angel", default: true}
+    - {id: 89, cat: XXX, desc: "Digital Sin", default: true}
 
   modes:
     search: [q]
@@ -41,26 +88,28 @@ search:
   paths:
     - path: index.php
   inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
     do: search
     subaction: search
     search_start: 0
     full_search: 1
     result_from: 1
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%D0%9F%D0%BE%D0%B8%D1%81%D0%BA{{ end }}"
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     # 0 in article 1 in comments 2 in static pages 3 in article titles
     titleonly: 3
     sortby: "{{ .Config.sort }}"
     resorder: "{{ .Config.type }}"
     showposts: 0
-    # does not have categories in results so there is little point in providing a full category map or multi-cat search support
-    catlist[]: 0
+
+  headers:
+    Referer: ["{{ .Config.sitelink }}"]
 
   rows:
     selector: article.shortstory
 
   fields:
     category:
-      text: xxx
+      text: 94
     title:
       selector: h2.short_title a
     details:

src/Jackett.Common/Definitions/aither.yml

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

src/Jackett.Common/Definitions/anime-free.yml

@@ -6,6 +6,8 @@ language: ru-RU
 type: semi-private
 encoding: windows-1251
 testlinktorrent: false
+certificates:
+  - 2b49b401259cb893f37de9eff343f7d356b1c2f2 # expired 8 ‎January ‎2022
 links:
   - https://anime-free.biz/
 legacylinks:

src/Jackett.Common/Definitions/animelayer.yml

@@ -0,0 +1,201 @@
+---
+id: animelayer
+name: AnimeLayer
+description: "AnimeLayer is a RUSSIAN Semi-Private Torrent Tracker for ANIME"
+language: ru-RU
+type: semi-private
+encoding: UTF-8
+links:
+  - https://www.animelayer.ru/
+
+caps:
+  categorymappings:
+    - {id: аниме, cat: TV/Anime, desc: Аниме}
+    - {id: музыка, cat: Audio, desc: Музыка}
+    - {id: манга, cat: Books, desc: Манга}
+    - {id: дорама, cat: TV, desc: Дорама}
+
+  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: category-id
+    type: select
+    label: Category
+    default: anime
+    options:
+      anime: Аниме
+      music: Музыка
+      manga: Манга
+      dorama: Дорама
+
+login:
+  path: login.php
+  method: form
+  form: form#loginForm
+  inputs:
+    login: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.error
+  test:
+    path: /
+    selector: a[href^="/auth/logout/"]
+
+search:
+  paths:
+    - path: "torrents/{{ .Config.category-id }}/"
+  inputs:
+    q: "{{ .Keywords }}"
+
+  rows:
+    selector: ul.torrents-list li.torrent-item:has(a[href^="/torrent/"])
+
+  fields:
+    category:
+      selector: label.category
+    resolution:
+      selector: div.description
+      filters:
+        - name: regexp
+          args: "Разрешение:\\s+\\d{3,4}\\D(\\d{3,4})"
+    title:
+      selector: img
+      attribute: alt
+      filters:
+        - name: append
+          args: "{{ if .Result.resolution }} [{{ .Result.resolution }}p]{{ else }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/torrent/"]
+      attribute: href
+      filters:
+        - name: append
+          args: download/
+    poster:
+      selector: img
+      attribute: data-original
+    size:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 2]
+    date_noyear:
+      # <span class="gray">Добавлен:</span>&nbsp;18 августа в&nbsp;21:39
+      selector: div.info
+      filters:
+        - name: regexp
+          args: "н:\\s(\\d{1,2} \\D{3,8} в\\s\\d{1,2}:\\d{2})"
+        - name: replace
+          args: ["\xA0", " "]
+        - name: replace
+          args: ["Обновлён:", ""]
+        - name: replace
+          args: ["Добавлен:", ""]
+        - name: replace
+          args: [" в ", " "]
+        - name: replace
+          args: ["января", "January {{ .Today.Year }}"]
+        - name: replace
+          args: ["февраля", "February {{ .Today.Year }}"]
+        - name: replace
+          args: ["марта", "March {{ .Today.Year }}"]
+        - name: replace
+          args: ["апреля", "April {{ .Today.Year }}"]
+        - name: replace
+          args: ["мая", "May {{ .Today.Year }}"]
+        - name: replace
+          args: ["июня", "June {{ .Today.Year }}"]
+        - name: replace
+          args: ["июля", "July {{ .Today.Year }}"]
+        - name: replace
+          args: ["августа", "August {{ .Today.Year }}"]
+        - name: replace
+          args: ["сентября", "September {{ .Today.Year }}"]
+        - name: replace
+          args: ["октября", "October {{ .Today.Year }}"]
+        - name: replace
+          args: ["ноября", "November {{ .Today.Year }}"]
+        - name: replace
+          args: ["декабря", "December {{ .Today.Year }}"]
+        - name: re_replace
+          args: ["\\s(\\d\\:)", " 0$1"]
+    date_year:
+      # <span class="gray">Обновлён:</span>&nbsp;3 октября 2019 в&nbsp;6:02
+      selector: div.info
+      filters:
+        - name: regexp
+          args: "н:\\s(\\d{1,2} \\D{3,8} \\d{4} в\\s\\d{1,2}:\\d{2})"
+        - name: replace
+          args: ["\xA0", " "]
+        - name: replace
+          args: ["Обновлён:", ""]
+        - name: replace
+          args: ["Добавлен:", ""]
+        - name: replace
+          args: [" в ", " "]
+        - name: replace
+          args: ["января", "January"]
+        - name: replace
+          args: ["февраля", "February"]
+        - name: replace
+          args: ["марта", "March"]
+        - name: replace
+          args: ["апреля", "April"]
+        - name: replace
+          args: ["мая", "May"]
+        - name: replace
+          args: ["июня", "June"]
+        - name: replace
+          args: ["июля", "July"]
+        - name: replace
+          args: ["августа", "August"]
+        - name: replace
+          args: ["сентября", "September"]
+        - name: replace
+          args: ["октября", "October"]
+        - name: replace
+          args: ["ноября", "November"]
+        - name: replace
+          args: ["декабря", "December"]
+        - name: re_replace
+          args: ["\\s(\\d\\:)", " 0$1"]
+    date:
+      text: "{{ if or .Result.date_year .Result.date_noyear }}{{ or .Result.date_year .Result.date_noyear }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 0]
+    leechers:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 1]
+    subtitles:
+      filters:
+        - name: regexp
+          args: "Субтитры:(.+?)\\n"
+    language:
+      filters:
+        - name: regexp
+          args: "Язык:(.+?)\\n"
+    description:
+      text: "{{ if .Result.subtitles }}Субтитры: {{ .Result.subtitles }}{{ else }}{{ end }} - {{ if .Result.language }}Язык: {{ .Result.language }}{{ else }}{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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

@@ -11,18 +11,21 @@ links:
 caps:
   # dont forget to update the case block in the search fields category
   categorymappings:
-    - {id: 1, cat: Movies/Other, desc: "Anime Movie"}
-    - {id: 2, cat: TV/Anime, desc: "Anime Serie"}
-    - {id: 3, cat: Audio, desc: "Anime Musik/OST"}
+    - {id: 1, cat: Movies/Other, desc: "Anime Filme"}
+    - {id: 2, cat: TV/Anime, desc: "Anime Serien"}
+    - {id: 3, cat: Audio, desc: "Anime Musik / OSTs"}
     - {id: 4, cat: PC/Games, desc: "Anime Spiele"}
-    - {id: 5, cat: XXX, desc: "Hentai"}
-    - {id: 6, cat: PC, desc: "Spiele Linux"}
+    - {id: 5, cat: XXX, desc: "Anime Hentai"}
+    - {id: 6, cat: PC, desc: "Software"}
     - {id: 7, cat: Other, desc: "Sonstiges"}
     - {id: 8, cat: Movies, desc: "Filme"}
     - {id: 9, cat: TV, desc: "Serien"}
     - {id: 10, cat: PC/Games, desc: "Spiele"}
     - {id: 11, cat: Audio, desc: "Musik"}
-    - {id: 12, cat: Books, desc: "Mangas"}
+    - {id: 12, cat: Books, desc: "Manga"}
+    - {id: 13, cat: Movies, desc: "Cartoon Filme"}
+    - {id: 14, cat: TV, desc: "Cartoon Serie"}
+    - {id: 15, cat: XXX, desc: "H-Manga / Doujinshi"}
 
   modes:
     search: [q]
@@ -78,18 +81,21 @@ search:
     category:
       selector: category
       case:
-        "Anime Movie": 1
-        "Anime Serie": 2
-        "Anime Musik/OST": 3
+        "Anime Filme": 1
+        "Anime Serien": 2
+        "Anime Musik / OSTs": 3
         "Anime Spiele": 4
-        "Hentai": 5
-        "Spiele Linux": 6
+        "Anime Hentai": 5
+        "Software": 6
         "Sonstiges": 7
-        "Filme": 8
         "Serien": 9
         "Spiele": 10
         "Musik": 11
-        "Mangas": 12
+        "Manga": 12
+        "Cartoon Filme": 13
+        "Cartoon Serie": 14
+        "H-Manga / Doujinshi": 15
+        "Filme": 8
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/animeworld.yml

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

src/Jackett.Common/Definitions/arabp2p.yml

@@ -126,6 +126,8 @@ search:
 
   rows:
     selector: table.torrent tr.torrent
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/asiandvdclub.yml

@@ -1,125 +0,0 @@
----
-id: asiandvdclub
-name: AsianDVDClub
-description: "AsianDVDClub (ADC) is a Private Torrent Tracker for Asian DVD and BluRay"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://asiandvdclub.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-    - {id: 3, cat: Movies, desc: "Japan"}
-    - {id: 5, cat: Movies, desc: "China"}
-    - {id: 4, cat: Movies, desc: "Korea"}
-    - {id: 2, cat: Movies, desc: "Hong Kong"}
-    - {id: 6, cat: Movies, desc: "Philippines"}
-    - {id: 7, cat: Movies, desc: "Taiwan"}
-    - {id: 8, cat: Movies, desc: "Thailand"}
-    - {id: 9, cat: Movies, desc: "Vietnam"}
-    - {id: 10, cat: Movies, desc: "Malaysia"}
-    - {id: 11, cat: Movies, desc: "Other Asian"}
-    - {id: 12, cat: Other, desc: "Miscellaneous"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-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.
-
-login:
-  path: login
-  method: post
-  inputs:
-    apple: evil
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: p:contains("Error")
-  test:
-    path: index
-    selector: a[href="/logout"]
-
-search:
-  paths:
-    - path: torrents/
-  inputs:
-    $raw: "{{ range .Categories }}countries[]={{.}}&{{end}}"
-    searchbox: "{{ .Keywords }}"
-    search: Search
-    golden: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table.torrenttable_helper > tbody > tr:has(img)
-
-  fields:
-    category:
-      selector: img[class^="cat-"]
-      attribute: class
-      case:
-        img.cat-anime: 1
-        img.cat-hk: 2
-        img.cat-japan: 3
-        img.cat-korea: 4
-        img.cat-china: 5
-        img.cat-phil: 6
-        img.cat-taiwan: 7
-        img.cat-thai: 8
-        img.cat-viet: 9
-        img.cat-malaysia: 10
-        img.cat-rest: 11
-        img.cat-misc: 12 # unconfirmed as there are currently no torrents for cat[12]
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["torrent", "download"]
-    size:
-      selector: td:nth-last-child(6)
-    seeders:
-      selector: td:nth-last-child(5)
-    leechers:
-      selector: td:nth-last-child(4)
-    date:
-      selector: td:nth-last-child(3)
-      remove: p
-      filters:
-        - name: timeago
-    grabs:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="../images/golden.gif"]: 0
-        img[src="../images/silver.gif"]: 0.5 # unconfirmed as there are currently no silver torrents
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.5
-    minimumseedtime:
-      # 45 days (as seconds = 45 x 24 x 60 x 60)
-      text: 3888000
-# Engine n/a

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.nl/ # site forces http, does not support https
   - http://audiobookbay.ws/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.tv/
+  - https://audiobookbay.unblockit.how/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
@@ -27,6 +27,7 @@ legacylinks:
   - http://audiobookbay.net/
   - https://audiobookbay.unblockit.kim/
   - https://audiobookbay.unblockit.bz/
+  - https://audiobookbay.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -101,6 +101,8 @@ search:
 
   rows:
     selector: table > tbody#highlighted > tr:has(a[href^="browse.php?cat="])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/bitbazis.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 69, cat: TV/Anime, desc: "Mese/XviD"}
     - {id: 58, cat: TV, desc: "Sorozat/Eng"}
     - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
+    - {id: 91, cat: TV/Anime, desc: "Mese/HD"}
     - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
     - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
     - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
@@ -53,12 +54,13 @@ caps:
     music-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -67,7 +69,6 @@ settings:
       1: title
       4: added
       5: size
-      7: seeders
   - name: type
     type: select
     label: Order requested from site
@@ -81,13 +82,9 @@ settings:
     default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
 
 login:
-  path: login.php
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table[width="920"]:contains("Hiba")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href^="logout.php?k="]
@@ -129,29 +126,27 @@ search:
         - name: replace
           args: ["details.php?id=", "download.php?torrent="]
     size:
-      selector: td:last-child
+      selector: td:nth-last-child(2)
     date:
       # 2021-11-09 16:51:24
-      selector: td:nth-last-child(2)
+      selector: td:last-child
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
-    files:
-      selector: td:nth-last-child(4)
     grabs:
-      selector: td:nth-child(2)
+      selector: td:nth-child(6)
       filters:
         - name: regexp
-          args: "D:(\\d+)x"
+          args: "D:(\\d+)"
     seeders:
-      selector: td:nth-child(2)
+      selector: td:nth-child(4)
       filters:
         - name: regexp
           args: "S:(\\d+)"
     leechers:
-      selector: td:nth-child(2)
+      selector: td:nth-child(5)
       filters:
         - name: regexp
           args: "L:(\\d+)"

src/Jackett.Common/Definitions/bitsexy.yml

@@ -119,8 +119,14 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
   rows:
     selector: div.torrentrow:has(a[href^="download.php?torrent="])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/bluesbrothers.yml

@@ -0,0 +1,187 @@
+---
+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]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    perm_ssl: ""
+    returnto: /
+  error:
+    - selector: table.main:contains("Login failed!")
+      message:
+        selector: table tr td.colhead2
+  test:
+    path: /
+    selector: a[href*="logout.php?hash_please="]
+
+search:
+  paths:
+    # https://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: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Tip\\('<b>(.+?)</b>"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(.+?)\\'
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    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/blutopia-api.yml

@@ -59,6 +59,10 @@ search:
         type: json
         attribute: attributes
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     count:
@@ -105,11 +109,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

src/Jackett.Common/Definitions/blutopia.yml

@@ -1,188 +0,0 @@
----
-id: blutopia
-name: Blutopia
-description: "Blutopia (BLU) is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://blutopia.xyz/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Movies/Other, desc: "FANRES"}
-    - {id: 5, cat: Movies/Other, desc: "Trailer"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.1b

src/Jackett.Common/Definitions/brsociety.yml

@@ -1,186 +0,0 @@
----
-id: brsociety
-name: BrSociety
-description: "BrSociety (SemeandoCC) is a BRAZILIAN Private Torrent Tracker for E-LEARNING"
-language: pt-BR
-type: private
-encoding: UTF-8
-links:
-  - https://brsociety.club/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV, desc: "Cursos (courses)"}
-    - {id: 2, cat: Books/EBook, desc: "eBooks"}
-    - {id: 5, cat: Books/Mags, desc: "Revistas (Magazines)"}
-    - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
-    - {id: 4, cat: Other, desc: "Arquivos de Auxilio (Help Files)"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ .Keywords }}"
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download_check/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["download_check", "download"]
-    magnet:
-      selector: a[href^="magnet:?"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# UNIT3D 5.3.0

src/Jackett.Common/Definitions/chilebt.yml

@@ -193,4 +193,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 1.9.3

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -55,17 +55,17 @@ settings:
     default: false
   - name: sort
     type: select
-    label: Sort requested from site (Only works for searches with Keywords)
-    default: ?trie-date-d
+    label: Sort requested from site (Works only for searches with Keywords)
+    default: trie-date-d
     options:
-      ?trie-date-d: created desc
-      ?trie-date-a: created asc
-      ?trie-seeds-d: seeders desc
-      ?trie-seeds-a: seeders asc
-      ?trie-poid-d: size desc
-      ?trie-poid-a: size asc
-      ?trie-nom-d: title desc
-      ?trie-nom-a: title asc
+      trie-date-d: created desc
+      trie-date-a: created asc
+      trie-seeds-d: seeders desc
+      trie-seeds-a: seeders asc
+      trie-poid-d: size desc
+      trie-poid-a: size asc
+      trie-nom-d: title desc
+      trie-nom-a: title asc
 
 download:
   selectors:
@@ -74,7 +74,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}home/{{ end }}"
+    - path: "{{ if .Keywords }}search_torrent/{{ .Keywords }}.html,{{ .Config.sort }}{{ else }}home/{{ end }}"
 
   rows:
     selector: table.table-corps > tbody > tr:has(a)

src/Jackett.Common/Definitions/crazyhd.yml

@@ -144,6 +144,10 @@ search:
     category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
     search: "{{ .Keywords }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: div.inf-table-row
 

src/Jackett.Common/Definitions/datascene.yml

@@ -1,197 +0,0 @@
----
-id: datascene
-name: DataScene
-description: "DataScene (DS) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://datascene.xyz/
-legacylinks:
-  - http://datascene.net/
-  - https://datascene.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"}
-    - {id: 6, cat: XXX, desc: "XXX"}
-    - {id: 7, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 8, cat: Books/EBook, desc: "E-Book"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    date:
-      selector: td:has(a.view-torrent) spam:last-child span:last-child
-      remove: a
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-#        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-#        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-#        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-#        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-trophy  data-toggle"]: 0 # Global Freeleech
-#        i[class*="fa-star text-gold"]: 0 # Freeleech
-#        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-angle-double-up"]: 2 # Single Torrent Double Upload
-#        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-#        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/demonoid.yml

@@ -1,7 +1,7 @@
 ---
 id: demonoid
 name: Demonoid
-description: "Demonoid is a Public torrent site for MOVIES / TV / GENERAL"
+description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: semi-private
 encoding: UTF-8
@@ -11,19 +11,10 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.tv/
+  - https://demonoid.unblockit.how/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.biz/
 legacylinks:
-  - https://demonoid.unblockit.pro/
-  - https://demonoid.unblockit.one/
-  - https://demonoid.unblockit.me/
-  - https://dnoid.black-mirror.xyz/
-  - https://dnoid.unblocked.casa/
-  - https://dnoid.proxyportal.fun/
-  - https://dnoid.uk-unblock.xyz/
-  - https://dnoid.ind-unblock.xyz/
-  - https://demonoid.unblockit.pw/
   - https://demonoid.unblockit.id/
   - https://demonoid.unblockit.win/
   - https://demonoid.unblockit.top/
@@ -43,6 +34,7 @@ legacylinks:
   - https://demonoid.nocensor.work/
   - https://demonoid.unblockit.kim/
   - https://demonoid.unblockit.bz/
+  - https://demonoid.unblockit.tv/
 
 caps:
   categorymappings:
@@ -357,10 +349,10 @@ search:
 
   rows:
     # only the default theme "Demonoid - v5" is supported
-    selector: table.table:has(td.torrent__table-today) > tbody > tr:has(td[class^="tone_"])
+    selector: table.table tbody tr.table__row:has(td[class*="tone_"])
     after: 1
     dateheaders:
-      selector: tr td.torrent__table-today:not(:contains("Sponsored links"))
+      selector: tr td.table__separator:not(:contains("Sponsored links"))
       filters:
         - name: replace
           args: ["Added ", ""]
@@ -368,27 +360,30 @@ search:
           args: ["on ", ""]
 
   fields:
-    title_default:
-      selector: a[href^="/files/details/"]
-    title_optional:
-      selector: a[href^="/files/details/"]
-      optional: true
-      attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     category:
-      selector: span.torrent__table-info > a:nth-child(2)
+      selector: span.table__column__subtext > a:nth-child(2)
       attribute: href
       optional: true
       filters:
         - name: querystring
           args: subcategory
+    title:
+      selector: a[href^="/files/details/"]
     details:
       selector: a[href^="/files/details/"]
       attribute: href
     download:
       selector: a[href^="/files/details/"]
       attribute: href
+    poster:
+      selector: div[title]
+      attribute: data-bs-content
+      filters:
+        - name: regexp
+          args: src='(.+?)'
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     description:
       selector: td:nth-last-child(7)
     size:

src/Jackett.Common/Definitions/desitorrents.yml

@@ -1,187 +0,0 @@
----
-id: desitorrents
-name: DesiTorrents
-description: "Desitorrents is a Private Torrent Tracker for BOLLYWOOD / TOLLYWOOD / MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://desitorrents.tv/
-  - https://desitorrents.rocks/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    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: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr:has(a[href*="/download/"])
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: td div a
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: td div a
-      attribute: href
-    poster:
-      selector: div img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(6)
-    seeders:
-      selector: td:nth-last-child(5)
-    leechers:
-      selector: td:nth-last-child(4)
-    grabs:
-      selector: td:nth-last-child(3)
-    date:
-      selector: td:nth-last-child(2)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-coins"]: 0 # Freeleech From Token
-        i[class*="fa-globe"]: 0 # Global Freeleech
-        i[class*="fa-star"]: 0 # Freeleech
-        i[class*="fa-certificate"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe"]: 2 # Global Double Upload
-        i[class*="fa-certificate"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/devilsplayground.yml

@@ -1,173 +0,0 @@
----
-id: devilsplayground
-name: Devils-Playground
-description: "Devils-Playground (Nbytez) is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-GB
-type: private
-encoding: UTF-8
-links:
-  - http://devils-playground.org/
-legacylinks:
-  - https://devils-playground.org/
-  - https://nbytez.me/
-  - http://nbytez.me/
-
-caps:
-  categorymappings:
-    - {id: 3, cat: PC, desc: "Apps"}
-    - {id: 4, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 22, cat: PC/Games, desc: "Games"}
-    - {id: 15, cat: Movies, desc: "Movies"}
-    - {id: 19, cat: Movies/UHD, desc: "Movies/Bluray"}
-    - {id: 20, cat: Movies, desc: "Movies/Packs"}
-    - {id: 17, cat: Movies/WEB-DL, desc: "Movies/Webrip"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x265"}
-    - {id: 18, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 10, cat: Audio, desc: "Music/"}
-    - {id: 12, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 11, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 14, cat: Audio, desc: "Music/Packs"}
-    - {id: 13, cat: Audio, desc: "Music/Top UK 40"}
-    - {id: 5, cat: TV, desc: "TV"}
-    - {id: 9, cat: TV, desc: "TV/Packs"}
-    - {id: 6, cat: TV/HD, desc: "TV/x254"}
-    - {id: 7, cat: TV/HD, desc: "TV/x255"}
-    - {id: 8, cat: TV/SD, desc: "TV/XVID"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table:has(a[href*="login.php?error=1"])
-      message:
-        text: "ERROR: Incorrect username!"
-    - selector: table:has(a[href*="login.php?error=4"])
-      message:
-        text: "ERROR: Incorrect password!"
-    - selector: table:has(a[href*="login.php?error="])
-      message:
-        text: "ERROR: Something went wrong during login!"
-  test:
-    path: index.php
-    selector: a[href*="logout.php?logouthash="]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    do: search
-    # does not support multi categories so defaulting to ALL
-    category: 0
-    # yes incldead, no activeonly
-    include_dead_torrents: yes
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # replace special characters with "%" (wildcard)
-      args: ["[^a-zA-Z0-9]+", "%"]
-
-  rows:
-    selector: "table#sortabletable tbody tr:has(a[href*=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_default:
-      # is often abbreviated
-      selector: a[href*="details.php?id="]
-    title_optional:
-      # usually longer than details title
-      selector: div[id^="port-content-"] div
-      optional: true
-    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
-    poster:
-      selector: div[id^="port-content-"] img
-      attribute: src
-    date:
-      selector: td:nth-child(2) > div:last-child
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-# TBD, Rules and FAQ do not cover this yet
-#    minimumratio:
-#      text: 1.0
-#    minimumseedtime:
-#      # 2 days (as seconds = 2 x 24 x 60 x 60)
-#      text: 172800
-#  TS Special Edition v.7.5

src/Jackett.Common/Definitions/digitalcore.yml

@@ -14,6 +14,7 @@ caps:
     - {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: 5, cat: Movies/HD, desc: Movies/720p}
     - {id: 6, cat: Movies/HD, desc: Movies/1080p}
     - {id: 7, cat: Movies/HD, desc: Movies/PACKS}
@@ -33,6 +34,8 @@ caps:
     - {id: 23, cat: Audio/Lossless, desc: Music/FLAC}
     - {id: 24, cat: Audio/Video, desc: Music/MTV}
     - {id: 29, cat: Audio, desc: Music/PACKS}
+    - {id: 39, cat: Audio/Video, desc: Music/DVD}
+    - {id: 40, cat: Audio/Video, desc: Music/Bluray}
     - {id: 25, cat: PC/Games, desc: Games/PC}
     - {id: 26, cat: Console, desc: Games/NSW}
     - {id: 27, cat: PC/Mac, desc: Games/Mac}
@@ -44,6 +47,7 @@ caps:
     - {id: 36, cat: XXX, desc: XXX/Movies/HD}
     - {id: 37, cat: XXX/UHD, desc: XXX/Movies/4K}
     - {id: 34, cat: XXX/ImageSet, desc: XXX/Imagesets}
+    - {id: 41, cat: XXX, desc: XXX/PACKS}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/docspedia.yml

@@ -10,24 +10,24 @@ links:
 
 caps:
   categorymappings:
+    - {id: 77, cat: PC, desc: "3D Models"}
     - {id: 65, cat: Audio, desc: "Audio"}
     - {id: 64, cat: Books/EBook, desc: "Books"}
-    - {id: 66, cat: TV, desc: "Business"}
+    - {id: 66, cat: Books, desc: "Business"}
     - {id: 68, cat: Books/Comics, desc: "Comics"}
-    - {id: 67, cat: TV, desc: "Development"}
-    - {id: 60, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 59, cat: TV/Documentary, desc: "Docs/Movies"}
+    - {id: 60, cat: TV/Documentary, desc: "Docs/TV"}
+    - {id: 79, cat: TV, desc: "Educational"}
     - {id: 71, cat: Other, desc: "Fonts"}
-    - {id: 62, cat: Other, desc: "Graphic"}
     - {id: 72, cat: Books, desc: "IT Books"}
     - {id: 57, cat: Books/Mags, desc: "Magazine"}
-    - {id: 58, cat: TV, desc: "Medicine"}
+    - {id: 58, cat: Books, desc: "Medicine"}
     - {id: 70, cat: Books/EBook, desc: "Occult"}
     - {id: 74, cat: Audio, desc: "Podcasts"}
     - {id: 69, cat: Other, desc: "PS Resources"}
     - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
-    - {id: 59, cat: TV, desc: "Video"}
-    - {id: 61, cat: TV, desc: "Video tutorials"}
+    - {id: 61, cat: Other, desc: "Tutorials"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/efectodoppler.yml

@@ -1,146 +0,0 @@
----
-id: efectodoppler
-name: Efecto Doppler
-description: "Efecto Doppler is a SPANISH Private Torrent Tracker for MUSIC"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://efectodoppler.pw/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Música"}
-    - {id: 2, cat: PC, desc: "Aplicaciones"}
-    - {id: 3, cat: Books/EBook, desc: "Libros Electrónicos"}
-    - {id: 4, cat: Audio/Audiobook, desc: "Audiolibros"}
-    - {id: 5, cat: Audio/Video, desc: "Vídeos de aprendizaje"}
-    - {id: 6, cat: Books/Comics, desc: "Comedia"}
-    - {id: 7, cat: Books/Mags, desc: "Revistas"}
-
-  modes:
-    search: [q]
-    music-search: [q, album, artist]
-    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: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: form > span.warning
-  test:
-    path: index.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    artistname: "{{ .Query.Artist }}"
-    groupname: "{{ .Query.Album }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    # 1 gold, 2 neutral, 3 other, 0 normal
-    freetorrent: "{{ if .Config.freeleech }}3{{ else }}{{ end }}"
-
-  rows:
-    selector: tr.torrent
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: div.tooltip
-      case:
-        div.cats_música: 1
-        div.cats_aplicaciones: 2
-        div.cats_libroselectrónicos: 3
-        div.cats_audiolibros: 4
-        div.cats_vídeosdeaprendizaje: 5
-        div.cats_comedia: 6
-        div.cats_revistas: 7
-    artist:
-      selector: a[href^="artist.php?id="]
-      optional: true
-    title:
-      selector: a[href^="torrents.php?id="]
-      filters:
-        - name: prepend
-          args: "{{ if .Result.artist }}{{ .Result.artist }}{{ else }}Varios artistas{{ end }} - "
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    poster:
-      selector: div.group_image img
-      attribute: src
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.torrent_info
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4) span
-      attribute: title
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        strong.torrent_label[title*="Neutral"]: 0
-        strong.torrent_label[title*="Oro"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        strong.torrent_label[title*="Neutral"]: 0
-        "*": 1
-    minimumratio:
-      text: 0.6
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine n/a

src/Jackett.Common/Definitions/eniahd.yml

@@ -155,6 +155,8 @@ search:
 
   rows:
     selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+    filters:
+      - name: andmatch
 
   fields:
     title:

src/Jackett.Common/Definitions/ettv.yml

@@ -9,32 +9,13 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.tv/
+  - https://ettv.unblockit.how/
   - https://ettv.nocensor.biz/
 legacylinks:
   - https://www.ettv.tv/
   - https://www.ettv.to/
-  - https://ettv.unblockit.pro/
-  - https://ettv.unblockit.one/
-  - https://ettv.black-mirror.xyz/
-  - https://ettv.unblocked.casa/
-  - https://ettv.proxyportal.fun/
-  - https://ettv.uk-unblock.xyz/
-  - https://ettv.ind-unblock.xyz/
-  - https://ettv.unblockit.me/
-  - https://ettv.unblockit.pw/
-  - https://ettv.unblockit.id/
-  - https://ettv.unblockit.win/
   - https://www.ettvdl.com/
-  - https://ettv.unblocked.bar/
-  - https://ettv.proxyportal.pw/
-  - https://ettv.uk-unblock.pro/
-  - https://ettv.root.yt/
   - https://www.ettv.be/
-  - https://ettv.unblockit.top/
-  - https://ettv.unblockit.lat/
-  - https://ettv.unblockit.app/
-  - https://ettv.unblocked.rest/
   - https://ettv.unblockit.dev/
   - https://ettv.unblockit.ltd/
   - https://ettv.unblockit.link/
@@ -50,6 +31,7 @@ legacylinks:
   - https://ettv.nocensor.work/
   - https://ettv.unblockit.kim/
   - https://ettv.unblockit.bz/
+  - https://ettv.unblockit.tv/
 
 caps:
   categorymappings:

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

@@ -7,12 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.tv/
+  - https://extratorrent.unblockit.how/
   - https://extratorrent.nocensor.biz/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.unblockit.kim/
   - https://extratorrent.unblockit.bz/
+  - https://extratorrent.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -80,6 +80,8 @@ download:
   selectors:
     - selector: a[href^="downloadv1.php?id="]
       attribute: href
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/eztv.yml

@@ -12,32 +12,13 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.tv/
+  - https://eztv.unblockit.how/
   - https://eztv.nocensor.biz/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
-  - https://eztv.unblockit.pro/
-  - https://eztv.unblockit.one/
-  - https://eztv.black-mirror.xyz/
-  - https://eztv.unblocked.casa/
-  - https://eztv.proxyportal.fun/
-  - https://eztv.uk-unblock.xyz/
-  - https://eztv.ind-unblock.xyz/
-  - https://eztv.unblockit.me/
-  - https://eztv.unblockit.pw/
-  - https://eztv.unblockit.id/
-  - https://eztv.unblockit.win/
-  - https://eztv.unblocked.bar/
-  - https://eztv.proxyportal.pw/
-  - https://eztv.uk-unblock.pro/
-  - https://eztv.unblockit.top/
-  - https://eztv.unblockit.lat/
   - https://eztv.io/
-  - https://eztv.unblockit.app/
-  - https://eztv.root.yt/
-  - https://eztv.unblocked.rest/
   - https://eztv.unblockit.dev/
   - https://eztv.unblockit.ltd/
   - https://eztv.unblockit.link/
@@ -53,6 +34,7 @@ legacylinks:
   - https://eztv.nocensor.work/
   - https://eztv.unblockit.kim/
   - https://eztv.unblockit.bz/
+  - https://eztv.unblockit.tv/
 
 caps:
   categories:

src/Jackett.Common/Definitions/femdomcult.yml

@@ -143,4 +143,10 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.5
+    # MR is reduced but not removed if MST is met
+    # minimumseedtime:
+    #   # 3 days (as seconds = 3 x 24 x 60 x 60)
+    #   text: 259200
 # luminance

src/Jackett.Common/Definitions/finelite.yml

@@ -98,6 +98,8 @@ search:
 
   rows:
     selector: table.main > tbody >  tr:has(a[href^="/lataa.php/"])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/freshmeat.yml

@@ -0,0 +1,75 @@
+---
+id: freshmeat
+name: freshMeat
+description: "freshMeat is a Public torrent meta-search engine"
+language: en-US
+type: public
+encoding: UTF-8
+certificates:
+  - 9aa995b06d86a22074c90faf5a9836e8a0fe6327 # expired 03/Jan/2022
+links:
+  - https://freshmeat.io/
+
+caps:
+  # unfortunately freshMeat does not display categories anywhere in its search results page :-(
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Other, desc: "Other"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+
+settings:
+  - name: info_8000
+    type: info
+    label: About freshMeat Categories
+    default: freshMeat does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}s?q={{ .Keywords }}{{ else }}{{ end }}"
+
+  rows:
+    selector: table.torrent-list > tbody > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: 3
+    title:
+      selector: td:nth-child(2)
+    details:
+      selector: td:nth-child(2) a
+      attribute: href
+    download:
+      selector: td:nth-child(2) a
+      attribute: href
+    date:
+      selector: td:nth-child(1)
+      attribute: data-sort-value
+      filters:
+        - name: dateparse
+          args: "2006-01-02 15:04:05"
+    description:
+      selector: td:nth-child(3) img
+      attribute: title
+    size:
+      selector: td:nth-child(4)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      text: 0
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/gktorrent.yml

@@ -78,9 +78,10 @@ settings:
 
 download:
   selectors:
-    - selector: a[href*="magnet:?xt="]
-      attribute: href
-
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 search:
   paths:
     - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}{{ end }}"

src/Jackett.Common/Definitions/glodls.yml

@@ -9,27 +9,11 @@ followredirect: true
 links:
   - https://glodls.to/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.tv/
+  - https://glotorrents.unblockit.how/
   - https://glotorrents.nocensor.biz/
 legacylinks:
   - https://glodls.rocks/
-  - https://glotorrents.unblockit.pro/
-  - https://glotorrents.unblockit.one/
-  - https://glodls.black-mirror.xyz/
-  - https://glodls.unblocked.casa/
-  - https://glodls.proxyportal.fun/
-  - https://glodls.uk-unblock.xyz/
-  - https://glodls.ind-unblock.xyz/
-  - https://glotorrents.unblockit.me/
-  - https://glotorrents.unblockit.pw/
-  - https://glotorrents.unblockit.id/
-  - https://glotorrents.unblockit.win/
-  - https://glodls.unblocked.bar/
-  - https://glodls.proxyportal.pw/
-  - https://glodls.uk-unblock.pro/
   - https://gtdb.to/
-  - https://glotorrents.unblockit.top/
-  - https://glotorrents.unblockit.lat/
   - https://glotorrents.unblockit.app/
   - https://glodls.unblocked.rest/
   - https://glotorrents.unblockit.dev/
@@ -47,6 +31,7 @@ legacylinks:
   - https://glotorrents.nocensor.work/
   - https://glotorrents.unblockit.kim/
   - https://glotorrents.unblockit.bz/
+  - https://glotorrents.unblockit.tv/
 
 caps:
   categorymappings:

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

@@ -0,0 +1,118 @@
+---
+id: hawke-uno
+name: hawke-uno
+description: "hawke-uno is a Private Torrent Tracker for (X265 / HEVC) MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.hawke.uno/
+
+caps:
+  # dont forget to update the case block in the search fields category
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movie"}
+    - {id: 2, cat: TV, desc: "TV"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://www.hawke.uno/\" target =_blank>hawke-uno</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
+
+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 }}"
+      response:
+        type: json
+        attribute: attributes
+
+  rows:
+    selector: data
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category
+      case:
+        Movie: 1
+        TV: 2
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+    imdbid:
+      selector: imdb_id
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    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=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+#    minimumratio:
+#      text: 0.4
+#    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+#      text: 432000
+# json UNIT3D 5.3.0

src/Jackett.Common/Definitions/hdmonkey.yml

@@ -0,0 +1,164 @@
+---
+id: hdmonkey
+name: HDMonkey
+description: "HDMonkey is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ro-RO
+type: private
+encoding: UTF-8
+links:
+  - https://hdmonkey.org/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
+    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
+    - {id: 8, cat: PC, desc: "Apps: Linux"}
+    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
+    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
+    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
+    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
+    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
+    - {id: 24, cat: Movies, desc: "Movies: Packs"}
+    - {id: 28, cat: Movies, desc: "Movies: Cartoons"}
+    - {id: 47, cat: XXX, desc: "Movies: XXX"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
+    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
+    - {id: 48, cat: TV, desc: "TV: Packs"}
+    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio, desc: "Music: Pack"}
+    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
+    - {id: 54, cat: Console, desc: "Games: PsP"}
+
+  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
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.myBlock:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href^="account-logout.php"]
+
+search:
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 both 1 local 2 external
+    inclexternal: 0
+    # 0 only active 1 incl dead 2 only dead
+    incldead: 1
+    # 0 all 1 not freeleech 2 only freeleech
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?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
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=([^\s]+)
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: td:nth-child(4)
+    date:
+      # 19.Jul<br>2021<br>06:57
+      selector: td:nth-child(5)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "2.Jan200615:04 -07:00"
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    description:
+      case:
+        img[src="images/t_extern.png"]: External
+        "*": Local
+    downloadvolumefactor:
+      case:
+        img[src="images/t_extern.png"]: 0
+        img[src="images/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# engine n/a

src/Jackett.Common/Definitions/hdturk.yml

@@ -25,18 +25,21 @@ caps:
     - {id: 16, cat: TV, desc: "TV Yerli"}
     - {id: 19, cat: TV/HD, desc: "TV Yerli HD"}
     - {id: 170, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 175, cat: Movies/HD, desc: "Movies 1080p Remux DUAL"}
+    - {id: 226, cat: Movies/HD, desc: "Movies 1080p Remux TR"}
+    - {id: 183, cat: Movies/HD, desc: "Movies 1080p Remux Yabancı"}
     - {id: 174, cat: Movies/3D, desc: "Movies 3D DUAL"}
     - {id: 180, cat: Movies/3D, desc: "Movies 3D TR"}
     - {id: 181, cat: Movies/3D, desc: "Movies 3D Yabancı"}
     - {id: 217, cat: Movies/UHD, desc: "Movies 4K DUAL"}
+    - {id: 224, cat: Movies/UHD, desc: "Movies 4K Remux DUAL"}
+    - {id: 225, cat: Movies/UHD, desc: "Movies 4K Remux Yabanci"}
     - {id: 218, cat: Movies/UHD, desc: "Movies 4K TR"}
     - {id: 216, cat: Movies/UHD, desc: "Movies 4K Yabancı"}
     - {id: 205, cat: Movies/DVD, desc: "Movies DVD DUAL"}
     - {id: 206, cat: Movies/DVD, desc: "Movies DVD TR/Yerli"}
     - {id: 219, cat: Movies/DVD, desc: "Movies DVD Yabancı"}
     - {id: 173, cat: Movies/BluRay, desc: "Movies Full BD"}
-    - {id: 175, cat: Movies/HD, desc: "Movies Remux DUAL"}
-    - {id: 183, cat: Movies/HD, desc: "Movies Remux Yabancı"}
     - {id: 171, cat: Movies/HD, desc: "Movies x264 DUAL"}
     - {id: 176, cat: Movies/HD, desc: "Movies x264 TR"}
     - {id: 177, cat: Movies/HD, desc: "Movies x264 Yabancı"}
@@ -73,6 +76,7 @@ caps:
     - {id: 221, cat: Other, desc: "VIP"}
     - {id: 85, cat: XXX, desc: "XXX"}
     - {id: 92, cat: XXX/Other, desc: "XXX E-Magazin"}
+    - {id: 220, cat: XXX/Other, desc: "XXX Hentai"}
     - {id: 93, cat: XXX, desc: "XXX Movie"}
     - {id: 95, cat: XXX/Pack, desc: "XXX Packs"}
     - {id: 96, cat: XXX/ImageSet, desc: "XXX Pics"}

src/Jackett.Common/Definitions/hdu.yml

@@ -9,6 +9,8 @@ links:
   - https://pt.upxin.net/
 legacylinks:
   - http://pt.upxin.net/
+certificates:
+  - d52ca3e97d730541d8f81452185e4481225f3a2d # expired 06/Jan/2022
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hqsource.yml

@@ -68,7 +68,8 @@ search:
     search: "{{ .Keywords }}"
     incldead: 1
     polish: 0
-    blah: 0
+    # 0 both, 1 name, 2 desc
+    blah: 1
 
   rows:
     selector: table#line > tbody > tr:has(a[href^="details.php?id="])

src/Jackett.Common/Definitions/ilcorsaroverde.yml

@@ -12,25 +12,25 @@ caps:
   # commented out categories are discussion-only forums
   categorymappings:
     # CIURMA
-#    - {id: "150", cat: Other, desc: "Regole per Postare"}
+    # - {id: "150", cat: Other, desc: "Regole per Postare"}
     - {id: "140", cat: Other/Misc, desc: "Bozze - Sezione fruibile a tutti i nuovi Releaser", default: true}
     # INFORMAZIONI E REGOLE DEL FORUM
-#    - {id: "108", cat: Other, desc: "Manifesto Generale"}
-#    - {id: "30", cat: Other, desc: "Disclaimer"}
-#    - {id: "76", cat: Other, desc: "Statuto"}
-#    - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
-#    - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
-#    - {id: "124", cat: Other, desc: "iCV Community"}
+    # - {id: "108", cat: Other, desc: "Manifesto Generale"}
+    # - {id: "30", cat: Other, desc: "Disclaimer"}
+    # - {id: "76", cat: Other, desc: "Statuto"}
+    # - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
+    # - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
+    # - {id: "124", cat: Other, desc: "iCV Community"}
     # PROGETTI
-#    - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
-#    - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
-#    - {id: "110", cat: Books, desc: "Progetto - Biblico"}
-#    - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
-#    - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
+    # - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
+    # - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
+    # - {id: "110", cat: Books, desc: "Progetto - Biblico"}
+    # - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
+    # - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
     # MUSICA
     - {id: "19", cat: Audio, desc: "Musica Audio - Tutti i formati", default: true}
     - {id: "20", cat: Audio/Video, desc: "Musica Video - Standard Definition - High Definition", default: true}
-#    - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
+    # - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
     # VIDEO
     - {id: "6", cat: Movies/SD, desc: "Video - Screener", default: true}
     - {id: "7", cat: Movies/SD, desc: "Video - Standard Definition", default: true}
@@ -41,66 +41,66 @@ caps:
     - {id: "95", cat: Movies, desc: "Video - Dispositivi Mobili (Portable)", default: true}
     - {id: "79", cat: Movies, desc: "Video - TVRip - Standard Definition - High Definition", default: true}
     - {id: "14", cat: TV/Other, desc: "Video - Documentari - Sportivi - Spettacoli - Lirica - Standard Definition - High Definition", default: true}
-#    - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
+    # - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
     # SERIE TV
     - {id: "12", cat: TV/SD, desc: "Serie TV - Standard Definition", default: true}
     - {id: "102", cat: TV/HD, desc: "Serie TV - High definition H.264", default: true}
     - {id: "161", cat: TV/HD, desc: "Serie TV - High definition HEVC/H.265", default: true}
-#    - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
-#    - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
-#    - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
-#    - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
+    # - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
+    # - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
+    # - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
+    # - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
     # CARTONI ANIMATI - ANIME
     - {id: "17", cat: Movies/SD, desc: "Cartoni Animati - Standard Definition - High Definition", default: true}
     - {id: "18", cat: TV/HD, desc: "Cartoni Animati - Serie TV Standard Definition - High Definition", default: true}
     - {id: "15", cat: TV/Anime, desc: "Anime - Standard Definition - High Definition", default: true}
     - {id: "16", cat: TV/Anime, desc: "Anime - Serie TV Standard Definition - High Definition", default: true}
     - {id: "89", cat: Movies/HD, desc: "Cartoni Animati - Anime - Serie Tv e Non - High Definition - HEVC/H.265", default: true}
-#    - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
+    # - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
     # EBOOK - FUMETTI - RIVISTE - QUOTIDIANI
     - {id: "25", cat: Books/EBook, desc: "Ebook", default: true}
     - {id: "26", cat: Audio/Audiobook, desc: "Ebook Audio", default: true}
     - {id: "170", cat: Books/Comics, desc: "Fumetti", default: true}
     - {id: "28", cat: Books/Mags, desc: "Riviste - Quotidiani", default: true}
     - {id: "47", cat: Other, desc: "Wallpapers - Poster - Calendari", default: true}
-#    - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
+    # - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
     # SOFTWARE
     - {id: "21", cat: PC/0day, desc: "Windows Software", default: true}
-#    - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
-#    - {id: "92", cat: PC, desc: "Windows Supporto "}
+    # - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
+    # - {id: "92", cat: PC, desc: "Windows Supporto "}
     - {id: "138", cat: PC/Mac, desc: "macOS Software", default: true}
-#    - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
-#    - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
-#    - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
-#    - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
+    # - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
+    # - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
+    # - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
+    # - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
     - {id: "23", cat: PC, desc: "Linux Software", default: true}
-#    - {id: "168", cat: PC, desc: "Linux Guide"}
-#    - {id: "93", cat: PC, desc: "Linux Supporto"}
+    # - {id: "168", cat: PC, desc: "Linux Guide"}
+    # - {id: "93", cat: PC, desc: "Linux Supporto"}
     - {id: "24", cat: PC, desc: "Guide & Tutorial Video", default: true}
-#    - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
+    # - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
     # GAMES
     - {id: "36", cat: PC/Games, desc: "Games - Pc Windows", default: true}
     - {id: "158", cat: PC/Mac, desc: "Games - macOS", default: true}
     - {id: "37", cat: Console/XBox 360, desc: "Games - Console Microsoft Xbox 360", default: true}
     - {id: "38", cat: Console/PS3, desc: "Games - Console Sony PS3", default: true}
     - {id: "152", cat: Console/PS4, desc: "Games - Console Sony PS4", default: true}
-#    - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
-#    - {id: "123", cat: PC/Games, desc: "Games - Guide"}
-#    - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
+    # - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
+    # - {id: "123", cat: PC/Games, desc: "Games - Guide"}
+    # - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
     # ANDROID
     - {id: "58", cat: PC/Mobile-Android, desc: "Android Apps", default: true}
-#    - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
-#    - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
+    # - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
+    # - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
     # TEAM GRAFICO
-#    - {id: "88", cat: Other, desc: "Vetrina Grafica"}
-#    - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
+    # - {id: "88", cat: Other, desc: "Vetrina Grafica"}
+    # - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
     # TAVERNA DEI CORSARI
-#    - {id: "39", cat: Other, desc: "Presentati alla Community"}
-#    - {id: "112", cat: Other, desc: "Assistenza Forum"}
-#    - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
-#    - {id: "83", cat: Other, desc: "Commenti Titoli "}
-#    - {id: "136", cat: Other, desc: "Sondaggi"}
-#    - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
+    # - {id: "39", cat: Other, desc: "Presentati alla Community"}
+    # - {id: "112", cat: Other, desc: "Assistenza Forum"}
+    # - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
+    # - {id: "83", cat: Other, desc: "Commenti Titoli "}
+    # - {id: "136", cat: Other, desc: "Sondaggi"}
+    # - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
     # ARCHIVIO FORUM
     - {id: "171", cat: PC/0day, desc: "Windows Software obsoleto", default: true}
 

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

@@ -66,6 +66,8 @@ search:
 
   rows:
     selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/krazyzone.yml

@@ -0,0 +1,245 @@
+---
+id: krazyzone
+name: KrazyZone
+description: "KrazyZone is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - http://krazyzone.net/ # does not support https, CA expired Dec 2016
+
+caps:
+  categorymappings:
+    - {id: 3, cat: Audio, desc: "Mastermix"}
+    - {id: 4, cat: Audio, desc: "Mastermix Classic"}
+    - {id: 5, cat: Audio, desc: "Mastermix DJ Beats"}
+    - {id: 6, cat: Audio, desc: "Mastermix Extended"}
+    - {id: 7, cat: Audio, desc: "Mastermix- Grandmaster"}
+    - {id: 8, cat: Audio, desc: "Mastermix- Mastermix Other"}
+    - {id: 9, cat: Audio, desc: "Mastermix- Mastermix Packs"}
+    - {id: 10, cat: Audio, desc: "Mastermix Monthly Issue"}
+    - {id: 11, cat: Audio, desc: "Mastermix Pro Dance / Disc"}
+    - {id: 12, cat: Audio, desc: "Mastermix Professional"}
+    - {id: 13, cat: Audio, desc: "DMC"}
+    - {id: 83, cat: Audio, desc: "DMC Bootlegs"}
+    - {id: 84, cat: Audio, desc: "DMC Classic"}
+    - {id: 85, cat: Audio, desc: "DMC Commercial"}
+    - {id: 86, cat: Audio, desc: "DMC Complete"}
+    - {id: 87, cat: Audio, desc: "DMC Dance Mixes"}
+    - {id: 88, cat: Audio, desc: "DMC Essential"}
+    - {id: 89, cat: Audio, desc: "DMC Guide"}
+    - {id: 90, cat: Audio, desc: "DMC Monsterjam"}
+    - {id: 91, cat: Audio, desc: "DMC Other DMC and Packs"}
+    - {id: 92, cat: Audio, desc: "DMC Promo"}
+    - {id: 14, cat: Audio, desc: "MUSIC Albums"}
+    - {id: 110, cat: Audio, desc: "MUSIC Album / Music Packs and other MP3"}
+    - {id: 76, cat: Audio, desc: "MUSIC Artist Albums "}
+    - {id: 77, cat: Audio, desc: "MUSIC Compilations "}
+    - {id: 109, cat: Audio, desc: "MUSIC Discographys , Collection"}
+    - {id: 80, cat: Audio, desc: "MUSIC Flac / Lossy / DTS Packs "}
+    - {id: 81, cat: Audio/Lossless, desc: "MUSIC FLAC 24bit Hi-Res "}
+    - {id: 115, cat: Audio, desc: "MUSIC Singles , Maxi CD and Vinyl"}
+    - {id: 15, cat: Audio, desc: "DJ Only"}
+    - {id: 74, cat: Audio, desc: "DJ Other DJ Music  Including Select Mix , Promo Only"}
+    - {id: 75, cat: Audio, desc: "DJ UK Top 40 / Other Top 20 / 40"}
+    - {id: 82, cat: Audio, desc: "DJ Ultramix , Ultrasound , UltraTraxx , Xmix "}
+    - {id: 16, cat: Audio, desc: "ONLY KZN Packs / Albums"}
+    - {id: 73, cat: Audio, desc: "ONLY KZN  KZN Packs / Albums Exclusive VIP only"}
+    - {id: 69, cat: Audio, desc: "ONLY KZN Album / Music Packs"}
+    - {id: 72, cat: Audio, desc: "ONLY KZN MP3 Weekly"}
+    - {id: 17, cat: Audio, desc: "Karaoke"}
+    - {id: 67, cat: Audio, desc: "Karaoke All Karaoke "}
+    - {id: 68, cat: Audio, desc: "Karaoke All Karaoke Packs "}
+    - {id: 95, cat: Audio, desc: "KZN Mixed Albums / KZN Mixed Videos "}
+    - {id: 96, cat: Audio, desc: "KZN Mixed Albums / KZN Mixed Videos"}
+    - {id: 112, cat: Audio, desc: "KZN MP3 Weekly"}
+    - {id: 18, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 66, cat: Audio/Video, desc: "Music Videos Singles Video"}
+    - {id: 65, cat: Audio/Video, desc: "Music Videos Video Packs and Live Video Concerts"}
+    - {id: 19, cat: Movies, desc: "Movie Packs"}
+    - {id: 62, cat: Movies, desc: "Movie Packs Kids Movie Packs"}
+    - {id: 63, cat: Movies, desc: "Movie Packs Movie Packs"}
+    - {id: 64, cat: Movies, desc: "Movie Packs Pre 90 Movie Packs"}
+    - {id: 21, cat: PC, desc: "Applications"}
+    - {id: 50, cat: PC/Mobile-Android, desc: "Applications Android"}
+    - {id: 51, cat: PC/Mac, desc: "Applications Misc , Linux , Mac "}
+    - {id: 52, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 22, cat: Books, desc: "Ebooks/Mags"}
+    - {id: 48, cat: Audio/Audiobook, desc: "Ebooks Audiobooks"}
+    - {id: 49, cat: Books/EBook, desc: "Ebooks Ebooks / Mags"}
+    - {id: 23, cat: PC/Games, desc: "Games"}
+    - {id: 45, cat: PC/Games, desc: "Games PC / ISO"}
+    - {id: 105, cat: Console/PS4, desc: "Games PS2 / PS3 / PS4 "}
+    - {id: 46, cat: Console/NDS, desc: "Games Wii+ Nds"}
+    - {id: 47, cat: Console/XBox 360, desc: "Games Xbox360"}
+    - {id: 20, cat: Movies, desc: "Movies"}
+    - {id: 113, cat: Movies, desc: "Movies 2021 Movies"}
+    - {id: 116, cat: Movies/UHD, desc: "Movies 4K Movies"}
+    - {id: 53, cat: Movies, desc: "Movies Anime / Kids"}
+    - {id: 54, cat: Movies/BluRay, desc: "Movies Bluray,HDRip,BDRip,Webrip,HEVC"}
+    - {id: 55, cat: Movies/SD, desc: "Movies Cam / TS / Screener"}
+    - {id: 56, cat: Movies, desc: "Movies Classic Movies Pre 90s to 2000"}
+    - {id: 57, cat: Movies/DVD, desc: "Movies DVDR ,NTSCPAL ,ISO"}
+    - {id: 58, cat: Movies/WEB-DL, desc: "Movies DVDRip,AVI,XVID,BRRip"}
+    - {id: 59, cat: Movies/Foreign, desc: "Movies Foreign"}
+    - {id: 107, cat: Movies/HD, desc: "Movies Mp4  Movies"}
+    - {id: 60, cat: Movies, desc: "Movies Netflix"}
+    - {id: 61, cat: Movies/3D, desc: "Movies Remux , 3D"}
+    - {id: 24, cat: TV, desc: "TV"}
+    - {id: 39, cat: TV/Documentary, desc: "TV Discovery /  Geographics / Documentary"}
+    - {id: 41, cat: TV, desc: "TV Episodes"}
+    - {id: 42, cat: TV/Anime, desc: "TV Kids / Anime"}
+    - {id: 43, cat: TV/Sport, desc: "TV Sport"}
+    - {id: 44, cat: TV/Sport, desc: "TV Sport Packs"}
+    - {id: 26, cat: Books/Comics, desc: "Comics"}
+    - {id: 37, cat: Books/Comics, desc: "Comics Comics"}
+    - {id: 25, cat: TV, desc: "TV Packs/Full Seasons"}
+    - {id: 38, cat: TV, desc: "TV Packs Full Seasons"}
+    - {id: 40, cat: TV, desc: "TV Packs Kids / Anime Full Seasons"}
+    - {id: 94, cat: TV, desc: "TV Packs Pre 90`s TV series"}
+    - {id: 27, cat: Other, desc: "Wallpapers"}
+    - {id: 36, cat: Other, desc: "Wallpapers PC Wallpapers"}
+    - {id: 1, cat: Other/Misc, desc: "Unsorted"}
+    - {id: 2, cat: Other/Misc, desc: "Unsorted To Be Edited"}
+    - {id: 30, cat: Other, desc: "Exclusive VIP"}
+    - {id: 33, cat: Other, desc: "Exclusive VIP Exclusive VIP Not To Be Uploaded Anywhere"}
+    - {id: 31, cat: Other, desc: "VIP"}
+    - {id: 32, cat: Other, desc: "VIP VIP Not To Be Uploaded Anywhere"}
+    - {id: 99, cat: Other, desc: "Christmas Albums"}
+    - {id: 101, cat: Other, desc: "Christmas Albums Packs"}
+    - {id: 103, cat: Other, desc: "All Christmas Movies and Packs"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_results
+    type: info
+    label: Search results
+    default: "If you are getting <b>0 results</b> then access the site with your browser and <b>mark as read</b> all PMs."
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("error has occured")
+    - selector: a[href*="/login.php?error="]
+      message:
+        text: Wrong username or password.
+  test:
+    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
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+
+  rows:
+    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    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
+    poster:
+      selector: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02-01-2006 15:04 -07:00"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 12 hours (as seconds = 12 x 60 x 60)
+      text: 43200
+# TS Special Edition v.7.4

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.pro/
-  - https://limetorrents.unblockit.tv/
+  - https://limetorrents.unblockit.how/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.biz/
 legacylinks:
@@ -17,27 +17,6 @@ legacylinks:
   - https://www.limetorrents.cc/
   - https://www.limetorrents.me/
   - https://www.limetorrents.zone/ # redirects to .info
-  - https://limetorrents.unblockit.pro/
-  - https://limetorrents.unblockit.one/
-  - https://limetorrents.black-mirror.xyz/
-  - https://limetorrents.unblocked.casa/
-  - https://limetorrents.proxyportal.fun/
-  - https://limetorrents.uk-unblock.xyz/
-  - https://limetorrents.ind-unblock.xyz/
-  - https://limetorrents.unblocked.bar/
-  - https://limetorrents.proxyportal.pw/
-  - https://limetorrents.uk-unblock.pro/
-  - https://limetorrents.unblockit.me/
-  - https://limetorrents.unblockit.pw/
-  - https://limetorrents.unblockit.id/
-  - https://limetorrents.unblockit.win/
-  - https://limetorrents.unblockit.top/
-  - https://limetorrents.unblockit.lat/
-  - https://limetorrents.unblockit.app/
-  - https://limetorrents.unblockit.dev/
-  - https://limetorrents.unblockit.ltd/
-  - https://limetorrents.unblockit.link/
-  - https://limetorrents.unblockit.buzz/
   - https://limetorrents.unblockit.club/
   - https://limetorrents.unblockit.onl/
   - https://www.limetorrents.info/
@@ -53,6 +32,7 @@ legacylinks:
   - https://limetorrents.nocensor.work/
   - https://limetorrents.unblockit.kim/
   - https://limetorrents.unblockit.bz/
+  - https://limetorrents.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/mediamaatjes.yml

@@ -0,0 +1,195 @@
+---
+id: mediamaatjes
+name: MediaMaatjes
+description: "MediaMaatjes is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: nl-NL
+type: private
+encoding: UTF-8
+links:
+  - https://www.mediamaatjes.org/
+
+caps:
+  categorymappings:
+    - {id: 43, cat: Movies/UHD, desc: "4k Films"}
+    - {id: 41, cat: TV/Documentary, desc: "Documentaire"}
+    - {id: 40, cat: Other, desc: "kerst"}
+    - {id: 15, cat: Other, desc: "Overige"}
+    - {id: 1, cat: Other, desc: "Afbeeldingen"}
+    - {id: 19, cat: TV, desc: "TV Series"}
+    - {id: 21, cat: TV/HD, desc: "Series/MKV"}
+    - {id: 23, cat: Audio/Video, desc: "Cabaret"}
+    - {id: 24, cat: Books/EBook, desc: "E-Books"}
+    - {id: 30, cat: Movies, desc: "Classic"}
+    - {id: 31, cat: Audio/Audiobook, desc: "Luisterboek"}
+    - {id: 32, cat: Movies/HD, desc: "Films/HD 720p"}
+    - {id: 33, cat: Audio, desc: "NL Muziek"}
+    - {id: 34, cat: Books/Comics, desc: "Stripboeken"}
+    - {id: 36, cat: Books/Mags, desc: "E Magazine"}
+    - {id: 18, cat: TV/SD, desc: "Series/XVID"}
+    - {id: 17, cat: PC/Games, desc: "PC Spellen"}
+    - {id: 16, cat: PC, desc: "PC Software"}
+    - {id: 2, cat: Movies/HD, desc: "Films/HD 1080p"}
+    - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
+    - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
+    - {id: 7, cat: Movies/SD, desc: "DVD Promo/R5"}
+    - {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, desc: "Muziek Diverse"}
+    - {id: 13, cat: Console/Wii, desc: "Wii"}
+
+  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: Filter freeleech only
+    default: false
+  - name: thankyou
+    type: text
+    label: Thank You Comment
+  - name: info
+    type: info
+    label: Thank you comment
+    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table.main:contains("Aanmelden mislukt")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+download:
+  before:
+    # https://www.mediamaatjes.org/comment.php?action=add&tid=166386
+    path: comment.php
+    method: post
+    inputs:
+      action: add
+      tid: "{{ .DownloadUri.Query.id }}"
+      text: "{{ .Config.thankyou }}"
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    # https://www.mediamaatjes.org/browse.php?search=&cat=43&incldead=1
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    incldead: 1
+    # does not support imdbid search and does not return imdb link in results
+
+  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
+    title:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+        - name: re_replace
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+        - name: re_replace
+          args: ["(?i)compleet", "Complete"]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    size:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "(.+?) in"
+    files:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "in (\\d+) bestan"
+    grabs:
+      selector: table table tr:nth-child(2) td:nth-child(1)
+    date:
+      selector: table 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: 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: table tr:nth-child(3) td:nth-child(5) font b:nth-child(2)
+    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:
+      text: 1.0
+# engine n/a

src/Jackett.Common/Definitions/mircrew.yml

@@ -9,54 +9,68 @@ links:
   - https://mircrew-releases.org/
 
 caps:
+  # commented out categories are discussion-only forums
   categorymappings:
-    - {id: 1, cat: Other, desc: "MIRCrew Sharing Community"}
-    - {id: 2, cat: Other, desc: "Piazza Grande"}
-    - {id: 3, cat: Other, desc: "Comunicazioni, Annunci & Guide"}
-    - {id: 11, cat: Other, desc: "CAG Progetti & Collezioni"}
-    - {id: 12, cat: Other, desc: "CAG Pir8 Channel"}
-    - {id: 13, cat: Other, desc: "CAG Progetti"}
-    - {id: 61, cat: Other, desc: "CAG Video"}
-    - {id: 62, cat: Other, desc: "CAG Animazione"}
-    - {id: 63, cat: Other, desc: "CAG Libreria"}
-    - {id: 64, cat: Other, desc: "CAG Musica"}
-    - {id: 14, cat: Other, desc: "CAG Collezioni"}
-    - {id: 50, cat: Other, desc: "CAG Proposte & Richieste"}
-    - {id: 60, cat: Other, desc: "CAG Abbandonati"}
-    - {id: 15, cat: Other, desc: "Area Grafica"}
-    - {id: 16, cat: Other, desc: "Vetrina MIRCrew"}
-    - {id: 17, cat: Other, desc: "Vetrina Utenti"}
-    - {id: 19, cat: Other, desc: "Area Staff"}
-    - {id: 23, cat: Other, desc: "Archivio"}
-    - {id: 25, cat: Movies, desc: "Video Releases"}
-    - {id: 26, cat: Movies, desc: "Releases Film"}
-    - {id: 28, cat: TV, desc: "Releases Serie TV"}
-    - {id: 51, cat: TV, desc: "Releases TV Stagioni in corso"}
-    - {id: 52, cat: TV, desc: "Releases TV Stagioni complete"}
-    - {id: 29, cat: TV/Documentary, desc: "Documentari"}
-    - {id: 30, cat: TV, desc: "TV Show"}
-    - {id: 31, cat: TV, desc: "Teatro"}
-    - {id: 32, cat: Movies, desc: "Richieste Video"}
-    - {id: 53, cat: Movies, desc: "Richieste Film"}
-    - {id: 54, cat: TV, desc: "Richieste Serie TV"}
-    - {id: 55, cat: Movies, desc: "Richieste Video diverse"}
-    - {id: 57, cat: Movies, desc: "Richieste Video Soddisfatte"}
-    - {id: 33, cat: TV/Anime, desc: "Animazione Releases"}
-    - {id: 34, cat: TV/Anime, desc: "Anime - Movies"}
-    - {id: 35, cat: TV/Anime, desc: "Anime - Serie"}
-    - {id: 36, cat: TV/Anime, desc: "Cartoon - Movies"}
-    - {id: 37, cat: TV/Anime, desc: "Cartoon - Serie"}
-    - {id: 38, cat: TV/Anime, desc: "Richieste Animazione"}
-    - {id: 39, cat: Books, desc: "Libreria Releases"}
-    - {id: 40, cat: Books/EBook, desc: "E-Books"}
-    - {id: 41, cat: Audio/Audiobook, desc: "A-Books"}
-    - {id: 42, cat: Books/Comics, desc: "Comics"}
-    - {id: 43, cat: Books/Mags, desc: "Edicola"}
-    - {id: 44, cat: Books, desc: "Richieste Libreria"}
-    - {id: 45, cat: Audio, desc: "Music Releases"}
-    - {id: 46, cat: Audio, desc: "Musica - Audio"}
-    - {id: 47, cat: Audio/Video, desc: "Musica - Video"}
-    - {id: 48, cat: Audio, desc: "Richieste Musica"}
+    # - {id: 1, cat: Other, desc: "MIRCrew Sharing Community"}
+    # - {id: 2, cat: Other, desc: "Piazza Grande"}
+    # - {id: 4, cat: Other, desc: "PG Statuto & Regole"}
+    # - {id: 5, cat: Other, desc: "PG Info Point"}
+    # - {id: 6, cat: Other, desc: "PG Presentazioni"}
+    # - {id: 7, cat: Other, desc: "PG Off Topic"}
+    # - {id: 49, cat: Other, desc: "PG Segnalazioni allo Staff"}
+    # - {id: 3, cat: Other, desc: "Comunicazioni, Annunci & Guide"}
+    # - {id: 8, cat: Other, desc: "CAG Comunicazioni da MIRCrew"}
+    # - {id: 9, cat: Other, desc: "CAG Guide & Tutorial"}
+    # - {id: 11, cat: Other, desc: "Progetti & Collezioni"}
+    # - {id: 12, cat: Other, desc: "P&C Pir8 Channel"}
+    # - {id: 13, cat: Other, desc: "P&C Progetti"}
+    # - {id: 61, cat: Other, desc: "P&C Video"}
+    # - {id: 62, cat: Other, desc: "P&C Animazione"}
+    # - {id: 63, cat: Other, desc: "P&C Libreria"}
+    # - {id: 64, cat: Other, desc: "P&C Musica"}
+    # - {id: 14, cat: Other, desc: "P&C Collezioni"}
+    # - {id: 50, cat: Other, desc: "P&C Proposte & Richieste"}
+    # - {id: 60, cat: Other, desc: "P&C Abbandonati"}
+    # - {id: 15, cat: Other, desc: "Area Grafica"}
+    # - {id: 16, cat: Other, desc: "AG Vetrina MIRCrew"}
+    # - {id: 17, cat: Other, desc: "AG Vetrina Utenti"}
+    # - {id: 18, cat: Other, desc: "AG Richieste Grafica"}
+    # - {id: 19, cat: Other, desc: "Area Staff"}
+    # - {id: 20, cat: Other, desc: "AS Membri MIRCrew"}
+    # - {id: 21, cat: Other, desc: "AS Reclutamento MIRCrew"}
+    # - {id: 23, cat: Other, desc: "AS Archivio"}
+    - {id: 25, cat: Movies, desc: "Video Releases", default: true}
+    - {id: 26, cat: Movies, desc: "Releases Film", default: true}
+    # - {id: 28, cat: TV, desc: "Releases Serie TV"}
+    - {id: 51, cat: TV, desc: "Releases TV Stagioni in corso", default: true}
+    - {id: 52, cat: TV, desc: "Releases TV Stagioni complete", default: true}
+    - {id: 29, cat: TV/Documentary, desc: "Documentari", default: true}
+    - {id: 30, cat: TV, desc: "TV Show", default: true}
+    - {id: 31, cat: TV, desc: "Teatro", default: true}
+    # - {id: 32, cat: Movies, desc: "Richieste Video"}
+    # - {id: 53, cat: Movies, desc: "Richieste Film"}
+    # - {id: 54, cat: TV, desc: "Richieste Serie TV"}
+    # - {id: 55, cat: Movies, desc: "Richieste Video diverse"}
+    # - {id: 57, cat: Movies, desc: "Richieste Video Soddisfatte"}
+    - {id: 33, cat: TV/Anime, desc: "Animazione Releases", default: true}
+    - {id: 34, cat: TV/Anime, desc: "Anime - Movies", default: true}
+    - {id: 35, cat: TV/Anime, desc: "Anime - Serie", default: true}
+    - {id: 36, cat: TV/Anime, desc: "Cartoon - Movies", default: true}
+    - {id: 37, cat: TV/Anime, desc: "Cartoon - Serie", default: true}
+    # - {id: 38, cat: TV/Anime, desc: "Richieste Animazione", default: true}
+    # - {id: 58, cat: TV/Anime, desc: "Richieste Animazione Soddisfatte", default: true}
+    - {id: 39, cat: Books, desc: "Libreria Releases", default: true}
+    - {id: 40, cat: Books/EBook, desc: "E-Books", default: true}
+    - {id: 41, cat: Audio/Audiobook, desc: "A-Books", default: true}
+    - {id: 42, cat: Books/Comics, desc: "Comics", default: true}
+    - {id: 43, cat: Books/Mags, desc: "Edicola", default: true}
+    # - {id: 44, cat: Books, desc: "Richieste Libreria"}
+    # - {id: 59, cat: Books, desc: "Richieste Libreria Soddisfatte"}
+    - {id: 45, cat: Audio, desc: "Music Releases", default: true}
+    - {id: 46, cat: Audio, desc: "Musica - Audio", default: true}
+    - {id: 47, cat: Audio/Video, desc: "Musica - Video", default: true}
+    # - {id: 48, cat: Audio, desc: "Richieste Musica"}
+    # - {id: 56, cat: Audio, desc: "Richieste Musica Soddisfatte"}
 
   modes:
     search: [q]
@@ -114,7 +128,7 @@ search:
     # Search by Author
     author: ""
     # Search in subforums: yes 1, no 0
-    sc: 1
+    sc: 0
     # Search For: all, msgonly, titleonly, firstpost
     sf: titleonly
     # Show Results as: posts, topics

src/Jackett.Common/Definitions/moviesite.yml

@@ -1,9 +1,9 @@
 ---
 id: moviesite
 name: Moviesite
-description: "Moviesite is a HUNGARIAN private tracker for MOVIES / TV / GENERAL"
+description: "Moviesite is a HUNGARIAN Semi-Private tracker for MOVIES / TV / GENERAL"
 language: hu-HU
-type: private
+type: semi-private
 encoding: ISO-8859-2
 links:
   - http://moviesite.info.hu/ # does not support https ERR_CONNECTION_REFUSED

src/Jackett.Common/Definitions/movietorrentz.yml

@@ -0,0 +1,136 @@
+---
+id: movietorrentz
+name: Movie-Torrentz
+description: "Movie-Torrentz is a Private Torrent Tracker for MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://m2g.link/
+
+caps:
+  categorymappings:
+    - {id: 106, cat: Movies, desc: "m2g: m2g"}
+    - {id: 102, cat: PC, desc: "Misc: Programs"}
+    - {id: 107, cat: Movies/SD, desc: "Movies: Xvid"}
+    - {id: 108, cat: Movies/DVD, desc: "Movies: DVDR"}
+    - {id: 109, cat: Movies, desc: "Movies: Packs"}
+    - {id: 110, cat: Movies/HD, desc: "Movies: MP4"}
+    - {id: 112, cat: Movies/SD, desc: "Movies: 480p"}
+    - {id: 113, cat: Movies/BluRay, desc: "Movies: BluRay / x264"}
+    - {id: 126, cat: Movies/HD, desc: "Movies: x265"}
+    - {id: 127, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 114, cat: TV/SD, desc: "TV: XviD"}
+    - {id: 115, cat: TV/HD, desc: "TV: X264"}
+    - {id: 116, cat: TV, desc: "TV: Packs"}
+    - {id: 128, cat: TV/HD, desc: "TV: x265"}
+    - {id: 103, cat: Movies, desc: "ViP3R: ViP3R"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-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 }}"
+    remember: yes
+  error:
+    - selector: div.myBlock:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 dead, 2 onlydead
+    incldead: 1
+    # 0 any, 1 english, etc
+    lang: 0
+    # 0 any, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid searching
+
+  rows:
+    selector: tr.t-row
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) width"
+        - name: replace
+          args: ["images/nocover.jpg", ""]
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src="images/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+# TorrentTrader

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

@@ -17,6 +17,10 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: true
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -797,6 +801,11 @@ search:
       filters:
         - name: querystring
           args: f
+    title_is_rus:
+      selector: a[href^="viewtopic.php?t="] > b
+      filters:
+        - name: re_replace
+          args: ["[^А-Яа-яЁё]+", ""]
     title:
       selector: a[href^="viewtopic.php?t="] > b
       filters:
@@ -818,6 +827,10 @@ search:
           args: ["WEBDLRip", "WEBDL"]
         - name: replace
           args: ["HDTVRip", "HDTV"]
+        - name: append
+          args: "{{ if .Result.title_is_rus }} - RUSSIAN{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(.+?) - RUSSIAN", "{{ if .Config.addrussian }}$1 - RUSSIAN{{ else }}$1{{ end }}"]
     details:
       selector: a[href^="viewtopic.php?t="]
       attribute: href

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

@@ -23,6 +23,10 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: true
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -822,6 +826,11 @@ search:
       filters:
         - name: querystring
           args: f
+    title_is_rus:
+      selector: a[href^="viewtopic.php?t="] > b
+      filters:
+        - name: re_replace
+          args: ["[^А-Яа-яЁё]+", ""]
     title:
       selector: a[href^="viewtopic.php?t="] > b
       filters:
@@ -843,6 +852,10 @@ search:
           args: ["WEBDLRip", "WEBDL"]
         - name: replace
           args: ["HDTVRip", "HDTV"]
+        - name: append
+          args: "{{ if .Result.title_is_rus }} - RUSSIAN{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(.+?) - RUSSIAN", "{{ if .Config.addrussian }}$1 - RUSSIAN{{ else }}$1{{ end }}"]
     details:
       selector: a[href^="viewtopic.php?t="]
       attribute: href

src/Jackett.Common/Definitions/oncesearch.yml

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

src/Jackett.Common/Definitions/opensharing.yml

@@ -49,6 +49,7 @@ caps:
     - {id: 425, cat: XXX, desc: "Movies XXX: С Русским переводом!"}
     - {id: 1195, cat: XXX, desc: "Movies XXX: LegalPorno"}
     - {id: 1200, cat: XXX, desc: "Movies XXX: Solo & Masturbation"}
+    - {id: 1250, cat: XXX, desc: "Movies XXX: Movie Scenes"}
     - {id: 7000, cat: XXX, desc: "Movies XXX: -= XXX =-"}
 
   modes:

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,31 +7,14 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.vc/
-  - https://oxtorrent.unblockit.tv/
+  - https://www.oxtorrent.be/
+  - https://oxtorrent.unblockit.how/
   - https://oxtorrent.nocensor.biz/
 legacylinks:
-  - https://wwv.oxtorrent.com/
-  - https://www.smartorrent.tv/
-  - https://oxtorrent.black-mirror.xyz/
-  - https://oxtorrent.unblocked.casa/
-  - https://oxtrorrent.proxyportal.fun/
-  - https://oxtorrent.uk-unblock.xyz/
-  - https://oxtorrent.ind-unblock.xyz/
-  - https://www.oxtorrent.com/
-  - https://www.oxtorrent.pw/
-  - https://oxtorrent.unblocked.bar/
-  - https://oxtorrent.proxyportal.pw/
-  - https://oxtorrent.uk-unblock.pro/
-  - https://oxtorrent.unblocked.rest/
-  - https://www.oxtorrent.cc/
   - https://www.oxtorrent.bz/
   - https://www.oxtorrent.ws/
-  - https://wvw.oxtorrent.ws/
-  - https://oxtorrent.unblocked.monster/
   - https://www.oxtorrent.tv/
   - https://www.oxtorrent.ph/
-  - https://wvw.oxtorrent.pe/
   - https://www.oxtorrent.pe/
   - https://www.oxtorrent.co/
   - https://oxtorrent.unblockit.uno/
@@ -46,6 +29,8 @@ legacylinks:
   - https://www.oxtorrent.sh/
   - https://www.oxtorrent.pl/
   - https://oxtorrent.unblockit.bz/
+  - https://www.oxtorrent.vc/
+  - https://oxtorrent.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/peeratiko.yml

@@ -0,0 +1,202 @@
+---
+id: peeratiko
+name: Peeratiko
+description: "Peeratiko is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+links:
+  - https://peeratiko.org/
+
+caps:
+  categorymappings:
+    - {id: 58, cat: PC, desc: "Applications Linux"}
+    - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
+    - {id: 54, cat: PC/Mobile-Other, desc: "Applications Mobiles"}
+    - {id: 2, cat: PC, desc: "Applications Other"}
+    - {id: 3, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 39, cat: Books/EBook, desc: "Books Books"}
+    - {id: 56, cat: Books/Comics, desc: "Books Comics"}
+    - {id: 47, cat: Books/Mags, desc: "Books Magazines"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Games Mobiles"}
+    - {id: 5, cat: Console/Other, desc: "Games Other"}
+    - {id: 8, cat: Console/PS3, desc: "Games PSP/PS2/PS3"}
+    - {id: 6, cat: PC/Games, desc: "Games Windows"}
+    - {id: 7, cat: Console/XBox, desc: "Games XBOX"}
+    - {id: 60, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 1, cat: Movies, desc: "Movies Anime/Cartoons"}
+    - {id: 9, cat: Movies/BluRay, desc: "Movies BluRay x264"}
+    - {id: 62, cat: Movies/DVD, desc: "Movies DVD-R"}
+    - {id: 15, cat: Movies/WEB-DL, desc: "DVD/BD/BR-rip x264"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Movies Gr. Subs DVD/BD/BR-rip"}
+    - {id: 18, cat: Movies, desc: "Movies Gr. Subs Embeddeed"}
+    - {id: 19, cat: Movies/Other, desc: "Movies Gr. Subs Other"}
+    - {id: 17, cat: Movies/DVD, desc: "Movies Greek DVD-R"}
+    - {id: 21, cat: Movies/WEB-DL, desc: "Movies Greek DVD/BD/BR-rip"}
+    - {id: 22, cat: Movies/Other, desc: "Movies Greek Other"}
+    - {id: 10, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 13, cat: Movies/Other, desc: "Movies Other"}
+    - {id: 14, cat: Movies, desc: "Movies Packs"}
+    - {id: 23, cat: Audio, desc: "Music DJs Stuff"}
+    - {id: 26, cat: Audio, desc: "Music English/Discographies"}
+    - {id: 24, cat: Audio, desc: "Music English/Foreign"}
+    - {id: 25, cat: Audio/Lossless, desc: "Music English/Foreign FLAC"}
+    - {id: 27, cat: Audio, desc: "Music Greek"}
+    - {id: 28, cat: Audio/Lossless, desc: "Music Greek FLAC"}
+    - {id: 29, cat: Audio, desc: "Music Greek/Discographies"}
+    - {id: 36, cat: Audio/Video, desc: "Music Video Clips"}
+    - {id: 61, cat: Other, desc: "Other Packs"}
+    - {id: 40, cat: Other/Misc, desc: "Other Misc"}
+    - {id: 59, cat: Other, desc: "Other Pictures"}
+    - {id: 11, cat: TV/Documentary, desc: "TV Documentaries"}
+    - {id: 12, cat: TV/HD, desc: "TV HD Series"}
+    - {id: 63, cat: TV/HD, desc: "TV HD Series Packs"}
+    - {id: 53, cat: TV/Other, desc: "TV Other"}
+    - {id: 31, cat: TV, desc: "TV Series Gr. Subs"}
+    - {id: 32, cat: TV, desc: "TV Series Gr. Subs Embedded"}
+    - {id: 33, cat: TV, desc: "TV Series Gr. Subs Packs"}
+    - {id: 34, cat: TV, desc: "TV Series Greek"}
+    - {id: 35, cat: TV, desc: "TV Series Greek Packs"}
+    - {id: 30, cat: TV/Sport, desc: "TV Sports"}
+
+  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: 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 <i>Personal Options</i> from the <i>Personal Settings</i> menu on the Peeratiko webpage.
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    keeplogged: 1
+  error:
+    - selector: h2
+      message:
+        selector: table tr td.text
+  test:
+    path: index.php
+    selector: a[href^="/logout.php?auth="]
+
+search:
+  paths:
+    # https://peeratiko.org/browse.php?cats2[]=39&cats5[]=28&cats5[]=29&cats5[]=36&search=&searchin=title&incldead=1
+    - path: browse.php
+  inputs:
+    # note: site uses the catsX[]=nn method which cardigann does not support.
+    search: "{{ .Keywords }}"
+    # title, descr, filelist, genre, tags, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support searching imdbid and does not return imdb links
+
+  rows:
+    selector: table[width="90%"] tbody tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: ">(.+?)<"
+    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=..(https.+).. width"
+    files:
+      selector: td:nth-last-child(8)
+    date_day:
+      # Today<br>08:10 AM
+      # Yesterday<br>06:44 PM
+      optional: true
+      selector: td:nth-last-child(6):contains("day")
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+    date_year:
+      # Dec 4 2021<br>10:20 AM
+      optional: true
+      selector: td:nth-last-child(6):not(:contains("day"))
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        "b:contains(\"[FREE]\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# U-232 V3

src/Jackett.Common/Definitions/pier720.yml

@@ -1,9 +1,9 @@
 ---
 id: pier720
 name: 720pier
-description: "720pier is a RUSSIAN Private Torrent Tracker for HD SPORTS"
+description: "720pier is a RUSSIAN Semi-Private Torrent Tracker for HD SPORTS"
 language: ru-RU
-type: private
+type: semi-private
 encoding: UTF-8
 links:
   - https://720pier.ru/

src/Jackett.Common/Definitions/piratadigital.yml

@@ -1,8 +1,8 @@
 ---
 id: piratadigital
 name: Pirata Digital
-description: "Pirata Digital (PD) is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-US
+description: "Pirata Digital (PD) is a BRAZILIAN Private Torrent Tracker for HD MOVIES / TV"
+language: pt-BR
 type: private
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/piratbit.yml

@@ -6,12 +6,15 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://piratbit.top/ # site forces https, http is not supported
-legacylinks:
   - https://pb.wtf/
+  - http://top.piratbit.fun/
+legacylinks:
   - https://piratbit.pw/
   - https://piratbit.ml/
   - http://piratbit.top/
+  - https://piratbit.top/
+certificates:
+  - 8531af678cf197593ff4d6a4e6ce30088d719509 # expired 13th Nov 2016
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/piratbitl.yml

@@ -6,12 +6,15 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - https://piratbit.top/ # site forces https, http is not supported
-legacylinks:
   - https://pb.wtf/
+  - http://top.piratbit.fun/
+legacylinks:
   - https://piratbit.pw/
   - https://piratbit.ml/
   - http://piratbit.top/
+  - https://piratbit.top/
+certificates:
+  - 8531af678cf197593ff4d6a4e6ce30088d719509 # expired 13th Nov 2016
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pirateiro.yml

@@ -9,12 +9,9 @@ followredirect: true
 links:
   - https://pirateiro.com/
   - https://pirateiro.eu/
-  - https://pirateiro.unblockit.tv/
+  - https://pirateiro.unblockit.how/
 legacylinks:
   - http://pirateiro.com/
-  - https://pirateiro.unblockit.pro/
-  - https://pirateiro.unblockit.one/
-  - https://pirateiro.unblockit.me/
   - https://pirateiro.unblockit.pw/
   - https://pirateiro.unblockit.id/
   - https://pirateiro.unblockit.win/
@@ -33,6 +30,7 @@ legacylinks:
   - https://pirateiro.unblockit.ws/
   - https://pirateiro.unblockit.kim/
   - https://pirateiro.unblockit.bz/
+  - https://pirateiro.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/polishsource.yml

@@ -145,16 +145,12 @@ search:
       filters:
         - name: append
           args: "Language: polish\n<br>"
-        - name: prepend
-          args: "{{ .Result.description }}"
     subbed:
       optional: true
       selector: img[src="pic/napisy.png"]
       filters:
         - name: append
           args: "Subbed\n<br>"
-        - name: prepend
-          args: "{{ .Result.description }}"
     description:
       text: "{{ .Result.genre }}{{ .Result.language }}{{ .Result.subbed }}"
     imdbid:

src/Jackett.Common/Definitions/pornbay.yml

@@ -66,11 +66,11 @@ settings:
   - name: info_grid
     type: info
     label: GRID view
-    default: This indexer does not support the GRID view on the torrent search page. Change the <b>GRID</b> setting to <b>OFF</b> on your account profile. If set to <i>ON</i> will cause no results to be returned.
+    default: This indexer does not support the GRID view on the torrent search page. Change the <b>Grid View</b> setting to <b>OFF</b> on your User Settings. If set to <i>ON</i> will cause no results to be returned.
   - name: info_tpp
     type: info
     label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>25</i>.
+    default: For best results, change the <b>Torrents per page</b> setting to <b>100</b> on your User Settings. The default is <i>25</i>.
 
 login:
   path: login.php

src/Jackett.Common/Definitions/pornorip.yml

@@ -1,224 +0,0 @@
----
-id: pornorip
-name: PornoRip
-description: "PornoRip is a RUSSIAN Public Torrent Tracker for 3X"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - https://www.pornorip.biz/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: XXX, desc: "Порно Трекер / XXX Torrent Tracker"}
-    - {id: 2, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms"}
-    - {id: 29, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms Гонзо-фильмы / Gonzo & All Sex"}
-    - {id: 30, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms Фильмы с сюжетом / Feature"}
-    - {id: 31, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms Лесбо-фильмы / Lesbo"}
-    - {id: 32, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms Этнические фильмы / Ethnic"}
-    - {id: 35, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms Эротические фильмы / Erotic & Documentary"}
-    - {id: 70, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms Классика / Classic Porn"}
-    - {id: 33, cat: XXX, desc: "Зарубежные порнофильмы / Pornofilms HD порнофильмы / HD Porn Movies"}
-    - {id: 10, cat: XXX, desc: "Порноролики / Porn Clips"}
-    - {id: 42, cat: XXX, desc: "Порноролики / Porn Clips Сайтрипы / SiteRip's"}
-    - {id: 43, cat: XXX, desc: "Порноролики / Porn Clips Сайтрипы HD / SiteRip's HD Video"}
-    - {id: 73, cat: XXX, desc: "Порноролики / Porn Clips Сайтрипы UHD / 4K UHD (2160p) Porn Video"}
-    - {id: 78, cat: XXX, desc: "Порноролики / Porn Clips 3D & Virtual Reality Porn Videos (VR)"}
-    - {id: 44, cat: XXX, desc: "Порноролики / Porn Clips Сцены из фильмов / Movie Scenes"}
-    - {id: 45, cat: XXX, desc: "Порноролики / Porn Clips Порноролики Разное / Various Clips"}
-    - {id: 40, cat: XXX, desc: "Порноролики / Porn Clips Паки сайтрипов / SiteRip's Packs"}
-    - {id: 41, cat: XXX, desc: "Порноролики / Porn Clips Паки по актрисам / Actresses Clips Packs"}
-    - {id: 3, cat: XXX, desc: "Японское порно / Japan Porn"}
-    - {id: 79, cat: XXX, desc: "Chinese Movies"}
-    - {id: 80, cat: XXX, desc: "Japanese Movies"}
-    - {id: 18, cat: XXX, desc: "Русское порно / Russian Porn"}
-    - {id: 36, cat: XXX, desc: "Русское порно / Russian Porn Русские порнофильмы / Russian Porn Films"}
-    - {id: 37, cat: XXX, desc: "Русское порно / Russian Porn Паки русских порнороликов / Russian Clips Packs"}
-    - {id: 39, cat: XXX, desc: "Русское порно / Russian Porn Русское любительское порно видео / Russian Amateur Porn Video"}
-    - {id: 4, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix"}
-    - {id: 46, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Эротические студии видео / Erotic Video Library"}
-    - {id: 47, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Эротические студии Фото / Erotic Picture Gallery"}
-    - {id: 48, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Паки сайтрипов эротических студий / Erotic Picture SiteRip's"}
-    - {id: 49, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Любительское фото / Amateur Picture"}
-    - {id: 50, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Подборки по актрисам / Actresses Picture Packs"}
-    - {id: 51, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Подборки сайтрипов / SiteRip's Picture Packs"}
-    - {id: 52, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Подборки сетов / Picture Sets"}
-    - {id: 53, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Нетрадиционное порно фото"}
-    - {id: 76, cat: XXX, desc: "Эротические студии и Фотосеты, Комиксы, Журналы / Erotic, Pictures, Magazines & Comix Комиксы и рисунки, Журналы / Magazines & Comix"}
-    - {id: 6, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn"}
-    - {id: 56, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Бисексуалы / Bisexual"}
-    - {id: 57, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Транссексуалы / Shemale Transsexual"}
-    - {id: 58, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn БДСМ / BDSM"}
-    - {id: 59, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Женское доминирование и страпон / Femdom & Strapon"}
-    - {id: 60, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Подглядывание / Voyeur"}
-    - {id: 61, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Фистинг и дилдо / Fisting & Dildo"}
-    - {id: 62, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Беременные / Pregnant Preggo"}
-    - {id: 63, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Буккаке / Bukkake"}
-    - {id: 64, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Мочеиспускание / Peeing"}
-    - {id: 65, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Фетиш / Fetish"}
-    - {id: 66, cat: XXX, desc: "Нетрадиционное порно / Special Interest Porn Копро / Scat"}
-    - {id: 5, cat: XXX, desc: "Мультфильмы, Хентай и игры / Сartoons, Hentai & Games"}
-    - {id: 54, cat: XXX, desc: "Мультфильмы, Хентай и игры / Сartoons, Hentai & Games Хентай"}
-    - {id: 55, cat: XXX, desc: "Мультфильмы, Хентай и игры / Сartoons, Hentai & Games Игры"}
-    - {id: 74, cat: XXX, desc: "Мультфильмы, Хентай и игры / Сartoons, Hentai & GamesПорно Мультики"}
-    - {id: 7, cat: XXX, desc: "Гей-порно / Gay porn"}
-    - {id: 67, cat: XXX, desc: "Гей-порно / Gay porn Полнометражные гей-фильмы / Full Length Gay Movies"}
-    - {id: 68, cat: XXX, desc: "Гей-порно / Gay porn Ролики, SiteRip'ы и сцены из гей-фильмов / Gay Clips & Movie Scenes"}
-    - {id: 16, cat: XXX, desc: "Форум PornoRip.biz"}
-    - {id: 17, cat: XXX, desc: "Форум PornoRip.biz Новости Порно Индустрии"}
-    - {id: 69, cat: XXX, desc: "Форум PornoRip.biz Правила, инструкции, FAQ"}
-    - {id: 71, cat: XXX, desc: "Форум PornoRip.biz Новости трекера!"}
-    - {id: 72, cat: XXX, desc: "Форум PornoRip.biz Общение"}
-    - {id: 77, cat: XXX, desc: "Форум PornoRip.biz ОбщениеАрхив"}
-
-  modes:
-    search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: t
-    options:
-      t: created
-      ts: seeders
-      sz: size
-      i: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: d
-    options:
-      d: desc
-      a: asc
-
-search:
-  paths:
-    # https://www.pornorip.biz/search.php?tracker_search=torrent&keywords=slut&terms=all&fp=1&author=&sc=1&sf=titleonly&sr=topics&sk=t&sd=d&st=0&ch=300&t=0&submit=Search
-    - path: search.php
-  inputs:
-    tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    terms: all
-    author: ""
-    sc: 1
-    sf: titleonly
-    sr: topics
-    sk: "{{ .Config.sort }}"
-    sd: "{{ .Config.type }}"
-    st: 0
-    ch: 300
-    t: 0
-    submit: Search
-    $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
-
-  rows:
-    selector: div.forumbg > div.inner > ul.topiclist > li.row > dl.icon:has(a[href^="./download/file.php?id="])
-    filters:
-      - name: andmatch
-
-  fields:
-    title:
-      selector: a.topictitle
-      filters:
-        - name: re_replace
-          args: ["^\\[[\\w ]*\\]\\s?", ""]
-    details:
-      selector: a.topictitle
-      attribute: href
-    category:
-      selector: dt a:last-of-type
-      attribute: href
-      filters:
-        - name: regexp
-          args: "-f(\\d+).html$"
-    download:
-      selector: a[href^="./download/file.php?id="]
-      attribute: href
-    size:
-      selector: dt b:nth-of-type(2)
-      filters:
-        - name: replace
-          args: ["ТБ", "TB"]
-        - name: replace
-          args: ["ГБ", "GB"]
-        - name: replace
-          args: ["МБ", "MB"]
-        - name: replace
-          args: ["КБ", "KB"]
-    seeders:
-      selector: span.seed
-    leechers:
-      selector: span.leech
-    grabs:
-      selector: span.complet
-    date_day:
-      # Сегодня, 12:35
-      selector: dt:contains("Сегодня"), dt:contains("Вчера")
-      optional: true
-      filters:
-        - name: regexp
-          args: "»\\s+(.+?)\\s+в"
-        - name: replace
-          args: ["Сегодня", "Today"]
-        - name: replace
-          args: ["Вчера", "Yesterday"]
-        - name: fuzzytime
-    date_ago:
-      # 46 минут назад
-      selector: dt:contains("назад")
-      optional: true
-      filters:
-        - name: regexp
-          args: "»\\s+(.+?)\\s+в"
-        - name: replace
-          args: ["назад", "ago"]
-        - name: replace
-          args: ["секунд", "seconds"]
-        - name: replace
-          args: ["минут", "minutes"]
-        - name: replace
-          args: ["часов", "hours"]
-        - name: timeago
-    date_year:
-      # 12 янв 2019, 11:26
-      selector: dt:not(:contains("Сегодня")):not(:contains("Вчера")):not(:contains("назад"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "»\\s+(.+?)\\s+в"
-        - name: replace
-          args: ["янв", "Jan"]
-        - name: replace
-          args: ["фев", "Feb"]
-        - name: replace
-          args: ["мар", "Mar"]
-        - name: replace
-          args: ["апр", "Apr"]
-        - name: replace
-          args: ["май", "May"]
-        - name: replace
-          args: ["июн", "Jun"]
-        - name: replace
-          args: ["июл", "Jul"]
-        - name: replace
-          args: ["авг", "Aug"]
-        - name: replace
-          args: ["сен", "Sep"]
-        - name: replace
-          args: ["окт", "Oct"]
-        - name: replace
-          args: ["ноя", "Nov"]
-        - name: replace
-          args: ["дек", "Dec"]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "02 Jan 2006, 15:04 -07:00"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_ago .Result.date_day }}{{ or .Result.date_year  .Result.date_ago .Result.date_day }}{{ else }}now{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# phpBB

src/Jackett.Common/Definitions/pornotorrent.yml

@@ -2,7 +2,7 @@
 id: pornotorrent
 name: PornoTorrent
 description: "PornoTorrent is a SPANISH Public Torrent Tracker for 3X"
-language: es-ES
+language: en-US
 type: public
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/potuk.yml

@@ -121,6 +121,10 @@ search:
     - path: "index.php?torrents/&freeleech={{ if .Config.freeleech }}1{{ else }}{{ end }}&filename={{ .Keywords }}"
     # imdb and tmdb not supported
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table.dataList-table > tbody.normal-torrents > tr
 

src/Jackett.Common/Definitions/redbits.yml

@@ -14,6 +14,7 @@ caps:
     - {id: 2, cat: TV, desc: "Series"}
     - {id: 6, cat: TV/Documentary, desc: "Documentales"}
     - {id: 7, cat: TV/Sport, desc: "Deportes"}
+    - {id: 8, cat: Movies, desc: "Hagbard"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/reelflix.yml

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

src/Jackett.Common/Definitions/renegade.yml

@@ -1,184 +0,0 @@
----
-id: renegade
-name: Renegade
-description: "Renegade is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hu-HU
-type: private
-encoding: ISO-8859-2
-links:
-  - http://renegade-tracker.com/
-legacylinks:
-  - https://renegade-tracker.com/ # ERR_CONNECTION_REFUSED
-
-caps:
-  # dont forget to update the search fields category case block
-  categorymappings:
-    - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 38, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 24, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 50, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 42, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 30, cat: PC/Games, desc: "Játék/Rip"}
-    - {id: 31, cat: Other, desc: "Képek"}
-    - {id: 43, cat: Audio/Video, desc: "Klip"}
-    - {id: 33, cat: Books, desc: "Könyv/Eng"}
-    - {id: 44, cat: Books, desc: "Könyv/Hun"}
-    - {id: 32, cat: Console, desc: "Konzol"}
-    - {id: 53, cat: Audio/Lossless, desc: "Lossless/Eng"}
-    - {id: 52, cat: Audio/Lossless, desc: "Lossless/Hun"}
-    - {id: 51, cat: TV/Anime, desc: "Mese/Eng"}
-    - {id: 45, cat: TV/Anime, desc: "Mese/Hun"}
-    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 40, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 41, cat: Audio/MP3, desc: "Mp3/Hun"}
-    - {id: 35, cat: PC/0day, desc: "Program"}
-    - {id: 47, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 36, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 39, cat: XXX, desc: "XXX/Film"}
-    - {id: 49, cat: XXX/ImageSet, desc: "XXX/Kép"}
-
-  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: Filter freeleech only
-    default: false
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    belepes: igen
-    fhnev: "{{ .Config.username }}"
-    jelszo: "{{ .Config.password }}"
-  error:
-    - selector: div#title_curent:contains("Hibás")
-      message:
-        selector: font[color="red"]
-  test:
-    path: ajanlo.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://renegade-tracker.com/letoltes.php?search=&incldead=1&cat=36
-    - path: letoltes.php
-      categories: ["!", 39, 49]
-    - path: xxx.php
-      categories: [39, 49]
-  keywordsfilters:
-    # the site uses % for wildcard
-    - name: re_replace
-      args: ["[^a-zA-Z0-9]+", "%"]
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 both, 2 dead, 3 free, 4 double, 5 Renegade releases, 6 my torrents
-    # note: free and double do not appear to work
-    incldead: 1
-    # does not support imdbid search
-
-  rows:
-    selector: "div#bro_browse_torrents_content{{ if .Config.freeleech }}:contains(\"Igen. Nem \"){{ else }}{{ end }}"
-
-  fields:
-    title:
-      selector: div#bro_browse_details b font a
-    details:
-      selector: div#bro_browse_details b font a
-      attribute: href
-    download:
-      selector: a#bro_dlbutton
-      attribute: href
-    poster:
-      selector: div#bro_browse_poster_1 a img
-      attribute: src
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: "(\\d+\\.\\d{1,2} [M|G|k]?B)"
-    files:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d+) fájl
-    seeders:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d+) seeder
-    leechers:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d+) leecher
-    date:
-      selector: div#bro_browse_details
-      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"
-    downloadvolumefactor:
-      case:
-        "div#bro_browse_torrents_content:contains(\"Igen. Nem \")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "div#bro_browse_torrents_content:contains(\"DUPLA ott a \")": 2
-        "*": 1
-    category:
-      selector: div#bro_browse_details
-      remove: a
-      case:
-        ":contains(\"DVD/Eng\")": 26
-        ":contains(\"DVD/Hun\")": 25
-        ":contains(\"XviD/Eng\")": 38
-        ":contains(\"XviD/Hun\")": 24
-        ":contains(\"HD/Eng\")": 50
-        ":contains(\"HD/Hun\")": 42
-        ":contains(\"Játék/ISO\")": 28
-        ":contains(\"Játék/Rip\")": 30
-        ":contains(\"Képek\")": 31
-        ":contains(\"Klip\")": 43
-        ":contains(\"Könyv/Eng\")": 33
-        ":contains(\"Könyv/Hun\")": 44
-        ":contains(\"Konzol\")": 32
-        ":contains(\"Lossless/Eng\")": 53
-        ":contains(\"Lossless/Hun\")": 52
-        ":contains(\"Mese/Eng\")": 51
-        ":contains(\"Mese/Hun\")": 45
-        ":contains(\"Mobil\")": 34
-        ":contains(\"Mp3/Eng\")": 40
-        ":contains(\"Mp3/Hun\")": 41
-        ":contains(\"Program\")": 35
-        ":contains(\"Sorozat/Eng\")": 47
-        ":contains(\"Sorozat/Hun\")": 36
-        ":contains(\"XXX/Film\")": 39
-        ":contains(\"XXX/Kép\")": 49
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a

src/Jackett.Common/Definitions/rintor.yml

@@ -150,6 +150,8 @@ search:
 
   rows:
     selector: tr[id^="tor_"]
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/rus-media.yml

@@ -357,6 +357,14 @@ search:
       optional: true
     leechers:
       text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    date_minutes:
+      # 55 минут назад
+      selector: td:nth-of-type(6) p:nth-of-type(1):contains("минут")
+      optional: true
+      filters:
+        - name: replace
+          args: ["минут назад", "minutes ago"]
+        - name: timeago
     date_day:
       # Сегодня, 03:04
       # Вчера, 22:47
@@ -369,7 +377,7 @@ search:
           args: ["Вчера", "Yesterday"]
     date_year:
       # 12 янв 2019, 12:47
-      selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера"))
+      selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера")):not(:contains("минут"))
       optional: true
       filters:
         # replace month abbreviations
@@ -404,7 +412,7 @@ search:
         - name: dateparse
           args: "02 Jan 2006 15:04 -07:00"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_day .Result.date_minutes }}{{ or .Result.date_year .Result.date_day .Result.date_minutes }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/rutor.yml

@@ -41,6 +41,10 @@ caps:
     music-search: [q]
 
 settings:
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: info
     type: info
     label: A note about RuTor
@@ -70,6 +74,11 @@ search:
   fields:
     category:
       text: 3
+    title_is_rus:
+      selector: td:nth-of-type(2) a[href^="/torrent/"]
+      filters:
+        - name: re_replace
+          args: ["[^А-Яа-яЁё]+", ""]
     title:
       selector: td:nth-of-type(2) a[href^="/torrent/"]
       filters:
@@ -79,6 +88,10 @@ search:
           args: ["E -", "E01-99 -"]
         - name: replace
           args: ["Кураж-Бамбей", "kurazh"]
+        - name: append
+          args: "{{ if .Result.title_is_rus }} - RUSSIAN{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(.+?) - RUSSIAN", "{{ if .Config.addrussian }}$1 - RUSSIAN{{ else }}$1{{ end }}"]
     details:
       selector: td:nth-of-type(2) a[href^="/torrent/"]
       attribute: href

src/Jackett.Common/Definitions/shareisland.yml

@@ -1,228 +0,0 @@
----
-id: shareisland
-name: Shareisland
-description: "A general italian tracker"
-language: it-IT
-type: private
-encoding: UTF-8
-links:
-  - https://shareisland.org/
-legacylinks:
-  - http://shareisland.org/
-  - http://www.shareisland.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "Serie TV"}
-    - {id: 15, cat: Books/EBook, desc: "Ebook"}
-    - {id: 17, cat: Books/Mags, desc: "Riviste e Giornali"}
-    - {id: 19, cat: XXX, desc: "XXX"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 7, cat: PC/Games, desc: "Games"}
-    - {id: 23, cat: PC, desc: "Software"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
-    - name: re_replace # S01E01 to 1 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-      filters:
-        - name: re_replace # replace special characters with " " (space)
-          args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
-        - name: diacritics
-          args: replace
-        - name: re_replace # replace multiple spaces
-          args: ["[ ]{2,}", " "]
-        # normalize to SXXEYY format
-        - name: re_replace # S01 E01 to S01E01
-          args: ["(?i)\\bS(\\d+)\\sE(\\d+)\\b", "S$1E$2"]
-        - name: re_replace # 01x01 to S01E01
-          args: ["(?i)(\\d{2})x(\\d+)", "S$1E$2"]
-        - name: re_replace # 1x01 to S01E01
-          args: ["(?i)\\b(\\d{1})x(\\d+)", "S0$1E$2"]
-        - name: re_replace # Stagione X --> S0X
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b|\\bSeason'?s?\\s?(\\d{1})\\b", "S0$1$2"]
-        - name: re_replace # Stagione XX --> SXX
-          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b|\\bSeason'?s?\\s?(\\d{2,})\\b", "S$1$2"]
-        - name: re_replace # Episodio 4 to E4
-          args: ["(?i)\\b(?:[\\/\\|]?Episodio\\s?(\\d+)|Puntata\\s?(\\d+))", "E$1$2"]
-        - name: re_replace # Episodi 4 5 to E04-05
-          args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
-        - name: re_replace # rimozioni varie
-          args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.0

src/Jackett.Common/Definitions/shokweb.yml

@@ -1,80 +0,0 @@
----
-id: shokweb
-name: shokweb
-description: "shokweb is a CHINESE Public tracker"
-language: zh-CN
-type: public
-encoding: UTF-8
-links:
-  - https://shokweb.com/
-certificates:
-  - ba7fb6290a9d7d821e73efb0eac4ed95a7fd2d11 # expired
-
-settings: []
-
-caps:
-  categorymappings:
-    - {id: "影视", cat: Movies, desc: "影视(Movie)"}
-    - {id: "安装包", cat: PC/ISO, desc: "安装包(Installation Package)"}
-    - {id: "其他", cat: Other, desc: "其他(Other)"}
-    - {id: "音乐", cat: Audio, desc: "音乐(Music)"}
-    - {id: "文档书籍", cat: Books, desc: "文档书籍(Documents Book)"}
-    - {id: "压缩文件", cat: PC, desc: "压缩文件(Compressed Files)"}
-    - {id: "图像", cat: Other/Misc, desc: "图像(Image)"}
-
-  modes:
-    search: [q]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-search:
-  paths:
-    # https://shokweb.com/ (latest)
-    # https://shokweb.com/search/supergirl%20s04e01 (search)
-    - path: "{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: div:has(a[href^="magnet:?"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: p:has(img) span:nth-last-child(4)
-    title:
-      selector: a[href^="/post/"]
-    details:
-      selector: a[href^="/post/"]
-      attribute: href
-    download:
-      selector: a[href^="magnet:?"]
-      attribute: href
-    size:
-      selector: p:has(img) span:nth-last-child(2)
-    grabs:
-      selector: p:has(img) span:nth-last-child(5)
-    date:
-      selector: p:has(img) span:nth-last-child(1)
-      filters:
-        - name: replace
-          args: ["时", " hours"]
-        - name: replace
-          args: ["分", " minutes"]
-        - name: replace
-          args: ["天", " days"]
-        - name: replace
-          args: ["年", " year"]
-        - name: replace
-          args: ["月", " months"]
-        - name: replace
-          args: ["前", " ago"]
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

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

@@ -56,6 +56,10 @@ search:
         type: json
         attribute: attributes
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     count:

src/Jackett.Common/Definitions/skipthecommercials.yml

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

src/Jackett.Common/Definitions/sktorrent-org.yml

@@ -119,6 +119,8 @@ search:
 
   rows:
     selector: tr.t-row
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/slosoul.yml

@@ -16,15 +16,21 @@ caps:
     - {id: 5, cat: PC, desc: "Apps"}
     - {id: 7, cat: Books/EBook, desc: "Ebooks"}
     - {id: 6, cat: PC/Games, desc: "Games PC"}
+    - {id: 19, cat: Console/XBox 360, desc: "GAMES xbox360"}
     - {id: 8, cat: Movies, desc: "Movies Packs"}
     - {id: 1, cat: Movies/SD, desc: "Movies Divx/Xvid"}
     - {id: 9, cat: Movies/DVD, desc: "Movies DVD-r"}
+    - {id: 17, cat: Movies/HD, desc: "Movies x.264"}
     - {id: 11, cat: Movies/BluRay, desc: "Movies BluRay"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: XXX, desc: "Porn"}
+    - {id: 15, cat: Movies/HD, desc: "Movies HEVC"}
+    - {id: 14, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 3, cat: Audio/MP3, desc: "Music MP3"}
     - {id: 13, cat: TV/Sport, desc: "TV Sport"}
+    - {id: 18, cat: TV, desc: "TV Packs"}
     - {id: 10, cat: TV, desc: "TV Shows"}
+    - {id: 16, cat: TV/HD, desc: "TV Shows HEVC"}
     - {id: 12, cat: Other, desc: "VIP"}
+    - {id: 4, cat: XXX, desc: "Porn"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/spidertk.yml

@@ -0,0 +1,201 @@
+---
+id: spidertk
+name: SpiderTK
+description: "SpiderTK is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://spidertk.xyz/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies/BluRay, desc: "Films / 2160p / BluRay"}
+    - {id: 410, cat: Movies/UHD, desc: "Films / 2160p / REMUX"}
+    - {id: 411, cat: Movies/UHD, desc: "Films / 2160p / AV1"}
+    - {id: 412, cat: Movies/UHD, desc: "Films / 2160p / x265"}
+    - {id: 413, cat: Movies/BluRay, desc: "Films / 1080p / BluRay"}
+    - {id: 414, cat: Movies/HD, desc: "Films / 1080p / REMUX"}
+    - {id: 415, cat: Movies/HD, desc: "Films / 1080p / AV1"}
+    - {id: 416, cat: Movies/HD, desc: "Films / 1080p / x265"}
+    - {id: 417, cat: Movies/HD, desc: "Films / 1080p / x264"}
+    - {id: 418, cat: Movies/HD, desc: "Films / 720p / x264"}
+    - {id: 419, cat: Movies/SD, desc: "Films / SD / x264"}
+    - {id: 420, cat: Movies/3D, desc: "Films / 3D"}
+    - {id: 421, cat: Movies/SD, desc: "Films / XviD"}
+    - {id: 422, cat: Movies/HD, desc: "Films / HDTV / 1080p"}
+    - {id: 440, cat: Movies/HD, desc: "Films / HDTV / 720p"}
+    - {id: 423, cat: Movies/WEB-DL, desc: "Films / WEB / 1080p"}
+    - {id: 458, cat: Movies/WEB-DL, desc: "Films / WEB / 720p"}
+    - {id: 424, cat: TV/Documentary, desc: "Films / Documentaire"}
+    - {id: 425, cat: TV/Sport, desc: "Films / Sport"}
+    - {id: 426, cat: Movies, desc: "Films / Animation"}
+    - {id: 427, cat: Movies/Other, desc: "Films / Spectacle"}
+    - {id: 428, cat: Audio/Video, desc: "Films / Concerts, Clips"}
+    - {id: 429, cat: Movies, desc: "Films / VOSTFR"}
+    - {id: 460, cat: Movies, desc: "Films / VO"}
+    - {id: 430, cat: TV, desc: "Séries / BluRay"}
+    - {id: 431, cat: TV, desc: "Séries / Pack VF"}
+    - {id: 432, cat: TV/HD, desc: "Séries / HD VF"}
+    - {id: 433, cat: TV/SD, desc: "Séries / SD VF"}
+    - {id: 434, cat: TV, desc: "Séries / Pack VOSTFR"}
+    - {id: 435, cat: TV/HD, desc: "Séries / HD VOSTFR"}
+    - {id: 436, cat: TV/SD, desc: "Séries / SD VOSTFR"}
+    - {id: 437, cat: TV/Anime, desc: "Séries / Pack Animé"}
+    - {id: 438, cat: TV/Anime, desc: "Séries / Animé VF"}
+    - {id: 439, cat: TV/Anime, desc: "Séries / Animé VOSTFR"}
+    - {id: 441, cat: TV/Documentary, desc: "Séries / Documentaire"}
+    - {id: 442, cat: TV/Sport, desc: "Séries / Sport"}
+    - {id: 443, cat: TV, desc: "Séries / Émission TV"}
+    - {id: 461, cat: TV, desc: "Séries / VO"}
+    - {id: 444, cat: Books/EBook, desc: "Livres / Roman"}
+    - {id: 445, cat: Audio/Audiobook, desc: "Livres / Audio"}
+    - {id: 446, cat: Books/Mags, desc: "Livres / Magazine"}
+    - {id: 447, cat: Books/Comics, desc: "Livres / Bande Dessinée"}
+    - {id: 448, cat: Books/Comics, desc: "Livres / Comic"}
+    - {id: 449, cat: Books/Comics, desc: "Livres / Manga"}
+    - {id: 450, cat: PC/Games, desc: "Logiciels / Jeu PC"}
+    - {id: 451, cat: PC/Games, desc: "Logiciels / Jeu Mac"}
+    - {id: 452, cat: PC/Games, desc: "Logiciels / Jeu Linux"}
+    - {id: 453, cat: PC/0day, desc: "Logiciels / Appli Windows"}
+    - {id: 454, cat: PC/Mac, desc: "Logiciels / Appli Mac"}
+    - {id: 455, cat: PC, desc: "Logiciels / Appli Linux"}
+    - {id: 456, cat: Console, desc: "Logiciels / Console"}
+    - {id: 457, cat: PC/Mobile-iOS, desc: "Logiciels / iOS"}
+    - {id: 459, cat: PC/Mobile-Android, desc: "Logiciels / Android"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: 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: 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:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  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 }}{{ .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 }}"
+    inclbookmarked: 0
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    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
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - 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:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 0.81
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/tellytorrent.yml

@@ -1,197 +0,0 @@
----
-id: tellytorrent
-name: TellyTorrent
-description: "TellyTorrent is an INDIAN Private Tracker for MOVIES / TV"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://telly.wtf/
-legacylinks:
-  - https://tellytorrent.net/
-  - https://telly.cc/
-  - https://telly.to/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movie"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Movies/WEB-DL, desc: "Web Originals"}
-    - {id: 5, cat: PC/Games, desc: "Games"}
-    - {id: 6, cat: PC/0day, desc: "Application"}
-    - {id: 7, cat: PC/Mobile-Other, desc: "Mobile App"}
-    - {id: 8, cat: Movies, desc: "Movies"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
-    movie-search: [q, imdbid, tmdbid]
-    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: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    mediainfo: ""
-    keywords: ""
-    uploader: ""
-    tmdbId: "{{ .Query.TMDBID }}"
-    imdbId: "{{ .Query.IMDBIDShort }}"
-    tvdbId: "{{ .Query.TVDBID }}"
-    malId: ""
-    startYear: ""
-    endYear: ""
-    playlistId: ""
-    collectionId: ""
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    size:
-      selector: td:nth-last-child(5)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    grabs:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 5.3.0

src/Jackett.Common/Definitions/the-devils-lounge.yml

@@ -110,9 +110,9 @@ download:
       attribute: href
 
 search:
-  # https://the-devils-lounge.xyz/torrents-search.php?search=&cat=0&incldead=0&freeleech=2&inclexternal=0&lang=0
+  # https://the-devils-lounge.xyz/torrents.php?search=&cat=0&incldead=0&freeleech=0&inclexternal=0&lang=0
   paths:
-    - path: torrents-search.php
+    - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"

src/Jackett.Common/Definitions/theleachzone.yml

@@ -111,6 +111,8 @@ search:
 
   rows:
     selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
+    filters:
+      - name: andmatch
 
   fields:
     category:
@@ -128,6 +130,12 @@ search:
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(.+?)\\'
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/torlock.yml

@@ -10,15 +10,10 @@ links:
   - https://www.torlock.com/
   - https://www.torlock2.com/
   - https://www.torlock.icu/
-  - https://torlock.unblockit.tv/
+  - https://torlock.unblockit.how/
   - https://torlock.nocensor.biz/
 legacylinks:
   - https://torlock.com/
-  - https://torlock.unblockit.pro/
-  - https://torlock.unblockit.one/
-  - https://torlock.unblockit.me/
-  - https://torlock.unblockit.pw/
-  - https://torlock.unblockit.id/
   - https://torlock.unblockit.win/
   - https://torlock.unblockit.top/
   - https://torlock.unblockit.lat/
@@ -37,6 +32,7 @@ legacylinks:
   - https://torlock.nocensor.work/
   - https://torlock.unblockit.kim/
   - https://torlock.unblockit.bz/
+  - https://torlock.unblockit.tv/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torlook.yml

@@ -53,6 +53,8 @@ search:
 
   rows:
     selector: div.webResult:has(a.magneto[data-src])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/torrent9.yml

@@ -96,10 +96,6 @@ settings:
       ".html,trie-poid-a": size asc
       ".html,trie-nom-d": title desc
       ".html,trie-nom-a": title asc
-  - name: info_131681
-    type: info
-    label: About Torrent9 Categories
-    default: Torrent9 only returns category <b>Movies</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 131681(Movies) category.
 
 download:
   selectors:
@@ -108,7 +104,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}/top_torrent.html{{ end }}"
+    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace
@@ -118,6 +114,10 @@ search:
     - name: replace
       args: [" ", "-"]
 
+  headers:
+    # site blocks Jackett's Linux User-Agent, so use Jackett's Windows User-Agent instead
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
+
   rows:
     selector: table.table-striped > tbody > tr
     filters:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -100,10 +100,6 @@ settings:
     type: checkbox
     label: Replace VOSTFR with ENGLISH
     default: false
-  - name: info_145469
-    type: info
-    label: About Torrent9clone Categories
-    default: Torrent9clone only returns category <b>Movies</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 145469(Movies) category.
 
 download:
   selectors:
@@ -114,7 +110,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/recherche/{{ .Keywords }}{{ else }}/top{{ end }}"
+    - path: "{{ if .Keywords }}/recherche/{{ .Keywords }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs swith S01 to saison 1 #9712
     - name: re_replace

src/Jackett.Common/Definitions/torrentby.yml

@@ -6,9 +6,9 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://torrent.by/
-certificates:
-  - 7536f57e6640c3fce3784736994be95585a85dfb
+  - http://torrent.by/
+legacylinks:
+  - https://torrent.by/ # ERR_CONNECTION_REFUSED
 
 caps:
   categories:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,23 +8,9 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.tv/
+  - https://torrentdownload.unblockit.how/
   - https://torrentdownload.nocensor.biz/
 legacylinks:
-  - https://torrentdownload.unblockit.pro/
-  - https://torrentdownload.unblockit.one/
-  - https://torrentdownload.black-mirror.xyz/
-  - https://torrentdownload.unblocked.casa/
-  - https://torrentdownload.proxyportal.fun/
-  - https://torrentdownload.uk-unblock.xyz/
-  - https://torrentdownload.ind-unblock.xyz/
-  - https://torrentdownload.unblockit.me/
-  - https://torrentdownload.unblockit.pw/
-  - https://torrentdownload.unblockit.id/
-  - https://torrentdownload.unblockit.win/
-  - https://torrentdownload.unblocked.bar/
-  - https://torrentdownload.proxyportal.pw/
-  - https://torrentdownload.uk-unblock.pro/
   - https://torrentdownload.unblockit.top/
   - https://torrentdownload.unblockit.lat/
   - https://torrentdownload.unblockit.app/
@@ -44,6 +30,7 @@ legacylinks:
   - https://torrentdownload.nocensor.work/
   - https://torrentdownload.unblockit.kim/
   - https://torrentdownload.unblockit.bz/
+  - https://torrentdownload.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,24 +9,9 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.tv/
+  - https://torrentdownloads.unblockit.how/
   - https://torrentdownloads.nocensor.biz/
 legacylinks:
-  - https://torrentdownloads.unblockit.pro/
-  - https://torrentdownloads.unblockit.one/
-  - https://torrentdownloads.black-mirror.xyz/
-  - https://torrentdownloads.unblocked.casa/
-  - https://torrentdownloads.proxyportal.fun/
-  - https://torrentdownloads.uk-unblock.xyz/
-  - https://torrentdownloads.ind-unblock.xyz/
-  - https://torrentdownloads.unblockit.me/
-  - https://torrentdownloads.unblockit.pw/
-  - https://torrentdownloads.unblockit.id/
-  - https://torrentdownloads.unblockit.win/
-  - https://torrentdownloads.unblocked.bar/
-  - https://torrentdownloads.proxyportal.pw/
-  - https://torrentdownloads.uk-unblock.pro/
-  - https://torrentdownloads.unblockit.top/
   - https://torrentdownloads.unblockit.lat/
   - https://torrentdownloads.unblockit.app/
   - https://torrentdownloads.unblocked.rest/
@@ -46,6 +31,7 @@ legacylinks:
   - https://torrentdownloads.nocensor.work/
   - https://torrentdownloads.unblockit.kim/
   - https://torrentdownloads.unblockit.bz/
+  - https://torrentdownloads.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,13 +9,9 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.tv/
+  - https://torrentfunk.unblockit.how/
   - https://torrentfunk.nocensor.biz/
 legacylinks:
-  - https://torrentfunk.unblockit.pro/
-  - https://torrentfunk.unblockit.one/
-  - https://torrentfunk.unblockit.me/
-  - https://torrentfunk.unblockit.pw/
   - https://torrentfunk.unblockit.id/
   - https://torrentfunk.unblockit.win/
   - https://torrentfunk.unblockit.top/
@@ -35,6 +31,7 @@ legacylinks:
   - https://torrentfunk.nocensor.work/
   - https://torrentfunk.unblockit.kim/
   - https://torrentfunk.unblockit.bz/
+  - https://torrentfunk.unblockit.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,28 +11,11 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.tv/
+  - https://torrentgalaxy.unblockit.how/
   - https://torrentgalaxy.nocensor.biz/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
-  - https://torrentgalaxy.unblockit.pro/
-  - https://torrentgalaxy.unblockit.one/
-  - https://tgx.black-mirror.xyz/
-  - https://tgx.unblocked.casa/
-  - https://tgx.proxyportal.fun/
-  - https://tgx.uk-unblock.xyz/
-  - https://tgx.ind-unblock.xyz/
-  - https://torrentgalaxy.unblockit.me/
-  - https://torrentgalaxy.unblockit.pw/
-  - https://torrentgalaxy.unblockit.id/
-  - https://torrentgalaxy.unblockit.win/
   - https://torrentgalaxy.pw/ # proxy list only
-  - https://tgx.unblocked.bar/
-  - https://tgx.proxyportal.pw/
-  - https://tgx.uk-unblock.pro/
-  - https://torrentgalaxy.unblockit.top/
-  - https://torrentgalaxy.unblockit.lat/
-  - https://torrentgalaxy.unblockit.app/
   - https://torrentgalaxy.root.yt/
   - https://tgx.unblocked.rest/
   - https://torrentgalaxy.unblockit.dev/
@@ -50,6 +33,7 @@ legacylinks:
   - https://torrentgalaxy.nocensor.work/
   - https://torrentgalaxy.unblockit.kim/
   - https://torrentgalaxy.unblockit.bz/
+  - https://torrentgalaxy.unblockit.tv/
 
 caps:
   categorymappings: