desitorrents: removed, dead. resolves #378 (#11442)

new login error detection.
new results layout.
refresh cats.

README.md

@@ -39,6 +39,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BigFANGroup
  * BitRu
  * BT.etree
+ * BT4G
  * BTDB
  * BTDIGG
  * BTSOW
@@ -64,7 +65,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GkTorrent
  * GloDLS
  * GTorrent
- * HDReactor
+ * GTorrent.pro
+ * HDhouse (HDReactor)
  * IBit
  * Idope
  * Il CorSaRo Blu
@@ -72,7 +74,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * kickasstorrents (kickass.ws)
+ * kickasstorrents.ws
  * kickasstorrents.to
  * Legit Torrents
  * LePorno.info
@@ -82,9 +84,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Magnet4You
  * MejorTorrent
  * MixTapeTorrent
- * Monova
- * MovCr
+ * Montorrent
  * MoviesDVDR
+ * MovieTorrent
  * MyPornClub
  * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
  * Newstudio
@@ -93,6 +95,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NoNaMe Club (NNM-Club)
  * Nyaa-Pantsu
  * Nyaa.si
+ * OnceSearch
  * OneJAV
  * OxTorrent
  * ParnuXi
@@ -104,6 +107,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLive
  * PornoRip
  * PornoTor
+ * Portugas
  * ProPorn
  * ProStyleX
  * Rapidzona
@@ -118,34 +122,40 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ShizaProject
  * shokweb
  * ShowRSS
- * SkyTorrentsClone (*.lol)
- * SkyTorrentsClone2 (*.to)
+ * SkyTorrents.to
  * Solid Torrents
  * sosulki
+ * SubsPlease
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
+ * Tjangto (짱토)
+ * TNTfork
  * Tokyo Tosho
  * Torlock
  * TOROS
- * Torrent Bomb (토렌트봄)
  * Torrent Downloads (TD)
  * Torrent Oyun indir
+ * Torrent Paradise (ML)
  * torrent-pirat
  * Torrent4You
  * Torrent9
- * Torrent9Clone
+ * Torrent9 clone
  * TorrentDownload
  * TorrentFunk
  * TorrentGalaxy (TGx)
  * TorrentKitty
  * TorrentMafya
+ * TorrentMax (토렌트맥스)
  * TorrentParadise
  * TorrentProject
  * TorrentProject2
+ * TorrentQQ (토렌트큐큐)
  * Torrents.csv
+ * TorrentSir (토렌트썰)
  * Torrentv
  * TorrentView (토렌트뷰)
+ * TorrentWhiz ( 토렌트위즈)
  * Torrentz2
  * Torrentz2k
  * truPornolabs
@@ -165,11 +175,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
  * AniDUB
+ * Anime-Free
  * ArenaBG
  * BaibaKo
  * BookTracker
  * BootyTape
  * CasStudioTV
+ * Catorrent
  * Darmowe torrenty
  * Deildu
  * DimeADozen (EzTorrent)
@@ -181,6 +193,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremlymTorrents (XTR)
  * Genesis-Movement
  * HamsterStudio
+ * HunTorrent
  * IV-Torrents
  * KinoNaVse100
  * Kinorun
@@ -204,6 +217,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sharewood
  * SkTorrent
  * SkTorrent-org
