rgfootball: refresh cats

added poster, imdbid
new comments column bumps other columns out by 1

.github/workflows/winget.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@latest
+      - uses: vedantmgoyal2009/winget-releaser@v1
         with:
           identifier: Jackett.Jackett
           token: ${{ secrets.WINGET }}

README.md

@@ -32,7 +32,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anidex
  * AniLibria
  * AnimeClipse
- * Animedia
  * Anime Tosho
  * AniRena
  * AniSource
@@ -46,8 +45,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BT4G
  * BTDIGG
  * BTMET
- * BTmirror
  * BTSOW
+ * BullTorrent
  * Byrutor
  * CloudTorrents
  * comicat
@@ -58,6 +57,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Demonoid
  * DivxTotal
  * dmhy
+ * Dodder (菟丝子资源社区)
  * DonTorrent
  * E-Hentai
  * elitetorrent
@@ -99,15 +99,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
- * NewPCT.me
  * Newstudio
  * Nipponsei
- * Nitro
  * NNTT
  * NoNaMe Club (NNM-Club)
  * Nyaa.si
  * OneJAV
- * OpenSharing
  * ParnuXi
  * PC-torrent
  * PiratBit
@@ -118,7 +115,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoTorrent
  * Portugas
  * ProPorn
- * ProStyleX
  * Rapidzona
  * RARBG
  * RinTor
@@ -139,7 +135,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Pirate Bay (TPB)
  * Tokyo Tosho
  * Torlock
- * Torlook
  * Torrent[CORE]
  * Torrent Downloads (TD)
  * Torrent Oyun indir
@@ -160,8 +155,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
  * Torrentz2eu
+ * Torrentz2nz
+ * TrahT
  * truPornolabs
- * Underverse
  * UnionDHT
  * VSTHouse
  * VST Torrents
@@ -180,6 +176,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Anime-Free
  * AnimeLayer
  * ArenaBG
+ * BitNova
  * BookTracker
  * BootyTape
  * Catorrent
@@ -196,11 +193,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Fou-Du-Cinema
  * Gay-Torrents.net
  * Genesis-Movement
- * HamsterStudio
  * HD-CzTorrent
  * HDGalaKtik
  * HunTorrent
- * KinoNaVse100
  * Kinorun
  * Kinozal
  * LostFilm.tv
@@ -225,7 +220,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sharewood
  * SkTorrent
  * SkTorrent-org
- * SoundPark
  * themixingbowl (TMB)
  * Toloka.to
  * Torrent-Explosiv
@@ -244,6 +238,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT)
+ * 3Evils
  * 4thD (4th Dimension)
  * 52PT
  * Abnormal
@@ -256,8 +251,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Aither
  * AlphaRatio (AR)
  * AmigosShareClub
- * anasch.cc
  * AnimeBytes (AB)
+ * AnimeTracker
  * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
  * AnimeWorld
  * Anthelion
@@ -276,7 +271,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BeyondHD (BHD)
  * Bibliotik
  * Bit-Bázis
- * Bit-City Reloaded
  * BIT-HDTV
  * Bitded
  * Bithorlo (BHO)
