lemondhd: engine customised

update engine eyecatcher to highlight this is not 5.2.0 standard

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,8 @@
+### Read and complete in full with information about your setup and issue before submitting.
+### Do not delete the template.
+
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue.
-Check closed issues as well, because your issue may have already been fixed.
+Check closed issues as well, because your issue may have already been fixed. Also check our [Troubleshooting](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for steps to resolve common issues.
 
 Please read our [Contributing Guidelines](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md) before submitting your issue to ensure a prompt response to your bug.
 

README.md

@@ -53,7 +53,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * dmhy
  * E-Hentai
  * emtrek
- * Epizod
+ * Erai-Raws
  * ETTV
  * EXT Torrents
  * ExtraTorrent.cd
@@ -130,7 +130,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
- * Tjangto (짱토)
  * TNTfork
  * Tokyo Tosho
  * Torlock
@@ -149,7 +148,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentMafya
  * TorrentMax (토렌트맥스)
  * TorrentParadise
- * TorrentProject
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
  * Torrents.csv
@@ -157,8 +155,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrentv
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
- * Torrentz2
- * Torrentz2k
  * truPornolabs
  * Underverse
  * UnionDHT
@@ -188,12 +184,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
  * EniaHD
- * Erzsebet
  * Erzsebet.pl
  * ExKinoRay
- * ExtremlymTorrents (XTR)
  * Genesis-Movement
  * HamsterStudio
+ * HD-CzTorrent
  * HunTorrent
  * IV-Torrents
  * KinoNaVse100
@@ -322,7 +317,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * Elite-Tracker
  * Empornium (EMP)
  * EpubLibre
  * eShareNet
@@ -343,10 +337,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FreeTorrent
  * FunFile (FF)
  * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
- * FunReleases [![(invite needed)][inviteneeded]](#)
  * Fuzer (FZ)
  * GFXPeers
- * Galeriens (LaPauseTorrents)
  * Gay-Torrents.net
  * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
  * GAYtorrent.ru
@@ -410,6 +402,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LosslessClub
  * M-Team TP (MTTP)
  * MaDs Revolution
+ * magic-heaven
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
  * MeseVilág (Fairytale World)
@@ -427,6 +420,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NetCosmo
  * NetLab
  * NorBits
+ * Nordic+
  * Oasis
  * oMg[WtF]trackr
  * OpenCD
@@ -479,9 +473,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile (SF)
+ * ShareFiles
  * Shareisland
  * Shazbat
- * Shellife (SL) [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SnowPT (SSPT)
  * SoulVoice [![(invite needed)][inviteneeded]](#)
@@ -566,7 +560,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * XWTorrents (XWT)
  * Xthor
  * YDYPT
- * YingK
  * Zamunda.net
  * Zelka.org
  * ZonaQ
@@ -589,6 +582,28 @@ Using the all indexer has no advantages (besides reduced management overhead), o
 
 To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.
 
+### Filter indexers
+
+Another special "filter" indexer is available at `/api/v2.0/indexers/<filter>/results/torznab`
+It will query the configured indexers that match the `<filter>` expression criterias and return the combined results as "all".
+
+Supported filters
+Filter | Condition
+-|-
+`type:<type>` | where the indexer type is equal to `<type>`
+`tag:<tag>` | where the indexer tags contains `<tag>`
+`lang:<tag>` | where the indexer language start with `<lang>`
+`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
+
+Supported operators
+Operator | Condition
+-|-
+`!<expr>` | where not `<expr>`
+`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
+`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
+
+Example:
+The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
 
 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
@@ -778,11 +793,13 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ### Windows
 * Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
-* Open PowerShell and from the `src` directory, run `dotnet restore`
-* Open the Jackett solution in Visual Studio 2019 (version 16.4 or above)
-* Right-click on the Jackett solution and click 'Rebuild Solution' to restore NuGet packages
-* Select Jackett.Server as the startup project
-* In the drop-down menu of the run button select "Jackett.Server" instead of "IIS Express"
+* Open PowerShell and from the `src` directory:
+* - run `dotnet msbuild /restore`
+* - then run `dotnet restore`
+* - and run `dotnet build`
+* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
+* Select **Jackett.Server** as the startup project
+* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
 * Build/Start the project
 
 ### OSX

azure-pipelines.yml

@@ -2,7 +2,7 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
   majorVersion: 0
-  minorVersion: 17
+  minorVersion: 18
   patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
   jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
   buildConfiguration: Release
@@ -300,15 +300,9 @@ stages:
               workingDirectory: $(Build.SourcesDirectory)
               targetType: inline
               failOnStderr: true
-              script: |
-                dotnet-format --check --verbosity diagnostic --folder ./src/DateTimeRoutines
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Common
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Server
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Service
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Test
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Tray
-                dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Updater
+              # execute this command to format all files:
+              # dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src
+              script: dotnet-format --check --verbosity diagnostic --folder ./src
 
       - job: Linting_YAML
         displayName: Linting YAML

src/Jackett.Common/Content/custom.css

@@ -76,6 +76,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-inputtags {
+    max-width: 255px;
+}
+
 [data-type=hiddendata]{
     display: none;
 }
@@ -328,3 +332,21 @@ input#searchquery {
 #proxy-warning {
     color: red;
 }
+
+.label-tag {
+    text-transform: lowercase;
+    background-color: #777;
+}
+
+.tagify {
+    height: auto;
+}
+
+.tagify .tagify__input {
+    min-width: 0;
+    text-transform: lowercase;
+}
+
+.tagify .tagify__tag-text {
+    text-transform: lowercase;
+}

src/Jackett.Common/Content/custom_mobile.css

@@ -330,3 +330,21 @@ input#searchquery {
 #proxy-warning {
     color: red;
 }
+
+.label-tag {
+    text-transform: lowercase;
+    background-color: #777;
+}
+
+.tagify {
+    height: auto;
+}
+
+.tagify .tagify__input {
+    min-width: 0;
+    text-transform: lowercase;
+}
+
+.tagify .tagify__tag-text {
+    text-transform: lowercase;
+}

src/Jackett.Common/Content/index.html

@@ -22,11 +22,14 @@
     <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-multiselect.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/tagify.min.js?changed=11662"></script>
+    <script type="text/javascript" src="../libs/jQuery.tagify.min.js?changed=11662"></script>
 
     <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="../custom.css?changed=20201208" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20201208" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=11662" 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="../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">
@@ -51,6 +54,8 @@
         </div>
 
         <div class="pull-right">
+            <div id="filters" class="btn-group btn-group-sm">
+            </div>
             <button id="jackett-add-indexer" class="btn btn-success btn-sm">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
             </button>
@@ -65,7 +70,7 @@
             </button>
         </div>
         <h3>Configured Indexers</h3>
-        <div id="indexers"> </div>
+        <div id="indexers"></div>
         <hr />
 
         <div class="input-area">
@@ -213,7 +218,7 @@
     <div id="modals"></div>
 
     <script id="setup-item" type="text/x-handlebars-template">
-        <div class="setup-item form-group" data-id="{{id}}" data-value="{{value}}" data-type="{{type}}">
+        <div class="setup-item form-filter" data-id="{{id}}" data-value="{{value}}" data-type="{{type}}">
             <div class="setup-item-label">{{name}}</div>
             <div class="setup-item-value">{{{value_element}}}</div>
         </div>
@@ -289,10 +294,14 @@
             Click on an URL to copy it to the Site Link field.
         </div>
     </script>
-
+    <script id="setup-item-inputtags" type="text/x-handlebars-template">
+      <div class="setup-item-inputtags">
+        <input class="form-control input-sm" type="text" value="{{{value}}}" {{#if pattern}} pattern="{{pattern}}"{{/if}}/>
+      </div>
+    </script>
 
     <script id="configured-indexer-table" type="text/x-handlebars-template">
-        <div class="configured-indexer-div">
+        <div class="tab-content configured-indexer-div">
             <table id="configured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
                 <thead>
                     <tr>
@@ -303,7 +312,7 @@
                 <tbody>
                     {{#each indexers}}
                     <tr class="configured-indexer-row">
-                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
+                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span>{{#each tags}} <span title="{{this}}" class="label label-tag">{{this}}</span>{{/each}}</td>
                         <td class="fit">
                             <div class="indexer-buttons">
                                 <a href="{{rss_host}}" title="{{rss_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy RSS Feed</i></a>
@@ -342,10 +351,11 @@
             <table id="unconfigured-indexer-datatable" class="indexer-table dataTable compact cell-border hover stripe table table-responsive">
                 <thead>
                     <tr>
+                        <th></th>
                         <th>Indexer</th>
                         <th>Categories</th>
                         <th>Type</th>
-                        <th>Type string</th>
+                        <th data-type="hiddendata">Type string</th>
                         <th>Language</th>
                         <th></th>
                     </tr>
@@ -353,10 +363,15 @@
                 <tbody>
                     {{#each indexers}}
                     <tr class="unconfigured-indexer-row">
+                        <td class="checkboxColumn">
+                            {{#if_eq type "public"}}
+                            <input type="checkbox" id="select{{id}}" data-id="{{id}}" />
+                            {{/if_eq}}
+                        </td>
                         <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
                         <td>{{mains_cats}}</td>
                         <td class="fit"><span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
-                        <td>{{type}}</td>
+                        <td data-type="hiddendata">{{type}}</td>
                         <td class="fit">{{language}}</td>
                         <td class="fit">
                             <div class="indexer-buttons">
@@ -375,7 +390,13 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="6"></td>
+                        <th></th>
+                        <th>Indexer</th>
+                        <th>Categories</th>
+                        <th>Type</th>
+                        <th data-type="hiddendata">Type string</th>
+                        <th>Language</th>
+                        <th></th>
                     </tr>
                 </tfoot>
             </table>
@@ -487,12 +508,17 @@
                         <p>You can search all configured indexers from this screen.</p>
                         <label for="text">Query</label>
                         <input class="form-control" type="text" name="query" id="searchquery" />
-                        <label for="tracker">Tracker</label>
-                        <select name="tracker" id="searchTracker" multiple="multiple">
-                            {{#each indexers}}
-                            <option value="{{id}}" selected>{{name}}</option>
-                            {{/each}}
+                        {{#if filters}}
+                        <label for="filter">Filter</label>
+                        <select name="filter" id="searchFilter">
+                          <option value="all">all</option>
+                          {{#each filters}}
+                          <option value="{{id}}">{{id}}</option>
+                          {{/each}}
                         </select>
+                        {{/if}}
+                        <label for="tracker">Tracker</label>
+                        <select name="tracker" id="searchTracker" multiple="multiple"></select>
                         <label for="category">Category</label>
                         <select name="category" id="searchCategory" multiple="multiple"></select>
                         <button id="jackett-search-perform" class="btn btn-success btn-sm"><span class="fa fa-search"></span></button>
@@ -599,7 +625,9 @@
                         </div>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                        <button type="button" id="add-selected-indexers" class="btn btn-default">Add Selected</button>
+                        <button type="button" id="close-selected-indexers" class="btn btn-default"
+                            data-dismiss="modal">Close</button>
                     </div>
                 </div>
             </div>
@@ -684,6 +712,17 @@
         </div>
     </script>
 
+    <script id="jackett-filters" type="text/x-handlebars-template">
+        <button id="jackett-filters-dropdown" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Filter <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="jackett-filters-dropdown">
+            <li class="{{#if_eq active null}}active{{/if_eq}}"><a href="#">All</a></li>
+            {{#each filters}}
+            <li class="{{#if_eq ../active id}}active{{/if_eq}}"><a href="#indexers&filter={{id}}" data-id="{{id}}">{{id}}</a></li>
+            {{/each}}
+        </ul>
+    </script>
+
     <script id="spinner" type="text/x-handlebars-template">
         <span class="spinner glyphicon glyphicon-refresh"></span>
     </script>
@@ -693,6 +732,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20210322"></script>
+    <script type="text/javascript" src="../custom.js?changed=PR11721"></script>
 </body>
 </html>

src/Jackett.Common/Converters/StringToLongConverter.cs

@@ -25,7 +25,7 @@ namespace Jackett.Common.Converters
 
             return long.TryParse((string)reader.Value, out var foo)
                 ? foo
-                : (long?) null;
+                : (long?)null;
         }
 
         public override bool CanConvert(Type objectType) => objectType == typeof(string);

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

@@ -14,8 +14,8 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.club/
-  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.onl/
+  - https://1337x.nocensor.space/
 legacylinks:
   - https://1337x.unblocked.earth/
   - https://1337x.unblockit.pro/
@@ -42,6 +42,8 @@ legacylinks:
   - https://1337x.unblockit.ltd/
   - https://1337x.unblockit.link/
   - https://1337x.unblockit.buzz/
+  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/aither.yml

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

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

@@ -75,7 +75,7 @@ search:
     all_word_seach: 1
     # 0 article, 1 comments, 2 static pages, 3 article titles
     titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
-    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    searchdate: 0
     searchuser: ""
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     sortby: date
@@ -86,6 +86,9 @@ search:
 
   fields:
     category:
+      text: 54
+    category|noappend:
+      optional: true
       selector: a[href*="category="]
       attribute: href
       case:
@@ -130,6 +133,9 @@ search:
     leechers:
       text: 1
     size:
+      text: "0 B"
+    size:
+      optional: true
       selector: b.file_size
     downloadvolumefactor:
       text: 0

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.nl/ # site forces http, does not support https
   - http://audiobookbay.net/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.club/
+  - https://audiobookbay.unblockit.onl/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
@@ -18,6 +18,7 @@ legacylinks:
   - https://audiobookbay.unblockit.ltd/
   - https://audiobookbay.unblockit.link/
   - https://audiobookbay.unblockit.buzz/
+  - https://audiobookbay.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/bit-titan.yml

@@ -124,11 +124,11 @@ settings:
 login:
   path: login.php
   method: form
-  form: form[action="takelogin.php"]
+  form: form[action$="login.php"]
   cookies: ["JAVA=OK"] # avoid jscheck redirect
   captcha:
     type: image
-    selector: img[src^="cap/captcha_math.php"]
+    selector: img[src*="captcha_math.php"]
     input: stringCaptcha
   inputs:
     username: "{{ .Config.username }}"
@@ -150,7 +150,7 @@ search:
     allCats: ""
     search: "{{ .Keywords }}"
     # 1 25, 2 50, 3 75, 4 100
-    limit: 1
+    limit: 4
     # searchin: 0 all, 1 active, 2 dead, 3 highlights, 4 bookmarks, 5 uploads, 10 bots, 11 onlyupload, 12 multiplier, 13 %download, 14 freeleech
     # note: freeleech on this site means download and upload is not counted, whereas OU means download is free and upload is counted
     # 14 yields no freeleech, but 11 returns results
@@ -184,6 +184,9 @@ search:
           args: (\d+)
         - name: prepend
           args: "download.php?torrent="
+    poster:
+      selector: div[data-image]
+      attribute: data-image
     seeders:
       selector: td.peers:has(i[title="Seeders"])
     leechers:
@@ -217,13 +220,6 @@ search:
           args: "02.01.2006 15:04:05 -07:00"
     size:
       selector: td.size
-      filters:
-        - name: replace
-          args: ["\u00a0", ""]
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
     downloadvolumefactor:
       case:
         "span:contains(\"OU\")": 0 # only upload is counted
@@ -234,9 +230,9 @@ search:
         "*": 1
     uploadvolumefactor:
       case:
-        "span:contains(\"2x\")": 2
-        "span:contains(\"5x\")": 5
-        "span:contains(\"10x\")": 10
+        "span:contains(\"x2\")": 2
+        "span:contains(\"x5\")": 5
+        "span:contains(\"x10\")": 10
         "span:contains(\"FL\")": 0 # freeleech neither dl or ul is counted
         "*": 1
     minimumseedtime:

src/Jackett.Common/Definitions/bithumen.yml

@@ -123,13 +123,7 @@ search:
     size:
       selector: td:nth-child(6) > u
     downloadvolumefactor:
-      text: 1
-    downloadvolumefactor:
-      optional: true
-      selector: td:nth-child(6) > nobr > font:contains(" × ")
-      filters:
-        - name: replace
-          args: ["×", ""]
+      text: 0
     uploadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/bitturk.yml

@@ -21,6 +21,8 @@ caps:
     - {id: 67, cat: XXX, desc: "XxX"}
     - {id: 68, cat: Movies, desc: "Dual (TR-~)"}
     - {id: 71, cat: Movies, desc: "NFLIX"}
+    - {id: 78, cat: TV, desc: "EXXEN"}
+    - {id: 79, cat: TV, desc: "BLUTV"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}

src/Jackett.Common/Definitions/broadcity.yml

@@ -102,7 +102,6 @@ search:
       filters:
         - name: regexp
           args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-      filters:
         - name: append
           args: " +03:00" # TRT
         - name: dateparse

src/Jackett.Common/Definitions/btdb.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   # update poster placeholder link too
   - https://btdb.eu/
-  - https://btdb.unblockit.club/
+  - https://btdb.unblockit.onl/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -35,6 +35,7 @@ legacylinks:
   - https://btdb.unblockit.ltd/
   - https://btdb.unblockit.link/
   - https://btdb.unblockit.buzz/
+  - https://btdb.unblockit.club/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,6 +7,9 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
+  - https://btdiggwzoyrwwbiv.onion.ly/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
+legacylinks:
   - http://btdiggwzoyrwwbiv.onion.ly/
 
 caps:
@@ -40,7 +43,7 @@ search:
   paths:
     - path: search
   inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}test{{ end }}"
+    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     # 0 relevance 2 age 3 size 4 files
     order: "{{ .Config.sort }}"
 

src/Jackett.Common/Definitions/btetree.yml

@@ -56,21 +56,21 @@ search:
     files:
       selector: td:nth-child(4)
     date:
-      selector: td:nth-child(6)
+      selector: td:nth-child(5)
       filters:
         - name: dateparse
           args: "01/02 15:04"
     size:
-      selector: td:nth-child(7)
+      selector: td:nth-child(6)
     grabs:
-      selector: td:nth-child(8)
+      selector: td:nth-child(7)
       filters:
         - name: regexp
           args: (\d+)
     seeders:
-      selector: td:nth-child(9)
+      selector: td:nth-child(8)
     leechers:
-      selector: td:nth-child(10)
+      selector: td:nth-child(9)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/byrutor.yml

@@ -262,10 +262,10 @@ download:
   attribute: href
 
 search:
-  # keywords (any age posts, article titles only search)
+  # keywords (article titles only search)
   # do=search&subaction=search&story=five+freddy&titleonly=3&searchdate=0&sortby=date&resorder=desc&catlist[]=1&catlist[]=2&catlist[]=3
-  # keywordless (1 day old posts or newer + article body search) query=game
-  # do=search&subaction=search&story=game&titleonly=0&searchdate=1&sortby=date&resorder=desc&catlist[]=0
+  # keywordless (article body search) query=game
+  # do=search&subaction=search&story=game&titleonly=0&searchdate=0&sortby=date&resorder=desc&catlist[]=0
   paths:
     - path: index.php
   inputs:
@@ -278,7 +278,7 @@ search:
     showposts: 1
     # 0 article, 1 comments, 2 static pages, 3 article titles
     titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
-    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    searchdate: 0
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
     sortby: date
     resorder: desc
@@ -317,8 +317,6 @@ search:
       text: 1
     leechers:
       text: 1
-    grabs:
-      selector: li:has(img[alt="Скачиваний"])
     size:
       selector: div.shor_subtitles span:nth-child(2)
       filters:

src/Jackett.Common/Definitions/carpathians.yml

@@ -150,7 +150,7 @@ search:
           args: ["hete", "week"]
         - name: timeago
     downloadvolumefactor:
-      text: 1
+      text: 0
     uploadvolumefactor:
       case:
         img[src="pic/double.png"]: 2

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -82,6 +82,12 @@ search:
   paths:
     # http://www.cartoonchaos.org/index.php?page=torrents&search=transformers&category=30;21;20;26;15;16;17&options=0&active=0
     - path: index.php
+  keywordsfilters:
+   # if searching for season packs switch S01 to season 1 #11775
+    - name: re_replace
+      args: ["(?i)(S0)(\\d{1,2})$", "season $2"]
+    - name: re_replace
+      args: ["(?i)(S)(\\d{1,3})$", "season $2"]
   inputs:
     page: torrents
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
@@ -105,6 +111,10 @@ search:
           args: category
     title:
       selector: td a[href^="index.php?page=torrent-details"]
+      filters:
+        #  #11775
+        - name: re_replace
+          args: ["(?i)(season )", "S"]
     details:
       selector: td a[href^="index.php?page=torrent-details"]
       attribute: href

src/Jackett.Common/Definitions/cilipro.yml

@@ -6,20 +6,9 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - http://www.cilipro1.xyz/
-  - http://www.cilipro2.xyz/
-  - http://www.cilipro3.xyz/
-  - http://www.cilipro4.xyz/
-  - http://www.cilipro5.xyz/
-  - http://www.cilipro6.xyz/
-  - http://www.cilipro7.xyz/
-  - http://www.cilipro8.xyz/
-  - http://www.cilipro9.xyz/
-  - http://www.cilipro10.xyz/
   - http://www.cilinb1.xyz/
   - http://www.cilinb2.xyz/
   - http://www.cilinb3.xyz/
-  - http://www.cilinb4.xyz/
   - http://www.cilinb5.xyz/
   - http://www.cilinb6.xyz/
   - http://www.cilinb7.xyz/
@@ -80,6 +69,17 @@ legacylinks:
   - http://www.lrsoso9.xyz/
   - http://www.lrsoso10.xyz/
   - http://www.cilijj.xyz/
+  - http://www.cilipro1.xyz/
+  - http://www.cilipro2.xyz/
+  - http://www.cilipro3.xyz/
+  - http://www.cilipro4.xyz/
+  - http://www.cilipro5.xyz/
+  - http://www.cilipro6.xyz/
+  - http://www.cilipro7.xyz/
+  - http://www.cilipro8.xyz/
+  - http://www.cilipro9.xyz/
+  - http://www.cilipro10.xyz/
+  - http://www.cilinb4.xyz/
 
 caps:
   categories:

src/Jackett.Common/Definitions/cinematik.yml

@@ -1,39 +1,13 @@
 ---
-# Update by LA5T based on the orignial 'cinematik.yml'
-# 29.07.2018 22:53 UTC+2
-#
 id: cinematik
 name: Cinematik
-description: "Tracker for non-hollywood movies."
+description: "A tracker for full BD and DVD discs of non-mainstream movies, niche cinema and arthouse."
 language: en-us
 type: private
 encoding: UTF-8
 links:
   - https://www.cinematik.net/
 
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: incldead
-    type: select
-    label: Status
-    default: 1
-    options:
-      0: Active
-      1: "Active and Inactive"
-      2: Inactive
-  - name: srchdtls
-    type: checkbox
-    label: "Detailed search"
-  - name: info_results
-    type: info
-    label: "Search results"
-    default: "You can increase the number of search results in your profile.<br />Default is 15."
-
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Comedy"}
@@ -59,9 +33,34 @@ caps:
     search: [q]
     movie-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: incldead
+    type: select
+    label: Status
+    default: 1
+    options:
+      0: Active
+      1: "Active and Inactive"
+      2: Inactive
+  - name: srchdtls
+    type: checkbox
+    label: "Detailed search"
+  - name: info_results
+    type: info
+    label: "Search results"
+    default: "You can increase the number of search results in your profile.<br>Default is 15."
+
 login:
-  path: takelogin.php
-  method: post
+  method: form
+  path: login.php
+  submitpath: takelogin.php
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
@@ -75,34 +74,36 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Query.Keywords }}"
+    search: "{{ .Keywords }}"
     incldead: "{{ .Config.incldead }}"
     srchdtls: "{{ if .Config.srchdtls }}1{{ else }}0{{ end }}"
+
   rows:
     selector: table[border="1"] tr:not(:first-child)
+
   fields:
     category:
       text: 1
     title:
       selector: td:nth-child(2) a
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
     download:
       selector: a[href^="details.php?id="]
       attribute: href
       filters:
         - name: replace
           args: ["details.php?id=", "download.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(7)
     grabs:
       selector: td:nth-child(8)
       filters:
         - name: regexp
           args: ([\d,]+)
-    files:
-      selector: td:nth-child(5)
-    size:
-      selector: td:nth-child(7)
     seeders:
       selector: td:nth-child(9)
     leechers:
@@ -111,11 +112,12 @@ search:
       selector: td:nth-child(11) div.addedtor
     downloadvolumefactor:
       case:
-        "img[title=\"Golden Torrent: No Download Stats are Recorded\"]": 0
-        "img[title=\"Silver Torrent: Download Stats are 25% Recorded\"]": 0.25
-        "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 0
+        img[title^="Golden Torrent"]: 0
+        img[title^="Silver Torrent"]: 0.25
+        img[title^="Platinum Torrent"]: 0
         "*": 1
     uploadvolumefactor:
       case:
-        "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 2
+        img[title^="Platinum Torrent"]: 2
         "*": 1
+# Engine n/a

src/Jackett.Common/Definitions/crazyhd.yml

@@ -13,6 +13,10 @@ legacylinks:
 caps:
   categorymappings:
     # Movies
+    - {id: 62, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 96, cat: Movies/UHD, desc: "Movies 4k Hindi"}
+    - {id: 94, cat: Movies/UHD, desc: "Movies 4k"}
+    - {id: 64, cat: Movies, desc: "Movies Animated"}
     - {id: 16, cat: Movies/BluRay, desc: "Movies English Bluray"}
     - {id: 11, cat: Movies/DVD, desc: "Movies English DVD-RIP"}
     - {id: 14, cat: Movies, desc: "Movies English CAM"}
@@ -25,12 +29,9 @@ caps:
     - {id: 65, cat: Movies/WEB-DL, desc: "Movies Hindi Webrip/HDrip"}
     - {id: 24, cat: Movies, desc: "Movies UNRATED"}
     - {id: 53, cat: Movies/Foreign, desc: "Movies Other Foreign"}
-    - {id: 64, cat: Movies, desc: "Movies Animated"}
     - {id: 45, cat: Movies, desc: "Movies Trailers"}
     - {id: 93, cat: Movies, desc: "Movies Dual Movies"}
     - {id: 59, cat: Movies, desc: "Movies Pack"}
-    - {id: 94, cat: Movies/UHD, desc: "Movies 4k"}
-    - {id: 62, cat: Movies/3D, desc: "Movies 3D"}
     # TV
     - {id: 34, cat: TV, desc: "TV English Series"}
     - {id: 57, cat: TV, desc: "TV Bangla series"}
@@ -46,7 +47,7 @@ caps:
     - {id: 61, cat: PC/Games, desc: "Games trailer"}
     - {id: 90, cat: Console/PS4, desc: "Games Ps4"}
     - {id: 86, cat: Console/PS3, desc: "Games xbox / ps3"}
-    - {id: 92, cat: PC/Games, desc: "Games nrated"}
+    - {id: 92, cat: PC/Games, desc: "Games unrated"}
     # Software
     - {id: 7, cat: PC/0day, desc: "Software Windows"}
     - {id: 20, cat: PC/Mobile-Android, desc: "Software Android Apps"}

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -33,6 +33,7 @@ caps:
     - {id: 65, cat: Movies, desc: "Films FSCR"}
     - {id: 66, cat: Movies, desc: "Films CamTS"}
     - {id: 67, cat: Movies, desc: "Films Pack Films"}
+    - {id: 129, cat: Movies, desc: "Films QC~Film"}
     - {id: 68, cat: Movies, desc: "Films VostFR"}
     - {id: 69, cat: Movies, desc: "Films VO"}
     - {id: 70, cat: Movies/WEB-DL, desc: "Films WebRip 1080p"}
@@ -71,6 +72,7 @@ caps:
     - {id: 107, cat: Audio/MP3, desc: "Musiques MP3"}
     - {id: 108, cat: Audio/Lossless, desc: "Musiques FLAC"}
     - {id: 109, cat: Audio, desc: "Musiques WMA"}
+    - {id: 132, cat: Audio, desc: "Musiques QC~Musique"}
     # Séries
     - {id: 76, cat: TV/HD, desc: "Series Blu-Ray"}
     - {id: 77, cat: TV/HD, desc: "Series HDTV"}
@@ -88,10 +90,13 @@ caps:
     - {id: 97, cat: TV/Anime, desc: "Series Animée"}
     - {id: 88, cat: TV, desc: "Series Pack HD"}
     - {id: 128, cat: TV, desc: "Series Pack SD"}
+    - {id: 130, cat: TV, desc: "SeriesQC~Serie"}
     # Spéctacle
+    - {id: 131, cat: TV, desc: "SeriesQC~Spectacle"}
     - {id: 91, cat: TV/Other, desc: "Spectacle 720p"}
     - {id: 90, cat: TV/Other, desc: "Spectacle 1080p"}
     # Télévision
+    - {id: 133, cat: TV, desc: "TV QC~Tv"}
     - {id: 74, cat: TV/HD, desc: "TV TVHD"}
     - {id: 75, cat: TV, desc: "TV TVRip"}
     - {id: 92, cat: TV/Other, desc: "TV Spectacles"}
@@ -242,11 +247,23 @@ search:
         - name: regexp
           args: "src=(.*?)><"
     grabs:
-      selector: td:nth-last-child(4)
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Completé : </b>(\\d+)<"
     seeders:
-      selector: td:nth-last-child(3)
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "=green>(\\d+)<"
     leechers:
-      selector: td:nth-last-child(2)
+      selector: a[onmouseover][href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "=red>(\\d+)<"
     size:
       selector: a[onmouseover][href^="torrents-details.php?id="]
       attribute: onmouseover

src/Jackett.Common/Definitions/danishbytes.yml

@@ -12,9 +12,9 @@ caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 5, cat: PC/0day, desc: "Appz"}
-    - {id: 4, cat: PC/Games, desc: "Games"}
     - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
     - {id: 8, cat: Books, desc: "Bookz"}
 
   modes:
@@ -98,11 +98,15 @@ search:
 
   fields:
     category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
+      selector: i.torrent-icon
+      attribute: class
+      case:
+        i.fa-film: 1
+        i.fa-tv-retro: 2
+        i.fa-music: 3
+        i.fa-gamepad: 4
+        i.fa-compact-disc: 5
+        i.fa-book-open: 8
     title:
       selector: a.view-torrent
     download:
@@ -200,4 +204,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# UNIT3D 5.1.0 DB-edition
+# UNIT3D 5.1.0 DBy-edition 0.75

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

@@ -136,9 +136,9 @@ search:
     - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}}"
+    search: "{{ .Keywords }}"
     # 0 name, 1 descr, 2 both
-    blah: "0"
+    blah: 0
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,8 +10,9 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.club/
+  - https://demonoid.unblockit.onl/
   - https://demonoid.torrentbay.to/
+  - https://demonoid.nocensor.space/
 legacylinks:
   - https://demonoid.unblockit.pro/
   - https://demonoid.unblockit.one/
@@ -31,6 +32,7 @@ legacylinks:
   - https://demonoid.unblockit.ltd/
   - https://demonoid.unblockit.link/
   - https://demonoid.unblockit.buzz/
+  - https://demonoid.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/divteam.yml

@@ -24,6 +24,7 @@ caps:
     - {id: 89, cat: Movies/HD, desc: "BDRemux"}
     - {id: 88, cat: Movies/BluRay, desc: "Full HD"}
     - {id: 90, cat: Movies/BluRay, desc: "UHD Full"}
+    - {id: 92, cat: Movies/UHD, desc: "Web-DL UHD"}
     - {id: 23, cat: TV/Sport, desc: "Deportes"}
     - {id: 20, cat: TV/HD, desc: "Series"}
     - {id: 31, cat: TV/HD, desc: "Series VOSE"}

src/Jackett.Common/Definitions/epizod.yml

@@ -1,168 +0,0 @@
----
-id: epizod
-name: Epizod
-description: "Epizod is a FRENCH Public tracker for MOVIES / TV"
-language: fr-fr
-type: public
-encoding: UTF-8
-links:
-  - https://wwv.epizod.tv/
-legacylinks:
-  - https://www.epizod.tv/
-
-caps:
-  categorymappings:
-    - {id: series, cat: TV, desc: SÉRIES}
-    - {id: films, cat: Movies, desc: FILMS}
-    - {id: musique, cat: Audio, desc: MUSIQUE}
-    - {id: albums, cat: Audio, desc: ALBUMS}
-    - {id: ebook, cat: Books, desc: EBOOK}
-    - {id: jeux, cat: Console, desc: GAMES}
-    - {id: other, cat: Other, desc: OTHER}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
-
-download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
-
-search:
-  paths:
-    # https://www.epizod.tv/?s=
-    - path: /
-  inputs:
-    s: "{{ .Keywords }}"
-
-  headers:
-    # Windows User-Agent is required, Linux is blocked
-    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: li[class^="ilovewp-post"]:not(:has(a[title="DMCA"]))
-
-  fields:
-    category1:
-      selector: a[href*="/category/"]
-      attribute: href
-      optional: true
-      filters:
-        - name: split
-          args: ["/", 4]
-    category2:
-      selector: li[class^="ilovewp-post"]
-      attribute: class
-      optional: true
-      filters:
-        - name: regexp
-          args: "category-(.+?) "
-    category3:
-      selector: img[src*="img"]
-      attribute: src
-      optional: true
-      filters:
-        - name: regexp
-          args: "img/(.+?)_"
-        - name: replace
-          args: ["ebooks", "ebook"]
-    category:
-      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
-    sizecat:
-      text: "{{ if or .Result.category1 .Result.category2 .Result.category3 }}{{ or .Result.category1 .Result.category2 .Result.category3 }}{{ else }}other{{ end }}"
-    site_date:
-      selector: time > a
-      filters:
-        # year can be at the end of the title, so we get it and name it site_date
-        - name: regexp
-          args: "(19|20\\d{2})$"
-    title_phase1:
-      selector: time > a
-      attribute: title
-      filters:
-        # now we put the date at the right place according scene naming rules using .Result.site_date
-        - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result.site_date }} FRENCH"]
-        - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result.site_date }} MULTI"]
-        - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result.site_date }} TRUEFRENCH"]
-        - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result.site_date }} VOSTFR"]
-        - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result.site_date }} SUBFRENCH"]
-        # and we delete it at the end
-        - name: re_replace
-          args: ["(19|20\\d{2})$", ""]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: h2.title-post > a
-      attribute: href
-    download:
-      selector: h2.title-post > a
-      attribute: href
-    poster:
-      selector: img[data-lazy-src]
-      attribute: data-lazy-src
-    date:
-      selector: time
-      attribute: datetime
-      filters:
-        - name: replace
-          args: ["T", " "]
-        - name: dateparse
-          args: "2006-01-02 15:04:05-07:00"
-    size:
-      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"albums\") (eq .Result.sizecat \"musique\") }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"jeux\" }}1 GB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine wordpress

src/Jackett.Common/Definitions/erzsebet.yml

@@ -1,202 +0,0 @@
----
-id: erzsebet
-name: Erzsebet
-description: "Erzsebet is a RUSSIAN Semi-Private Torrent Tracker for 3X"
-language: ru-ru
-type: semi-private
-encoding: UTF-8
-links:
-  - https://erzsebet.org/
-
-caps:
-  categorymappings:
-    - {id: 9, cat: XXX, desc: "Feature, Vignettes, Classic / Фильмы с сюжетом и Классичес..."}
-    - {id: 11, cat: XXX, desc: "Gonzo & All Sex / Гонзо-фильмы и Фильмы без сюжета"}
-    - {id: 13, cat: XXX, desc: "All Girl & Solo / Лесбо-фильмы"}
-    - {id: 12, cat: XXX, desc: "Ethnic-Themed / Этнические фильмы"}
-    - {id: 176, cat: XXX, desc: "Mobile, Pocket РС & Phone / Фильмы для моби..."}
-    - {id: 157, cat: XXX, desc: "Full Length Movies Packs / Паки фильмов"}
-    - {id: 16, cat: XXX, desc: "Feature, Vignettes, Classic (HD) / Фильмы с сюжет..."}
-    - {id: 18, cat: XXX, desc: "Gonzo & All Sex, All Girl & Solo, Ethnic-Themed..."}
-    - {id: 180, cat: XXX, desc: "Full Length Movies (DVD) / Фильмы (DVD)"}
-    - {id: 246, cat: XXX, desc: "Full Length Movies (Blu-Ray) / Фильмы (Blu-Ray)"}
-    - {id: 48, cat: XXX, desc: "Clips (various) / Порно Разное"}
-    - {id: 32, cat: XXX, desc: "SiteRip's & Movie Scenes / Сайтрипы и сцены ..."}
-    - {id: 45, cat: XXX, desc: "SiteRip's & Movie Scenes (HD) / Сайтрипы и сцены..."}
-    - {id: 177, cat: XXX, desc: "3D & Virtual Reality Videos (VR) / Видео в 3D и..."}
-    - {id: 43, cat: XXX, desc: "Actresses Clips Packs / Паки по актрисам"}
-    - {id: 39, cat: XXX, desc: "SiteRip's Packs / Паки сайтрипов"}
-    - {id: 52, cat: XXX, desc: "Russian Clips (various) / Порно Разное с русскими актрисам..."}
-    - {id: 53, cat: XXX, desc: "Russian SiteRip's & Movie Scenes / Сайтрип..."}
-    - {id: 54, cat: XXX, desc: "Russian SiteRip's & Movie Scenes (HD) / Сайтрипы..."}
-    - {id: 56, cat: XXX, desc: "Russian Full Length Movies / Русские полнометражные фильмы"}
-    - {id: 50, cat: XXX, desc: "Russian Clips Packs / Паки русского и по русским актрисам"}
-    - {id: 59, cat: XXX, desc: "Amateur Picture / Любительское фото"}
-    - {id: 58, cat: XXX, desc: "Amateur Video & WebCams / Любительское видео"}
-    - {id: 128, cat: XXX, desc: "Amateur Packs / Паки любительского"}
-    - {id: 129, cat: XXX, desc: "Bukkake, Glory Hole, Cumshot Compilation, BlowGangBang ..."}
-    - {id: 130, cat: XXX, desc: "Squirting & Lesbian Bukkake / Лесбо и соло сквиртинг"}
-    - {id: 120, cat: XXX, desc: "Fisting, Dildo & Toys / Фистинг, фаллоимита..."}
-    - {id: 131, cat: XXX, desc: "LegalPorno.com / Сайтрипы студии Legal Porno "}
-    - {id: 64, cat: XXX, desc: "BDSM / БДСМ"}
-    - {id: 65, cat: XXX, desc: "Fetish / Фетиш"}
-    - {id: 66, cat: XXX, desc: "Peeing / Мочеиспускание"}
-    - {id: 67, cat: XXX, desc: "Pregnant / Беременные"}
-    - {id: 68, cat: XXX, desc: "Femdom & Strapon / Женское доминирование и страпон"}
-    - {id: 71, cat: XXX, desc: "Kaviar Movies / Копрофилия"}
-    - {id: 81, cat: XXX, desc: "Picture Gallery / Порнофотографии"}
-    - {id: 80, cat: XXX, desc: "Misc & Special Interest Picture / Тематичес..."}
-    - {id: 79, cat: XXX, desc: "Magazines, Comix & Artwork / Журналы, ком..."}
-    - {id: 78, cat: XXX, desc: "Picture Packs / Паки фотографий"}
-    - {id: 178, cat: XXX, desc: "Erotic Video Library / Эротические студии (видео)"}
-    - {id: 85, cat: XXX, desc: "Adult Games / Порноигры"}
-    - {id: 83, cat: XXX, desc: "Hentai, Manga & Cartoons  / Хентай, Манга и Мультфильм..."}
-    - {id: 89, cat: XXX, desc: "Japanese Porn / Японское порно"}
-    - {id: 188, cat: XXX, desc: "Erotic Movies, Documentary & Reality / Эротически..."}
-    - {id: 219, cat: XXX, desc: "Cinema / Зарубежный Кинематограф"}
-    - {id: 218, cat: XXX, desc: "Cinema Series / Зарубежные сериалы"}
-    - {id: 217, cat: XXX, desc: "Cinema (Russian) / Кинематограф СССР, России и бы..."}
-    - {id: 216, cat: XXX, desc: "Russian Series / Русские сериалы"}
-    - {id: 215, cat: XXX, desc: "Cartoons & Anime / Мультфильмы и Аниме"}
-    - {id: 214, cat: XXX, desc: "Music (Audio) / Музыка (Аудио)"}
-    - {id: 213, cat: XXX, desc: "Music (Video) / Музыка (Видео)"}
-    - {id: 212, cat: XXX, desc: "Games / Игры"}
-    - {id: 211, cat: XXX, desc: "Soft / Софт"}
-    - {id: 210, cat: XXX, desc: "Various / Разное"}
-    - {id: 205, cat: XXX, desc: "Shemale Transsexual / Транссексуалы"}
-    - {id: 204, cat: XXX, desc: "Bisexual / Бисексуалы"}
-    - {id: 206, cat: XXX, desc: "Gay Clips & Movie Scenes / Ролики, SiteRip'ы..."}
-    - {id: 208, cat: XXX, desc: "Full Length Gay Movies / Полнометражные гей-фильмы"}
-    - {id: 209, cat: XXX, desc: "Gay Magazines, Photo, Rest / Гей-журналы, фото, разное"}
-    - {id: 125, cat: XXX, desc: "Archive / Архив"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action="login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    autologin: 1
-  error:
-    - selector: table.error
-  test:
-    path: index.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    - path: tracker.php
-  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"]
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    prev_allw: 1
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    o: "{{ .Config.sort }}"
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    # title search
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # search by partial word
-    allw: 0
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
-
-  fields:
-    category:
-      selector: a.gen
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a.tLink
-    details:
-      selector: a.tLink
-      attribute: href
-    download:
-      selector: a[href^="./dl.php?id="]
-      attribute: href
-    magnet:
-      optional: true
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    size:
-      selector: td:nth-child(6) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# TorrentPier

src/Jackett.Common/Definitions/ettv.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.club/
-  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.onl/
+  - https://ettv.nocensor.space/
 legacylinks:
   - https://www.ettv.tv/
   - https://www.ettv.to/
@@ -39,6 +39,8 @@ legacylinks:
   - https://ettv.unblockit.ltd/
   - https://ettv.unblockit.link/
   - https://ettv.unblockit.buzz/
+  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.club/
 
 caps:
   categorymappings:

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

@@ -7,7 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrents.it/
-  - https://extratorrent.unblockit.club/
+  - https://extratorrent.unblockit.onl/
+  - https://extratorrent.nocensor.space/
 legacylinks:
   - https://extratorrent.ag/
   - https://extratorrent.unblockit.app/
@@ -16,6 +17,7 @@ legacylinks:
   - https://extratorrent.unblockit.link/
   - https://extratorrent2.unblockninja.com/
   - https://extratorrent.unblockit.buzz/
+  - https://extratorrent.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -1,179 +0,0 @@
----
-id: extremlymtorrents
-name: ExtremlymTorrents
-description: "ExtremlymTorrents (XTR) is a Semi-Private tracker for MOVIES / TV / GENERAL"
-language: en-us
-type: semi-private
-encoding: UTF-8
-links:
-  - https://extremlymtorrents.ws/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: Movies/HD, desc: "720p HD"}
-    - {id: 15, cat: Movies/HD, desc: "1080p HD"}
-    - {id: 40, cat: Movies/UHD, desc: "4K UHD 2160p"}
-    - {id: 12, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 5, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 16, cat: Movies/3D, desc: "BluRay 3D"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 47, cat: XXX, desc: "Porn UHD 4K -[+18]- xXx"}
-    - {id: 11, cat: XXX, desc: "Porn -[+18]- xXx"}
-    - {id: 50, cat: XXX, desc: "xXx iMAGESET (+18)"}
-    - {id: 41, cat: TV, desc: "TVRip"}
-    - {id: 6, cat: Audio, desc: "Music Mp3 | FLAC"}
-    - {id: 9, cat: TV, desc: "Kidz | Cartoons"}
-    - {id: 8, cat: Books/EBook, desc: "Comics | EBook"}
-    - {id: 10, cat: TV, desc: "TV Episode | Season Complete"}
-    - {id: 27, cat: Movies/DVD, desc: "DVD | PAL | NTSC"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "WEBRip | WEB-DL"}
-    - {id: 35, cat: Movies, desc: "BRRip | BDRip | HDRip"}
-    - {id: 3, cat: PC, desc: "Applications"}
-    - {id: 17, cat: Console/PSP, desc: "PSP | Playstation "}
-    - {id: 30, cat: TV/SD, desc: "PDTV | SDTV"}
-    - {id: 18, cat: Console/PS3, desc: "PS3 | Playstation 3 "}
-    - {id: 46, cat: Console/PS4, desc: "PS4 | PlayStation 4"}
-    - {id: 20, cat: PC/Mobile-iOS, desc: "Iphone iOS"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Android Apk"}
-    - {id: 21, cat: Movies, desc: "Pack"}
-    - {id: 49, cat: TV/UHD, desc: "TV UHD | 2160p | Episodes"}
-    - {id: 24, cat: Audio/Video, desc: "VideoClip"}
-    - {id: 26, cat: Console/Wii, desc: "Wii Games"}
-    - {id: 31, cat: TV/Documentary, desc: "DOC's"}
-    - {id: 36, cat: Movies, desc: "CAMRip | REC"}
-    - {id: 38, cat: Movies, desc: "TS: TeleSync | HD-TS"}
-    - {id: 48, cat: Audio/Video, desc: "4K | 2160p | Music Video"}
-    - {id: 28, cat: TV/Anime, desc: "Anime | Japanese"}
-    - {id: 43, cat: XXX, desc: "Hentai | Manga"}
-    - {id: 29, cat: PC/0day, desc: "Windows PC"}
-    - {id: 7, cat: PC/Mac, desc: "Mac"}
-    - {id: 23, cat: PC, desc: "Linux"}
-    - {id: 32, cat: PC/Mobile-Other, desc: "GPS Navigation"}
-    - {id: 45, cat: Audio, desc: "Vinyl Rip"}
-    - {id: 2, cat: Console/XBox 360, desc: "XBOX 360"}
-    - {id: 1, cat: PC/Games, desc: "Games PC"}
-    - {id: 14, cat: Other, desc: "Wallpapers"}
-    - {id: 44, cat: Movies, desc: "Bollywood"}
-    - {id: 42, cat: Other/Misc, desc: "X EXTERN ONLY MAGNET"}
-    - {id: 39, cat: TV/Sport, desc: "Sport TV"}
-
-  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: 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 }}"
-  error:
-    - selector: span.titlebar:contains("Access Denied")
-      message:
-        selector: td.text
-  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 all 1 English 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.xtrz > tbody > tr[class^="ttable_col"]
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    language:
-      selector: td:nth-last-child(5)
-    description:
-      optional: true
-      selector: img[src="/images/vip-icon.png"]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/images/vip-icon.png", " VIP ONLY"]
-    title:
-      selector: a[href^="file.php?id="] b
-      filters:
-        - name: append
-          args: " {{ .Result.language }}{{ .Result.description }}"
-    details:
-      selector: a[href^="file.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="file.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
-    leechers:
-      selector: td:nth-last-child(2)
-    seeders:
-      selector: td:nth-last-child(3)
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        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/eztv.yml

@@ -12,8 +12,8 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.club/
-  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.onl/
+  - https://eztv.nocensor.space/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
@@ -42,6 +42,8 @@ legacylinks:
   - https://eztv.unblockit.ltd/
   - https://eztv.unblockit.link/
   - https://eztv.unblockit.buzz/
+  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.club/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fouducinema.yml

@@ -11,33 +11,40 @@ links:
 caps:
   categorymappings:
     # when refreshing categories dont forget to update the category case block
-    - {id: 94, cat: TV/Sport, desc: "sport catch"}
-    - {id: 93, cat: TV/Sport, desc: "sport catch"}
+    - {id: 116, cat: Books, desc: "livres cuisine"}
+    - {id: 125, cat: XXX/Other, desc: "livres XXX"}
+    - {id: 123, cat: Books, desc: "livres roman"}
+    - {id: 113, cat: Books/EBook, desc: "livres Ebook"}
+    - {id: 110, cat: Audio/Audiobook, desc: "livres audio"}
+    - {id: 109, cat: Books/Comics, desc: "livres bd"}
+    - {id: 108, cat: Books/Comics, desc: "livres manga"}
+    - {id: 106, cat: Books, desc: "livres presse"}
+    - {id: 105, cat: Books/Mags, desc: "livres magazine"}
+    - {id: 126, cat: Books, desc: "livres "}
     - {id: 96, cat: TV/Sport, desc: "sport sport"}
     - {id: 97, cat: TV/Sport, desc: "sport divers"}
-    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
-    - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
-    - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
-    - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
     - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
     - {id: 79, cat: Movies/HD, desc: "Animation Film"}
+    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
+    - {id: 99, cat: Movies/HD, desc: "Film Hdrip"}
+    - {id: 98, cat: Movies/WEB-DL, desc: "Film Webrip"}
+    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
     - {id: 87, cat: Movies/HD, desc: "Film REMUX"}
     - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
     - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 67, cat: Movies/3D, desc: "Film 3D Bluray"}
     - {id: 59, cat: Movies/Other, desc: "Film Divers"}
     - {id: 19, cat: Movies/HD, desc: "Film 720P"}
     - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Webrip - HDrip"}
     - {id: 15, cat: Movies/BluRay, desc: "Film Bluray Full"}
     - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
+    - {id: 102, cat: Movies/UHD, desc: "Film HDR"}
     - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
     - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
     - {id: 60, cat: TV/Other, desc: "Serie Divers"}
     - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
-    - {id: 73, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 101, cat: TV/UHD, desc: "Serie HDR"}
     - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
     - {id: 30, cat: TV/HD, desc: "Serie 720P"}
     - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
@@ -48,6 +55,7 @@ caps:
     - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
     - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
     - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
+    - {id: 112, cat: TV/HD, desc: "Pack_Series HDTV"}
     - {id: 10, cat: XXX, desc: "XxX 18 Film"}
     - {id: 13, cat: PC/0day, desc: "Apps Win"}
     - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
@@ -158,33 +166,40 @@ search:
       selector: div.kat_cat_pic
       filters:
       case:
-        ":contains(\"sport\"):contains(\"catch\")": 94
-        ":contains(\"sport\"):contains(\"catch\")": 93
+        ":contains(\"livres\"):contains(\"cuisine\")": 116
+        ":contains(\"livres\"):contains(\"XXX\")": 125
+        ":contains(\"livres\"):contains(\"roman\")": 123
+        ":contains(\"livres\"):contains(\"Ebook\")": 113
+        ":contains(\"livres\"):contains(\"audio\")": 110
+        ":contains(\"livres\"):contains(\"bd\")": 109
+        ":contains(\"livres\"):contains(\"manga\")": 108
+        ":contains(\"livres\"):contains(\"presse\")": 106
+        ":contains(\"livres\"):contains(\"magazine\")": 105
+        ":contains(\"livres\"):contains(\"\")": 126
         ":contains(\"sport\"):contains(\"sport\")": 96
         ":contains(\"sport\"):contains(\"divers\")": 97
-        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
-        ":contains(\"Documentaires\"):contains(\"audio\")": 66
-        ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
-        ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
         ":contains(\"Animation\"):contains(\"Séries\")": 81
         ":contains(\"Animation\"):contains(\"Film\")": 79
+        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Film\"):contains(\"DVDRip\")": 2
+        ":contains(\"Film\"):contains(\"Hdrip\")": 99
+        ":contains(\"Film\"):contains(\"Webrip\")": 98
+        ":contains(\"Film\"):contains(\"UHD\")": 86
         ":contains(\"Film\"):contains(\"REMUX\")": 87
         ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
         ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Film\"):contains(\"3D\")": 67
         ":contains(\"Film\"):contains(\"Divers\")": 59
         ":contains(\"Film\"):contains(\"720P\")": 19
         ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"Webrip\")": 16
-        ":contains(\"Film\"):contains(\"Bluray\")": 15
+        ":contains(\"Film\"):contains(\"Full\")": 15
         ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"UHD\")": 86
+        ":contains(\"Film\"):contains(\"HDR\")": 102
         ":contains(\"Serie\"):contains(\"1080P\")": 46
         ":contains(\"Serie\"):contains(\"Bluray\")": 48
         ":contains(\"Serie\"):contains(\"Divers\")": 60
         ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
-        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 73
+        ":contains(\"Serie\"):contains(\"HDR\")": 101
         ":contains(\"Serie\"):contains(\"DVDRip\")": 12
         ":contains(\"Serie\"):contains(\"720P\")": 30
         ":contains(\"Serie\"):contains(\"Web\")": 23
@@ -195,6 +210,7 @@ search:
         ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
         ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
         ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
+        ":contains(\"Pack_Series\"):contains(\"HDTV\")": 112
         ":contains(\"XxX\"):contains(\"Film\")": 10
         ":contains(\"Apps\"):contains(\"Win\")": 13
         ":contains(\"Apps\"):contains(\"Mac\")": 14

src/Jackett.Common/Definitions/funreleases.yml

@@ -1,215 +0,0 @@
----
-id: funreleases
-name: FunReleases
-description: "FunReleases is a Private GERMAN site for TV / MOVIES / GENERAL"
-language: de-de
-type: private
-encoding: UTF-8
-links:
-  - https://funreleases.me/
-
-caps:
-  categorymappings:
-    - {id: 10, cat: Audio/MP3, desc: "Audio Mp3"}
-    - {id: 11, cat: Audio/MP3, desc: "Audio Pack|MP3"}
-    - {id: 12, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 13, cat: Audio/Lossless, desc: "Audio Pack|Flac"}
-    - {id: 14, cat: Audio, desc: "Audio Hörspiel"}
-    - {id: 15, cat: Audio/Audiobook, desc: "Audio Audiobook"}
-    - {id: 16, cat: Audio/Video, desc: "Audio Videoclip"}
-    - {id: 17, cat: Audio/Other, desc: "Audio Sonstiges"}
-    - {id: 18, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 19, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 20, cat: Movies/DVD, desc: "Filme DVD-R"}
-    - {id: 21, cat: Movies/UHD, desc: "Filme HD|4K"}
-    - {id: 22, cat: Movies/HD, desc: "Filme HD|1080p"}
-    - {id: 23, cat: Movies/HD, desc: "Filme HD|720p"}
-    - {id: 24, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 25, cat: Movies/SD, desc: "Filme XviD"}
-    - {id: 26, cat: Movies, desc: "Filme Remux"}
-    - {id: 27, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 28, cat: Movies/Other, desc: "Filme Sonstiges"}
-    - {id: 29, cat: TV/HD, desc: "Serien HD"}
-    - {id: 30, cat: TV/HD, desc: "Serien Pack|HD"}
-    - {id: 31, cat: TV/SD, desc: "Serien SD"}
-    - {id: 32, cat: TV/SD, desc: "Serien Pack|SD"}
-    - {id: 33, cat: TV, desc: "Serien TV/Shows"}
-    - {id: 34, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 35, cat: TV/Other, desc: "Serien Sonstiges"}
-    - {id: 36, cat: TV/Documentary, desc: "Doku HD"}
-    - {id: 37, cat: TV/Documentary, desc: "Doku Pack|HD"}
-    - {id: 38, cat: TV/Documentary, desc: "Doku SD"}
-    - {id: 39, cat: TV/Documentary, desc: "Doku Pack|SD"}
-    - {id: 40, cat: TV/Documentary, desc: "Doku International"}
-    - {id: 41, cat: TV/Documentary, desc: "Doku Sonstiges"}
-    - {id: 42, cat: PC/Games, desc: "Games Windows"}
-    - {id: 43, cat: Console/PSP, desc: "Games Playstation"}
-    - {id: 44, cat: Console/XBox, desc: "Games XBox"}
-    - {id: 45, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 46, cat: PC/Games, desc: "Games Macintosh"}
-    - {id: 47, cat: Console/Other, desc: "Games Sonstiges"}
-    - {id: 48, cat: PC/0day, desc: "Software Windows"}
-    - {id: 49, cat: PC/Mac, desc: "Software Macintosh"}
-    - {id: 50, cat: PC/Mobile-Other, desc: "Software Handy-PDA"}
-    - {id: 51, cat: PC, desc: "Software Linux"}
-    - {id: 52, cat: PC, desc: "Software Sonstiges"}
-    - {id: 53, cat: Books/EBook, desc: "Ebook Buch"}
-    - {id: 54, cat: Books/Comics, desc: "Ebook Comic"}
-    - {id: 55, cat: Books/Mags, desc: "Ebook Magazin"}
-    - {id: 56, cat: Books, desc: "Ebook Zeitung"}
-    - {id: 57, cat: Books/Other, desc: "Ebook Sonstiges"}
-    - {id: 58, cat: TV/Sport, desc: "Sport Fußball"}
-    - {id: 59, cat: TV/Sport, desc: "Sport Formel 1"}
-    - {id: 60, cat: TV/Sport, desc: "Sport Wrestling"}
-    - {id: 61, cat: TV/Sport, desc: "Sport Sonstiges"}
-    - {id: 62, cat: XXX, desc: "XXX HD"}
-    - {id: 63, cat: XXX, desc: "XXX Pack|HD"}
-    - {id: 64, cat: XXX, desc: "XXX SD"}
-    - {id: 65, cat: XXX, desc: "XXX Pack|SD"}
-    - {id: 66, cat: XXX, desc: "XXX Bilder"}
-    - {id: 67, cat: XXX, desc: "XXX Sonstiges"}
-
-  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: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: body[onLoad^="makeAlert('"]
-      message:
-        selector: body[onLoad^="makeAlert('"]
-        attribute: onLoad
-        filters:
-          - name: replace
-            args: ["makeAlert('Error' , '", ""]
-          - name: replace
-            args: ["');", ""]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  selector: a[href^="download.php?id="]
-  attribute: href
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    page: torrents
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    # 0 name, 1 name&descr, 2 descr, 3 uploader, 5 gold, 6 silver, 7 bronze, 8 1xUL, 9 2x, 10 3x, 11 4x, 12 5x, 13 6x, 14 7x, 15 8x, 16 9x, 17 10x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-  # does not return imdb link in results, and while a few titles have an imdbid in descr the majority do not.
-
-  rows:
-    selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href^="index.php?page=torrent-details&id="]
-    details:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=downloadcheck&id="]
-      attribute: href
-    poster:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(9)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-last-child(8)
-    leechers:
-      selector: td:nth-last-child(7)
-    grabs:
-      selector: td:nth-last-child(6)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        img[src="images/gold.gif"]: 0
-        img[src="images/silver.gif"]: 0.5
-        img[src="images/bronze.gif"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="images/2x.gif"]: 2
-        img[src="images/3x.gif"]: 3
-        img[src="images/4x.gif"]: 4
-        img[src="images/5x.gif"]: 5
-        img[src="images/6x.gif"]: 6
-        img[src="images/7x.gif"]: 7
-        img[src="images/8x.gif"]: 8
-        img[src="images/9x.gif"]: 9
-        img[src="images/10x.gif"]: 10
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800 # rules say you must seed but not for how long
-# xbtitFM 3.0.00

src/Jackett.Common/Definitions/galeriens.yml

@@ -1,367 +0,0 @@
----
-id: galeriens
-name: Galeriens
-description: "Galeriens is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-fr
-type: private
-encoding: UTF-8
-links:
-  - https://galeriens.com/
-legacylinks:
-  - https://galeriens.eu/
-
-caps:
-  categorymappings:
-    - {id: 4, cat: Movies/UHD, desc: "Animations -  4K Remux"}
-    - {id: 1, cat: Movies/3D, desc: "Animations - 3D"}
-    - {id: 3, cat: Movies/UHD, desc: "Animations - 4K Light"}
-    - {id: 2, cat: Movies/UHD, desc: "Animations - 4K UHD"}
-    - {id: 5, cat: Movies/UHD, desc: "Animations - 4K UHD Bluray"}
-    - {id: 6, cat: Movies/BluRay, desc: "Animations - BDRip-BRRIP"}
-    - {id: 7, cat: Movies/BluRay, desc: "Animations - BluRay-R"}
-    - {id: 8, cat: Movies, desc: "Animations - Coffret Films"}
-    - {id: 9, cat: Movies/DVD, desc: "Animations - DVD-R"}
-    - {id: 10, cat: Movies/DVD, desc: "Animations - DVDRip"}
-    - {id: 11, cat: Movies/HD, desc: "Animations - HD 1080P"}
-    - {id: 12, cat: Movies/HD, desc: "Animations - HD 720P"}
-    - {id: 13, cat: Movies/HD, desc: "Animations - HDRiP"}
-    - {id: 16, cat: Movies/HD, desc: "Animations - HDTV"}
-    - {id: 14, cat: Movies/HD, desc: "Animations - HDTV 1080p"}
-    - {id: 15, cat: Movies/HD, desc: "Animations - HDTV 720p"}
-    - {id: 17, cat: Movies, desc: "Animations - Jap-Animation"}
-    - {id: 18, cat: Movies/HD, desc: "Animations - M-HD 1080p"}
-    - {id: 19, cat: Movies/HD, desc: "Animations - M-HD 720p"}
-    - {id: 20, cat: Movies, desc: "Animations - Remux"}
-    - {id: 21, cat: Movies/WEB-DL, desc: "Animations - TVRip"}
-    - {id: 24, cat: Movies/WEB-DL, desc: "Animations - WEB-DL"}
-    - {id: 22, cat: Movies/WEB-DL, desc: "Animations - WEB-DL 1080p"}
-    - {id: 23, cat: Movies/WEB-DL, desc: "Animations - WEB-DL 720p"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "Animations - WEBRip"}
-    - {id: 26, cat: Movies/HD, desc: "Animations - X265"}
-    - {id: 49, cat: TV/Documentary, desc: "Documentaires - Doc-Spectacle"}
-    - {id: 48, cat: TV/Documentary, desc: "Documentaires - Emission TV"}
-    - {id: 51, cat: TV/Documentary, desc: "Documentaires - Film"}
-    - {id: 50, cat: TV/Sport, desc: "Documentaires - Sport"}
-    - {id: 57, cat: Movies/3D, desc: "Films - 3D"}
-    - {id: 59, cat: Movies/UHD, desc: "Films - 4K Light"}
-    - {id: 60, cat: Movies/UHD, desc: "Films - 4K Remux"}
-    - {id: 61, cat: Movies/UHD, desc: "Films - 4K UHD"}
-    - {id: 58, cat: Movies/UHD, desc: "Films - 4K UHD Bluray"}
-    - {id: 62, cat: Movies/BluRay, desc: "Films - BDRip-BRRIP"}
-    - {id: 63, cat: Movies/BluRay, desc: "Films - BluRay-R"}
-    - {id: 64, cat: Movies, desc: "Films - Coffret Films"}
-    - {id: 65, cat: Movies/DVD, desc: "Films - DVD-R"}
-    - {id: 66, cat: Movies/DVD, desc: "Films - DVDRip"}
-    - {id: 67, cat: Movies/HD, desc: "Films - HD 1080P"}
-    - {id: 68, cat: Movies/HD, desc: "Films - HD 720P"}
-    - {id: 69, cat: Movies/HD, desc: "Films - HDRiP"}
-    - {id: 72, cat: Movies/HD, desc: "Films - HDTV"}
-    - {id: 70, cat: Movies/HD, desc: "Films - HDTV 1080p"}
-    - {id: 71, cat: Movies/HD, desc: "Films - HDTV 720p"}
-    - {id: 73, cat: Movies/HD, desc: "Films - M-HD 1080p"}
-    - {id: 74, cat: Movies/HD, desc: "Films - M-HD 720p"}
-    - {id: 75, cat: Movies, desc: "Films - Remux"}
-    - {id: 76, cat: Movies/WEB-DL, desc: "Films - TVRip"}
-    - {id: 77, cat: Movies/WEB-DL, desc: "Films - WEB-DL"}
-    - {id: 78, cat: Movies/WEB-DL, desc: "Films - WEB-DL 1080p"}
-    - {id: 79, cat: Movies/WEB-DL, desc: "Films - WEB-DL 720p"}
-    - {id: 80, cat: Movies/WEB-DL, desc: "Films - WEBRip"}
-    - {id: 81, cat: Movies/HD, desc: "Films - X265"}
-    - {id: 82, cat: Movies/3D, desc: "Films-VOSTFR - 3D"}
-    - {id: 84, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Light"}
-    - {id: 85, cat: Movies/UHD, desc: "Films-VOSTFR - 4K Remux"}
-    - {id: 86, cat: Movies/UHD, desc: "Films-VOSTFR - 4K UHD"}
-    - {id: 83, cat: Movies/UHD, desc: "Films-VOSTFR - 4K UHD Bluray"}
-    - {id: 87, cat: Movies/BluRay, desc: "Films-VOSTFR - BDRip-BRRIP"}
-    - {id: 88, cat: Movies/BluRay, desc: "Films-VOSTFR - BluRay-R"}
-    - {id: 89, cat: Movies, desc: "Films-VOSTFR - Coffret Films"}
-    - {id: 90, cat: Movies/DVD, desc: "Films-VOSTFR - DVD-R"}
-    - {id: 91, cat: Movies/DVD, desc: "Films-VOSTFR - DVDRip"}
-    - {id: 92, cat: Movies/HD, desc: "Films-VOSTFR - HD 1080P"}
-    - {id: 93, cat: Movies/HD, desc: "Films-VOSTFR - HD 720P"}
-    - {id: 94, cat: Movies/HD, desc: "Films-VOSTFR - HDRiP"}
-    - {id: 97, cat: Movies/HD, desc: "Films-VOSTFR - HDTV"}
-    - {id: 95, cat: Movies/HD, desc: "Films-VOSTFR - HDTV 1080p"}
-    - {id: 96, cat: Movies/HD, desc: "Films-VOSTFR - HDTV 720p"}
-    - {id: 98, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 1080p"}
-    - {id: 99, cat: Movies/HD, desc: "Films-VOSTFR - M-HD 720p"}
-    - {id: 100, cat: Movies, desc: "Films-VOSTFR - Remux"}
-    - {id: 101, cat: Movies/WEB-DL, desc: "Films-VOSTFR - TVRip"}
-    - {id: 102, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL"}
-    - {id: 103, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL 1080p"}
-    - {id: 104, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEB-DL 720p"}
-    - {id: 105, cat: Movies/WEB-DL, desc: "Films-VOSTFR - WEBRip"}
-    - {id: 106, cat: Movies/HD, desc: "Films-VOSTFR - X265"}
-    - {id: 107, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
-    - {id: 108, cat: PC/Mobile-iOS, desc: "Jeux - IOS-OSX"}
-    - {id: 109, cat: PC/Games, desc: "Jeux - PC"}
-    - {id: 110, cat: Console/PS3, desc: "Jeux - PS3 - PS4"}
-    - {id: 111, cat: Console/PSP, desc: "Jeux - PSP-PSX"}
-    - {id: 112, cat: Console/Wii, desc: "Jeux - WII"}
-    - {id: 113, cat: Console/WiiU, desc: "Jeux - WII-U"}
-    - {id: 114, cat: Console/XBox, desc: "Jeux - XBOX"}
-    - {id: 52, cat: Books, desc: "Livres - BD"}
-    - {id: 56, cat: Audio/Audiobook, desc: "Livres - Livres Audio"}
-    - {id: 55, cat: Books/Comics, desc: "Livres - Mangas"}
-    - {id: 54, cat: Books/Mags, desc: "Livres - Press"}
-    - {id: 53, cat: Books/EBook, desc: "Livres - Romans"}
-    - {id: 115, cat: PC/Mobile-Android, desc: "Logiciels - ANDROID"}
-    - {id: 118, cat: PC/Mac, desc: "Logiciels - APPLE"}
-    - {id: 116, cat: PC/Mobile-iOS, desc: "Logiciels - IPHONE"}
-    - {id: 117, cat: PC, desc: "Logiciels - LINUX"}
-    - {id: 119, cat: PC/0day, desc: "Logiciels - WINDOWS"}
-    - {id: 120, cat: Audio/Lossless, desc: "Musiques - FLAC"}
-    - {id: 121, cat: Audio, desc: "Musiques - HQ"}
-    - {id: 122, cat: Audio/MP3, desc: "Musiques - MP3"}
-    - {id: 123, cat: Audio, desc: "Musiques - Spect/Concert"}
-    - {id: 27, cat: TV/HD, desc: "Series-Animee - BDRip-BRRIP"}
-    - {id: 28, cat: TV/HD, desc: "Series-Animee - BluRay-R"}
-    - {id: 29, cat: TV/SD, desc: "Series-Animee - DVD-R"}
-    - {id: 30, cat: TV/SD, desc: "Series-Animee - DVDRip"}
-    - {id: 32, cat: TV/HD, desc: "Series-Animee - HD 1080P"}
-    - {id: 31, cat: TV/HD, desc: "Series-Animee - HD 720P"}
-    - {id: 33, cat: TV/HD, desc: "Series-Animee - HDRiP"}
-    - {id: 34, cat: TV/HD, desc: "Series-Animee - HDTV"}
-    - {id: 35, cat: TV/HD, desc: "Series-Animee - HDTV 1080p"}
-    - {id: 36, cat: TV/HD, desc: "Series-Animee - HDTV 720p"}
-    - {id: 37, cat: TV/HD, desc: "Series-Animee - M-HD 1080p"}
-    - {id: 38, cat: TV/HD, desc: "Series-Animee - M-HD 720p"}
-    - {id: 47, cat: TV/Anime, desc: "Series-Animee - Pack Serie Animee"}
-    - {id: 39, cat: TV/Anime, desc: "Series-Animee - Remux"}
-    - {id: 46, cat: TV/Anime, desc: "Series-Animee - SERIE JAP-ANIM"}
-    - {id: 40, cat: TV/Anime, desc: "Series-Animee - TVRip"}
-    - {id: 41, cat: TV/Anime, desc: "Series-Animee - WEB-DL"}
-    - {id: 42, cat: TV/Anime, desc: "Series-Animee - WEB-DL 1080p"}
-    - {id: 43, cat: TV/Anime, desc: "Series-Animee - WEB-DL 720p"}
-    - {id: 44, cat: TV/Anime, desc: "Series-Animee - WEBRip"}
-    - {id: 45, cat: TV/HD, desc: "Series-Animee - X265"}
-    - {id: 124, cat: TV/HD, desc: "Series-FR - BDRip-BRRIP"}
-    - {id: 125, cat: TV/HD, desc: "Series-FR - BluRay-R"}
-    - {id: 126, cat: TV/SD, desc: "Series-FR - DVD-R"}
-    - {id: 127, cat: TV/SD, desc: "Series-FR - DVDRip"}
-    - {id: 128, cat: TV/HD, desc: "Series-FR - HD 1080P"}
-    - {id: 129, cat: TV/HD, desc: "Series-FR - HD 720P"}
-    - {id: 130, cat: TV/HD, desc: "Series-FR - HDRiP"}
-    - {id: 133, cat: TV/HD, desc: "Series-FR - HDTV"}
-    - {id: 131, cat: TV/HD, desc: "Series-FR - HDTV 1080p"}
-    - {id: 132, cat: TV/HD, desc: "Series-FR - HDTV 720p"}
-    - {id: 134, cat: TV/HD, desc: "Series-FR - M-HD 1080p"}
-    - {id: 135, cat: TV/HD, desc: "Series-FR - M-HD 720p"}
-    - {id: 136, cat: TV, desc: "Series-FR - Pack Serie"}
-    - {id: 137, cat: TV, desc: "Series-FR - Remux"}
-    - {id: 138, cat: TV/WEB-DL, desc: "Series-FR - TVRip"}
-    - {id: 141, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL"}
-    - {id: 139, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL 1080p"}
-    - {id: 140, cat: TV/WEB-DL, desc: "Series-FR - WEB-DL 720p"}
-    - {id: 142, cat: TV/WEB-DL, desc: "Series-FR - WEBRip"}
-    - {id: 143, cat: TV/HD, desc: "Series-FR - X265"}
-    - {id: 144, cat: TV/HD, desc: "Series-VOSTFR - BDRip-BRRIP"}
-    - {id: 145, cat: TV/HD, desc: "Series-VOSTFR - BluRay-R"}
-    - {id: 146, cat: TV/SD, desc: "Series-VOSTFR - DVD-R"}
-    - {id: 147, cat: TV/SD, desc: "Series-VOSTFR - DVDRip"}
-    - {id: 148, cat: TV/HD, desc: "Series-VOSTFR - HD 1080P"}
-    - {id: 149, cat: TV/HD, desc: "Series-VOSTFR - HD 720P"}
-    - {id: 150, cat: TV/HD, desc: "Series-VOSTFR - HDRiP"}
-    - {id: 153, cat: TV/HD, desc: "Series-VOSTFR - HDTV"}
-    - {id: 151, cat: TV/HD, desc: "Series-VOSTFR - HDTV 1080p"}
-    - {id: 152, cat: TV/HD, desc: "Series-VOSTFR - HDTV 720p"}
-    - {id: 154, cat: TV/HD, desc: "Series-VOSTFR - M-HD 1080p"}
-    - {id: 155, cat: TV/HD, desc: "Series-VOSTFR - M-HD 720p"}
-    - {id: 156, cat: TV, desc: "Series-VOSTFR - Pack Serie"}
-    - {id: 157, cat: TV, desc: "Series-VOSTFR - Remux"}
-    - {id: 158, cat: TV/WEB-DL, desc: "Series-VOSTFR - TVRip"}
-    - {id: 161, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL"}
-    - {id: 159, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL 1080p"}
-    - {id: 160, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEB-DL 720p"}
-    - {id: 162, cat: TV/WEB-DL, desc: "Series-VOSTFR - WEBRip"}
-    - {id: 163, cat: TV/HD, desc: "Series-VOSTFR - X265"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: torrentlanguage
-    type: select
-    label: Torrent Language
-    default: 0
-    options:
-      0: "Toutes Les Langues"
-      1: Allemand
-      2: Anglais(UK)
-      3: Anglais(US)
-      4: Arabe
-      5: Bengali
-      6: Cantonais
-      7: Coréen
-      8: Danois
-      9: Espagnol
-      10: Flamand
-      11: Français
-      12: Hébreu
-      13: Hindi
-      14: Italien
-      15: Japonais
-      16: Mandarin
-      17: Multi
-      24: "Multi Truefrench"
-      18: Perse
-      19: Portuguais
-      20: Québécois
-      21: Russe
-      22: Suédois
-      23: Ukrainien
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: TTV3/Bienvenue
-    selector: a[href$="/TTV3/Deconnexion"]
-
-download:
-  before:
-    # https://galeriens.com/TTV3/Torrents/11222/Remercier
-    # note http GET does not seem to work as the html suggests, so using same as LeChaudron which is also a TT3.00FRENCH engine.
-    path: "/TTV3/Torrents/{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}/Remercier"
-    method: post
-    inputs:
-      torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
-  selector: a[href*="/Telechargement/"]
-  attribute: href
-
-search:
-  paths:
-    # https://galeriens.eu/TTV3/Torrents/Recherche?recherche=&type=tout&endroit=nomtorrent&langue=0&tl=peuimporte
-    # categories for searching are unsupported
-    - path: TTV3/Torrents/Recherche
-  inputs:
-    recherche: "{{ .Keywords }}"
-    # searchtype: un (one word), tout (all words), exacte (exact expression)
-    type: tout
-    # searchin:  nomtorrent (name), desctorrent (descr)
-    endroit: nomtorrent
-    # language: 11 french, 17 multi
-    langue: "{{ .Config.torrentlanguage }}"
-    # freeleech: oui (yes), non (no), peuimporte (ignore)
-    tl: "{{ if .Config.freeleech }}oui{{ else }}peuimporte{{ end }}"
-    # does not support imdbid search and does not return imdb link in results.
-
-  rows:
-    selector: table.sortable tbody tr
-  fields:
-    category:
-      selector: a[href*="/SousCategories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title_phase1:
-      selector: a[onmouseover]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[onmouseover]
-      attribute: href
-    download:
-      selector: a[onmouseover]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src= (.*?)><"
-    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)
-    date:
-      selector: td:nth-child(2) a font[color="#F2F2F2"]
-      filters:
-        - name: replace
-          args: ["il y a ", ""]
-        - name: replace
-          args: [" Jours", " days"]
-        - name: replace
-          args: [" Jour", " day"]
-        - name: replace
-          args: [" heures", " hours"]
-        - name: replace
-          args: [" heure", " hour"]
-        - name: replace
-          args: [" Semaines", " weeks"]
-        - name: replace
-          args: [" Semaine", " week"]
-        - name: replace
-          args: [" mois", " month"]
-        - name: replace
-          args: [" ans", " years"]
-        - name: replace
-          args: [" an", " year"]
-        - name: append
-          args: " ago"
-    downloadvolumefactor:
-      case:
-        img[src$="/images/Torrents/TLibre.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TT3.00 FRENCH

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.gamestorrents.nu/
+  - https://gamestorrents.nocensor.space/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/

src/Jackett.Common/Definitions/generationfree.yml

@@ -36,16 +36,18 @@ caps:
     - {id: 50, cat: Books/EBook, desc: "E-Books: Manuel Français"}
     - {id: 66, cat: Movies, desc: "Films: VOSTFR"}
     - {id: 65, cat: Movies, desc: "Films: VO"}
-    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
     - {id: 54, cat: Movies/HD, desc: "Films: MHD HDlight"}
+    - {id: 55, cat: Movies/HD, desc: "Films: MHD x265"}
     - {id: 69, cat: Movies/3D, desc: "Films: 3D"}
-    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
     - {id: 2, cat: Movies/HD, desc: "Films: HD"}
-    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
+    - {id: 110, cat: Movies/WEB-DL, desc: "Films: WEB"}
+    - {id: 154, cat: Movies/UHD, desc: "Films: AV1-2160p"}
     - {id: 89, cat: Movies/SD, desc: "Films: SD"}
+    - {id: 153, cat: Movies/HD, desc: "Films: AV1-1080p"}
+    - {id: 59, cat: Movies, desc: "Films: Spectacle"}
     - {id: 70, cat: Movies/HD, desc: "Films: X265"}
-    - {id: 92, cat: Movies/UHD, desc: "Films: 4K"}
     - {id: 135, cat: Movies, desc: "Films: Noel"}
+    - {id: 155, cat: Movies/UHD, desc: "films: 4K X265"}
     - {id: 87, cat: XXX, desc: "Films: XXX"}
     - {id: 4, cat: Movies, desc: "Films: ISO"}
     - {id: 151, cat: TV, desc: "Films: .Série animation"}
@@ -55,8 +57,8 @@ caps:
     - {id: 97, cat: Audio, desc: "Musique: Podcast"}
     - {id: 137, cat: Audio, desc: "Musique: Noel"}
     - {id: 25, cat: Audio/MP3, desc: "Musique: Single MP3"}
-    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
     - {id: 22, cat: Audio/MP3, desc: "Musique: Album MP3"}
+    - {id: 143, cat: Audio/MP3, desc: "Musique: Wav"}
     - {id: 98, cat: Audio, desc: "Musique: karaoké"}
     - {id: 58, cat: Audio, desc: "Musique: Concert"}
     - {id: 24, cat: Audio/Lossless, desc: "Musique: Single Flac"}
@@ -64,8 +66,8 @@ caps:
     - {id: 64, cat: Audio, desc: "Musique: Mégamix Maison"}
     - {id: 6, cat: TV, desc: "Serie TV: Saison FR"}
     - {id: 7, cat: TV, desc: "Serie TV: Episode FR"}
-    - {id: 153, cat: TV, desc: "Serie TV: Saison VO"}
-    - {id: 63, cat: TV, desc: "Serie TV: Episode VO"}
+    - {id: 63, cat: TV, desc: "Serie TV: Saison VO"}
+    - {id: 152, cat: TV, desc: "Serie TV: Episode VO"}
     - {id: 93, cat: TV, desc: "Serie TV: Saison VOSTFR"}
     - {id: 61, cat: TV, desc: "Serie TV: Episode VOSTFR"}
     - {id: 12, cat: TV, desc: "Serie TV: Animation"}

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,6 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.gktorrent.cc/
+  - https://gktorrent.nocensor.space/
 legacylinks:
   - https://www.gktorrent.com/
   - http://www.gktorrent.com/

src/Jackett.Common/Definitions/glodls.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.club/
-  - https://glodls.unblocked.monster/
+  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.nocensor.space/
 legacylinks:
   - https://glodls.rocks/
   - https://glotorrents.unblockit.pro/
@@ -36,6 +36,8 @@ legacylinks:
   - https://glotorrents.unblockit.ltd/
   - https://glotorrents.unblockit.link/
   - https://glotorrents.unblockit.buzz/
+  - https://glodls.unblocked.monster/
+  - https://glotorrents.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdarea.yml

@@ -162,6 +162,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 0.8
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -0,0 +1,188 @@
+---
+id: hdcztorrent
+name: HD-CzTorrent
+description: "HD-CzTorrent is a CZECH semi private site for TV / MOVIES / GENERAL"
+language: cs-cz
+type: semi-private
+encoding: UTF-8
+links:
+  - http://www.hd-cztorrent.cz/
+
+caps:
+  categorymappings:
+    # Film
+    - {id: 37, cat: Movies/DVD, desc: "DVD"}
+    - {id: 92, cat: TV, desc: "TV Serial ENG"}
+    - {id: 39, cat: Audio/Video, desc: "Hudba Video"}
+    - {id: 41, cat: Movies/SD, desc: "DivX / AVI"}
+    - {id: 90, cat: Movies/SD, desc: "DivX / AVI Titulky"}
+    - {id: 43, cat: Movies/Other, desc: "FILM dokument"}
+    - {id: 44, cat: Movies/Other, desc: "FILM sport"}
+    - {id: 45, cat: TV, desc: "SERIALY CZ"}
+    - {id: 47, cat: Movies, desc: "Animované"}
+    - {id: 91, cat: TV, desc: "Serial titulky"}
+    - {id: 50, cat: Movies/BluRay, desc: "FILMY Blu-ray"}
+    - {id: 109, cat: Movies/BluRay, desc: "BLURAY orig JAZYK"}
+    - {id: 52, cat: Movies/HD, desc: "HD 1080 "}
+    - {id: 53, cat: Movies/HD, desc: "HD 720"}
+    - {id: 55, cat: Movies/3D, desc: "3D Filmy"}
+    - {id: 110, cat: Movies/3D, desc: "3D ORIGINÁL"}
+    - {id: 111, cat: Movies, desc: "FILMY CZ TVORBA"}
+    - {id: 98, cat: Movies/UHD, desc: "ORIGINAL JAZYK 4K"}
+    - {id: 77, cat: Movies/UHD, desc: "ULTRA HD  4K"}
+    - {id: 89, cat: Movies/HD, desc: "HD720 titulky "}
+    - {id: 93, cat: Movies/HD, desc: "HD 1080 titulky"}
+    - {id: 107, cat: Movies, desc: "CAMERA RIP "}
+    - {id: 94, cat: Movies, desc: "h 265"}
+    - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
+    - {id: 95, cat: Movies/Other, desc: "FILM RETRO"}
+    # HUDBA
+    - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
+    - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}
+    - {id: 96, cat: Audio/Other, desc: "RETRO HUDBA"}
+    # ostatni
+    - {id: 64, cat: Books, desc: "E-books, PDF fotky"}
+    - {id: 65, cat: Audio/Audiobook, desc: "Mluvene slovo"}
+    - {id: 113, cat: Books/Other, desc: "obrazky fotky"}
+    # PORNO
+    - {id: 11, cat: XXX, desc: "XXX 18+KLASIKA"}
+    - {id: 99, cat: XXX, desc: "XXX GAY"}
+    - {id: 100, cat: XXX, desc: "XXX ASIAN"}
+    - {id: 101, cat: XXX, desc: "XXX 3D"}
+    - {id: 106, cat: XXX/ImageSet, desc: "XXX-OBRÁZKY"}
+    - {id: 108, cat: XXX, desc: "PORNO BDSM"}
+    # HRY
+    - {id: 73, cat: PC/Games, desc: "Hry, Games"}
+    - {id: 97, cat: Console/PS4, desc: "HRY PS4"}
+    # APLIKACE
+    - {id: 60, cat: PC/Mobile-Other, desc: "Mobil PDA"}
+    - {id: 62, cat: PC, desc: "Aplikace All"}
+
+  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: 3
+    options:
+      3: created
+      5: seeders
+      4: size
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      2: desc
+      1: asc
+  - name: info
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  method: post
+  path: index.php?page=login
+  inputs:
+    uid: "{{ .Config.username }}"
+    pwd: "{{ .Config.password }}"
+  error:
+    - selector: td.lista span[style="color:#FF0000;"]
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+
+search:
+  paths:
+    # http://www.hd-cztorrent.cz/index.php?page=torrents&search=the+avengers&category=0&uploader=0&options=0&active=0&gold=0&order=3&by=2
+    - path: index.php
+  inputs:
+    page: torrents
+    search: "{{ .Keywords }}"
+    category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
+    uploader: 0
+    # 0 filename, 1 file & desc, 2 description
+    options: 0
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    # 0 all, 1 classic, 2 silver, 3 gold, 4 silver & gold
+    gold: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
+
+  rows:
+    selector: td#mcol table.lista > tbody > tr:has(a[href*=bookmark])
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: td:nth-child(2) > a
+    details:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    poster:
+      selector: a[href^="index.php?page=torrent-details"]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) "
+    date:
+      selector: td:nth-child(6)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02/01/2006 -07:00"
+    size:
+      selector: td:nth-child(11)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        img[src$="freeleech.gif"]: 0
+        img[src$="gold.gif"]: 0
+        img[src$="silver.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="2x.gif"]: 2
+        img[src$="3x.gif"]: 3
+        img[src$="4x.gif"]: 4
+        img[src$="5x.gif"]: 5
+        img[src$="6x.gif"]: 6
+        img[src$="7x.gif"]: 7
+        img[src$="8x.gif"]: 8
+        img[src$="9x.gif"]: 9
+        img[src$="10x.gif"]: 10
+        "*": 1
+    minimumratio:
+      text: 0.3
+# xbtit dt fm v7.1 customized

src/Jackett.Common/Definitions/hdhouse.yml

@@ -8,10 +8,10 @@ encoding: windows-1251
 links:
   - https://hdhouse.club/
   - https://hdreactor.club/
-  - https://hdreactor.su/
 legacylinks:
   - https://hdreactor.guru/
   - https://hdreactor.net/
+  - https://hdreactor.su/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdspain.yml

@@ -78,7 +78,18 @@ search:
         - name: append
           args: "]"
     title:
-      selector: td.titulo a[id]
+      selector: td.titulo a[id]:contains("VOSE")
+      optional: true
+      filters:
+        - name: prepend
+          args: "{{ .Result.extras }} "
+        - name: append
+          args: " English"
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+    title:
+      selector: td.titulo a[id]:not(:contains("VOSE"))
+      optional: true
       filters:
         - name: prepend
           args: "{{ .Result.extras }} "

src/Jackett.Common/Definitions/hdtime.yml

@@ -162,6 +162,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 0.8
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/hdturk.yml

@@ -6,9 +6,10 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - https://hdturk.de/
+  - https://hdturk.club/
 legacylinks:
   - http://hdturk.de/
+  - https://hdturk.de/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hqsource.yml

@@ -114,12 +114,14 @@ search:
     size:
       selector: td:nth-child(5)
     date:
-      selector: tr, br
+      selector: td:nth-child(2)
       filters:
+        - name: regexp
+          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
     seeders:
       selector: td:nth-child(7)
     leechers:

src/Jackett.Common/Definitions/idope.yml

@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 links:
   - https://idope.se/
-  - https://idope.unblocked.monster/
 legacylinks:
   - https://idope.black-mirror.xyz/
   - https://idope.unblocked.casa/
@@ -18,6 +17,7 @@ legacylinks:
   - https://idope.proxyportal.pw/
   - https://idope.uk-unblock.pro/
   - https://idope.unblocked.rest/
+  - https://idope.unblocked.monster/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -6,11 +6,12 @@ language: it-it
 type: semi-private
 encoding: UTF-8
 links:
-  - https://ilcorsaroblu.org/
+  - https://ilcorsaroblu.online/
 legacylinks:
   - http://ilcorsaroblu.org/
   - https://www.ilcorsaroblu.info/
   - https://www.ilcorsaroblu.org/
+  - https://ilcorsaroblu.org/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -11,6 +11,7 @@ links:
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
+  - https://ilcorsaronero.nocensor.space/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -46,7 +47,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
+    tv-search: [q]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -62,10 +63,11 @@ search:
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=1{{ else }}/browse/1{{ end }}"
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=2{{ else }}/browse/2{{ end }}"
   keywordsfilters:
-    - 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"]
+    # remove searching by season and episode due to inconsistent naming #11471
+    - name: re_replace # remove S01
+      args: ["(?i)(\\s*s\\d+)", ""]
+    - name: re_replace # remove E01
+      args: ["(?i)(\\s*e\\d+)", ""]
 
   rows:
     selector: "tr.odd,tr.odd2"

src/Jackett.Common/Definitions/jptv.yml

@@ -117,6 +117,8 @@ search:
           args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
         - name: replace
           args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:

src/Jackett.Common/Definitions/lemonhd.yml

@@ -42,12 +42,12 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: 4
+    default: added
     options:
-      4: created
-      7: seeders
-      5: size
-      1: title
+      added: created
+      seeders: seeders
+      size: size
+      name: title
   - name: type
     type: select
     label: Order requested from site
@@ -72,19 +72,13 @@ search:
     - path: torrents.php
   inputs:
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead
-    incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
-    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
-    search_mode: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
+    search_area: "{{ if .Query.IMDBID }}imdb{{ else }}name{{ end }}"
+    suggest: 0
+    column: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
 
   rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?"])
 
   fields:
     category:
@@ -152,4 +146,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP Standard v1.5 Beta 4 (customised)

src/Jackett.Common/Definitions/lesaloon.yml

@@ -122,15 +122,11 @@ login:
   method: form
   form: form[action^="login"]
   inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-    rememberme: ""
-  captcha:
-    type: image
-    selector: img[src^="access_code/"]
-    input: private_key
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    loginButton: X
   error:
-    - selector: tr td span[style="color:#FF0000;"]
+    - selector: "p[style=\"color: #B73C38\"]"
   test:
     path: index.php
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/limetorrents.yml

@@ -12,8 +12,9 @@ links:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.unblockit.club/
+  - https://limetorrents.unblockit.onl/
   - https://limetorrents.unblockninja.com/
+  - https://limetorrents.nocensor.space/
 legacylinks:
   - https://www.limetorrents.io/
   - https://www.limetorrents.cc/
@@ -40,6 +41,7 @@ legacylinks:
   - https://limetorrents.unblockit.ltd/
   - https://limetorrents.unblockit.link/
   - https://limetorrents.unblockit.buzz/
+  - https://limetorrents.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/magicheaven.yml

@@ -0,0 +1,203 @@
+---
+id: magicheaven
+name: magic-heaven
+description: "magic-heaven is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://magic-heaven.info/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC, desc: "APPS"}
+    - {id: 108, cat: Other, desc: "APPS Wallpapers"}
+    - {id: 8, cat: Movies/BluRay, desc: "BLU-RAY"}
+    - {id: 172, cat: Movies/BluRay, desc: "BLU-RAY 1080p"}
+    - {id: 176, cat: Movies/BluRay, desc: "BLU-RAY 720p"}
+    - {id: 156, cat: Movies/BluRay, desc: "BLU-RAY H264"}
+    - {id: 153, cat: Movies/BluRay, desc: "BLU-RAY X264"}
+    - {id: 36, cat: Movies/SD, desc: "CAMS"}
+    - {id: 161, cat: Movies/Other, desc: "Christmas Movies"}
+    - {id: 164, cat: Movies/Other, desc: "Christmas Music"}
+    - {id: 160, cat: Movies/Other, desc: "Classic Movies"}
+    - {id: 169, cat: Console, desc: "Console Games"}
+    - {id: 175, cat: Console/XBox, desc: "Console Games XBOX"}
+    - {id: 82, cat: Audio/Other, desc: "DJ MUSIC"}
+    - {id: 84, cat: Audio/Other, desc: "DJ MUSIC DMC"}
+    - {id: 102, cat: Audio/Other, desc: "DJ MUSIC Full Tilt Remix"}
+    - {id: 92, cat: Audio/Other, desc: "DJ MUSIC Funkymix"}
+    - {id: 83, cat: Audio/Other, desc: "DJ MUSIC MASTERMIX"}
+    - {id: 93, cat: Audio/Other, desc: "DJ MUSIC Ultimix"}
+    - {id: 90, cat: Audio/Other, desc: " DJ MUSIC X-mix"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD-R"}
+    - {id: 11, cat: Books/EBook, desc: "E BOOKS"}
+    - {id: 114, cat: Audio/Audiobook, desc: "E BOOKS Audio Books"}
+    - {id: 86, cat: Books/Mags, desc: "E BOOKS Magazines"}
+    - {id: 167, cat: Audio/Other, desc: "KARAOKE"}
+    - {id: 14, cat: Movies/Other, desc: "MKV's"}
+    - {id: 13, cat: Audio/MP3, desc: "MP3 RELEASES"}
+    - {id: 17, cat: Movies/Other, desc: "MP4"}
+    - {id: 18, cat: Movies/Other, desc: "MULTI'S"}
+    - {id: 98, cat: Movies/Other, desc: "MULTI'S Movie Box Sets"}
+    - {id: 20, cat: Audio/MP3, desc: "MUSIC - MP3"}
+    - {id: 170, cat: Audio, desc: "MUSIC Artist Albums"}
+    - {id: 150, cat: Audio, desc: "MUSIC Collections"}
+    - {id: 96, cat: Audio, desc: "MUSIC Discographys"}
+    - {id: 97, cat: Audio/Lossless, desc: "MUSIC Flac"}
+    - {id: 171, cat: Audio/Video, desc: "Music-Videos"}
+    - {id: 22, cat: PC/Games, desc: "PC GAMES"}
+    - {id: 81, cat: Movies, desc: "RatioBoosters"}
+    - {id: 26, cat: TV/Sport, desc: "SPORT"}
+    - {id: 7, cat: Audio, desc: "Top 40 Albums/Singles"}
+    - {id: 9, cat: TV, desc: "TV EPISODES"}
+    - {id: 38, cat: TV, desc: "TV SERIES"}
+    - {id: 30, cat: Other, desc: "VIP"}
+    - {id: 158, cat: Other, desc: "VIP GOLD"}
+    - {id: 173, cat: Movies/WEB-DL, desc: "Web-dl"}
+    - {id: 34, cat: Movies/SD, desc: "Xvid / HDrip"}
+
+  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: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+  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="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selector: a[href*="/download.php?id="]
+  attribute: href
+
+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: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: t_name
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results, does not support imdbid searches
+  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:
+      # is often abbreviated
+      selector: a[href*="details.php?id="]
+    title:
+      # usually longer than details title
+      selector: div[id^="port-content-"] div
+      optional: true
+    details:
+      selector: a[href*="details.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})
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02-01-2006 15:04 -07:00"
+    download:
+      selector: a[href*="details.php?id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    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
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# TS Special Edition v.7.5

src/Jackett.Common/Definitions/magnet4you.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://magnet4you.me/
-  - https://magnet4you.unblocked.monster/
+  - https://magnet4you.nocensor.space/
 legacylinks:
   - http://magnet4you.me/
   - https://magnet4you.black-mirror.xyz/
@@ -19,6 +19,7 @@ legacylinks:
   - https://magnet4you.proxyportal.pw/
   - https://magnet4you.uk-unblock.pro/
   - https://magnet4you.unblocked.rest/
+  - https://magnet4you.unblocked.monster/
 
 caps:
   categories:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -28,8 +28,9 @@ caps:
     - {id: 14, cat: PC, desc: "Maritime Software-Maritime Simulators"}
     - {id: 12, cat: PC, desc: "Maritime Software-Answers to tests"}
     - {id: 20, cat: PC, desc: "Maritime Software-Calculation soft"}
-    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
     - {id: 179, cat: PC, desc: "Maritime Software-Programming and SDK software"}
+    - {id: 317, cat: PC, desc: "Maritime Software-Shareware (demo, trial)"}
+    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
     - {id: 21, cat: Books, desc: "Deckofficer's Library"}
     - {id: 283, cat: Books, desc: "Deckofficer's Library-Radar at sea"}
     - {id: 114, cat: Books, desc: "Deckofficer's Library-Watch keeping"}

src/Jackett.Common/Definitions/netcosmo.yml

@@ -15,6 +15,7 @@ caps:
     - {id: 15, cat: Movies/HD, desc: "Rip H264"}
     - {id: 16, cat: Movies/HD, desc: "Rip H265"}
     - {id: 24, cat: Movies/UHD, desc: "Rip 4K"}
+    - {id: 40, cat: Movies/UHD, desc: "4K - 3840X2160"}
     - {id: 21, cat: Movies/HD, desc: "Full HD"}
     - {id: 31, cat: TV/HD, desc: "Serie TV 720P"}
     - {id: 25, cat: Audio, desc: "Musica"}

src/Jackett.Common/Definitions/nordicplus.yml

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

src/Jackett.Common/Definitions/nyaa-pantsu.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://nyaa.net/
+  - https://nyaapantsu.nocensor.space/
 legacylinks:
   - https://nyaa.pantsu.cat/
   - https://nyaa.pt/

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,9 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.tv/
+  - https://www.oxtorrent.ph/
   - https://www.oxtorrent.co/
-  - https://oxtorrent.unblocked.monster/
+  - https://oxtorrent.nocensor.space/
 legacylinks:
   - https://wwv.oxtorrent.com/
   - https://www.smartorrent.tv/
@@ -28,6 +28,8 @@ legacylinks:
   - https://www.oxtorrent.bz/
   - https://www.oxtorrent.ws/
   - https://wvw.oxtorrent.ws/
+  - https://oxtorrent.unblocked.monster/
+  - https://www.oxtorrent.tv/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pier720.yml

@@ -42,7 +42,7 @@ caps:
     - {id: 46, cat: TV/Sport, desc: "Hockey"}
     - {id: 48, cat: TV/Sport, desc: "Hockey - NHL"}
     - {id: 88, cat: TV/Sport, desc: "Hockey - NHL Playoffs"}
-    - {id: 102, cat: TV/Sport, desc: "Hockey - NHL Playoffs 2018-2019"}
+    - {id: 102, cat: TV/Sport, desc: "Hockey - NHL Playoffs 2018-2020"}
     - {id: 93, cat: TV/Sport, desc: "Hockey - NHL Playoffs - 2017"}
     - {id: 80, cat: TV/Sport, desc: "Hockey - NHL Playoffs - 2016"}
     - {id: 65, cat: TV/Sport, desc: "Hockey - Stanley Cup Finals"}
@@ -53,6 +53,7 @@ caps:
     - {id: 50, cat: TV/Sport, desc: "Hockey - Other"}
     - {id: 55, cat: TV/Sport, desc: "Baseball"}
     - {id: 71, cat: TV/Sport, desc: "Baseball - MLB"}
+    - {id: 107, cat: TV/Sport, desc: "Baseball - MLB World Series"}
     - {id: 72, cat: TV/Sport, desc: "Baseball - Other"}
     - {id: 85, cat: TV/Sport, desc: "Baseball - Reviews, highlights, documentaries"}
     - {id: 45, cat: TV/Sport, desc: "Other sports"}
@@ -63,6 +64,7 @@ caps:
     - {id: 75, cat: TV/Sport, desc: "Other sports - Tennis"}
     - {id: 74, cat: TV/Sport, desc: "Other sports - Fighting"}
     - {id: 94, cat: TV/Sport, desc: "Other sports - Misc"}
+    - {id: 73, cat: TV/Sport, desc: "Other sports - Auto, moto racing"}
     - {id: 100, cat: TV/Sport, desc: "Soccer"}
     - {id: 98, cat: TV/Sport, desc: "Soccer - FIFA World Cup"}
     - {id: 56, cat: TV/Sport, desc: "Sports on tv"}

src/Jackett.Common/Definitions/piratadigital.yml

@@ -18,16 +18,17 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid]
+    tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid, tmdbid]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -50,22 +51,9 @@ settings:
       asc: asc
 
 login:
-  path: login
-  method: form
-  form: form[action$="/login"]
+  method: cookie
   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"]
+    cookie: "{{ .Config.cookie }}"
 
 search:
   paths:
@@ -76,7 +64,7 @@ search:
     description: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
+    tvdb: ""
     tmdb: "{{ .Query.TMDBID }}"
     mal: ""
     igdb: ""

src/Jackett.Common/Definitions/pirateiro.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://pirateiro.com/
   - https://pirateiro.eu/
-  - https://pirateiro.unblockit.club/
+  - https://pirateiro.unblockit.onl/
 legacylinks:
   - http://pirateiro.com/
   - https://pirateiro.unblockit.pro/
@@ -25,6 +25,7 @@ legacylinks:
   - https://pirateiro.unblockit.ltd/
   - https://pirateiro.unblockit.link/
   - https://pirateiro.unblockit.buzz/
+  - https://pirateiro.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pixelcove.yml

@@ -54,6 +54,7 @@ caps:
     - {id: 48, cat: Other, desc: "Retro"}
     - {id: 72, cat: Other, desc: "Board Games"}
     - {id: 75, cat: Other, desc: "Paper Crafting"}
+    - {id: 77, cat: Other, desc: "Arcade"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/portugas.yml

@@ -107,12 +107,12 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
+      selector: a.text-bright
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a.view-torrent
+      selector: a.text-bright
       attribute: href
     poster:
       selector: div.torrent-poster img
@@ -133,12 +133,6 @@ search:
       filters:
         - name: regexp
           args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
     date:
       selector: time
       filters:

src/Jackett.Common/Definitions/puntotorrent.yml

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

src/Jackett.Common/Definitions/pwtorrents.yml

@@ -30,6 +30,8 @@ caps:
     - {id: 18, cat: TV/Sport, desc: "WWE Network"}
     - {id: 16, cat: TV/Sport, desc: "WWE PPV's"}
     - {id: 17, cat: TV/Sport, desc: "WWE Weekly"}
+    - {id: 19, cat: TV/Sport, desc: "AEW Weekly"}
+    - {id: 20, cat: TV/Sport, desc: "AEW PPV's"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/r3vwtf.yml

@@ -73,7 +73,7 @@ search:
     "only_free": 0
 
   rows:
-    selector: tr:has(a[href^="download.php?torrent="])
+    selector: table[cellpadding="3"] > tbody > tr:has(a[href^="download.php?torrent="])
   fields:
     category:
       selector: a[href^="browse.php?cat="]

src/Jackett.Common/Definitions/racingforme.yml

@@ -231,6 +231,9 @@ search:
       attribute: href
     size:
       selector: div.data-size
+      filters:
+        - name: re_replace
+          args: ["(\\d)\\.(\\d{3}\\.\\d{2})", "$1$2"]
     seeders:
       selector: div.data-seeders
       filters:

src/Jackett.Common/Definitions/redbits.yml

@@ -68,6 +68,9 @@ login:
 search:
   paths:
     - path: torrents/filter
+  keywordsfilters:
+    - name: re_replace
+      args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
@@ -99,23 +102,42 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a[href*="/torrents/"]
+      selector: a.view-torrent:contains("VOSE")
+      optional: true
       filters:
         - name: re_replace
-          args: ["\\[", " "]
+          args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
         - name: re_replace
-          args: ["\\]", " "]
+          args: ["(?i)RedBits", ""] # Delete RedBits
+        - name: append
+          args: " English" # Add english to fix Sonarr/Radarr language
+        - name: re_replace
+          args: ["\\[|\\]", " "]
+        - name: re_replace
+          args: ["  ", " "]
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+    title:
+      selector: a.view-torrent:not(:contains("VOSE"))
+      optional: true
+      filters:
         - name: re_replace
           args: ["(?i)bdfull", "BluRay"] # BDfull  -> BluRay
         - name: re_replace
           args: ["(?i)RedBits", ""] # Delete RedBits
         - name: append
           args: " Spanish" # Add spanish to fix Sonarr/Radarr language
+        - name: re_replace
+          args: ["\\[|\\]", " "]
+        - name: re_replace
+          args: ["  ", " "]
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a[href*="/torrents/"]
+      selector: a.view-torrent
       attribute: href
     poster:
       selector: div.torrent-poster img

src/Jackett.Common/Definitions/rofd.yml

@@ -29,6 +29,7 @@ caps:
     - {id: 30, cat: Audio/MP3, desc: "Musik mp3"}
     - {id: 31, cat: Audio/Lossless, desc: "Musik Flac"}
     - {id: 32, cat: Audio/Video, desc: "Musik Video"}
+    - {id: 45, cat: Audio, desc: "Musik Pack"}
     - {id: 34, cat: PC/Games, desc: "Spiele Windows"}
     - {id: 35, cat: Console, desc: "Spiele Konsole"}
     - {id: 36, cat: Console, desc: "Spiele Wimmel"}

src/Jackett.Common/Definitions/rutor.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
   - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
-  - https://rutor.unblocked.monster/
+  - https://rutor.nocensor.space/
 legacylinks:
   - http://live-rutor.org/ # domain expired 9 Feb 2020
   - http://new-rutor.org/ # ERR_NAME_NOT_RESOLVED
@@ -22,6 +22,7 @@ legacylinks:
   - https://rutor.uk-unblock.pro/
   - https://rutor.root.yt/
   - https://rutor.unblocked.rest/
+  - https://rutor.unblocked.monster/
 
 caps:
   # unfortunately RuTor does not display categories anywhere in its search results page :-(

src/Jackett.Common/Definitions/sdbits.yml

@@ -22,10 +22,38 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
     music-search: [q]
 
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 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
+    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: takeloginn3.php
   method: post
@@ -44,9 +72,14 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
+    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     incldead: 1
     descriptions: 0
+    imdbgt: 0
+    imdblt: 10
+    imdb: "{{ .Query.IMDBID }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
 
   rows:
     selector: table#torrent-list > tbody > tr[id]

src/Jackett.Common/Definitions/seedfile.yml

@@ -36,6 +36,7 @@ caps:
     - {id: 23, cat: Audio/Video, desc: "Video Clip"}
     - {id: 24, cat: XXX, desc: "Adult 18+"}
     - {id: 36, cat: Movies/3D, desc: "Video 3D"}
+    - {id: 37, cat: Movies/HD, desc: "Animație HD"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/sharefiles.yml

@@ -0,0 +1,166 @@
+---
+id: sharefiles
+name: ShareFiles
+description: "ShareFiles is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ro-ro
+type: private
+encoding: UTF-8
+links:
+  - https://sharefiles.ro/
+
+caps:
+  categorymappings:
+    - {id: 53, cat: TV/Anime, desc: "Anime | Cartoon"}
+    - {id: 28, cat: PC/0day, desc: "Appz | Win"}
+    - {id: 58, cat: Books, desc: "Docs"}
+    - {id: 67, cat: Console, desc: "Games | Console"}
+    - {id: 151, cat: Console, desc: "Games | Pack"}
+    - {id: 3, cat: PC/Games, desc: "Games | PC Iso"}
+    - {id: 144, cat: Other, desc: "Images"}
+    - {id: 54, cat: PC, desc: "Linux"}
+    - {id: 100, cat: Other, desc: "MiSC"}
+    - {id: 70, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 137, cat: Movies/3D, desc: "Movies | 3D"}
+    - {id: 140, cat: Movies/UHD, desc: "Movies | 4K Blu-Ray"}
+    - {id: 139, cat: Movies/UHD, desc: "Movies | 4K"}
+    - {id: 143, cat: Movies/UHD, desc: "Movies | 4K-Ro"}
+    - {id: 103, cat: Movies/BluRay, desc: "Movies | Blu-Ray"}
+    - {id: 132, cat: Movies/BluRay, desc: "Movies | Blu-Ray-Ro"}
+    - {id: 71, cat: Movies/DVD, desc: "Movies | DVD"}
+    - {id: 72, cat: Movies/DVD, desc: "Movies | DVD-Ro"}
+    - {id: 74, cat: Movies/HD, desc: "Movies | HD"}
+    - {id: 108, cat: Movies/HD, desc: "Movies | HD-Ro"}
+    - {id: 148, cat: Movies, desc: "Movies | Pack"}
+    - {id: 149, cat: Movies, desc: "Movies | Pack-Ro"}
+    - {id: 153, cat: Movies, desc: "Movies | Ro"}
+    - {id: 76, cat: Movies/SD, desc: "Movies | SD"}
+    - {id: 2, cat: Movies/SD, desc: "Movies | SD-Ro"}
+    - {id: 77, cat: Audio/MP3, desc: "Music | Audio"}
+    - {id: 141, cat: Audio/Lossless, desc: "Music | FLAC"}
+    - {id: 78, cat: Audio/Video, desc: "Music | Video"}
+    - {id: 82, cat: TV/Sport, desc: "Sports"}
+    - {id: 83, cat: TV/HD, desc: "Tv | HD"}
+    - {id: 115, cat: TV/HD, desc: "Tv | HD-Ro"}
+    - {id: 145, cat: TV, desc: "Tv | Pack"}
+    - {id: 147, cat: TV, desc: "Tv | Pack-Ro"}
+    - {id: 154, cat: TV, desc: "Tv | Ro"}
+    - {id: 116, cat: TV/SD, desc: "Tv | SD"}
+    - {id: 150, cat: TV/SD, desc: "Tv | SD-Ro"}
+    - {id: 85, cat: XXX, desc: "XxX"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    unlock: 1 # login on any IP:  0=no, 1=yes
+  error:
+    - selector: td.embedded:has(h2:contains("failed"))
+  test:
+    path: browse.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ if .Categories}}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
+    search: "{{ .Keywords }}"
+    # 0 name, 1 descr, 2 genre
+    blah: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searching or return imdb in results.
+
+  rows:
+    selector: "table[width=\"852\"] > tbody > tr:has(a[href^=\"download.php?id=\"]){{ if .Config.freeleech }}:has(a#free-btn){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=([^\s]+)
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(4)
+    grabs:
+      selector: td:nth-last-child(3)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      case:
+        "a#free-btn": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "a#double-btn": 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/shellife.yml

@@ -1,82 +0,0 @@
----
-id: shellife
-name: Shellife
-description: "Shellife (SL) is a Private Torrent Tracker for NON MAINSTREAM MUSIC"
-language: en-us
-type: private
-encoding: UTF-8
-links:
-  - https://shellife.eu/
-
-caps:
-  categories:
-    1: Audio
-
-  modes:
-    search: [q]
-    music-search: [q, artist]
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td:has(h2:contains("failed"))
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: 1
-
-  rows:
-    selector: table#ct > tbody > tr.torrent_row
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: a.altlink
-    title|append|1:
-      text: " - "
-    title|append|2:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    date:
-      text: now
-    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[alt="Freeleech"]: 0
-        img[alt="Free"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    description:
-      selector: td:nth-child(2)
-      remove: a.altlink, a[href^="details.php?id="], div[id^="news"]
-      filters:
-        - name: trim
-          args: "-"
-        - name: trim
-          args: " "
-# engine n/a

src/Jackett.Common/Definitions/sktorrent.yml

@@ -62,6 +62,7 @@ login:
     - selector: font:contains("Incorrect")
   test:
     path: torrent/index.php
+    selector: a[href^="usercp.php"]
 
 download:
   selector: a[href^="download.php?id="]

src/Jackett.Common/Definitions/teamos.yml

@@ -6,6 +6,8 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://teamos-hkrg.com/
+legacylinks:
   - https://www.teamos-hkrg.com/
 
 caps:

src/Jackett.Common/Definitions/tellytorrent.yml

@@ -14,7 +14,7 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Audio, desc: "Music"}
     - {id: 4, cat: Movies, desc: "Web Originals"}
@@ -76,24 +76,24 @@ login:
 
 search:
   paths:
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
+    keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
@@ -119,28 +119,17 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      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
@@ -194,9 +183,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-    minimumratio:
-      text: 1.0
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 1 day (as seconds = 24 x 60 x 60)
-      text: 86400
-# UNIT3D 5.2.0
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# UNIT3D 5.2.0 (customised)

src/Jackett.Common/Definitions/thesceneplace.yml

@@ -7,6 +7,8 @@ type: private
 encoding: UTF-8
 links:
   - https://www.thesceneplace.com/
+legacylinks:
+  - http://www.thesceneplace.com/ # site is no longer forcing http
 
 caps:
   categorymappings:
@@ -98,7 +100,7 @@ search:
     # does not support imdbid search and does not return imdb link in results
 
   rows:
-    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]){{ if .Config.freeleech }}:has(img[src=\"images/freeleech.gif\"]){{ else }}{{ end }}"
+    selector: "table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):not(:has(a[href^=\"index.php?page=userdetails&id=\"])){{ if .Config.freeleech }}:has(img[src=\"images/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.freeleech }}, table.lista > tbody > tr:has(a[href^=\"index.php?page=torrent-details&id=\"]):not(:has(a[href^=\"index.php?page=userdetails&id=\"])):has(img[src=\"images/gold.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -149,7 +151,17 @@ search:
         img[src="images/bronze.gif"]: 0.75
         "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        img[src="images/2x.gif"]: 2
+        img[src="images/3x.gif"]: 3
+        img[src="images/4x.gif"]: 4
+        img[src="images/5x.gif"]: 5
+        img[src="images/6x.gif"]: 6
+        img[src="images/7x.gif"]: 7
+        img[src="images/8x.gif"]: 8
+        img[src="images/9x.gif"]: 9
+        img[src="images/10x.gif"]: 10
+        "*": 1
     minimumratio:
       text: 1.0
     minimumseedtime:

src/Jackett.Common/Definitions/tjangto.yml

@@ -1,95 +0,0 @@
----
-id: tjangto
-name: Tjangto
-description: "Tjangto (짱토) is a Public KOREAN tracker for Korean media."
-language: ko-KR
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://www.jjangt.com/
-legacylinks:
-  - https://www.jjangtorrent.com/
-
-caps:
-  categorymappings:
-    - {id: "tani", cat: TV/Anime, desc: "애니 (Animation)"}
-    - {id: "tv", cat: TV, desc: "TV프로 (TV)"}
-    - {id: "tmovie", cat: Movies, desc: "영화 (Movie)"}
-    - {id: "tdrama", cat: TV, desc: "드라마 (Drama)"}
-    - {id: "tent", cat: TV, desc: "예능 (Entertainment)"}
-    - {id: "tmusic", cat: Audio, desc: "음악 (Music)"}
-    - {id: "util", cat: PC, desc: "유틸 (Software)"}
-    - {id: "torrent_amav", cat: XXX, desc: "서양 (Adult)"}
-    - {id: "torrent_nmav", cat: XXX, desc: "일본노모 (Adult)"}
-    - {id: "torrent_ymav", cat: XXX, desc: "일본유모 (Adult)"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
-
-download:
-  selector: a[href*="magnet:?xt="]
-  attribute: href
-  filters:
-    - name: append
-      args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
-
-search:
-  paths:
-    # https://www.jjangtorrent.com/bbs/search.php?site=1&sfl=wr_subject%7C%7Cwr_content&sop=and&stx=sin
-    - path: bbs/search.php
-  inputs:
-    stx: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    srows: 100
-    gr_id: ""
-    # wr_subject||wr_content, wr_subject, wr_content, mb_id, wr_name
-    sfl: wr_subject
-    # or, and
-    sop: and
-    site: 1
-
-  rows:
-    selector: section.sch_res_list ul li
-
-  fields:
-    category:
-      selector: div.sch_tit a
-      attribute: href
-      filters:
-        - name: querystring
-          args: bo_table
-    title:
-      selector: div.sch_tit a
-    details:
-      selector: div.sch_tit a
-      attribute: href
-    download:
-      selector: div.sch_tit a
-      attribute: href
-    date:
-      # 2020-05-12 12:00:52
-      selector: span.sch_datetime
-      filters:
-        - name: dateparse
-          args: "2006-01-02 15:04:05"
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/tokyotosho.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.tokyotosho.info/
-  - https://tokyotosho.unblocked.monster/
+  - https://tokyotosho.nocensor.space/
 legacylinks:
   - https://tokyotosho.black-mirror.xyz/
   - https://tokyotosho.unblocked.casa/
@@ -18,6 +18,7 @@ legacylinks:
   - https://tokyotosho.proxyportal.pw/
   - https://tokyotosho.uk-unblock.pro/
   - https://tokyotosho.unblocked.rest/
+  - https://tokyotosho.unblocked.monster/
 
 settings:
   - name: cat

src/Jackett.Common/Definitions/torlock.yml

@@ -10,7 +10,8 @@ links:
   - https://www.torlock.com/
   - https://www.torlock2.com/
   - https://www.torlock.icu/
-  - https://torlock.unblockit.club/
+  - https://torlock.unblockit.onl/
+  - https://torlock.nocensor.space/
 legacylinks:
   - https://torlock.com/
   - https://torlock.unblockit.pro/
@@ -26,6 +27,7 @@ legacylinks:
   - https://torlock.unblockit.ltd/
   - https://torlock.unblockit.link/
   - https://torlock.unblockit.buzz/
+  - https://torlock.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/toros.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.toros.co/
+  - https://toros.nocensor.space/
 
 caps:
   categorymappings:

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

@@ -36,9 +36,10 @@ caps:
     - {id: 191, cat: TV, desc: "TV/BluTv"}
     - {id: 192, cat: TV, desc: "TV/BluTv Series"}
     - {id: 193, cat: Movies, desc: "TV/BluTv Film"}
-    - {id: 199, cat: TV, desc: "TV/Netflix"}
+    - {id: 188, cat: TV, desc: "TV/Netflix"}
     - {id: 189, cat: TV, desc: "TV/Netflix Series"}
     - {id: 190, cat: Movies, desc: "TV/Netflix Film"}
+    - {id: 195, cat: TV, desc: "TV/Exxen"}
     - {id: 171, cat: Audio, desc: "Music"}
     - {id: 172, cat: Audio, desc: "Music/Turkish"}
     - {id: 173, cat: Audio, desc: "Music/Foreign"}

src/Jackett.Common/Definitions/torrent4you.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://torrent4you.me/
+  - https://torrent4you.nocensor.space/
 legacylinks:
   - http://torrent4you.me/
 

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torrent9.la/
-  - https://torrent9.unblocked.monster/
+  - https://www.torrent9.ninja/
+  - https://torrent9.nocensor.space/
 
 legacylinks:
   - https://www.torrents9.pw/
@@ -52,6 +52,8 @@ legacylinks:
   - https://wwv.torrent9.one/
   - https://vww.torrent9.one/
   - https://www.torrent9.srl/
+  - https://torrent9.unblocked.monster/
+  - https://www.torrent9.la/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,8 +8,8 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.club/
-  - https://torrentdownload.unblocked.monster/
+  - https://torrentdownload.unblockit.onl/
+  - https://torrentdownload.nocensor.space/
 legacylinks:
   - https://torrentdownload.unblockit.pro/
   - https://torrentdownload.unblockit.one/
@@ -33,6 +33,8 @@ legacylinks:
   - https://torrentdownload.unblockit.ltd/
   - https://torrentdownload.unblockit.link/
   - https://torrentdownload.unblockit.buzz/
+  - https://torrentdownload.unblocked.monster/
+  - https://torrentdownload.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.me/
-  - https://torrentdownloads.unblockit.club/
-  - https://torrentdownloads.unblocked.monster/
+  - https://torrentdownloads.unblockit.onl/
+  - https://torrentdownloads.nocensor.space/
 legacylinks:
   - https://torrentdownloads.unblockit.pro/
   - https://torrentdownloads.unblockit.one/
@@ -34,6 +34,8 @@ legacylinks:
   - https://torrentdownloads.unblockit.ltd/
   - https://torrentdownloads.unblockit.link/
   - https://torrentdownloads.unblockit.buzz/
+  - https://torrentdownloads.unblocked.monster/
+  - https://torrentdownloads.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,7 +9,8 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.club/
+  - https://torrentfunk.unblockit.onl/
+  - https://torrentfunk.nocensor.space/
 legacylinks:
   - https://torrentfunk.unblockit.pro/
   - https://torrentfunk.unblockit.one/
@@ -24,6 +25,7 @@ legacylinks:
   - https://torrentfunk.unblockit.ltd/
   - https://torrentfunk.unblockit.link/
   - https://torrentfunk.unblockit.buzz/
+  - https://torrentfunk.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,8 +11,8 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.club/
-  - https://tgx.unblocked.monster/
+  - https://torrentgalaxy.unblockit.onl/
+  - https://torrentgalaxy.nocensor.space/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
   - https://torrentgalaxy.unblockit.pro/
@@ -39,6 +39,8 @@ legacylinks:
   - https://torrentgalaxy.unblockit.ltd/
   - https://torrentgalaxy.unblockit.link/
   - https://torrentgalaxy.unblockit.buzz/
+  - https://tgx.unblocked.monster/
+  - https://torrentgalaxy.unblockit.club/
 
 caps:
   categorymappings:
@@ -130,7 +132,7 @@ search:
     order: "{{ .Config.type }}"
 
   rows:
-    selector: div.tgxtable > div:has(div[class="tgxtablecell shrink"])
+    selector: div.tgxtable > div:has(div[class^="tgxtablecell shrink"])
 
   fields:
     category:

src/Jackett.Common/Definitions/torrentland.yml

@@ -154,6 +154,8 @@ search:
           args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
         - name: replace
           args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:

src/Jackett.Common/Definitions/torrentmax.yml

@@ -27,6 +27,7 @@ caps:
     - {id: "MUSIC", cat: Audio, desc: "한국음악 (Music)"}
     - {id: "MUSIK", cat: Audio/Foreign, desc: "외국음악 (Music Foreign)"}
     - {id: "notice", cat: Other, desc: "공지사항 (Notice)"}
+    - {id: "humor", cat: Other, desc: "유머 (Humor)"}
     - {id: "MOBILE", cat: PC/Mobile-Other, desc: "모바일 (Mobile)"}
     - {id: "UTIL", cat: PC, desc: "유틸 (Software)"}