+ * themixingbowl (TMB)
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
@@ -220,17 +234,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2 Fast 4 You
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
- * 3evils
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
  * Abnormal [![(invite needed)][inviteneeded]](#)
+ * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
+ * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
  * Aidoru!Online
  * Aither
  * AlphaRatio (AR)
  * AmigosShareClub
+ * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
  * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
@@ -240,9 +256,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AsianCinema
  * Asylum Share
  * AudioNews (AN)
- * Audiobook Torrents (ABT + RNS)
+ * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Awesome-HD (AHD)
  * Borgzelle
  * Back-ups
  * bB
@@ -251,7 +266,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BeyondHD (BHD)
  * Bibliotik
  * BIGTorrent
- * BigTower
  * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
  * BIT-HDTV
  * BiT-TiTAN
@@ -278,7 +292,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
- * ChannelX
  * ChileBT
  * Cinecalidad
  * CinemaMovieS_ZT
@@ -291,20 +304,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
+ * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
  * Dark Tracker
  * Das Unerwartete [![(invite needed)][inviteneeded]](#)
  * DataScene (DS)
  * DesiReleasers
- * DesiTorrents
  * Diablo Torrent
  * DICMusic
  * DigitalCore
  * DivTeam
  * DivxTotal
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
- * DXDHD
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
@@ -318,6 +330,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * FANO.IN
  * Fantastic Heaven
+ * FeedUrNeed
  * Femdomcult
  * FileList (FL)
  * Film-Paleis
@@ -326,7 +339,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FocusX
  * Fou-Du-Cinema
  * FreeTorrent
- * FullMixMusic
  * FunFile (FF)
  * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
  * FunReleases [![(invite needed)][inviteneeded]](#)
@@ -354,6 +366,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HD-Torrents (HDT)
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDArea (HDA)
+ * HDAtmos
  * HDBits
  * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing)
@@ -363,7 +376,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDME
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky
- * HDStreet
  * HDTime
  * HDTorrents.it
  * HDTurk [![(invite needed)][inviteneeded]](#)
@@ -372,7 +384,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Hebits
  * HellasTZ
  * Hon3y HD
- * Horror Site
  * HQSource (HQS)
  * HuSh [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
@@ -406,7 +417,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MNV (Max-New-Vision)
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
- * Movie Zone (Mz)
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
@@ -414,12 +424,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
  * NetLab
- * New Real World [![(invite needed)][inviteneeded]](#)
  * NorBits
- * notwhat.cd
  * oMg[WtF]trackr
- * OnlineSelfEducation
- * ONLYscene
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -437,10 +443,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PolishTracker
  * PornBits (PB)
  * Pornbay [![(invite needed)][inviteneeded]](#)
+ * PotUK
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
- * Psytorrents [![(invite needed)][inviteneeded]](#)
  * PTerClub
  * PTFiles (PTF)
  * PThome
@@ -481,6 +487,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
  * SpringSunday
+ * SugoiMusic
  * Superbits (SBS)
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
@@ -488,6 +495,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
+ * teracod (Movie Zone)
  * The Falling Angels (TFA)
  * The Geeks [![(invite needed)][inviteneeded]](#)
  * The Horror Charnel (THC)
@@ -499,6 +507,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
  * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheLeachZone
+ * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * ToTheGlory (TTG)
@@ -523,6 +533,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
  * Torrentland
  * TotallyKids (TK)
+ * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
  * TTsWEB

azure-pipelines.yml

@@ -50,7 +50,7 @@ stages:
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
@@ -301,14 +301,14 @@ stages:
               targetType: inline
               failOnStderr: true
               script: |
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/DateTimeRoutines
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Common
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Server
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Service
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Test
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Tray
-                dotnet-format --dry-run --check --verbosity diagnostic --folder ./src/Jackett.Updater
+                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
 
       - job: Linting_YAML
         displayName: Linting YAML
@@ -354,21 +354,16 @@ stages:
               imageName: macOS-latest
               framework: $(netCoreFramework)
               runtime: osx-x64
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
               runtime: linux-x64
-            LinuxARM32:
-              buildDescription: Linux ARM32
+            LinuxARM:
+              buildDescription: Linux ARM
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
               runtime: linux-arm
-            LinuxARM64:
-              buildDescription: Linux ARM64
-              imageName: ubuntu-latest
-              framework: $(netCoreFramework)
-              runtime: linux-arm64
         pool:
           vmImage: $(imageName)
         displayName: ${{ variables.buildDescription }}
@@ -461,7 +456,7 @@ stages:
               buildDescription: macOS
               imageName: macOS-latest
               artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz

src/Jackett.Common/Content/custom.css

@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputcheckbox label {
     padding: 0 1.5em;
 }

src/Jackett.Common/Content/custom.js

@@ -249,7 +249,13 @@ function displayUnconfiguredIndexersList() {
 			        }).fail(function (data) {
                 if(data.responseJSON.error !== undefined) {
                   var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-                  doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                  var githubrepo = "Jackett/Jackett"
+                  var githubtext = "this indexer"
+                  if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
+                    githubrepo = "FlareSolverr/FlareSolverr"
+                    githubtext = "FlareSolverr"
+                  }
+                  doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
                 } else {
                   doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
                 }
@@ -474,7 +480,13 @@ function testIndexer(id, notifyResult) {
       updateTestState(id, "error", data.error, indexers);
       if(data.responseJSON.error !== undefined && notifyResult) {
         var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
-        doNotify("An error occurred while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+        var githubrepo = "Jackett/Jackett"
+        var githubtext = "this indexer"
+        if (data.responseJSON.error.includes("check FlareSolverr logs")) {
+          githubrepo = "FlareSolverr/FlareSolverr"
+          githubtext = "FlareSolverr"
+        }
+        doNotify("An error occurred while testing this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + id + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Test)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
       } else {
         doNotify("An error occurred while testing indexers, please take a look at indexers with failed test for more informations.", "danger", "glyphicon glyphicon-alert");
       }
@@ -561,6 +573,9 @@ function getConfigModalJson(configForm) {
             case "inputstring":
                 itemEntry.value = $el.find(".setup-item-inputstring input").val();
                 break;
+            case "password":
+                itemEntry.value = $el.find(".setup-item-password input").val();
+                break;
             case "inputbool":
                 itemEntry.value = $el.find(".setup-item-inputbool input").is(":checked");
                 break;

src/Jackett.Common/Content/custom_mobile.css

@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputbool input {
     max-width: 100px;
     height: 20px;

src/Jackett.Common/Content/index.html

@@ -9,14 +9,6 @@
     <meta charset="utf-8" />
     <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party resources (E.g. Empornium poster images won't load) -->
     <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
-    <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon" sizes="76x76" href="../apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="../apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="../apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="../apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
     <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
     <link rel="icon" type="image/ico" href="../favicon.ico" />
     <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
@@ -25,7 +17,7 @@
     <script type="text/javascript" src="../libs/jquery.dataTables.min.js?changed=2017083001" charset="utf8"></script>
     <script type="text/javascript" src="../libs/handlebars.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/moment.min.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../libs/handlebarsmoment.js?changed=20210117"></script>
     <script type="text/javascript" src="../libs/handlebarsextend.js?changed=2017083001"></script>
     <script type="text/javascript" src="../bootstrap/bootstrap.min.js?changed=2017083001"></script>
     <script type="text/javascript" src="../libs/bootstrap-notify.js?changed=2017083001"></script>
@@ -235,6 +227,11 @@
             {{/if}}
         </div>
     </script>
+    <script id="setup-item-password" type="text/x-handlebars-template">
+        <div class="setup-item-password">
+            <input class="form-control" type="password" value="{{{value}}}" />
+        </div>
+    </script>
     <script id="setup-item-inputbool" type="text/x-handlebars-template">
         <div class="setup-item-inputbool">
             {{#if value}}
@@ -696,6 +693,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20201220"></script>
+    <script type="text/javascript" src="../custom.js?changed=20210322"></script>
 </body>
 </html>

src/Jackett.Common/Content/libs/handlebarsmoment.js

@@ -33,5 +33,5 @@ Handlebars.registerHelper('jacketTimespan', function (context, block) {
 });
 
 Handlebars.registerHelper('jacketSize', function (context, block) {
-    return filesize(context, { round: 1 });
+    return filesize(context, { round: 2 });
 });

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

@@ -14,7 +14,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.dev/
+  - https://1337x.unblockit.buzz/
   - https://1337x.unblocked.monster/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -36,8 +36,11 @@ legacylinks:
   - https://1337x.unblockit.top/
   - https://1337x.unblockit.lat/
   - https://1337x.unblockit.app/
-  - https://1337x.unblocked.rest/
   - https://1337.root.yt/
+  - https://1337x.unblocked.rest/
+  - https://1337x.unblockit.dev/
+  - https://1337x.unblockit.ltd/
+  - https://1337x.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/1ptbar.yml

@@ -11,15 +11,17 @@ links:
 caps:
   categorymappings:
     - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
     - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
     - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 403, cat: TV, desc: "TV Show/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺节目"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
-    - {id: 409, cat: Other, desc: "Other/其它"}
-    - {id: 412, cat: Other, desc: "Education/教育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/高品质音频"}
+    - {id: 412, cat: Other, desc: "Edu/教育"}
+    - {id: 411, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 410, cat: PC/0day, desc: "Software/软件"}
 
   modes:
     search: [q]

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

@@ -1,188 +0,0 @@
----
-id: 3evils
-name: 3evils
-description: "3evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en
-type: private
-encoding: UTF-8
-links:
-  - https://www.3evils.net/
-legacylinks:
-  - https://www.3evils.com/
-  - https://the-unknown.xyz/
-
-caps:
-  categorymappings:
-    - {id: 73, cat: PC, desc: "Appz/Linux"}
-    - {id: 42, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 43, cat: PC/0day, desc: "Appz/Windows"}
-    - {id: 65, cat: Books/EBook, desc: "Books"}
-    - {id: 80, cat: Console/NDS, desc: "Games/Nintendo"}
-    - {id: 78, cat: Console/PS4, desc: "Games/PS4"}
-    - {id: 77, cat: PC/Games, desc: "Games/Windows"}
-    - {id: 79, cat: Console/XBox, desc: "Games/XBOX"}
-    - {id: 13, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 71, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 72, cat: Movies/BluRay, desc: "Movies/Blu-Ray"}
-    - {id: 12, cat: Movies/DVD, desc: "Movies/DVD-R"}
-    - {id: 14, cat: Movies, desc: "Movies/Packs"}
-    - {id: 70, cat: Movies/SD, desc: "Movies/Screeners & Cams"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x264"}
-    - {id: 17, cat: Movies/HD, desc: "Movies/X265"}
-    - {id: 11, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 74, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 33, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 32, cat: Audio, desc: "Music/Packs"}
-    - {id: 75, cat: Audio/Video, desc: "Music/Videos"}
-    - {id: 6, cat: TV, desc: "TV/Packs"}
-    - {id: 3, cat: TV/HD, desc: "TV/x264"}
-    - {id: 4, cat: TV/HD, desc: "TV/x265"}
-    - {id: 8, cat: TV/SD, desc: "TV/Xvid"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: login.php
-  method: form
-  form: form[action="takelogin.php"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-  error:
-    - selector: div.callout:contains("Login failed!")
-  test:
-    path: /
-    selector: a[href*="/logout.php?hash_please="]
-
-search:
-  paths:
-    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # title, descr, genre, all
-    searchin: title
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.unstriped tbody tr:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.*?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
-        # <img src=\'./pic/noposter.png\'
-        - name: regexp
-          args: "src=\\\\'(.+?)\\\\'"
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    files:
-      selector: td[data-label="Files"]
-    # 2 flavours of dates
-    date:
-      # Today<br> 10:20 AM
-      # Yesterday<br> 08:03 PM
-      optional: true
-      selector: td[data-label="Added"]:contains("day")
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-    date:
-      # Feb 14 2019<br> 10:20 AM
-      optional: true
-      selector: td[data-label="Added"]:not(:contains("day"))
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
-    size:
-      selector: td[data-label="Size"]
-    grabs:
-      selector: td[data-label="Snatched"]
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td[data-label="Seeders"]
-    leechers:
-      selector: td[data-label="Leechers"]
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5 (customised)

src/Jackett.Common/Definitions/DasUnerwartete.yml

@@ -61,6 +61,9 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: pin
+    type: text
+    label: Pin
 
 login:
   path: login.php
@@ -69,8 +72,9 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    pin: "{{ .Config.pin }}"
   error:
-    - selector: .tablea:contains("Benutzername oder Passwort ungültig")
+    - selector: .tablea:contains("Benutzername, Passwort oder Pin ungültig")
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/abtorrents.yml

@@ -1,7 +1,7 @@
----
-id: audiobooktorrents
-name: Audiobook Torrents
-description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
+---
+id: abtorrents
+name: ABtorrents
+description: "ABtorrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
 language: en-us
 type: private
 encoding: UTF-8
@@ -80,12 +80,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -96,17 +97,7 @@ settings:
     default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."
 
 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: 1
-    submitme: X
-  error:
-    - selector: td.embedded:has(h2:contains("Oops"))
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/acrossthetasman.yml

@@ -0,0 +1,83 @@
+---
+id: acrossthetasman
+name: Across The Tasman
+description: "ATT is a torrent site for Rugby and other sports played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://acrossthetasman.com/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    default: date
+    options:
+      date: created
+      filename: title
+      size: size
+      seeders: seeders
+  - name: order
+    type: select
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: post
+  path: login.php
+  inputs:
+    vb_login_username: "{{ .Config.username }}"
+    vb_login_password: "{{ .Config.password }}"
+    cookieuser: 1
+    do: login
+  test:
+    path: torrents.php
+
+search:
+  paths:
+    - path: "torrents.php?sort={{ .Config.sort }}&order={{ .Config.order}}&query={{ .Keywords }}"
+
+  rows:
+    selector: table[width='100%'][align='center']:not([class]) > tbody > tr
+
+  fields:
+    category:
+      text: 1
+    date:
+      # Feb 12, 2021
+      selector: td:nth-child(1)
+      filters:
+        - name: dateparse
+          args: "Jan 02, 2006"
+    title:
+      selector: td:nth-child(4) > span:nth-child(1)
+      filters:
+        - name: re_replace
+          args: ["[\\s]+Uploaded.*", ""]
+    download:
+      selector: a[href*="attachment.php?attachmentid="]
+      attribute: href
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    size:
+      selector: td:nth-child(10)
+# engine n/a

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 4.0.0
+# UNIT3D 5.1.0

src/Jackett.Common/Definitions/amigosshare.yml

@@ -205,7 +205,7 @@ search:
         - name: append
           args: "{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
         - name: re_replace
-          args: ["(Dual-Audio|Dublado)", "Brazilian $1"]
+          args: ["(Dual|[Nn]acional|[Dd]ublado)", "Brazilian $1"]
     details:
       selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
       attribute: href

src/Jackett.Common/Definitions/anaschcc.yml

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

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

@@ -0,0 +1,138 @@
+---
+id: anime-free
+name: Anime-Free
+description: "Anime-Free is a RUSSIAN Semi-Private Torrent Tracker for Hentai manga, eroge and flash porn games"
+language: ru-ru
+type: semi-private
+encoding: windows-1251
+links:
+  - https://anime-free.biz/
+legacylinks:
+  - https://anime-free.net/ # redirects to *.biz
+
+caps:
+  categorymappings:
+    - {id: 14, cat: TV/Anime, desc: "Аниме хентай"}
+    - {id: 47, cat: TV/Anime, desc: "   Хентай на Русском языке"}
+    - {id: 48, cat: TV/Anime, desc: "   Хентай Без русского перевода"}
+    - {id: 45, cat: TV/Anime, desc: "   Хентай Без цензуры"}
+    - {id: 46, cat: TV/Anime, desc: "   Хентай с цензурой"}
+    - {id: 54, cat: Other, desc: "Косплей"}
+    - {id: 51, cat: TV/Anime, desc: "[3D] хентай и анимация"}
+    - {id: 5, cat: Books/Comics, desc: "Хентай манга"}
+    - {id: 56, cat: Console, desc: "Игры"}
+    - {id: 10, cat: Console, desc: "   Эротические и хентай игры"}
+    - {id: 55, cat: Console, desc: "   3DCG/3D-Animation игры"}
+    - {id: 57, cat: Console, desc: "   Игры на русском языке"}
+    - {id: 58, cat: Other, desc: "   Онлайн игры"}
+    - {id: 52, cat: Books/Comics, desc: "Порно комиксы"}
+    - {id: 49, cat: XXX/ImageSet, desc: "Хентай картинки, иллюстрации, обои и Art "}
+    - {id: 43, cat: TV/Anime, desc: "Эччи (Легкая эротика)"}
+    - {id: 4, cat: TV/Anime, desc: "Аниме Хентай"}
+    - {id: 50, cat: Other, desc: "Хентай Онлайн"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: email
+    type: text
+    label: Email
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: /
+  method: form
+  form: form.login-form
+  inputs:
+    login_name: "{{ .Config.email }}"
+    login_password: "{{ .Config.password }}"
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&catlist[]=0
+  paths:
+    - path: index.php
+  inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    showposts: 0
+    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 }}"
+    searchuser: ""
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    sortby: date
+    resorder: desc
+
+  rows:
+    selector: article
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      case:
+        a[href$="3d_hentai"]: 51
+        a[href$="3dcg_game"]: 55
+        a[href$="censored"]: 46
+        a[href$="comics"]: 52
+        a[href$="cosplay"]: 54
+        a[href$="etty"]: 43
+        a[href$="h-game"]: 10
+        a[href$="h-online"]: 50
+        a[href$="hentai"]: 4
+        a[href$="hentai_games"]: 56
+        a[href$="hentai_manga"]: 5
+        a[href$="hentai_raznoe"]: 49
+        a[href$="hentai_rus"]: 47
+        a[href$="online_games"]: 58
+        a[href$="original_hentai"]: 48
+        a[href$="rus-game"]: 57
+        a[href$="uncensored"]: 45
+    title:
+      selector: h2.title a
+    details:
+      selector: h2.title a
+      attribute: href
+    download:
+      selector: h2.title a
+      attribute: href
+    poster:
+      selector: img.entry-image
+      attribute: src
+    description:
+      selector: div[itemprop="description"]
+      optional: true
+    date:
+      selector: li:has(img#adddate)
+      filters:
+        - name: dateparse
+          args: "02-01-2006, 15:04"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      selector: b.file_size
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/anirena.yml

@@ -8,7 +8,11 @@ encoding: UTF-8
 links:
   - https://www.anirena.com/
 
-settings: []
+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.
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -7,11 +7,16 @@ type: public
 encoding: UTF-8
 links:
   - http://audiobookbay.nl/ # site forces http, does not support https
-  - https://audiobookbay.unblockit.dev/
+  - http://audiobookbay.net/
+  - http://audiobookbayabb.com/
+  - https://audiobookbay.unblockit.buzz/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
   - https://audiobookbay.unblockit.app/
+  - https://audiobookbay.unblockit.dev/
+  - https://audiobookbay.unblockit.ltd/
+  - https://audiobookbay.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/aussierules.yml

@@ -0,0 +1,91 @@
+---
+id: aussierules
+name: Aussierul.es
+description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://aussierul.es/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: type
+    label: Search Type
+    type: select
+    default: t_name
+    options:
+      t_name: Torrent Name
+      t_description: Torrent Description
+      t_both: Name & Description
+      t_uploader: Uploader
+      t_genre: IMDB Genre
+  - name: dead
+    label: Include Dead Torrents
+    type: select
+    default: No
+    options:
+      yes: Yes
+      no: No
+
+login:
+  method: form
+  form: form
+  path: login.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("An error has occured!")
+  test:
+    path: browse.php
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    search_type: "{{ .Config.type }}"
+    include_dead_torrents: "{{ .Config.dead }}"
+    keywords: "{{ .Keywords }}"
+
+  rows:
+    selector: table#sortabletable > tbody > tr:not(:first-child)
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: td:nth-child(2) > div:nth-child(1) > a > strong
+    details:
+      selector: td:nth-child(2) > div:nth-child(1) > a
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]
+      attribute: href
+    date:
+      # 27-03-2021 18:34
+      selector: td:nth-child(2) > div:nth-child(2)
+      filters:
+        - name: dateparse
+          args: "2-01-2006 15:04"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+# TS Special Edition v.7.4

src/Jackett.Common/Definitions/bigtower.yml

@@ -1,141 +0,0 @@
----
-id: bigtower
-name: BigTower
-description: "Big Tower is an ITALIAN Private site for TV / MOVIES / GENERAL"
-language: it-it
-type: private
-encoding: UTF-8
-links:
-  - http://bigtower.info/ # site does not support https NET::ERR_CERT_DATE_INVALID
-legacylinks:
-  - https://bigtower.info/
-
-caps:
-  categorymappings:
-
-    - {id: 11, cat: Movies/HD, desc: "DSS"}
-    - {id: 1, cat: Movies, desc: "Screener"}
-    - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
-    - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
-    - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
-    - {id: 6, cat: TV, desc: "Serie TV"}
-    - {id: 4, cat: TV/Anime, desc: "Cartoni"}
-    - {id: 7, cat: PC/Games, desc: "Giochi"}
-    - {id: 8, cat: Audio, desc: "Musica"}
-    - {id: 9, cat: PC/0day, desc: "Software"}
-    - {id: 12, cat: PC/Mobile-Other, desc: "Applicazioni"}
-    - {id: 14, cat: Other, desc: "Varie & Altro"}
-    - {id: 13, cat: Books, desc: "Libri & Edicola"}
-
-  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: donor
-    type: checkbox
-    label: Show donor torrent? (Enable if you're a donor)
-    default: false
-  - 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: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: span:contains("Nome Utente non corretto")
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    page: torrents
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    options: 0
-    active: 0
-
-  rows:
-    selector: table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="]){{ if .Config.donor }}{{ else }}:not(:has(img[src*="keditbookmarks.png"])){{ end }}
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      filters:
-        - name: re_replace # rimozioni varie
-          args: ["(?i)(\\[Richiesta\\])", ""]
-    details:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["index.php?page=torrent-details&id=", "download.php?id="]
-    poster:
-      selector: a[onmouseover][href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    size:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-last-child(8)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    grabs:
-      selector: td:nth-last-child(5)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    seeders:
-      selector: td:nth-last-child(7)
-    leechers:
-      selector: td:nth-last-child(6)
-    downloadvolumefactor:
-      case:
-        img[alt="Gold 100% Free"]: 0
-        img[alt="Silver 50% Free"]: 0.5
-        img[alt="Bronze 25% Free"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[alt="2x Upload Multiplier"]: 2
-        img[alt="3x Upload Multiplier"]: 3
-        img[alt="4x Upload Multiplier"]: 4
-        img[alt="5x Upload Multiplier"]: 5
-        img[alt="6x Upload Multiplier"]: 6
-        img[alt="7x Upload Multiplier"]: 7
-        img[alt="8x Upload Multiplier"]: 8
-        img[alt="9x Upload Multiplier"]: 9
-        img[alt="10x Upload Multiplier"]: 10
-        "*": 1
-#  xbtitFM v3.0.00

src/Jackett.Common/Definitions/blutopia.yml

@@ -103,12 +103,12 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
       attribute: href
     poster:
       selector: div.torrent-poster img
@@ -193,4 +193,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 4.0.0b
+# UNIT3D 5.2.1b

src/Jackett.Common/Definitions/broadcity.yml

@@ -6,9 +6,9 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - http://broadcity.in/ # site is forcing to http
+  - https://broadcity.in/ # site is forcing to https
 legacylinks:
-  - https://broadcity.in/
+  - http://broadcity.in/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/bt4g.yml

@@ -0,0 +1,77 @@
+---
+id: bt4g
+name: BT4G
+description: "BT4G is a Public metadata crawler for magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://bt4g.org/
+
+caps:
+  categories:
+    Application: PC
+    Archive file: Other
+    Audio: Audio
+    Doc: Books
+    Other: Other
+    Video: Movies
+    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://bt4g.org/search/2021
+    # site does not support cat search
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.row > div.col > div:has(h5)
+
+  fields:
+    title:
+      selector: a
+    category:
+      selector: span.cpill
+    category:
+      # add tv to video
+      optional: true
+      selector: span.cpill
+      filters:
+        - name: replace
+          args: ["Video", "TV"]
+    details:
+      selector: a
+      attribute: href
+    infohash:
+      selector: a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/magnet/", ""]
+    date:
+      selector: span:nth-last-child(5) b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    files:
+      selector: span:nth-last-child(4) b
+    size:
+      selector: span:nth-last-child(3) b
+    seeders:
+      selector: span:nth-last-child(2) b
+    leechers:
+      selector: span:nth-last-child(1) b
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/btdb.yml

@@ -7,8 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
+  # update poster placeholder link too
   - https://btdb.eu/
-  - https://btdb.unblockit.dev/
+  - https://btdb.unblockit.buzz/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -30,6 +31,9 @@ legacylinks:
   - https://btdb.unblockit.top/
   - https://btdb.unblockit.lat/
   - https://btdb.unblockit.app/
+  - https://btdb.unblockit.dev/
+  - https://btdb.unblockit.ltd/
+  - https://btdb.unblockit.link/
 
 caps:
   categories:
@@ -43,6 +47,10 @@ caps:
     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.
   - name: info_8000
     type: info
     label: About BTDB Categories
@@ -89,7 +97,7 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["https://btdb.io/assets/img/placeholder.png", ""]
+          args: ["https://btdb.eu/assets/img/placeholder.png", ""]
     date:
       selector: small:nth-of-type(5) strong
       filters:

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
+  - http://btdiggwzoyrwwbiv.onion.ly/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -9,6 +9,8 @@ links:
   - https://bwtorrents.tv/
   - https://bwtorrents.fun/
   - https://bwtorrents.xyz/
+  - https://bwtorrents.us/
+  - https://bwtorrents.live/
 
 caps:
   categorymappings:
@@ -26,25 +28,24 @@ caps:
     - {id: 122, cat: Movies/WEB-DL, desc: "Bollywood-DVDRips 1080p/720p"}
     - {id: 123, cat: Movies/WEB-DL, desc: "Bollywood-SDRips WEB/DVD"}
     - {id: 124, cat: Movies/3D, desc: "Bollywood-3D-Movies"}
-    - {id: 190, cat: Movies, desc: "Bollywood-Movies packs"}
-    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movie packs"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-Web Series"}
+    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
     - {id: 126, cat: Movies/UHD, desc: "Hollywood-4K Ultra HD / Upscaled"}
     - {id: 127, cat: Movies/BluRay, desc: "Hollywood-Untouched BluRay"}
     - {id: 128, cat: Movies/HD, desc: "Hollywood-1080p BluRay Rips"}
     - {id: 129, cat: Movies/HD, desc: "Hollywood-720p BluRay Rips"}
     - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"}
     - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
-    - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
+    - {id: 132, cat: Movies, desc: "Hollywood-1080p WEB-Rips"}
+    - {id: 192, cat: Movies, desc: "Hollywood-720p WEB-Rips"}
     - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
     - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"}
     - {id: 134, cat: Movies/WEB-DL, desc: "Hollywood-DVDRips 1080p/720p"}
     - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"}
     - {id: 135, cat: Movies/3D, desc: "Hollywood-3D-Movies"}
-    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
-    - {id: 194, cat: Movies, desc: "Hollywood-Movies packs"}
+    - {id: 194, cat: Movies, desc: "Hollywood-Movie packs"}
     - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
-    - {id: 138, cat: Movies, desc: "Telugu-Movies"}
-    - {id: 139, cat: Movies, desc: "Tamil-Movies"}
     - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
     - {id: 141, cat: Movies, desc: "Kannada-Movies"}
     - {id: 142, cat: Movies, desc: "Lollywood-Movies"}
@@ -52,10 +53,9 @@ caps:
     - {id: 144, cat: Movies, desc: "Marathi-Movies"}
     - {id: 145, cat: Movies, desc: "Bangla-Movies"}
     - {id: 185, cat: Movies, desc: "Gujarati-Movies"}
-    - {id: 184, cat: Movies, desc: "Bollywood-South Hindi Dubbed"}
-    - {id: 183, cat: Movies, desc: "Hindi Dubbed Movies"}
+    - {id: 184, cat: Movies, desc: "South Hindi Dubbed"}
+    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
     - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
-    - {id: 198, cat: Movies, desc: "TV-MTV"}
     - {id: 182, cat: Movies, desc: "Other Movies"}
     - {id: 146, cat: TV, desc: "TV-Colors"}
     - {id: 147, cat: TV, desc: "TV-TV"}
@@ -66,13 +66,16 @@ caps:
     - {id: 152, cat: TV, desc: "TV-Star Bharat"}
     - {id: 153, cat: TV, desc: "TV-Star Plus"}
     - {id: 154, cat: TV, desc: "TV-Zee TV"}
+    - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
     - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
-    - {id: 156, cat: TV/Documentary, desc: "TV-Documentary"}
-    - {id: 157, cat: TV, desc: "TV-Hollywood"}
-    - {id: 158, cat: TV, desc: "TV-Others"}
-    - {id: 195, cat: TV, desc: "TV-Packs"}
-    - {id: 159, cat: TV, desc: "Religion &Spirituality "}
+    - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
+    - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
+    - {id: 195, cat: TV, desc: "TV-Tv Packs"}
+    - {id: 159, cat: Audio, desc: "Music-Religion & Spirituality"}
     - {id: 160, cat: Audio, desc: "Music-Classical"}
+    - {id: 172, cat: Audio, desc: "Music-Remix"}
     - {id: 161, cat: Audio/Lossless, desc: "Music-Flacs"}
     - {id: 162, cat: Audio, desc: "Music-Ghazals"}
     - {id: 163, cat: Audio, desc: "Music-Hindi OSTs"}
@@ -84,11 +87,10 @@ caps:
     - {id: 169, cat: Audio/Video, desc: "Music-Videos"}
     - {id: 170, cat: Audio, desc: "Music-Pop"}
     - {id: 171, cat: Audio, desc: "Music-Punjabi"}
-    - {id: 172, cat: Audio, desc: "Music-Remix"}
-    - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 174, cat: Audio, desc: "Music-Telugu"}
+    - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 196, cat: Audio, desc: "Music-Packs"}
-    - {id: 175, cat: Books/EBook, desc: "EBooks"}
+    - {id: 175, cat: Books/EBook, desc: "Ebooks"}
     - {id: 176, cat: PC/Games, desc: "Games PC"}
     - {id: 177, cat: Console, desc: "Games Console"}
     - {id: 178, cat: TV/Anime, desc: "Anime"}
@@ -96,6 +98,26 @@ caps:
     - {id: 180, cat: PC/Mobile-Other, desc: "Mobile Stuff"}
     - {id: 181, cat: Other, desc: "Pics/Wallpapers"}
     - {id: 187, cat: XXX, desc: "Adult XXX 18+"}
+    # Telugu-Movies
+    - {id: 199, cat: Movies, desc: "Telgu-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 200, cat: Movies, desc: "Telgu-Movies | Untouched WEB-DLs"}
+    - {id: 201, cat: Movies, desc: "Telgu-Movies | 1080p/720p WEBRips"}
+    - {id: 202, cat: Movies, desc: "Telgu-Movies | Untouched BluRay"}
+    - {id: 208, cat: Movies, desc: "Telgu-Movies | Remuxes BluRay"}
+    - {id: 207, cat: Movies, desc: "Telgu-Movies | BluRay Rips"}
+    - {id: 203, cat: Movies, desc: "Telgu-Movies | Untouched DVDs"}
+    - {id: 204, cat: Movies, desc: "Telgu-Movies | SD-WEBRips / DVDRips"}
+    - {id: 205, cat: Movies, desc: "Telgu-Movies | Movie Packs"}
+    # Tamil-Movies
+    - {id: 209, cat: Movies, desc: "Tamil-Movies | 4K Ultra HD - Upscaled"}
+    - {id: 210, cat: Movies, desc: "Tamil-Movies | Untouched WEB-DLs"}
+    - {id: 211, cat: Movies, desc: "Tamil-Movies | 1080p/720p WEBRips"}
+    - {id: 212, cat: Movies, desc: "Tamil-Movies | Untouched BluRay"}
+    - {id: 217, cat: Movies, desc: "Tamil-Movies | Remuxes BluRay"}
+    - {id: 216, cat: Movies, desc: "Tamil-Movies | BluRay Rips"}
+    - {id: 213, cat: Movies, desc: "Tamil-Movies | Untouched DVDs"}
+    - {id: 214, cat: Movies, desc: "Tamil-Movies | SD-WEBRips / DVDRips"}
+    - {id: 215, cat: Movies, desc: "Tamil-Movies | Movie Packs"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/catorrent.yml

@@ -0,0 +1,105 @@
+---
+id: catorrent
+name: Catorrent
+description: "Catorrent is a RUSSIAN Semi-Private Torrent Tracker for GAMES"
+language: ru-ru
+type: semi-private
+encoding: UTF-8
+links:
+  - https://catorrent.org/
+
+caps:
+  categorymappings:
+    - {id: PC, cat: PC/Games, desc: "PC"}
+    - {id: PS1, cat: Console/Other, desc: "Playstation 1"}
+    - {id: PS2, cat: Console/Other, desc: "Playstation 2"}
+    - {id: PS3, cat: Console/PS3, desc: "Playstation 3"}
+    - {id: PS4, cat: Console/PS4, desc: "Playstation 4"}
+    - {id: SWITCH, cat: Console/Other, desc: "Nintendo Switch"}
+    - {id: PSP, cat: Console/PSP, desc: "Playstation (portable) PSP"}
+    - {id: PSVITA, cat: Console/PS Vita, desc: "Playstation Vita"}
+    - {id: XONE, cat: Console/XBox One, desc: "Xbox ONE"}
+    - {id: X360, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: WIIU, cat: Console/WiiU, desc: "Nintendo WIIU"}
+    - {id: WII, cat: Console/Wii, desc: "Nintendo WII"}
+    - {id: 3DS, cat: Console/3DS, desc: "Nintendo 3DS"}
+    - {id: NDS, cat: Console/NDS, desc: "Nintendo DS"}
+    - {id: N64, cat: Console/Other, desc: "Nintendo 64"}
+    - {id: NGC, cat: Console/Other, desc: "Nintendo Game Cube"}
+    - {id: DREAMCAST, cat: Console/Other, desc: "Dreamcast"}
+    - {id: SAT, cat: Console/Other, desc: "Sega Saturn"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: index.php
+  method: form
+  form: form[action=""]
+  inputs:
+    login_name: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    login_not_save: ""
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/index.php?do=download&id="]
+  attribute: href
+
+search:
+  # https://catorrent.org/index.php?do=search&subaction=search&story=lovelot
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.short_game_search
+
+  fields:
+    category:
+      selector: div.icon_default
+    title:
+      selector: div.short_game_title
+    details:
+      selector: a[href$=".html"]
+      attribute: href
+    download:
+      selector: a[href$=".html"]
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    description:
+      selector: div.short_game_genre
+      optional: true
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      text: "512 MB"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -18,7 +18,7 @@ caps:
     - {id: 12, cat: Movies/Other, desc: "Filmy Inne"}
     - {id: 32, cat: Movies/UHD, desc: "Filmy UHD"}
     - {id: 2, cat: TV/Anime, desc: "Anime"}
-    - {id: 2, cat: TV/Documentary, desc: "TV Dokumentalne"}
+    - {id: 10, cat: TV/Documentary, desc: "TV Dokumentalne"}
     - {id: 20, cat: TV, desc: "TV Paczki"}
     - {id: 22, cat: TV/Sport, desc: "TV Sport"}
     - {id: 24, cat: TV/HD, desc: "TV HD"}

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -24,9 +24,7 @@ caps:
     - {id: 156, cat: TV/HD, desc: "Serien - Pack/1080p"}
     - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
     # Doku
-    - {id: 15, cat: TV/Documentary, desc: "Doku - Xvid/x264"}
-    - {id: 14, cat: TV/Documentary, desc: "Doku - 720p/1080p"}
-    - {id: 13, cat: TV/Documentary, desc: "Doku - Pack"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Alle"}
     # App
     - {id: 12, cat: PC/0day, desc: "App - Win"}
     - {id: 11, cat: PC, desc: "App - Other"}
@@ -45,6 +43,7 @@ caps:
     # Sport
     - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
     # Sonstiges
+    - {id: 159, cat: Audio/Audiobook, desc: "Sonstiges - Hörbuch"}
     - {id: 64, cat: Books/Comics, desc: "Sonstiges - Anime"}
     - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges - A-Book"}
     - {id: 96, cat: Books/EBook, desc: "Sonstiges - E-Book"}
@@ -140,9 +139,7 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/1080p\"))": "156"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
         # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "15"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "14"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "13"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Alle\"))": "15"
         # App
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
@@ -161,6 +158,7 @@ search:
         # Sport
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "62"
         # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": "159"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"

src/Jackett.Common/Definitions/danishbytes.yml

@@ -1,26 +1,28 @@
 ---
-id: Channelx
-name: ChannelX
-description: "ChannelX is a Private Torrent Tracker for High Quality Optimized HD MOVIES / TV"
+id: danishbytes
+name: DANISH BYTES
+description: "DANISH BYTES is a Private Danish Tracker"
 language: en-us
 type: private
 encoding: UTF-8
 links:
-  - https://channelx.xyz/
-legacylinks:
-  - https://channelx.online/
+  - https://danishbytes.org/
 
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Audiotracks"}
-    - {id: 4, cat: TV/Sport, desc: "Sports"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 8, cat: Books, desc: "Bookz"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -75,6 +77,7 @@ search:
     $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 }}"
@@ -105,6 +108,10 @@ search:
     download:
       selector: a[href*="/download/"]
       attribute: href
+# tracker has issue with some magnet downloads failing #10758
+#    magnet:
+#      selector: a[href^="magnet"]
+#      attribute: href
     details:
       selector: a.view-torrent
       attribute: href
@@ -112,12 +119,10 @@ search:
       selector: div.torrent-poster img
       attribute: src
       filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
         - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:
@@ -176,7 +181,7 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From PARA Store
         i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
         i[class*="fa-star text-bold"]: 0 # Freeleech From Token
         i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
@@ -191,8 +196,8 @@ search:
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
     minimumratio:
-      text: 0.4
+      text: 1.1
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# UNIT3D 2.7.0
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# UNIT3D 5.1.0 DB-edition

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

@@ -13,59 +13,59 @@ legacylinks:
 caps:
   categorymappings:
     # Film
-    - {id: 32, cat: Movies/HD, desc: "Film 720p/1080p"}
-    - {id: 28, cat: Movies/SD, desc: "Film XviD/x264"}
     - {id: 119, cat: Movies/DVD, desc: "Film DVD"}
     - {id: 114, cat: Movies/UHD, desc: "Film 4K/2160p"}
+    - {id: 28, cat: Movies/SD, desc: "Film XviD/x264"}
+    - {id: 32, cat: Movies/HD, desc: "Film 720p/1080p"}
     - {id: 26, cat: Movies/3D, desc: "Film 3D"}
     # Serien
     - {id: 57, cat: TV/HD, desc: "Serien HD"}
-    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 59, cat: TV, desc: "Serien Pack"}
+    - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 122, cat: TV, desc: "Serien Show"}
     - {id: 123, cat: TV/Documentary, desc: "Serien Doku"}
+    # Audio
+    - {id: 120, cat: Audio/Video, desc: "Audio Video"}
+    - {id: 48, cat: Audio/Lossless, desc: "Audio Flac"}
+    - {id: 52, cat: Audio, desc: "Audio Pack"}
+    - {id: 110, cat: Audio/MP3, desc: "Audio MP3"}
+    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
+    # App
+    - {id: 12, cat: PC/0day, desc: "App PC"}
+    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
+    - {id: 125, cat: PC/Mac, desc: "App macOS"}
     # Doku
     - {id: 14, cat: TV/Documentary, desc: "Doku HD"}
     - {id: 15, cat: TV/Documentary, desc: "Doku SD"}
-    # Spiele
-    - {id: 17, cat: PC/Games, desc: "Spiele PC"}
-    - {id: 24, cat: Console, desc: "Spiele Konsole"}
-    - {id: 121, cat: Console, desc: "Spiele Wimmelbild"}
-    - {id: 126, cat: Console/Other, desc: "Spiele Mobil"}
-    # Musik
-    - {id: 110, cat: Audio/MP3, desc: "Musik MP3"}
-    - {id: 52, cat: Audio, desc: "Musik Pack"}
-    - {id: 48, cat: Audio/Lossless, desc: "Musik Flac"}
-    - {id: 120, cat: Audio/Video, desc: "Musik Video"}
-    # App
-    - {id: 12, cat: PC/0day, desc: "App PC"}
-    - {id: 125, cat: PC/Mac, desc: "App MacOS"}
-    - {id: 11, cat: PC/Mobile-Other, desc: "App Mobil"}
+    # Spiel
+    - {id: 126, cat: Console/Other, desc: "Spiel Mobil"}
+    - {id: 17, cat: PC/Games, desc: "Spiel PC"}
+    - {id: 24, cat: Console, desc: "Spiel Konsole"}
+    - {id: 121, cat: Console, desc: "Spiel Wimmelbild"}
     # Sport
     - {id: 61, cat: TV/Sport, desc: "Sport HD"}
     - {id: 62, cat: TV/Sport, desc: "Sport SD"}
-    #  Internal
-    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
-    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
-    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
-    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
-    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
     # Sonstiges
     - {id: 64, cat: TV/Anime, desc: "Anime"}
-    - {id: 96, cat: Books/EBook, desc: "e-Book"}
-    - {id: 63, cat: Audio/Audiobook, desc: "Hörbuch"}
-    - {id: 71, cat: Other, desc: "Anderes"}
+    - {id: 96, cat: Books/EBook, desc: "E-Book"}
+    - {id: 71, cat: Other, desc: "Other"}
     # XXX
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
     - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 124, cat: XXX/Other, desc: "XXX Clips"}
     - {id: 133, cat: XXX/Other, desc: "XXX A/E-book"}
+    #  Internal
+    - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
+    - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
+    - {id: 130, cat: TV/HD, desc: "Internal Serien HD"}
+    - {id: 131, cat: TV/SD, desc: "Internal Serien SD"}
+    - {id: 132, cat: Other, desc: "Internal Sonstiges"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
@@ -136,9 +136,9 @@ search:
     - path: selection.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name, 1 descr, 2 both, 4 imdb
-    blah: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    search: "{{ .Keywords }}}"
+    # 0 name, 1 descr, 2 both
+    blah: "0"
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
@@ -151,7 +151,7 @@ search:
       case:
         # Movies
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "119"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"4K/2160p\"))": "114"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"2160p\"))": "114"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"x264\"))": "28"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": "32"
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "26"
@@ -161,7 +161,7 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "60"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Show\"))": "122"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Doku\"))": "123"
-        # Musik
+        # Audio
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Videos\"))": "120"
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "48"
         ":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
@@ -170,15 +170,15 @@ search:
         # App
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "12"
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "11"
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"MacOS\"))": "125"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"macOS\"))": "125"
         # Doku
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "14"
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "15"
-        # Games
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
+        # Spiel
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Mobil\"))": "126"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Konsole\"))": "24"
+        ":has(div.kat_cat_pic_name:contains(\"Spiel\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "121"
         # Sport
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "61"
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"

src/Jackett.Common/Definitions/datascene.yml

@@ -163,6 +163,8 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 1.0
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,7 +10,7 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.dev/
+  - https://demonoid.unblockit.buzz/
   - https://demonoid.torrentbay.to/
 legacylinks:
   - https://demonoid.unblockit.pro/
@@ -27,6 +27,9 @@ legacylinks:
   - https://demonoid.unblockit.top/
   - https://demonoid.unblockit.lat/
   - https://demonoid.unblockit.app/
+  - https://demonoid.unblockit.dev/
+  - https://demonoid.unblockit.ltd/
+  - https://demonoid.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -183,4 +183,4 @@ search:
         "*": 1
     minimumratio:
       text: 0.4
-# UNIT3D 2.7.0 (Customised)
+# UNIT3D 5.1.0 (Customised)

src/Jackett.Common/Definitions/desitorrents.yml

@@ -1,274 +0,0 @@
----
-id: desitorrents
-name: DesiTorrents
-description: "Desitorrents is a  Private Torrent Tracker for BOLLYWOOD / TOLLYWOOD / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://desitorrents.tv/
-
-caps:
-  categorymappings:
-    # movies
-    - {id: 47, cat: Movies, desc: "Movies/Bollywood"}
-    - {id: 48, cat: Movies, desc: "Movies/Bengali"}
-    - {id: 49, cat: Movies, desc: "Movies/Tamil"}
-    - {id: 51, cat: Movies, desc: "Movies/Punjabi"}
-    - {id: 52, cat: Movies, desc: "Movies/Marathi"}
-    - {id: 53, cat: Movies, desc: "Movies/Malayalam"}
-    - {id: 54, cat: Movies, desc: "Movies/Kannada"}
-    - {id: 55, cat: Movies, desc: "Movies/Gujarati"}
-    - {id: 56, cat: Movies, desc: "Movies/Foreign"}
-    - {id: 57, cat: Movies, desc: "Movies/Lollywood"}
-    - {id: 58, cat: Movies, desc: "Movies/Hollywood"}
-    - {id: 103, cat: Movies, desc: "Movies/Telugu"}
-    - {id: 104, cat: Movies, desc: "Movies/South Dubbed"}
-    - {id: 110, cat: Movies, desc: "Movies/Documentary"}
-    - {id: 117, cat: Movies, desc: "Movies/Bhojpuri"}
-    - {id: 124, cat: Movies, desc: "Movies/Movie Packs"}
-    - {id: 128, cat: Movies, desc: "Movies/Dubbed Audio"}
-    - {id: 129, cat: Movies, desc: "Movies/Animated"}
-    - {id: 140, cat: Movies, desc: "Movies/Short Films"}
-    # tv shows
-    - {id: 59, cat: TV, desc: "TV/Colors"}
-    - {id: 60, cat: TV, desc: "TV/Sony"}
-    - {id: 61, cat: TV, desc: "TV/&TV"}
-    - {id: 62, cat: TV, desc: "TV/StarPlus"}
-    - {id: 63, cat: TV, desc: "TV/ZEE TV"}
-    - {id: 97, cat: TV, desc: "TV/Life OK"}
-    - {id: 98, cat: TV, desc: "TV/Documentary"}
-    - {id: 101, cat: TV/Sport, desc: "TV/Sports"}
-    - {id: 102, cat: TV/Other, desc: "TV/Others"}
-    - {id: 113, cat: TV, desc: "TV/Pak Drama"}
-    - {id: 125, cat: TV, desc: "TV/TV Packs"}
-    - {id: 130, cat: TV, desc: "TV/Star Bharat"}
-    - {id: 132, cat: TV, desc: "TV/Sab TV"}
-    - {id: 139, cat: TV, desc: "TV/Hollywood"}
-    # music
-    - {id: 67, cat: Audio/Video, desc: "Music/Video"}
-    - {id: 68, cat: Audio, desc: "Music/Hindi Soundtrack"}
-    - {id: 70, cat: Audio, desc: "Music/Remix"}
-    - {id: 71, cat: Audio, desc: "Music/Ghazal"}
-    - {id: 72, cat: Audio, desc: "Music/Instrumental"}
-    - {id: 105, cat: Audio, desc: "Music/Telugu"}
-    - {id: 106, cat: Audio, desc: "Music/Tamil"}
-    - {id: 107, cat: Audio, desc: "Music/Punjabi"}
-    - {id: 108, cat: Audio, desc: "Music/Gujarati"}
-    - {id: 109, cat: Audio, desc: "Music/Compilations"}
-    - {id: 118, cat: Audio, desc: "Music/Kannada"}
-    - {id: 126, cat: Audio, desc: "Music/Marathi"}
-    - {id: 127, cat: Audio, desc: "Music/Lollywood"}
-    - {id: 131, cat: Audio, desc: "Music/Classical"}
-    - {id: 134, cat: Audio, desc: "Music/Desi Pop"}
-    - {id: 136, cat: Audio, desc: "Music/Bengali"}
-    - {id: 137, cat: Audio, desc: "Music/Malayalam"}
-    # games
-    - {id: 78, cat: PC/Games, desc: "Games/PC"}
-    - {id: 79, cat: PC/Games, desc: "Games/Mac"}
-    - {id: 80, cat: PC/Games, desc: "Games/IOS"}
-    - {id: 81, cat: PC/Games, desc: "Games/Android"}
-    - {id: 83, cat: PC/Games, desc: "Games/XBOX"}
-    - {id: 86, cat: PC/Games, desc: "Games/Playstation"}
-    # books
-    - {id: 92, cat: Books/Mags, desc: "Books/Magazine"}
-    - {id: 93, cat: Books/EBook, desc: "Books/Novels"}
-    - {id: 95, cat: Books, desc: "Books/Newspapers"}
-    - {id: 133, cat: Audio/Audiobook, desc: "Books/Audiobooks"}
-    # Sport
-    - {id: 114, cat: TV/Sport, desc: "Sport/WWE"}
-    - {id: 115, cat: TV/Sport, desc: "Sport/Cricket"}
-    - {id: 116, cat: TV/Sport, desc: "Sport/Football"}
-    # XXX
-    - {id: 89, cat: XXX, desc: "Adult Videos"}
-    - {id: 90, cat: XXX, desc: "Adult Pics"}
-    # WEB
-    - {id: 135, cat: TV, desc: "Web Series"}
-    # Legact
-    - {id: 30, cat: Other, desc: "Legacy"}
-
-  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: twofa
-    type: text
-    label: 2FA code
-  - name: info_2fa
-    type: info
-    label: "About 2FA code"
-    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the Desitorrents Web Site. Otherwise just leave it empty."
-  - name: sort
-    type: select
-    label: Sort requested from site
-    # while the grabs and date columns are merged due (see #9849), the time sort on the website fails with: "selected sorting wrong: time".
-    # default: time
-    default: relevance
-    options:
-      # time: created
-      seeders: seeders
-      size: size
-      relevance: title
-
-login:
-  path: login.php?from=index1
-  method: post
-  inputs:
-    action: login
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    twofa: "{{ .Config.twofa }}"
-  error:
-    - selector: form#loginform:has(span.warning)
-  test:
-    path: ajax.php
-
-search:
-  paths:
-    - path: ajax.php?action=search_torrent_cats
-      method: post
-  inputs:
-    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
-    search_string: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
-    selected_sorting: "{{ .Config.sort }}"
-    selected_group: ""
-    search_username: ""
-    selected_sub[]: "{{ join .Categories \",\" }}"
-  error:
-    - selector: ":contains(\"Something was wrong with your request\")"
-  preprocessingfilters:
-    - name: replace
-      args: ["{\"torrent_html\":\"", ""]
-    - name: replace
-      args: ["\\", ""]
-    - name: re_replace
-      args: ["\",\"paging.*", ""]
-    - name: re_replace
-      args: ["</th<th>", "</th><th>"] # fix for #9849
-    - name: prepend
-      args: "<table>"
-    - name: append
-      args: "</table>"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: th:first-child
-      case:
-        img[src*="Bollywood Movies.png"]: 47
-        img[src*="Bengali Movies.png"]: 48
-        img[src*="Tamil Films.png"]: 49
-        img[src*="Punjabi Movies.png"]: 51
-        img[src*="Marathi Movies.png"]: 52
-        img[src*="Malayalam Movies.png"]: 53
-        img[src*="Kannada Movies.png"]: 54
-        img[src*="Gujarati Movies.png"]: 55
-        img[src*="Foreign Movies.png"]: 56
-        img[src*="Pakistani Movies.png"]: 57
-        img[src*="Hollywood Movies.png"]: 58
-        img[src*="Telugu Movies.png"]: 103
-        img[src*="south-dubbed.png"]: 104
-        img[src*="docmentary.png"]: 110
-        img[src*="Bhojpuri Movies.png"]: 117
-        img[src*="Movie Packs.png"]: 124
-        img[src*="Dubbed Movies.png"]: 128
-        img[src*="Animated Movies.png"]: 129
-        img[src*="Short Films.png"]: 140
-        img[src*="Colors TV.png"]: 59
-        img[src*="Sony TV.png"]: 60
-        img[src*="AndTV.png"]: 61
-        img[src*="Star Plus.png"]: 62
-        img[src*="Zee TV.png"]: 63
-        img[src*="Life OK.png"]: 97
-        img[src*="Documentaries.png"]: 98
-        img[src*="sports.png"]: 101
-        img[src*="Others-png.png"]: 102
-        img[src*="Pak-Drama.png"]: 113
-        img[src*="TV Packs.png"]: 125
-        img[src*="Star Bharat.png"]: 130
-        img[src*="Sab TV.png"]: 132
-        img[src*="Hollywood TV.png"]: 139
-        img[src*="Music Videos.png"]: 67
-        img[src*="Hindi Soundtracks.png"]: 68
-        img[src*="Remix Music.png"]: 70
-        img[src*="Ghazal Music.png"]: 71
-        img[src*="Instrumental Music.png"]: 72
-        img[src*="Telugu Music.png"]: 105
-        img[src*="Tamil Music.png"]: 106
-        img[src*="Punjabi Music.png"]: 107
-        img[src*="Gujarati Music.png"]: 108
-        img[src*="Music Compilations.png"]: 109
-        img[src*="Kannada Music.png"]: 118
-        img[src*="Marathi Gaane.png"]: 126
-        img[src*="Lollywood Music.png"]: 127
-        img[src*="Classical Music.png"]: 131
-        img[src*="Desi Pop Music.png"]: 134
-        img[src*="Bengali Music.png"]: 136
-        img[src*="Malayalam Music.png"]: 137
-        img[src*="PC Games.png"]: 78
-        img[src*="Mac Games.png"]: 79 # unverified
-        img[src*="IOS Games.png"]: 80 # unverified
-        img[src*="Android Games.png"]: 81
-        img[src*="XBOX Games.png"]: 83 # unverified
-        img[src*="Playstation Games.png"]: 86 # unverified
-        img[src*="Magazines.png"]: 92
-        img[src*="Novels.png"]: 93
-        img[src*="Newspapers.png"]: 95
-        img[src*="AudioBooks.png"]: 133
-        img[src*="WWE.png"]: 114
-        img[src*="Cricket.png"]: 115
-        img[src*="Football.png"]: 116
-        img[src*="Adult Videos.png"]: 89 # unverified
-        img[src*="Adult Pics.png"]: 90 # unverified
-        img[src*="Web Series.png"]: 135
-        img[src*="no.png"]: 30
-    title:
-      selector: a[href^="/torrents.php?id="]
-    details:
-      selector: a[href^="/torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/torrents.php?action=download&id="]
-      attribute: href
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
-    size:
-      selector: th:nth-child(7)
-    files:
-      selector: th:nth-child(8)
-    seeders:
-      selector: th:nth-child(9)
-    leechers:
-      selector: th:nth-child(10)
-    grabs:
-      selector: th:nth-child(11)
-    date:
-      selector: th:nth-child(12)
-      filters:
-        - name: append
-          args: " +00:00" # GMT
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 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/divteam.yml

@@ -12,18 +12,18 @@ caps:
   categorymappings:
     - {id: 60, cat: Movies/HD, desc: "MicroHD 720p"}
     - {id: 77, cat: Movies/HD, desc: "MicroHD 1080p"}
-    - {id: 78, cat: Movies/HD, desc: "MicroHD 4K"}
+    - {id: 78, cat: Movies/UHD, desc: "MicroHD 4K"}
     - {id: 64, cat: TV/HD, desc: "Pack Series"}
     - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"}
-    - {id: 80, cat: Movies/BluRay, desc: "BDRip X265 1080p"}
+    - {id: 80, cat: Movies/HD, desc: "BDRip X265 1080p"}
     - {id: 81, cat: Movies/UHD, desc: "UHDRip x265 4K"}
     - {id: 82, cat: Movies/WEB-DL, desc: "Pelis Web-DL 1080"}
     - {id: 83, cat: Movies/WEB-DL, desc: "Pelis Web-DL 720"}
     - {id: 84, cat: Movies/UHD, desc: "UHD Remux x265"}
     - {id: 91, cat: Movies/HD, desc: "BDRip x264"}
     - {id: 89, cat: Movies/HD, desc: "BDRemux"}
-    - {id: 88, cat: Movies/HD, desc: "Full HD"}
-    - {id: 90, cat: Movies/UHD, desc: "UHD Full"}
+    - {id: 88, cat: Movies/BluRay, desc: "Full HD"}
+    - {id: 90, cat: Movies/BluRay, desc: "UHD Full"}
     - {id: 23, cat: TV/Sport, desc: "Deportes"}
     - {id: 20, cat: TV/HD, desc: "Series"}
     - {id: 31, cat: TV/HD, desc: "Series VOSE"}
@@ -38,11 +38,11 @@ caps:
     - {id: 76, cat: Movies, desc: "x-men saga"}
     - {id: 85, cat: Movies, desc: "Sean Connery"}
     - {id: 6, cat: Books/EBook, desc: "EBooks"}
-    - {id: 58, cat: Books/EBook, desc: "Kiosko"}
+    - {id: 58, cat: Books/Mags, desc: "Kiosko"}
     - {id: 24, cat: TV/Documentary, desc: "Documentales"}
     - {id: 32, cat: TV/Documentary, desc: "Documentales VOSE"}
-    - {id: 49, cat: Books/EBook, desc: "eLearning"}
-    - {id: 68, cat: Books/EBook, desc: "eLearning Multimedia"}
+    - {id: 49, cat: Books/Technical, desc: "eLearning"}
+    - {id: 68, cat: Books/Technical, desc: "eLearning Multimedia"}
     - {id: 87, cat: Audio/Audiobook, desc: "Audiolibros"}
 
   modes:
@@ -125,16 +125,16 @@ search:
       selector: a[href^="index.php?page=torrent-details"][onmouseover]:not(:contains("VOSE"))
       optional: true
       filters:
-        - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
         - name: append
-          args: ".Spanish-DivTeam"
+          args: " MULTi/SPANiSH" # DivTeam doesn't bring languages. Usually Original + Spanish.
         - name: re_replace
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
-        - name: re_replace
-          args: ["UHDRip", "BDRip"] # Fix for Radarr
+        - name: replace
+          args: ["UHDRip", "Bluray-2160p"] # Fix for Radarr
+        - name: replace
+          args: ["2160p BDRip", "Bluray-2160p"] # Fix for Radarr
     poster:
       selector: a[onmouseover][href^="index.php?page=torrent-details"]
       attribute: onmouseover

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

@@ -44,6 +44,7 @@ caps:
     - {id: 276, cat: Audio/Audiobook, desc: "Audio: Military Fiction"}
     - {id: 299, cat: Audio/Audiobook, desc: "Audio: Magazines"}
     - {id: 301, cat: Audio/Audiobook, desc: "Audio: Collections"}
+    - {id: 314, cat: Audio/Audiobook, desc: "Audio: Dystopian/Post Apocalyptic Bks"}
     - {id: 47, cat: Books/EBook, desc: "Children's: Adventure"}
     - {id: 48, cat: Books/EBook, desc: "Children's: Novels"}
     - {id: 49, cat: Books/EBook, desc: "Children's: Collections"}

src/Jackett.Common/Definitions/empornium.yml

@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
   - https://www.empornium.me/
 
 caps:

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
   - https://www.empornium.me/
 
 caps:

src/Jackett.Common/Definitions/eniahd.yml

@@ -6,6 +6,8 @@ language: ru-ru
 type: semi-private
 encoding: UTF-8
 links:
+  - https://eniatv.com/
+legacylinks:
   - https://eniahd.com/
 
 caps:
@@ -16,6 +18,25 @@ caps:
     - {id: 12, cat: Movies, desc: "Наше кино"}
     # TV
     - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+    - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}
+    - {id: 52, cat: TV/HD, desc: "Блудный сын / Prodigal Son"}
+    - {id: 49, cat: TV/HD, desc: "Пенниуорт / Pennyworth"}
+    - {id: 62, cat: TV/HD, desc: "Черный список / The Blacklist"}
+    - {id: 64, cat: TV/HD, desc: "Игра престолов / Game of Thrones"}
+    - {id: 59, cat: TV/HD, desc: "Американская история ужасов / American Horror Story"}
+    - {id: 60, cat: TV/HD, desc: "Хороший доктор / The Good Doctor"}
+    - {id: 54, cat: TV/HD, desc: "Рэй Донован / Ray Donovan"}
+    - {id: 55, cat: TV/HD, desc: "Сверхъестественное / Supernatural"}
+    - {id: 56, cat: TV/HD, desc: "Сквозь снег / Snowpiercer"}
+    - {id: 57, cat: TV/HD, desc: "Теория большого взрыва / The Big Bang Theory"}
+    - {id: 58, cat: TV/HD, desc: "Миллиарды / Billions"}
+    - {id: 53, cat: TV/HD, desc: "Родина / Homeland"}
+    - {id: 51, cat: TV/HD, desc: "Новобранец / The Rookie"}
+    - {id: 50, cat: TV/HD, desc: "Это мы / This Is Us"}
+    - {id: 48, cat: TV/HD, desc: "Бэтвумен / Batwoman"}
+    - {id: 32, cat: TV/HD, desc: "Кости / Bones"}
+    - {id: 31, cat: TV/HD, desc: "Американские боги / American Gods"}
+    - {id: 30, cat: TV/HD, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
     - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
     - {id: 22, cat: TV, desc: "Зарубежные сериалы HEVC"}
     - {id: 3, cat: TV, desc: "Зарубежные сериалы"}
@@ -28,6 +49,8 @@ caps:
     - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
     - {id: 21, cat: TV/Documentary, desc: "Документальные"}
     - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+    # Private Forums
+    - {id: 47, cat: TV/HD, desc: "Рассказ служанки / The Handmaid's Tale"}
     # Miscellaneous
     - {id: 8, cat: Other, desc: "Разное (раздачи)"}
 

src/Jackett.Common/Definitions/epizod.yml

@@ -15,7 +15,9 @@ caps:
     - {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:
@@ -154,7 +156,7 @@ search:
         - name: dateparse
           args: "2006-01-02 15:04:05-07:00"
     size:
-      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if 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 \"films\" }}2 GB{{ else }}{{ end }}"
+      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:

src/Jackett.Common/Definitions/ettv.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.dev/
+  - https://ettv.unblockit.buzz/
   - https://ettv.unblocked.monster/
 legacylinks:
   - https://www.ettv.tv/
@@ -35,6 +35,9 @@ legacylinks:
   - https://ettv.unblockit.lat/
   - https://ettv.unblockit.app/
   - https://ettv.unblocked.rest/
+  - https://ettv.unblockit.dev/
+  - https://ettv.unblockit.ltd/
+  - https://ettv.unblockit.link/
 
 caps:
   categorymappings:

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

@@ -1,7 +1,7 @@
 ---
 id: extratorrent-cd
 name: ExtraTorrent.cd
-description: "ExtraTorrent.cd is a Public tracker, a  popular alternative to the original ET site, providing Movie / TV / General magnets"
+description: "ExtraTorrent.cd is a Public tracker for MOVIE / TV / GENERAL magnets"
 language: en-us
 type: public
 encoding: UTF-8
@@ -13,8 +13,15 @@ legacylinks:
   - https://extratorrent.unblockit.one/ # for .ag
 
 caps:
-  categories:
-    Other: Other
+  categorymappings:
+    - {id: Movies, cat: Movies, desc: "Movies"}
+    - {id: Video, cat: Movies, desc: "Movies"}
+    - {id: TV, cat: TV, desc: "TV"}
+    - {id: Music, cat: Audio, desc: "Music"}
+    - {id: Porn, cat: XXX, desc: "Adult / Porn"}
+    - {id: Software, cat: PC, desc: "Software"}
+    - {id: Games, cat: Console, desc: "Games"}
+    - {id: Other, cat: Other/Misc, desc: "Other"}
 
   modes:
     search: [q]
@@ -23,15 +30,14 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings:
-  - name: info_8000
-    type: info
-    label: About ExtraTorrent Categories
-    default: ExtraTorrent does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+settings: []
 
 search:
   paths:
-    - path: "search/?search={{ .Keywords }}"
+    # 30 rows per page
+    - path: "search/?search={{ .Keywords }}&srt=added&order=desc"
+    - path: "search/?page=2&search={{ .Keywords }}&srt=added&order=desc"
+    - path: "search/?page=3&search={{ .Keywords }}&srt=added&order=desc"
   keywordsfilters:
     - name: re_replace
       args: ["[\\s]+", "."]
@@ -44,7 +50,7 @@ search:
 
   fields:
     category:
-      text: Other
+      selector: span.c_tor > a
     title:
       selector: a[href*="/torrent/"][title^="view"]
     details:

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

@@ -7,11 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrents.it/
-  - https://extratorrent.unblockit.dev/
-  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.buzz/
 legacylinks:
   - https://extratorrent.ag/
   - https://extratorrent.unblockit.app/
+  - https://extratorrent.unblockit.dev/
+  - https://extratorrent.unblockit.ltd/
+  - https://extratorrent.unblockit.link/
+  - https://extratorrent2.unblockninja.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
+    tv-search: [q]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -104,6 +104,15 @@ search:
           args: cat
     title:
       selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+        - name: re_replace
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+        - name: re_replace
+          args: ["(?i)compleet", "Complete"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/exttorrents.yml

@@ -46,6 +46,7 @@ caps:
     - {id: "/movies/dvd/", cat: Movies/DVD, desc: "Movies DVD"}
     - {id: "/movies/highres-movies/", cat: Movies/HD, desc: "Movies Highres"}
     - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
+    - {id: "/movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
     - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
     - {id: "/music/", cat: Audio, desc: Music}
     - {id: "/music/aac/", cat: Audio, desc: "Music AAC"}
@@ -61,6 +62,7 @@ caps:
     - {id: "/xxx/magazines/", cat: XXX/Other, desc: "XXX Magazines"}
     - {id: "/xxx/pictures/", cat: XXX/ImageSet, desc: "XXX Pictures"}
     - {id: "/xxx/video/", cat: XXX, desc: "XXX Video"}
+    - {id: "/video/", cat: XXX, desc: "XXX Video"}
 
   modes:
     search: [q]
@@ -101,6 +103,10 @@ search:
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/3/&{{ else }}latest/3/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
     - path: "{{ if .Keywords }}search/?q={{ .Keywords }}/4/&{{ else }}latest/4/?{{ end }}order={{ .Config.sort }}&sort={{ .Config.type }}"
 
+  headers:
+    # site presents hcaptcha challenge for Jackett's User-Agent, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
+    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
+
   rows:
     selector: table.table-striped > tbody > tr
 

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.dev/
+  - https://eztv.unblockit.buzz/
   - https://eztv.unblocked.monster/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -38,6 +38,9 @@ legacylinks:
   - https://eztv.unblockit.app/
   - https://eztv.root.yt/
   - https://eztv.unblocked.rest/
+  - https://eztv.unblockit.dev/
+  - https://eztv.unblockit.ltd/
+  - https://eztv.unblockit.link/
 
 caps:
   categories:

src/Jackett.Common/Definitions/feedurneed.yml

@@ -0,0 +1,208 @@
+---
+id: feedurneed
+name: FeedUrNeed
+description: "FeedUrNeed (FuN) is a Private Torrent Tracker for MOVIES / TV / General"
+language: en-us
+type: private
+encoding: utf-8
+links:
+  - https://feedurneed.xyz/
+
+caps:
+  categorymappings:
+    - {id: 12, cat: TV/Anime, desc: Anime}
+    - {id: 82, cat: PC/0day, desc: Apps/0day}
+    - {id: 1, cat: PC/ISO, desc: Apps/ISO}
+    - {id: 63, cat: Audio/Audiobook, desc: Audiobooks}
+    - {id: 66, cat: Console/Other, desc: Console/NSW}
+    - {id: 67, cat: Console/PS4, desc: Console/PS4}
+    - {id: 68, cat: Console/Other, desc: Console/PS5}
+    - {id: 24, cat: Books/EBook, desc: E-Books}
+    - {id: 64, cat: PC/Games, desc: Games/ISO}
+    - {id: 65, cat: PC/Games, desc: Games/Rips}
+    - {id: 28, cat: Movies/3D, desc: Movies/3D}
+    - {id: 30, cat: Movies, desc: Movies/Cam-TS}
+    - {id: 15, cat: Movies/DVD, desc: Movies/DVDR}
+    - {id: 58, cat: Movies/Foreign, desc: Movies/DVDR-Foreign}
+    - {id: 31, cat: Movies, desc: Movies/FooKaS RG}
+    - {id: 70, cat: Movies/BluRay, desc: Movies/HD-Blu-Ray}
+    - {id: 60, cat: Movies/HD, desc: Movies/HD-Foreign}
+    - {id: 18, cat: Movies/HD, desc: Movies/HD-Retail-X264}
+    - {id: 56, cat: Movies/HD, desc: Movies/HD-Retail-X265}
+    - {id: 55, cat: Movies/WEB-DL, desc: Movies/HD-Web}
+    - {id: 23, cat: Movies/BluRay, desc: Movies/Remuxes}
+    - {id: 59, cat: Movies/Foreign, desc: Movies/SD-Foreign}
+    - {id: 74, cat: Movies/WEB-DL, desc: Movies/SD-Web}
+    - {id: 72, cat: Movies/SD, desc: Movies/SD-X264}
+    - {id: 13, cat: Movies/SD, desc: Movies/SD-XviD}
+    - {id: 71, cat: Movies/BluRay, desc: Movies/UHD-Blu-Ray}
+    - {id: 78, cat: Movies/Foreign, desc: Movies/UHD-Foreign}
+    - {id: 57, cat: Movies/UHD, desc: Movies/UHD-Retail}
+    - {id: 69, cat: Movies/WEB-DL, desc: Movies/UHD-Web}
+    - {id: 26, cat: Audio/Lossless, desc: Music/FLAC}
+    - {id: 10, cat: Audio/MP3, desc: Music/MP3}
+    - {id: 43, cat: Audio/Video, desc: Music/Mvids}
+    - {id: 29, cat: Movies, desc: Packs/Movies}
+    - {id: 19, cat: Audio/MP3, desc: Packs/MP3}
+    - {id: 62, cat: TV/HD, desc: Packs/TV-HD}
+    - {id: 61, cat: TV/SD, desc: Packs/TV-SD}
+    - {id: 76, cat: TV/HD, desc: TV/Blu-Ray}
+    - {id: 81, cat: TV/SD, desc: TV/DVDR}
+    - {id: 77, cat: TV/Foreign, desc: TV/Foreign}
+    - {id: 45, cat: TV/HD, desc: TV/HD}
+    - {id: 80, cat: TV/HD, desc: TV/HD-Retail}
+    - {id: 36, cat: TV/SD, desc: TV/SD}
+    - {id: 79, cat: TV/SD, desc: TV/SD-Retail}
+    - {id: 73, cat: TV/Sport, desc: TV/Sports}
+    - {id: 75, cat: TV/UHD, desc: TV/UHD}
+    - {id: 17, 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: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>25</i>.
+  - name: info_pm
+    type: info
+    label: Force Read PM
+    default: To prevent being redirected to the mailbox when you have unread PMs, the setting <b>Force read pm:</b> should be set to <b>No</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.embedded:has(h2:contains("failed"))
+  test:
+    path: index.php
+    selector: a[href*="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered > tbody > tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[onmouseover][href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=\\\\'(.*?)\\\\'"
+        - name: replace
+          args: ["./pic/noposter.png", ""]
+    imdb:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "(\\d{6,8})"
+        - name: prepend
+          args: "tt"
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: a[href^="snatches.php?id="]
+      filters:
+        - name: replace
+          args: ["Times", ""]
+    downloadvolumefactor:
+      case:
+        "a.info:contains(\"FREE\")": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "a.info:contains(\"Double\")": 2
+        "*": 1
+    date:
+      selector: td:nth-child(7):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(7):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 pm +00:00"
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
+      # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
+      case:
+        "a.info:contains(\"FREE\")": 172800
+        "*": 129600
+# U-232 V5

src/Jackett.Common/Definitions/film-paleis.yml

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
@@ -95,6 +95,8 @@ search:
     title:
       selector: a[href^="details.php?id="]
       filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
         - name: re_replace
           args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
         - name: re_replace

src/Jackett.Common/Definitions/firebit.yml

@@ -8,8 +8,6 @@ encoding: UTF-8
 links:
   - https://firebit.net/
   - https://firebit.info/
-  - https://firebit.pro/
-  - https://firebit.club/
 legacylinks:
   - https://firebit.name/
   - https://firebit.biz/
@@ -19,6 +17,8 @@ legacylinks:
   - http://firebit.pro/
   - http://firebit.club/
   - http://firebit.biz/
+  - https://firebit.pro/
+  - https://firebit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/focusx.yml

@@ -10,152 +10,156 @@ links:
 
 caps:
   categorymappings:
-    - {id: 111, cat: Movies, desc: "1922"}
-    - {id: 135, cat: Movies, desc: "Анон"}
-    - {id: 213, cat: Movies, desc: "Борат 2"}
-    - {id: 206, cat: Movies, desc: "Брачная история"}
-    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
-    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
-    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
-    - {id: 65, cat: Movies, desc: "В твоих глазах"}
-    - {id: 74, cat: Movies, desc: "Варкрафт"}
-    - {id: 202, cat: Movies, desc: "Визит инспектора"}
-    - {id: 83, cat: Movies, desc: "Возмущение"}
-    - {id: 168, cat: Movies, desc: "Воспитательница"}
-    - {id: 46, cat: Movies, desc: "Высотка"}
-    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
-    - {id: 90, cat: Movies, desc: "Дангал"}
-    - {id: 189, cat: Movies, desc: "Дедвуд"}
-    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
-    - {id: 19, cat: Movies, desc: "Заброшенный"}
-    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
-    - {id: 64, cat: Movies, desc: "Зоотопия"}
-    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
-    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
-    - {id: 61, cat: Movies, desc: "Комета"}
-    - {id: 18, cat: Movies, desc: "Копенгаген"}
-    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
-    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
-    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 9, cat: TV, desc: "Иерихон"}
     - {id: 10, cat: Movies, desc: "Мёд в голове"}
-    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
-    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
-    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
-    - {id: 54, cat: Movies, desc: "Охотник: Война Зимы"}
+    - {id: 11, cat: TV, desc: "11-22-63"}
+    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
+    - {id: 13, cat: TV, desc: "Смерть в раю"}
+    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
+    - {id: 15, cat: TV, desc: "Чёрные паруса"}
+    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 17, cat: TV, desc: "Карточный домик"}
+    - {id: 18, cat: Movies, desc: "Копенгаген"}
+    - {id: 19, cat: Movies, desc: "Заброшенный"}
+    - {id: 37, cat: TV, desc: "Джек Айриш"}
+    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
+    - {id: 39, cat: TV, desc: "Чужестранка"}
+    - {id: 40, cat: TV, desc: "Девушка по вызову"}
+    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
+    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
+    - {id: 43, cat: TV, desc: "Игра престолов"}
+    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
     - {id: 45, cat: Movies, desc: "Падение Лондона"}
-    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
-    - {id: 57, cat: Movies, desc: "Портниха"}
-    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
-    - {id: 70, cat: Movies, desc: "Припаркованные"}
-    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 46, cat: Movies, desc: "Высотка"}
+    - {id: 47, cat: TV, desc: "Острые козырьки"}
+    - {id: 48, cat: TV, desc: "Странная парочка"}
+    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
     - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
-    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 51, cat: TV, desc: "Проповедник"}
+    - {id: 52, cat: TV, desc: "Изгой"}
+    - {id: 53, cat: TV, desc: "Рэй Донован"}
+    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
+    - {id: 56, cat: TV, desc: "Бесстыдники"}
+    - {id: 57, cat: Movies, desc: "Портниха"}
+    - {id: 58, cat: TV, desc: "Мистер Робот"}
+    - {id: 59, cat: TV, desc: "Валландер"}
+    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
+    - {id: 61, cat: Movies, desc: "Комета"}
+    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 63, cat: TV, desc: "Куорри"}
+    - {id: 64, cat: Movies, desc: "Зоотопия"}
+    - {id: 65, cat: Movies, desc: "В твоих глазах"}
+    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
+    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
+    - {id: 68, cat: TV, desc: "Бесстыжие"}
+    - {id: 69, cat: TV, desc: "Нарко"}
+    - {id: 70, cat: Movies, desc: "Припаркованные"}
+    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
+    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
+    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
+    - {id: 74, cat: Movies, desc: "Варкрафт"}
+    - {id: 75, cat: TV, desc: "Все схвачено"}
+    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
+    - {id: 77, cat: TV, desc: "Граница"}
+    - {id: 79, cat: TV, desc: "Бош"}
+    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 81, cat: TV, desc: "Викинги"}
+    - {id: 82, cat: TV, desc: "Салем"}
+    - {id: 83, cat: Movies, desc: "Возмущение"}
     - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
     - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
-    - {id: 11, cat: TV, desc: "11-22-63"}
-    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
-    - {id: 119, cat: TV, desc: "Алиенист"}
-    - {id: 122, cat: TV, desc: "Американская история преступлений"}
-    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
-    - {id: 115, cat: TV, desc: "Безбожники"}
-    - {id: 141, cat: TV, desc: "Безопасность"}
-    - {id: 124, cat: TV, desc: "Бельвью"}
-    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
-    - {id: 56, cat: TV, desc: "Бесстыдники"}
-    - {id: 68, cat: TV, desc: "Бесстыжие"}
-    - {id: 79, cat: TV, desc: "Бош"}
-    - {id: 138, cat: TV, desc: "В пустыне смерти"}
-    - {id: 59, cat: TV, desc: "Валландер"}
-    - {id: 204, cat: TV, desc: "Ведьмак"}
-    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
-    - {id: 129, cat: TV, desc: "Взлет"}
-    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
-    - {id: 81, cat: TV, desc: "Викинги"}
-    - {id: 164, cat: TV, desc: "Возвращение домой"}
-    - {id: 75, cat: TV, desc: "Все схвачено"}
-    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
-    - {id: 144, cat: TV, desc: "Голиаф"}
-    - {id: 77, cat: TV, desc: "Граница"}
-    - {id: 167, cat: TV, desc: "Грязный Джон"}
-    - {id: 96, cat: TV, desc: "Двойка"}
-    - {id: 40, cat: TV, desc: "Девушка по вызову"}
-    - {id: 37, cat: TV, desc: "Джек Айриш"}
-    - {id: 156, cat: TV, desc: "Джек Райан"}
-    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
-    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
-    - {id: 139, cat: TV, desc: "Дождь"}
-    - {id: 184, cat: TV, desc: "Доктор Блейк"}
-    - {id: 197, cat: TV, desc: "Западное крыло"}
-    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
-    - {id: 43, cat: TV, desc: "Игра престолов"}
-    - {id: 9, cat: TV, desc: "Иерихон"}
-    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
-    - {id: 186, cat: TV, desc: "Изгнание"}
-    - {id: 52, cat: TV, desc: "Изгой"}
-    - {id: 162, cat: TV, desc: "Изнанка дела"}
-    - {id: 130, cat: TV, desc: "Инстинкт"}
-    - {id: 175, cat: TV, desc: "Каратель"}
-    - {id: 17, cat: TV, desc: "Карточный домик"}
-    - {id: 203, cat: TV, desc: "Книга Рабов"}
-    - {id: 190, cat: TV, desc: "Кобра Кай"}
-    - {id: 147, cat: TV, desc: "Королева Сахара"}
     - {id: 86, cat: TV, desc: "Кровавая Гонка"}
-    - {id: 187, cat: TV, desc: "Крупный Город"}
-    - {id: 63, cat: TV, desc: "Куорри"}
-    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
-    - {id: 176, cat: TV, desc: "Матрёшка"}
-    - {id: 165, cat: TV, desc: "Метод Комински"}
-    - {id: 89, cat: TV, desc: "Миднайт Техас"}
-    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
-    - {id: 182, cat: TV, desc: "Мистер Посредник"}
-    - {id: 58, cat: TV, desc: "Мистер Робот"}
-    - {id: 69, cat: TV, desc: "Нарко"}
-    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
-    - {id: 155, cat: TV, desc: "Наследники"}
-    - {id: 106, cat: TV, desc: "Одаренные"}
-    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
-    - {id: 120, cat: TV, desc: "Ординатор"}
-    - {id: 47, cat: TV, desc: "Острые козырьки"}
-    - {id: 118, cat: TV, desc: "Охотник за разумом"}
-    - {id: 173, cat: TV, desc: "Парфюм"}
-    - {id: 143, cat: TV, desc: "Подлый пит"}
-    - {id: 179, cat: TV, desc: "Половое Просвещение"}
-    - {id: 110, cat: TV, desc: "Порох"}
-    - {id: 51, cat: TV, desc: "Проповедник"}
-    - {id: 169, cat: TV, desc: "Романовы"}
-    - {id: 53, cat: TV, desc: "Рэй Донован"}
-    - {id: 82, cat: TV, desc: "Салем"}
-    - {id: 116, cat: TV, desc: "Секретные Материалы"}
-    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
     - {id: 87, cat: TV, desc: "Сеньор Авила"}
-    - {id: 100, cat: TV, desc: "Смертельное оружие"}
-    - {id: 172, cat: TV, desc: "Смертельный класс"}
-    - {id: 13, cat: TV, desc: "Смерть в раю"}
-    - {id: 181, cat: TV, desc: "Сорвиголова"}
-    - {id: 185, cat: TV, desc: "Стальная Звезда"}
-    - {id: 131, cat: TV, desc: "Стартап"}
-    - {id: 140, cat: TV, desc: "Страйк"}
-    - {id: 170, cat: TV, desc: "Страна приливов"}
-    - {id: 48, cat: TV, desc: "Странная парочка"}
     - {id: 88, cat: TV, desc: "Стрелок"}
-    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
-    - {id: 112, cat: TV, desc: "Субура"}
-    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
-    - {id: 133, cat: TV, desc: "Террор"}
-    - {id: 97, cat: TV, desc: "Тик-герой"}
-    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 89, cat: TV, desc: "Миднайт Техас"}
+    - {id: 90, cat: Movies, desc: "Дангал"}
     - {id: 91, cat: TV, desc: "Утиные Истории"}
-    - {id: 121, cat: TV, desc: "Уэйко"}
-    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 96, cat: TV, desc: "Двойка"}
+    - {id: 97, cat: TV, desc: "Тик-герой"}
+    - {id: 100, cat: TV, desc: "Смертельное оружие"}
+    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
+    - {id: 102, cat: TV, desc: "Черный Список"}
+    - {id: 106, cat: TV, desc: "Одаренные"}
+    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
     - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
     - {id: 109, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 110, cat: TV, desc: "Порох"}
+    - {id: 111, cat: Movies, desc: "1922"}
+    - {id: 112, cat: TV, desc: "Субура"}
+    - {id: 115, cat: TV, desc: "Безбожники"}
+    - {id: 116, cat: TV, desc: "Секретные Материалы"}
+    - {id: 118, cat: TV, desc: "Охотник за разумом"}
+    - {id: 119, cat: TV, desc: "Алиенист"}
+    - {id: 120, cat: TV, desc: "Ординатор"}
+    - {id: 121, cat: TV, desc: "Уэйко"}
+    - {id: 122, cat: TV, desc: "Американская история преступлений"}
+    - {id: 124, cat: TV, desc: "Бельвью"}
+    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
+    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
+    - {id: 129, cat: TV, desc: "Взлет"}
+    - {id: 130, cat: TV, desc: "Инстинкт"}
+    - {id: 131, cat: TV, desc: "Стартап"}
+    - {id: 133, cat: TV, desc: "Террор"}
+    - {id: 135, cat: Movies, desc: "Анон"}
+    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
+    - {id: 138, cat: TV, desc: "В пустыне смерти"}
+    - {id: 139, cat: TV, desc: "Дождь"}
+    - {id: 140, cat: TV, desc: "Страйк"}
+    - {id: 141, cat: TV, desc: "Безопасность"}
+    - {id: 143, cat: TV, desc: "Подлый пит"}
+    - {id: 144, cat: TV, desc: "Голиаф"}
+    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
+    - {id: 147, cat: TV, desc: "Королева Сахара"}
+    - {id: 155, cat: TV, desc: "Наследники"}
+    - {id: 156, cat: TV, desc: "Джек Райан"}
+    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
     - {id: 161, cat: TV, desc: "Частные сыщики"}
-    - {id: 15, cat: TV, desc: "Чёрные паруса"}
-    - {id: 102, cat: TV, desc: "Черный Список"}
-    - {id: 39, cat: TV, desc: "Чужестранка"}
-    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 162, cat: TV, desc: "Изнанка дела"}
+    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
+    - {id: 164, cat: TV, desc: "Возвращение домой"}
+    - {id: 165, cat: TV, desc: "Метод Комински"}
     - {id: 166, cat: TV, desc: "Элита"}
+    - {id: 167, cat: TV, desc: "Грязный Джон"}
+    - {id: 168, cat: Movies, desc: "Воспитательница"}
+    - {id: 169, cat: TV, desc: "Романовы"}
+    - {id: 170, cat: TV, desc: "Страна приливов"}
+    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 172, cat: TV, desc: "Смертельный класс"}
+    - {id: 173, cat: TV, desc: "Парфюм"}
+    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 175, cat: TV, desc: "Каратель"}
+    - {id: 176, cat: TV, desc: "Матрёшка"}
+    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
+    - {id: 179, cat: TV, desc: "Половое Просвещение"}
+    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
+    - {id: 181, cat: TV, desc: "Сорвиголова"}
+    - {id: 182, cat: TV, desc: "Мистер Посредник"}
+    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 184, cat: TV, desc: "Доктор Блейк"}
+    - {id: 185, cat: TV, desc: "Стальная Звезда"}
+    - {id: 186, cat: TV, desc: "Изгнание"}
+    - {id: 187, cat: TV, desc: "Крупный Город"}
+    - {id: 189, cat: Movies, desc: "Дедвуд"}
+    - {id: 190, cat: TV, desc: "Кобра Кай"}
+    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
+    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 197, cat: TV, desc: "Западное крыло"}
+    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
+    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
+    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
+    - {id: 202, cat: Movies, desc: "Визит инспектора"}
+    - {id: 203, cat: TV, desc: "Книга Рабов"}
+    - {id: 204, cat: TV, desc: "Ведьмак"}
+    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
+    - {id: 206, cat: Movies, desc: "Брачная история"}
+    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
+    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
+    - {id: 213, cat: Movies, desc: "Борат 2"}
+    - {id: 222, cat: Movies, desc: "Траффик"}
+    - {id: 223, cat: Movies, desc: "На колёсах"}
+    - {id: 224, cat: Movies, desc: "Чудо в камере №7"}
+    - {id: 227, cat: Movies, desc: "Сначала убили моего отца"}
+    - {id: 228, cat: Movies, desc: "Айла: Дочь войны"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/fouducinema.yml

@@ -11,6 +11,10 @@ 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: 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"}
@@ -18,15 +22,17 @@ caps:
     - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
     - {id: 79, cat: Movies/HD, desc: "Animation Film"}
     - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
+    - {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: 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 Web"}
-    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
+    - {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: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
+    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
     - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
     - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
     - {id: 60, cat: TV/Other, desc: "Serie Divers"}
@@ -152,6 +158,10 @@ search:
       selector: div.kat_cat_pic
       filters:
       case:
+        ":contains(\"sport\"):contains(\"catch\")": 94
+        ":contains(\"sport\"):contains(\"catch\")": 93
+        ":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
@@ -159,15 +169,17 @@ search:
         ":contains(\"Animation\"):contains(\"Séries\")": 81
         ":contains(\"Animation\"):contains(\"Film\")": 79
         ":contains(\"Film\"):contains(\"DVDRip\")": 2
+        ":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(\"Divers\")": 59
         ":contains(\"Film\"):contains(\"720P\")": 19
         ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"Web\")": 16
+        ":contains(\"Film\"):contains(\"Webrip\")": 16
         ":contains(\"Film\"):contains(\"Bluray\")": 15
         ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
+        ":contains(\"Film\"):contains(\"UHD\")": 86
         ":contains(\"Serie\"):contains(\"1080P\")": 46
         ":contains(\"Serie\"):contains(\"Bluray\")": 48
         ":contains(\"Serie\"):contains(\"Divers\")": 60

src/Jackett.Common/Definitions/fullmixmusic.yml

@@ -1,89 +0,0 @@
----
-id: fullmixmusic
-name: FullMixMusic
-description: "FullMixMusic is a HUNGARIAN Private Torrent Tracker for MUSIC"
-language: hu-hu
-type: private
-encoding: UTF-8
-links:
-  - https://fullmixmusic.org/
-legacylinks:
-  - http://fullmixmusic.org/
-
-caps:
-  categories:
-    1: Audio
-
-  modes:
-    search: [q]
-    music-search: [q, artist]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("Művelet!")
-  test:
-    path: browse.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}"
-    showsearch: 1
-    incldead: 1
-
-  rows:
-    selector: table.tablak > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: a[href^="details.php?id="][title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: ^(.*?)<br />
-    details:
-      selector: a[href^="details.php?id="][title]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="][title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: "src=\"(.*?)\">"
-    description:
-      selector: td:nth-child(2) > i > font
-    date:
-      selector: td:nth-child(6)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td:nth-child(7)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    grabs:
-      selector: td:nth-child(10)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      case:
-        font[title^="Dupla feltöltésű torrent!"]: 2
-        font[title^="x3 feltöltésű torrent!"]: 3
-        font[title^="x4 feltöltésű torrent!"]: 4
-        "*": 1
-# engine tbd

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -95,8 +95,9 @@ caps:
     book-search: [q]
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"

src/Jackett.Common/Definitions/gigatorrents.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 81, cat: TV/SD, desc: "Sorozat/SD-x264/Hun"}
+    - {id: 91, cat: Movies/UHD, desc: "4K Blu-Ray"}
     - {id: 62, cat: Movies/BluRay, desc: "Bluray Disc"}
     - {id: 80, cat: Movies/SD, desc: "CAM/Eng"}
     - {id: 79, cat: Movies/SD, desc: "CAM/Hun"}
@@ -39,6 +39,7 @@ caps:
     - {id: 85, cat: TV/HD, desc: "Sorozat HD/Eng"}
     - {id: 84, cat: TV/HD, desc: "Sorozat HD/Hun"}
     - {id: 8, cat: TV/SD, desc: "Sorozat/SD-x264/Eng"}
+    - {id: 81, cat: TV/SD, desc: "Sorozat/SD-x264/Hun"}
     - {id: 83, cat: TV/SD, desc: "Sorozat/SD-Xvid/Eng"}
     - {id: 7, cat: TV/SD, desc: "Sorozat/SD-Xvid/Hun"}
     - {id: 46, cat: XXX, desc: "XXX"}

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://vww.gktorrent.pw/
+  - https://www.gktorrent.cc/
 legacylinks:
   - https://www.gktorrent.com/
   - http://www.gktorrent.com/
@@ -30,6 +30,7 @@ legacylinks:
   - https://www.gktorrent.io/
   - https://www.gktorrent.pw/
   - https://wvw.gktorrent.pw/
+  - https://vww.gktorrent.pw/
 
 caps:
   categorymappings:
@@ -85,7 +86,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a)
+    selector: table.table-hover > tbody > tr:has(a[href*=torrent])
 
   fields:
     category:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.dev/
+  - https://glotorrents.unblockit.buzz/
   - https://glodls.unblocked.monster/
 legacylinks:
   - https://glodls.rocks/
@@ -32,6 +32,9 @@ legacylinks:
   - https://glotorrents.unblockit.lat/
   - https://glotorrents.unblockit.app/
   - https://glodls.unblocked.rest/
+  - https://glotorrents.unblockit.dev/
+  - https://glotorrents.unblockit.ltd/
+  - https://glotorrents.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gtorrent.yml

@@ -10,7 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Other, desc: "Other"}
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
 
   modes:
     search: [q]
@@ -40,7 +45,11 @@ search:
 
   fields:
     category:
-      text: 1
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
     title:
       selector: div.name
     details:

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -0,0 +1,73 @@
+---
+id: gtorrentpro
+name: GTorrent.pro
+description: "GTorrent.pro is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-ru
+type: public
+encoding: windows-1251
+links:
+  - http://gtorrent.pro/
+
+caps:
+  categorymappings:
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selector: a[href^="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.blog_brief_news:not(div.first_line):not(:has(div.uploaded:empty))
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: div.name
+    details:
+      selector: div.name a
+      attribute: href
+    download:
+      selector: div.name a
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: div:nth-child(2)
+    seeders:
+      selector: div.uploaded
+    leechers:
+      selector: div.download
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/haidan.yml

@@ -104,7 +104,7 @@ search:
     # supports search using imdbid, does not return imdb links in results
 
   rows:
-    selector: div.group_content
+    selector: div.group_content:has(a[href^="download.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/hdatmos.yml

@@ -1,32 +1,33 @@
 ---
-id: hdstreet
-name: HDStreet
-description: "HDStreet is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+id: hdatmos
+name: HDAtmos
+description: "HDAtmos is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: zh-cn
 type: private
 encoding: UTF-8
 links:
-  - https://hdstreet.club/
+  - https://hdatmos.club/
+
 caps:
   categorymappings:
-    - {id: 401, cat: Movies, desc: "Movies(D)/华语电影", default: true}
-    - {id: 403, cat: Movies, desc: "Movies(F)/外语电影", default: true}
-    - {id: 402, cat: TV, desc: "TV Series(D)/华语电视剧", default: true}
-    - {id: 404, cat: TV, desc: "TV Series(F)/外语电视剧", default: true}
-    - {id: 406, cat: TV, desc: "TV Shows(D)/华语综艺", default: true}
-    - {id: 405, cat: TV, desc: "TV Shows(F)/外语综艺", default: true}
-    - {id: 408, cat: TV/Anime, desc: "TV Anime(D)/华语动漫", default: true}
-    - {id: 411, cat: TV/Anime, desc: "TV Anime(F)/外语动漫", default: true}
-    - {id: 409, cat: Audio/Video, desc: "MusicVideo(D)/华语音乐MV", default: true}
-    - {id: 412, cat: Audio/Video, desc: "MusicVideo(F)/外语音乐MV", default: true}
-    - {id: 407, cat: TV/Documentary, desc: "Documentaries(D)/华语纪录片", default: true}
-    - {id: 413, cat: TV/Documentary, desc: "Documentaries(F)/外语纪录片", default: true}
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 422, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 423, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV演唱会"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: PC/0day, desc: "Software/软件"}
+    - {id: 424, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -39,6 +40,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -55,23 +60,26 @@ settings:
     options:
       desc: desc
       asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
   method: form
   form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    logintype: username
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     logout: ""
-    thispagewidth: yes
+    securelogin: ""
+    ssl: yes
+    trackerssl: ""
   error:
-    - selector: td.embedded:has(h2:contains("姿势不正确"))
+    - selector: td.embedded:has(h2:contains("失败"))
+      message:
+        selector: td.text
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -79,29 +87,22 @@ login:
 search:
   paths:
     - path: torrents.php
-      categories: [401, 402, 406, 408, 409, 407]
-    - path: torrentsasia.php
-      categories: [403, 404, 405, 411, 412, 413]
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 incldead, 1 active, 2 dead, 3 noimdb, 4 onlydead
+    # 0 incldead, 1 active, 2 dead
     incldead: 0
-    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%, 8 all promotions
-    spstate: "{{ if .Config.freeleech }}8{{ else }}0{{ end }}"
-    # 0 all, 1 popular, 2 classic, 3 recommended, 4 normal
-    picktype: 0
-    # 0 title, 3 uploader, 4 movie info, 5 imdbid, 6 torrent hash, 7 activity seed
-    search_area: "{{ if .Query.IMDBID }}5{{ else }}0{{ end }}"
+    # 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 }}"
-    # can search for imdbid but does not show imdb link in search results.
 
   rows:
-    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="]), table.torrents > tbody > tr:has(a[href^="comment.php?"])
-    after: 1
+    selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
     category:
@@ -120,19 +121,14 @@ search:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
-      # downloads can be missing but we can exclude them due to after:1
       selector: a[href^="download.php?id="]
       attribute: href
-      optional: true
-    seeders:
-      selector: td:nth-child(3)
-    leechers:
-      selector: td:nth-child(4)
-    grabs:
-      selector: td:nth-child(5)
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     date:
       # time type: time elapsed (default)
-      selector: td:nth-child(9) > span[title]
+      selector: td:nth-child(4) > span[title]
       attribute: title
       optional: true
       filters:
@@ -142,7 +138,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date:
       # time added
-      selector: td:nth-child(9):not(:has(span))
+      selector: td:nth-child(4):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -150,7 +146,13 @@ search:
         - name: dateparse
           args: "2006-01-0215:04:05 -07:00"
     size:
-      selector: td:nth-child(10)
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -168,4 +170,6 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP V1.5.β5
+    minimumratio:
+      text: 0.81
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/hdhouse.yml

@@ -1,27 +1,28 @@
 ---
-id: hdreactor
-name: HDReactor
-description: "HDReactor is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
+id: hdhouse
+name: HDhouse
+description: "HDhouse (HDReactor) is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
 language: ru-ru
 type: public
 encoding: windows-1251
 links:
-  - https://hdreactor.net/
+  - https://hdhouse.club/
   - https://hdreactor.club/
   - https://hdreactor.su/
 legacylinks:
   - https://hdreactor.guru/
+  - https://hdreactor.net/
 
 caps:
   categorymappings:
-    - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
-    - {id: 5006, cat: Movies/UHD, desc: "Кино 4K"}
-    - {id: 2007, cat: Movies/Other, desc: "Анимация"}
-    - {id: 2006, cat: TV/HD, desc: "Сериалы"}
-    - {id: 5005, cat: TV/Sport, desc: "Спорт"}
-    - {id: 2004, cat: Audio/Lossless, desc: "Музыка"}
-    - {id: 2005, cat: PC/Games, desc: "Игры"}
-    - {id: 2003, cat: XXX, desc: "18+"}
+    - {id: 1, cat: Movies/HD, desc: "Кино HD"}
+    - {id: 2, cat: Movies/UHD, desc: "Кино UHD"}
+    - {id: 3, cat: XXX, desc: "18+ HD"}
+    - {id: 4, cat: Audio/Lossless, desc: "Музыка A"}
+    - {id: 5, cat: PC/Games, desc: "Игры"}
+    - {id: 6, cat: TV/HD, desc: "Сериалы HD"}
+    - {id: 7, cat: TV/Anime, desc: "Мультфильмы"}
+    - {id: 9, cat: Audio/Video, desc: "Музыка V"}
 
   modes:
     search: [q]
@@ -69,29 +70,29 @@ search:
     do: search
     subaction: search
     showposts: 1
-    # 0 in article 1 in comments 2 in static pages 3 in article titles
+    # 0 in article, 1 in comments ,2 in static pages, 3 in article titles
     titleonly: 3
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     sortby: "{{ .Config.sort }}"
     resorder: "{{ .Config.type }}"
 
   rows:
-    selector: div.news:contains("Категория:")
+    selector: div.movie-item
 
   fields:
     category:
-      selector: div.news-content > a
+      selector: div.movie-item__meta > span > a
       case:
-        a[href$="/4k_uhd/"]: 5006
-        a[href$="/1/"]: 2001
-        a[href$="/6/"]: 2006
-        a[href$="/7/"]: 2007
-        a[href$="/4/"]: 2004
-        a[href$="/5/"]: 2005
-        a[href$="/3/"]: 2003
-        a[href$="/sport-hd/"]: 5005
+        a[href$="/1/"]: 1
+        a[href$="/3/"]: 3
+        a[href$="/4/"]: 4
+        a[href$="/4k_uhd/"]: 2
+        a[href$="/5/"]: 5
+        a[href$="/6/"]: 6
+        a[href$="/7/"]: 7
+        a[href$="/9/"]: 9
     title:
-      selector: h1 > a
+      selector: span.movie-item__title
       filters:
         # normalize to SXXEYY format
         - name: re_replace
@@ -117,11 +118,14 @@ search:
         - name: replace
           args: ["HDTVRip", "HDTV"]
     details:
-      selector: h1 > a
+      selector: div.movie-item__desc > a
       attribute: href
     download:
-      selector: h1 > a
+      selector: div.movie-item__desc > a
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     size:
       text: "512 MB"
     seeders:
@@ -129,11 +133,9 @@ search:
     leechers:
       text: 1
     date:
-      selector: div.news-content
+      selector: div.movie-item__meta > span:nth-child(2)
       filters:
-        # - 30-10-2019, 14:49]
-        - name: regexp
-          args: "(\\d{1,2}\\-\\d{2}\\-\\d{4}\\, \\d{1,2}\\:\\d{2})"
+        # 5-03-2021, 21:59
         - name: replace
           args: [",", ""]
         - name: append

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -104,19 +104,51 @@ search:
       selector: a.view-torrent
       filters:
         - name: re_replace
-          args: ["(?i)full", "BRDISK."] # FULL(BR/UHD) -> BRDISK
+          args: ["\\[", " "]
         - name: re_replace
+          args: ["\\]", " "]
+        - name: re_replace
+          args: ["(?i)(full(bluray)?)", "BRDISK"] # FULL(BR/UHD) -> BRDISK
+        - name: replace
           args: ["HDOlimpo", ""] # Delete HDOlimpo
-        - name: re_replace
+        - name: replace
           args: ["HD-Olimpo", ""] # Delete HD-Olimpo
         - name: re_replace
-          args: ["\\W", "."] # Spaces and other characters -> .
-        - name: append
-          args: ".Spanish-HDOlimpo"
+          args: ["[ -](?i)español[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)castellano[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)spa[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)esp[ -]", " SPANiSH "]
+        - name: re_replace
+          args: ["[ -](?i)ingl[eé]s[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)[ei]ng[ -]", " English "]
+        - name: re_replace
+          args: ["[ -](?i)cat[ -]", " Catalan "]
+        - name: re_replace
+          args: ["[ -](?i)vas[ -]", " Basque "]
+        - name: re_replace
+          args: ["[ -](?i)fr[ae][ -]", " French "]
+        - name: re_replace
+          args: ["[ -](?i)jap[ -]", " Japanese "]
+        - name: re_replace
+          args: ["[ -](?i)ita[ -]", " Italian "]
+        - name: re_replace
+          args: ["[ -](?i)rus[ -]", " Russian "]
+        - name: re_replace
+          args: ["[ -](?i)ger[ -]", " German "]
+        - name: re_replace
+          args: ["(?i)(triaudio)", "MULTi/SPANiSH/English"]
+        - name: re_replace
+          args: ["(?i)(dual)", " MULTi/SPANiSH "]
         - name: re_replace
           args: ["\\.+", "."] # More than 1 dot -> .
         - name: re_replace
           args: ["^\\.", ""] # Delete first dot
+        - name: re_replace
+          args: ["\\s+", " "] # More than 1 space to 1 space
 
     download:
       selector: a[href*="/download/"]

src/Jackett.Common/Definitions/hdturk.yml

@@ -112,8 +112,10 @@ search:
     category: 0
     search_type: t_name
     include_dead_torrents: yes
+
   rows:
     selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+
   fields:
     title:
       selector: div[id^="port-target-"] a
@@ -133,13 +135,10 @@ search:
       selector: div[id^="port-content-"] img
       attribute: src
     date:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
+      selector: td:nth-child(2) > div:nth-last-child(1)
       filters:
         - name: append
-          args: " +03:00" # TRT
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     download:

src/Jackett.Common/Definitions/hellastz.yml

@@ -79,7 +79,7 @@ login:
     uid: "{{ .Config.username }}"
     pwd: "{{ .Config.password }}"
   error:
-    - selector: form[action="index.php?page=login&returnto=index.php"] table tr td span
+    - selector: tr td span[style="color:#FF0000;"]
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -132,29 +132,24 @@ search:
     download:
       selector: a[href^="index.php?page=downloadcheck&id="]
       attribute: href
-    size:
-      selector: p:contains("Μέγεθος:")
-      filters:
-        - name: replace
-          args: ["Μέγεθος: ", ""]
     date:
-      selector: p:contains("Προστέθηκε:")
+      selector: td:nth-child(4)
       filters:
-        - name: replace
-          args: ["Προστέθηκε: ", ""]
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "15:04:05 02/01/2006 -07:00"
+          args: "02/01/2006 -07:00"
     seeders:
-      selector: p:has(a[href^="index.php?page=peers&id="]) > a:first-child
+      selector: td:nth-child(5)
     leechers:
-      selector: p:has(a[href^="index.php?page=peers&id="]) > a:nth-child(2)
+      selector: td:nth-child(6)
     grabs:
-      selector: p:has(a[href^="index.php?page=peers&id="]) > a:last-child
+      selector: td:nth-child(7)
       filters:
         - name: replace
           args: ["---", "0"]
+    size:
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
         img[alt="Gold 100% Free"]: 0
@@ -178,4 +173,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-#  xbtitFM v3.0.00
+#  xbtitFM v3.1.00

src/Jackett.Common/Definitions/horrorsite.yml

@@ -1,174 +0,0 @@
----
-id: horrorsite
-name: Horror Site
-description: "Horror Site is a Hungarian Private site for MOVIES / TV"
-language: hu-hu
-type: private
-encoding: iso-8859-1
-links:
-  - https://selection-tracker.net/
-legacylinks:
-  - https://horror-site.net/
-
-caps:
-  categorymappings:
-    - {id: 80, cat: Movies, desc: "Film /PACK"}
-    - {id: 82, cat: Movies/SD, desc: "Cam-Hun"}
-    - {id: 105, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
-    - {id: 38, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
-    - {id: 76, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 71, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 103, cat: Movies/SD, desc: "Film/SD/Eng"}
-    - {id: 104, cat: Movies/SD, desc: "Film/SD/Hun"}
-    - {id: 40, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 39, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 52, cat: PC/Games, desc: "Játék/RIP/ISO"}
-    - {id: 75, cat: Other, desc: "Képek"}
-    - {id: 107, cat: Books, desc: "eBook/Eng"}
-    - {id: 61, cat: Books, desc: "eBook/Hun"}
-    - {id: 106, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 50, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 49, cat: Audio/MP3, desc: "Mp3/Hun"}
-    - {id: 45, cat: PC, desc: "Program ISO /RIP"}
-    - {id: 43, cat: TV, desc: "Rajzfilm/Hun"}
-    - {id: 57, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 58, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 102, cat: XXX, desc: "Film/XXX/HD"}
-    - {id: 59, cat: XXX, desc: "Film/XXX/SD"}
-    - {id: 74, cat: XXX, desc: "Képek/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: 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:
-  path: takelogin.php
-  method: post
-  inputs:
-    post_kuldes: engedelyezve
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.browse:contains("hiba")
-  test:
-    path: /
-    selector: a[href$="/logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # hidden field
-    turkalo: 0
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 dead, 3 recomended, 4 double, 5 free
-    # note: option 4 and 5 do not actually filter. everything is returned.
-    # incldead: "{{ if .Config.freeleech }}5{{ else }}1{{ end }}"
-    incldead: 1
-    # 0 name, 1 descr, 2 both
-    blah: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # does not support imdbid search
-
-  rows:
-    selector: "table > tbody > tr.sor:has(a[href^=\"/download.php/\"]){{ if .Config.freeleech }}:has(img[src=\"../pic/freedownload.gif\"]){{ else }}{{ end }}"
-#    error:
-#      - selector: div.content:contains("Meg van vonva a letöltési jogod")
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/download.php/"]
-      attribute: href
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    files:
-      selector: td:nth-last-child(8)
-    date:
-      selector: td:nth-last-child(6)
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})
-        - name: replace
-          args: ["\xA0", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td:nth-last-child(5) > u
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="../pic/freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-#          img[src="../pic/????????.gif"]: 2 # there is a double (according to incldead=4) but not found at this time.
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# engine n/a

src/Jackett.Common/Definitions/huntorrent.yml

@@ -0,0 +1,166 @@
+---
+id: huntorrent
+name: HunTorrent
+description: "HunTorrent is a Hungarian Semi-Private site for MOVIES / TV / GENERAL"
+language: hu-hu
+type: semi-private
+encoding: UTF-8
+links:
+  - https://huntorrent.net/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: Movies/SD, desc: "Cam/ENG"}
+    - {id: 27, cat: Movies/SD, desc: "Cam/HUN"}
+    - {id: 4, cat: Movies/DVD, desc: "DVDR/ENG"}
+    - {id: 3, cat: Movies/DVD, desc: "DVDR/HUN"}
+    - {id: 6, cat: Movies/HD, desc: "HD/ENG"}
+    - {id: 5, cat: Movies/HD, desc: "HD/HUN"}
+    - {id: 29, cat: Movies, desc: "Mese/ENG"}
+    - {id: 30, cat: Movies, desc: "Mese/HUN"}
+    - {id: 8, cat: TV/SD, desc: "Sorozat/ENG"}
+    - {id: 31, cat: TV/HD, desc: "Sorozat/HD/ENG"}
+    - {id: 9, cat: TV/HD, desc: "Sorozat/HD/HUN"}
+    - {id: 7, cat: TV/SD, desc: "Sorozat/HUN"}
+    - {id: 2, cat: Movies/SD, desc: "XviD/ENG"}
+    - {id: 1, cat: Movies/SD, desc: "XviD/HUN"}
+    - {id: 25, cat: Other, desc: "Kép"}
+    - {id: 24, cat: Books, desc: "eBook/ENG"}
+    - {id: 23, cat: Books, desc: "eBook/HUN"}
+    - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 17, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 18, cat: PC/Games, desc: "Játék/RIP"}
+    - {id: 19, cat: Console, desc: "Konzol"}
+    - {id: 26, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 20, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 21, cat: PC/0day, desc: "Program/RIP"}
+    - {id: 13, cat: Audio/Video, desc: "Klip/ENG"}
+    - {id: 12, cat: Audio/Video, desc: "Klip/HUN"}
+    - {id: 11, cat: Audio/MP3, desc: "MP3/ENG"}
+    - {id: 10, cat: Audio/MP3, desc: "MP3/HUN"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: name
+      4: created
+      7: seeders
+      5: size
+  - 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: login.php
+  method: form
+  form: form#loginForm
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    login: yes
+  # error: using some kind of JS popup that can not be trapped :-(
+  test:
+    path: browse.php
+    selector: a[href^="logout.php?k="]
+
+search:
+  paths:
+    # https://huntorrent.net/browse.php?time=1616615308&korhatar=0&incldead=1&xyz=yes&c28=1&c27=1&c6=1&c5=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    viewMode: ""
+    xyz: yes
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # Age Limit: 0 all, 1 no, 5 6, 2 12, 3 16, 4 18
+    korhatar: 0
+    # 0 active, 1 all, 2 dead, 3 my uploads, 4  my bookmarks
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # no freeleech atm
+
+  rows:
+    selector: table[align="center"][cellpadding="5"] > tbody > tr[id^="torrent-main-"]
+
+  fields:
+    id:
+      selector: a.download-link
+      attribute: data-id
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="#details_tr_"]
+      attribute: title
+      filters:
+        - name: replace
+          args: ["Név: ", ""]
+    details:
+      text: "details.php?id={{ .Result.id }}"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    description:
+      selector: td:nth-child(2) div:nth-child(2)
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    poster:
+      selector: a[href^="torrents_data/posters/"]
+      attribute: href
+    date:
+      selector: td:nth-last-child(6)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(5) b
+    grabs:
+      selector: td:nth-last-child(4)
+      filters:
+        - name: replace
+          args: ["x", ""]
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 2
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 32 hours (as seconds = 32 x 60 x 60)
+      text: 115200
+# engine n/a

src/Jackett.Common/Definitions/idope.yml

@@ -59,6 +59,10 @@ settings:
       3: "created asc"
       1: "seeders asc"
       2: "size asc"
+  - 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.
 
 search:
   paths:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -85,6 +85,10 @@ settings:
     type: checkbox
     label: Search freeleech only
     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.
   - name: sort
     type: select
     label: Sort requested from site

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

@@ -137,10 +137,10 @@ caps:
     - {id: 729, cat: Other, desc: " |- Работа со звуком"}
     - {id: 766, cat: Other, desc: " |- ZBrush"}
     - {id: 473, cat: Other, desc: " |- Работа с видео"}
-    - {id: 426, cat: Other, desc: " |- Autodesk 3ds Max"}
-    - {id: 425, cat: Other, desc: " |- Adobe Photoshop"}
-    - {id: 427, cat: Other, desc: " |- Инженерные и научные программы (видеоуроки)"}
-    - {id: 424, cat: Other, desc: " |- WEB, SMM, SEO, интернет-маркетинг"}
+    - {id: 726, cat: Other, desc: " |- Autodesk 3ds Max"}
+    - {id: 725, cat: Other, desc: " |- Adobe Photoshop"}
+    - {id: 727, cat: Other, desc: " |- Инженерные и научные программы (видеоуроки)"}
+    - {id: 724, cat: Other, desc: " |- WEB, SMM, SEO, интернет-маркетинг"}
     - {id: 472, cat: Other, desc: " |- Веб-дизайн, Программирование"}
     - {id: 474, cat: Other, desc: " |- Компьютерные сети и безопасность"}
     # Игры Games

src/Jackett.Common/Definitions/jptv.yml

@@ -194,4 +194,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 4.0.0
+# UNIT3D 5.1.0

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

@@ -56,7 +56,12 @@ download:
 
 search:
   paths:
+    # 20 rows per page
     - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}2/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}3/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}4/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}5/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
 
   rows:
     selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])

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

@@ -1,7 +1,7 @@
 ---
-id: kickasstorrent-kathow
-name: kickasstorrents (kickass.ws)
-description: "kickasstorrents (kickass.ws) is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
+id: kickasstorrents-ws
+name: kickasstorrents.ws
+description: "kickasstorrents.ws is a Public KickAssTorrent clone for TV / MOVIES / GENERAL"
 language: en-us
 type: public
 encoding: UTF-8

src/Jackett.Common/Definitions/kinonavse100.yml

@@ -66,6 +66,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -110,18 +111,28 @@ search:
     # http://kinonavse100.com/search.php?tracker_search=torrent&keywords=2020&terms=all&author=&sc=1&sf=titleonly&sk=t&sd=d&sr=topics&st=0&ch=300&t=0&submit=Search
     - path: search.php
   inputs:
-    tracker_search: torrent
+    # Search On: tracker, torrent, comment, forum, all
+    tracker_search: "{{ if .Keywords }}torrent{{ else }}tracker{{ end }}"
     keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    # all, any
     terms: all
+    # Search by Author
     author: ""
+    # Search in subforums: yes 1, no 0
     sc: 1
+    # Search For: all, msgonly, titleonly, firstpost
     sf: titleonly
+    # Show Results as: posts, topics
     sr: topics
     sk: "{{ .Config.sort }}"
     sd: "{{ .Config.type }}"
+    # Seach Posts For: all 0, 1day 1, week 7, fortnight 14, month 30, 3months 90, 6 months 180, year 365
     st: 0
+    # Show first: all -1, 0, 25, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000
     ch: 300
+    # hidden
     t: 0
+    # hidden
     submit: Search
     $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
 

src/Jackett.Common/Definitions/lastfiles.yml

@@ -4,82 +4,94 @@ name: LastFiles
 description: "LastFiles (LF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
 language: ro-ro
 type: private
-encoding: windows-1252
+encoding: utf-8
+followredirect: true
 links:
-  - http://last-torrents.org/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://www.lastfiles.ro/
+  - http://www.lastfiles.ro/
+  - https://www.last-torrents.org/
+  - http://www.last-torrents.org/
+legacylinks:
+  - http://last-torrents.org/
+  - https://last-torrents.org/
 
 caps:
   categorymappings:
-    - {id: 31, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 5, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 9, cat: Movies/DVD, desc: "Movies/DVD"}
-    - {id: 11, cat: Movies/HD, desc: "Movies/HD"}
+    - {id: 31, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay"}
+    - {id: 9, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 11, cat: Movies/HD, desc: "Movies: HD"}
     - {id: 58, cat: Movies/SD, desc: "Movies/Cam"}
     - {id: 61, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 24, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 16, cat: Movies, desc: "Old Movies"}
+    - {id: 24, cat: Movies/SD, desc: "Movies: XVID"}
+    - {id: 16, cat: Movies, desc: "Movies: Old"}
     - {id: 15, cat: Movies, desc: "Movies Mobile"}
     - {id: 54, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"}
     - {id: 56, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 18, cat: Movies, desc: "Movie Packs"}
-    - {id: 32, cat: Movies/UHD, desc: "Movies/4K-RO"}
-    - {id: 6, cat: Movies/BluRay, desc: "Movies/BluRay-Ro"}
-    - {id: 12, cat: Movies/HD, desc: "Movies/HD-Ro"}
-    - {id: 81, cat: Movies/HD, desc: "Movies/x265-Ro"}
-    - {id: 82, cat: Movies/HD, desc: "Movies/x265"}
-    - {id: 10, cat: Movies/DVD, desc: "Movies/DVD-Ro"}
-    - {id: 59, cat: Movies/SD, desc: "Movies/Cam-Ro"}
-    - {id: 25, cat: Movies/SD, desc: "Movies/XVID-Ro"}
-    - {id: 17, cat: Movies, desc: "Old Movies Ro"}
+    - {id: 18, cat: Movies, desc: "Movies: Pack"}
+    - {id: 32, cat: Movies/UHD, desc: "Movies:4KRO"}
+    - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro"}
+    - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro"}
+    - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro"}
+    - {id: 82, cat: Movies/HD, desc: "Movies: x265"}
+    - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro"}
+    - {id: 59, cat: Movies/SD, desc: "Movies/Cam-RO"}
+    - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro"}
+    - {id: 17, cat: Movies, desc: "Movies: Old-Ro"}
     - {id: 55, cat: Movies/WEB-DL, desc: "Movies/WEB-DL Ro"}
     - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro"}
-    - {id: 62, cat: Movies/3D, desc: "Movies/3D-RO"}
-    - {id: 19, cat: Movies, desc: "Movie Packs Ro"}
+    - {id: 62, cat: Movies/3D, desc: "Movies/3D-Ro"}
+    - {id: 19, cat: Movies, desc: "Movies: Pack-Ro"}
     - {id: 20, cat: TV, desc: "TV Episodes"}
-    - {id: 21, cat: TV, desc: "TV Episodes Ro"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 14, cat: TV/HD, desc: "HDTV-Ro"}
+    - {id: 21, cat: TV, desc: "TV Episodes-Ro"}
+    - {id: 13, cat: TV/HD, desc: "HDTV Episodes"}
+    - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro"}
     - {id: 28, cat: Audio, desc: "Music"}
-    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps & Games"}
+    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps"}
     - {id: 26, cat: PC/0day, desc: "Software"}
-    - {id: 30, cat: PC/ISO, desc: "Games PC-ISO"}
-    - {id: 33, cat: PC/Games, desc: "Game Packs"}
-    - {id: 1, cat: TV/Anime, desc: "Anime/Hentai"}
-    - {id: 2, cat: TV/Anime, desc: "Anime-Ro"}
+    - {id: 30, cat: PC/Games, desc: "Games: PC-ISO"}
+    - {id: 33, cat: PC/Games, desc: "Games: Packs"}
+    - {id: 1, cat: TV/Anime, desc: "Movies: Anime"}
+    - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro"}
     - {id: 42, cat: TV/Sport, desc: "Sport"}
-    - {id: 43, cat: Books, desc: "Books"}
+    - {id: 43, cat: Books, desc: "Documents"}
     - {id: 44, cat: Other, desc: "Images"}
     - {id: 49, cat: Other, desc: "Diverse"}
     - {id: 22, cat: Other, desc: "RoContent"}
-    - {id: 60, cat: XXX, desc: "Images/XXX"}
-    - {id: 27, cat: XXX, desc: "XXX"}
+    - {id: 60, cat: XXX, desc: "ImagesXXX"}
+    - {id: 27, cat: XXX, desc: "Movies: XXX"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (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: 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.
   - name: sort
     type: select
     label: Sort requested from site
-    default: 4
+    default: 3
     options:
-      4: created
-      7: seeders
-      5: size
+      3: created
+      6: seeders
+      4: size
       1: title
   - name: type
     type: select
@@ -90,13 +102,7 @@ settings:
       asc: asc
 
 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
   test:
     path: browse.php
 
@@ -105,16 +111,20 @@ search:
     - path: browse.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # 0 name 1 genre 2 descr
-    genre: "{{ if .Query.IMDBID }}2{{ else }}0{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead, 3 free, 4 double
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
 
   rows:
-    selector: table.browser > tbody > tr:has(a[href^="download.php/"])
+    selector: tbody > tr:has(a[href^="download.php"])
 
   fields:
     category:
@@ -133,40 +143,57 @@ search:
       attribute: onmouseover
       filters:
         - name: regexp
-          args: src=([^\s]+)
+          args: src=\\'(http.+?\.jpg)\\'
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(http.+?\.png)\\'
     download:
-      selector: a[href^="download.php/"]
+      selector: a[href^="download.php"]
       attribute: href
     date:
-      selector: td:nth-child(3)
+      selector: td:nth-child(4) span:not(:contains("day"))
+      optional: true
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-200615:04:05 -07:00"
+          args: "Jan 2 2006 03:04 PM -07:00"
+    date:
+      selector: td:nth-child(4) span:contains("day")
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: fuzzytime
     size:
-      selector: td:nth-child(4)
-    grabs:
       selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
       filters:
         - name: regexp
           args: (\d+)
     seeders:
-      selector: td:nth-child(6)
-    leechers:
       selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
-        "span:contains(\"FREE\")": 0
-        "span:contains(\"Half\")": 0.5
+        "a.info > b:contains(\"FREE\")": 0
+#        "a.info > b:contains(\"Half\")": 0.5
         "*": 1
     uploadvolumefactor:
       case:
-        "span:contains(\"2XUP\")": 2
+#        "a.info > b:contains(\"2XUP\")": 2
         "*": 1
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 36 hours (as seconds = 36 x 60 x 60)
-      text: 129600
-# engine n/a
+      # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
+      # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
+      case:
+        "a.info > b:contains(\"FREE\")": 172800
+        "*": 129600
+# U-232 V5

src/Jackett.Common/Definitions/lemonhd.yml

@@ -12,27 +12,13 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 300, cat: Movies/UHD, desc: "Movies UHD-4K"}
-    - {id: 301, cat: Movies/UHD, desc: "Movies 2160p"}
-    - {id: 420, cat: Movies/UHD, desc: "Movies 2160p REMUX"}
-    - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-    - {id: 410, cat: Movies/HD, desc: "Movies 1080p"}
-    - {id: 415, cat: Movies, desc: "Movies 1080p REMUX"}
-    - {id: 416, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 411, cat: Movies/HD, desc: "Movies 720p"}
-    - {id: 412, cat: Movies/WEB-DL, desc: "Movies WEB-DL"}
-    - {id: 413, cat: TV/HD, desc: "Movies HDTV"}
-    - {id: 417, cat: Movies, desc: "Movies iPad"}
-    - {id: 414, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
-    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)"}
-    - {id: 407, cat: TV/Sport, desc: "Sports(体育)"}
-    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)"}
-    - {id: 421, cat: Books, desc: "Book(学习资料)"}
-    - {id: 422, cat: Console, desc: "Game(游戏)"}
-    - {id: 409, cat: Other, desc: "Misc(其他)"}
+    - {id: animate, cat: TV/Anime, desc: "动漫 Anime"}
+    - {id: doc, cat: TV/Documentary, desc: "纪录片 Documentary"}
+    - {id: movie, cat: Movies, desc: "电影 Movie"}
+    - {id: mv, cat: Audio/Video, desc: "MV Music Video"}
+    - {id: music, cat: Audio, desc: "音乐 Music"}
+    - {id: tv, cat: TV, desc: "剧集综艺 TV"}
+    - {id: other, cat: Other, desc: "艺术 Other"}
 
   modes:
     search: [q]
@@ -85,7 +71,6 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
@@ -103,19 +88,19 @@ search:
 
   fields:
     category:
-      selector: a[href^="?cat="]
-      attribute: href
+      selector: img[class^="cat_"]
+      attribute: class
       filters:
-        - name: querystring
-          args: cat
+        - name: regexp
+          args: "cat_(.+?)$"
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details_"] > b
     title:
       optional: true
-      selector: a[title][href^="details.php?id="]
+      selector: a[title][href^="details_"] > b
       attribute: title
     details:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details_"]
       attribute: href
     download:
       selector: a[href^="download.php?"]

src/Jackett.Common/Definitions/lepornoinfo.yml

@@ -13,6 +13,7 @@ caps:
     - {id: 1, cat: XXX/XviD, desc: "Videos SD"}
     - {id: 2, cat: XXX/x264, desc: "Videos HD"}
     - {id: 3, cat: XXX/WMV, desc: "Movies"}
+    - {id: 17, cat: XXX/ImageSet, desc: "SiteRip's Picture Packs"}
     - {id: 6, cat: XXX/Other, desc: "Porn (Other)"}
     - {id: 4, cat: XXX, desc: "AV CENSORED (JAV)"}
     - {id: 5, cat: XXX, desc: "AV UNCENSORED (JAV)"}
@@ -26,6 +27,7 @@ caps:
     - {id: 15, cat: XXX, desc: "Pregnant"}
     - {id: 16, cat: XXX, desc: "Fetish"}
     - {id: 9, cat: XXX, desc: "Gay Forum"}
+    - {id: 18, cat: XXX, desc: "Incest and Taboo"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/lesaloon.yml

@@ -120,7 +120,7 @@ login:
   # https://lesaloonv2-0.net/yupy_login.php
   path: yupy_login.php
   method: form
-  form: form[action^="index.php?page=login"]
+  form: form[action^="login"]
   inputs:
     uid: "{{ .Config.username }}"
     pwd: "{{ .Config.password }}"

src/Jackett.Common/Definitions/limetorrents.yml

@@ -12,7 +12,7 @@ links:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.unblockit.dev/
+  - https://limetorrents.unblockit.buzz/
   - https://limetorrents.unblockninja.com/
 legacylinks:
   - https://www.limetorrents.io/
@@ -36,6 +36,9 @@ legacylinks:
   - https://limetorrents.unblockit.top/
   - https://limetorrents.unblockit.lat/
   - https://limetorrents.unblockit.app/
+  - https://limetorrents.unblockit.dev/
+  - https://limetorrents.unblockit.ltd/
+  - https://limetorrents.unblockit.link/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/magico.yml

@@ -6,11 +6,12 @@ language: el-gr
 type: private
 encoding: UTF-8
 links:
-  - https://magico.fun/
+  - https://trellas.info/
 legacylinks:
   - https://magico.info/
   - https://magico.one/
   - https://magico.club/
+  - https://magico.fun/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -98,12 +98,15 @@ caps:
     - {id: 212, cat: Books, desc: "Ship's documentation"}
     - {id: 251, cat: Books, desc: "Diving"}
     - {id: 111, cat: Books, desc: "Yachting, sailing, boating"}
+    - {id: 298, cat: Books, desc: "Yachting, sailing, boating-Cruising Guides"}
+    - {id: 297, cat: Books, desc: "Yachting, sailing, boating-Weather Sailing"}
+    - {id: 296, cat: Books, desc: "Yachting, sailing, boating-How to Buy a Boat?"}
     - {id: 258, cat: Books, desc: "Yachting, sailing, boating-Inflatable boats, boats, kayaks"}
     - {id: 237, cat: Books, desc: "Yachting, sailing, boating-Yachting, sailing videos"}
     - {id: 257, cat: Books, desc: "Yachting, sailing, boating-Motor Boat & Yachting magazines"}
     - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Seamanship practice"}
     - {id: 254, cat: Books, desc: "Yachting, sailing, boating-Repair and Restoration"}
-    - {id: 253, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
+    - {id: 255, cat: Books, desc: "Yachting, sailing, boating-Sailing Alone"}
     - {id: 256, cat: Books, desc: "Yachting, sailing, boating-Rigging, knots"}
     - {id: 252, cat: Books, desc: "Yachting, sailing, boating-Projects, design, construction"}
     - {id: 177, cat: Books, desc: "Shipmodeling"}
@@ -142,6 +145,7 @@ caps:
     - {id: 247, cat: Books, desc: "Rarity-1600 - 1700"}
     - {id: 187, cat: Books, desc: "Others (not maritime)"}
     - {id: 162, cat: Books, desc: "Archive"}
+    - {id: 295, cat: Books, desc: "Archive-Unregistered releases"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/mesevilag.yml

@@ -12,17 +12,24 @@ caps:
   categorymappings:
     - {id: 1, cat: TV/Anime, desc: "Anime/Cam"}
     - {id: 2, cat: TV/Anime, desc: "Anime/Eng"}
+    - {id: 21, cat: TV/Anime, desc: "Anime/HD"}
     - {id: 3, cat: TV/Anime, desc: "Anime/Hun"}
     - {id: 13, cat: TV/Anime, desc: "Anime/Sorozat(Series)"}
     - {id: 4, cat: Movies, desc: "Családi/Cam(Family)"}
     - {id: 5, cat: Movies, desc: "Családi/Eng(Family)"}
+    - {id: 19, cat: Movies/HD, desc: "Családi/HD(Family)"}
     - {id: 6, cat: Movies, desc: "Családi/Hun(Family)"}
+    - {id: 17, cat: Movies, desc: "Családi/Romantikus/Cam(Family Romantic)"}
+    - {id: 16, cat: Movies, desc: "Családi/Romantikus/Eng(Family Romantic)"}
+    - {id: 15, cat: Movies, desc: "Családi/Romantikus/Hun(Family Romantic)"}
+    - {id: 18, cat: TV, desc: "Családi/Romantikus/Sorozat(Family Romantic Series)"}
     - {id: 14, cat: TV, desc: "Családi/Sorozat(Family Series)"}
     - {id: 8, cat: Audio/Audiobook, desc: "Hangoskönyv(Audiobooks)"}
     - {id: 9, cat: PC/Games, desc: "Játék/ISO(Games)"}
     - {id: 11, cat: Console, desc: "Játék/Konzol(Console)"}
-    - {id: 10, cat: PC/Games, desc: "Játék/RIP(Games RIP)"}
+    - {id: 10, cat: PC/Games, desc: "Játék/RIP(Games)"}
     - {id: 7, cat: Books, desc: "Könyv(Books)"}
+    - {id: 20, cat: Movies/HD, desc: "Romantikus/HD(Romantic)"}
     - {id: 12, cat: Audio, desc: "Zene/Hun(Music)"}
 
   modes:

src/Jackett.Common/Definitions/mononokebt.yml

@@ -6,7 +6,9 @@ language: fr-fr
 type: private
 encoding: iso-8859-15
 links:
-  - http://mononoke-bt.org/ # site does not support https NET::ERR_CERT_DATE_INVALID expired 10 Dec 2018
+  - http://mononoke-bt.org/
+legacylinks:
+  - https://mononoke-bt.org/ # downloads do not supported https
 
 caps:
   categories:
@@ -16,17 +18,41 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
 
+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: vostfr
+    type: checkbox
+    label: Add VOSTFR to titles
+    default: false
+  - name: IMPORTANT_FR
+    type: info
+    label: (FR) Informations Importantes
+    default: Avant de pouvoir télécharger un torrent depuis Jackett, allez dans la <a href="https://mononoke-bt.org/faq.php" target="_blank">FAQ</a> et cliquer tous les 'Lu et Approuvé' de la page.
+  - name: IMPORTANT_EN
+    type: info
+    label: (EN) Important infos
+    default: Before you can even begin to download anything you need to go to the <a href="https://mononoke-bt.org/faq.php" target="_blank">FAQ</a> and click every 'Lu et Approuvé' present on the page.
+
 login:
-  path: takelogin.php
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.embedded:has(h2:contains("l'authentification"))
+    cookie: "{{ .Config.cookie }}"
   test:
     path: browse2.php
 
+download:
+  before:
+    path: gettorrent.php
+    method: get
+    inputs:
+      id: "{{ .DownloadUri.Query.id }}"
+
 search:
   paths:
     - path: browse2.php
@@ -40,8 +66,12 @@ search:
   fields:
     category:
       text: 1
-    title:
+    title_normal:
       selector: a[href^="details.php?id="]
+    title_vostfr:
+      text: "{{ .Result.title_normal }} VOSTFR"
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_normal }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/monova.yml

@@ -1,116 +0,0 @@
----
-id: monova
-name: Monova
-description: "Monova is a Public torrent index"
-language: en-us
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://monova.org/
-  - https://monova.to/
-  - https://monova.unblockit.dev/
-  - https://monova.unblocked.monster/
-  - https://monova.unblockninja.com/
-legacylinks:
-  - https://monova.unblockit.pro/
-  - https://monova.unblockit.one/
-  - https://monova.black-mirror.xyz/
-  - https://monova.unblocked.casa/
-  - https://monova.proxyportal.fun/
-  - https://monova.uk-unblock.xyz/
-  - https://monova.ind-unblock.xyz/
-  - https://monova.unblockit.me/
-  - https://monova.unblockit.pw/
-  - https://monova.unblocked.bar/
-  - https://monova.proxyportal.pw/
-  - https://monova.uk-unblock.pro/
-  - https://monova.unblockit.id/
-  - https://monova.unblockit.lat/
-  - https://monova.unblockit.app/
-  - https://monova.unblocked.rest/
-
-caps:
-  categorymappings:
-    - {id: venus-mars, cat: XXX, desc: Adult}
-    - {id: video-camera, cat: Movies, desc: Video}
-    - {id: music, cat: Audio, desc: Audio}
-    - {id: book, cat: Books, desc: Books}
-    - {id: gamepad, cat: PC/Games, desc: Games}
-    - {id: cog, cat: PC/0day, desc: Software}
-    - {id: list, cat: Other, desc: Others}
-    - {id: picture-o, cat: Other/Misc, desc: Photos}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # https://monova.to/search?term=vikings+s05e05
-    # https://monova.to/video
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}{{ else }}video{{ end }}"
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}&{{ else }}video?{{ end }}page=2"
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}&{{ else }}video?{{ end }}page=3"
-    - path: "{{ if .Keywords }}search?term={{ .Keywords }}&{{ else }}video?{{ end }}page=4"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
-
-  rows:
-    selector: tr.desktop:not(tr[class="desktop  success"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td.torrent_name i
-      attribute: class
-      filters:
-        # remove fa fa- prefix
-        - name: replace
-          args: ["fa fa-", ""]
-    title:
-      selector: td.torrent_name a
-    details:
-      selector: td.torrent_name a
-      attribute: href
-    infohash:
-      selector: td.torrent_name a
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([0-9A-Fa-f]{40})
-    size:
-      optional: true
-      selector: td.center-align
-      filters:
-        - name: replace
-          args: ["N/A", "512 MB"]
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-    date:
-      optional: true
-      selector: td.torrent_name
-      remove: a
-      filters:
-        - name: replace
-          args: ["added ", ""]
-        - name: replace
-          args: [" ago.*$", ""]
-        - name: replace
-          args: ["min.", "minutes"]
-        - name: timeago
-# engine n/a

src/Jackett.Common/Definitions/montorrent.yml

@@ -0,0 +1,191 @@
+---
+id: montorrent
+name: MonTorrent
+description: "MonTorrent is a FRENCH Public Indexer"
+language: fr-fr
+type: public
+encoding: UTF-8
+followredirect: true
+links:
+  - https://www.montorrent.com/
+
+caps:
+  categorymappings:
+    - {id: "vo", cat: Movies, desc: "Films VO"}
+    - {id: "vostfr", cat: Movies, desc: "Films VOSTFR"}
+    - {id: "dvdrip", cat: Movies/SD, desc: "Films DVDRip"}
+    - {id: "brrip", cat: Movies/SD, desc: "Films BRRip"}
+    - {id: "bdrip", cat: Movies/SD, desc: "Films BDRip"}
+    - {id: "webrip", cat: Movies/WEB-DL, desc: "Films WEBRip"}
+    - {id: "hdrip", cat: Movies/SD, desc: "Films HDRip"}
+    - {id: "dvdscreener", cat: Movies, desc: "Films DVDScreener"}
+    - {id: "screener", cat: Movies, desc: "Films Screener"}
+    - {id: "hd2160p", cat: Movies/UHD, desc: "Films 2160p"}
+    - {id: "hd1080p", cat: Movies/HD, desc: "Films 1080p"}
+    - {id: "hd720p", cat: Movies/HD, desc: "Films 720p"}
+    - {id: "hd2160p-hdlight", cat: Movies/UHD, desc: "Films 2160p HDLight"}
+    - {id: "hd1080p-hdlight", cat: Movies/HD, desc: "Films 1080p HDLight"}
+    - {id: "hd720p-hdlight", cat: Movies/HD, desc: "Films 720p HDLight"}
+    - {id: "hd3d", cat: Movies/3D, desc: "Films 3D"}
+    - {id: "serie-vostfr", cat: TV, desc: "TV VOSTFR"}
+    - {id: "serie-vf", cat: TV, desc: "TV VF"}
+    - {id: "pack-vf", cat: TV, desc: "TV Pack VF"}
+    - {id: "pack-vostfr", cat: TV, desc: "TV Pack VOSTFR"}
+    - {id: "pack-vo", cat: TV, desc: "TV Pack VO"}
+    - {id: "albums", cat: Audio, desc: "Albums"}
+    - {id: "jeux-pc", cat: PC/Games, desc: "Jeux PC"}
+    - {id: "jeux-console", cat: Console, desc: "Jeux Consoles"}
+    - {id: "logiciels", cat: PC/0day, desc: "Logiciels"}
+    - {id: "ebooks", cat: Books/EBook, desc: "eBooks"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: filter_title
+    type: checkbox
+    label: Try to normalize releases names by moving year after the title
+    default: false
+  - name: langfilter
+    type: select
+    label: Lang Filter / Filtre Langue
+    default: on
+    options:
+      on: Tous
+      french: French
+      truefrench: TrueFrench
+      vostfr: VOSTFR
+      vo: VO
+  - 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: enhancedAnime
+    type: checkbox
+    label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3)
+    default: false
+  - name: order
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: id
+      seeders: seeders
+      size: taille
+      rls: name
+  - name: orderby
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - 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.
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}/recherche/?query={{ .Keywords }}&{{ else }}/torrents/?{{ end }}langue={{ .Config.langfilter }}&order={{ .Config.order }}&orderby={{ .Config.orderby }}"
+    - path: "{{ if .Keywords }}/recherche/?query={{ .Keywords }}&{{ else }}/torrents/?{{ end }}langue={{ .Config.langfilter }}&order={{ .Config.order }}&orderby={{ .Config.orderby }}&page=2"
+
+  rows:
+    selector: div.t-details
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      optional: true
+      selector: a[href*="id_cat"]
+      attribute: class
+      filters:
+        - name: replace
+          args: ["liste-categorie-couleur ", ""]
+    title_normal:
+      selector: a[href^="/torrent/"]
+    title_filtered:
+      text: "{{ .Result.title_normal }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)^(?:(.+?)((?:[\\.\\-\\s_\\[]+(?:imax|(?:dvd|bd|tv)(?:rip|scr)|bluray(?:\\-?rip)?|720\\s*p?|1080\\s*p?|vof?|vost(?:fr)?|multi|vf(?:f|q)?[1-3]?|(?:true)?french|eng?)[\\.\\-\\s_\\]]*)*)([\\(\\[]?(?:20|1[7-9])\\d{2}[\\)\\]]?)(.*)$|(.*))$", "$1 $3 $2 $4 $5"]
+        - name: replace
+          args: [".", " "]
+        - name: trim
+        - name: re_replace
+          args: ["(?i)\\s(mkv|avi|divx|xvid|mp4)$", ""]
+        - name: re_replace
+          args: ["(\\s{2,5})", " "]
+        - name: trim
+    title_phase1:
+      text: "{{ if .Config.filter_title }}{{ .Result.title_filtered }}{{ else }}{{ .Result.title_normal }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)[\\.\\s\\[\\-]multi[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)[\\.\\s\\[\\-]vostfr[\\.\\s\\]\\-]", ".ENGLISH."]
+        - name: re_replace
+          args: ["(?i)[\\.\\s\\[\\-]subfrench[\\.\\s\\]\\-]", ".ENGLISH."]
+    title_phase3:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    title_anime:
+      text: "{{ .Result.title_phase3 }}"
+      filters:
+        # Sonarr need E in front of 3 digit number or else it thinks it is episode
+        # S01E10 for number 110 for example ==> enhancedAnime
+        - name: re_replace
+          args: ["(.*)(\\.| |\\-)(\\d{2,3})(\\.| |\\-)(.*)", "$1 E$3 $5"]
+    title:
+      text: "{{ if .Config.enhancedAnime }}{{ .Result.title_anime }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/telechargement/"]
+      attribute: href
+    size:
+      selector: div.t-taille
+    date:
+      text: now
+    seeders:
+      text: 0
+    seeders:
+      selector: div.t-sources
+      optional: true
+    leechers:
+      text: 0
+    leechers:
+      selector: div.t-clients
+      optional: true
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/movcr.yml

@@ -1,95 +0,0 @@
----
-id: movcr
-name: MovCr
-description: "MovCr is an Indian Public torrent site"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://movcr.st/
-legacylinks:
-  - https://movcr.tv/
-  - https://movcr.black-mirror.xyz/
-  - https://movcr.unblocked.casa/
-  - https://movcr.proxyportal.fun/
-  - https://movcr.uk-unblock.xyz/
-  - https://movcr.ind-unblock.xyz/
-  - https://movcr.unblocked.bar/ # some torrent links are broken if 'movcr.to' is in its name
-  - https://movcr.proxyportal.pw/ # some torrent links are broken if 'movcr.to' is in its name
-  - https://movcr.uk-unblock.pro/ # some torrent links are broken if 'movcr.to' is in its name
-  - https://movcr.to/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About MovCr Categories
-    default: MovCr does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-download:
-  selector: a[href^="/torrents/"]
-  attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/search.php?q={{ .Keywords }}{{ else }}/{{ end }}"
-
-  rows:
-    selector: tr:has(td.name a[href^="/download-"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: td.name a:nth-child(2)
-    details:
-      selector: td.name a
-      attribute: href
-    download:
-      selector: td.name a
-      attribute: href
-    date:
-      selector: td.seeds:contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +05:30" # IST
-        - name: dateparse
-          args: "2006-01-02 -07:00"
-    date:
-      selector: td.seeds:not(:contains("-"))
-      optional: true
-      filters:
-        - name: timeago
-    size:
-      selector: td.leeches:not(:contains("B"))
-      optional: true
-      text: "0 B"
-    size:
-      selector: td.leeches:contains("B")
-      optional: true
-    seeders:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["/", 0]
-    leechers:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["/", 1]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/movietorrent.yml

@@ -0,0 +1,112 @@
+---
+id: movietorrent
+name: MovieTorrent
+description: "MovieTorrent is a Public site for Bollywood, Hollywood, Hindi Dubbed, Tamil , Punjabi, Pakistani MOVIES"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://movietorrent.co/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Bollywood"}
+    - {id: 2, cat: Movies/HD, desc: "1080p"}
+    - {id: 3, cat: Movies/HD, desc: "2016"}
+    - {id: 4, cat: Movies/HD, desc: "2017"}
+    - {id: 6, cat: Movies/HD, desc: "2018"}
+    - {id: 7, cat: Movies/HD, desc: "720p"}
+    - {id: 8, cat: Movies/HD, desc: "480p"}
+    - {id: 9, cat: Movies/HD, desc: "Action"}
+    - {id: 10, cat: Movies, desc: "Adventure"}
+    - {id: 11, cat: Movies, desc: "Animation"}
+    - {id: 14, cat: Movies, desc: "Comedy"}
+    - {id: 15, cat: Movies, desc: "Crime"}
+    - {id: 18, cat: Movies, desc: "Drama"}
+    - {id: 19, cat: Movies, desc: "Dubbed"}
+    - {id: 23, cat: Movies, desc: "Hindi"}
+    - {id: 26, cat: Movies, desc: "Hollywood"}
+    - {id: 27, cat: Movies, desc: "Horror"}
+    - {id: 32, cat: Movies, desc: "Pakistani"}
+    - {id: 35, cat: Movies, desc: "Punjabi"}
+    - {id: 36, cat: Movies, desc: "Religious"}
+    - {id: 38, cat: Movies, desc: "Romance"}
+    - {id: 42, cat: Movies, desc: "Sport"}
+    - {id: 44, cat: Movies, desc: "Superhero"}
+    - {id: 47, cat: Movies, desc: "Tamil Telugu"}
+    - {id: 48, cat: Movies, desc: "Thriller"}
+    - {id: 49, cat: Movies, desc: "Trending"}
+    - {id: 53, cat: Movies/WEB-DL, desc: "Web Series"}
+    - {id: 59, cat: Movies, desc: "2019"}
+    - {id: 5143, cat: Movies, desc: "2012"}
+    - {id: 5247, cat: Movies, desc: "2015"}
+    - {id: 8758, cat: Movies, desc: "2020"}
+    - {id: 8808, cat: Movies, desc: "2013"}
+    - {id: 8809, cat: Movies, desc: "2014"}
+    - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
+    - {id: 10293, cat: Movies, desc: "2021"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+
+settings: []
+
+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:
+    - path: "?s={{ .Keywords }}"
+    - path: "/page/2/?s={{ .Keywords }}"
+    - path: "/page/3/?s={{ .Keywords }}"
+
+  rows:
+    selector: article:has(h2)
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: span.term-badge
+      attribute: class
+      filters:
+        - name: regexp
+          args: (\d+)
+    title:
+      selector: h2
+      filters:
+        - name: replace
+          args: ["Full Movie ", ""]
+        - name: replace
+          args: ["Torrent Magnet ", ""]
+        - name: replace
+          args: ["Download ", ""]
+    details:
+      selector: h2 > a
+      attribute: href
+    download:
+      selector: h2 > a
+      attribute: href
+    poster:
+      selector: a[data-src]
+      attribute: data-src
+    date:
+      selector: time
+      attribute: datetime
+    size:
+      text: "5 GB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine wordpress

src/Jackett.Common/Definitions/mvgroupforum.yml

@@ -96,7 +96,7 @@ settings:
     default: false
   - name: dropbbc
     type: checkbox
-    label: Drop "BBC " from the front of result titles
+    label: Drop BBC & other channels from the front of result titles
     default: false
   - name: stripS01E01
     type: checkbox
@@ -165,7 +165,35 @@ search:
       selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
       filters:
         - name: re_replace
-          args: ["^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
         - name: append
           args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
     details:

src/Jackett.Common/Definitions/mvgroupmain.yml

@@ -96,7 +96,7 @@ settings:
     default: false
   - name: dropbbc
     type: checkbox
-    label: Drop "BBC " from the front of result titles
+    label: Drop BBC & other channels from the front of result titles
     default: false
   - name: stripS01E01
     type: checkbox
@@ -165,7 +165,35 @@ search:
       selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
       filters:
         - name: re_replace
-          args: ["^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
         - name: append
           args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
     details:

src/Jackett.Common/Definitions/nethd.yml

@@ -1,12 +1,14 @@
 ---
 id: nethd
 name: NetHD
-description: "NetHD (VietTorrent) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
+description: "NetHD (VietTorrent) is a VIETNAMESE Semi-Private Torrent Tracker for HD MOVIES / TV"
 language: vi-vn
 type: semi-private
 encoding: UTF-8
 links:
-  - http://nethd.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
+  - https://nethd.org/
+legacylinks:
+  - http://nethd.org/ # site forces https
 
 caps:
   categorymappings:
@@ -118,33 +120,19 @@ search:
         - name: prepend
           args: "download.php?id="
     date:
-      # 2020-10-05<br/>14:43:24
-      selector: td:nth-child(5):contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    date:
-      # 2 days<br/>23 hours
-      selector: td:nth-child(5):not(:contains("-"))
-      optional: true
+      # 2 ngày<br/>23 giờ
+      selector: td:nth-child(5)
       filters:
         - name: re_replace
-          args: ["year|years", "years "]
+          args: ["năm", "years "]
         - name: re_replace
-          args: ["month|months", "months "]
+          args: ["tháng", "months "]
         - name: re_replace
-          args: ["week|weeks", "weeks "]
+          args: ["ngày", "days "]
         - name: re_replace
-          args: ["day|days", "days "]
+          args: ["phút", "minutes "]
         - name: re_replace
-          args: ["second|seconds", "seconds "]
-        - name: re_replace
-          args: ["minute|minutes", "minutes "]
-        - name: re_replace
-          args: ["hour|hours", "hours "]
+          args: ["giờ", "hours "]
         - name: timeago
     size:
       selector: td:nth-child(6)