@@ -287,7 +281,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BiTTuRK
  * BJ-Share (BJ)
  * BlueBird [![(invite needed)][inviteneeded]](#)
- * Blues-Brothers
  * Blutopia (BLU)
  * Borgzelle [![(invite needed)][inviteneeded]](#)
  * Boxing Torrents
@@ -295,7 +288,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadcasTheNet (BTN)
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BreizhPeers
  * BrSociety
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
@@ -322,7 +314,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
- * CrypticHaven Comedy Club (CCC)
  * DANISH BYTES
  * Darius Tracker
  * Dark-Shadow
@@ -335,7 +326,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DivTeam
  * DocsPedia
  * Dream Tracker
- * EbookParadijs
  * Ebooks-Shares
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
@@ -345,11 +335,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeTorrents
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
+ * Fantastic Heaven
  * Fantastiko
  * Femdomcult
  * FileList (FL)
- * Film-Paleis
  * FinElite (FE)
  * FinVip
  * FunFile (FF)
@@ -361,7 +350,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Generation-Free
  * GFXPeers
  * GigaTorrents
- * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
+ * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
@@ -371,19 +360,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HappyFappy
  * Hawke-uno
  * HD Dolby
- * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
  * HD-Olimpo
  * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
  * HD-Space (HDS)
  * HD-Spain [![(invite needed)][inviteneeded]](#)
  * HD-Torrents (HDT)
+ * HD-UNiT3D
  * HD4FANS [![(invite needed)][inviteneeded]](#)
  * HDAI
  * HDArea (HDA)
  * HDAtmos
  * HDBits [![(invite needed)][inviteneeded]](#)
- * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDFans
@@ -397,8 +385,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
+ * HellasHut
+ * HHanClub
  * House of Devil
- * HQSource (HQS)
+ * iHDBits
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
@@ -420,7 +410,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * leech24
  * LegacyHD (HD4Free)
  * LemonHD
- * Libble [![(invite needed)][inviteneeded]](#)
+ * Libble
  * LibraNet (LN)
  * LinkoManija [![(invite needed)][inviteneeded]](#)
  * Locadora
@@ -431,13 +421,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
- * MediaMaatjes
  * MegamixTracker
  * MeseVilág (Fairytale World)
  * Milkie
  * MIRcrew
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
+ * MOJBLiNK
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
@@ -445,13 +435,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
- * NBTorrents
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
- * NetCosmo
  * NorBits
+ * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
- * Oppaitime
  * Orpheus
  * OshenPT
  * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
@@ -460,7 +448,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Partis
  * PassThePopcorn (PTP)
  * Peeratiko
- * PeerJunkies
  * Peers.FM
  * PigNetwork
  * PirateTheNet (PTN)
@@ -470,7 +457,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PolishSource (PS)
  * PolishTracker
  * Pornbay [![(invite needed)][inviteneeded]](#)
- * PornBits (PB)
  * PotUK
  * Pretome
  * PrivateHD (PHD)
@@ -485,7 +471,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PuntoTorrent
  * PuroVicio
  * PuTao
- * Puur-Hollands
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
@@ -504,12 +489,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SceneTime
  * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
+ * SeedFile
  * Shareisland
  * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SkipTheCommercials
  * SkipTheTrailers
- * slosoul
  * SnowPT (SSPT)
  * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
@@ -525,7 +510,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Superbits (SBS)
  * Swarmazon
  * Tapochek
- * Tasmanit [![(invite needed)][inviteneeded]](#)
+ * Tasmanit
  * Team CT Game (TCTG)
  * TeamHD
  * TeamOS
@@ -534,9 +519,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * teracod (Movie Zone)
  * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
- * The Horror Charnel (THC)
  * The New Retro
  * The Occult [![(invite needed)][inviteneeded]](#)
+ * The Old School
  * The Place [![(invite needed)][inviteneeded]](#)
  * The Shinning (TsH)
  * The Show
@@ -560,7 +545,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentBytes (TBy)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
- * TorrentDB
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
  * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT)
@@ -575,7 +559,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
- * turktracker
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
@@ -585,9 +568,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UHDBits
  * UnionGang
  * UnlimitZ
+ * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)
+ * World-of-Tomorrow
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
@@ -830,7 +815,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 
 -   `-d, --DataFolder`         Specify the location of the data folder (Must be an admin on Windows)
     - e.g. --DataFolder="D:\Your Data\Jackett\".
-    - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the datadir or set the XDG_CONFIG_HOME environment variable.
+    - Don't use this on Unix (mono) systems. On Unix just adjust the HOME directory of the user to the data folder or set the XDG_CONFIG_HOME environment variable.
 
 -   `--NoRestart`              Don't restart after update
 
@@ -846,7 +831,7 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ## Building from source
 
 ### Windows
-* Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
+* Install the .NET 6 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
 * Open PowerShell and from the `src` directory:
 * - run `dotnet msbuild /restore`

install_service_macos

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

src/Jackett.Common/Content/custom.js

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

src/Jackett.Common/Content/index.html

@@ -8,6 +8,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <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) -->
+    <meta name="robots" content="noindex, nofollow"/>
     <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
     <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
     <link rel="icon" type="image/ico" href="../favicon.ico" />
@@ -565,6 +566,7 @@
             {{/if}}
             , {{/each}}
         </p>
+        <datalist id="jackett-search-saved-presets"></datalist>
         <table id="jackett-search-results-datatable" class="dataTable compact cell-border hover stripe">
             <thead>
                 <tr>
@@ -754,6 +756,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20220721002"></script>
+    <script type="text/javascript" src="../custom.js?changed=20221221"></script>
 </body>
 </html>

src/Jackett.Common/Content/login.html

@@ -3,6 +3,7 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta charset="utf-8" />
+    <meta name="robots" content="noindex, nofollow"/>
 
     <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
 

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

@@ -6,23 +6,18 @@ language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
+requestDelay: 2
 links:
   - https://1337x.to/
   - https://1337x.st/
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.bet/
-  - https://1337x.nocensor.world/
+  - https://1337x.unblockit.pet/
+  - https://1337x.nocensor.lol/
   - https://1337x.unblockninja.com/
 legacylinks:
-  - https://1337x.unblocked.monster/
-  - https://1337x.unblockit.li/
-  - https://1337x.unblockit.uno/
   - https://1337x.is/
-  - https://1337x.unblockit.ch/
-  - https://1337x.nocensor.space/
-  - https://1337x.unblockit.ws/
   - https://1337x.nocensor.work/
   - https://1337x.unblockit.kim/
   - https://1337x.unblockit.bz/
@@ -37,6 +32,11 @@ legacylinks:
   - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
   - https://1337x.unblockit.ist/
+  - https://1337x.unblockit.bet/
+  - https://1337x.unblockit.cat/
+  - https://1337x.unblockit.nz/
+  - https://1337x.nocensor.world/
+  - https://1337x.unblockit.page/
 
 caps:
   categorymappings:

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

@@ -125,9 +125,15 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img.lazyload
+      attribute: data-src
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(5) > span[title]
       attribute: title
       optional: true
       filters:
@@ -137,7 +143,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(5):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -147,13 +153,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(6)
     seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(7)
     leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(8)
     grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(9)
     downloadvolumefactor:
       case:
         img.pro_free: 0

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

@@ -0,0 +1,181 @@
+---
+id: 3evils
+name: 3Evils
+description: "3Evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://3evils.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC, desc: "Apps"}
+    - {id: 24, cat: Books, desc: "Books/Magazines"}
+    - {id: 12, cat: TV/Anime, desc: "Movies/Anime"}
+    - {id: 31, cat: Movies, desc: "Movies/FooKaS RG"}
+    - {id: 84, cat: Movies, desc: "Movies/Kids"}
+    - {id: 55, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"}
+    - {id: 70, cat: Movies/WEB-DL, desc: "Movies/WEBRip"}
+    - {id: 71, cat: Movies/HD, desc: "Movies/x265"}
+    - {id: 64, cat: Movies/SD, desc: "Movies/XViD"}
+    - {id: 26, cat: Audio/Lossless, desc: "Music/FLAC"}
+    - {id: 10, cat: Audio/MP3, desc: "Music/MP3"}
+    - {id: 63, cat: Audio/Video, desc: "Music/Videos"}
+    - {id: 29, cat: Movies, desc: "Movies/Packs"}
+    - {id: 19, cat: Audio, desc: "Music/Packs"}
+    - {id: 61, cat: TV/Anime, desc: "TV/Anime"}
+    - {id: 85, cat: TV, desc: "TV/Kids"}
+    - {id: 86, cat: TV, desc: "TV/Packs"}
+    - {id: 82, cat: TV/Sport, desc: "TV/Sports"}
+    - {id: 36, cat: TV/HD, desc: "TV/x265"}
+    - {id: 45, 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: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    perm_ssl: ""
+  error:
+    - selector: td.embedded: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 }}"
+
+  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[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:nth-last-child(9)
+    # 2 flavours of dates
+    date_day:
+      # Today<br> 10:20 AM
+      # Yesterday<br> 08:03 PM
+      selector: td:nth-last-child(7):contains("day")
+      # auto adjusted by site account profile
+      optional: true
+    date_year:
+      # Feb 14 2019<br> 10:20 AM
+      selector: td:nth-last-child(7):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM"
+    date:
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-last-child(6)
+    grabs:
+      selector: td:nth-last-child(5)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    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/Bittorrentfiles.yml

@@ -130,11 +130,11 @@ settings:
 
 login:
   path: signin.php
-  method: form
-  form: form
+  method: post
   inputs:
     user: "{{ .Config.user }}"
     pass: "{{ .Config.pass }}"
+    returnto: "%2Fbrowse.php"
   error:
     - selector: .error
   test:

src/Jackett.Common/Definitions/abnormal.yml

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

src/Jackett.Common/Definitions/abtorrents.yml

@@ -137,25 +137,23 @@ search:
       attribute: href
     files:
       selector: td:nth-last-child(9)
-    date_yday:
+    date_day:
       # Yesterday<br/>6:00 AM
       selector: td:nth-last-child(7):contains("day")
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     date_year:
       # Aug 6 2021<br/>7:25 PM
       selector: td:nth-last-child(7):not(:contains("day"))
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 3:04 PM -07:00"
+          args: "Jan 2 2006 3:04 PM"
     date:
-      text: "{{ if or .Result.date_yday .Result.date_year }}{{ or .Result.date_yday .Result.date_year }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-last-child(6)
     grabs:

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

@@ -140,8 +140,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -27,7 +27,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
 
@@ -115,11 +115,10 @@ search:
       selector: td:nth-last-child(2)
     date:
       selector: td:last-child
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "060102 15:04:05 -07:00"
+          args: "060102 15:04:05"
     downloadvolumefactor:
       case:
         img[src="images/freeleech.png"]: 0 # dl not counted

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

@@ -107,7 +107,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -117,6 +117,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -126,8 +137,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -152,4 +168,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.2.1
+# json UNIT3D 6.4.0

src/Jackett.Common/Definitions/amigosshare.yml

@@ -5,6 +5,7 @@ description: "Amigos Share Club is a Brazilian Private site for TV / MOVIES / GE
 language: pt-BR
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://cliente.amigos-share.club/
 legacylinks:
@@ -298,16 +299,15 @@ search:
         "[src$=\"/outros2.png\"]": 130
     date_optional:
       selector: p:contains("Lançado:")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Lançado: (.+?)$"
         - name: re_replace
           args: [" (\\d:)", " 0$1"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/06 15:04:05 -07:00"
+          args: "02/01/06 15:04:05"
     date:
       text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/anaschcc.yml

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

src/Jackett.Common/Definitions/anilibria.yml

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

src/Jackett.Common/Definitions/animeclipse.yml

@@ -2,7 +2,7 @@
 id: animeclipse
 name: AnimeClipse
 description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
-language: en-US
+language: el-GR
 type: public
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/animetracker.yml

@@ -0,0 +1,171 @@
+---
+id: animetracker
+name: AnimeTracker (API)
+description: "AnimeTracker is a Private Torrent Tracker for HD ANIME / MANGA / HENTAI"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://animetracker.cc/
+
+caps:
+  categorymappings:
+    - {id: 7, cat: TV/Anime, desc: "Series English"}
+    - {id: 16, cat: TV/Anime, desc: "ongoing"}
+    - {id: 11, cat: TV/Anime, desc: "Series Non-English"}
+    - {id: 1, cat: TV/Anime, desc: "Raws"}
+    - {id: 2, cat: TV/Anime, desc: "OVA"}
+    - {id: 4, cat: Movies, desc: "Movie"}
+    - {id: 15, cat: Books/Comics, desc: "Manga"}
+    - {id: 6, cat: XXX, desc: "Hentai Censored"}
+    - {id: 14, cat: XXX, desc: "Hentai Uncensored"}
+    - {id: 9, cat: XXX, desc: "Hentai Manga"}
+    - {id: 10, cat: Movies, desc: "Live Action"}
+    - {id: 3, cat: Audio, desc: "Music"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target =_blank>AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
+      selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 5 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 5 day (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 6.4.0

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

@@ -125,8 +125,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/anisource.yml

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

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

@@ -77,12 +77,16 @@ search:
           args: [",", -1]
     year:
       selector: year
+      optional: true
     _codec:
       selector: codec
     _container:
       selector: container
     _media:
       selector: media
+      filters:
+        - name: replace
+          args: ["WEB", "WEB-DL"]
     _resolution:
       selector: resolution
     _audioFormat:
@@ -99,13 +103,18 @@ search:
     _language:
       selector: language
       optional: true
+    _releaseGroup:
+      selector: releaseGroup
+      optional: true
+      filters:
+        - name: trim
     title:
       selector: title
       filters:
         - name: replace
           args: ["'", "'"]
         - name: append
-          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
+          args: " {{ .Result.year }} {{ .Result._codec }} {{ .Result._container }} {{ .Result._media }} {{ .Result._resolution }} {{ .Result._audioFormat }}{{ if .Result._subbing }} Subs{{ else }}{{ end }}{{ if .Result._flags }} {{ .Result._flags }}{{ else }}{{ end }}{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}{{ if and (.Result._releaseGroup) (ne .Result._releaseGroup \"NULL\") }} -{{ .Result._releaseGroup }}{{ else }}{{ end }}"
     details:
       selector: guid
     download:
@@ -119,6 +128,15 @@ search:
       selector: imdb
     tmdbid:
       selector: tmdb
+    genre:
+      selector: tags
+      filters:
+        - name: replace
+          args: [".", "_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: fileCount
     seeders:
       selector: seeders
     leechers:

src/Jackett.Common/Definitions/arabp2p.yml

@@ -149,11 +149,10 @@ search:
     date:
       selector: td:nth-child(4) span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "2006-01-02 15:04:05"
     seeders:
       selector: td:nth-child(5)
     leechers:

src/Jackett.Common/Definitions/arenabg.yml

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

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -5,15 +5,13 @@ description: "AudioBook Bay (ABB) is a public Torrent Tracker for AUDIOBOOKS"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
-  - https://audiobookbay.fi/
+  - https://audiobookbay.li/
   - https://audiobookbay.se/
-  - https://audiobookbay.unblockit.bet/
+  - https://audiobookbay.unblockit.pet/
 legacylinks:
   - https://audiobookbay.la/
-  - https://audiobookbay.unblockit.uno/
-  - https://audiobookbay.unblockit.ch/
-  - https://audiobookbay.unblockit.ws/
   - http://audiobookbay.net/
   - https://audiobookbay.unblockit.kim/
   - https://audiobookbay.unblockit.bz/
@@ -31,6 +29,11 @@ legacylinks:
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
   - https://audiobookbay.unblockit.ist/
+  - https://audiobookbay.unblockit.bet/
+  - https://audiobookbay.unblockit.cat/
+  - https://audiobookbay.unblockit.nz/
+  - https://audiobookbay.fi/
+  - https://audiobookbay.unblockit.page/
 
 caps:
   categorymappings:
@@ -117,14 +120,16 @@ search:
     # with just 7 results per page, try to grab up to 35 results
     # http://audiobookbay.nl/?s=teeth
     # http://audiobookbay.nl/page/2/?s=teeth
-    - path: "{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/2/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/3/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/4/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
-    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
+    - path: "page/2/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
+    - path: "page/3/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
+    - path: "page/4/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
+    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
 
   rows:
     selector: div.post:has(div[class="postTitle"])
+    filters:
+      - name: andmatch
 
   fields:
     category:
@@ -132,8 +137,27 @@ search:
       filters:
         - name: regexp
           args: "Category: (.+?)\\s"
+    _format:
+      optional: true
+      selector: div.postContent
+      filters:
+        - name: regexp
+          args: "Format: (.+?) /"
+        - name: replace
+          args: ["?", ""]
+    _bitrate:
+      optional: true
+      selector: div.postContent
+      filters:
+        - name: regexp
+          args: "Bitrate: (.+?)File"
+        - name: replace
+          args: ["?", ""]
     title:
       selector: div.postTitle
+      filters:
+        - name: append
+          args: "{{ if .Result._format }} [{{ .Result._format }}]{{ else }}{{ end }}{{ if .Result._bitrate }} [{{ .Result._bitrate }}]{{ else }}{{ end }}"
     details:
       selector: div.postTitle h2 a
       attribute: href
@@ -160,11 +184,7 @@ search:
         - name: regexp
           args: "File Size: (.+?)$"
         - name: replace
-          args: ["MBs", "MB"]
-        - name: replace
-          args: ["GBs", "GB"]
-        - name: replace
-          args: ["KBs", "KB"]
+          args: ["s", ""]
     size:
       text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
     seeders:

src/Jackett.Common/Definitions/audionews.yml

@@ -176,6 +176,8 @@ caps:
     - {id: 233, cat: Other, desc: "GFXNEWS GAME DEVELOPMENT"}
     - {id: 226, cat: Other, desc: "GFXNEWS MAGAZINE"}
     - {id: 234, cat: Other, desc: "GFXNEWS MATERIAL"}
+    - {id: 243, cat: Other, desc: "GFXNEWS OTHER GRAPHICS"}
+    - {id: 244, cat: Other, desc: "GFXNEWS OTHER GRAPHICS Zbrush, Substance tools"}
     - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
     - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
     - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
@@ -183,10 +185,10 @@ caps:
     - {id: 229, cat: Other, desc: "GFXNEWS PHOTOSHOP Background & PSD Source"}
     - {id: 230, cat: Other, desc: "GFXNEWS PHOTOSHOP Brushes & Gradient"}
     - {id: 231, cat: Other, desc: "GFXNEWS PHOTOSHOP Toolkits, Papers & Objects"}
+    - {id: 245, cat: Other, desc: "GFXNEWS PLUGINS"}
     - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
     - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
     - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
-    - {id: 236, cat: Other, desc: "GFXNEWS POSER"}
     - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
     - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
     - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -5,13 +5,15 @@ description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.world/
+  - https://badasstorrents.nocensor.lol/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
   - https://badasstorrents.nocensor.sbs/
+  - https://badasstorrents.nocensor.world/
 
 caps:
   categories:

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

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

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -22,7 +22,7 @@ settings:
   - name: info_oid
     type: info
     label: "About 2FA"
-    default: "If you want to enable 2FA then use the Beyond-HD (OneURL) indexer instead."
+    default: "If you want to enable 2FA then use the Beyond-HD (API) indexer instead."
   - name: username
     type: text
     label: Username

src/Jackett.Common/Definitions/bigfangroup.yml

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

src/Jackett.Common/Definitions/bitbazis.yml

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

src/Jackett.Common/Definitions/bitcityreloaded.yml

@@ -1,161 +0,0 @@
----
-id: bitcityreloaded
-name: Bit-City Reloaded
-description: "Bit-City Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: ISO-8859-1
-links:
-  - https://bc-reloaded.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Other, desc: "Anderes"}
-    - {id: 34, cat: PC, desc: "Appz/Linux"}
-    - {id: 35, cat: PC/Mac, desc: "Appz/Mac"}
-    - {id: 36, cat: PC, desc: "Appz/Other"}
-    - {id: 20, cat: PC/0day, desc: "Appz/Win"}
-    - {id: 4, cat: Books/EBook, desc: "EBooks"}
-    - {id: 10, cat: PC/Games, desc: "Games/PC"}
-    - {id: 15, cat: PC/Mobile-Android, desc: "Handy & PDA"}
-    - {id: 16, cat: Audio/Audiobook, desc: "Hörspiel/Hörbuch"}
-    - {id: 30, cat: Movies/Foreign, desc: "International"}
-    - {id: 43, cat: Movies/3D, desc: "Movie/3D"}
-    - {id: 6, cat: Movies/HD, desc: "Movie/HD 1080p"}
-    - {id: 7, cat: Movies/HD, desc: "Movie/HD 720p"}
-    - {id: 17, cat: Movies/Other, desc: "Movie/MegaPack"}
-    - {id: 9, cat: Movies/SD, desc: "Movie/SD"}
-    - {id: 26, cat: XXX, desc: "Movie/XXX"}
-    - {id: 41, cat: XXX/Other, desc: "Movie/XXX/Other"}
-    - {id: 42, cat: XXX/Pack, desc: "Movie/XXX/Pack"}
-    - {id: 45, cat: Movies/UHD, desc: "Movies/4K"}
-    - {id: 33, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 19, cat: Audio/Video, desc: "Musik Videos"}
-    - {id: 18, cat: Audio, desc: "Musik/MP3/Flac"}
-    - {id: 13, cat: Console/WiiU, desc: "Nintendo"}
-    - {id: 12, cat: Console/PS4, desc: "Playstation"}
-    - {id: 22, cat: TV/HD, desc: "Serie/HD"}
-    - {id: 38, cat: TV, desc: "Serie/Pack"}
-    - {id: 23, cat: TV/SD, desc: "Serie/SD"}
-    - {id: 25, cat: TV/Sport, desc: "Sport"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Anzahl der Torrents beim Durchsuchen</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login/index.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div#login_error
-  test:
-    path: /
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://bc-reloaded.net/uebersicht.php?c7=1&c17=1&showsearch=1&search=2021+720p&blah=0&incldead=1&orderby=added&sort=desc
-    - path: uebersicht.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    showsearch: 1
-    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both, 3 noDVDRip
-    blah: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-    # site does not support imdbid searching or display imdb links in results.
-
-  rows:
-    selector: "table.tableinborder[cellpadding=0] > tbody > tr{{ if .Config.freeleech }}:has(img[src$=\"torrent_ou.gif\"]){{ else }}{{ end }}"
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="uebersicht.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php"]
-      attribute: href
-    date:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(5)
-      filters:
-        - name: re_replace
-          args: ["\u00a0", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
-    size:
-      selector: table tbody tr:nth-of-type(2) > td > b
-    files:
-      selector: td:has(a[href*="&filelist=1"])> b:nth-child(2)
-    grabs:
-      selector: td:has(a[href*="&tosnatchers=1"])> b:nth-child(1)
-    seeders:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(1) font
-    leechers:
-      selector: table tbody tr:nth-of-type(2) td:nth-of-type(2) b:nth-of-type(2) font
-    downloadvolumefactor:
-      case:
-        img[src$="torrent_ou.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="torrent_2u.gif"]: 2
-        "*": 1
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a

src/Jackett.Common/Definitions/bitnova.yml

@@ -0,0 +1,119 @@
+---
+id: bitnova
+name: BitNova
+description: "BitNova is a POLISH Semi-Private Torrent Tracker for 0DAY / GENERAL"
+language: pl-PL
+type: semi-private
+encoding: UTF-8
+links:
+  - https://bitnova.info/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC, desc: "Programy"}
+    - {id: 2, cat: PC/0day, desc: "Programy dla Windows"}
+    - {id: 3, cat: PC, desc: "Programy dla Linux"}
+    - {id: 4, cat: PC/Mac, desc: "Programy dla Mac"}
+    - {id: 5, cat: TV/Anime, desc: "Anime"}
+    - {id: 6, cat: Books, desc: "eBooki"}
+    - {id: 8, cat: Movies, desc: "Dla dzieci"}
+    - {id: 9, cat: Movies, desc: "Filmy"}
+    - {id: 10, cat: Movies/SD, desc: "Filmy (S)VCD"}
+    - {id: 11, cat: Movies/SD, desc: "DivX/XviD"}
+    - {id: 12, cat: Movies/DVD, desc: "Filmy DVD"}
+    - {id: 13, cat: Movies/BluRay, desc: "Filmy HDDVD/BluRay"}
+    - {id: 14, cat: Movies/SD, desc: "Filmy RMVB"}
+    - {id: 15, cat: Movies/HD, desc: "Filmy x264"}
+    - {id: 342, cat: Movies/3D, desc: "Filmy 3D"}
+    - {id: 16, cat: Console, desc: "Gry"}
+    - {id: 17, cat: Console, desc: "Gry na konsole"}
+    - {id: 18, cat: PC/Games, desc: "Gry komputerowe"}
+    - {id: 19, cat: PC/Mobile-Other, desc: "GSM/PDA"}
+    - {id: 20, cat: PC/Mobile-Other, desc: "GSM/PDA Dodatki"}
+    - {id: 21, cat: PC/Mobile-Other, desc: "GSM/PDA Filmy"}
+    - {id: 22, cat: PC/Mobile-Other, desc: "GSM/PDA Gry"}
+    - {id: 23, cat: PC/Mobile-Other, desc: "GSM/PDA Programy"}
+    - {id: 24, cat: Audio, desc: "Muzyka"}
+    - {id: 25, cat: Audio/MP3, desc: "Muzyka Albumy"}
+    - {id: 26, cat: Audio/Video, desc: "Muzyka Teledyski/Koncerty"}
+    - {id: 27, cat: Other, desc: "Różne"}
+    - {id: 28, cat: TV/Sport, desc: "Sport"}
+    - {id: 29, cat: TV, desc: "TV"}
+    - {id: 30, cat: XXX, desc: "Erotyka"}
+
+  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
+
+login:
+  path: login.php?act=login
+  method: post
+  inputs:
+    login: "{{ .Config.username }}"
+    pass: "{{ .Config.password }}"
+    remember: 1
+  error:
+    - selector: div#errmsg
+  test:
+    path: /
+    selector: a[href^="/login.php?act=logout"]
+
+search:
+  paths:
+    - path: search
+  inputs:
+    q: "{{ if .Query.Keywords }}{{ .Query.Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    cid: 0
+
+  rows:
+    selector: table#searchRes > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="/torrenty/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: (\d+)-
+    title:
+      selector: a[href^="/torrent/"]
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/torrent/"]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/torrent/", "/torrent/download/"]
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
+    date:
+      selector: td:nth-last-child(1)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+# engine v2.0

src/Jackett.Common/Definitions/bitsearch.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
-  - https://bitsearch.nocensor.world/
+  - https://bitsearch.nocensor.lol/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/
+  - https://bitsearch.nocensor.world/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bitsexy.yml

@@ -121,7 +121,7 @@ search:
 
   keywordsfilters:
     - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
+      args: ["(\\w+)", "+$1"] # prepend + to each word
 
   rows:
     selector: div.torrentrow:has(a[href^="download.php?torrent="])
@@ -151,20 +151,20 @@ search:
           args: "src=(.*?) width"
     files:
       selector: div.torrenttable:nth-last-child(7)
-    date_year:
-      # Jul 4 2019 08:04 AM
-      selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
     date_day:
       # Today 02:40 PM
       # Yesterday 09:10 AM
       selector: div.torrenttable:nth-last-child(5):contains("day")
+      # auto adjusted by site account profile
       optional: true
+    date_year:
+      # Jul 4 2019 08:04 AM
+      selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/bitturk.yml

@@ -6,9 +6,10 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
-  - http://bitturk.net/ # site does not support https ERR_CONNECTION_REFUSED
+  - https://bitturk.net/
 legacylinks:
   - http://www.bitturk.net/
+  - http://bitturk.net/
 
 caps:
   categorymappings:
@@ -25,6 +26,8 @@ caps:
     - {id: 79, cat: TV, desc: "BLUTV"}
     - {id: 90, cat: TV, desc: "Disney+"}
     - {id: 91, cat: TV, desc: "Prime Video"}
+    - {id: 93, cat: TV, desc: "Gain"}
+    - {id: 94, cat: TV, desc: "ATVP"}
     - {id: 58, cat: Movies, desc: "Film"}
     - {id: 72, cat: Movies, desc: "Belgesel"}
     - {id: 60, cat: Movies/3D, desc: "3D"}
@@ -57,7 +60,6 @@ caps:
     - {id: 2, cat: Console, desc: "Oyun"}
     - {id: 74, cat: PC/Games, desc: "Oyun PC"}
     - {id: 84, cat: Console/PS3, desc: "Oyun Playstation"}
-    - {id: 85, cat: Console/PS3, desc: "Oyun Playstation 2"}
     - {id: 82, cat: Console/PSP, desc: " Oyun PSP"}
     - {id: 83, cat: Console/Other, desc: "Oyun Gameboy"}
     - {id: 87, cat: Console/XBox, desc: "Oyun XBOX"}
@@ -170,34 +172,34 @@ search:
     download:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
-    date_year:
-      # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
-      optional: true
-      filters:
-        - name: regexp
-          args: "Uploaded (.+?) by"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
     date_day:
       # Uploaded Friday at 05:11 by
       # Uploaded Today at 00:48 by
       # Uploaded Yesterday at 23:57 by
       selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: fuzzytime
+    date_year:
+      # Uploaded 30-01-2019 15:02 by
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: dateparse
+          args: "02-01-2006 15:04"
     date_unix:
       # within the hour (unix)
       selector: abbr[data-time]
       attribute: data-time
       optional: true
     date:
-      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
     size:
       selector: a[rel="torrent_size"]
     seeders:

src/Jackett.Common/Definitions/bluesbrothers.yml

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

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

@@ -6,6 +6,8 @@ language: en-US
 type: private
 encoding: UTF-8
 links:
+  - https://blutopia.cc/
+legacylinks:
   - https://blutopia.xyz/
 
 caps:
@@ -27,7 +29,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.xyz/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.cc/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -71,7 +73,7 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -129,8 +131,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -155,4 +162,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.4.0b
+# json UNIT3D 6.5.0b

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

@@ -16,10 +16,11 @@ caps:
     - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
     - {id: 4, cat: Other, desc: "Arquivos de Auxilio"}
     - {id: 6, cat: Other, desc: "Graduação"}
+    - {id: 7, cat: TV/Documentary, desc: "Documentários"}
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     book-search: [q]
 
 settings:
@@ -111,8 +112,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     downloadvolumefactor:
       # api returns 0=false, 1=true
       selector: freeleech

src/Jackett.Common/Definitions/bt4g.yml

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

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,12 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ws/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.to/
 legacylinks:
   - http://btdiggwzoyrwwbiv.onion.ly/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
   - https://btdiggwzoyrwwbiv.onion.ly/
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ws/ # redirects to spam
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/ # not found
 
 caps:
   categories:

src/Jackett.Common/Definitions/btmirror.yml

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

src/Jackett.Common/Definitions/btsow.yml

@@ -7,13 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.click/
+  - https://btsow.beauty/
 legacylinks:
-  - https://btsow.monster/
-  - https://btsow.casa/
-  - https://btsow.website/
-  - https://btsow.online/
-  - https://btsow.work/
   - https://btsow.store/
   - https://btsow.surf/
   - https://btsow.com/
@@ -24,6 +19,11 @@ legacylinks:
   - https://btsow.one/
   - https://btsow.rest/
   - https://btsow.bar/
+  - https://btsow.click/
+  - https://btsow.cfd/
+  - https://btsow.sbs/
+  - https://btsow.quest/
+  - https://btsow.autos/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bulltorrent.yml

@@ -0,0 +1,120 @@
+---
+id: bulltorrent
+name: BullTorrent
+description: "BullTorrent (formerly TOROS) is a Public torrent index"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://www.bulltorrent.com/
+  - https://toros.nocensor.lol/
+legacylinks:
+  - https://toros.nocensor.space/
+  - https://toros.nocensor.work/
+  - https://www.toros.co/
+  - https://toros.nocensor.biz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: Movies}
+    - {id: 2, cat: Audio, desc: Music}
+    - {id: 3, cat: TV, desc: Television}
+    - {id: 4, cat: PC/Games, desc: Games}
+    - {id: 5, cat: PC, desc: Software}
+    - {id: 6, cat: TV/Anime, desc: Anime}
+    - {id: 7, cat: XXX, desc: Adult}
+    - {id: 8, cat: Books, desc: Ebooks}
+    - {id: 9, cat: TV/Anime, desc: Animation}
+    - {id: 10, cat: Other, desc: Other}
+    - {id: 0, cat: Other, desc: TBC}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    # https://www.bulltorrent.com/all/torrents/2022.html?v=&i=100&sort=added&o=desc
+    - path: "{{ if .Keywords }}all/torrents/{{ .Keywords }}.html?v=&i=100&sort={{ .Config.sort }}&o={{ .Config.type }}{{ else }}trending.html{{ end }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "-"]
+    - name: tolower
+
+  rows:
+    selector: table.table-responsive tr:has(a[href^="/torrent/"])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: td:nth-child(1)
+      attribute: class
+      filters:
+        - name: regexp
+          args: (\d+)
+    title:
+      selector: a[href^="/torrent/"]
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    date_day:
+      selector: td:nth-child(2):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date_ago:
+      selector: td:nth-child(2):contains("ago")
+      optional: true
+      filters:
+        - name: timeago
+    date_year:
+      selector: td:nth-child(2):not(:contains("ago")):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2 Jan -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_ago .Result.date_day }}{{ or .Result.date_year  .Result.date_ago .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: td:nth-child(4)
+    leechers:
+      selector: td:nth-child(5)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -184,11 +184,10 @@ search:
       selector: td:nth-child(3)
     date:
       selector: td:nth-child(5)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-200615:04:05 -07:00"
+          args: "02-01-200615:04:05"
     size:
       selector: td:nth-child(6)
     download:

src/Jackett.Common/Definitions/carphunter.yml

@@ -5,42 +5,43 @@ description: "Carp-Hunter is a HUNGARIAN Private Torrent Tracker for MOVIES / TV
 language: hu-HU
 type: private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://carp-hunter.hu/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng"}
-    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"}
-    - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng"}
-    - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"}
-    - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"}
-    - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun"}
-    - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng"}
-    - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun"}
-    - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng"}
-    - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun"}
-    - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny"}
-    - {id: 19, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 20, cat: PC/Games, desc: "Játék/RIP"}
-    - {id: 24, cat: Other, desc: "Képek"}
-    - {id: 21, cat: Books, desc: "Könyv/Eng"}
-    - {id: 22, cat: Books, desc: "Könyv/Hun"}
-    - {id: 35, cat: TV/Anime, desc: "Mese/Eng"}
-    - {id: 36, cat: TV/Anime, desc: "Mese/Hun"}
-    - {id: 25, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 30, cat: PC/ISO, desc: "Programok/ISO"}
-    - {id: 31, cat: PC/0day, desc: "Programok/RIP"}
-    - {id: 33, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 32, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"}
-    - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"}
-    - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"}
-    - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun"}
-    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
-    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 1, cat: Movies/SD, desc: "Film/Cam/Eng", default: true}
+    - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun", default: true}
+    - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng", default: true}
+    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun", default: true}
+    - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng", default: true}
+    - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun", default: true}
+    - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng", default: true}
+    - {id: 13, cat: Movies/HD, desc: "Film/HD720P/Hun", default: true}
+    - {id: 4, cat: Movies/SD, desc: "Film/SD/Eng", default: true}
+    - {id: 3, cat: Movies/SD, desc: "Film/SD/Hun", default: true}
+    - {id: 18, cat: Movies/UHD, desc: "Film/UHD/Eng", default: true}
+    - {id: 17, cat: Movies/UHD, desc: "Film/UHD/Hun", default: true}
+    - {id: 23, cat: Audio/Audiobook, desc: "Hangosköny", default: true}
+    - {id: 19, cat: PC/Games, desc: "Játék/ISO", default: true}
+    - {id: 20, cat: PC/Games, desc: "Játék/RIP", default: true}
+    - {id: 24, cat: Other, desc: "Képek", default: true}
+    - {id: 21, cat: Books, desc: "Könyv/Eng", default: true}
+    - {id: 22, cat: Books, desc: "Könyv/Hun", default: true}
+    - {id: 35, cat: TV/Anime, desc: "Mese/Eng", default: true}
+    - {id: 36, cat: TV/Anime, desc: "Mese/Hun", default: true}
+    - {id: 25, cat: PC/Mobile-Other, desc: "Mobil", default: true}
+    - {id: 30, cat: PC/ISO, desc: "Programok/ISO", default: true}
+    - {id: 31, cat: PC/0day, desc: "Programok/RIP", default: true}
+    - {id: 33, cat: TV, desc: "Sorozat/Eng", default: true}
+    - {id: 32, cat: TV, desc: "Sorozat/Hun", default: true}
+    - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng", default: true}
+    - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun", default: true}
+    - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng", default: true}
+    - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun", default: true}
+    - {id: 34, cat: XXX, desc: "XXX/Filmek", default: false}
+    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek", default: false}
 
   modes:
     search: [q]
@@ -88,7 +89,7 @@ login:
 search:
   paths:
     - path: browse.php
-      categories: ["!", 34, 39]
+      categories: [1, 2, 8, 7, 16, 15, 14, 13, 4, 3, 18, 17, 23, 19, 20, 24, 21, 22, 35, 36, 25, 30, 31, 33, 32, 29, 28, 27, 26]
     - path: browse.php
       categories: [34, 39]
       inputs:
@@ -146,6 +147,8 @@ search:
     date:
       selector: td:nth-last-child(8)
       filters:
+        - name: regexp
+          args: (\d{4}-\d{2}-\d{2}.\d{2}:\d{2}:\d{2})
         - name: replace
           args: ["\u00a0", " "]
         - name: append

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -140,25 +140,23 @@ search:
     date_day:
       # Yesterday at 10:03:30 PM
       selector: td:nth-child(5):contains("day")
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: re_replace
           args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
     date_year:
       # February 09, 2019, 06:35:08 AM
       selector: td:nth-child(5):not(:contains("day"))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: re_replace
           args: ["[,]|[\\s+]|[//\xa0],\\/g", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "January 02  2006  03:04:05 PM -07:00"
+          args: "January 02  2006  03:04:05 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     seeders:
       selector: td:nth-child(6)
     leechers:

src/Jackett.Common/Definitions/cathoderaytube.yml

@@ -107,7 +107,7 @@ search:
         - name: re_replace # Seasons X-Y --> SX-SY
           args: ["(?i)seasons?\\s*(\\d+)\\s*-\\s*(\\d+)", "S$1-S$2"]
         - name: re_replace # Season X --> S0X
-          args: ["(?i)season\\s*(\\d+)", "S$"]
+          args: ["(?i)season\\s*(\\d+)", "S$1"]
         - name: re_replace
           args: ["(?i)Complete\\s+Series", ""]
     details:
@@ -137,11 +137,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/comicat.yml

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

src/Jackett.Common/Definitions/cpabien.yml

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

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -71,9 +71,12 @@ settings:
       trie-nom-a: title asc
 
 download:
+  before:
+    # request target
+    path: "download_magnet?id={{ re_replace .DownloadUri.AbsoluteUri \"^.*-(\\d+)\\.html\" \"$1\" }}"
   selectors:
-    - selector: a[href^="magnet:"]
-      attribute: href
+    - selector: body
+      usebeforeresponse: true
 
 search:
   paths:

src/Jackett.Common/Definitions/crazyhd.yml

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

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -269,13 +269,12 @@ search:
     date:
       selector: a[onmouseover][href^="torrents-details.php?id="]
       attribute: onmouseover
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: "Partagé Voilà : </b>(.*?)<br"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "01-02-2006 -07:00"
+          args: "01-02-2006"
     downloadvolumefactor:
       case:
         img[src="images/Torrents/free.png"]: 0
@@ -284,4 +283,7 @@ search:
       text: 1
     minimumratio:
       text: 1.0
+    minimumseedtime:
+      # 2 day (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TT3.1

src/Jackett.Common/Definitions/crnaberza.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 61, cat: Movies/HD, desc: "HD Mesano"}
     - {id: 50, cat: PC/Games, desc: "Igre"}
     - {id: 44, cat: Books, desc: "Knjige"}
+    - {id: 80, cat: TV, desc: "Paketi"}
     - {id: 46, cat: Audio, desc: "Koncerti"}
     - {id: 58, cat: Audio/Lossless, desc: "Lossless/Domaće"}
     - {id: 59, cat: Audio/Lossless, desc: "Lossless/Strano"}
@@ -139,26 +140,24 @@ search:
     date_day:
       # Danas<br>08:10 AM
       # Juče<br>06:44 PM
-      optional: true
       selector: td:nth-of-type(6):contains("Danas"), td:nth-of-type(6):contains("Juče")
+      # auto adjusted by site account profile
+      optional: true
       filters:
         - name: replace
           args: ["Danas", "Today"]
         - name: replace
           args: ["Juče", "Yesterday"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
     date_year:
       # Feb 14 2019<br>10:20 AM
-      optional: true
       selector: td:nth-of-type(6):not(:contains("Juče")):not(:contains("Danas"))
+      # auto adjusted by site account profile
+      optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
+          args: "Jan 2 2006 03:04 PM"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:
       selector: td:nth-of-type(7)
     grabs:

src/Jackett.Common/Definitions/crt2fa.yml

@@ -97,7 +97,7 @@ search:
         - name: re_replace # Seasons X-Y --> SX-SY
           args: ["(?i)seasons?\\s*(\\d+)\\s*-\\s*(\\d+)", "S$1-S$2"]
         - name: re_replace # Season X --> S0X
-          args: ["(?i)season\\s*(\\d+)", "S$"]
+          args: ["(?i)season\\s*(\\d+)", "S$1"]
         - name: re_replace
           args: ["(?i)Complete\\s+Series", ""]
     details:
@@ -127,11 +127,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/cryptichaven.yml

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

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

@@ -118,8 +118,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2022-02-28T19:09:44.000000Z
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -18,6 +18,12 @@ caps:
     - {id: 114, cat: Movies/UHD, desc: "Filme UHD"}
     - {id: 140, cat: Movies/BluRay, desc: "Filme BluRay"}
     - {id: 138, cat: Movies, desc: "Filme Pack`s"}
+    # Kids
+    - {id: 143, cat: Movies, desc: "Kids Filme"}
+    - {id: 144, cat: TV, desc: "Kids Serien"}
+    - {id: 145, cat: Audio, desc: "Kids Music"}
+    - {id: 146, cat: Audio, desc: "Kids Audio"}
+    - {id: 147, cat: Books, desc: "Kids EBook"}
     # Serien
     - {id: 60, cat: TV/SD, desc: "Serien SD"}
     - {id: 57, cat: TV/HD, desc: "Serien HD"}
@@ -54,6 +60,7 @@ caps:
     - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
     #  Internal
     - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
     - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
@@ -167,7 +174,7 @@ search:
       attribute: href
       filters:
         - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
+          args: ["details.php?id=", "download_ssl.php?torrent="]
     poster:
       selector: div[id^="details"] img
       attribute: src

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

@@ -106,7 +106,7 @@ search:
     download:
       selector: download_link
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -116,6 +116,19 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(All Sex)", "All_Sex"]
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -125,8 +138,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -151,4 +169,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.3.0
+# json UNIT3D 6.4.1

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,18 +10,12 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
-  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
-  - https://demonoid.unblockit.bet/
-  - https://demonoid.torrentbay.to/
-  - https://demonoid.nocensor.world/
-legacylinks:
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.li/
-  - https://demonoid.unblockit.uno/
-  - https://demonoid.unblockit.ch/
-  - https://demonoid.nocensor.space/
-  - https://demonoid.unblockit.ws/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
+  - https://demonoid.unblockit.pet/
+  - https://demonoid.torrentbay.to/
+  - https://demonoid.nocensor.lol/
+legacylinks:
   - https://demonoid.nocensor.work/
   - https://demonoid.unblockit.kim/
   - https://demonoid.unblockit.bz/
@@ -35,6 +29,13 @@ legacylinks:
   - https://demonoid.unblockit.name/
   - https://demonoid.nocensor.sbs/
   - https://demonoid.unblockit.ist/
+  - https://demonoid.unblockit.bet/
+  - https://demonoid.unblockit.cat/
+  - https://demonoid.unblockit.nz/
+  - https://demonoid.nocensor.world/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
+  - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
+  - https://demonoid.unblockit.page/
 
 caps:
   categorymappings:
@@ -319,13 +320,20 @@ settings:
 
 login:
   method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
   test:
     path: files/
 
 download:
-  selectors:
-    - selector: a[href^="/files/download/"]:has(i.fa-download)
-      attribute: href
+  infohash:
+    hash:
+      selector: div:contains("Torrent hash") > div.col-md-5 > div
+      filters:
+        - name: replace
+          args: [" ", ""]
+    title:
+      selector: h1[id="torrent--title"]
 
 search:
   paths:

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

@@ -8,6 +8,7 @@ encoding: UTF-8
 links:
   - https://desitorrents.tv/
   - https://desitorrents.rocks/
+  - https://torrent.desi/
 
 caps:
   categorymappings:
@@ -64,13 +65,23 @@ search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
     # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
 
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
   keywordsfilters:
     - name: re_replace
-      args: [^$, "%"]
+      args: ["\\.", " "]
 
   rows:
     selector: data
@@ -79,16 +90,18 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
       selector: details_link
     download:
       selector: download_link
+    infohash:
+      selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -98,6 +111,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -107,25 +131,35 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
       # api returns 0=false, 1=true
       selector: double_upload
       case:
         0: 1 # normal
         1: 2 # double
-    minimumratio:
-      text: 1.0
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
     minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 5.3.0 (custom)
+# json UNIT3D 6.5.0 (custom)

src/Jackett.Common/Definitions/digitalcore.yml

@@ -10,23 +10,23 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/DVD, desc: Movies/DVDR}
     - {id: 2, cat: Movies/SD, desc: Movies/SD}
-    - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
-    - {id: 4, cat: Movies/UHD, desc: Movies/4K}
-    - {id: 38, cat: Movies/UHD, desc: Movies/UHD}
+    - {id: 1, cat: Movies/DVD, desc: Movies/DVDR}
     - {id: 5, cat: Movies/HD, desc: Movies/720p}
     - {id: 6, cat: Movies/HD, desc: Movies/1080p}
+    - {id: 4, cat: Movies/UHD, desc: Movies/2160p}
+    - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
+    - {id: 38, cat: Movies/UHD, desc: Movies/Bluray/UHD}
     - {id: 7, cat: Movies/HD, desc: Movies/PACKS}
-    - {id: 8, cat: TV/HD, desc: TV/720p}
-    - {id: 9, cat: TV/HD, desc: TV/1080p}
-    - {id: 10, cat: TV/SD, desc: TV/SD}
-    - {id: 11, cat: TV/SD, desc: TV/DVDR}
-    - {id: 12, cat: TV/HD, desc: TV/PACKS}
-    - {id: 13, cat: TV/UHD, desc: TV/4K}
-    - {id: 14, cat: TV/HD, desc: TV/BluRay}
+    - {id: 10, cat: TV/SD, desc: Tv/SD}
+    - {id: 11, cat: TV/SD, desc: Tv/DVDR}
+    - {id: 8, cat: TV/HD, desc: Tv/720p}
+    - {id: 9, cat: TV/HD, desc: Tv/1080p}
+    - {id: 13, cat: TV/UHD, desc: Tv/2160p}
+    - {id: 14, cat: TV/HD, desc: Tv/BluRay}
+    - {id: 12, cat: TV/HD, desc: Tv/PACKS}
     - {id: 17, cat: Other, desc: Unknown}
-    - {id: 18, cat: PC/0day, desc: Apps/0day}
+    - {id: 18, cat: PC/0day, desc: Apps/0DAY}
     - {id: 20, cat: PC/ISO, desc: Apps/PC}
     - {id: 21, cat: PC/Mac, desc: Apps/Mac}
     - {id: 33, cat: PC, desc: Apps/Tutorials}
@@ -37,8 +37,11 @@ caps:
     - {id: 39, cat: Audio/Video, desc: Music/DVD}
     - {id: 40, cat: Audio/Video, desc: Music/Bluray}
     - {id: 25, cat: PC/Games, desc: Games/PC}
-    - {id: 26, cat: Console, desc: Games/NSW}
     - {id: 27, cat: PC/Mac, desc: Games/Mac}
+    - {id: 26, cat: Console, desc: Games/Consoles}
+    - {id: 43, cat: Console, desc: Games/ROMS}
+    - {id: 42, cat: XXX/Other, desc: Games/XXX}
+    - {id: 44, cat: Audio/Audiobook, desc: Audiobooks}
     - {id: 28, cat: Books/EBook, desc: Ebooks}
     - {id: 30, cat: XXX/SD, desc: XXX/SD}
     - {id: 31, cat: XXX, desc: XXX/HD}

src/Jackett.Common/Definitions/dimeadozen.yml

@@ -116,7 +116,7 @@ search:
     searchscope: 1
   keywordsfilters:
     - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
+      args: ["(\\w+)", "+$1"] # prepend + to each word
   # does not support multi category filtering
   # does not support imdbid searches, does not return imdb link in results
   # does not support sorting

src/Jackett.Common/Definitions/divteam.yml

@@ -157,11 +157,10 @@ search:
       selector: td:nth-child(4)
     date:
       selector: td:nth-child(6)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     seeders:
       selector: td:nth-last-child(4)
     leechers:

src/Jackett.Common/Definitions/dmhy.yml

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

src/Jackett.Common/Definitions/docspedia.yml

@@ -29,10 +29,11 @@ caps:
     - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
     - {id: 61, cat: Other, desc: "Tutorials"}
+    - {id: 81, cat: Books, desc: "Wordpress"}
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     book-search: [q]
     music-search: [q]
 
@@ -138,22 +139,22 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-    date_year:
-      remove: a
-      # Jul 4 2019 08:04 AM
-      selector: div.torrenttable:nth-child(2):not(:contains("day"))
-      optional: true
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
     date_day:
       remove: a
       # Today 02:40 PM
       # Yesterday 09:10 AM
       selector: div.torrenttable:nth-child(2):contains("day")
+      # auto adjusted by site account profile
       optional: true
+    date_year:
+      remove: a
+      # Jul 4 2019 08:04 AM
+      selector: div.torrenttable:nth-child(2):not(:contains("day"))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     minimumratio:

src/Jackett.Common/Definitions/dodder.yml

@@ -0,0 +1,75 @@
+---
+id: dodder
+name: Dodder
+description: "Dodder (菟丝子资源社区) is a CHINESE Public BitTorrent DHT search engine"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  - https://dodder.top/
+
+caps:
+  categories:
+    Other: Other
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  infohash:
+    hash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: b
+      attribute: title
+      filters:
+        - name: validfilename
+
+search:
+  paths:
+    - path: /
+  inputs:
+    fileName: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: table.dodder-torrent-list > tbody > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: Other
+    title:
+      selector: a[href^="/info/"]
+      attribute: title
+    details:
+      selector: a[href^="/info/"]
+      attribute: href
+    download:
+      selector: a[href^="/info/"]
+      attribute: href
+    date:
+      selector: div.layui-hide-xs
+      filters:
+        - name: dateparse
+          args: "2006-01-02 15:04:05"
+    size:
+      selector: span.layui-bg-gray
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    description:
+      selector: span.layui-row
+      remove: span.layui-badge
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/dreamtracker.yml

@@ -21,6 +21,7 @@ caps:
     - {id: 17, cat: Movies/Other, desc: "Cartoon Sub. Embed."}
     - {id: 31, cat: Movies/Other, desc: "Cartoon in Greek "}
     - {id: 107, cat: Movies/Other, desc: "Kids in Greek"}
+    - {id: 120, cat: Movies/Other, desc: "Cartoon Series"}
     - {id: 88, cat: Audio/Other, desc: "Music Kids"}
     # Movies Subs No Embed.
     - {id: 38, cat: Movies, desc: "Movies Subs No Embed."}
@@ -76,6 +77,7 @@ caps:
     - {id: 83, cat: Books/EBook, desc: "Ebooks"}
     - {id: 110, cat: Books/Mags, desc: "EMagazines"}
     - {id: 82, cat: Other, desc: "Pics & Images"}
+    - {id: 119, cat: Audio/Audiobook, desc: "Audio Books"}
     # Games
     - {id: 2, cat: PC/Games, desc: "Games"}
     - {id: 27, cat: PC/Games, desc: "PC"}
@@ -89,6 +91,7 @@ caps:
     - {id: 94, cat: Audio/Lossless, desc: "Foreign Flac"}
     - {id: 117, cat: Audio, desc: "Compact Disc Club"}
     - {id: 20, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 118, cat: Audio, desc: "Dream Radio Music"}
 
   modes:
     search: [q]
@@ -164,34 +167,34 @@ search:
     download:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
-    date_year:
-      # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
-      optional: true
-      filters:
-        - name: regexp
-          args: "Uploaded (.+?) by"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
     date_day:
       # Uploaded Friday at 05:11 by
       # Uploaded Today at 00:48 by
       # Uploaded Yesterday at 23:57 by
       selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
       optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: fuzzytime
+    date_year:
+      # Uploaded 30-01-2019 15:02 by
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      # auto adjusted by site account profile
+      optional: true
+      filters:
+        - name: regexp
+          args: "Uploaded (.+?) by"
+        - name: dateparse
+          args: "02-01-2006 15:04"
     date_unix:
       # within the hour (unix)
       selector: abbr[data-time]
       attribute: data-time
       optional: true
     date:
-      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year .Result.date_unix }}{{ or .Result.date_day .Result.date_year .Result.date_unix }}{{ else }}now{{ end }}"
     size:
       selector: a[rel="torrent_size"]
     seeders:

src/Jackett.Common/Definitions/ebookparadijs.yml

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

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

@@ -349,17 +349,17 @@ search:
     download:
       selector: a[href^="torrents-details.php?id="]
       attribute: href
-    seeders:
-      selector: td:nth-child(4)
-    leechers:
-      selector: td:nth-child(5)
     size:
+      selector: td:nth-child(5)
+    seeders:
       selector: td:nth-child(6)
-    description:
+    leechers:
       selector: td:nth-child(7)
+    description:
+      selector: td:nth-child(4)
       filters:
         - name: prepend
-          args: "wait: "
+          args: "uploader: "
     date:
       text: now
     downloadvolumefactor:

src/Jackett.Common/Definitions/ehentai.yml

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

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

@@ -5,14 +5,11 @@ description: "EliteTorrent.biz is a Public torrent site for TV, movies and docum
 language: es-ES
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.elitetorrent.com/
-  - https://elitetorrent.nocensor.world/
+  - https://elitetorrent.nocensor.lol/
 legacylinks:
-  - https://www.elitetorrent.biz/
-  - https://www.elitetorrent.io/
-  - https://www.elitetorrent.one/
-  - https://www.elitetorrent.is/
   - https://www.elitetorrent.nu/
   - https://www.elitetorrent.tv/
   - https://www.elitetorrent.li/
@@ -32,6 +29,7 @@ legacylinks:
   - https://www.elitetorrent.wtf/
   - https://www.elitetorrent.dev/
   - https://elitetorrent.nocensor.sbs/
+  - https://elitetorrent.nocensor.world/
 
 caps:
   categories:

src/Jackett.Common/Definitions/empornium.yml

@@ -141,11 +141,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -136,11 +136,10 @@ search:
     date:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/eniahd.yml

@@ -108,7 +108,7 @@ search:
     - name: diacritics
       args: replace
     - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
+      args: ["(\\w+)", "+$1"] # prepend + to each word
     - name: re_replace # S01 to сезон 1
       args: ["(?i)S0*(\\d+)", "сезон $1"]
     - name: re_replace # S01E01 to сезон 1 серии 1

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

@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.bet/
-  - https://extratorrent.nocensor.world/
+  - https://extratorrent.unblockit.pet/
+  - https://extratorrent.nocensor.lol/
 legacylinks:
   - https://extratorrent.nocensor.work/
   - https://extratorrent.unblockit.kim/
@@ -23,6 +23,11 @@ legacylinks:
   - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
   - https://extratorrent.unblockit.ist/
+  - https://extratorrent.unblockit.bet/
+  - https://extratorrent.unblockit.cat/
+  - https://extratorrent.unblockit.nz/
+  - https://extratorrent.nocensor.world/
+  - https://extratorrent.unblockit.page/
 
 caps:
   categorymappings:
@@ -69,6 +74,7 @@ caps:
     - {id: Comics, cat: Books/Comics, desc: Books Comics}
     - {id: Ebooks, cat: Books/EBook, desc: Books Ebook}
     - {id: Other, cat: Other/Misc, desc: Other}
+    - {id: Other Applications, cat: PC, desc: Other Applications}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/extremebits.yml

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

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -114,7 +114,7 @@ search:
     order: "{{ .Config.type }}"
   keywordsfilters:
     - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
+      args: ["(\\w+)", "+$1"] # prepend + to each word
 
   rows:
     selector: table.xtrz > tbody > tr[class^="ttable_col"]
@@ -151,11 +151,10 @@ search:
           args: "src=(.+?) "
     date:
       selector: td:nth-last-child(1)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
+          args: "02.01.200615:04:05"
     leechers:
       selector: td:nth-last-child(2)
     seeders:

src/Jackett.Common/Definitions/exttorrents.yml

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

src/Jackett.Common/Definitions/eztv.yml

@@ -13,20 +13,13 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.bet/
-  - https://eztv.nocensor.world/
+  - https://eztv.unblockit.pet/
+  - https://eztv.nocensor.lol/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.unblocked.monster/
-  - https://eztv.unblockit.li/
-  - https://eztv.unblockit.uno/
-  - https://eztv.unblockit.ch/
-  - https://eztv.nocensor.space/
-  - https://eztv.unblockit.ws/
-  - https://eztv.nocensor.work/
   - https://eztv.unblockit.kim/
   - https://eztv.unblockit.bz/
   - https://eztv.unblockit.tv/
@@ -39,6 +32,11 @@ legacylinks:
   - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
   - https://eztv.unblockit.ist/
+  - https://eztv.unblockit.bet/
+  - https://eztv.unblockit.cat/
+  - https://eztv.unblockit.nz/
+  - https://eztv.nocensor.world/
+  - https://eztv.unblockit.page/
 
 caps:
   categories:

src/Jackett.Common/Definitions/falkonvisionteam.yml

@@ -120,13 +120,12 @@ search:
       attribute: src
     date:
       selector: td:nth-child(2)
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: "(\\d{2}-\\d{2}-\\d{2} \\d{2}:\\d{2})"
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-06 15:04 -07:00"
+          args: "02-01-06 15:04"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -10,53 +10,48 @@ links:
 
 caps:
   categorymappings:
-    - {id: 58, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
-    - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
-    - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
-    - {id: 170, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 169, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 183, cat: Movies/SD, desc: "Filme Packs SD"}
-    - {id: 184, cat: Movies/HD, desc: "Filme Packs 720p"}
-    - {id: 185, cat: Movies/HD, desc: "Filme Packs 1080p"}
-    - {id: 186, cat: Movies/UHD, desc: "Filme Packs 2160p"}
-    - {id: 172, cat: Movies/SD, desc: "Film-Klassiker SD"}
-    - {id: 173, cat: Movies/HD, desc: "Film-Klassiker 720p"}
-    - {id: 174, cat: Movies/HD, desc: "Film-Klassiker 1080p"}
-    - {id: 175, cat: Movies/UHD, desc: "Film-Klassiker 2160p"}
-    - {id: 180, cat: Movies/DVD, desc: "Film-Klassiker DVD"}
-    - {id: 181, cat: Movies/BluRay, desc: "Film-Klassiker Bluray"}
-    - {id: 182, cat: Movies/3D, desc: "Film-Klassiker 3D"}
-    - {id: 176, cat: Movies/SD, desc: "Film-Klassiker Pack SD"}
-    - {id: 177, cat: Movies/HD, desc: "Film-Klassiker Pack 720p"}
-    - {id: 178, cat: Movies/HD, desc: "Film-Klassiker Pack 1080p"}
-    - {id: 179, cat: Movies/UHD, desc: "Film-Klassiker Pack 2160p"}
-    - {id: 64, cat: TV/SD, desc: "Serien SD"}
-    - {id: 65, cat: TV/HD, desc: "Serien 720p"}
-    - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
-    - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
-    - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"}
-    - {id: 167, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 187, cat: TV/SD, desc: "Serienpacks SD"}
-    - {id: 188, cat: TV/HD, desc: "Serienpacks 720p"}
-    - {id: 189, cat: TV/HD, desc: "Serienpacks 1080p"}
-    - {id: 190, cat: TV/UHD, desc: "Serienpacks 2160p"}
-    - {id: 191, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"}
-    - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
-    - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 73, cat: Audio, desc: "Audio Packs"}
-    - {id: 153, cat: Audio/Audiobook, desc: "Hörbücher"}
-    - {id: 192, cat: PC/Games, desc: "Spiele Windows"}
-    - {id: 193, cat: PC, desc: "Software Windows"}
-    - {id: 90, cat: Books/Mags, desc: "Zeitschriften"}
-    - {id: 89, cat: Books/EBook, desc: "E-Books"}
-    - {id: 91, cat: XXX/SD, desc: "XXX SD"}
-    - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
-    - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
-    - {id: 171, cat: XXX/Pack, desc: "XXX Packs"}
-    - {id: 94, cat: XXX/ImageSet, desc: "XXX Magazine"}
+    - {id: 157, cat: TV/Documentary, desc: "Doku 1080p"}
+    - {id: 156, cat: TV/Documentary, desc: "Doku 720p"}
+    - {id: 155, cat: TV/Documentary, desc: "Doku SD x264/x265"}
+    - {id: 152, cat: Books, desc: "E-Books"}
+    - {id: 141, cat: Movies/HD, desc: "Filme HD 1080p"}
+    - {id: 154, cat: Movies/HD, desc: "Filme HD 720p"}
+    - {id: 139, cat: Movies/HD, desc: "Filme Packs HD 1080p"}
+    - {id: 106, cat: Movies/HD, desc: "Filme Packs HD 720p"}
+    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD x264/x265"}
+    - {id: 119, cat: Movies/UHD, desc: "Filme Packs UHD 2160p"}
+    - {id: 153, cat: Movies/SD, desc: "Filme SD x264/x265"}
+    - {id: 140, cat: Movies/UHD, desc: "Filme UHD 2160p"}
+    - {id: 104, cat: Movies/HD, desc: "Filmklassiker HD 1080p"}
+    - {id: 103, cat: Movies/HD, desc: "Filmklassiker HD 720p"}
+    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs HD 1080p"}
+    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs HD 720p"}
+    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs UHD 2160p"}
+    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs  x264/x265"}
+    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD x264/x265"}
+    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker UHD 2160p"}
+    - {id: 118, cat: Audio/Audiobook, desc: "Hörbücher"}
+    - {id: 109, cat: Audio/Lossless, desc: "Musik Flac"}
+    - {id: 129, cat: Audio/MP3, desc: "Musik MP3"}
+    - {id: 111, cat: Audio/Lossless, desc: "Musik Packs Flac"}
+    - {id: 112, cat: Audio/MP3, desc: "Musik Packs MP3"}
+    - {id: 113, cat: TV/HD, desc: "Serie HD 1080p"}
+    - {id: 125, cat: TV/HD, desc: "Serie HD 720p"}
+    - {id: 115, cat: TV/Foreign, desc: "Serie International"}
+    - {id: 138, cat: TV/HD, desc: "Serie Packs HD 1080p"}
+    - {id: 116, cat: TV/HD, desc: "Serie Packs HD 720p"}
+    - {id: 144, cat: TV/Foreign, desc: "Serie Packs International"}
+    - {id: 137, cat: TV/SD, desc: "Serie Packs SD x264/x265"}
+    - {id: 143, cat: TV/UHD, desc: "Serie Packs UHD 2160p"}
+    - {id: 133, cat: TV/SD, desc: "Serie SD x264/x265"}
+    - {id: 114, cat: TV/UHD, desc: "Serie UHD 2160p"}
+    - {id: 150, cat: PC/0day, desc: "Windows Apps"}
+    - {id: 149, cat: PC/Games, desc: "Windows Spiele"}
+    - {id: 147, cat: XXX/x264, desc: "XXX HD 1080p"}
+    - {id: 146, cat: XXX/x264, desc: "XXX HD 720p"}
+    - {id: 148, cat: XXX/Pack, desc: "XXX Packs"}
+    - {id: 69, cat: XXX/SD, desc: "XXX SD x264/x265"}
+    - {id: 151, cat: Books/Mags, desc: "Zeitschriften"}
 
   modes:
     search: [q]
@@ -72,6 +67,21 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: pin
+    type: text
+    label: Pin
+  - name: freeleech
+    type: checkbox
+    label: Filter FreeLeech only
+    default: false
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech and OnlyUpload at Fantastic Heaven
+    default: <li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
   - name: sort
     type: select
     label: Sort requested from site
@@ -88,75 +98,84 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
 
 login:
   path: login.php
   method: form
-  form: form[action="/login.php"]
+  form: form[action="../takelogin.php"]
   cookies: ["JAVA=OK"] # avoid jscheck redirect
-  captcha:
-    type: image
-    selector: img[src^="cap/captcha_math.php?codeCaptcha="]
-    input: stringCaptcha
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    loggiin: "einloggen"
+    secure_pin: "{{ .Config.pin }}"
   error:
-    - selector: div#login_error
+    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
   test:
     path: index.php
     selector: a[href="logout.php"]
 
 search:
   paths:
-    - path: selection.php
+    - path: browse.php
   inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
     search: "{{ .Keywords }}"
-    blah: 0
+    # 0 active, 1 all, 2 dead
+    incldead: 1
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
   rows:
-    selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"] > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href^="selection.php?cat="]
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
-        - name: replace
-          args: ["#2", ""]
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details.php?id="] > b
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
-    grabs:
-      selector: div.selection_unter_ae
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
     size:
-      selector: div.selection_unter_ad
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
     seeders:
-      selector: div.selection_unter_aa > b
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
     leechers:
-      selector: div.selection_unter_aaa > b
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
     date:
-      selector: div.selection_unter_ab
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(5)
       filters:
-        - name: replace
-          args: ["um ", ""]
         - name: append
           args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
         - name: dateparse
           args: "02.01.2006 15:04:05 -07:00"
     downloadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/oupic.gif"]: 0 # only upload is counted
+        "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/freeleech.gif"]: 0 # nothing is counted
+        "*": 1
 # engine n/a

src/Jackett.Common/Definitions/fantastiko.yml

@@ -149,8 +149,9 @@ search:
     uploadvolumefactor:
       text: 1
     date_day:
-      optional: true
       selector: td.torrent_name:contains("day"), td.torrent_name:contains("σήμερα"), td.torrent_name:contains("εχθές"), td.torrent_name:contains("Δευτέρα"), td.torrent_name:contains("Τρίτη"), td.torrent_name:contains("Τετάρτη"), td.torrent_name:contains("Πέμπτη"), td.torrent_name:contains("Παρασκευή"), td.torrent_name:contains("Σάββατο"), td.torrent_name:contains("Κυριακή")
+      # auto adjusted by site account profile
+      optional: true
       remove: span, a
       filters:
         - name: replace
@@ -185,8 +186,9 @@ search:
           args: ["Κυριακή", "Sunday"]
         - name: fuzzytime
     date_year:
-      optional: true
       selector: td.torrent_name:contains("-")
+      # auto adjusted by site account profile
+      optional: true
       remove: span, a
       filters:
         - name: replace
@@ -203,12 +205,10 @@ search:
           args: [" τον/την", ""] # him/her
         - name: replace
           args: ["στις ", ""] # at
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "02-01-2006 15:04"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     minimumratio:
       text: 1.0
     minimumseedtime:

src/Jackett.Common/Definitions/femdomcult.yml

@@ -119,12 +119,11 @@ search:
     date_optional:
       selector: td:nth-child(5) > span
       attribute: title
+      # auto adjusted by site account profile
       optional: true
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
+          args: "Jan 02 2006, 15:04"
     date: # some torrents have "Never" date
       text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}20 years ago{{ end }}"
     size:

src/Jackett.Common/Definitions/fenyarnyek-tracker.yml

@@ -146,11 +146,10 @@ search:
           args: "src=(.+?) "
     date:
       selector: td:nth-last-child(11)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "02/01/2006"
     size:
       selector: td:nth-last-child(5)
     seeders:

src/Jackett.Common/Definitions/filelisting.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.nocensor.world/
+  - https://filelisting.nocensor.lol/
 legacylinks:
   - https://filelisting.nocensor.biz/
   - https://filelisting.nocensor.sbs/
+  - https://filelisting.nocensor.world/
 
 caps:
   categorymappings:

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

@@ -1,190 +0,0 @@
----
-id: film-paleis
-name: Film-Paleis
-description: "Film-Paleis is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
-  - https://www.film-paleis.me/
-legacylinks:
-  - http://www.film-paleis.me/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Movies/BluRay, desc: "Bluray/HD"}
-    - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
-    - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
-    - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
-    - {id: 7, cat: Movies/UHD, desc: "4K films"}
-    - {id: 8, cat: XXX, desc: "Erotiek"}
-    - {id: 9, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
-    - {id: 10, cat: Audio, desc: "Muziek Album"}
-    - {id: 11, cat: Audio/Other, desc: "Muziek Diverse"}
-    - {id: 12, cat: Console/NDS, desc: "Nintendo"}
-    - {id: 13, cat: Movies, desc: "Classic"}
-    - {id: 15, cat: Other, desc: "Overige"}
-    - {id: 16, cat: PC/0day, desc: "PC Software"}
-    - {id: 17, cat: PC, desc: "PC Spellen"}
-    - {id: 19, cat: TV, desc: "TV Series"}
-    - {id: 21, cat: Movies/SD, desc: "Divx/Xvid"}
-    - {id: 24, cat: Books/EBook, desc: "E-Books"}
-    - {id: 26, cat: Audio/Other, desc: "Cabaret"}
-    - {id: 27, cat: TV/Documentary, desc: "Documentaire"}
-    - {id: 31, cat: Movies/HD, desc: "FP-release"}
-    - {id: 32, cat: Audio/Audiobook, desc: "Luister Boeken"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: 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: thankyou
-    type: text
-    label: Thank You Comment
-  - name: info
-    type: info
-    label: Thank you comment
-    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above. Minimum of at least 10 characters.
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  before:
-    path: comment.php
-    method: post
-    inputs:
-      action: add
-      tid: "{{ .DownloadUri.Query.id }}"
-      text: "{{ .Config.thankyou }}"
-      submit: Opslaan
-  selectors:
-    - selector: a[href^="download.php?id="]
-      attribute: href
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    incldead: 1
-    # does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # S01E02 to 1 2
-      args: ["(?i)\\bS0*(\\d{1,2})\\s*E0*(\\d{1,2})\\b", "$1 $2"]
-    - name: re_replace # S01 to 1
-      args: ["(?i)\\bS0*(\\d{1,2})\\b", "$1"]
-
-  rows:
-    selector: table.mainouter
-    filters:
-      - name: andmatch
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "S$2-$4"]
-        - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
-        - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "E$2-$4"]
-        - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})", "E$2"]
-        - name: re_replace
-          args: ["(?i)compleet", "Complete"]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    poster:
-      selector: img[src*="/covers/"]
-      attribute: src
-    size:
-      selector: td:nth-child(4) table tr td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "(.+?) in"
-    files:
-      selector: td:nth-child(4) table tr td:nth-child(2)
-      filters:
-        - name: regexp
-          args: "in (\\d+) bestan"
-    grabs:
-      selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
-    date:
-      selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(2)
-      filters:
-        - name: replace
-          args: ["januari", "January"]
-        - name: replace
-          args: ["februari", "February"]
-        - name: replace
-          args: ["maart", "March"]
-        - name: replace
-          args: ["april", "April"]
-        - name: replace
-          args: ["mei", "May"]
-        - name: replace
-          args: ["juni", "June"]
-        - name: replace
-          args: ["juli", "July"]
-        - name: replace
-          args: ["augustus", "August"]
-        - name: replace
-          args: ["september", "September"]
-        - name: replace
-          args: ["oktober", "October"]
-        - name: replace
-          args: ["november", "November"]
-        - name: replace
-          args: ["december", "December"]
-        - name: re_replace
-          args: ["\\s*om\\s*", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
-    seeders_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5)  font b
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      optional: true
-      selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      case:
-        img[src="pic/freedlfsu.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/finelite.yml

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

src/Jackett.Common/Definitions/finvip.yml

@@ -146,11 +146,10 @@ search:
     date:
       # 23/12/2019 07:57
       selector: td:nth-last-child(4)
+      # auto adjusted by site account profile
       filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02/01/2006 15:04 -07:00"
+          args: "02/01/2006 15:04"
     genre:
       selector: td:nth-child(2)
       remove: a

src/Jackett.Common/Definitions/firebit.yml

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

src/Jackett.Common/Definitions/fouducinema.yml

@@ -12,9 +12,13 @@ legacylinks:
 
 caps:
   categorymappings:
+    - {id: 80, cat: Movies, desc: "Enfants Film"}
+    - {id: 82, cat: TV, desc: "Enfants Série"}
     - {id: 1, cat: Movies/SD, desc: "FILM Xvid"}
-    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 101, cat: TV/Documentary, desc: "FILM Documentaire"}
+    - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
     - {id: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
     - {id: 66, cat: Movies/HD, desc: "FILM HDRip"}
     - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
     - {id: 33, cat: Movies/HD, desc: "FILM HDTV"}
@@ -27,10 +31,10 @@ caps:
     - {id: 25, cat: Movies/BluRay, desc: "FILM ISO"}
     - {id: 4, cat: Movies/HD, desc: "FILM 1080"}
     - {id: 2, cat: Movies/DVD, desc: "FILM DVD"}
-    - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
+    - {id: 103, cat: Movies, desc: "FILM Pack"}
     - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
     - {id: 65, cat: TV/HD, desc: "SERIE HDRip"}
-    - {id: 37, cat: TV, desc: "SERIE EPISODE"}
     - {id: 21, cat: TV/HD, desc: "SERIE HDTV.1080p"}
     - {id: 20, cat: TV/HD, desc: "SERIE HDTV.720p"}
     - {id: 19, cat: TV/SD, desc: "SERIE HDTV"}
@@ -40,19 +44,19 @@ caps:
     - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
     - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
     - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
-    - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
+    - {id: 102, cat: TV/Documentary, desc: "SERIE Documentaire"}
     - {id: 67, cat: TV/Anime, desc: "ANIMEE films"}
     - {id: 70, cat: TV/Anime, desc: "ANIMEE Series"}
+    - {id: 95, cat: TV/Anime, desc: "ANIMEE Animée"}
     - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
     - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
     - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
-    - {id: 59, cat: PC, desc: "LOGICIELS "}
     - {id: 44, cat: Books/Mags, desc: "EBOOK Journaux"}
     - {id: 46, cat: Books/Technical, desc: "EBOOK Documents"}
     - {id: 48, cat: XXX/Other, desc: "EBOOK XXX"}
     - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
     - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
-    - {id: 7, cat: PC/Games, desc: "JEUX Win"}
+    - {id: 96, cat: PC/Games, desc: "JEUX Apple"}
     - {id: 8, cat: Console/PS3, desc: "JEUX PS3"}
     - {id: 45, cat: PC/Games, desc: "JEUX PC"}
 

src/Jackett.Common/Definitions/frozenlayer.yml

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

src/Jackett.Common/Definitions/fuzer.yml

@@ -13,7 +13,7 @@ legacylinks:
 caps:
   categorymappings:
     # Movies
-    - {id: 73, cat: Movies, desc: "סרטים"}
+    - {id: 73, cat: Movies, desc: "FuzePacks -סרטים"}
     - {id: 7, cat: Movies/SD, desc: "סרטים"}
     - {id: 60, cat: Movies/SD, desc: "סרטים ישראליים"}
     - {id: 9, cat: Movies/HD, desc: "סרטים HD"}
@@ -24,7 +24,7 @@ caps:
     - {id: 58, cat: Movies/DVD, desc: "סרטים DVD-R"}
     - {id: 83, cat: Movies/Other, desc: "סרטים מדובבים"}
     # TV
-    - {id: 76, cat: TV, desc: "סדרות"}
+    - {id: 76, cat: TV, desc: "FuzePacks - סדרות"}
     - {id: 8, cat: TV/SD, desc: "סדרות"}
     - {id: 62, cat: TV/SD, desc: "סדרות ישראליות"}
     - {id: 10, cat: TV/HD, desc: "Tסדרות HD"}
@@ -34,7 +34,7 @@ caps:
     - {id: 65, cat: TV/Anime, desc: "אנימה"}
     - {id: 64, cat: TV/Sport, desc: "ספורט"}
     # PC
-    - {id: 74, cat: PC, desc: "תוכנות"}
+    - {id: 74, cat: PC, desc: "FuzePacks - תוכנות"}
     - {id: 15, cat: PC/0day, desc: "תוכנות PC"}
     - {id: 11, cat: PC/Games, desc: "משחקים PC"}
     - {id: 13, cat: PC/Mobile-Android, desc: "אפליקציות לאנדרואיד"}
@@ -43,13 +43,13 @@ caps:
     # XXX
     - {id: 16, cat: XXX, desc: "למבוגרים בלבד"}
     # Games
-    - {id: 72, cat: Console, desc: "משחקים"}
+    - {id: 72, cat: Console, desc: "FuzePacks - משחקים"}
     - {id: 55, cat: Console/XBox, desc: "משחקים XBOX"}
     - {id: 12, cat: Console/PSP, desc: "משחקים PS"}
     - {id: 56, cat: Console/Wii, desc: "משחקים WII"}
     - {id: 57, cat: PC/Mobile-Other, desc: "משחקי קונסולות ניידות"}
     # Music
-    - {id: 75, cat: Audio, desc: "שירים"}
+    - {id: 75, cat: Audio, desc: "FuzePacks - שירים"}
     - {id: 14, cat: Audio, desc: "מוזיקה עולמית"}
     - {id: 66, cat: Audio, desc: "מוזיקה ישראלית"}
     - {id: 68, cat: Audio, desc: "פסקולים"}
@@ -116,17 +116,19 @@ search:
     $raw: "{{ range .Categories }}c[]={{.}}&{{end}}"
 
   rows:
-    selector: .box_torrent
+    # Others, Classic
+    selector: .box_torrent, table.tborder[align="center"][border="0"][cellpadding="0"][cellspacing="1"][class="tborder"][width="100%"] > tbody > tr:has(a[href^="/attachment.php?"])
 
   fields:
     category:
-      selector: a[href^="/browse.php?cat="]
+      # Others, Classic
+      selector: a[href^="/browse.php?cat="], a[href^="/browse.php?r3=1&cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
     title:
-      selector: .main_title
+      selector: a[href^="/showthread.php?t="]
     details:
       selector: a[href^="/showthread.php?t="]
       attribute: href
@@ -134,30 +136,30 @@ search:
       selector: a[href^="/attachment.php?attachmentid="]
       attribute: href
     imdbid:
-      selector: span.imdb-inline > a
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
     poster:
       selector: a[imgsrc]
       attribute: imgsrc
     size:
-      selector: td:nth-child(4)
+      selector: td.inline_info:nth-last-child(4)
     grabs:
-      selector: td:nth-child(5)
+      selector: td.inline_info:nth-last-child(3)
       filters:
         - name: replace
           args: [",", ""]
     seeders:
-      selector: td:nth-child(6)
+      selector: td.inline_info:nth-last-child(2)
       filters:
         - name: replace
           args: [",", ""]
     leechers:
-      selector: td:nth-child(7)
+      selector: td.inline_info:nth-last-child(1)
       filters:
         - name: replace
           args: [",", ""]
     date:
-      selector: .up_info2
+      selector: div[class^="up_info"]
       filters:
         - name: append
           args: " +02:00" # IST

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 links:
   - https://www.gamestorrents.fm/
-  - https://gamestorrents.nocensor.world/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/
@@ -16,6 +15,7 @@ legacylinks:
   - https://gamestorrents.nocensor.work/
   - https://gamestorrents.nocensor.biz/
   - https://gamestorrents.nocensor.sbs/
+  - https://gamestorrents.nocensor.world/
 
 caps:
   categorymappings:

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

@@ -5,6 +5,7 @@ description: "Gay-Torrents.net is a Private Torrent Tracker for GAY 3X"
 language: en-US
 type: semi-private
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://www.gay-torrents.net/
 
@@ -87,7 +88,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     book-search: [q]
 
@@ -130,37 +131,40 @@ search:
     freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
   keywordsfilters:
     - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
+      args: ["(\\w+)", "+$1"] # prepend + to each word
 
   rows:
-    selector: ul.TorrentList
+    selector: ul.TorrentList, ul.Torrent-List
 
   fields:
     category:
-      selector: .TorrentList1 > a
+      selector: a[href^="torrentslist.php?type="]
       attribute: href
       filters:
         - name: querystring
           args: type
     title:
-      selector: .TorrentList2 > a
+      selector: a[href^="torrentdetails.php?torrentid="]
+      filters:
+        - name: replace
+          args: ["[FFL] ", ""] # remove freeleech flag from title
     download:
-      selector: .TorrentList2 > a
+      selector: a[href^="torrentdetails.php?torrentid="]
       attribute: href
       filters:
         - name: append
           args: "&do=download"
     details:
-      selector: .TorrentList2 > a
+      selector: a[href^="torrentdetails.php?torrentid="]
       attribute: href
     size:
-      selector: .TorrentList3
+      selector: .TorrentList3, .Torrent-List-Size
     seeders:
-      selector: .TorrentList6
+      selector: .TorrentList6, .Torrent-List-Seeds
     leechers:
-      selector: .TorrentList7
+      selector: .TorrentList7, .Torrent-List-Peers
     date:
-      selector: li.TorrentList8
+      selector: .TorrentList8, .Torrent-List-Date
       filters:
         - name: append
           args: " +02:00" # EET
@@ -168,7 +172,7 @@ search:
           args: "15:04 02-Jan-2006 -07:00"
     downloadvolumefactor:
       case:
-        ".TorrentList2 > a:contains(\"[FFL]\")": 0
+        "a:contains(\"[FFL]\")": 0
         "*": 1
     uploadvolumefactor:
       text: 1

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

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

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -167,13 +167,12 @@ search:
       selector: a[href$="&todlers=1"]
     date:
       selector: .tadded
+      # auto adjusted by site account profile
       filters:
         - name: re_replace
           args: ["(\\d{4}-\\d{2}-\\d{2})(\\d{2}:\\d{2}:\\d{2}).*", "$1 $2"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "2006-01-02 15:04:05"
     downloadvolumefactor:
       case:
         "td:nth-child(3) > div > nobr > font[color=\"yellow\"]": 0

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

@@ -163,8 +163,13 @@ search:
     grabs:
       selector: times_completed
     date:
-      # 2021-10-18T00:34:50.000000Z"
+      # "created_at": "2021-10-18T00:34:50.000000Z" is returned by Newtonsoft.Json.Linq as 18/10/2021 00:34:50
       selector: created_at
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "01/02/2006 15:04:05 -07:00"
     size:
       selector: size
     downloadvolumefactor:
@@ -186,4 +191,4 @@ search:
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# json UNIT3D 6.2.2
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/genesismovement.yml

@@ -116,15 +116,14 @@ search:
       attribute: href
     date:
       selector: div[id^="kt"] > table > tbody > tr > td:contains("Date Added:")
+      # auto adjusted by site account profile
       filters:
         - name: regexp
           args: "(\\d{2}-\\d{2}-\\d{4} at \\d{2}:\\d{2}:\\d{2})"
         - name: replace
           args: [" at ", " "]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
-          args: "02-01-2006 15:04:05 -07:00"
+          args: "02-01-2006 15:04:05"
     size:
       selector: td:nth-last-child(6)
     grabs: