linuxtracker: add new category

*.pe redirects to *.io
*.co does not have the  derniers page.

README.md

@@ -28,6 +28,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 7torrents
  * ACG.RIP
  * ACGsou (36DM)
+ * AngieTorrents
  * Anidex
  * AniLibria
  * AnimeClipse
@@ -36,11 +37,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AniRena
  * AniSource
  * AudioBook Bay (ABB)
+ * Badass Torrents
  * BigFANGroup
  * BitRu
  * BT.etree
  * BT4G
- * BTDB
  * BTDIGG
  * BTSOW
  * Byrutor
@@ -50,15 +51,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * cpasbien
  * cpasbienClone
  * Demonoid
+ * DivxTotal
  * dmhy
  * E-Hentai
- * emtrek
- * Epizod
+ * elitetorrent
+ * EpubLibre
  * Erai-Raws
  * ETTV
  * EXT Torrents
  * ExtraTorrent.cd
- * ExtraTorrent.it
  * EZTV
  * Filebase
  * FireBit
@@ -66,7 +67,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GamesTorrents
  * GkTorrent
  * GloDLS
- * GTorrent
  * GTorrent.pro
  * HDhouse (HDReactor)
  * IBit
@@ -124,7 +124,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ShizaProject
  * shokweb
  * ShowRSS
- * SkyTorrents.to
  * Solid Torrents
  * sosulki
  * SubsPlease
@@ -149,7 +148,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentMafya
  * TorrentMax (토렌트맥스)
  * TorrentParadise
- * TorrentProject
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
  * Torrents.csv
@@ -179,18 +177,19 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BaibaKo
  * BookTracker
  * BootyTape
- * CasStudioTV
  * Catorrent
  * Darmowe torrenty
  * Deildu
  * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
  * EniaHD
- * Erzsebet
- * Erzsebet.pl
  * ExKinoRay
+ * ExtremlymTorrents
+ * Fou-Du-Cinema
+ * Gay-Torrents.net
  * Genesis-Movement
  * HamsterStudio
+ * HD-CzTorrent
  * HunTorrent
  * IV-Torrents
  * KinoNaVse100
@@ -207,11 +206,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLab
  * PussyTorrents
  * Rainbow Tracker
+ * RGFootball
  * RiperAM
  * RockBox
  * RuTracker
  * Rustorka
- * SDkino
  * Sharewood
  * SkTorrent
  * SkTorrent-org
@@ -229,13 +228,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * 0day.kiev
  * 1ptbar
- * 2 Fast 4 You
+ * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
- * Abnormal [![(invite needed)][inviteneeded]](#)
+ * Abnormal
  * ABtorrents (ABT + RNS)
  * Acid Lounge (A-L) [![(invite needed)][inviteneeded]](#)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
@@ -247,16 +246,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT)
- * AnimeWorld (AST4u) [![(invite needed)][inviteneeded]](#)
+ * AnimeWorld [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * AsianCinema
- * Asylum Share
+ * AsianDVDClub
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Borgzelle
  * Back-ups
  * bB
  * BakaBT
@@ -267,29 +265,33 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
  * BIT-HDTV
  * BiT-TiTAN
+ * Bitded
+ * Bithorlo (BHO)
  * BitHUmen
+ * BitSexy
+ * Bitspyder
  * BitTorrentFiles
  * BiTTuRK
- * Bithorlo (BHO)
- * Bitspyder
  * BJ-Share (BJ)
  * BlueBird [![(invite needed)][inviteneeded]](#)
  * Blutopia (BLU)
+ * Borgzelle
  * Boxing Torrents
  * Brasil Tracker
- * BroadCity [![(invite needed)][inviteneeded]](#)
  * BroadcasTheNet (BTN)
+ * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
  * BTNext (BTNT)
  * BTSCHOOL
  * BWTorrents
- * CCFBits
- * CGPeers
- * CHDBits
  * Carp-Hunter
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
+ * CCFBits
+ * CeskeForum
+ * CGPeers
+ * CHDBits
  * ChileBT
  * Cinecalidad
  * CinemaMovieS_ZT
@@ -314,13 +316,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DICMusic
  * DigitalCore
  * DivTeam
- * DivxTotal
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * Empornium (EMP)
- * EpubLibre
+ * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
  * eStone (XiDER, BeLoad)
  * ExoticaZ (YourExotic)
@@ -328,32 +328,30 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * FANO.IN
  * Fantastic Heaven
+ * Fantastiko
  * FeedUrNeed
  * Femdomcult
  * FileList (FL)
  * Film-Paleis
  * FinElite (FE)
  * FinVip
- * FocusX
- * Fou-Du-Cinema
- * FreeTorrent
  * FunFile (FF)
- * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
+ * FunkyTorrents (FT)
  * Fuzer (FZ)
- * GFXPeers
- * Galeriens (LaPauseTorrents)
- * Gay-Torrents.net
  * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
  * GAYtorrent.ru
  * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
  * Generation-Free
+ * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreekDiamond
  * Greek Team
  * HaiDan
- * HD Dolby [![(invite needed)][inviteneeded]](#)
+ * Haitang
+ * HappyFappy
+ * HD Dolby
  * HD-Bits.com
  * HD-Forever (HDF)
  * HD-Olimpo
@@ -365,9 +363,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDArea (HDA)
  * HDAtmos
  * HDBits
+ * HDC (HDCiTY)
  * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing)
- * HDC (HDCiTY)
  * HDCity
  * HDHome (HDBigger)
  * HDME
@@ -375,12 +373,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDSky
  * HDTime
  * HDTorrents.it
- * HDTurk [![(invite needed)][inviteneeded]](#)
- * HDU [![(invite needed)][inviteneeded]](#)
+ * HDTurk
+ * HDU
  * HDZone
  * Hebits
  * HellasTZ
- * Hon3y HD
  * HQSource (HQS)
  * HuSh [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
@@ -395,16 +392,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LastFiles
  * LatinoP2P
  * Le Saloon
- * LeChaudron
- * LemonHD
  * LearnFlakes
  * LegacyHD (HD4Free)
+ * LemonHD
  * Libble
  * LibraNet (LN)
  * LinkoManija
  * LosslessClub
  * M-Team TP (MTTP)
- * MaDs Revolution
+ * MaDs Revolution [![(invite needed)][inviteneeded]](#)
  * magic-heaven
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
@@ -415,9 +411,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MNV (Max-New-Vision)
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
+ * MouseBits
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
+ * Nbytez
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
  * NetCosmo
@@ -425,15 +423,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NorBits
  * Nordic+
  * Oasis
+ * Obscure
  * oMg[WtF]trackr
  * OpenCD
+ * Oppaitime [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
  * P2PBG
  * P2PElite
- * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
+ * PeerJunkies
  * Peers.FM
  * Pirata Digital
  * PirateTheNet (PTN)
@@ -464,9 +464,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
+ * Resurrect The Net
  * RetroFlix
  * RevolutionTT
- * ROFD
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
  * RPTorrents
  * SceneHD
@@ -476,11 +476,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SDBits [![(invite needed)][inviteneeded]](#)
  * Secret Cinema
  * SeedFile (SF)
+ * ShareFiles
  * Shareisland
  * Shazbat
  * SiamBIT
  * SnowPT (SSPT)
- * SoulVoice [![(invite needed)][inviteneeded]](#)
+ * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
  * Speedmaster HD
@@ -491,6 +492,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpringSunday
  * SugoiMusic
  * Superbits (SBS)
+ * Swarmazon
  * Tapochek
  * Tasmanit [![(invite needed)][inviteneeded]](#)
  * TeamHD
@@ -499,7 +501,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TellyTorrent
  * teracod (Movie Zone)
  * The Falling Angels (TFA)
- * The Geeks [![(invite needed)][inviteneeded]](#)
+ * The Geeks
  * The Horror Charnel (THC)
  * The New Retro
  * The Occult [![(invite needed)][inviteneeded]](#)
@@ -508,9 +510,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Show [![(invite needed)][inviteneeded]](#)
  * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
- * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
- * TheLeachZone
+ * TheEmpire (TE)
+ * TheLeachZone (TLZ)
  * TheScenePlace (TSP)
+ * TheSpit
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * ToTheGlory (TTG)
@@ -525,16 +528,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
  * TorrentDB
- * TorrentFactory
- * TorrentHR
+ * Torrentech (TTH)
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
+ * TorrentHR
+ * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
+ * TotallyKids (TK)
+ * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentSeeds (TS)
- * Torrentech (TTH)
- * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
- * Torrentland
- * TotallyKids (TK)
  * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
@@ -552,7 +554,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnlimitZ
  * Vizuk
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
- * Witch-Hunter (Demon-Site)
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * x-ite.me (XM) [![(invite needed)][inviteneeded]](#)
@@ -584,6 +585,32 @@ Using the all indexer has no advantages (besides reduced management overhead), o
 
 To get all Jackett indexers including their capabilities you can use `t=indexers` on the all indexer. To get only configured/unconfigured indexers you can also add `configured=true/false` as a query parameter.
 
+### Filter indexers
+
+Another special "filter" indexer is available at `/api/v2.0/indexers/<filter>/results/torznab`
+It will query the configured indexers that match the `<filter>` expression criterias and return the combined results as "all".
+
+Supported filters
+Filter | Condition
+-|-
+`type:<type>` | where the indexer type is equal to `<type>`
+`tag:<tag>` | where the indexer tags contains `<tag>`
+`lang:<tag>` | where the indexer language start with `<lang>`
+`test:{passed\|failed}` | where the last indexer test performed `passed` or `failed`
+`status:{healthy\|failing\|unknown}` | where the indexer state is `healthy` (succesfully operates in the last minutes), `failing` (generates errors in the recent call) or `unknown` (unused for a while)
+
+Supported operators
+Operator | Condition
+-|-
+`!<expr>` | where not `<expr>`
+`<expr1>+<expr2>[+<expr3>...]` | where `<expr1>` and `<expr2>` [and `<expr3>`...]
+`<expr1>,<expr2>[,<expr3>...]` | where `<expr1>` or `<expr2>` [or `<expr3>`...]
+
+Example 1:
+The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/results/torznab` will query all the configured indexers tagged with `group1` or all the indexers not private and with `en` language (`en-en`,`en-us`,...)
+
+Example 2:
+The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
 
 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.

azure-pipelines.yml

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

src/Jackett.Common/Content/custom.css

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

src/Jackett.Common/Content/custom.js

@@ -3,6 +3,9 @@ var basePath = '';
 var indexers = [];
 var configuredIndexers = [];
 var unconfiguredIndexers = [];
+var configuredTags = [];
+var availableFilters = [];
+var currentFilter = null;
 
 $.fn.inView = function () {
     if (!this.length) return false;
@@ -46,27 +49,45 @@ $(document).ready(function () {
     var pathPrefix = window.location.pathname.substr(0, index);
     api.root = pathPrefix + api.root;
 
+    const hashArgs = getHashArgs();
+    if ("indexers" in hashArgs)
+      currentFilter = hashArgs.filter
     bindUIButtons();
     loadJackettSettings();
 });
 
 function openSearchIfNecessary() {
-    const hashArgs = location.hash.substring(1).split('&').reduce((prev, item) =>
-        Object.assign({
-            [item.split('=')[0]]: (item.split('=').length < 2 ?
-                undefined :
-                decodeURIComponent(item.split('=')[1].replace(/\+/g, '%20')))
-        }, prev), {});
+    const hashArgs = getHashArgs();
     if ("search" in hashArgs) {
-        showSearch(hashArgs.tracker, hashArgs.search, hashArgs.category);
+        showSearch(hashArgs.filter, hashArgs.tracker, hashArgs.search, hashArgs.category);
     }
 }
 
+function getHashArgs() {
+    return location.hash.substring(1).split('&').reduce((prev, item) => Object.assign({
+        [item.split('=')[0]]: (item.split('=').length < 2 ?
+            undefined :
+            decodeURIComponent(item.split('=')[1].replace(/\+/g, '%20')))
+    }, prev), {});
+}
+
 function insertWordWrap(str) {
     // insert optional word wrap after punctuation to avoid overflows on long scene titles
     return str.replace(/([\.\-_\/\\])/g, "$1\u200B");
 }
 
+function type_filter(indexer) {
+  return indexer.type == this.value;
+}
+
+function tag_filter(indexer) {
+  return indexer.tags.map(t => t.toLowerCase()).indexOf(this.value.toLowerCase()) > -1;
+}
+
+function state_filter(indexer) {
+  return indexer.state == this.value;
+}
+
 function getJackettConfig(callback) {
     api.getServerConfig(callback).fail(function () {
         doNotify("Error loading Jackett settings, request to Jackett server failed, is server running ?", "danger", "glyphicon glyphicon-alert");
@@ -131,11 +152,14 @@ function loadJackettSettings() {
 }
 
 function reloadIndexers() {
+    $('#filters').hide();
     $('#indexers').hide();
     api.getAllIndexers(function (data) {
         indexers = data;
         configuredIndexers = [];
         unconfiguredIndexers = [];
+        configuredTags = [];
+        availableFilters = [];
         for (var i = 0; i < data.length; i++) {
             var item = data[i];
             item.rss_host = resolveUrl(basePath + "/api/v2.0/indexers/" + item.id + "/results/torznab/api?apikey=" + api.key + "&t=search&cat=&q=");
@@ -169,7 +193,13 @@ function reloadIndexers() {
             else
                 unconfiguredIndexers.push(item);
         }
-        displayConfiguredIndexersList(configuredIndexers);
+
+        configuredTags = configuredIndexers.map(i => i.tags).reduce((a, g) => a.concat(g), []).filter((v, i, a) => a.indexOf(v) === i);
+
+        configureFilters(configuredIndexers);
+        
+        displayFilteredIndexersList(configuredIndexers, currentFilter);
+
         $('#indexers div.dataTables_filter input').focusWithoutScrolling();
         openSearchIfNecessary();
     }).fail(function () {
@@ -177,6 +207,53 @@ function reloadIndexers() {
     });
 }
 
+function configureFilters(indexers) {
+    function add(f) {
+      if (availableFilters.find(x => x.id == f.id))
+        return;
+      if (!indexers.every(f.apply, f) && indexers.some(f.apply, f))
+        availableFilters.push(f);
+    }
+
+    availableFilters.push({id: "test:passed", apply: state_filter, value: "success" });
+    availableFilters.push({id: "test:failed", apply: state_filter, value: "error" });
+
+    ["public", "private", "semi-private"]
+      .map(t => { return { id: "type:" + t, apply: type_filter, value: t } })
+      .forEach(add);
+
+    configuredTags.sort()
+      .map(t => { return { id: "tag:" + t.toLowerCase(), apply: tag_filter, value: t }})
+      .forEach(add);
+}
+
+function displayFilteredIndexersList(indexers, filter) {
+    var active = availableFilters.find(x => x.id == filter);
+    if (availableFilters.length > 0) {
+        var filtersTemplate = Handlebars.compile($("#jackett-filters").html());
+        var filters = $(filtersTemplate({
+              filters: availableFilters,
+              active: active ? active.id : null
+            }));
+
+        $("li a", filters).on('click', function(){
+            displayFilteredIndexersList(configuredIndexers, $(this).data("id"));
+        });
+
+        $('#filters').empty();
+        $('#filters').append(filters);
+        $('#filters').fadeIn();
+    }
+    if (active) {
+        indexers = indexers.filter(active.apply, active);
+        currentFilter = active.id;
+    }
+    else {
+        currentFilter = null;
+    }
+    displayConfiguredIndexersList(indexers)
+}
+
 function displayConfiguredIndexersList(indexers) {
     var indexersTemplate = Handlebars.compile($("#configured-indexer-table").html());
     var indexersTable = $(indexersTemplate({
@@ -239,36 +316,7 @@ function displayUnconfiguredIndexersList() {
         $(btn).click(function () {
             $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
                 var indexerId = $(btn).attr("data-id");
-                api.getIndexerConfig(indexerId, function (data) {
-                    if (data.result !== undefined && data.result == "error") {
-                        doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
-                        return;
-                    }
-                    api.updateIndexerConfig(indexerId, data, function (data) {
-                        if (data == undefined) {
-                            reloadIndexers();
-                            doNotify("Successfully configured " + name, "success", "glyphicon glyphicon-ok");
-                        } else if (data.result == "error") {
-                            if (data.config) {
-                                populateConfigItems(configForm, data.config);
-                            }
-                            doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
-                        }
-                    }).fail(function (data) {
-                        if (data.responseJSON.error !== undefined) {
-                            var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-                            var githubrepo = "Jackett/Jackett";
-                            var githubtext = "this indexer";
-                            if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
-                                githubrepo = "FlareSolverr/FlareSolverr";
-                                githubtext = "FlareSolverr";
-                            }
-                            doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
-                        } else {
-                            doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
-                        }
-                    });
-                });
+                addIndexer(indexerId, true);
             });
         });
     });
@@ -311,6 +359,9 @@ function displayUnconfiguredIndexersList() {
                 }
             });
         },
+        "drawCallback": function (settings) {
+            addCheckOnCellClick();
+        },
         "stateSave": true,
         "stateDuration": 0,
         "fnStateSaveParams": function (oSettings, sValue) {
@@ -323,47 +374,58 @@ function displayUnconfiguredIndexersList() {
             [10, 20, 50, 100, 250, 500, -1],
             [10, 20, 50, 100, 250, 500, "All"]
         ],
+        "select": {
+            style: 'os',
+            selector: 'td:first-child'
+        },
         "order": [
-            [0, "asc"]
+            [1, "asc"]
         ],
         "columnDefs": [{
-                "name": "name",
+                "name": "select",
                 "targets": 0,
                 "visible": true,
-                "searchable": true,
-                "orderable": true
+                "searchable": false,
+                "orderable": false
             },
             {
-                "name": "description",
+                "name": "name",
                 "targets": 1,
                 "visible": true,
                 "searchable": true,
                 "orderable": true
             },
             {
-                "name": "type",
+                "name": "description",
                 "targets": 2,
                 "visible": true,
                 "searchable": true,
                 "orderable": true
             },
             {
-                "name": "type_string",
+                "name": "type",
                 "targets": 3,
-                "visible": false,
+                "visible": true,
                 "searchable": true,
-                "orderable": true,
+                "orderable": true
+            },
+            {
+                "name": "type_string",
+                "targets": 4,
+                "visible": false,
+                "searchable": false,
+                "orderable": false,
             },
             {
                 "name": "language",
-                "targets": 4,
+                "targets": 5,
                 "visible": true,
                 "searchable": true,
                 "orderable": true
             },
             {
                 "name": "buttons",
-                "targets": 5,
+                "targets": 6,
                 "visible": true,
                 "searchable": false,
                 "orderable": false
@@ -384,9 +446,64 @@ function displayUnconfiguredIndexersList() {
 
     $("#modals").append(UnconfiguredIndexersDialog);
 
+    $('#add-selected-indexers').click(function () {
+        var selectedIndexers = $('#unconfigured-indexer-datatable').DataTable().$('input[type="checkbox"]');
+        var hasSelectedIndexers = selectedIndexers.is(':checked');
+        if (hasSelectedIndexers) {
+            doNotify("Adding selected Indexers, please wait...", "info", "glyphicon glyphicon-transfer", false);
+            $('#select-indexer-modal button').attr('disabled', true);
+
+            addIndexers(selectedIndexers,
+                addSelectedIndexersSuccess,
+                addSelectedIndexersError);
+        } else {
+            doNotify("Error: You must select more than one indexer", "danger", "glyphicon glyphicon-alert");
+        }
+    });
+
     UnconfiguredIndexersDialog.modal("show");
 }
 
+function addSelectedIndexersSuccess() {
+    $.notifyClose();
+    $('#select-indexer-modal').modal('hide');
+    doNotify("Selected indexers successfully added.", "success", "glyphicon glyphicon-ok");
+    $('#select-indexer-modal button').attr('disabled', false);
+}
+
+function addSelectedIndexersError(e, xhr, options, err) {
+    doNotify("Configuration failed", "danger", "glyphicon glyphicon-alert");
+}
+
+function addCheckOnCellClick() {
+    $('td.checkboxColumn')
+        .off('click')
+        .on('click', (function (event) {
+            if (!$(event.target).is('input')) {
+                $('input:checkbox', this).prop('checked', function (i, value) {
+                    return !value;
+                });
+            }
+        }));
+}
+
+function addIndexers(selectedIndexerList, successCallback, errorCallback) {
+    $(document).ajaxStop(function () {
+        if (successCallback == addSelectedIndexersSuccess) {
+            $(document).ajaxStop().unbind(); // Keep future AJAX events from effecting this
+            successCallback();
+        }
+    }).ajaxError(function (e, xhr, options, err) {
+        errorCallback(e, xhr, options, err);
+    });
+
+    selectedIndexerList.each(function () {
+        if (this.checked) {
+            addIndexer($(this).data('id'), false);
+        }
+    })
+}
+
 function createDropDownHtml(column, exactMatch) {
     var select = $('<select><option value="">Show all</option></select>')
         .appendTo($(column.footer()).empty())
@@ -409,6 +526,42 @@ function createDropDownHtml(column, exactMatch) {
     return select;
 }
 
+function addIndexer(indexerId, displayNotification) {
+    api.getIndexerConfig(indexerId, function (data) {
+        if (data.result !== undefined && data.result == "error") {
+            doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
+            return;
+        }
+
+        api.updateIndexerConfig(indexerId, data, function (data) {
+            if (data == undefined) {
+                reloadIndexers();
+                if (displayNotification) {
+                    doNotify("Successfully configured " + indexerId, "success", "glyphicon glyphicon-ok");
+                }
+            } else if (data.result == "error") {
+                if (data.config) {
+                    populateConfigItems(configForm, data.config);
+                }
+                doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
+            }
+        }).fail(function (data) {
+            if (data.responseJSON.error !== undefined) {
+                var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
+                var githubrepo = "Jackett/Jackett";
+                var githubtext = "this indexer";
+                if (data.responseJSON.error.includes("check FlareSolverr logs") || data.responseJSON.error.includes("cookies provided by FlareSolverr are not valid")) {
+                    githubrepo = "FlareSolverr/FlareSolverr";
+                    githubtext = "FlareSolverr";
+                }
+                doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/" + githubrepo + "/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for " + githubtext + ".</a><i>", "danger", "glyphicon glyphicon-alert", false);
+            } else {
+                doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
+            }
+        });
+    });
+}
+
 function copyToClipboard(text) {
     // create hidden text element, if it doesn't already exist
     var targetId = "_hiddenCopyText_";
@@ -483,18 +636,21 @@ function prepareSearchButtons(element) {
         var $btn = $(btn);
         var id = $btn.data("id");
         $btn.click(function () {
-            window.location.hash = "search&tracker=" + id;
-            showSearch(id);
+            window.location.hash = "search&tracker=" + id + (currentFilter ? "&filter=" + currentFilter : "");
+            showSearch(currentFilter, id);
         });
     });
 }
 
 function prepareSetupButtons(element) {
     element.find('.indexer-setup').each(function (i, btn) {
-        var indexer = configuredIndexers[i];
-        $(btn).click(function () {
-            displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description);
-        });
+        var $btn = $(btn);
+        var id = $btn.data("id");
+        var indexer = configuredIndexers.find(i => i.id === id);
+        if (indexer)
+          $btn.click(function () {
+              displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description);
+          });
     });
 }
 
@@ -533,6 +689,10 @@ function updateTestState(id, state, message, parent) {
     }).rows().invalidate('dom');
     if (state != "inprogres")
         dt.draw();
+
+    var indexer = configuredIndexers.find(x => x.id == id);
+    if (indexer)
+        indexer.state = state;
 }
 
 function testIndexer(id, notifyResult) {
@@ -610,11 +770,32 @@ function populateConfigItems(configForm, config) {
         var item = config[i];
         var setupValueTemplate = Handlebars.compile($("#setup-item-" + item.type).html());
         item.value_element = setupValueTemplate(item);
-        var template = setupItemTemplate(item);
+        var template = $(setupItemTemplate(item));
         $formItemContainer.append(template);
+        setupConfigItem(template, item);
     }
 }
 
+function setupConfigItem(configItem, item) {
+  switch (item.type) {
+    case "inputtags": {
+        configItem.find("input").tagify({
+          dropdown: {
+            enabled: 0,
+            position: "text"
+          },
+          separator: item.separator || ",",
+          whitelist: item.whitelist || [],
+          blacklist: item.blacklist || [],
+          pattern: item.pattern || null,
+          delimiters: item.delimiters || item.separator || ",",
+          originalInputValueFormat: function (values) { return values.map(item => item.value.toLowerCase()).join(this.separator); }
+        });
+      }
+      break;
+  }
+}
+
 function newConfigModal(title, config, caps, link, alternativesitelinks, description) {
     var configTemplate = Handlebars.compile($("#jackett-config-setup-modal").html());
     var configForm = $(configTemplate({
@@ -638,6 +819,8 @@ function newConfigModal(title, config, caps, link, alternativesitelinks, descrip
         });
     }
 
+    $("div[data-id='tags'] input", configForm).data("tagify").settings.whitelist = configuredTags;
+
     return configForm;
 }
 
@@ -668,9 +851,13 @@ function getConfigModalJson(configForm) {
                 $el.find(".setup-item-inputcheckbox input:checked").each(function () {
                     itemEntry.values.push($(this).val());
                 });
+                break;
             case "inputselect":
                 itemEntry.value = $el.find(".setup-item-inputselect select").val();
                 break;
+            case "inputtags":
+                itemEntry.value = $el.find(".setup-item-inputtags input").val();
+                break;
         }
         configJson.push(itemEntry)
     });
@@ -802,14 +989,15 @@ function updateReleasesRow(row) {
     }
 }
 
-function showSearch(selectedIndexer, query, category) {
+function showSearch(selectedFilter, selectedIndexer, query, category) {
     var selectedIndexers = [];
     if (selectedIndexer)
-        selectedIndexers = selectedIndexer.split(",");
+      selectedIndexers = selectedIndexer.split(",");
     $('#select-indexer-modal').remove();
     var releaseTemplate = Handlebars.compile($("#jackett-search").html());
     var releaseDialog = $(releaseTemplate({
-        indexers: configuredIndexers
+        filters: availableFilters,
+        active: selectedFilter
     }));
 
     $("#modals").append(releaseDialog);
@@ -820,9 +1008,32 @@ function showSearch(selectedIndexer, query, category) {
 
     releaseDialog.on('hidden.bs.modal', function (e) {
         $('#indexers div.dataTables_filter input').focusWithoutScrolling();
-        window.location.hash = '';
+        window.location.hash = currentFilter ? "indexers&filter=" + currentFilter : '';
     });
 
+    var setTrackers = function (filterId, trackers) {
+        var select = $('#searchTracker');
+        var selected = select.val();
+        var filter = availableFilters.find(f => f.id == filterId);
+        if (filter)
+          trackers = trackers.filter(filter.apply,filter);
+        var options = trackers.map(t => {
+          return {
+            label: t.name,
+            value: t.id
+          }
+        });
+        select.multiselect('dataprovider', options);
+        select.val(selected).multiselect("refresh");
+    };
+
+    $('#searchFilter').change(jQuery.proxy(function () {
+        var filterId = $('#searchFilter').val();
+        setTrackers(filterId, this.items);
+    }, {
+        items: configuredIndexers
+    }));
+
     var setCategories = function (trackers, items) {
         var cats = {};
         for (var i = 0; i < items.length; i++) {
@@ -869,6 +1080,7 @@ function showSearch(selectedIndexer, query, category) {
             return;
         }
         var searchString = releaseDialog.find('#searchquery').val();
+        var filterId = releaseDialog.find('#searchFilter').val();
         var queryObj = {
             Query: searchString,
             Category: releaseDialog.find('#searchCategory').val(),
@@ -878,14 +1090,15 @@ function showSearch(selectedIndexer, query, category) {
         window.location.hash = Object.entries({
             search: encodeURIComponent(queryObj.Query).replace(/%20/g, '+'),
             tracker: queryObj.Tracker.join(","),
-            category: queryObj.Category.join(",")
-        }).map(([k, v], i) => k + '=' + v).join('&');
+            category: queryObj.Category.join(","),
+            filter: filterId ? encodeURIComponent(filterId) : ""
+        }).filter(([k, v]) => v).map(([k, v], i) => k + '=' + v).join('&');
 
         $('#jackett-search-perform').html($('#spinner').html());
         $('#searchResults div.dataTables_filter input').val("");
         clearSearchResultTable($('#searchResults'));
 
-        var trackerId = "all";
+        var trackerId = filterId || "all";
         api.resultsForIndexer(trackerId, queryObj, function (data) {
             for (var i = 0; i < data.Results.length; i++) {
                 var item = data.Results[i];
@@ -906,16 +1119,14 @@ function showSearch(selectedIndexer, query, category) {
 
     var searchTracker = releaseDialog.find("#searchTracker");
     var searchCategory = releaseDialog.find('#searchCategory');
-    searchCategory.multiselect({
+    var searchFilter = releaseDialog.find('#searchFilter');
+    
+    searchFilter.multiselect({
         maxHeight: 400,
         enableFiltering: true,
-        includeSelectAllOption: true,
         enableCaseInsensitiveFiltering: true,
-        nonSelectedText: 'Any'
+        nonSelectedText: 'All'
     });
-    if (selectedIndexers)
-        searchTracker.val(selectedIndexers);
-    searchTracker.trigger("change");
 
     updateSearchResultTable($('#searchResults'), []);
     clearSearchResultTable($('#searchResults'));
@@ -928,6 +1139,29 @@ function showSearch(selectedIndexer, query, category) {
         nonSelectedText: 'All'
     });
 
+    searchCategory.multiselect({
+      maxHeight: 400,
+      enableFiltering: true,
+      includeSelectAllOption: true,
+      enableCaseInsensitiveFiltering: true,
+      nonSelectedText: 'Any'
+    });
+
+    if (availableFilters.length > 0) {
+      if (selectedFilter) {
+        searchFilter.val(selectedFilter);
+        searchFilter.multiselect("refresh");
+      }
+      searchFilter.trigger("change");
+    }
+    else
+      setTrackers(selectedFilter, configuredIndexers);
+
+    if (selectedIndexers) {
+      searchTracker.val(selectedIndexers);
+      searchTracker.multiselect("refresh");
+    }
+    searchTracker.trigger("change");
 
     if (category !== undefined) {
         searchCategory.val(category.split(","));
@@ -1116,6 +1350,7 @@ function bindUIButtons() {
     $('#jackett-add-indexer').click(function () {
         $("#modals").empty();
         displayUnconfiguredIndexersList();
+        addCheckOnCellClick();
         $('#unconfigured-indexer-datatable tfoot tr').insertAfter($('#unconfigured-indexer-datatable thead tr'));
         $('#unconfigured-indexer-datatable').DataTable().search('').columns().search('').draw();
     });
@@ -1231,8 +1466,8 @@ function bindUIButtons() {
     });
 
     $("#jackett-show-search").click(function () {
-        showSearch(null);
-        window.location.hash = "search";
+        showSearch(currentFilter);
+        window.location.hash = "search" + (currentFilter ? "&filter=" + currentFilter : "");
     });
 
     $("#view-jackett-logs").click(function () {
@@ -1348,4 +1583,4 @@ function proxyWarning(input) {
     } else {
         $('#proxy-warning').hide();
     }
-}
+}

src/Jackett.Common/Content/custom_mobile.css

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

src/Jackett.Common/Content/index.html

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

src/Jackett.Common/Content/login.html

@@ -16,7 +16,7 @@
 
     <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
     <link href="../animate.css" rel="stylesheet">
-    <link href="../custom.css?changed=20200223" rel="stylesheet">
+    <link href="../custom.css?changed=PR12083" rel="stylesheet">
 
     <title>Jackett</title>
 </head>

src/Jackett.Common/Converters/StringToLongConverter.cs

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

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

@@ -14,7 +14,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.onl/
+  - https://1337x.unblockit.ch/
   - https://1337x.nocensor.space/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -44,6 +44,9 @@ legacylinks:
   - https://1337x.unblockit.buzz/
   - https://1337x.unblocked.monster/
   - https://1337x.unblockit.club/
+  - https://1337x.unblockit.onl/
+  - https://1337x.unblockit.li/
+  - https://1337x.unblockit.uno/
 
 caps:
   categorymappings:
@@ -142,7 +145,22 @@ settings:
     default: "magnet:"
     options:
       "http://itorrents.org/": iTorrents.org
+      "http://torrage.info/": Torrage
+      "http://btcache.me/": BTcache
       "magnet:": magnet
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "http://itorrents.org/"
+    options:
+      "http://itorrents.org/": iTorrents.org
+      "http://torrage.info/": Torrage
+      "http://btcache.me/": BTcache
+      "magnet:": magnet
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: As the .torrent download links on this site are known to fail from time to time, you can optionally set as a fallback an automatic alternate link. We suggest using the magnet link as a fallback.
   - name: sort
     type: select
     label: Sort requested from site
@@ -160,9 +178,12 @@ settings:
       asc: asc
 
 download:
-  # the .torrent url is on the on the details page
-  selector: ul li a[href^="{{ .Config.downloadlink }}"]
-  attribute: href
+  # the .torrent URL and magnet URI are on the details page
+  selectors:
+    - selector: ul li a[href^="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: ul li a[href^="{{ .Config.downloadlink2 }}"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/acgsou.yml

@@ -24,7 +24,7 @@ caps:
     - {id: 2, cat: TV/Anime, desc: "动画分类 (Anime)"}
     - {id: 7, cat: TV/Anime, desc: "新番连载 (Anime New Fan Series)"}
     - {id: 8, cat: TV/Anime, desc: "完整动画 (Anime Collection)"}
-    - {id: 9, cat: TV/Anime, desc: "剧场版 (Anime Movie)"}
+    - {id: 9, cat: Movies/Other, desc: "剧场版 (Anime Movie)"}
     - {id: 10, cat: TV/Anime, desc: "DVDRIP (Anime DVDRIP)"}
     - {id: 11, cat: TV/Anime, desc: "BDRIP (Anime BDRIP)"}
     - {id: 5, cat: TV/Anime, desc: "RAW/ISO"}
@@ -51,8 +51,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/aither.yml

@@ -76,25 +76,27 @@ login:
 
 search:
   paths:
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
+    keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    playlistId: ""
+    collectionId: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -119,28 +121,17 @@ search:
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      selector: td:nth-last-child(1)
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -194,9 +185,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
-    minimumratio:
-      text: 0.4
+# global MR is 0.4 but torrents must be seeded for 3 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# UNIT3D 5.1.0
+# UNIT3D 5.3.0

src/Jackett.Common/Definitions/angietorrents.yml

@@ -0,0 +1,147 @@
+---
+id: angietorrents
+name: AngieTorrents
+description: "AngieTorrents is a Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://angietorrents.cc/
+
+caps:
+  categorymappings:
+    - {id: 48, cat: XXX/x264, desc: "Adult - HD"}
+    - {id: 47, cat: XXX/SD, desc: "Adult - SD"}
+    - {id: 28, cat: TV/Anime, desc: "Anime - All"}
+    - {id: 18, cat: PC/0day, desc: "Apps - PC"}
+    - {id: 19, cat: PC/Mac, desc: "Apps - Mac"}
+    - {id: 20, cat: PC, desc: "Apps - Linux"}
+    - {id: 21, cat: PC/Mobile-Other, desc: "Apps - Other"}
+    - {id: 54, cat: Books/EBook, desc: "Books - eBooks"}
+    - {id: 55, cat: Audio/Audiobook, desc: "Books - Audio Books"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries - All"}
+    - {id: 51, cat: Movies/Foreign, desc: "Foreign Movies - HD"}
+    - {id: 52, cat: Movies/Foreign, desc: "Foreign Movies - SD"}
+    - {id: 10, cat: PC/Games, desc: "Games - PC"}
+    - {id: 11, cat: Console/Other, desc: "Games - PS2"}
+    - {id: 43, cat: Console/PS3, desc: "Games - PS3"}
+    - {id: 12, cat: Console/PSP, desc: "Games - PSP"}
+    - {id: 13, cat: Console/XBox, desc: "Games - Xbox"}
+    - {id: 14, cat: Console/XBox 360, desc: "Games - Xbox360"}
+    - {id: 15, cat: Console/Other, desc: "Games - PS1"}
+    - {id: 16, cat: Console/Other, desc: "Games - Dreamcast"}
+    - {id: 44, cat: Console/Wii, desc: "Games - Wii"}
+    - {id: 45, cat: Console/Other, desc: "Games - DS"}
+    - {id: 46, cat: Console/Other, desc: "Games - GameCube"}
+    - {id: 17, cat: Console/Other, desc: "Games - Other"}
+    - {id: 50, cat: Movies, desc: "Movies - Packs"}
+    - {id: 1, cat: Movies/DVD, desc: "Movies - DVD"}
+    - {id: 2, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
+    - {id: 3, cat: Movies/SD, desc: "Movies - SD"}
+    - {id: 42, cat: Movies/HD, desc: "Movies - HD"}
+    - {id: 4, cat: Movies/Other, desc: "Movies - Other"}
+    - {id: 22, cat: Audio/MP3, desc: "Music - MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music - Lossless"}
+    - {id: 24, cat: Audio/Video, desc: "Music - DVD"}
+    - {id: 25, cat: Audio/Video, desc: "Music - Video"}
+    - {id: 26, cat: Audio/Other, desc: "Music - Radio"}
+    - {id: 27, cat: Audio/Other, desc: "Music - Other"}
+    - {id: 33, cat: PC, desc: "Other - Emulation"}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Other - PPC/PDA"}
+    - {id: 35, cat: Audio, desc: "Other - Sounds"}
+    - {id: 36, cat: Books/EBook, desc: "Other - E-Books"}
+    - {id: 37, cat: Other, desc: "Other - Images"}
+    - {id: 38, cat: PC/Mobile-Other, desc: "Other - Mobile Phone"}
+    - {id: 39, cat: Other, desc: "Other - Extra Pars/Fills"}
+    - {id: 40, cat: Other, desc: "Other - Other"}
+    - {id: 53, cat: Other, desc: "Tutorials - All"}
+    - {id: 49, cat: TV, desc: "TV - Packs"}
+    - {id: 5, cat: TV/SD, desc: "TV - DVD"}
+    - {id: 41, cat: TV/HD, desc: "TV - HD"}
+    - {id: 6, cat: TV/SD, desc: "TV - Divx/Xvid"}
+    - {id: 7, cat: TV/SD, desc: "TV - SD"}
+
+  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: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    # https://angietorrents.cc/search.php?search=white&cat=42&incldead=1&freeleech=0&inclexternal=0&lang=0
+    - path: search.php
+    # 20 torrents per page
+    - path: search.php
+      inputs:
+        page: 1
+    - path: search.php
+      inputs:
+        page: 2
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    # site supports exact matching only
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: 0
+    # 0 both 1 local 2 external
+    inclexternal: 0
+    # 0 all 1 english etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner tr.t-row
+
+  fields:
+    category:
+      selector: a[href^="/torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="/details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="/download.php?id="]
+      attribute: href
+    size:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    date:
+      text: now
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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

@@ -57,8 +57,9 @@ login:
     selector: a[href$="/index.php?action=logout"]
 
 download:
-  selector: a[href*="/engine/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/engine/download.php?id="]
+      attribute: href
 
 search:
   # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&catlist[]=0
@@ -86,6 +87,9 @@ search:
 
   fields:
     category:
+      text: 54
+    category|noappend:
+      optional: true
       selector: a[href*="category="]
       attribute: href
       case:
@@ -130,6 +134,9 @@ search:
     leechers:
       text: 1
     size:
+      text: "0 B"
+    size:
+      optional: true
       selector: b.file_size
     downloadvolumefactor:
       text: 0

src/Jackett.Common/Definitions/animeworld.yml

@@ -1,47 +1,32 @@
 ---
 id: animeworld
 name: AnimeWorld
-description: "AnimeWorld (AST4u) is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
+description: "AnimeWorld (AW) is a GERMAN Private site for ANIME / MANGA / HENTAI"
 language: de-de
 type: private
-encoding: iso-8859-1
+encoding: UTF-8
 links:
   - https://animeworld.cx/
-legacylinks:
-  - https://www.ast4u.me/
 
 caps:
   categorymappings:
-    - {id: 35, cat: TV/Anime, desc: "Anime Movie"}
-    - {id: 36, cat: TV/Anime, desc: "Anime Serie"}
-    - {id: 37, cat: Audio/Foreign, desc: "Anime Musik"}
-    - {id: 41, cat: Books, desc: "Anime Pic & Manga"}
-    - {id: 42, cat: XXX, desc: "Hentai Movie & OVA"}
-    - {id: 43, cat: XXX, desc: "Hentai Serie"}
-    - {id: 44, cat: PC, desc: "Hentai Game"}
-    - {id: 45, cat: Movies, desc: "Cartoon Movie"}
-    - {id: 46, cat: TV, desc: "Cartoon Serie"}
-    - {id: 47, cat: TV, desc: "TV-Serie"}
-    - {id: 49, cat: TV/Documentary, desc: "Sonstiges Doku"}
-    - {id: 50, cat: Audio, desc: "Sonstiges Soundtrack"}
-    - {id: 52, cat: Movies/HD, desc: "Movie HD"}
-    - {id: 53, cat: Other, desc: "Sonstiges"}
-    - {id: 55, cat: Movies/Foreign, desc: "Movie Asia & MartialArts"}
-    - {id: 56, cat: TV/Anime, desc: "Anime OVA"}
-    - {id: 58, cat: Movies, desc: "Movie"}
-    - {id: 59, cat: Audio/Audiobook, desc: "Sonstiges Hoerspiele"}
-    - {id: 62, cat: Console, desc: "Sonstiges Game"}
-    - {id: 65, cat: Movies/BluRay, desc: "Movie BluRay"}
-    - {id: 66, cat: TV, desc: "TV-Serie BluRay"}
-    - {id: 67, cat: TV/HD, desc: "TV-Serie HD"}
-    - {id: 68, cat: TV/Anime, desc: "Anime Movie HD & BD"}
-    - {id: 69, cat: TV/Anime, desc: "Anime OVA HD & BD"}
-    - {id: 70, cat: TV/Anime, desc: "Anime Serie HD & BD"}
+    - {id: 1, cat: Movies/Other, desc: "Anime Movie"}
+    - {id: 2, cat: TV/Anime, desc: "Anime Serie"}
+    - {id: 3, cat: Audio, desc: "Anime Musik/OST"}
+    - {id: 4, cat: PC/Games, desc: "Anime Spiele"}
+    - {id: 5, cat: XXX, desc: "Hentai"}
+    - {id: 6, cat: PC, desc: "Spiele Linux"}
+    - {id: 7, cat: Other, desc: "Sonstiges"}
+    - {id: 8, cat: Movies, desc: "Filme"}
+    - {id: 9, cat: TV, desc: "Serien"}
+    - {id: 10, cat: PC/Games, desc: "Spiele"}
+    - {id: 11, cat: Audio, desc: "Musik"}
+    - {id: 12, cat: Books, desc: "Mangas"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
     music-search: [q]
     book-search: [q]
 
@@ -52,83 +37,155 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrentliste</b> setting to <i>Platzsparendes Layout mit PopUp für zusätzliche Informationen</i> in your profile.
+  - 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: takelogin.php
-  method: post
+  path: login
+  method: form
+  form: form[action$="/login"]
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    returnto: "/index.php"
-  test:
-    path: browse.php
+    remember: on
+  selectorinputs:
+    _token:
+      selector: input[name="_token"]
+      attribute: value
+  error:
+    - selector: div#ERROR_COPY
+#    test:
+#      path: /
+#      selector: a[href$="/logout"]
 
 search:
   paths:
-    - path: browse.php
+    - path: torrents
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    incldead: 0
-    orderby: added
-    sort: desc
+    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    description: ""
+    mediainfo: ""
+    keywords: ""
+    uploader: ""
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
-    selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+    selector: table > tbody > tr
 
-  fields: # note: two alternative layouts available
-    title:
-      selector: a[href^="details.php"]
-    title:
-      optional: true
-      selector: a[href^="details.php"][title]
-      attribute: title
+  fields:
     category:
-      selector: a[href^="browse.php?cat="]
+      selector: a[href*="/categories/"]
       attribute: href
       filters:
-        - name: querystring
-          args: cat
-    details:
-      selector: a[href^="details.php"]
-      attribute: href
+        - name: regexp
+          args: "/categories/(\\d+)"
+    title:
+      selector: a.view-torrent
     download:
-      selector: a[href^=" /gettorrent/"]
+      selector: a[href*="/download/"]
       attribute: href
-    files:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2), a[href*="&filelist=1"]
-    grabs:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1), a[href*="&tosnatchers=1"]
+    details:
+      selector: a.view-torrent
+      attribute: href
+    poster:
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1), td:nth-child(7):has(br)
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1), a[href*="&toseeders=1"]
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3), a[href*="&todlers=1"]
+      selector: td:nth-last-child(3)
+    grabs:
+      selector: td:nth-last-child(2)
     date:
-      selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5), td:nth-child(5):has(br)
+      selector: td:nth-last-child(1)
       filters:
-        - name: replace
-          args: [" ", ""]
-        - name: append
-          args: " +2:00" # EET
-        - name: replace
-          args: ["\xA0", ""]
-        - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
+        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
+        - name: re_replace
+          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
+        - name: re_replace
+          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
+        - name: re_replace
+          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
+        - name: re_replace
+          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
+        - name: re_replace
+          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
+        - name: re_replace
+          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
+        - name: re_replace
+          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
+        - name: re_replace
+          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
+        - name: re_replace
+          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
+        - name: re_replace
+          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
+        - name: re_replace
+          args: ["(?i) (ay)", "month"]
+        - name: re_replace
+          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
+        - name: re_replace
+          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
+        - name: re_replace
+          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
+        - name: re_replace
+          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
+        - name: re_replace
+          args: ["(?i) (an)", "year"]
+        - name: re_replace
+          args: ["(?i)(För |und)", ""] # Misc removals
+        - name: timeago
     downloadvolumefactor:
       case:
-        img[src="/pic/free.gif"]: 0
+        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
+        i[class*="fa-star text-gold"]: 0 # Freeleech
+        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
         "*": 1
     uploadvolumefactor:
-      text: 1
-# engine tbd
+      case:
+        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
+        i[class*="fa-globe text-green"]: 2 # Global Double Upload
+        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        "*": 1
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# UNIT3D 5.3.0

src/Jackett.Common/Definitions/arabafenice.yml

@@ -14,41 +14,53 @@ caps:
   categorymappings:
     # HRS
     - {id: 34, cat: Movies/HD, desc: "1080p HRS x264"}
-    - {id: 47, cat: Movies/UHD, desc: "2160p 4k UltraHD HRS"}
+    - {id: 47, cat: Movies/UHD, desc: "2160p 4K UHD HRS"}
     - {id: 35, cat: TV, desc: "Serie TV HRS"}
     - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
     - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
     - {id: 39, cat: Movies/HD, desc: "1080p HRS x265 HEVC"}
+    # AREA SuperVip
+    - {id: 33, cat: Movies/HD, desc: "[DD] Film 720p MP4"}
+    - {id: 54, cat: Movies/HD, desc: "[DD] 1080p V.U. MKV"}
+    - {id: 55, cat: Movies/BluRay, desc: "[DD] FULL BluRay"}
+    - {id: 57, cat: Movies/UHD, desc: "[DD] 4K FULL BluRay"}
+    - {id: 58, cat: XXX, desc: "[DD] XXX 1080p"}
+    - {id: 59, cat: XXX, desc: "[DD] XXX 4K 2160p"}
+    - {id: 60, cat: XXX, desc: "[DD] XXX 720p"}
     # VIDEO
     - {id: 1, cat: Movies, desc: "News Cinema"}
+    - {id: 40, cat: TV/UHD, desc: "4K Video Untouched"}
     - {id: 2, cat: Movies/SD, desc: "BD-DVDRip"}
     - {id: 3, cat: Movies/DVD, desc: "DVD 5"}
-    - {id: 5, cat: Movies/DVD, desc: "DVD 9"}
+    - {id: 50, cat: Movies/UHD, desc: "4K 2160p UHD"}
     - {id: 6, cat: Movies/BluRay, desc: "BluRay Full"}
     - {id: 4, cat: Movies/HD, desc: "1080p 3D x264"}
     - {id: 7, cat: Movies/HD, desc: "1080p x264"}
-    - {id: 46, cat: Movies/HD, desc: "1080p Video Untouch"}
-    - {id: 44, cat: Movies/HD, desc: "1080p x265"}
+    - {id: 46, cat: Movies/HD, desc: "1080p VideoUntouched"}
+    - {id: 44, cat: Movies/HD, desc: "1080p x265 HEVC"}
+    - {id: 5, cat: Movies/DVD, desc: "DVD 9"}
     - {id: 9, cat: TV/Anime, desc: "Cartoons"}
     - {id: 8, cat: TV/Anime, desc: "720p x264"}
-    - {id: 12, cat: TV, desc: "He concluded seasons"}
-    - {id: 13, cat: TV, desc: "Seasons in Onda"}
+    - {id: 12, cat: TV, desc: "Stagioni Concluse"}
+    - {id: 13, cat: TV, desc: "Stagioni in Onda"}
     - {id: 14, cat: TV, desc: "TV Show"}
     - {id: 42, cat: TV, desc: "Serie Tv Sub Ita"}
-    - {id: 15, cat: TV/Documentary, desc: "documentaries"}
-    - {id: 33, cat: TV, desc: "mp4"}
-    - {id: 40, cat: TV/UHD, desc: "2160p 4K UltraHD"}
+    - {id: 15, cat: TV/Documentary, desc: "Documentari"}
+    - {id: 53, cat: TV/HD, desc: "VIDEO MP4 720p"}
     - {id: 38, cat: XXX, desc: "xXx"}
-    - {id: 43, cat: Other, desc: "Arabic for social"}
+    - {id: 43, cat: Other, desc: "Araba per il sociale"}
     # MUSICA
-    - {id: 17, cat: Audio, desc: "Italian music"}
-    - {id: 45, cat: Audio, desc: "Discography"}
+    - {id: 17, cat: Audio, desc: "Musica Italiana"}
+    - {id: 45, cat: Audio, desc: "Discografie"}
     - {id: 18, cat: Audio, desc: "MusicaInternazionale"}
     - {id: 19, cat: Audio, desc: "Compilation"}
     # PDF
     - {id: 21, cat: Books, desc: "Ebook"}
     - {id: 22, cat: Books/Comics, desc: "Comics"}
     - {id: 23, cat: Books, desc: "Newsstand"}
+    - {id: 56, cat: Books/Mags, desc: "Riviste"}
+    - {id: 48, cat: XXX/Other, desc: "Riviste xXx"}
+    - {id: 49, cat: XXX/Other, desc: "Fumetti xXx"}
     # GAMES
     - {id: 25, cat: Console/PS4, desc: "Sony Games"}
     - {id: 26, cat: Console/XBox, desc: "XboX Games"}
@@ -121,8 +133,12 @@ download:
       infohash: "{{ .DownloadUri.Query.id }}"
       thanks: 1
       rndval: "1487013827343"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^(.+?)&key="
 
 search:
   paths:

src/Jackett.Common/Definitions/arenabg.yml

@@ -92,6 +92,17 @@ settings:
     options:
       "/en/torrents/download/?key=": ".torrent"
       "magnet:?xt=": "magnet"
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "/en/torrents/download/?key="
+    options:
+      "/en/torrents/download/?key=": ".torrent"
+      "magnet:?xt=": "magnet"
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: You can optionally set as a fallback an automatic alternate link, so if the .torrent download link fails your download will still be successful.
 
 login:
   path: en/users/signin/
@@ -111,8 +122,11 @@ login:
     selector: a[href="/en/users/logout/"]
 
 download:
-  selector: a[href^="{{ .Config.downloadlink }}"]
-  attribute: href
+  selectors:
+    - selector: a[href^="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: a[href^="{{ .Config.downloadlink2 }}"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/asiandvdclub.yml

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

src/Jackett.Common/Definitions/asylumshare.yml

@@ -1,228 +0,0 @@
----
-id: asylumshare
-name: Asylum Share
-description: "Asylum Share is a BRAZILIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: pt-br
-type: private
-encoding: UTF-8
-links:
-  - https://asylumshare.net/
-
-caps:
-  categorymappings:
-    - {id: 104, cat: XXX, desc: "Adultos: Fotos +18"}
-    - {id: 120, cat: TV/Anime, desc: "Anime: Anime"}
-    - {id: 122, cat: PC/Mobile-Android, desc: "Aplicativos: Android"}
-    - {id: 115, cat: PC/Mobile-Other, desc: "Aplicativos: Celular"}
-    - {id: 129, cat: PC, desc: "Aplicativos: Linux"}
-    - {id: 19, cat: PC/Mac, desc: "Aplicativos: Mac"}
-    - {id: 18, cat: PC, desc: "Aplicativos: PC"}
-    - {id: 123, cat: PC/Mobile-Other, desc: "Aplicativos: Symbian"}
-    - {id: 94, cat: PC/0day, desc: "Aplicativos: Windows"}
-    - {id: 9, cat: Other, desc: "Cursos: Apostilas"}
-    - {id: 113, cat: Other, desc: "Cursos: Curso"}
-    - {id: 111, cat: Other, desc: "Cursos: Video-Aula"}
-    - {id: 4, cat: Movies, desc: "Filmes: Ação"}
-    - {id: 47, cat: XXX, desc: "Filmes: Adulto +18"}
-    - {id: 114, cat: Movies, desc: "Filmes: Animação"}
-    - {id: 23, cat: Movies, desc: "Filmes: Aventura"}
-    - {id: 24, cat: Movies, desc: "Filmes: Biografia"}
-    - {id: 25, cat: Movies, desc: "Filmes: Clássico"}
-    - {id: 26, cat: Movies, desc: "Filmes: Comédia "}
-    - {id: 27, cat: TV/Documentary, desc: "Filmes: Documentário"}
-    - {id: 33, cat: Movies, desc: "Filmes: Drama"}
-    - {id: 117, cat: Movies, desc: "Filmes: Épico"}
-    - {id: 34, cat: Movies, desc: "Filmes: Esporte"}
-    - {id: 35, cat: Movies, desc: "Filmes: Ficção "}
-    - {id: 36, cat: Movies, desc: "Filmes: Guerra "}
-    - {id: 37, cat: Movies, desc: "Filmes: Infantil "}
-    - {id: 124, cat: Movies, desc: "Filmes: Músical"}
-    - {id: 42, cat: Movies, desc: "Filmes: Nacionais"}
-    - {id: 7, cat: Movies, desc: "Filmes : Ocidental"}
-    - {id: 39, cat: Movies, desc: "Filmes: Policial"}
-    - {id: 5, cat: Movies, desc: "Filmes : Religioso"}
-    - {id: 41, cat: Movies, desc: "Filmes : Romance "}
-    - {id: 40, cat: Movies, desc: "Filmes : Suspense"}
-    - {id: 6, cat: Movies, desc: "Filmes : Terror"}
-    - {id: 93, cat: Other, desc: "Fotos: Fotos"}
-    - {id: 121, cat: Console, desc: "Jogos: Celular"}
-    - {id: 16, cat: Console, desc: "Jogos: Dreamcast"}
-    - {id: 102, cat: Console, desc: "Jogos: Emuladores e Roms"}
-    - {id: 105, cat: Console, desc: "Jogos: Game-Cube"}
-    - {id: 116, cat: Console, desc: "Jogos: Nintendo DS"}
-    - {id: 10, cat: PC/Games, desc: "Jogos: PC"}
-    - {id: 15, cat: Console, desc: "Jogos: PS1"}
-    - {id: 11, cat: Console, desc: "Jogos: PS2"}
-    - {id: 43, cat: Console, desc: "Jogos: PS3"}
-    - {id: 128, cat: Console, desc: "Jogos: PS4"}
-    - {id: 12, cat: Console, desc: "Jogos: PSP"}
-    - {id: 44, cat: Console, desc: "Jogos: Wii"}
-    - {id: 13, cat: Console, desc: "Jogos: Xbox"}
-    - {id: 14, cat: Console, desc: "Jogos: Xbox 360"}
-    - {id: 127, cat: Books, desc: "Leitura: HQs e Mangás"}
-    - {id: 119, cat: Books, desc: "Leitura: Quadrinhos"}
-    - {id: 109, cat: Books, desc: "Leitura: Revistas e E-Books"}
-    - {id: 85, cat: Audio, desc: "Músicas: Alma"}
-    - {id: 72, cat: Audio, desc: "Músicas: Antigas"}
-    - {id: 51, cat: Audio, desc: "Músicas: Axé"}
-    - {id: 52, cat: Audio, desc: "Músicas: Blues"}
-    - {id: 53, cat: Audio, desc: "Músicas: Coletânea"}
-    - {id: 54, cat: Audio, desc: "Músicas: Country"}
-    - {id: 55, cat: Audio, desc: "Músicas: Dance"}
-    - {id: 56, cat: Audio, desc: "Músicas: Discografia"}
-    - {id: 57, cat: Audio, desc: "Músicas: Eletrônica"}
-    - {id: 58, cat: Audio, desc: "Músicas: Enka"}
-    - {id: 59, cat: Audio, desc: "Músicas: Erudita"}
-    - {id: 60, cat: Audio, desc: "Músicas: Forró"}
-    - {id: 61, cat: Audio, desc: "Músicas: Funk"}
-    - {id: 62, cat: Audio, desc: "Músicas: Gospel"}
-    - {id: 64, cat: Audio, desc: "Músicas: Hard Rock"}
-    - {id: 65, cat: Audio, desc: "Músicas: Heavy Metal"}
-    - {id: 66, cat: Audio, desc: "Músicas: Hip Hop"}
-    - {id: 67, cat: Audio, desc: "Músicas: House"}
-    - {id: 68, cat: Audio, desc: "Músicas: Infantil"}
-    - {id: 107, cat: Audio, desc: "Músicas: Instrumental"}
-    - {id: 69, cat: Audio, desc: "Músicas: Jazz"}
-    - {id: 118, cat: Audio, desc: "Músicas: Mixados"}
-    - {id: 70, cat: Audio, desc: "Músicas: MPB"}
-    - {id: 71, cat: Audio, desc: "Músicas: Nova Era"}
-    - {id: 73, cat: Audio, desc: "Músicas: Pagode"}
-    - {id: 74, cat: Audio, desc: "Músicas: Pop"}
-    - {id: 75, cat: Audio, desc: "Músicas: Psicodélico"}
-    - {id: 76, cat: Audio, desc: "Músicas: Punk Rock"}
-    - {id: 78, cat: Audio, desc: "Músicas: Rap"}
-    - {id: 79, cat: Audio, desc: "Músicas: Reggae"}
-    - {id: 80, cat: Audio, desc: "Músicas: Regionais"}
-    - {id: 82, cat: Audio, desc: "Músicas: Rock"}
-    - {id: 83, cat: Audio, desc: "Músicas: Samba"}
-    - {id: 84, cat: Audio, desc: "Músicas: Sertanejo"}
-    - {id: 86, cat: Audio, desc: "Músicas: Surf"}
-    - {id: 87, cat: Audio, desc: "Músicas: Techno"}
-    - {id: 88, cat: Audio, desc: "Músicas: Trance"}
-    - {id: 89, cat: Audio, desc: "Músicas: Trilha Sonora"}
-    - {id: 90, cat: Audio, desc: "Músicas: Vocal"}
-    - {id: 91, cat: Audio, desc: "Músicas: World Music"}
-    - {id: 108, cat: Other, desc: "Outros: Outros"}
-    - {id: 95, cat: TV, desc: "Séries: Seriados"}
-    - {id: 110, cat: TV, desc: "Shows: Shows"}
-    - {id: 49, cat: TV, desc: "Televisão: TV"}
-    - {id: 112, cat: Audio/Video, desc: "Video Clipe: Video Clipe"}
-
-  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: id
-    options:
-      id: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: account-login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: p#msgError
-  test:
-    path: index.php
-    selector: a[href="account-logout.php"]
-
-search:
-  paths:
-    # https://asylumshare.net/torrents-search.php?c108=1&c95=1&c110=1&c49=1&search=&cat=0&incldead=1&freeleech=2&filmeQualidade=0
-    - path: torrents-search.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    cat: 0
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    # 0 all, 1 notfree, 2 onlyfree
-    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
-    # 0 all, 1 3D, 2 4K, 3 FHD, 4 HD
-    filmeQualidade: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # site does not support imdbid search or return imdb links.
-  keywordsfilters:
-    # drop the year from searches since site titles do not include year
-    - name: re_replace
-      args: ["(19|20[0-9]{2})", ""]
-    # prepend + to each word
-    - name: re_replace
-      args: ["(\\w+)", "+$1"]
-
-  rows:
-    selector: tr.t-row:has(a[href^="download.php?id="])
-
-  fields:
-    category:
-      selector: td a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td a[href^="torrents-details.php?id="]
-      filters:
-        - name: replace
-          args: ["[FREE]", ""]
-    details:
-      selector: td a[href^="torrents-details.php?id="]
-      attribute: href
-    download:
-      selector: td a[href^="download.php?id="]
-      attribute: href
-    date:
-      selector: a[title]
-      attribute: title
-      filters:
-        - name: regexp
-          args: "(\\d{2}\\/\\d{2}\\/\\d{2} \\d{2}:\\d{2}:\\d{2})"
-        - name: append
-          args: " -03:00" # BRT
-        - name: dateparse
-          args: "02/01/06 15:04:05 -07:00"
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        "span.color-green:contains(\"FREE\")": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1
-# engine n/a, likely customised TT3.0

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.nl/ # site forces http, does not support https
   - http://audiobookbay.net/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.onl/
+  - https://audiobookbay.unblockit.ch/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
@@ -19,6 +19,9 @@ legacylinks:
   - https://audiobookbay.unblockit.link/
   - https://audiobookbay.unblockit.buzz/
   - https://audiobookbay.unblockit.club/
+  - https://audiobookbay.unblockit.onl/
+  - https://audiobookbay.unblockit.li/
+  - https://audiobookbay.unblockit.uno/
 
 caps:
   categorymappings:
@@ -88,12 +91,13 @@ caps:
 settings: []
 
 download:
-  selector: td:contains("Info Hash:") ~ td
-  filters:
-    - name: prepend
-      args: "magnet:?xt=urn:btih:"
-    - name: append
-      args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+  selectors:
+    - selector: td:contains("Info Hash:") ~ td
+      filters:
+        - name: prepend
+          args: "magnet:?xt=urn:btih:"
+        - name: append
+          args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
 
 search:
   paths:

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -0,0 +1,107 @@
+---
+id: badasstorrents
+name: Badass Torrents
+description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://badasstorrents.com/
+
+caps:
+  categories:
+    Anime: TV/Anime
+    Apps: PC
+    Books: Books
+    Games: PC/Games
+    Movies: Movies
+    Music: Audio
+    Other: Other
+    TV: TV
+    XXX: XXX
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q, album, artist]
+    book-search: [q]
+settings:
+  - name: downloadlink
+    type: select
+    label: Download link
+    default: "magnet:?xt="
+    options:
+      "/download/": ".torrent"
+      "magnet:?xt=": "magnet"
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "/download/"
+    options:
+      "/download/": ".torrent"
+      "magnet:?xt=": "magnet"
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: You can optionally set as a fallback an automatic alternate link, so if the .torrent download link fails your download will still be successful.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      seeds: seeders
+      size: size
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+download:
+  selectors:
+    - selector: a[href*="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: a[href*="{{ .Config.downloadlink2 }}"]
+      attribute: href
+
+search:
+  paths:
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}26/{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}51/{{ .Config.sort }}/{{ .Config.type }}"
+    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}76/{{ .Config.sort }}/{{ .Config.type }}"
+
+  rows:
+    selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])
+
+  fields:
+    category:
+      selector: a[href*="/cat/"]
+    title:
+      selector: a[href*="/torrent/"]
+    details:
+      selector: a[href*="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href*="/torrent/"]
+      attribute: href
+    date:
+      selector: td:nth-child(4)
+      filters:
+        - name: timeago
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/bigtorrent.yml

@@ -60,8 +60,9 @@ login:
     path: index.php
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

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

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

src/Jackett.Common/Definitions/bitded.yml

@@ -0,0 +1,149 @@
+---
+id: bitded
+name: Bitded
+description: "Bitded is a THAI Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: th-th
+type: private
+encoding: UTF-8
+links:
+  - https://www.dedbit.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Other, desc: "ในพระราชสำนัก (in the royal court)"}
+    - {id: 4, cat: TV, desc: "รายการทีวี (TV)"}
+    - {id: 7, cat: Movies, desc: "ภาพยนตร์ชุด (Movie Packs)"}
+    - {id: 12, cat: Books/EBook, desc: "หนังสือ สื่อการสอน (Books)"}
+    - {id: 13, cat: Other/Misc, desc: "ทั่วไป (General)"}
+    - {id: 14, cat: TV/Sport, desc: "กีฬา (Sport)"}
+    - {id: 16, cat: TV/Documentary, desc: "สารคดี (Documentary)"}
+    - {id: 18, cat: TV/Other, desc: "ธรรมะ (Dharma)"}
+    - {id: 21, cat: Books/Comics, desc: "หนังสือการ์ตูน (Comics)"}
+    - {id: 22, cat: TV/Anime, desc: "การ์ตูนอนิเมชั่น (Anime)"}
+    - {id: 31, cat: Movies, desc: "ภาพยนตร์ (Movies)"}
+    - {id: 34, cat: Movies/DVD, desc: "ภาพยนตร์ DVD (Movies DVD)"}
+    - {id: 35, cat: Movies/HD, desc: "วีดีโอความละเอียดสูง (Movies HD)"}
+    - {id: 41, cat: Audio/MP3, desc: "เพลง (Music)"}
+    - {id: 43, cat: Audio/Video, desc: "มิวสิควีดีโอ (Music video)"}
+    - {id: 53, cat: PC/0day, desc: "โปรแกรม/Windows (Software Windows)"}
+    - {id: 54, cat: PC/Mac, desc: "โปรแกรม/Mac, Linux (Software Mac/Linux)"}
+    - {id: 55, cat: PC/Mobile-Other, desc: "โปรแกรม/Mobile (Software Mobile)"}
+    - {id: 61, cat: PC/Games, desc: "เกม-Computer (PC Games)"}
+    - {id: 62, cat: Console, desc: "เกม-Console (Console)"}
+    - {id: 63, cat: Console, desc: "เกมส์-พกพา (Console portable)"}
+    - {id: 72, cat: Other, desc: "รูปภาพ (Pics)"}
+    - {id: 74, cat: Other, desc: "J-IDOL"}
+
+  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: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: DESC
+    options:
+      DESC: desc
+      ASC: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    x: axion
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: td.embedded:contains("Login failed!")
+  test:
+    path: my.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    # https://www.dedbit.com/browse.php?c12=1&c13=1&incldead=1&freeload=1&search=&sort=added&h=6&d=DESC
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    freeload: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    search: "{{ .Keywords }}"
+    sort: "{{ .Config.sort }}"
+    d: "{{ .Config.type }}"
+    # site does not support imdbid searching and does not display imdb links in results.
+
+  rows:
+    selector: table.torrenttable tbody tr:has(a[href^="download.php"])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    files:
+      selector: td:nth-last-child(9)
+    date:
+      selector: td:nth-last-child(7)
+      filters:
+        - name: append
+          args: " +07:00" # ICT
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src$="pic/freeload.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# engine n/a

src/Jackett.Common/Definitions/bithorlo.yml

@@ -28,6 +28,8 @@ caps:
     - {id: 28, cat: Movies/HD, desc: "HD/Hun"}
     - {id: 33, cat: TV, desc: "Sorozat/Eng"}
     - {id: 5, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 52, cat: TV/HD, desc: "Sorozat/Eng/HD"}
+    - {id: 53, cat: TV/HD, desc: "Sorozat/Hun/HD"}
     - {id: 4, cat: Movies/SD, desc: "Xvid/Eng"}
     - {id: 3, cat: Movies/SD, desc: "Xvid/Hun"}
     # Zene

src/Jackett.Common/Definitions/bithumen.yml

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

src/Jackett.Common/Definitions/bitsexy.yml

@@ -0,0 +1,182 @@
+---
+id: bitsexy
+name: BitSexy
+description: "BitSexy is a Private Torrent Tracker for 3x"
+language: en-us
+type: private
+encoding: UTF-8
+links:
+  - https://bitsexy.org/
+
+caps:
+  categorymappings:
+    - {id: 33, cat: XXX, desc: "Amateur"}
+    - {id: 19, cat: XXX, desc: "Anal"}
+    - {id: 16, cat: XXX, desc: "Anime"}
+    - {id: 17, cat: XXX, desc: "Asian"}
+    - {id: 26, cat: XXX, desc: "BBW"}
+    - {id: 22, cat: XXX, desc: "BDSM"}
+    - {id: 18, cat: XXX, desc: "Big Tits"}
+    - {id: 43, cat: XXX, desc: "Black"}
+    - {id: 46, cat: XXX, desc: "Classic"}
+    - {id: 41, cat: XXX, desc: "Creampie"}
+    - {id: 28, cat: XXX, desc: "DVD-R"}
+    - {id: 21, cat: XXX, desc: "Ebony"}
+    - {id: 20, cat: XXX, desc: "Extreme"}
+    - {id: 44, cat: XXX, desc: "Feature"}
+    - {id: 31, cat: XXX, desc: "Fetish"}
+    - {id: 35, cat: XXX, desc: "Foreign"}
+    - {id: 53, cat: XXX, desc: "Gay"}
+    - {id: 30, cat: XXX, desc: "Gonzo"}
+    - {id: 51, cat: XXX, desc: "Handjob"}
+    - {id: 36, cat: XXX, desc: "Hardcore"}
+    - {id: 24, cat: XXX, desc: "Interracial"}
+    - {id: 37, cat: XXX, desc: "Latina"}
+    - {id: 25, cat: XXX, desc: "Lesbian"}
+    - {id: 52, cat: XXX, desc: "Magazines"}
+    - {id: 49, cat: XXX, desc: "Masturbation"}
+    - {id: 23, cat: XXX, desc: "Mature"}
+    - {id: 40, cat: XXX, desc: "MILF"}
+    - {id: 38, cat: XXX, desc: "Oral"}
+    - {id: 42, cat: XXX, desc: "Orgy"}
+    - {id: 29, cat: XXX, desc: "Other"}
+    - {id: 39, cat: XXX, desc: "Packs"}
+    - {id: 27, cat: XXX, desc: "PC Games"}
+    - {id: 15, cat: XXX, desc: "Pics"}
+    - {id: 48, cat: XXX, desc: "POV"}
+    - {id: 50, cat: XXX, desc: "Public"}
+    - {id: 14, cat: XXX, desc: "Reality"}
+    - {id: 47, cat: XXX, desc: "Shemale"}
+    - {id: 45, cat: XXX, desc: "Softcore"}
+    - {id: 55, cat: XXX, desc: "Solo"}
+    - {id: 54, cat: XXX, desc: "Squirt"}
+    - {id: 32, cat: XXX, desc: "Teens"}
+    - {id: 34, cat: XXX, desc: "Virtual"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img.cimage
+    input: captcha
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    perm_ssl: ""
+    returnto: "/"
+  error:
+    - selector: table.main:contains("failed")
+  test:
+    path: my.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 freeleech, 4 480p, 5 720p, 6 1080p, 7 4k
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+
+  rows:
+    selector: table[cellpadding="5"] 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="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) width"
+    files:
+      selector: td:nth-last-child(7)
+    date:
+      # Jul 4 2019 08:04 AM
+      selector: td: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:
+      # Today 02:40 PM
+      # Yesterday 09:10 AM
+      selector: td:nth-last-child(5):contains("day")
+      optional: true
+    size:
+      selector: td:nth-last-child(4)
+    grabs:
+      selector: td:nth-last-child(3)
+      filters:
+        - name: regexp
+          args: (\d+)
+    seeders:
+      selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
+    downloadvolumefactor:
+      case:
+        img[src$="/pic/freeleech.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 days (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# TBdev

src/Jackett.Common/Definitions/bitturk.yml

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

src/Jackett.Common/Definitions/blutopia.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 1, cat: Movies, desc: "Movie"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Movies/Other, desc: "FANRES"}
     - {id: 5, cat: Movies/Other, desc: "Trailer"}
@@ -68,29 +68,27 @@ login:
 
 search:
   paths:
-    # https://blutopia.xyz/torrents/filter?
-    # search=&description=&keywords=&uploader=&imdb=&tvdb=&view=list&tmdb=&mal=&igdb=
-    # &start_year=&end_year=&categories%5B%5D=3&sorting=seeders&direction=asc&page=0&qty=25
-    - path: torrents/filter
+    - path: torrents
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    mediainfo: ""
     keywords: ""
     uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    malId: ""
+    startYear: ""
+    endYear: ""
+    playlistId: ""
+    collectionId: ""
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr
@@ -103,40 +101,29 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a[href*="/torrents/"]
+      selector: a.view-torrent
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a[href*="/torrents/"]
+      selector: a.view-torrent
       attribute: href
     poster:
       selector: div.torrent-poster img
       attribute: src
       filters:
         - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+          args: ["https://via.placeholder.com/90x135", ""]
     size:
-      selector: td:nth-last-child(4)
+      selector: td:nth-last-child(5)
     seeders:
-      selector: td:nth-last-child(3)
+      selector: td:nth-last-child(4)
     leechers:
-      selector: td:nth-last-child(2)
+      selector: td:nth-last-child(3)
     grabs:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: regexp
-          args: (\d+)
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"]
-      attribute: href
+      selector: td:nth-last-child(2)
     date:
-      selector: time
+      selector: td:nth-last-child(1)
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -190,7 +177,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 5.2.1b
+# UNIT3D 5.3.1b

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -77,8 +77,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php"]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/broadcity.yml

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

src/Jackett.Common/Definitions/btdb.yml

@@ -1,125 +0,0 @@
----
-id: btdb
-name: BTDB
-description: "BTDB is a Public BitTorrent DHT search engine."
-language: en-us
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  # update poster placeholder link too
-  - https://btdb.eu/
-  - https://btdb.unblockit.onl/
-legacylinks:
-  - https://btdb.to/
-  - https://btdb.unblocked.app/
-  - https://btdb.unblockit.pro/
-  - https://btdb.unblockit.one/
-  - https://btdb.black-mirror.xyz/
-  - https://btdb.unblocked.casa/
-  - https://btdb.proxyportal.fun/
-  - https://btdb.uk-unblock.xyz/
-  - https://btdb.ind-unblock.xyz/
-  - https://btdb.io/ # ERR_NAME_NOT_RESOLVED
-  - https://btdb.unblockit.me/
-  - https://btdb.unblockit.pw/
-  - https://btdb.unblockit.id/
-  - https://btdb.unblockit.win/
-  - https://btdb.unblocked.bar/
-  - https://btdb.proxyportal.pw/
-  - https://btdb.uk-unblock.pro/
-  - https://btdb.unblockit.top/
-  - https://btdb.unblockit.lat/
-  - https://btdb.unblockit.app/
-  - https://btdb.unblockit.dev/
-  - https://btdb.unblockit.ltd/
-  - https://btdb.unblockit.link/
-  - https://btdb.unblockit.buzz/
-  - https://btdb.unblockit.club/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: flaresolverr
-    type: info
-    label: FlareSolverr
-    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
-  - name: info_8000
-    type: info
-    label: About BTDB Categories
-    default: BTDB 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: time
-    options:
-      time: created
-      length: size
-      seeders: seeders
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=2"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=3"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=4"
-    - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}recent{{ end }}?sort={{ .Config.sort }}&page=5"
-
-  rows:
-    selector: div.media
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: a[href*="/torrent/"]
-      attribute: title
-    details:
-      selector: a[href*="/torrent/"]
-      attribute: href
-    download:
-      # download can be missing despite icon being present. Fortunately the magnet is always there
-      selector: a[href$=".torrent"]
-      attribute: href
-      optional: true
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    poster:
-      selector: a.img-thumbnail img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://btdb.eu/assets/img/placeholder.png", ""]
-    date:
-      selector: small:nth-of-type(5) strong
-      filters:
-        - name: timeago
-    size:
-      selector: small:nth-of-type(1) strong
-    files:
-      selector: small:nth-of-type(2) strong
-    seeders:
-      selector: small:nth-of-type(3) strong
-      filters:
-        - name: replace
-          args: [",", ""]
-    leechers:
-      selector: small:nth-of-type(4) strong
-      filters:
-        - name: replace
-          args: [",", ""]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/btdigg.yml

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

src/Jackett.Common/Definitions/btetree.yml

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

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.digital
+  - https://btsow.one/
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -25,6 +25,9 @@ legacylinks:
   - https://btsow.surf/
   - https://btsow.com/
   - https://btsow.cam/
+  - https://btsow.digital/
+  - https://btsow.shop/
+  - https://btsow.us/
 
 caps:
   categories:
@@ -44,8 +47,9 @@ settings:
     default: BTSOW does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
 
 download:
-  selector: a#magnetOpen
-  attribute: href
+  selectors:
+    - selector: a#magnetOpen
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -67,10 +67,11 @@ caps:
     - {id: 153, cat: TV, desc: "TV-Star Plus"}
     - {id: 154, cat: TV, desc: "TV-Zee TV"}
     - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
-    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
     - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
     - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
     - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
+    - {id: 219, cat: TV, desc: "TV-Bengali Tv"}
     - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
     - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
     - {id: 195, cat: TV, desc: "TV-Tv Packs"}

src/Jackett.Common/Definitions/byrutor.yml

@@ -6,6 +6,8 @@ language: ru-ru
 type: public
 encoding: UTF-8
 links:
+  - https://byrut.org/
+legacylinks:
   - https://byrutor.org/
 
 caps:
@@ -258,8 +260,9 @@ caps:
 settings: []
 
 download:
-  selector: a.itemtop_game
-  attribute: href
+  selectors:
+    - selector: a.itemtop_game
+      attribute: href
 
 search:
   # keywords (article titles only search)
@@ -317,8 +320,6 @@ search:
       text: 1
     leechers:
       text: 1
-    grabs:
-      selector: li:has(img[alt="Скачиваний"])
     size:
       selector: div.shor_subtitles span:nth-child(2)
       filters:

src/Jackett.Common/Definitions/carpathians.yml

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

src/Jackett.Common/Definitions/carphunter.yml

@@ -16,10 +16,6 @@ caps:
     - {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: 10, cat: Movies/DVD, desc: "Film/DVD5/Eng"}
-    - {id: 9, cat: Movies/DVD, desc: "Film/DVD5/Hun"}
-    - {id: 12, cat: Movies/DVD, desc: "Film/DVD9/Eng"}
-    - {id: 11, cat: Movies/DVD, desc: "Film/DVD9/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"}
@@ -103,16 +99,16 @@ search:
     - name: re_replace
       args: ["[^a-zA-Z0-9]+", "%"]
   inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 active, 1 both, 2 onlydead, 3 onlyfree, 4 x2 torrents, 6 mytorrents
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    # 0 both, 1 onlyactive, 2 onlydead, 3 onlyfree, 4 x2 torrents, 5 mytorrents, 6 waiting for seeds
+    incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     # does not support imdbid searches
 
   rows:
-    selector: table[width="800"] > tbody > tr:has(a[href^="details.php?id="])
+    selector: table[width="920px"] > tbody > tr:has(a[href^="details.php?id="])
 
   fields:
     category:
@@ -122,13 +118,13 @@ search:
         - name: querystring
           args: cat
     title:
-      selector: a[href^="/details.php?id="]
+      selector: a[href*="/details.php?id="]
       attribute: title
     details:
-      selector: a[href^="/details.php?id="]
+      selector: a[href*="/details.php?id="]
       attribute: href
     download:
-      selector: a[href^="/details.php?id="]
+      selector: a[href*="/details.php?id="]
       attribute: href
       filters:
         - name: replace

src/Jackett.Common/Definitions/cartoonchaos.yml

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

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -1,386 +0,0 @@
----
-id: casstudiotv
-name: CasStudioTV
-description: "CasStudioTV is a RUSSIAN Semi-Private Torrent Tracker for TV"
-language: ru-ru
-type: semi-private
-encoding: UTF-8
-links:
-  - https://casstudio.tk/
-legacylinks:
-  - https://casstudio.tv/
-certificates:
-  - 71fe2295b57e6287ce36a39823bee752cbbd9d42 # expired 01 November 2020
-
-caps:
-  categorymappings:
-    - {id: 259, cat: TV, desc: "Сериалы"}
-    - {id: 372, cat: TV, desc: "Австралийские сериалы"}
-    - {id: 375, cat: TV, desc: "Американские сериалы"}
-    - {id: 343, cat: TV, desc: "A&E"}
-    - {id: 126, cat: TV, desc: "Мотель Бейтс / Bates Motel"}
-    - {id: 317, cat: TV, desc: "ABC"}
-    - {id: 72, cat: TV, desc: "Агент Картер / Agent Carter"}
-    - {id: 120, cat: TV, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
-    - {id: 110, cat: TV, desc: "Американская семейка / Modern Family"}
-    - {id: 70, cat: TV, desc: "Анатомия страсти / Анатомия Грей / Grey's Anatomy"}
-    - {id: 210, cat: TV, desc: "База Куантико / Quantico"}
-    - {id: 65, cat: TV, desc: "Возмездие / Revenge"}
-    - {id: 119, cat: TV, desc: "Бывает и хуже / The Middle"}
-    - {id: 145, cat: TV, desc: "Город Хищниц / Cougar Town"}
-    - {id: 75, cat: TV, desc: "Как избежать наказания за убийство / How to Get Away with Murder"}
-    - {id: 63, cat: TV, desc: "Касл / Castle"}
-    - {id: 222, cat: TV, desc: "Клуб жен астронавтов / The Astronaut Wives Club"}
-    - {id: 147, cat: TV, desc: "Копы-новобранцы / Rookie Blue"}
-    - {id: 276, cat: TV, desc: "Любовницы / Mistresses US"}
-    - {id: 308, cat: TV, desc: "Хороший доктор / The Good Doctor"}
-    - {id: 189, cat: TV, desc: "Шёпот / The Whispers"}
-    - {id: 164, cat: TV, desc: "Нэшвилл / Nashville"}
-    - {id: 303, cat: TV, desc: "Одаренные / The Gifted"}
-    - {id: 92, cat: TV, desc: "Однажды в сказке / Once Upon A Time"}
-    - {id: 163, cat: TV, desc: "Отчаянные домохозяйки / Desperate Housewives"}
-    - {id: 287, cat: TV, desc: "Приговор / Conviction"}
-    - {id: 135, cat: TV, desc: "ПригорАД / Suburgatory"}
-    - {id: 267, cat: TV, desc: "Семья / The Family"}
-    - {id: 64, cat: TV, desc: "Скандал / Scandal"}
-    - {id: 106, cat: TV, desc: "Шпионка / Alias"}
-    - {id: 358, cat: TV, desc: "Adult Swim"}
-    - {id: 323, cat: TV, desc: "Amazon"}
-    - {id: 232, cat: TV, desc: "Десница Божья / Hand of God"}
-    - {id: 231, cat: TV, desc: "Моцарт в джунглях / Mozart in the Jungle"}
-    - {id: 280, cat: TV, desc: "Тик / The Tick"}
-    - {id: 328, cat: TV, desc: "AMC"}
-    - {id: 122, cat: TV, desc: "Безумцы / Mad Men"}
-    - {id: 208, cat: TV, desc: "Бойтесь ходячих мертвецов / Fear the Walking Dead"}
-    - {id: 219, cat: TV, desc: "В пустыне смерти / Into the Badlands"}
-    - {id: 198, cat: TV, desc: "Люди / Humans"}
-    - {id: 274, cat: TV, desc: "Проповедник / Preacher"}
-    - {id: 95, cat: TV, desc: "Убийство / The Killing"}
-    - {id: 59, cat: TV, desc: "Ходячие мертвецы / The Walking Dead"}
-    - {id: 356, cat: TV, desc: "Audience"}
-    - {id: 320, cat: TV, desc: "CBS"}
-    - {id: 87, cat: TV, desc: "В поле зрения / Person of Interest"}
-    - {id: 293, cat: TV, desc: "Голубая кровь / Blue Bloods"}
-    - {id: 108, cat: TV, desc: "Две девицы на мели / 2 Broke Girls"}
-    - {id: 201, cat: TV, desc: "За пределами / Выжившая / Род человеческий / Extant"}
-    - {id: 314, cat: TV, desc: "Звёздный путь / Star Trek"}
-    - {id: 141, cat: TV, desc: "Как Я Встретил Вашу Маму / How I Met Your Mother"}
-    - {id: 127, cat: TV, desc: "Майк и Молли / Mike & Molly"}
-    - {id: 313, cat: TV, desc: "МакГайвер / MacGyver"}
-    - {id: 180, cat: TV, desc: "Миллеры в разводе / The Millers"}
-    - {id: 76, cat: TV, desc: "Мыслить как преступник / Criminal Minds"}
-    - {id: 144, cat: TV, desc: "Полиция Гавайев / Hawaii Five-0"}
-    - {id: 99, cat: TV, desc: "Под куполом / Under The Dome"}
-    - {id: 78, cat: TV, desc: "Помнить все / Незабываемое / Unforgettable"}
-    - {id: 107, cat: TV, desc: "Теория Большого Взрыва / The Big Bang Theory"}
-    - {id: 105, cat: TV, desc: "Элементарно / Elementary"}
-    - {id: 318, cat: TV, desc: "CW"}
-    - {id: 307, cat: TV, desc: "Династия / Dynasty"}
-    - {id: 102, cat: TV, desc: "Дневники вампира / The Vampire Diaries"}
-    - {id: 104, cat: TV, desc: "Древние / The Originals"}
-    - {id: 277, cat: TV, desc: "Карантин / Containment"}
-    - {id: 193, cat: TV, desc: "Красавица и чудовище / Beauty and the Beast"}
-    - {id: 238, cat: TV, desc: "Легенды завтрашнего дня / Legends of Tomorrow"}
-    - {id: 290, cat: TV, desc: "Радиоволна / Frequency"}
-    - {id: 111, cat: TV, desc: "Сверхъестественное / Supernatural"}
-    - {id: 109, cat: TV, desc: "Сотня / 100 / The Hundred"}
-    - {id: 131, cat: TV, desc: "Стрела / Arrow"}
-    - {id: 190, cat: TV, desc: "Супергёрл / Supergirl"}
-    - {id: 142, cat: TV, desc: "Флэш / Flash"}
-    - {id: 124, cat: TV, desc: "Царство / Reign"}
-    - {id: 270, cat: TV, desc: "яЗомби / iZombie"}
-    - {id: 336, cat: TV, desc: "DC"}
-    - {id: 316, cat: TV, desc: "FOX"}
-    - {id: 310, cat: TV, desc: "9-1-1"}
-    - {id: 61, cat: TV, desc: "Готэм / Gotham"}
-    - {id: 182, cat: TV, desc: "Задержка в развитии / Arrested Development"}
-    - {id: 74, cat: TV, desc: "Империя / Empire"}
-    - {id: 247, cat: TV, desc: "Люцифер / Lucifer"}
-    - {id: 157, cat: TV, desc: "Секретные материалы / X-Files"}
-    - {id: 286, cat: TV, desc: "Смертельное Оружие / Lethal Weapon"}
-    - {id: 304, cat: TV, desc: "Орвилл / The Orville"}
-    - {id: 162, cat: TV, desc: "Последователи / The Following"}
-    - {id: 187, cat: TV, desc: "Уэйуорд Пайнс / Wayward Pines"}
-    - {id: 288, cat: TV, desc: "Экзорцист / The Exorcist"}
-    - {id: 327, cat: TV, desc: "FX"}
-    - {id: 62, cat: TV, desc: "Американцы / The Americans"}
-    - {id: 239, cat: TV, desc: "Баскетс / Baskets"}
-    - {id: 300, cat: TV, desc: "Легион / Legion"}
-    - {id: 85, cat: TV, desc: "Штамм / The Strain"}
-    - {id: 82, cat: TV, desc: "Сыны Анархии / Sons of Anarchy"}
-    - {id: 98, cat: TV, desc: "Уилфред / Wilfred"}
-    - {id: 337, cat: TV, desc: "History"}
-    - {id: 91, cat: TV, desc: "Викинги / Vikings"}
-    - {id: 324, cat: TV, desc: "HULU"}
-    - {id: 246, cat: TV, desc: "11.22.63"}
-    - {id: 305, cat: TV, desc: "Беглецы / Runaways"}
-    - {id: 345, cat: TV, desc: "MTV, Sprike"}
-    - {id: 137, cat: TV, desc: "Оборотень / Teen Wolf"}
-    - {id: 237, cat: TV, desc: "Хроники Шаннары / The Shannara Chronicles"}
-    - {id: 319, cat: TV, desc: "NBC"}
-    - {id: 192, cat: TV, desc: "Водолей / Aquarius"}
-    - {id: 166, cat: TV, desc: "Ганнибал / Hannibal"}
-    - {id: 211, cat: TV, desc: "Герои: Возрождение / Heroes Reborn"}
-    - {id: 117, cat: TV, desc: "Гримм / Grimm"}
-    - {id: 285, cat: TV, desc: "Квантовый скачок / Quantum Leap"}
-    - {id: 245, cat: TV, desc: "Медики Чикаго / Chicago Med"}
-    - {id: 234, cat: TV, desc: "Мистер Робинсон / Mr. Robinson"}
-    - {id: 80, cat: TV, desc: "Пересекающиеся линии / Пересекая черту / Crossing Lines"}
-    - {id: 90, cat: TV, desc: "Пожарные Чикаго / Chicago Fire"}
-    - {id: 77, cat: TV, desc: "Полиция Чикаго / Chicago PD"}
-    - {id: 112, cat: TV, desc: "Революция / Revolution"}
-    - {id: 213, cat: TV, desc: "Слепое пятно / Blindspot"}
-    - {id: 93, cat: TV, desc: "Сообщество / Community"}
-    - {id: 273, cat: TV, desc: "Тайны Лауры / The Mysteries of Laura"}
-    - {id: 177, cat: TV, desc: "Черный список / The Blacklist"}
-    - {id: 321, cat: TV, desc: "NETFLIX"}
-    - {id: 281, cat: TV, desc: "Барыги / Narcos"}
-    - {id: 309, cat: TV, desc: "Видоизмененный углерод / Altered Carbon"}
-    - {id: 229, cat: TV, desc: "Джессика Джонс / Jessica Jones"}
-    - {id: 278, cat: TV, desc: "Загадочные события / Stranger Things"}
-    - {id: 301, cat: TV, desc: "Защитники / The Defenders"}
-    - {id: 306, cat: TV, desc: "Каратель / The Punisher"}
-    - {id: 174, cat: TV, desc: "Карточный домик / House of Cards"}
-    - {id: 130, cat: TV, desc: "Лиллехаммер / Lilyhammer"}
-    - {id: 294, cat: TV, desc: "Лемони Сникет: 33 несчастья / A Series of Unfortunate Events"}
-    - {id: 275, cat: TV, desc: "Оранжевый - хит сезона / Orange is the New Black"}
-    - {id: 194, cat: TV, desc: "Сорвиголова / Daredevil"}
-    - {id: 333, cat: TV, desc: "Showtime"}
-    - {id: 154, cat: TV, desc: "Блудливая Калифорния / Californication"}
-    - {id: 118, cat: TV, desc: "Веб терапия / Web Therapy"}
-    - {id: 176, cat: TV, desc: "Декстер / Dexter"}
-    - {id: 282, cat: TV, desc: "Дорожная команда / Roadies"}
-    - {id: 203, cat: TV, desc: "Как бы счастье / Happyish"}
-    - {id: 156, cat: TV, desc: "Мастера Секса / Masters of Sex"}
-    - {id: 244, cat: TV, desc: "Миллиарды / Billions"}
-    - {id: 58, cat: TV, desc: "Обитель лжи / House of Lies"}
-    - {id: 83, cat: TV, desc: "Родина / Homeland"}
-    - {id: 128, cat: TV, desc: "Рэй Донован / Ray Donovan"}
-    - {id: 191, cat: TV, desc: "Страшные сказки / Penny Dreadful"}
-    - {id: 330, cat: TV, desc: "STARZ"}
-    - {id: 204, cat: TV, desc: "Власть в ночном городе / Power"}
-    - {id: 271, cat: TV, desc: "Девушка по вызову / The Girlfriend Experience"}
-    - {id: 218, cat: TV, desc: "Плоть и кости / Flesh and Bone"}
-    - {id: 217, cat: TV, desc: "Эш против Зловещих мертвецов / Ash vs Evil Dead"}
-    - {id: 153, cat: TV, desc: "Спартак / Spartacus"}
-    - {id: 73, cat: TV, desc: "Черные Паруса / Black Sails"}
-    - {id: 326, cat: TV, desc: "SyFy"}
-    - {id: 86, cat: TV, desc: "12 Обезьян / 12 Monkeys"}
-    - {id: 228, cat: TV, desc: "Волшебники / The Magicians"}
-    - {id: 195, cat: TV, desc: "Киллджойс / Killjoys"}
-    - {id: 233, cat: TV, desc: "Конец детства / Childhood's End"}
-    - {id: 235, cat: TV, desc: "Пространство / The Expanse"}
-    - {id: 196, cat: TV, desc: "Тёмная материя / Dark Matter"}
-    - {id: 143, cat: TV, desc: "Хранилище 13 / Warehouse 13"}
-    - {id: 94, cat: TV, desc: "Хэйвен / Haven"}
-    - {id: 351, cat: TV, desc: "TBS"}
-    - {id: 334, cat: TV, desc: "TNT"}
-    - {id: 243, cat: TV, desc: "Библиотекари / The Librarians"}
-    - {id: 220, cat: TV, desc: "Восприятие / Perception"}
-    - {id: 136, cat: TV, desc: "Риццоли и Айлc / Rizzoli & Isles"}
-    - {id: 160, cat: TV, desc: "Рухнувшие Небеса / Falling Skies"}
-    - {id: 341, cat: TV, desc: "TV Land"}
-    - {id: 146, cat: TV, desc: "Красотки в Кливленде / Hot in Cleveland"}
-    - {id: 325, cat: TV, desc: "USA"}
-    - {id: 158, cat: TV, desc: "4400 / The 4400"}
-    - {id: 134, cat: TV, desc: "Белый воротничок / White Collar"}
-    - {id: 230, cat: TV, desc: "Колония / Colony"}
-    - {id: 291, cat: TV, desc: "Королева Юга / Queen of the South"}
-    - {id: 236, cat: TV, desc: "Полицейские на велосипедах / Pacific Blue"}
-    - {id: 168, cat: TV, desc: "Форс-мажоры / Костюмы / Suits"}
-    - {id: 352, cat: TV, desc: "YouTube"}
-    - {id: 370, cat: TV, desc: "Британские сериалы"}
-    - {id: 69, cat: TV, desc: "Мушкетеры / The Musketeers"}
-    - {id: 272, cat: TV, desc: "Поворот / TURN"}
-    - {id: 373, cat: TV, desc: "Датские и Шведские сериалы"}
-    - {id: 381, cat: TV, desc: "Ирландские сериалы"}
-    - {id: 367, cat: TV, desc: "Испанские сериалы"}
-    - {id: 380, cat: TV, desc: "Итальянские сериалы"}
-    - {id: 371, cat: TV, desc: "Канадские сериалы"}
-    - {id: 368, cat: TV, desc: "Немецкие сериалы"}
-    - {id: 376, cat: TV, desc: "Нидерландские сериалы"}
-    - {id: 379, cat: TV, desc: "Норвежские сериалы"}
-    - {id: 377, cat: TV, desc: "Российские сериалы"}
-    - {id: 369, cat: TV, desc: "Французкие сериалы"}
-    - {id: 374, cat: TV, desc: "Швейцарские сериалы"}
-    - {id: 382, cat: TV, desc: "Японские сериалы"}
-    - {id: 357, cat: TV, desc: "Сериалы только с субтитрами"}
-    - {id: 378, cat: TV, desc: "Сериалы производства нескольких стран"}
-    - {id: 88, cat: TV, desc: "Мультсериалы"}
-    - {id: 101, cat: TV, desc: "Южный Парк / South Park"}
-    - {id: 89, cat: TV, desc: "Спецагент Арчер / Archer"}
-    - {id: 225, cat: TV, desc: "Стендап / Stand Up"}
-    - {id: 54, cat: TV, desc: "Особый раздел"}
-    - {id: 100, cat: TV, desc: "Короткометражки"}
-    - {id: 60, cat: TV, desc: "Документальные и научно-популярные передачи"}
-    - {id: 159, cat: TV, desc: "Разное"}
-    - {id: 261, cat: TV, desc: "Спорт"}
-    - {id: 262, cat: TV, desc: "Автомотоспорт"}
-    - {id: 263, cat: TV, desc: "Формула 1 / Formula 1"}
-    - {id: 264, cat: TV, desc: "MotoGP / SBK"}
-    - {id: 265, cat: TV, desc: "V8 supercars"}
-    - {id: 31, cat: TV, desc: "Пользователи"}
-    - {id: 188, cat: TV, desc: "Поздравления"}
-    - {id: 24, cat: TV, desc: "Чат"}
-    - {id: 23, cat: TV, desc: "Общий"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: t
-    options:
-      t: created
-      ts: seeders
-      sz: size
-      i: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: d
-    options:
-      d: desc
-      a: asc
-
-login:
-  path: ucp.php?mode=login
-  method: form
-  form: form#login
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: fieldset:has(div.error)
-  test:
-    path: /
-    selector: :has(a[href^="./ucp.php?mode=logout&sid="])
-
-search:
-  paths:
-    # https://casstudio.tv/search.php?tracker_search=torrent&keywords=star&terms=all&author=&sc=1&sf=titleonly&sr=topics&sk=t&sd=d&st=0&ch=300&t=0&submit=Search
-    - path: search.php
-  inputs:
-    tracker_search: torrent
-    keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    terms: all
-    author: ""
-    sc: 1
-    sf: titleonly
-    sr: topics
-    sk: "{{ .Config.sort }}"
-    sd: "{{ .Config.type }}"
-    st: 0
-    ch: 300
-    t: 0
-    submit: Search
-
-  rows:
-    selector: tr.row
-
-  fields:
-    title:
-      selector: a.topictitle
-    details:
-      selector: a.topictitle
-      attribute: href
-    category:
-      selector: a[href^="./viewforum.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    download:
-      selector: a[href^="./download/file.php?id="]
-      attribute: href
-    size:
-      selector: a[href^="./viewforum.php?f="] + b
-      filters:
-        - name: replace
-          args: ["ТБ", "TB"]
-        - name: replace
-          args: ["ГБ", "GB"]
-        - name: replace
-          args: ["МБ", "MB"]
-        - name: replace
-          args: ["КБ", "KB"]
-    seeders:
-      selector: td.forumtopics span.seed
-    leechers:
-      selector: td.forumtopics span.leech
-    grabs:
-      selector: td.forumposts span.complet
-    date:
-      # Вчера, 10:34
-      selector: td.forumdetails span.forum-descriptions:contains("Вчера")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(Вчера, \\d{2}:\\d{2})"
-        - name: replace
-          args: ["Вчера", "Today"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: fuzzytime
-    date:
-      # Сегодня, 17:54
-      selector: td.forumdetails span.forum-descriptions:contains("Сегодня")
-      optional: true
-      filters:
-        - name: regexp
-          args: "(Сегодня, \\d{2}:\\d{2})"
-        - name: replace
-          args: ["Сегодня", "Today"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: fuzzytime
-    date:
-      # 12 янв 2019, 11:26
-      selector: td.forumdetails span.forum-descriptions:not(:contains("Сегодня")):not(:contains("Вчера"))
-      optional: true
-      filters:
-        - name: regexp
-          args: "(\\d{2} \\D{3} \\d{4}, \\d{2}:\\d{2})"
-        - name: replace
-          args: ["янв", "Jan"]
-        - name: replace
-          args: ["фев", "Feb"]
-        - name: replace
-          args: ["мар", "Mar"]
-        - name: replace
-          args: ["апр", "Apr"]
-        - name: replace
-          args: ["май", "May"]
-        - name: replace
-          args: ["июн", "Jun"]
-        - name: replace
-          args: ["июл", "Jul"]
-        - name: replace
-          args: ["авг", "Aug"]
-        - name: replace
-          args: ["сен", "Sep"]
-        - name: replace
-          args: ["окт", "Oct"]
-        - name: replace
-          args: ["ноя", "Nov"]
-        - name: replace
-          args: ["дек", "Dec"]
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02 Jan 2006, 15:04 -07:00"
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# phpBB

src/Jackett.Common/Definitions/catorrent.yml

@@ -56,8 +56,9 @@ login:
     selector: a[href$="/index.php?action=logout"]
 
 download:
-  selector: a[href*="/index.php?do=download&id="]
-  attribute: href
+  selectors:
+    - selector: a[href*="/index.php?do=download&id="]
+      attribute: href
 
 search:
   # https://catorrent.org/index.php?do=search&subaction=search&story=lovelot

src/Jackett.Common/Definitions/ceskeforum.yml

@@ -0,0 +1,169 @@
+---
+id: ceskeforum
+name: CeskeForum
+description: "CeskeForum is a CZECH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: cs-cz
+type: private
+encoding: UTF-8
+links:
+  - https://t.ceskeforum.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Filmy (Movies)"}
+    - {id: 403, cat: TV, desc: "TV pořady (TV Shows)"}
+    - {id: 404, cat: TV/Documentary, desc: "TV dokumenty (Documentaries)"}
+    - {id: 408, cat: TV, desc: "TV seriály - kompletní série (TV Series complete)"}
+    - {id: 402, cat: TV, desc: "TV seriály - jednotlivé díly (TV Series episodes)"}
+    - {id: 407, cat: TV/Sport, desc: "Sport"}
+    - {id: 411, cat: Books, desc: "Knihy (Books)"}
+    - {id: 413, cat: Audio/Audiobook, desc: "Knihy ve zvukové podobě (AudioBooks)"}
+    - {id: 406, cat: Audio, desc: "Hudba (Music)"}
+    - {id: 410, cat: PC, desc: "Software"}
+    - {id: 412, cat: PC/Games, desc: "Software - Hry (Games)"}
+    - {id: 409, cat: Other, desc: "Nezařazené (Misc)"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("Přihlášení selhalo!"))
+      message:
+        selector: td.text
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0=incldead, 1=active, 2=dead
+    incldead: 0
+    # show promotions: 0=all, 1=normal, 2=free, 3=2x, 4=2xFree, 5=50%, 6=2x50%, 7=30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0=title, 1=descr, 3=uploader, 4=imdb URL
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0=AND, 1=OR, 2=Exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    title:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +02:00" # EET
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/cilipro.yml

@@ -6,15 +6,6 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - http://www.cilinb1.xyz/
-  - http://www.cilinb2.xyz/
-  - http://www.cilinb3.xyz/
-  - http://www.cilinb5.xyz/
-  - http://www.cilinb6.xyz/
-  - http://www.cilinb7.xyz/
-  - http://www.cilinb8.xyz/
-  - http://www.cilinb9.xyz/
-  - http://www.cilinb10.xyz/
   - http://www.kmsoso1.xyz/
   - http://www.kmsoso3.xyz/
   - http://www.kmsoso5.xyz/
@@ -24,6 +15,17 @@ links:
   - http://www.kuaimaso3.xyz/
   - http://www.kuaimaso5.xyz/
   - http://www.kuaimaso9.xyz/
+  - http://www.km159.xyz/
+  - http://www.km160.xyz/
+  - http://www.km161.xyz/
+  - http://www.km162.xyz/
+  - http://www.km163.xyz/
+  - http://www.km164.xyz/
+  - http://www.km165.xyz/
+  - http://www.km166.xyz/
+  - http://www.km167.xyz/
+  - http://www.km168.xyz/
+  - http://www.km169.xyz/
 legacylinks:
   - http://www.cili180.com/
   - https://www.cilijj.xyz/
@@ -80,6 +82,15 @@ legacylinks:
   - http://www.cilipro9.xyz/
   - http://www.cilipro10.xyz/
   - http://www.cilinb4.xyz/
+  - http://www.cilinb1.xyz/
+  - http://www.cilinb2.xyz/
+  - http://www.cilinb3.xyz/
+  - http://www.cilinb5.xyz/
+  - http://www.cilinb6.xyz/
+  - http://www.cilinb7.xyz/
+  - http://www.cilinb8.xyz/
+  - http://www.cilinb9.xyz/
+  - http://www.cilinb10.xyz/
 
 caps:
   categories:

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -53,6 +53,17 @@ settings:
     type: checkbox
     label: Drop the Polish title prefix
     default: false
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI & PL by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI & PL by this language
+    default: POLISH
+    options:
+      POLISH: POLISH
+      MULTI.POLISH: MULTI.POLISH
   - name: sort
     type: select
     label: Sort requested from site
@@ -105,13 +116,22 @@ search:
           args: cat
     title_raw:
       selector: a[href^="details.php?id="]
+    title_multilang:
+      text: "{{ .Result.title_raw }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\[multi\\])", " {{ .Config.multilanguage }} "]
+        - name: re_replace
+          args: ["(?i)(\\[pl\\])", " {{ .Config.multilanguage }} "]
+    title_phase1:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_raw }}{{ end }}"
     title_stripped:
-      selector: a[href^="details.php?id="]
+      text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
           args: ["^(.* / )(.*)$", "$2"]
     title:
-      text: "{{ if .Config.drop_polish_prefix }}{{ .Result.title_stripped }}{{ else }}{{ .Result.title_raw }}{{ end }}"
+      text: "{{ if .Config.drop_polish_prefix }}{{ .Result.title_stripped }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/cinematik.yml

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

src/Jackett.Common/Definitions/classix.yml

@@ -28,8 +28,9 @@ login:
     path: index.php
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/cpabien.yml

@@ -61,7 +61,6 @@ settings:
   - name: useragent
     type: text
     label: User-Agent
-    label: User-Agent
   - name: info_useragent
     type: info
     label: How to get the User-Agent
@@ -101,8 +100,9 @@ login:
     user-agent: "[ .Config.useragent ]"
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -68,8 +68,9 @@ settings:
       ?trie-nom-a: title asc
 
 download:
-  selector: a[href^="magnet:"]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/crazyhd.yml

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

src/Jackett.Common/Definitions/crazyspirits.yml

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

src/Jackett.Common/Definitions/danishbytes.yml

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

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

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

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,7 +10,7 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.onl/
+  - https://demonoid.unblockit.ch/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.space/
 legacylinks:
@@ -33,6 +33,9 @@ legacylinks:
   - https://demonoid.unblockit.link/
   - https://demonoid.unblockit.buzz/
   - https://demonoid.unblockit.club/
+  - https://demonoid.unblockit.onl/
+  - https://demonoid.unblockit.li/
+  - https://demonoid.unblockit.uno/
 
 caps:
   categorymappings:
@@ -283,7 +286,7 @@ caps:
     - {id: 233, cat: TV, desc: "TV Trailers"}
     - {id: 234, cat: TV, desc: "TV War"}
     - {id: 235, cat: TV, desc: "TV Western"}
-    # cat 7 misc has no subcats
+    # cat 7 Miscellaneous has no subcats
 
   modes:
     search: [q]
@@ -300,6 +303,10 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Access this tracker with your browser<li>click on the <b>Apply Filter</b> button on the page to invoke the search and solve the challenge<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: info_themes
+    type: info
+    label: About themes
+    default: Only the default theme <b>Demonoid - v5</b> is supported. If you are using v3 then change it in your <i>User Control Panel</i> or you will get 0 results.
   - name: sort
     type: select
     label: Sort requested from site
@@ -317,8 +324,9 @@ login:
     path: files/
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="/files/download/"]:has(i.fa-download)
+      attribute: href
 
 search:
   paths:
@@ -341,10 +349,11 @@ search:
     # does not return imdb link in results
 
   rows:
-    selector: table.font_12px tr:has(td[class^="tone_1"])
+    # only the default theme "Demonoid - v5" is supported
+    selector: table.table:has(td.torrent__table-today) > tbody > tr:has(td[class^="tone_"])
     after: 1
     dateheaders:
-      selector: tr td.added_today:not(:contains("Sponsored links"))
+      selector: tr td.torrent__table-today:not(:contains("Sponsored links"))
       filters:
         - name: replace
           args: ["Added ", ""]
@@ -359,7 +368,7 @@ search:
       optional: true
       attribute: title
     category:
-      selector: span > a[href*="&subcategory="]
+      selector: span.torrent__table-info > a:nth-child(2)
       attribute: href
       optional: true
       filters:
@@ -372,15 +381,15 @@ search:
       selector: a[href^="/files/details/"]
       attribute: href
     description:
-      selector: td:nth-last-child(9)
+      selector: td:nth-last-child(7)
     size:
-      selector: td:nth-last-child(6)
+      selector: td:nth-last-child(5)
     grabs:
-      selector: td:nth-last-child(4)
-    seeders:
       selector: td:nth-last-child(3)
-    leechers:
+    seeders:
       selector: td:nth-last-child(2)
+    leechers:
+      selector: td:nth-last-child(1)
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -86,22 +86,22 @@ search:
     freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
   rows:
-    selector: table > tbody > tr:has(a[href^="magnet:?dn="])
+    selector: table > tbody > tr:has(a[href*="/download/"])
 
   fields:
     category:
       text: 1
     title:
-      selector: a[href*="/torrents/"]
+      selector: span[class="name"]
     details:
       selector: a[href*="/torrents/"]
       attribute: href
     download:
       selector: a[href*="/download/"]
       attribute: href
-    magnet:
-      selector: a[href^="magnet:?dn="]
-      attribute: href
+#    magnet:
+#      selector: a[href^="magnet:?dn="]
+#      attribute: href
     poster:
       selector: img.tps
       attribute: src

src/Jackett.Common/Definitions/desitorrents.yml

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

src/Jackett.Common/Definitions/dimeadozen.yml

@@ -100,8 +100,9 @@ login:
 
 download:
   # download.php/673256/Talk%20Talk%20-%201986-07-05%20Paris.torrent
-  selector: a[href^="download.php/"]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php/"]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/divteam.yml

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

src/Jackett.Common/Definitions/dxp.yml

@@ -79,8 +79,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   # https://dxp.ru/torrents.php?search=&sort=4&type=desc

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -79,8 +79,9 @@ download:
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

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

@@ -308,8 +308,9 @@ login:
     selector: a[href^="account-logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/ehentai.yml

@@ -19,8 +19,9 @@ caps:
     tv-search: [q, season, ep]
 
 download:
-  selector: a[href*="/get/"]
-  attribute: href
+  selectors:
+    - selector: a[href*="/get/"]
+      attribute: href
 
 search:
   paths:

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

@@ -0,0 +1,151 @@
+---
+id: elitetorrent-biz
+name: EliteTorrent.biz
+description: "EliteTorrent.biz is a Public torrent site for TV, movies and documentaries"
+language: es-es
+type: public
+encoding: UTF-8
+links:
+  - https://elitetorrent.si/
+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/
+  - https://www.elitetorrent.bz/
+  - https://www.elitetorrent.nl/
+  - https://wwvv.elitetorrent.nl/
+  - https://wvvw.elitetorrent.nl/
+  - https://vvww.elitetorrent.nl/
+  - https://www.elitetorrent.to/
+  - https://www.elitetorrent.se/
+  - https://www.elitetorrent.com/
+  - https://elitetorrent.com/
+  - https://elitetorrent.app/
+
+caps:
+  categories:
+    "series": TV
+    "peliculas": Movies
+    "other": Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+
+settings: []
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?"]
+      attribute: href
+
+search:
+  # site returns just 30 results, attempt to fetch upto 90
+  paths:
+    - path: /
+    - path: /page/2/
+      followredirect: true
+    - path: /page/3/
+      followredirect: true
+  keywordsfilters:
+    # most ES/ITA TV torrents are in XXxYY format, so we search without S/E prefixes and filter later
+    - name: re_replace
+      args: ["(?i)S0?(\\d{1,2})", " $1 "]
+    - name: re_replace
+      args: ["(?i)E(\\d{2,3})", " $1 "]
+  inputs:
+    s: "{{ .Keywords }}"
+    $raw: "&x=0&y=0"
+
+  rows:
+    selector: "#principal .miniboxs-ficha li:has(span:nth-of-type(2))"
+    filters:
+      - name: andmatch
+
+  fields:
+    quality:
+      selector: span:nth-of-type(2) > i
+      filters:
+        - name: replace
+          args: ["---", ""]
+    language:
+      selector: span#idiomacio > i > img
+      attribute: title
+      filters:
+        - name: replace
+          args: ["Pelicula en ", ""]
+        - name: replace
+          args: ["Español Latino", "LATiN SPANiSH"]
+        - name: replace
+          args: ["Español Castellano", "SPANiSH"]
+        - name: replace
+          args: ["Ingles", "English"]
+        - name: replace
+          args: ["Subtitulado", " SPASUBS"]
+        - name: replace
+          args: ["VOSE", ""]
+    _title:
+      selector: div.imagen > a
+      attribute: title
+      # normalize to SXXEYY format
+      filters:
+        - name: replace
+          args: [" – ", " "]
+        - name: replace
+          args: ["(", ""]
+        - name: replace
+          args: [")", ""]
+        - name: re_replace
+          args: ["(\\d{2})×(\\d{2})", "S$1E$2"]
+        - name: re_replace
+          args: ["(\\d{1})×(\\d{2})", "S0$1E$2"]
+    title:
+      text: "{{ .Result._title}} {{ .Result.language }} {{ .Result.quality }}"
+    details:
+      selector: .meta a
+      attribute: href
+    download:
+      selector: .meta a
+      attribute: href
+    banner:
+      selector: .imagen img
+      attribute: data-src
+    category_movie:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(peliculas)/.*$"
+    category_tv:
+      selector: .meta a
+      attribute: href
+      filters:
+        - name: regexp
+          args: "^.*/(series)/.*$"
+    category:
+      text: "{{ if or .Result.category_movie .Result.category_tv }}{{ or .Result.category_movie .Result.category_tv }}{{ else }}other{{ end }}"
+    size:
+      text: "512 MB"
+    size:
+      # size can be missing
+      optional: true
+      selector: .voto1
+      filters:
+        - name: replace
+          args: ["s", ""]
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/emtrek.yml

@@ -1,310 +0,0 @@
----
-id: emtrek
-name: emtrek
-description: "emtrek is a RUSSIAN Public Torrent Tracker for 0DAY / GENERAL"
-language: ru-ru
-type: public
-encoding: UTF-8
-links:
-  - http://emtrek.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
-
-caps:
-  categorymappings:
-    # when refreshing categories remember to use the list on the tracker.php page and not the search.php page.
-    # Игры для PC (pc games)
-    - {id: 317, cat: PC/Games, desc: "Игры для Linux"}
-    - {id: 174, cat: PC/Games, desc: " |- Патчи"}
-    - {id: 175, cat: PC/Games, desc: " |- Дополнения к играм"}
-    - {id: 176, cat: PC/Games, desc: " |- Русификаторы"}
-    # Игры для Консолей (console)
-    - {id: 155, cat: Console/XBox 360, desc: " |- XBox360 | Программы / Прошивки"}
-    - {id: 162, cat: Console/PSP, desc: " |- PSP | Программы / Прошивки"}
-    - {id: 163, cat: Console/PSP, desc: " |- PSX-PSP"}
-    - {id: 164, cat: Console/Other, desc: " |- Homebrew игры"}
-    - {id: 165, cat: Console/PSP, desc: " |- PlayStation One | Игры"}
-    - {id: 166, cat: Console/PSP, desc: " |- PlayStation 2 | Игры"}
-    - {id: 168, cat: Console/NDS, desc: " |- Nintendo DS | Игры"}
-    - {id: 169, cat: Console/Other, desc: " |- GameCube | Игры"}
-    - {id: 170, cat: Console/Wii, desc: " |- Wii | Игры"}
-    # Спорт (sport)
-    - {id: 313, cat: TV/Sport, desc: " |- Лёгкая атлетика"}
-    - {id: 181, cat: TV/Sport, desc: " |- Автоспорт"}
-    - {id: 182, cat: TV/Sport, desc: " |- Мотоспорт"}
-    - {id: 183, cat: TV/Sport, desc: " |- Формула-1 2011"}
-    - {id: 184, cat: TV/Sport, desc: " |- Бокс"}
-    - {id: 185, cat: TV/Sport, desc: " |- Смешанные единоборства и K-1"}
-    - {id: 186, cat: TV/Sport, desc: " |- Рестлинг"}
-    - {id: 187, cat: TV/Sport, desc: " |- Регби"}
-    - {id: 188, cat: TV/Sport, desc: " |- Бейсбол"}
-    - {id: 190, cat: TV/Sport, desc: " |- Экстрим"}
-    - {id: 192, cat: TV/Sport, desc: " |- Россия 2011-2013"}
-    - {id: 193, cat: TV/Sport, desc: " |- Россия/СССР"}
-    - {id: 194, cat: TV/Sport, desc: " |- Еврокубки"}
-    - {id: 195, cat: TV/Sport, desc: " |- Еврокубки 2010-2012"}
-    - {id: 196, cat: TV/Sport, desc: " |- Чемпионаты Европы"}
-    - {id: 197, cat: TV/Sport, desc: " |- Чемпионаты Мира"}
-    - {id: 198, cat: TV/Sport, desc: " |- Обзорные и аналитические передачи"}
-    - {id: 318, cat: TV/Sport, desc: " |- Разное"}
-    - {id: 200, cat: TV/Sport, desc: " |- Международные соревнования"}
-    - {id: 201, cat: TV/Sport, desc: " |- NBA / NCAA (до 2000 г.)"}
-    - {id: 202, cat: TV/Sport, desc: " |- NBA / NCAA (2000-2010 гг.)"}
-    - {id: 203, cat: TV/Sport, desc: " |- NBA / NCAA (2010-2011 гг.)"}
-    - {id: 204, cat: TV/Sport, desc: " |- Европейский клубный баскетбол"}
-    - {id: 206, cat: TV/Sport, desc: " |- Хоккей с мячом / Бенди"}
-    - {id: 207, cat: TV/Sport, desc: " |- Международные турниры"}
-    - {id: 208, cat: TV/Sport, desc: " |- KXЛ"}
-    - {id: 209, cat: TV/Sport, desc: " |- НХЛ (до 2003/04)"}
-    - {id: 210, cat: TV/Sport, desc: " |- НХЛ (с 2005/06)"}
-    - {id: 211, cat: TV/Sport, desc: " |- СССР - Канада"}
-    - {id: 212, cat: TV/Sport, desc: " |- Документальные фильмы и аналитика"}
-    # Музыка (music)
-    - {id: 78, cat: Audio, desc: "Джаз и Блюз"}
-    - {id: 79, cat: Audio, desc: "Классическая музыка"}
-    - {id: 80, cat: Audio, desc: "Поп музыка, Eurodance, Disco"}
-    - {id: 81, cat: Audio, desc: "Народная и Этническая музыка"}
-    - {id: 82, cat: Audio, desc: "New Age, Relax, Meditative&Flamenco"}
-    - {id: 84, cat: Audio, desc: " |- Отечественный Rap / Hip-hop"}
-    - {id: 85, cat: Audio, desc: " |- Зарубежный Rap / Hip-hop"}
-    - {id: 99, cat: Audio, desc: " |- R'n'B"}
-    - {id: 86, cat: Audio, desc: "Reggae, Ska, Dub,Soul"}
-    - {id: 295, cat: Audio/Lossless, desc: " |- Classic Rock&Hard Rock (lossless)"}
-    - {id: 109, cat: Audio, desc: " |- Rock"}
-    - {id: 88, cat: Audio, desc: "Зарубежный метал"}
-    - {id: 89, cat: Audio, desc: "Отечественный Рок, Панк, Метал, Альтернатива"}
-    - {id: 110, cat: Audio, desc: " |- Rock"}
-    - {id: 90, cat: Audio, desc: "Шансон / Авторская песня"}
-    - {id: 91, cat: Audio, desc: " |- Шансон"}
-    - {id: 92, cat: Audio, desc: " |- Авторская песня"}
-    - {id: 94, cat: Audio, desc: "Восточно-азиатская музыка"}
-    - {id: 95, cat: Audio/Video, desc: "Музыкальное DVD и HD видео"}
-    - {id: 96, cat: Audio, desc: "Караоке"}
-    - {id: 248, cat: Audio, desc: " |- House, Techno, Hardcore, Hardstyle, Jumpstyle"}
-    - {id: 246, cat: Audio, desc: " |- Trance, Goa Trance, Psy-Trance, PsyChill, Ambient Dub"}
-    - {id: 249, cat: Audio, desc: " |- Drum&Bass, Jungle, Breakbeat, Dubstep, IDM, Electro"}
-    - {id: 250, cat: Audio, desc: " |- Chillout, Lounge, Downtempo, Trip-Hop"}
-    - {id: 251, cat: Audio, desc: " |- Traditional Electronic, Ambient, Modern Classical,..."}
-    - {id: 252, cat: Audio, desc: " |- Industrial, Noise, EBM, Dark Electro, Aggrotech,..."}
-    - {id: 253, cat: Audio/Lossless, desc: " |- Label Packs (lossless)"}
-    - {id: 254, cat: Audio/MP3, desc: " |- Label packs, Scene packs (lossy)"}
-    - {id: 255, cat: Audio/Video, desc: " |- Электронная музыка (Видео, DVD Video/Audio, HD Video,..."}
-    - {id: 298, cat: Audio/Lossless, desc: " |- DTS включая upmix"}
-    - {id: 299, cat: Audio, desc: " |- DVD-A"}
-    - {id: 300, cat: Audio, desc: " |- SACD"}
-    - {id: 257, cat: Audio, desc: "Клипы"}
-    - {id: 309, cat: Audio, desc: "Разное"}
-    # Программное обеспечение (software)
-    - {id: 22, cat: PC/Mac, desc: "Mac OS. Программное обеспечение под них"}
-    - {id: 23, cat: PC, desc: "Unix, Unix-подобные (*nix) и другие OS. Прогр..."}
-    - {id: 325, cat: PC, desc: "Авторские сборки"}
-    - {id: 328, cat: PC, desc: " |- m0nkrus"}
-    - {id: 289, cat: PC, desc: "Авторские раздачи Unix"}
-    - {id: 24, cat: PC/0day, desc: "Microsoft Windows OS"}
-    - {id: 49, cat: PC/0day, desc: " |- Оригинальные версии Windows"}
-    - {id: 294, cat: PC/0day, desc: " |- Оригинальные версии Windows Server"}
-    - {id: 28, cat: PC/0day, desc: " |- Windows XP"}
-    - {id: 29, cat: PC/0day, desc: " |- Windows Vista"}
-    - {id: 30, cat: PC/0day, desc: " |- Windows 7"}
-    - {id: 225, cat: PC/0day, desc: " |- Windows 8"}
-    - {id: 321, cat: PC/0day, desc: " |- Windows 10"}
-    - {id: 293, cat: PC/0day, desc: " |- Сборки Windows - "все в одном""}
-    - {id: 235, cat: PC/0day, desc: " |- Разное"}
-    - {id: 305, cat: PC/0day, desc: "Windows ОС в VHD контейнерах"}
-    - {id: 292, cat: PC/0day, desc: " |- stea.61"}
-    - {id: 307, cat: PC/0day, desc: " |- Сборки welic"}
-    - {id: 308, cat: PC/0day, desc: " |- Разное"}
-    - {id: 264, cat: PC/0day, desc: " |- lopatkin"}
-    - {id: 319, cat: PC/0day, desc: " |- KottoSOFT"}
-    - {id: 273, cat: PC/0day, desc: " |- vlazok"}
-    - {id: 269, cat: PC/0day, desc: " |- pytex"}
-    - {id: 276, cat: PC/0day, desc: " |- Vannza"}
-    - {id: 279, cat: PC/0day, desc: " |- Viktor"}
-    - {id: 291, cat: PC/0day, desc: " |- aleks200059"}
-    - {id: 265, cat: PC/0day, desc: " |- StartSoft"}
-    - {id: 266, cat: PC/0day, desc: " |- UralSOFT"}
-    - {id: 268, cat: PC/0day, desc: " |- БЕЛOFF"}
-    - {id: 272, cat: PC/0day, desc: " |- Elgujakviso"}
-    - {id: 311, cat: PC/0day, desc: " |- Feniks"}
-    - {id: 312, cat: PC/0day, desc: " |- vldim"}
-    - {id: 314, cat: PC/0day, desc: " |- DDGroup"}
-    - {id: 323, cat: PC/0day, desc: " |- adguard"}
-    - {id: 116, cat: PC/0day, desc: " |- Настройка и обслуживание. Диагностика"}
-    - {id: 120, cat: PC/0day, desc: " |- Сервисное обслуживание компьютера"}
-    - {id: 280, cat: PC/0day, desc: " |- Резервное копирование"}
-    - {id: 115, cat: PC/0day, desc: " |- Архиваторы и файловые менеджеры"}
-    - {id: 117, cat: PC/0day, desc: " |- Работа с носителями информации"}
-    - {id: 98, cat: PC/0day, desc: " |- Антивирусное ПО, Фаерволлы и защита информации"}
-    - {id: 118, cat: PC/0day, desc: " |- Драйвера"}
-    - {id: 243, cat: PC/0day, desc: " |- Оригинальные диски к компьютерам и комплектующим"}
-    - {id: 119, cat: PC/0day, desc: " |- Разное"}
-    - {id: 104, cat: PC/0day, desc: " |- Системы для офиса, бизнеса и научной работы"}
-    - {id: 107, cat: PC/0day, desc: " |- Программы для Интернет и сетей"}
-    - {id: 105, cat: PC/0day, desc: " |- Аудио- и видео, CD- проигрыватели и каталогизаторы"}
-    - {id: 108, cat: PC/0day, desc: " |- Разное"}
-    - {id: 106, cat: PC/0day, desc: " |- Обучающие программы, справочники, энциклопедии"}
-    - {id: 329, cat: PC/0day, desc: " |- WPI"}
-    - {id: 172, cat: PC/0day, desc: " |- Скрипты и движки сайтов, CMS а также расширения к ним"}
-    - {id: 171, cat: PC/0day, desc: " |- Текстовые редакторы с подсветкой"}
-    - {id: 111, cat: PC/0day, desc: " |- Графические редакторы"}
-    - {id: 284, cat: PC/0day, desc: " |- Программные комплекты"}
-    - {id: 285, cat: PC/0day, desc: " |- Плагины для программ компании Adobe"}
-    - {id: 286, cat: PC/0day, desc: " |- Редакторы видео"}
-    - {id: 288, cat: PC/0day, desc: " |- Виртуальные студии, секвенсоры и аудиоредакторы"}
-    - {id: 112, cat: PC/0day, desc: " |- Разное"}
-    # Мобильные устройства (mobile)
-    - {id: 224, cat: PC/Mobile-Other, desc: " |- Игры"}
-    - {id: 226, cat: PC/Mobile-Other, desc: " |- Программы"}
-    - {id: 227, cat: PC/Mobile-Other, desc: " |- Прошивки"}
-    - {id: 222, cat: PC/Mobile-Other, desc: " |- Видео"}
-    - {id: 228, cat: PC/Mobile-Other, desc: " |- Разное"}
-    - {id: 230, cat: PC/Mobile-Other, desc: " |- Игры"}
-    - {id: 231, cat: PC/Mobile-Other, desc: " |- Программы"}
-    - {id: 232, cat: PC/Mobile-Other, desc: " |- Прошивки"}
-    - {id: 233, cat: PC/Mobile-Other, desc: " |- Разное"}
-    # Книги, Аудиокниги, Ноты (books, audiobooks)
-    - {id: 123, cat: Books, desc: " |- Компьютерная литература"}
-    - {id: 124, cat: Books, desc: " |- Точные и естественные науки"}
-    - {id: 125, cat: Books, desc: " |- Строительная литература"}
-    - {id: 126, cat: Books, desc: " |- Художественная литература"}
-    - {id: 127, cat: Books, desc: " |- Гуманитарные науки"}
-    - {id: 281, cat: Books, desc: " |- Медицина.Здоровье"}
-    - {id: 128, cat: Books, desc: " |- Авто литература"}
-    - {id: 129, cat: Books, desc: " |- Журналы"}
-    - {id: 130, cat: Books, desc: " |- Комиксы"}
-    - {id: 131, cat: Books, desc: " |- Детские книги и журналы"}
-    - {id: 132, cat: Books, desc: " |- Охота и Рыбалка"}
-    - {id: 133, cat: Books, desc: " |- Психология"}
-    - {id: 134, cat: Books, desc: " |- История"}
-    - {id: 135, cat: Books, desc: " |- Религия"}
-    - {id: 277, cat: Books, desc: " |- Магия, Астрология, Алхимия"}
-    - {id: 278, cat: Books, desc: " |- Кулинария (книги)"}
-    - {id: 304, cat: Books, desc: " |- Домашние питомцы"}
-    - {id: 310, cat: Books, desc: " |- Разное"}
-    - {id: 137, cat: Books, desc: " |- Психология"}
-    - {id: 138, cat: Books, desc: " |- История"}
-    - {id: 139, cat: Books, desc: " |- Юмор"}
-    - {id: 140, cat: Books, desc: " |- Религия"}
-    - {id: 141, cat: Books, desc: " |- Детская литература"}
-    - {id: 142, cat: Books, desc: " |- Фантастика"}
-    - {id: 143, cat: Books, desc: " |- Классика"}
-    - {id: 144, cat: Books, desc: " |- Художественная литература"}
-    - {id: 303, cat: Books, desc: " |- Поэзия"}
-    - {id: 146, cat: Books, desc: " |- Ноты"}
-    # Wallpapers (other)
-    - {id: 121, cat: Other, desc: "Обои / Рисунки / Картинки"}
-    # Корзина (other)
-    - {id: 2, cat: Other, desc: "Для пробных раздач"}
-    # the following forums are not in the tracker pull down list.
-    # Архив (archive)
-    - {id: 20, cat: Other, desc: "Архив"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 1
-    options:
-      1: desc
-      2: asc
-
-search:
-  paths:
-    - path: tracker.php
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    prev_allw: 1
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    # sort by 1=registered, 2=topicTitle, 4=completed, 10=seed, 11=leech, 12=up, 13=down, 5=replies, 6=views, 7=size, 8=lastPost, 9=seedLastSeen
-    o: "{{ .Config.sort }}"
-    # 1=asc, 2=desc
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # all words
-    allw: 1
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="magnet:?xt="])
-
-  fields:
-    category:
-      selector: a[href^="tracker.php?f="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a[href^="./viewtopic.php?t="]
-    details:
-      selector: a[href^="./viewtopic.php?t="]
-      attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-      filters:
-        - name: append
-          args: "&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://tracker.opentrackr.org:1337"
-    size:
-      selector: td:nth-child(6) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      text: 0
-#        case:
-#          img[src="styles/images/tor_gold.gif"]: 0
-#          img[src="styles/images/tor_silver.gif"]: 0.5
-#          "*": 1
-    uploadvolumefactor:
-      text: 1
-# TorrentPier II

src/Jackett.Common/Definitions/epizod.yml

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

src/Jackett.Common/Definitions/erzsebet.yml

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

src/Jackett.Common/Definitions/erzsebetpl.yml

@@ -1,328 +0,0 @@
----
-id: erzsebetpl
-name: Erzsebet.pl
-description: "Erzsebet.pl is a RUSSIAN Semi-Private Torrent Tracker for 3X"
-language: ru-ru
-type: semi-private
-encoding: UTF-8
-links:
-  - https://erzsebet.pl/
-
-caps:
-  categorymappings:
-    # Movies
-    - {id: 3, cat: Movies, desc: "Зарубежное кино"}
-    - {id: 4, cat: Movies, desc: "Зарубежное кино Классика мирового кинематографа"}
-    - {id: 10, cat: Movies, desc: "Зарубежное кино Зарубежные фильмы"}
-    - {id: 157, cat: Movies, desc: "Зарубежное кино Зарубежное кино (DVD Video)"}
-    - {id: 142, cat: Movies, desc: "Зарубежное кино Зарубежное кино (HD Video)"}
-    - {id: 161, cat: TV, desc: "Зарубежное кино Зарубежные сериалы"}
-    - {id: 11, cat: Movies, desc: "Кино России, CCCР и бывших стран СССР"}
-    - {id: 12, cat: Movies, desc: "Кино России Кино СССР"}
-    - {id: 132, cat: Movies, desc: "Кино России Наше кино"}
-    - {id: 158, cat: Movies, desc: "Кино России Наше кино (DVD Video)"}
-    - {id: 133, cat: Movies, desc: "Кино России Наше кино (HD Video)"}
-    - {id: 160, cat: TV, desc: "Кино России Русские сериалы"}
-    - {id: 111, cat: Movies, desc: "Мультфильмы"}
-    - {id: 113, cat: Movies, desc: "Мультфильмы Иностранные мультфильмы"}
-    - {id: 196, cat: Movies, desc: "Мультфильмы Мультсериалы"}
-    - {id: 112, cat: Movies, desc: "Мультфильмы Отечественные мультфильмы"}
-    - {id: 162, cat: TV/Anime, desc: "Мультфильмы Аниме (Японская анимация)"}
-    - {id: 179, cat: Movies, desc: "Театр"}
-    - {id: 180, cat: Movies, desc: "Театр Произведения театрального искусства"}
-    # Audio
-    - {id: 175, cat: Audio, desc: "Популярная музыка"}
-    - {id: 183, cat: Audio/Lossless, desc: "Популярная музыка Зарубежная популярная музыка (lossless)"}
-    - {id: 184, cat: Audio, desc: "Популярная музыка Сборники песен для детей (lossy и lossless)"}
-    - {id: 182, cat: Audio/Video, desc: "Популярная музыка Наша популярная музыка (Видео и DVD)"}
-    - {id: 176, cat: Audio/Video, desc: "Популярная музыка Наша популярная музыка (HD Video)"}
-    - {id: 199, cat: Audio, desc: "Джазовая и Блюзовая музыка"}
-    - {id: 201, cat: Audio/MP3, desc: "Джазовая и Блюзовая музыка Jazz (lossy)"}
-    - {id: 200, cat: Audio/Lossless, desc: "Джазовая и Блюзовая музыка Jazz (lossless)"}
-    - {id: 204, cat: Audio/MP3, desc: "Джазовая и Блюзовая музыка Blues (lossy)"}
-    - {id: 203, cat: Audio/Lossless, desc: "Джазовая и Блюзовая музыка Blues (lossless)"}
-    - {id: 150, cat: Audio, desc: "Рок-музыка"}
-    - {id: 181, cat: Audio/Lossless, desc: "Рок-музыка Зарубежный Rock (lossless)"}
-    - {id: 245, cat: Audio/MP3, desc: "Рок-музыка Зарубежный Metal (lossy)"}
-    - {id: 246, cat: Audio/Lossless, desc: "Рок-музыка Зарубежный Metal (lossless)"}
-    - {id: 156, cat: Audio/MP3, desc: "Рок-музыка Отечественный Rock, Metal (lossy)"}
-    - {id: 155, cat: Audio/Lossless, desc: "Рок-музыка Отечественный Rock, Metal (lossless)"}
-    - {id: 154, cat: Audio/Video, desc: "Рок-музыка Metal (DVD Video)"}
-    - {id: 153, cat: Audio/Video, desc: "Рок-музыка Рок-музыка (HD Video)"}
-    # Games
-    - {id: 27, cat: PC/Games, desc: "Игры для Windows "}
-    - {id: 28, cat: PC/Games, desc: "Игры для Windows Горячие новинки"}
-    - {id: 38, cat: PC/Games, desc: "Игры для Windows Аркады"}
-    - {id: 214, cat: PC/Games, desc: "Игры для Windows Файтинги"}
-    - {id: 31, cat: PC/Games, desc: "Игры для Windows Экшены"}
-    - {id: 185, cat: PC/Games, desc: "Игры для Windows Логические игры"}
-    - {id: 215, cat: PC/Games, desc: "Игры для Windows Хорроры"}
-    - {id: 219, cat: PC/Games, desc: "Игры для Windows Приключения и квесты"}
-    - {id: 29, cat: PC/Games, desc: "Игры для Windows Демо-версии"}
-    - {id: 186, cat: PC/Games, desc: "Игры для Windows Многопользовательские игры"}
-    - {id: 187, cat: PC/Games, desc: "Игры для Windows Онлайновые игры"}
-    - {id: 33, cat: PC/Games, desc: "Игры для Windows Стратегии в реальном времени"}
-    - {id: 35, cat: PC/Games, desc: "Игры для Windows Пошаговые стратегии"}
-    - {id: 41, cat: PC/Games, desc: "Игры для Windows Разное"}
-    - {id: 168, cat: Console, desc: "Игры для Linux "}
-    - {id: 169, cat: Console, desc: "Игры для Linux Нативные игры для Linux "}
-    - {id: 170, cat: Console, desc: "Игры для Linux Портированные игры для Linux "}
-    - {id: 163, cat: Console, desc: "Игры для Консолей"}
-    - {id: 189, cat: Console, desc: "Игры для Консолей PS "}
-    - {id: 166, cat: Console, desc: "Игры для Консолей PS2 "}
-    - {id: 239, cat: Console, desc: "Игры для Консолей PS3 "}
-    - {id: 165, cat: Console, desc: "Игры для Консолей PS4 "}
-    - {id: 171, cat: Console, desc: "Игры для Консолей PSP "}
-    - {id: 164, cat: Console, desc: "Игры для Консолей Xbox 360 "}
-    - {id: 167, cat: Console, desc: "Игры для Консолей Остальные платформы"}
-    # Programs
-    - {id: 13, cat: PC, desc: "Операционные системы"}
-    - {id: 14, cat: PC, desc: "Операционные системы Windows "}
-    - {id: 15, cat: PC, desc: "Операционные системы Linux "}
-    - {id: 147, cat: PC, desc: "Операционные системы Mac OS "}
-    - {id: 173, cat: PC, desc: "Системные программы"}
-    - {id: 190, cat: PC, desc: "Системные программы Работа с жёстким диском"}
-    - {id: 216, cat: PC, desc: "Системные программы Резервное копирование"}
-    - {id: 217, cat: PC, desc: "Системные программы Архиваторы и файловые менеджеры"}
-    - {id: 174, cat: PC, desc: "Системные программы Программы для настройки и оптимизации ОС"}
-    - {id: 218, cat: PC, desc: "Системные программы Сервисное обслуживание компьютера"}
-    - {id: 244, cat: PC, desc: "Системные программы Программы для интернет и сетей"}
-    - {id: 109, cat: PC, desc: "Программы для работы с мультимедиа и 3D "}
-    - {id: 172, cat: PC, desc: "Программы для работы с мультимедиа и 3D Графические редакторы"}
-    - {id: 110, cat: PC, desc: "Программы для работы с мультимедиа и 3D 3D моделирование, рендеринг и плагины для них"}
-    - {id: 77, cat: PC, desc: "ГИС, системы навигации и карты"}
-    - {id: 79, cat: PC, desc: "ГИС, системы навигации и карты Разное - системы навигации и карты"}
-    - {id: 78, cat: PC, desc: "ГИС, системы навигации и карты Navigon / Navitel "}
-    # tutorial video
-    - {id: 53, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD "}
-    - {id: 56, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Кулинария"}
-    - {id: 57, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Спорт"}
-    - {id: 59, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Оздоровительные практики"}
-    - {id: 62, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Игра на гитаре"}
-    - {id: 68, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Психология"}
-    - {id: 69, cat: Other, desc: "Видеоуроки и обучающие интерактивные DVD Строительство, ремонт и дизайн"}
-    - {id: 55, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD "}
-    - {id: 70, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD Компьютерные сети и безопасность"}
-    - {id: 71, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD ОС и серверные программы Microsoft "}
-    - {id: 72, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD 2D и 3D графика"}
-    - {id: 75, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD Программирование (видеоуроки)"}
-    - {id: 76, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные DVD Работа с видео"}
-    # Sport
-    - {id: 49, cat: TV/Sport, desc: "Футбол"}
-    - {id: 177, cat: TV/Sport, desc: "Футбол Чемпионаты Мира"}
-    - {id: 178, cat: TV/Sport, desc: "Футбол Россия и СССР"}
-    - {id: 193, cat: TV/Sport, desc: "Футбол Чемпионаты Европы"}
-    - {id: 194, cat: TV/Sport, desc: "Футбол Еврокубки"}
-    - {id: 205, cat: TV/Sport, desc: "Хоккей"}
-    - {id: 210, cat: TV/Sport, desc: "Хоккей Хоккей с мячом / Бенди"}
-    - {id: 209, cat: TV/Sport, desc: "Хоккей КХЛ"}
-    - {id: 208, cat: TV/Sport, desc: "Хоккей НХЛ"}
-    - {id: 207, cat: TV/Sport, desc: "Хоккей Международные турниры"}
-    - {id: 211, cat: TV/Sport, desc: "Хоккей СССР - Канада"}
-    - {id: 206, cat: TV/Sport, desc: "Хоккей Документальные фильмы и аналитика"}
-    - {id: 226, cat: TV/Sport, desc: "Баскетбол"}
-    - {id: 229, cat: TV/Sport, desc: "Баскетбол Международные соревнования"}
-    - {id: 228, cat: TV/Sport, desc: "Баскетбол NBA / NCAA "}
-    - {id: 227, cat: TV/Sport, desc: "Баскетбол Европейский клубный баскетбол"}
-    # XXX
-    - {id: 116, cat: XXX, desc: "Зарубежные порнофильмы"}
-    - {id: 126, cat: XXX, desc: "Зарубежные порнофильмы Паки полных фильмов"}
-    - {id: 118, cat: XXX, desc: "Зарубежные порнофильмы Классические фильмы"}
-    - {id: 145, cat: XXX, desc: "Зарубежные порнофильмы Фильмы с сюжетом"}
-    - {id: 136, cat: XXX, desc: "Зарубежные порнофильмы Гонзо-фильмы"}
-    - {id: 122, cat: XXX, desc: "Зарубежные порнофильмы Фильмы без сюжета"}
-    - {id: 137, cat: XXX, desc: "Зарубежные порнофильмы Лесбо-фильмы"}
-    - {id: 159, cat: XXX, desc: "Зарубежные порнофильмы Этнические фильмы"}
-    - {id: 146, cat: XXX, desc: "Зарубежные порнофильмы Видео для телефонов и КПК"}
-    - {id: 124, cat: XXX, desc: "Зарубежные порнофильмы Фильмы с сюжетом, Классические (DVD)"}
-    - {id: 117, cat: XXX, desc: "Зарубежные порнофильмы Гонзо, Лесбо и Фильмы без сюжета (DVD)"}
-    - {id: 198, cat: XXX, desc: "Зарубежные порнофильмы Фильмы с сюжетом (HD Video)"}
-    - {id: 125, cat: XXX, desc: "Зарубежные порнофильмы Гонзо, Лесбо и Фильмы без сюжета (HD Video)"}
-    - {id: 114, cat: XXX, desc: "Зарубежные порноролики"}
-    - {id: 121, cat: XXX, desc: "Зарубежные порноролики Паки сайтрипов"}
-    - {id: 127, cat: XXX, desc: "Зарубежные порноролики Паки порнороликов по актрисам"}
-    - {id: 129, cat: XXX, desc: "Зарубежные порноролики Сайтрипы"}
-    - {id: 115, cat: XXX, desc: "Зарубежные порноролики Сайтрипы (HD Video)"}
-    - {id: 195, cat: XXX, desc: "Зарубежные порноролики Сцены из фильмов"}
-    - {id: 123, cat: XXX, desc: "Зарубежные порноролики Порноролики Разное"}
-    - {id: 138, cat: XXX, desc: "Русское порно"}
-    - {id: 213, cat: XXX, desc: "Русское порно Русские порнофильмы"}
-    - {id: 144, cat: XXX, desc: "Русское порно Паки русских порнороликов"}
-    - {id: 140, cat: XXX, desc: "Русское порно Сайтрипы с русскими актрисами"}
-    - {id: 141, cat: XXX, desc: "Русское порно Сайтрипы с русскими актрисами (HD Video)"}
-    - {id: 143, cat: XXX, desc: "Русское порно Русские Порноролики Разное"}
-    - {id: 139, cat: XXX, desc: "Русское порно Русское любительское видео"}
-    - {id: 240, cat: XXX, desc: "Японское порно"}
-    - {id: 243, cat: XXX, desc: "Русское порно Паки японских фильмов и сайтрипов"}
-    - {id: 242, cat: XXX, desc: "Русское порно Японские фильмы и сайтрипы (DVD и HD Video)"}
-    - {id: 241, cat: XXX, desc: "Русское порно Японские фильмы и сайтрипы"}
-    - {id: 191, cat: XXX, desc: "Эротические студии, фото и журналы"}
-    - {id: 192, cat: XXX, desc: "Эротические студии Эротические студии (видео)"}
-    - {id: 232, cat: XXX, desc: "Эротические студии Met-Art &MetModels "}
-    - {id: 233, cat: XXX, desc: "Эротические студии Эротические студии Разное"}
-    - {id: 247, cat: XXX, desc: "Эротические студии Паки сайтрипов эротических студий"}
-    - {id: 220, cat: XXX, desc: "Эротические студии Любительское фото"}
-    - {id: 248, cat: XXX, desc: "Эротические студии Подборки по актрисам"}
-    - {id: 212, cat: XXX, desc: "Эротические студии Подборки сетов"}
-    - {id: 202, cat: XXX, desc: "Эротические студии Тематическое и нетрадиционное фото"}
-    - {id: 249, cat: XXX, desc: "Эротические студии Журналы"}
-    - {id: 250, cat: XXX, desc: "Порноигры"}
-    - {id: 251, cat: XXX, desc: "Порноигры Игры: основной подраздел"}
-    - {id: 252, cat: XXX, desc: "Порноигры Игры: визуальные новеллы"}
-    - {id: 256, cat: XXX, desc: "Порноигры Игры: ролевые"}
-    - {id: 255, cat: XXX, desc: "Порноигры Игры и Софт: Анимация"}
-    - {id: 254, cat: XXX, desc: "Порноигры Игры: В разработке и Демо (основной подраздел)"}
-    - {id: 253, cat: XXX, desc: "Порноигры Игры: В разработке и Демо (ролевые)"}
-    - {id: 119, cat: XXX, desc: "Нетрадиционное порно"}
-    - {id: 130, cat: XXX, desc: "Нетрадиционное порно Транссексуалы"}
-    - {id: 134, cat: XXX, desc: "Нетрадиционное порно Бисексуалы"}
-    - {id: 221, cat: XXX, desc: "Нетрадиционное порно БДСМ"}
-    - {id: 131, cat: XXX, desc: "Нетрадиционное порно Женское доминирование и страпон"}
-    - {id: 236, cat: XXX, desc: "Нетрадиционное порно Подглядывание"}
-    - {id: 128, cat: XXX, desc: "Нетрадиционное порно Фистинг и дилдо"}
-    - {id: 237, cat: XXX, desc: "Нетрадиционное порно Беременные"}
-    - {id: 120, cat: XXX, desc: "Нетрадиционное порно Буккаке"}
-    - {id: 135, cat: XXX, desc: "Нетрадиционное порно Мочеиспускание"}
-    - {id: 188, cat: XXX, desc: "Нетрадиционное порно Фетиш"}
-    - {id: 234, cat: XXX, desc: "Нетрадиционное порно Дефекация"}
-    - {id: 222, cat: XXX, desc: "Гей-порно"}
-    - {id: 223, cat: XXX, desc: "Гей-порно Полнометражные гей-фильмы"}
-    - {id: 224, cat: XXX, desc: "Гей-порно Полнометражные азиатские гей-фильмы"}
-    - {id: 225, cat: XXX, desc: "Гей-порно Классические гей-фильмы (до 1990 года)"}
-    - {id: 230, cat: XXX, desc: "Гей-порно Гей-фильмы в высоком качестве (DVD и HD)"}
-    - {id: 231, cat: XXX, desc: "Гей-порно Азиатские гей-фильмы в высоком качестве (DVD и HD)"}
-    - {id: 235, cat: XXX, desc: "Гей-порно ПАКи гей-роликов и сайтрипов"}
-    - {id: 238, cat: XXX, desc: "Гей-порно Гей-ролики в высоком качестве (HD Video)"}
-    # Archive
-    - {id: 197, cat: Other, desc: "Повторы и поглощенные раздачи"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 1
-    options:
-      1: created
-      10: seeders
-      7: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action="login.php"]
-  inputs:
-    login_username: "{{ .Config.username }}"
-    login_password: "{{ .Config.password }}"
-    autologin: 1
-  error:
-    - selector: table.error
-  test:
-    path: index.php
-    selector: a[href="./login.php?logout=1"]
-
-search:
-  paths:
-    - path: tracker.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to сезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
-    - name: re_replace # S01E01 to сезон 1 серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
-  inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{ else }}f[]=-1{{ end }}"
-    prev_allw: 1
-    prev_a: 0
-    prev_dla: 0
-    prev_dlc: 0
-    prev_dld: 0
-    prev_dlw: 0
-    prev_my: 0
-    prev_new: 0
-    prev_sd: 0
-    prev_da: 1
-    prev_dc: 0
-    prev_df: 1
-    prev_ds: 0
-    prev_tor_type: 0
-    o: "{{ .Config.sort }}"
-    s: "{{ .Config.type }}"
-    # show category
-    dc: 0
-    # show forum
-    df: 1
-    # show author
-    da: 1
-    # show speed
-    ds: 0
-    # -1=all time
-    tm: -1
-    # seed not seen -1=disregard
-    sns: -1
-    # group releases -1=not selected
-    srg: -1
-    # title search
-    nm: "{{ .Keywords }}"
-    # find a username
-    pn: ""
-    # search by partial word
-    allw: 0
-
-  rows:
-    selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
-
-  fields:
-    category:
-      selector: a.gen
-      attribute: href
-      filters:
-        - name: querystring
-          args: f
-    title:
-      selector: a[data-topic_id]
-    details:
-      selector: a[data-topic_id]
-      attribute: href
-    download:
-      selector: a[href^="./dl.php?id="]
-      attribute: href
-    magnet:
-      optional: true
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    size:
-      selector: td:nth-child(6) > u
-    seeders:
-      selector: td.seedmed > b
-    leechers:
-      selector: td.leechmed > b
-    grabs:
-      selector: td:nth-child(9)
-    date:
-      # unix
-      selector: td:last-child > u
-    downloadvolumefactor:
-      text: 1
-    uploadvolumefactor:
-      text: 1
-# TorrentPier

src/Jackett.Common/Definitions/ettv.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.onl/
+  - https://ettv.unblockit.ch/
   - https://ettv.nocensor.space/
 legacylinks:
   - https://www.ettv.tv/
@@ -41,6 +41,9 @@ legacylinks:
   - https://ettv.unblockit.buzz/
   - https://ettv.unblocked.monster/
   - https://ettv.unblockit.club/
+  - https://ettv.unblockit.onl/
+  - https://ettv.unblockit.li/
+  - https://ettv.unblockit.uno/
 
 caps:
   categorymappings:
@@ -123,8 +126,9 @@ settings:
       asc: asc
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   path: "{{ if .Keywords }}torrents-search.php{{ else }}torrents.php{{ end }}"

src/Jackett.Common/Definitions/exkinoray.yml

@@ -6,7 +6,9 @@ language: ru-ru
 type: semi-private
 encoding: UTF-8
 links:
-  - http://exkinoray.tv/ # site forces http, does not support https
+  - http://exkinoray.fun/ # site does not support https
+legacylinks:
+  - http://exkinoray.tv/
 
 caps:
   categorymappings:

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

@@ -1,989 +0,0 @@
----
-id: extratorrent-it
-name: ExtraTorrent.it
-description: "ExtraTorrent.it is a Public tracker, a popular alternative to the original ET site, providing Movie / TV / General magnets"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://extratorrents.it/
-  - https://extratorrent.unblockit.onl/
-  - https://extratorrent.nocensor.space/
-legacylinks:
-  - https://extratorrent.ag/
-  - https://extratorrent.unblockit.app/
-  - https://extratorrent.unblockit.dev/
-  - https://extratorrent.unblockit.ltd/
-  - https://extratorrent.unblockit.link/
-  - https://extratorrent2.unblockninja.com/
-  - https://extratorrent.unblockit.buzz/
-  - https://extratorrent.unblockit.club/
-
-caps:
-  categorymappings:
-    # Anime
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-    - {id: 963, cat: TV/Anime, desc: "Anime - Absolute Duo"}
-    - {id: 951, cat: TV/Anime, desc: "Anime - Akame ga Kill"}
-    - {id: 959, cat: TV/Anime, desc: "Anime - Aldnoah Zero"}
-    - {id: 99, cat: TV/Anime, desc: "Anime - Anime - Other"}
-    - {id: 86, cat: TV/Anime, desc: "Anime - Battle Programer Shirase"}
-    - {id: 87, cat: TV/Anime, desc: "Anime - Big O"}
-    - {id: 960, cat: TV/Anime, desc: "Anime - Binan Koukou Chikyuu Bouei-bu Love"}
-    - {id: 267, cat: TV/Anime, desc: "Anime - Bleach"}
-    - {id: 88, cat: TV/Anime, desc: "Anime - Cardcaptor Sakura"}
-    - {id: 89, cat: TV/Anime, desc: "Anime - Chobits"}
-    - {id: 142, cat: TV/Anime, desc: "Anime - Comics"}
-    - {id: 962, cat: TV/Anime, desc: "Anime - Death Parade"}
-    - {id: 151, cat: TV/Anime, desc: "Anime - Dragon ball"}
-    - {id: 90, cat: TV/Anime, desc: "Anime - Dragonball GT"}
-    - {id: 91, cat: TV/Anime, desc: "Anime - Dragonball Z"}
-    - {id: 156, cat: TV/Anime, desc: "Anime - DVD-R"}
-    - {id: 950, cat: TV/Anime, desc: "Anime - Fairy Tail"}
-    - {id: 92, cat: TV/Anime, desc: "Anime - Flame of Recca"}
-    - {id: 93, cat: TV/Anime, desc: "Anime - Full Metal Alchemist"}
-    - {id: 95, cat: TV/Anime, desc: "Anime - Ghost In The Shell SAC"}
-    - {id: 94, cat: TV/Anime, desc: "Anime - Gundam"}
-    - {id: 620, cat: TV/Anime, desc: "Anime - Hentai"}
-    - {id: 145, cat: TV/Anime, desc: "Anime - Hunter X Hunter"}
-    - {id: 949, cat: TV/Anime, desc: "Anime - Inou Battle wa Nichijou-kei no Naka de"}
-    - {id: 96, cat: TV/Anime, desc: "Anime - InuYasha"}
-    - {id: 524, cat: TV/Anime, desc: "Anime - Kiba"}
-    - {id: 97, cat: TV/Anime, desc: "Anime - Konkiki No Gash Bell"}
-    - {id: 961, cat: TV/Anime, desc: "Anime - Kuroko No Basuke"}
-    - {id: 98, cat: TV/Anime, desc: "Anime - Last Exile"}
-    - {id: 964, cat: TV/Anime, desc: "Anime - Log Horizon"}
-    - {id: 952, cat: TV/Anime, desc: "Anime - Nanatsu no Taizai"}
-    - {id: 101, cat: TV/Anime, desc: "Anime - Naruto"}
-    - {id: 508, cat: TV/Anime, desc: "Anime - One Piece"}
-    - {id: 100, cat: TV/Anime, desc: "Anime - Onegai Twins"}
-    - {id: 523, cat: TV/Anime, desc: "Anime - Ouran High School Host Club"}
-    - {id: 102, cat: TV/Anime, desc: "Anime - PlanetES"}
-    - {id: 146, cat: TV/Anime, desc: "Anime - Prince of Tennis"}
-    - {id: 103, cat: TV/Anime, desc: "Anime - Ranma 1/2"}
-    - {id: 104, cat: TV/Anime, desc: "Anime - Ruroni Kenshin"}
-    - {id: 105, cat: TV/Anime, desc: "Anime - Samurai Champloo"}
-    - {id: 107, cat: TV/Anime, desc: "Anime - Scrapped Princess"}
-    - {id: 997, cat: TV/Anime, desc: "Anime - Spider-man"}
-    - {id: 106, cat: TV/Anime, desc: "Anime - Stellvia of the Universe"}
-    - {id: 525, cat: TV/Anime, desc: "Anime - Strawberry Panic"}
-    - {id: 953, cat: TV/Anime, desc: "Anime - Sword Art Online II"}
-    - {id: 958, cat: TV/Anime, desc: "Anime - Tokyo Ghoul"}
-    # Audio
-    - {id: 5, cat: Audio, desc: "Music"}
-    - {id: 54, cat: Audio, desc: "Music - Alternative"}
-    - {id: 990, cat: Audio, desc: "Music - Ambient"}
-    - {id: 160, cat: Audio, desc: "Music - Anime"}
-    - {id: 55, cat: Audio, desc: "Music - Asian"}
-    - {id: 56, cat: Audio, desc: "Music - Blues"}
-    - {id: 809, cat: Audio, desc: "Music - Bollywood"}
-    - {id: 57, cat: Audio, desc: "Music - Christian"}
-    - {id: 58, cat: Audio, desc: "Music - Classic"}
-    - {id: 515, cat: Audio, desc: "Music - Compilation/Various Artists (VA)"}
-    - {id: 59, cat: Audio, desc: "Music - Country/Western"}
-    - {id: 971, cat: Audio, desc: "Music - Discography"}
-    - {id: 60, cat: Audio, desc: "Music - Drum N Bass"}
-    - {id: 61, cat: Audio, desc: "Music - Electronic"}
-    - {id: 850, cat: Audio/Lossless, desc: "Music - FLAC"}
-    - {id: 519, cat: Audio, desc: "Music - Folk"}
-    - {id: 62, cat: Audio, desc: "Music - Game Music"}
-    - {id: 233, cat: Audio, desc: "Music - Gothic"}
-    - {id: 63, cat: Audio, desc: "Music - Hardcore"}
-    - {id: 78, cat: Audio, desc: "Music - HardHouse/Old School Radio Mixes"}
-    - {id: 512, cat: Audio, desc: "Music - Hardrock"}
-    - {id: 724, cat: Audio, desc: "Music - Hardstyle"}
-    - {id: 306, cat: Audio, desc: "Music - Heavy/Death Metal"}
-    - {id: 64, cat: Audio, desc: "Music - Hip Hop"}
-    - {id: 511, cat: Audio, desc: "Music - Indie/Britpop"}
-    - {id: 65, cat: Audio, desc: "Music - Industrial"}
-    - {id: 66, cat: Audio, desc: "Music - Jazz"}
-    - {id: 67, cat: Audio, desc: "Music - Karaoke"}
-    - {id: 521, cat: Audio, desc: "Music - Latin"}
-    - {id: 68, cat: Audio, desc: "Music - Metal"}
-    - {id: 526, cat: Audio, desc: "Music - Motown"}
-    - {id: 79, cat: Audio, desc: "Music - Music - Other"}
-    - {id: 69, cat: Audio/Video, desc: "Music - Music Videos"}
-    - {id: 522, cat: Audio, desc: "Music - Non-English"}
-    - {id: 507, cat: Audio, desc: "Music - Now That's What I Call Music"}
-    - {id: 70, cat: Audio, desc: "Music - Pop"}
-    - {id: 852, cat: Audio, desc: "Music - Progressive"}
-    - {id: 71, cat: Audio, desc: "Music - Punk"}
-    - {id: 72, cat: Audio, desc: "Music - R&B"}
-    - {id: 851, cat: Audio, desc: "Music - Rai"}
-    - {id: 73, cat: Audio, desc: "Music - Rap"}
-    - {id: 74, cat: Audio, desc: "Music - Reggae"}
-    - {id: 75, cat: Audio, desc: "Music - Rock"}
-    - {id: 527, cat: Audio, desc: "Music - Rock 'n' Roll"}
-    - {id: 514, cat: Audio, desc: "Music - Singer Songwriter"}
-    - {id: 230, cat: Audio, desc: "Music - Ska"}
-    - {id: 505, cat: Audio, desc: "Music - Soul"}
-    - {id: 77, cat: Audio, desc: "Music - Soundtracks"}
-    - {id: 161, cat: Audio, desc: "Music - Techno"}
-    - {id: 420, cat: Audio, desc: "Music - Trance/House/Dance"}
-    - {id: 76, cat: Audio, desc: "Music - Unsigned/Amateur"}
-    - {id: 1002, cat: Audio, desc: "Music - AAC"}
-    - {id: 1003, cat: Audio, desc: "Music - Album"}
-    - {id: 1004, cat: Audio, desc: "Music - Box Set"}
-    - {id: 1005, cat: Audio, desc: "Music - Concerts"}
-    - {id: 1006, cat: Audio, desc: "Music - Discography"}
-    - {id: 1007, cat: Audio/Video, desc: "Music - DVD"}
-    - {id: 1008, cat: Audio/Lossless, desc: "Music - Lossless"}
-    - {id: 1009, cat: Audio/MP3, desc: "Music - MP3"}
-    - {id: 1011, cat: Audio, desc: "Music - Radio"}
-    - {id: 1012, cat: Audio, desc: "Music - Single"}
-    # Movies
-    - {id: 4, cat: Movies, desc: "Movies"}
-    - {id: 419, cat: Movies, desc: "Movies - Action"}
-    - {id: 28, cat: Movies, desc: "Movies - Adventure"}
-    - {id: 29, cat: Movies, desc: "Movies - Animation"}
-    - {id: 30, cat: Movies, desc: "Movies - Asian"}
-    - {id: 32, cat: Movies, desc: "Movies - Automotive/Cars"}
-    - {id: 628, cat: Movies, desc: "Movies - Biography"}
-    - {id: 977, cat: Movies, desc: "Movies - Black and White"}
-    - {id: 558, cat: Movies, desc: "Movies - Bollywood/Desi"}
-    - {id: 976, cat: Movies, desc: "Movies - Classic"}
-    - {id: 33, cat: Movies, desc: "Movies - Comedy"}
-    - {id: 34, cat: Movies, desc: "Movies - Concerts"}
-    - {id: 600, cat: Movies, desc: "Movies - Crime"}
-    - {id: 35, cat: Movies, desc: "Movies - Documentary"}
-    - {id: 37, cat: Movies, desc: "Movies - Drama"}
-    - {id: 742, cat: Movies, desc: "Movies - Dubbed/Dual Audio"}
-    - {id: 36, cat: Movies, desc: "Movies - DVD/Film Extras"}
-    - {id: 149, cat: Movies, desc: "Movies - Family"}
-    - {id: 38, cat: Movies, desc: "Movies - Fantasy"}
-    - {id: 39, cat: Movies, desc: "Movies - Gore Flicks"}
-    - {id: 602, cat: Movies, desc: "Movies - History"}
-    - {id: 40, cat: Movies, desc: "Movies - Horror"}
-    - {id: 41, cat: Movies, desc: "Movies - Kids"}
-    - {id: 150, cat: Movies/SD, desc: "Movies - KVCD"}
-    - {id: 974, cat: Movies, desc: "Movies - Lollywood"}
-    - {id: 42, cat: Movies, desc: "Movies - Martial Arts"}
-    - {id: 44, cat: Movies/Other, desc: "Movies - Other"}
-    - {id: 805, cat: Movies/3D, desc: "Movies - 3D"}
-    - {id: 975, cat: Movies/UHD, desc: "Movies - 4K"}
-    - {id: 947, cat: Movies, desc: "Movies - Musical"}
-    - {id: 43, cat: Movies, desc: "Movies - Mystery"}
-    - {id: 603, cat: Movies/Foreign, desc: "Movies - non English"}
-    - {id: 978, cat: Movies, desc: "Movies - Rarities"}
-    - {id: 45, cat: Movies, desc: "Movies - Romance"}
-    - {id: 46, cat: Movies, desc: "Movies - Samples/Trailers"}
-    - {id: 47, cat: Movies, desc: "Movies - Sci-Fi"}
-    - {id: 48, cat: Movies, desc: "Movies - Sports related"}
-    - {id: 779, cat: Movies, desc: "Movies - Stand-up comedy"}
-    - {id: 49, cat: Movies, desc: "Movies - Thriller"}
-    - {id: 671, cat: Movies, desc: "Movies - Travel"}
-    - {id: 307, cat: Movies, desc: "Movies - War"}
-    - {id: 601, cat: Movies, desc: "Movies - Western"}
-    - {id: 1024, cat: Movies/HD, desc: "Movies - HEVC/x265"}
-    - {id: 1030, cat: Movies/SD, desc: "Movies - Divx/Xvid"}
-    - {id: 1031, cat: Movies/HD, desc: "Movies - h.264/x264"}
-    - {id: 1032, cat: Movies/HD, desc: "Movies - HD"}
-    - {id: 1033, cat: Movies/HD, desc: "Movies - MP4"}
-    - {id: 1034, cat: Movies/SD, desc: "Movies - SVCD/VCD"}
-    - {id: 1035, cat: Movies, desc: "Movies - YIFY"}
-    # TV
-    - {id: 8, cat: TV, desc: "TV"}
-    - {id: 986, cat: TV, desc: "TV - 12 Monkeys"}
-    - {id: 598, cat: TV, desc: "TV - 19-2"}
-    - {id: 795, cat: TV, desc: "TV - 2 Broke Girls"}
-    - {id: 435, cat: TV, desc: "TV - 24"}
-    - {id: 169, cat: TV, desc: "TV - 30 Days"}
-    - {id: 561, cat: TV, desc: "TV - 30 Rock"}
-    - {id: 274, cat: TV, desc: "TV - 60 Minutes"}
-    - {id: 862, cat: TV, desc: "TV - 666 Park Avenue"}
-    - {id: 273, cat: TV, desc: "TV - 'Allo 'Allo!"}
-    - {id: 310, cat: TV, desc: "TV - A-Team"}
-    - {id: 797, cat: TV, desc: "TV - About a Boy"}
-    - {id: 998, cat: TV, desc: "TV - Above Suspicion"}
-    - {id: 966, cat: TV, desc: "TV - Adam - E.V.A"}
-    - {id: 573, cat: TV, desc: "TV - Alaska State Troopers"}
-    - {id: 821, cat: TV, desc: "TV - Alcatraz"}
-    - {id: 118, cat: TV, desc: "TV - Alias"}
-    - {id: 810, cat: TV, desc: "TV - Almost Human"}
-    - {id: 771, cat: TV, desc: "TV - Alphas"}
-    - {id: 818, cat: TV, desc: "TV - American Chopper"}
-    - {id: 234, cat: TV, desc: "TV - American Dad"}
-    - {id: 194, cat: TV, desc: "TV - American Horror Story"}
-    - {id: 634, cat: TV, desc: "TV - American Idol"}
-    - {id: 674, cat: TV, desc: "TV - Americas Got Talent"}
-    - {id: 675, cat: TV, desc: "TV - Americas Next Top Model"}
-    - {id: 894, cat: TV, desc: "TV - Ancient Aliens"}
-    - {id: 170, cat: TV, desc: "TV - Angel"}
-    - {id: 911, cat: TV, desc: "TV - Anger Management"}
-    - {id: 659, cat: TV, desc: "TV - Archer"}
-    - {id: 275, cat: TV, desc: "TV - Arrested Development"}
-    - {id: 872, cat: TV, desc: "TV - Arrow"}
-    - {id: 984, cat: TV, desc: "TV - Ash vs Evil Dead"}
-    - {id: 171, cat: TV, desc: "TV - Attack Of The Show"}
-    - {id: 837, cat: TV, desc: "TV - Awake"}
-    - {id: 902, cat: TV, desc: "TV - Awkward"}
-    - {id: 916, cat: TV, desc: "TV - Baby Daddy"}
-    - {id: 165, cat: TV, desc: "TV - Babylon 5"}
-    - {id: 309, cat: TV, desc: "TV - Back In The Game"}
-    - {id: 460, cat: TV, desc: "TV - Band Of Brothers"}
-    - {id: 329, cat: TV, desc: "TV - Banshee"}
-    - {id: 891, cat: TV, desc: "TV - Bates Motel"}
-    - {id: 802, cat: TV, desc: "TV - Batman The Brave and The Bold"}
-    - {id: 163, cat: TV, desc: "TV - Battlestar Galactica"}
-    - {id: 794, cat: TV, desc: "TV - BBC"}
-    - {id: 886, cat: TV, desc: "TV - Beauty and the Beast"}
-    - {id: 172, cat: TV, desc: "TV - Beauty And The Geek"}
-    - {id: 782, cat: TV, desc: "TV - Beavis and Butt-Head"}
-    - {id: 584, cat: TV, desc: "TV - Being Erica"}
-    - {id: 669, cat: TV, desc: "TV - Being Human"}
-    - {id: 683, cat: TV, desc: "TV - Believe"}
-    - {id: 335, cat: TV, desc: "TV - Bellator FC"}
-    - {id: 979, cat: TV, desc: "TV - Better Call Saul"}
-    - {id: 173, cat: TV, desc: "TV - Big Brother"}
-    - {id: 666, cat: TV, desc: "TV - Big Love"}
-    - {id: 774, cat: TV, desc: "TV - Bigg Boss"}
-    - {id: 989, cat: TV, desc: "TV - Billions"}
-    - {id: 174, cat: TV, desc: "TV - Bitten"}
-    - {id: 396, cat: TV, desc: "TV - Black Sails"}
-    - {id: 981, cat: TV, desc: "TV - Blindspot"}
-    - {id: 717, cat: TV, desc: "TV - Blue Bloods"}
-    - {id: 754, cat: TV, desc: "TV - Boardwalk Empire"}
-    - {id: 709, cat: TV, desc: "TV - Bobs Burgers"}
-    - {id: 767, cat: TV, desc: "TV - Body of Proof"}
-    - {id: 175, cat: TV, desc: "TV - Bold and the beautiful"}
-    - {id: 969, cat: TV, desc: "TV - Bollywood TV Shows"}
-    - {id: 269, cat: TV, desc: "TV - Bones"}
-    - {id: 235, cat: TV, desc: "TV - Boston Legal"}
-    - {id: 676, cat: TV, desc: "TV - Breaking Bad"}
-    - {id: 707, cat: TV, desc: "TV - Breakout Kings"}
-    - {id: 409, cat: TV, desc: "TV - Brickleberry"}
-    - {id: 680, cat: TV, desc: "TV - Brooklyn Nine-Nine"}
-    - {id: 560, cat: TV, desc: "TV - Brothers And Sisters"}
-    - {id: 147, cat: TV, desc: "TV - Buffy"}
-    - {id: 677, cat: TV, desc: "TV - Burn Notice"}
-    - {id: 619, cat: TV, desc: "TV - Californication"}
-    - {id: 883, cat: TV, desc: "TV - Call of the Wildman"}
-    - {id: 719, cat: TV, desc: "TV - Camelot"}
-    - {id: 921, cat: TV, desc: "TV - Camp"}
-    - {id: 661, cat: TV, desc: "TV - Caprica"}
-    - {id: 928, cat: TV, desc: "TV - Capture"}
-    - {id: 128, cat: TV, desc: "TV - Carnivale"}
-    - {id: 736, cat: TV, desc: "TV - Cartoon"}
-    - {id: 658, cat: TV, desc: "TV - Castle"}
-    - {id: 941, cat: TV, desc: "TV - Cedar Cove"}
-    - {id: 846, cat: TV, desc: "TV - Celebrity Juice"}
-    - {id: 141, cat: TV, desc: "TV - Charmed"}
-    - {id: 900, cat: TV, desc: "TV - Chicago Fire"}
-    - {id: 324, cat: TV, desc: "TV - Chicago PD"}
-    - {id: 315, cat: TV, desc: "TV - Chopped"}
-    - {id: 184, cat: TV, desc: "TV - Chozen"}
-    - {id: 657, cat: TV, desc: "TV - Chuck"}
-    - {id: 133, cat: TV, desc: "TV - Cold Case"}
-    - {id: 629, cat: TV, desc: "TV - Community"}
-    - {id: 178, cat: TV, desc: "TV - Conan O'Brien"}
-    - {id: 946, cat: TV, desc: "TV - Constantine"}
-    - {id: 879, cat: TV, desc: "TV - Continuum"}
-    - {id: 861, cat: TV, desc: "TV - Copper"}
-    - {id: 322, cat: TV, desc: "TV - Cops"}
-    - {id: 186, cat: TV, desc: "TV - Cosmos A Space Time Odyssey"}
-    - {id: 670, cat: TV, desc: "TV - Cougar Town"}
-    - {id: 729, cat: TV, desc: "TV - Covert Affairs"}
-    - {id: 651, cat: TV, desc: "TV - Craig Ferguson"}
-    - {id: 280, cat: TV, desc: "TV - Criminal Minds"}
-    - {id: 788, cat: TV, desc: "TV - Crisis"}
-    - {id: 279, cat: TV, desc: "TV - Criss Angel BeLIEve"}
-    - {id: 323, cat: TV, desc: "TV - Crossing Jordan"}
-    - {id: 926, cat: TV, desc: "TV - Crossing Lines"}
-    - {id: 108, cat: TV, desc: "TV - CSI"}
-    - {id: 325, cat: TV, desc: "TV - Curb Your Enthusiasm"}
-    - {id: 882, cat: TV, desc: "TV - Da Vincis Demons"}
-    - {id: 282, cat: TV, desc: "TV - Dallas"}
-    - {id: 678, cat: TV, desc: "TV - Damages"}
-    - {id: 798, cat: TV, desc: "TV - Dancing with the Stars US"}
-    - {id: 652, cat: TV, desc: "TV - David Letterman"}
-    - {id: 994, cat: TV, desc: "TV - Days of Our Lives"}
-    - {id: 985, cat: TV, desc: "TV - DCs Legends of Tomorrow"}
-    - {id: 181, cat: TV, desc: "TV - Dead Like Me"}
-    - {id: 679, cat: TV, desc: "TV - Deadliest Catch"}
-    - {id: 182, cat: TV, desc: "TV - Deadwood"}
-    - {id: 890, cat: TV, desc: "TV - Defiance"}
-    - {id: 281, cat: TV, desc: "TV - Democracy Now!"}
-    - {id: 183, cat: TV, desc: "TV - Desperate Housewives"}
-    - {id: 939, cat: TV, desc: "TV - Devious Maids"}
-    - {id: 585, cat: TV, desc: "TV - Dexter"}
-    - {id: 644, cat: TV, desc: "TV - Dirty Jobs"}
-    - {id: 122, cat: TV, desc: "TV - Discovery Channel"}
-    - {id: 167, cat: TV, desc: "TV - Doctor Who"}
-    - {id: 968, cat: TV/Documentary, desc: "TV - Documentary"}
-    - {id: 606, cat: TV, desc: "TV - Dollhouse"}
-    - {id: 839, cat: TV, desc: "TV - Dont Trust the Bitch in Apartment"}
-    - {id: 326, cat: TV, desc: "TV - Dr Who"}
-    - {id: 925, cat: TV, desc: "TV - Dracula"}
-    - {id: 328, cat: TV, desc: "TV - Drawn Together"}
-    - {id: 732, cat: TV, desc: "TV - Drop Dead"}
-    - {id: 820, cat: TV, desc: "TV - Eastbound and Down"}
-    - {id: 875, cat: TV, desc: "TV - Elementary"}
-    - {id: 283, cat: TV, desc: "TV - Ellen DeGeneres"}
-    - {id: 330, cat: TV, desc: "TV - Enlisted"}
-    - {id: 187, cat: TV, desc: "TV - Entourage"}
-    - {id: 270, cat: TV, desc: "TV - ER"}
-    - {id: 765, cat: TV, desc: "TV - Eureka"}
-    - {id: 238, cat: TV, desc: "TV - Everybody Loves Raymond"}
-    - {id: 571, cat: TV, desc: "TV - Extant"}
-    - {id: 840, cat: TV, desc: "TV - Fact or Faked Paranormal Files"}
-    - {id: 828, cat: TV, desc: "TV - Fairly Legeal"}
-    - {id: 876, cat: TV, desc: "TV - Faking It"}
-    - {id: 917, cat: TV, desc: "TV - Falling Skies"}
-    - {id: 188, cat: TV, desc: "TV - Family Guy"}
-    - {id: 855, cat: TV, desc: "TV - Family Tools"}
-    - {id: 411, cat: TV, desc: "TV - Fargo"}
-    - {id: 331, cat: TV, desc: "TV - Farscape"}
-    - {id: 983, cat: TV, desc: "TV - Fear the Walking Dead"}
-    - {id: 332, cat: TV, desc: "TV - Fifth Gear"}
-    - {id: 672, cat: TV, desc: "TV - Flashforward"}
-    - {id: 753, cat: TV, desc: "TV - Flashpoint"}
-    - {id: 831, cat: TV, desc: "TV - Foreign Series/Non English"}
-    - {id: 266, cat: TV, desc: "TV - Forever"}
-    - {id: 922, cat: TV, desc: "TV - Franklin and Bash"}
-    - {id: 140, cat: TV, desc: "TV - Friends"}
-    - {id: 612, cat: TV, desc: "TV - Fringe"}
-    - {id: 277, cat: TV, desc: "TV - From Dusk Till Dawn"}
-    - {id: 681, cat: TV, desc: "TV - Futurama"}
-    - {id: 728, cat: TV, desc: "TV - Game of Thrones"}
-    - {id: 334, cat: TV, desc: "TV - Gang Related"}
-    - {id: 996, cat: TV, desc: "TV - General Hospital"}
-    - {id: 954, cat: TV, desc: "TV - Geordie Shore"}
-    - {id: 574, cat: TV, desc: "TV - Ghost Adventures"}
-    - {id: 704, cat: TV, desc: "TV - Ghost Hunters"}
-    - {id: 642, cat: TV, desc: "TV - Ghost Mine"}
-    - {id: 338, cat: TV, desc: "TV - Ghost Whisperer"}
-    - {id: 284, cat: TV, desc: "TV - Gilmore Girls"}
-    - {id: 682, cat: TV, desc: "TV - Glee"}
-    - {id: 865, cat: TV, desc: "TV - Go On"}
-    - {id: 276, cat: TV, desc: "TV - Gold Rush"}
-    - {id: 339, cat: TV, desc: "TV - Good Eats"}
-    - {id: 599, cat: TV, desc: "TV - Gossip Girl"}
-    - {id: 580, cat: TV, desc: "TV - Gotham"}
-    - {id: 919, cat: TV, desc: "TV - Graceland"}
-    - {id: 955, cat: TV, desc: "TV - Gracepoint"}
-    - {id: 285, cat: TV, desc: "TV - Greys Anatomy"}
-    - {id: 819, cat: TV, desc: "TV - Grimm"}
-    - {id: 237, cat: TV, desc: "TV - Growing Up Fisher"}
-    - {id: 340, cat: TV, desc: "TV - Guiding Light"}
-    - {id: 866, cat: TV, desc: "TV - Guys With Kids"}
-    - {id: 880, cat: TV, desc: "TV - Hannibal"}
-    - {id: 813, cat: TV, desc: "TV - Happily Divorced"}
-    - {id: 769, cat: TV, desc: "TV - Happy Endings"}
-    - {id: 190, cat: TV, desc: "TV - Harald Schmidt"}
-    - {id: 713, cat: TV, desc: "TV - Harrys Law"}
-    - {id: 832, cat: TV, desc: "TV - Hart of Dixie"}
-    - {id: 341, cat: TV, desc: "TV - Haunted"}
-    - {id: 773, cat: TV, desc: "TV - Haven"}
-    - {id: 712, cat: TV, desc: "TV - Hawaii Five-0"}
-    - {id: 781, cat: TV, desc: "TV - Helix"}
-    - {id: 853, cat: TV, desc: "TV - Hell on Wheels"}
-    - {id: 191, cat: TV, desc: "TV - Hells Kitchen"}
-    - {id: 884, cat: TV, desc: "TV - Hemlock Grove"}
-    - {id: 342, cat: TV, desc: "TV - Hercules"}
-    - {id: 556, cat: TV, desc: "TV - Heroes"}
-    - {id: 343, cat: TV, desc: "TV - Hex"}
-    - {id: 192, cat: TV, desc: "TV - Hogans Heroes"}
-    - {id: 588, cat: TV, desc: "TV - Hollands Hoop"}
-    - {id: 755, cat: TV, desc: "TV - Homeland"}
-    - {id: 812, cat: TV, desc: "TV - Hostages"}
-    - {id: 684, cat: TV, desc: "TV - Hot in Cleveland"}
-    - {id: 286, cat: TV, desc: "TV - House"}
-    - {id: 913, cat: TV, desc: "TV - House Of Cards"}
-    - {id: 287, cat: TV, desc: "TV - How I Met Your Mother"}
-    - {id: 568, cat: TV, desc: "TV - How Its Made"}
-    - {id: 893, cat: TV, desc: "TV - How to Live with Your Parents"}
-    - {id: 288, cat: TV, desc: "TV - Howard Stern"}
-    - {id: 132, cat: TV, desc: "TV - Huff"}
-    - {id: 345, cat: TV, desc: "TV - Humor Amarillo"}
-    - {id: 756, cat: TV, desc: "TV - Hung"}
-    - {id: 637, cat: TV, desc: "TV - Hustle"}
-    - {id: 346, cat: TV, desc: "TV - In Justice"}
-    - {id: 685, cat: TV, desc: "TV - In Plain Sight"}
-    - {id: 582, cat: TV, desc: "TV - Ink Master"}
-    - {id: 347, cat: TV, desc: "TV - Inked"}
-    - {id: 965, cat: TV, desc: "TV - Inside MMA"}
-    - {id: 873, cat: TV, desc: "TV - Intelligence US"}
-    - {id: 240, cat: TV, desc: "TV - Into the West"}
-    - {id: 166, cat: TV, desc: "TV - Iron Chef"}
-    - {id: 289, cat: TV, desc: "TV - Invasion"}
-    - {id: 817, cat: TV, desc: "TV - Ironside"}
-    - {id: 772, cat: TV, desc: "TV - Its Always Sunny in Philadelphia"}
-    - {id: 988, cat: TV, desc: "TV - iZombie"}
-    - {id: 991, cat: TV, desc: "TV - Jane the Virgin"}
-    - {id: 290, cat: TV, desc: "TV - Jay Leno"}
-    - {id: 763, cat: TV, desc: "TV - Jersey Shore"}
-    - {id: 177, cat: TV, desc: "TV - Joe Rogan Questions Everything"}
-    - {id: 110, cat: TV, desc: "TV - Joey"}
-    - {id: 196, cat: TV, desc: "TV - Justice League Unlimited"}
-    - {id: 686, cat: TV, desc: "TV - Justified"}
-    - {id: 412, cat: TV, desc: "TV - kabachitare!"}
-    - {id: 738, cat: TV, desc: "TV - Killer Contact"}
-    - {id: 349, cat: TV, desc: "TV - Killer Instinct"}
-    - {id: 197, cat: TV, desc: "TV - Kim Possible"}
-    - {id: 741, cat: TV, desc: "TV - King"}
-    - {id: 933, cat: TV, desc: "TV - King and Maxwel"}
-    - {id: 350, cat: TV, desc: "TV - King Of The Hill"}
-    - {id: 351, cat: TV, desc: "TV - Kitchen Confidential"}
-    - {id: 790, cat: TV, desc: "TV - Kitchen Nightmares US"}
-    - {id: 348, cat: TV, desc: "TV - Kolchak The Night Stalker"}
-    - {id: 241, cat: TV, desc: "TV - Koot en Bie"}
-    - {id: 198, cat: TV, desc: "TV - Kung Fu"}
-    - {id: 199, cat: TV, desc: "TV - La Femme Nikita"}
-    - {id: 570, cat: TV, desc: "TV - LA Ink"}
-    - {id: 242, cat: TV, desc: "TV - Laguna Beach"}
-    - {id: 130, cat: TV, desc: "TV - Las Vegas"}
-    - {id: 843, cat: TV, desc: "TV - Last Man Standing"}
-    - {id: 867, cat: TV, desc: "TV - Last Resort"}
-    - {id: 200, cat: TV, desc: "TV - Late Night with Conan O'Brien"}
-    - {id: 115, cat: TV, desc: "TV - Law And Order"}
-    - {id: 591, cat: TV, desc: "TV - Law and Order UK"}
-    - {id: 243, cat: TV, desc: "TV - Le Cameleon"}
-    - {id: 578, cat: TV, desc: "TV - Legend of the Seeker"}
-    - {id: 590, cat: TV, desc: "TV - Legends"}
-    - {id: 898, cat: TV, desc: "TV - Legit"}
-    - {id: 638, cat: TV, desc: "TV - Level3"}
-    - {id: 656, cat: TV, desc: "TV - Leverage"}
-    - {id: 618, cat: TV, desc: "TV - Lie To Me"}
-    - {id: 650, cat: TV, desc: "TV - Life"}
-    - {id: 353, cat: TV, desc: "TV - Life on Mars"}
-    - {id: 716, cat: TV, desc: "TV - Lights Out"}
-    - {id: 244, cat: TV, desc: "TV - Line Of Fire"}
-    - {id: 504, cat: TV, desc: "TV - Little Britain"}
-    - {id: 665, cat: TV, desc: "TV - Little Mosque on the Prairie"}
-    - {id: 148, cat: TV, desc: "TV - Long Island Medium"}
-    - {id: 914, cat: TV, desc: "TV - Longmire"}
-    - {id: 354, cat: TV, desc: "TV - Los Serrano"}
-    - {id: 111, cat: TV, desc: "TV - Lost"}
-    - {id: 314, cat: TV, desc: "TV - Lost Girl"}
-    - {id: 858, cat: TV, desc: "TV - Louie"}
-    - {id: 726, cat: TV, desc: "TV - Love Bites"}
-    - {id: 937, cat: TV, desc: "TV - Low Winter Sun"}
-    - {id: 956, cat: TV, desc: "TV - Lucha Underground"}
-    - {id: 980, cat: TV, desc: "TV - Lucifer"}
-    - {id: 503, cat: TV, desc: "TV - Lucky Louie"}
-    - {id: 687, cat: TV, desc: "TV - Luther"}
-    - {id: 157, cat: TV, desc: "TV - MacGyver"}
-    - {id: 705, cat: TV, desc: "TV - Mad Love"}
-    - {id: 826, cat: TV, desc: "TV - Mad Men"}
-    - {id: 869, cat: TV, desc: "TV - Made in Jersey"}
-    - {id: 355, cat: TV, desc: "TV - MADtv"}
-    - {id: 871, cat: TV, desc: "TV - Major Crimes"}
-    - {id: 667, cat: TV, desc: "TV - Make It or Break It"}
-    - {id: 357, cat: TV, desc: "TV - Malcolm In The Middle"}
-    - {id: 662, cat: TV, desc: "TV - Man vs Wild"}
-    - {id: 759, cat: TV, desc: "TV - Marvels Agents of S.H.I.E.L.D"}
-    - {id: 910, cat: TV, desc: "TV - MasterChef US"}
-    - {id: 358, cat: TV, desc: "TV - Masters Of Horror"}
-    - {id: 824, cat: TV, desc: "TV - Masters of Sex"}
-    - {id: 291, cat: TV, desc: "TV - Medium"}
-    - {id: 617, cat: TV, desc: "TV - Melrose Place"}
-    - {id: 688, cat: TV, desc: "TV - Memphis Beat"}
-    - {id: 905, cat: TV, desc: "TV - Men at Work"}
-    - {id: 645, cat: TV, desc: "TV - Men of a Certain Age"}
-    - {id: 633, cat: TV, desc: "TV - Mercy"}
-    - {id: 579, cat: TV, desc: "TV - Merlin"}
-    - {id: 359, cat: TV, desc: "TV - Miami Ink"}
-    - {id: 825, cat: TV, desc: "TV - Midsomer Murders"}
-    - {id: 783, cat: TV, desc: "TV - Mike and Molly"}
-    - {id: 823, cat: TV, desc: "TV - Mind Games"}
-    - {id: 246, cat: TV, desc: "TV - Mind of Mencia"}
-    - {id: 313, cat: TV, desc: "TV - Misfits"}
-    - {id: 842, cat: TV, desc: "TV - Missing"}
-    - {id: 647, cat: TV, desc: "TV - Mistresses US"}
-    - {id: 179, cat: TV, desc: "TV - Mixology"}
-    - {id: 632, cat: TV, desc: "TV - Modern Family"}
-    - {id: 245, cat: TV, desc: "TV - Modern Marvels"}
-    - {id: 398, cat: TV, desc: "TV - Mom"}
-    - {id: 201, cat: TV, desc: "TV - Monk"}
-    - {id: 361, cat: TV, desc: "TV - Monty Pythons Flying Circus"}
-    - {id: 907, cat: TV, desc: "TV - Motive"}
-    - {id: 247, cat: TV, desc: "TV - Mr Bean"}
-    - {id: 992, cat: TV, desc: "TV - Mr. Robot"}
-    - {id: 356, cat: TV, desc: "TV - MST3K"}
-    - {id: 292, cat: TV, desc: "TV - My Favorite Martian"}
-    - {id: 792, cat: TV, desc: "TV - My Ghost Story"}
-    - {id: 999, cat: TV, desc: "TV - My Little Pony - Friendship is Magic"}
-    - {id: 362, cat: TV, desc: "TV - My Name Is Earl"}
-    - {id: 202, cat: TV, desc: "TV - My Restaurant Rules"}
-    - {id: 193, cat: TV, desc: "TV - Mythbusters"}
-    - {id: 940, cat: TV, desc: "TV - Naked And Afraid"}
-    - {id: 203, cat: TV, desc: "TV - NASA 50 Years Of Space Exploration"}
-    - {id: 899, cat: TV, desc: "TV - Nashville"}
-    - {id: 636, cat: TV/Documentary, desc: "TV - National Geographic"}
-    - {id: 120, cat: TV, desc: "TV - NCIS"}
-    - {id: 920, cat: TV, desc: "TV - Necessary Roughness"}
-    - {id: 841, cat: TV, desc: "TV - New Girl"}
-    - {id: 957, cat: TV, desc: "TV - New Japan Pro Wrestling"}
-    - {id: 311, cat: TV, desc: "TV - NewGamePlus"}
-    - {id: 363, cat: TV, desc: "TV - Night Stalker"}
-    - {id: 722, cat: TV, desc: "TV - Nikita"}
-    - {id: 293, cat: TV, desc: "TV - Nip Tuck"}
-    - {id: 710, cat: TV, desc: "TV - No Ordinary Family"}
-    - {id: 294, cat: TV, desc: "TV - Numb3rs"}
-    - {id: 689, cat: TV, desc: "TV - Nurse Jackie"}
-    - {id: 703, cat: TV, desc: "TV - Off the Map"}
-    - {id: 833, cat: TV, desc: "TV - Once Upon a Time Once"}
-    - {id: 364, cat: TV, desc: "TV - One Tree Hill"}
-    - {id: 424, cat: TV, desc: "TV - Only Fools And Horses"}
-    - {id: 935, cat: TV, desc: "TV - Orange Is The New Black"}
-    - {id: 881, cat: TV, desc: "TV - Orphan Black"}
-    - {id: 113, cat: TV/Other, desc: "TV - Other"}
-    - {id: 365, cat: TV, desc: "TV - Out of Practice S01E"}
-    - {id: 248, cat: TV, desc: "TV - Outer Limits"}
-    - {id: 646, cat: TV, desc: "TV - Outer Space Astronauts"}
-    - {id: 336, cat: TV, desc: "TV - Outlander"}
-    - {id: 723, cat: TV, desc: "TV - Outsourced"}
-    - {id: 249, cat: TV, desc: "TV - Over There"}
-    - {id: 757, cat: TV, desc: "TV - Pan Am"}
-    - {id: 640, cat: TV, desc: "TV - Paradox"}
-    - {id: 778, cat: TV, desc: "TV - Parenthood"}
-    - {id: 613, cat: TV, desc: "TV - Parks and Recreation"}
-    - {id: 250, cat: TV, desc: "TV - Passions"}
-    - {id: 414, cat: TV, desc: "TV - PBS NOW"}
-    - {id: 690, cat: TV, desc: "TV - Penn and Teller Bullshit"}
-    - {id: 945, cat: TV, desc: "TV - Penny Dreadful"}
-    - {id: 927, cat: TV, desc: "TV - Perception"}
-    - {id: 785, cat: TV, desc: "TV - Person of Interest"}
-    - {id: 366, cat: TV, desc: "TV - Phil of the Future"}
-    - {id: 204, cat: TV, desc: "TV - Pimp My Ride"}
-    - {id: 967, cat: TV, desc: "TV - Player Attack"}
-    - {id: 427, cat: TV, desc: "TV - Poker"}
-    - {id: 691, cat: TV, desc: "TV - Pretty Little Liars"}
-    - {id: 784, cat: TV, desc: "TV - Prime Suspect US"}
-    - {id: 734, cat: TV, desc: "TV - Primeval"}
-    - {id: 229, cat: TV, desc: "TV - Prison Break"}
-    - {id: 692, cat: TV, desc: "TV - Private Practice"}
-    - {id: 368, cat: TV, desc: "TV - Project Runway"}
-    - {id: 663, cat: TV, desc: "TV - Psych"}
-    - {id: 205, cat: TV, desc: "TV - Punkd"}
-    - {id: 803, cat: TV, desc: "TV - QI"}
-    - {id: 982, cat: TV, desc: "TV - Quantico"}
-    - {id: 251, cat: TV, desc: "TV - Quantum Leap"}
-    - {id: 993, cat: TV, desc: "TV - Queen of the South"}
-    - {id: 252, cat: TV, desc: "TV - Queer as Folk"}
-    - {id: 714, cat: TV, desc: "TV - Raising Hope"}
-    - {id: 317, cat: TV, desc: "TV - Ravenswood"}
-    - {id: 936, cat: TV, desc: "TV - Ray Donovan"}
-    - {id: 594, cat: TV, desc: "TV - Ray Mears Northern Wilderness"}
-    - {id: 822, cat: TV, desc: "TV - Real Time with Bill Maher"}
-    - {id: 369, cat: TV, desc: "TV - Reba"}
-    - {id: 885, cat: TV, desc: "TV - Rectify"}
-    - {id: 206, cat: TV, desc: "TV - Red Dwarf"}
-    - {id: 906, cat: TV, desc: "TV - Red Widow"}
-    - {id: 117, cat: TV, desc: "TV - ReGenesis"}
-    - {id: 854, cat: TV, desc: "TV - Reign"}
-    - {id: 370, cat: TV, desc: "TV - Related"}
-    - {id: 327, cat: TV, desc: "TV - Remedy"}
-    - {id: 253, cat: TV, desc: "TV - Remington Steele"}
-    - {id: 254, cat: TV, desc: "TV - Reno 911"}
-    - {id: 207, cat: TV, desc: "TV - Rescue Me"}
-    - {id: 576, cat: TV, desc: "TV - Resurrection"}
-    - {id: 295, cat: TV, desc: "TV - Reunion"}
-    - {id: 208, cat: TV, desc: "TV - Revelations"}
-    - {id: 760, cat: TV, desc: "TV - Revenge"}
-    - {id: 859, cat: TV, desc: "TV - Revolution"}
-    - {id: 312, cat: TV, desc: "TV - Rewind"}
-    - {id: 768, cat: TV, desc: "TV - Ringer"}
-    - {id: 604, cat: TV, desc: "TV - Rip Off Britain"}
-    - {id: 693, cat: TV, desc: "TV - River Monsters"}
-    - {id: 929, cat: TV, desc: "TV - Rizzoli and Isles"}
-    - {id: 209, cat: TV, desc: "TV - Robot Chicken"}
-    - {id: 888, cat: TV, desc: "TV - Rogue"}
-    - {id: 944, cat: TV/Sport, desc: "TV - ROH-Wrestling"}
-    - {id: 255, cat: TV, desc: "TV - Rome"}
-    - {id: 849, cat: TV, desc: "TV - Rookie Blue"}
-    - {id: 694, cat: TV, desc: "TV - Royal Pains"}
-    - {id: 695, cat: TV, desc: "TV - Rubicon"}
-    - {id: 807, cat: TV, desc: "TV - Rules of Engagement"}
-    - {id: 372, cat: TV, desc: "TV - Ruri no Shima"}
-    - {id: 892, cat: TV, desc: "TV - Rush"}
-    - {id: 555, cat: TV, desc: "TV - Russian TV programs"}
-    - {id: 789, cat: TV, desc: "TV - Salem"}
-    - {id: 605, cat: TV, desc: "TV - Sanctuary"}
-    - {id: 776, cat: TV, desc: "TV - Satisfaction US"}
-    - {id: 373, cat: TV, desc: "TV - Saturday Night Live"}
-    - {id: 915, cat: TV, desc: "TV - Save Me"}
-    - {id: 696, cat: TV, desc: "TV - Saving Grace"}
-    - {id: 931, cat: TV, desc: "TV - Saving Hope"}
-    - {id: 844, cat: TV, desc: "TV - Scandal"}
-    - {id: 344, cat: TV, desc: "TV - Scorpion"}
-    - {id: 987, cat: TV, desc: "TV - Scream"}
-    - {id: 138, cat: TV, desc: "TV - Scrubs"}
-    - {id: 304, cat: TV, desc: "TV - Sean Saves The World"}
-    - {id: 715, cat: TV, desc: "TV - Secret Diary Of A Call Girl"}
-    - {id: 210, cat: TV, desc: "TV - Seinfeld"}
-    - {id: 296, cat: TV, desc: "TV - Sex and The City"}
-    - {id: 708, cat: TV, desc: "TV - Shameless"}
-    - {id: 375, cat: TV, desc: "TV - Sin Rastro"}
-    - {id: 737, cat: TV, desc: "TV - Single Ladies"}
-    - {id: 211, cat: TV, desc: "TV - Six Feet Under"}
-    - {id: 697, cat: TV, desc: "TV - Skins"}
-    - {id: 376, cat: TV, desc: "TV - Sleeper Cell"}
-    - {id: 112, cat: TV, desc: "TV - Sleepy Hollow"}
-    - {id: 256, cat: TV, desc: "TV - Sliders"}
-    - {id: 137, cat: TV, desc: "TV - Smallville"}
-    - {id: 830, cat: TV, desc: "TV - Smash"}
-    - {id: 649, cat: TV, desc: "TV - So You Think You Can Dance"}
-    - {id: 569, cat: TV, desc: "TV - Sons of Anarchy"}
-    - {id: 815, cat: TV, desc: "TV - Sons of Guns"}
-    - {id: 212, cat: TV, desc: "TV - South Park"}
-    - {id: 718, cat: TV, desc: "TV - Southland"}
-    - {id: 257, cat: TV, desc: "TV - Space 1999"}
-    - {id: 297, cat: TV, desc: "TV - Space Above and Beyond"}
-    - {id: 631, cat: TV, desc: "TV - Spartacus"}
-    - {id: 845, cat: TV, desc: "TV - Spike TV"}
-    - {id: 607, cat: TV, desc: "TV - Spooks"}
-    - {id: 131, cat: TV, desc: "TV - Sports Illustrated"}
-    - {id: 159, cat: TV/Sport, desc: "TV - Sports related"}
-    - {id: 378, cat: TV, desc: "TV - Stacked"}
-    - {id: 379, cat: TV, desc: "TV - Star Trek"}
-    - {id: 563, cat: TV, desc: "TV - Star Wars The Clone Wars"}
-    - {id: 615, cat: TV, desc: "TV - Star-Crossed"}
-    - {id: 139, cat: TV, desc: "TV - Star-Trek Enterprise"}
-    - {id: 144, cat: TV, desc: "TV - Star-Trek The Next Generation"}
-    - {id: 380, cat: TV, desc: "TV - Stargate"}
-    - {id: 123, cat: TV, desc: "TV - Stargate Atlantis"}
-    - {id: 124, cat: TV, desc: "TV - StarGate SG1"}
-    - {id: 562, cat: TV, desc: "TV - Stargate Universe"}
-    - {id: 258, cat: TV, desc: "TV - Starved"}
-    - {id: 213, cat: TV, desc: "TV - Stella"}
-    - {id: 614, cat: TV, desc: "TV - Steven Seagal Lawman"}
-    - {id: 381, cat: TV, desc: "TV - Still Standing"}
-    - {id: 857, cat: TV, desc: "TV - Strike Back"}
-    - {id: 528, cat: TV, desc: "TV - Studio 60 on the Sunset Strip"}
-    - {id: 838, cat: TV, desc: "TV - Suburgatory"}
-    - {id: 761, cat: TV, desc: "TV - Suits"}
-    - {id: 214, cat: TV, desc: "TV - Summerland"}
-    - {id: 400, cat: TV, desc: "TV - Super Fun Night"}
-    - {id: 298, cat: TV, desc: "TV - Supernatural"}
-    - {id: 299, cat: TV, desc: "TV - Surface"}
-    - {id: 382, cat: TV, desc: "TV - Survivor"}
-    - {id: 215, cat: TV, desc: "TV - Survivors"}
-    - {id: 847, cat: TV, desc: "TV - Swamp People"}
-    - {id: 863, cat: TV, desc: "TV - Switched at Birth"}
-    - {id: 153, cat: TV, desc: "TV - Tattoo Nightmares"}
-    - {id: 217, cat: TV, desc: "TV - Teen Titans"}
-    - {id: 731, cat: TV, desc: "TV - Teen Wolf"}
-    - {id: 764, cat: TV, desc: "TV - Terra Nova"}
-    - {id: 119, cat: TV, desc: "TV - That 70s Show"}
-    - {id: 316, cat: TV, desc: "TV - The 100"}
-    - {id: 168, cat: TV, desc: "TV - The 4400"}
-    - {id: 300, cat: TV, desc: "TV - The Adventures of Sherlock Holmes"}
-    - {id: 185, cat: TV, desc: "TV - The After"}
-    - {id: 383, cat: TV, desc: "TV - The Amazing Race"}
-    - {id: 887, cat: TV, desc: "TV - The Americans"}
-    - {id: 301, cat: TV, desc: "TV - The Apprentice"}
-    - {id: 384, cat: TV, desc: "TV - The Bernie Mac Show"}
-    - {id: 583, cat: TV, desc: "TV - The Big Bang Theory"}
-    - {id: 829, cat: TV, desc: "TV - The Big C"}
-    - {id: 572, cat: TV, desc: "TV - The Biggest Loser"}
-    - {id: 581, cat: TV, desc: "TV - The Blacklist"}
-    - {id: 410, cat: TV, desc: "TV - The Boondocks"}
-    - {id: 608, cat: TV, desc: "TV - The Border"}
-    - {id: 775, cat: TV, desc: "TV - The Borgias"}
-    - {id: 923, cat: TV, desc: "TV - The Bridge US"}
-    - {id: 711, cat: TV, desc: "TV - The Cape"}
-    - {id: 730, cat: TV, desc: "TV - The Carrie Diaries"}
-    - {id: 586, cat: TV, desc: "TV - The Cleveland Show"}
-    - {id: 896, cat: TV, desc: "TV - The Client List"}
-    - {id: 218, cat: TV, desc: "TV - The Closer"}
-    - {id: 272, cat: TV, desc: "TV - The Colbert Report"}
-    - {id: 219, cat: TV, desc: "TV - The Comeback"}
-    - {id: 510, cat: TV, desc: "TV - The Contender"}
-    - {id: 758, cat: TV, desc: "TV - The Crazy Ones"}
-    - {id: 114, cat: TV, desc: "TV - The Daily Show"}
-    - {id: 856, cat: TV, desc: "TV - The Dead Files"}
-    - {id: 220, cat: TV, desc: "TV - The Dead Zone"}
-    - {id: 189, cat: TV, desc: "TV - The Divide"}
-    - {id: 386, cat: TV, desc: "TV - The Dog Whisperer"}
-    - {id: 702, cat: TV, desc: "TV - The Event"}
-    - {id: 610, cat: TV, desc: "TV - The F Word"}
-    - {id: 639, cat: TV, desc: "TV - The Family"}
-    - {id: 835, cat: TV, desc: "TV - The Finder"}
-    - {id: 834, cat: TV, desc: "TV - The Firm"}
-    - {id: 973, cat: TV, desc: "TV - The Flash"}
-    - {id: 877, cat: TV, desc: "TV - The Following"}
-    - {id: 635, cat: TV, desc: "TV - The Forgotten"}
-    - {id: 932, cat: TV, desc: "TV - The Fosters"}
-    - {id: 816, cat: TV, desc: "TV - The Game"}
-    - {id: 766, cat: TV, desc: "TV - The Gates"}
-    - {id: 259, cat: TV, desc: "TV - The Girls Next Door"}
-    - {id: 740, cat: TV, desc: "TV - The Glades"}
-    - {id: 587, cat: TV, desc: "TV - The Goldbergs"}
-    - {id: 648, cat: TV, desc: "TV - The Good Wife"}
-    - {id: 912, cat: TV, desc: "TV - The Goodwin Games"}
-    - {id: 278, cat: TV, desc: "TV - The Haunting Of"}
-    - {id: 903, cat: TV, desc: "TV - The Hero"}
-    - {id: 655, cat: TV, desc: "TV - The Hills"}
-    - {id: 221, cat: TV, desc: "TV - The Inside"}
-    - {id: 595, cat: TV, desc: "TV - The Jeff Dunham Show"}
-    - {id: 387, cat: TV, desc: "TV - The Jetsons"}
-    - {id: 827, cat: TV, desc: "TV - The Killing"}
-    - {id: 388, cat: TV, desc: "TV - The King Of Queens"}
-    - {id: 321, cat: TV, desc: "TV - The Knick"}
-    - {id: 271, cat: TV, desc: "TV - The L Word"}
-    - {id: 609, cat: TV, desc: "TV - The League"}
-    - {id: 897, cat: TV, desc: "TV - The Leftovers"}
-    - {id: 808, cat: TV, desc: "TV - The Life and Times of Tim"}
-    - {id: 924, cat: TV, desc: "TV - The Listener"}
-    - {id: 222, cat: TV, desc: "TV - The Lone Gunmen"}
-    - {id: 152, cat: TV, desc: "TV - The Lost World"}
-    - {id: 643, cat: TV, desc: "TV - The Mentalist"}
-    - {id: 878, cat: TV, desc: "TV - The Michael J Fox"}
-    - {id: 630, cat: TV, desc: "TV - The Middle"}
-    - {id: 405, cat: TV, desc: "TV - The Millers"}
-    - {id: 901, cat: TV, desc: "TV - The Mindy Project"}
-    - {id: 860, cat: TV, desc: "TV - The Mob Doctor"}
-    - {id: 870, cat: TV, desc: "TV - The Musketeers"}
-    - {id: 239, cat: TV, desc: "TV - The Mysteries Of Laura"}
-    - {id: 938, cat: TV, desc: "TV - The Newsroom"}
-    - {id: 109, cat: TV, desc: "TV - The O.C."}
-    - {id: 308, cat: TV, desc: "TV - The Office"}
-    - {id: 319, cat: TV, desc: "TV - The Originals"}
-    - {id: 392, cat: TV, desc: "TV - The Others"}
-    - {id: 390, cat: TV, desc: "TV - The O`Reilly Factor"}
-    - {id: 698, cat: TV, desc: "TV - The Pacific"}
-    - {id: 302, cat: TV, desc: "TV - The PJs"}
-    - {id: 567, cat: TV, desc: "TV - The Practice"}
-    - {id: 260, cat: TV, desc: "TV - The Real World"}
-    - {id: 176, cat: TV, desc: "TV - The Red Road"}
-    - {id: 597, cat: TV, desc: "TV - The Replacements"}
-    - {id: 664, cat: TV, desc: "TV - The Sci Fi Guys"}
-    - {id: 393, cat: TV, desc: "TV - The Secret Adventures of Jules Verne"}
-    - {id: 786, cat: TV, desc: "TV - The Secret Circle"}
-    - {id: 668, cat: TV, desc: "TV - The Secret Life of the American Teenager"}
-    - {id: 735, cat: TV, desc: "TV - The Shadow Line"}
-    - {id: 223, cat: TV, desc: "TV - The Shield"}
-    - {id: 125, cat: TV, desc: "TV - The Simpsons"}
-    - {id: 423, cat: TV, desc: "TV - The Sopranos"}
-    - {id: 333, cat: TV, desc: "TV - The Strain"}
-    - {id: 236, cat: TV, desc: "TV - The Tomorrow People US"}
-    - {id: 699, cat: TV, desc: "TV - The Tudors"}
-    - {id: 611, cat: TV, desc: "TV - The Ultimate Fighter"}
-    - {id: 320, cat: TV, desc: "TV - The Unexplained Files"}
-    - {id: 721, cat: TV, desc: "TV - The Vampire Diaries"}
-    - {id: 654, cat: TV, desc: "TV - The Venture Bros"}
-    - {id: 725, cat: TV, desc: "TV - The Voice"}
-    - {id: 720, cat: TV, desc: "TV - The Walking Dead"}
-    - {id: 394, cat: TV, desc: "TV - The War At Home"}
-    - {id: 116, cat: TV, desc: "TV - The West Wing"}
-    - {id: 577, cat: TV, desc: "TV - The X Factor"}
-    - {id: 425, cat: TV, desc: "TV - Thief"}
-    - {id: 268, cat: TV, desc: "TV - Threshold"}
-    - {id: 796, cat: TV, desc: "TV - Thundercats"}
-    - {id: 216, cat: TV, desc: "TV - TLC Connections"}
-    - {id: 904, cat: TV/Sport, desc: "TV - TNA-Wrestling"}
-    - {id: 399, cat: TV, desc: "TV - Tonight Show With Jay Leno"}
-    - {id: 616, cat: TV, desc: "TV - Top Chef"}
-    - {id: 224, cat: TV, desc: "TV - Top Gear"}
-    - {id: 942, cat: TV, desc: "TV - Top Shot"}
-    - {id: 762, cat: TV, desc: "TV - Torchwood"}
-    - {id: 836, cat: TV, desc: "TV - Touch"}
-    - {id: 225, cat: TV, desc: "TV - Trailer Park Boys"}
-    - {id: 1001, cat: TV, desc: "TV - Transformers Prime"}
-    - {id: 733, cat: TV, desc: "TV - Treme"}
-    - {id: 303, cat: TV, desc: "TV - Tripping the Rift"}
-    - {id: 787, cat: TV, desc: "TV - Trophy Wife"}
-    - {id: 565, cat: TV, desc: "TV - True Blood"}
-    - {id: 180, cat: TV, desc: "TV - True Detective"}
-    - {id: 727, cat: TV, desc: "TV - Turn"}
-    - {id: 261, cat: TV, desc: "TV - Twin Peaks"}
-    - {id: 930, cat: TV, desc: "TV - Twisted"}
-    - {id: 401, cat: TV, desc: "TV - Two And A Half Men"}
-    - {id: 337, cat: TV, desc: "TV - Tyrant"}
-    - {id: 793, cat: TV/Sport, desc: "TV - UFC"}
-    - {id: 814, cat: TV, desc: "TV - Ugly Americans"}
-    - {id: 559, cat: TV, desc: "TV - Ugly Betty"}
-    - {id: 155, cat: TV, desc: "TV - UK"}
-    - {id: 934, cat: TV, desc: "TV - Under the Dome"}
-    - {id: 791, cat: TV, desc: "TV - Underbelly"}
-    - {id: 706, cat: TV, desc: "TV - Undercover Boss"}
-    - {id: 777, cat: TV, desc: "TV - Unforgettable"}
-    - {id: 129, cat: TV, desc: "TV - Unscripted"}
-    - {id: 739, cat: TV, desc: "TV - Unsealed Alien Files"}
-    - {id: 226, cat: TV, desc: "TV - Unsolved Mysteries"}
-    - {id: 868, cat: TV, desc: "TV - Up All Night"}
-    - {id: 262, cat: TV, desc: "TV - Urgences"}
-    - {id: 566, cat: TV, desc: "TV - V"}
-    - {id: 895, cat: TV, desc: "TV - Veep"}
-    - {id: 864, cat: TV, desc: "TV - Vegas"}
-    - {id: 121, cat: TV, desc: "TV - Veronica Mars"}
-    - {id: 908, cat: TV, desc: "TV - Vice"}
-    - {id: 402, cat: TV, desc: "TV - Viewtiful Joe"}
-    - {id: 799, cat: TV, desc: "TV - Vikings"}
-    - {id: 227, cat: TV, desc: "TV - Viva La Bam"}
-    - {id: 263, cat: TV, desc: "TV - Wanted"}
-    - {id: 593, cat: TV, desc: "TV - Warehouse 13"}
-    - {id: 995, cat: TV, desc: "TV - Wayward Pines"}
-    - {id: 264, cat: TV, desc: "TV - Weeds"}
-    - {id: 404, cat: TV, desc: "TV - Weird U S"}
-    - {id: 909, cat: TV, desc: "TV - Wentworth"}
-    - {id: 596, cat: TV, desc: "TV - When Ghosts Attack"}
-    - {id: 575, cat: TV, desc: "TV - White Collar"}
-    - {id: 406, cat: TV, desc: "TV - Whose Line Is It Anyway"}
-    - {id: 918, cat: TV, desc: "TV - Wilfred US"}
-    - {id: 135, cat: TV, desc: "TV - Will And Grace"}
-    - {id: 673, cat: TV, desc: "TV - Witches of East End"}
-    - {id: 408, cat: TV, desc: "TV - Without A Trace"}
-    - {id: 800, cat: TV, desc: "TV - Workaholics"}
-    - {id: 127, cat: TV/Sport, desc: "TV - WWE - Wrestling"}
-    - {id: 228, cat: TV, desc: "TV - X Files"}
-    - {id: 770, cat: TV, desc: "TV - X-Men"}
-    - {id: 265, cat: TV, desc: "TV - Young and the Restless"}
-    - {id: 801, cat: TV, desc: "TV - Young Justice"}
-    - {id: 889, cat: TV, desc: "TV - Zero Hour US"}
-    - {id: 1025, cat: TV/HD, desc: "TV - HEVC/x265"}
-    - {id: 1026, cat: TV/SD, desc: "TV - Divx/Xvid"}
-    - {id: 1027, cat: TV/SD, desc: "TV - DVD"}
-    - {id: 1028, cat: TV/HD, desc: "TV - HD"}
-    - {id: 1029, cat: TV/SD, desc: "TV - SVCD/VCD"}
-    # Apps
-    - {id: 7, cat: PC, desc: "Software"}
-    - {id: 532, cat: PC, desc: "Software - KeyGen / Tools"}
-    - {id: 17, cat: PC, desc: "Software - Linux"}
-    - {id: 27, cat: PC/Mac, desc: "Software - Mac"}
-    - {id: 232, cat: PC/Mobile-Other, desc: "Software - Mobile phones"}
-    - {id: 18, cat: PC, desc: "Software - Other operating systems"}
-    - {id: 19, cat: PC, desc: "Software - Palm, PocketPC and IPAQ"}
-    - {id: 20, cat: PC, desc: "Software - Windows - CD/DVD Tools"}
-    - {id: 25, cat: PC, desc: "Software - Windows - Other"}
-    - {id: 21, cat: PC, desc: "Software - Windows - Photo Editing"}
-    - {id: 22, cat: PC, desc: "Software - Windows - Security"}
-    - {id: 23, cat: PC, desc: "Software - Windows - Sound Editing"}
-    - {id: 24, cat: PC, desc: "Software - Windows - Video Apps"}
-    # Games
-    - {id: 3, cat: PC/Games, desc: "Games"}
-    - {id: 136, cat: PC/Games, desc: "Games - fixes/patches"}
-    - {id: 422, cat: PC/Games, desc: "Games - Other"}
-    - {id: 26, cat: PC/Games, desc: "Games - Mac"}
-    - {id: 231, cat: Console, desc: "Games - Mobile phones"}
-    - {id: 627, cat: Console/NDS, desc: "Games - Nintendo DS"}
-    - {id: 11, cat: Console, desc: "Games - PS 2"}
-    - {id: 700, cat: Console/PS3, desc: "Games - PS 3"}
-    - {id: 12, cat: Console, desc: "Games - PS X"}
-    - {id: 158, cat: Console/PSP, desc: "Games - PSP"}
-    - {id: 13, cat: Console, desc: "Games - ROMS/Retro"}
-    - {id: 15, cat: Console, desc: "Games - Sega Saturn"}
-    - {id: 14, cat: PC/Games, desc: "Games - Video Demonstrations"}
-    - {id: 701, cat: Console/Wii, desc: "Games - Wii"}
-    - {id: 421, cat: PC/Games, desc: "Games - Windows"}
-    - {id: 10, cat: PC/Games, desc: "Games - Windows Kids Games"}
-    - {id: 16, cat: Console/XBox, desc: "Games - XBox"}
-    - {id: 1017, cat: Console, desc: "Games - PS 1"}
-    - {id: 1018, cat: Console/XBox 360, desc: "Games - Xbox 360"}
-    - {id: 1014, cat: Console/3DS, desc: "Games - Nintendo 3DS"}
-    - {id: 1015, cat: Console, desc: "Games - Dreamcast"}
-    - {id: 1016, cat: Console, desc: "Games - GameCube"}
-    # XXX
-    - {id: 533, cat: XXX, desc: "XXX"}
-    - {id: 943, cat: XXX, desc: "XXX - Animation/Hentai"}
-    - {id: 553, cat: XXX/DVD, desc: "XXX - DVD"}
-    - {id: 536, cat: XXX, desc: "XXX - Games"}
-    - {id: 948, cat: XXX/x264, desc: "XXX - HD Video"}
-    - {id: 535, cat: XXX/ImageSet, desc: "XXX - Pictures"}
-    - {id: 552, cat: XXX, desc: "XXX - Video"}
-    - {id: 804, cat: XXX, desc: "XXX - Video 3D"}
-    - {id: 970, cat: XXX, desc: "XXX - Virtual Reality"}
-    - {id: 806, cat: XXX, desc: "XXX - Wallpapers"}
-    - {id: 811, cat: XXX, desc: "XXX - Books"}
-    # Books
-    - {id: 2, cat: Books, desc: "Books"}
-    - {id: 625, cat: Books, desc: "Books - Adventure"}
-    - {id: 51, cat: Audio/Audiobook, desc: "Books - Audio books"}
-    - {id: 848, cat: Books/Comics, desc: "Books - Comics"}
-    - {id: 624, cat: Books, desc: "Books - Crime"}
-    - {id: 623, cat: Books, desc: "Books - Drama"}
-    - {id: 50, cat: Books/EBook, desc: "Books - Ebooks"}
-    - {id: 621, cat: Books, desc: "Books - Educational"}
-    - {id: 622, cat: Books, desc: "Books - Horror"}
-    - {id: 465, cat: Books/Mags, desc: "Books - Magazines"}
-    - {id: 1000, cat: Books, desc: "Books - Sexual Fitness and Education"}
-    - {id: 626, cat: Books, desc: "Books - True Stories"}
-    # Other
-    - {id: 6, cat: Other, desc: "Pictures"}
-    - {id: 9, cat: Other, desc: "Other"}
-    - {id: 53, cat: Other, desc: "Pictures - Other"}
-    - {id: 52, cat: Other, desc: "Pictures - Wallpapers"}
-    - {id: 80, cat: Other, desc: "Other - Articles"}
-    - {id: 143, cat: Other, desc: "Other - Comics"}
-    - {id: 85, cat: Other, desc: "Other - Funny clips"}
-    - {id: 81, cat: Other, desc: "Other - Manuals"}
-    - {id: 83, cat: Other, desc: "Other - Other"}
-    - {id: 413, cat: Other, desc: "Other - Radio shows"}
-    - {id: 82, cat: Other, desc: "Other - Religion"}
-    - {id: 874, cat: Other, desc: "Other - Subtitles"}
-    - {id: 557, cat: Other, desc: "Other - Training "}
-    - {id: 1021, cat: Other, desc: "Other - Tutorials"}
-    - {id: 1022, cat: Other, desc: "Other - Sounds"}
-    - {id: 1023, cat: Other, desc: "Other - Nulled Scripts"}
-    # Mobile
-    - {id: 416, cat: PC/Mobile-Other, desc: "Mobile"}
-    - {id: 752, cat: PC/Mobile-Other, desc: "Mobile - Games for Android"}
-    - {id: 746, cat: PC/Mobile-Other, desc: "Mobile - Games for Apple iPod, iPod Touch, iPad, iPhone"}
-    - {id: 745, cat: PC/Mobile-Other, desc: "Mobile - Games for Java"}
-    - {id: 744, cat: PC/Mobile-Other, desc: "Mobile - Games for Symbian"}
-    - {id: 743, cat: PC/Mobile-Other, desc: "Mobile - Games for Windows Mobile"}
-    - {id: 517, cat: PC/Mobile-Other, desc: "Mobile - Music"}
-    - {id: 554, cat: PC/Mobile-Other, desc: "Mobile - Other"}
-    - {id: 748, cat: PC/Mobile-Other, desc: "Mobile - Software - Other"}
-    - {id: 972, cat: PC/Mobile-Other, desc: "Mobile - Software for Android"}
-    - {id: 749, cat: PC/Mobile-Other, desc: "Mobile - Software for Apple iPad, iPhone, iPod Touch"}
-    - {id: 747, cat: PC/Mobile-Other, desc: "Mobile - Software for Windows Mobile"}
-    - {id: 428, cat: PC/Mobile-Other, desc: "Mobile - Tv"}
-    - {id: 417, cat: PC/Mobile-Other, desc: "Mobile - Video"}
-    - {id: 750, cat: PC/Mobile-Other, desc: "Mobile - Video for Apple iPad, iPhone, iPod Touch"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings: []
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}{{ else }}/home{{ end }}"
-
-  rows:
-    selector: tr[class^="tl"]
-
-  fields:
-    title:
-      selector: td.tli a
-    category:
-      selector: td a[href^="/category/"]
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 2]
-    details:
-      selector: td.tli a
-      attribute: href
-    download:
-      selector: td a[href^="magnet:?xt="]
-      attribute: href
-      filters:
-        - name: replace
-          args: [";", "&"]
-    date:
-      selector: td:nth-last-of-type(5)
-      filters:
-        - name: timeago
-    size:
-      selector: td:nth-last-of-type(4)
-    seeders:
-      text: 0
-    leechers:
-      text: 0
-    seeders:
-      optional: true
-      selector: td.sy
-    leechers:
-      optional: true
-      selector: td.ly
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -78,8 +78,9 @@ download:
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/extremlymtorrents.yml

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

src/Jackett.Common/Definitions/exttorrents.yml

@@ -38,6 +38,7 @@ caps:
     - {id: "/games/switch/", cat: Console/Other, desc: "Games Switch"}
     - {id: "/games/wii/", cat: Console/Wii, desc: "Games Wii"}
     - {id: "/games/xbox360/", cat: Console/XBox 360, desc: "Games Xbox360"}
+    - {id: "/games/mac/", cat: PC/Mac, desc: "Games Mac"}
     - {id: "/movies/", cat: Movies, desc: Movies}
     - {id: "/movies/3d-movies/", cat: Movies/3D, desc: "Movies 3D"}
     - {id: "/movies/bollywood/", cat: Movies, desc: "Movies Bollywood"}
@@ -48,6 +49,8 @@ caps:
     - {id: "/movies/mp4/", cat: Movies, desc: "Movies MP4"}
     - {id: "/movies/other-movies/", cat: Movies, desc: "Movies Other Movies"}
     - {id: "/movies/ultrahd/", cat: Movies/UHD, desc: "Movies UltraHD"}
+    - {id: "/movies/music-videos/", cat: Audio/Video, desc: "Movies Music videos"}
+    - {id: "/movies/movie-clips/", cat: Movies/Other, desc: "Movies Movie clips"}
     - {id: "/music/", cat: Audio, desc: Music}
     - {id: "/music/aac/", cat: Audio, desc: "Music AAC"}
     - {id: "/music/lossless/", cat: Audio/Lossless, desc: "Music Lossless"}
@@ -93,8 +96,9 @@ settings:
     default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.onl/
+  - https://eztv.unblockit.ch/
   - https://eztv.nocensor.space/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -44,6 +44,9 @@ legacylinks:
   - https://eztv.unblockit.buzz/
   - https://eztv.unblocked.monster/
   - https://eztv.unblockit.club/
+  - https://eztv.unblockit.onl/
+  - https://eztv.unblockit.li/
+  - https://eztv.unblockit.uno/
 
 caps:
   categories:

src/Jackett.Common/Definitions/fantastiko.yml

@@ -0,0 +1,215 @@
+---
+id: fantastiko
+name: Fantastiko
+description: "Fantastiko is a GREEK Private Torrent Tracker for SCI-FI / FANTASY / HORROR MOVIES / TV / GENERAL"
+language: el-gr
+type: private
+encoding: UTF-8
+links:
+  - http://fantastiko.space/ # https is not supported
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 14, cat: Movies/BluRay, desc: "Movies DVDRip/BRRip"}
+    - {id: 56, cat: Movies/HD, desc: "Movies BluRay 720p/1080p/2160p"}
+    - {id: 17, cat: Movies/DVD, desc: "Movies DVD5/9"}
+    - {id: 49, cat: Movies, desc: "Movies Packs/filmographies"}
+    - {id: 50, cat: Movies/Other, desc: "Movies Others (screener-webrip-tvrip)"}
+    - {id: 53, cat: Movies/SD, desc: "Movies VHS"}
+    - {id: 51, cat: Movies, desc: "Movies Short films"}
+    - {id: 52, cat: Movies, desc: "Movie Serials"}
+    - {id: 32, cat: TV, desc: "Series"}
+    - {id: 38, cat: TV, desc: "TV Episodes"}
+    - {id: 39, cat: TV, desc: "TV Packs"}
+    - {id: 57, cat: TV/WEB-DL, desc: "Web Episodes"}
+    - {id: 65, cat: TV/WEB-DL, desc: "Web Episode Packs"}
+    - {id: 64, cat: TV, desc: "Video Episodes"}
+    - {id: 66, cat: TV, desc: "Video Episode Packs"}
+    - {id: 36, cat: TV/Anime, desc: "Animation"}
+    - {id: 54, cat: TV/Anime, desc: "Animation Movies"}
+    - {id: 55, cat: TV/Anime, desc: "Animation TV Series"}
+    - {id: 60, cat: TV/Anime, desc: "Animation Web Series"}
+    - {id: 61, cat: TV/Anime, desc: "Animation Video Series"}
+    - {id: 59, cat: TV/Anime, desc: "Animation Shorts"}
+    - {id: 33, cat: TV/Documentary, desc: "Ντοκιμαντέρ/Τηλ.Εκπομπές (Documentaries)"}
+    - {id: 58, cat: TV, desc: "Supermarionation"}
+    - {id: 62, cat: TV, desc: "Supermarionation Movies"}
+    - {id: 63, cat: TV, desc: "Supermarionation  Series"}
+    - {id: 34, cat: Books, desc: "Βιβλία"}
+    - {id: 40, cat: Books/EBook, desc: "E-Books"}
+    - {id: 41, cat: Audio/Audiobook, desc: "Audio Books"}
+    - {id: 42, cat: Books/Mags, desc: "Περιοδικά (Magazines)"}
+    - {id: 35, cat: Books/Comics, desc: "Comics"}
+    - {id: 37, cat: Other, desc: "Παραστάσεις (Theater)"}
+    - {id: 45, cat: Other, desc: "Photos"}
+    - {id: 7, cat: Audio/Other, desc: "Music/Soundtrack"}
+    - {id: 2, cat: PC/Games, desc: "Games"}
+    - {id: 46, cat: PC, desc: "Software"}
+    - {id: 47, cat: Other, desc: "Κατασκευές (Constructions)"}
+    - {id: 48, cat: Other, desc: "Borg Cube"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+
+login:
+  path: ?p=home&pid=1
+  method: form
+  form: form#sls_form
+  submitpath: /ajax/login.php
+  inputs:
+    action: login
+    loginbox_membername: "{{ .Config.username }}"
+    loginbox_password: "{{ .Config.password }}"
+    loginbox_remember: 1
+  selectorinputs:
+    securitytoken:
+      selector: "script:contains(\"stKey: \")"
+      filters:
+        - name: regexp
+          args: "stKey: \"(.+?)\","
+  error:
+    - selector: ":contains(\"-ERROR-\")"
+  test:
+    path: ?p=home&pid=1
+    selector: a#logout
+
+search:
+  paths:
+    - path: /
+  keywordsfilters:
+    - name: re_replace # add brackets to year on searchquery if missing
+      args: ["\\(*((19|20)\\d{2})\\)*", "($1)"]
+    - name: re_replace
+      args: ["[^\\w\\d\\(\\)]+", "%"]
+  inputs:
+    p: torrents
+    pid: 32
+    $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
+    keywords: "{{ .Keywords }}"
+    # name, description, both, uploader
+    search_type: name
+  error:
+    - selector: div#show_error
+
+  rows:
+    selector: "tr:has(a[href*=\"?p=torrents\"][href*=\"&cid=\"]){{ if .Config.freeleech }}:has(img[src*=\"torrent_free.png\"]){{ else }}{{ end }}"
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href*="?p=torrents"][href*="&cid="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cid
+    title:
+      selector: a[href*="?p=torrents"][href*="&action=details"]
+    details:
+      selector: a[href*="?p=torrents"][href*="&action=details"]
+      attribute: href
+    download:
+      selector: a[href*="?p=torrents"][href*="&action=download"]
+      attribute: href
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: a[rel="torrent_size"]
+    seeders:
+      selector: a[rel="torrent_seeders"]
+    leechers:
+      selector: a[rel="torrent_leechers"]
+    grabs:
+      selector: a[rel="times_completed"]
+    poster:
+      selector: a[rel="fancybox"]
+      attribute: href
+    downloadvolumefactor:
+      case:
+        "img[src*=\"torrent_free.png\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    date:
+      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("Κυριακή")
+      remove: span, a
+      filters:
+        - name: replace
+          args: ["Uploaded ", ""]
+        - name: replace
+          args: [" by", ""]
+        - name: replace
+          args: ["Ανέβηκε ", ""] # Uploaded
+        - name: replace
+          args: [" από", ""] # by
+        - name: replace
+          args: [" τον/την", ""] # him/her
+        - name: replace
+          args: ["στις ", "at "] # at
+        - name: replace
+          args: ["σήμερα", "Today"]
+        - name: replace
+          args: ["εχθές", "Yesterday"]
+        - name: replace
+          args: ["Δευτέρα", "Monday"]
+        - name: replace
+          args: ["Τρίτη", "Tuesday"]
+        - name: replace
+          args: ["Τετάρτη", "Wednesday"]
+        - name: replace
+          args: ["Πέμπτη", "Thursday"]
+        - name: replace
+          args: ["Παρασκευή", "Friday"]
+        - name: replace
+          args: ["Σάββατο", "Saturday"]
+        - name: replace
+          args: ["Κυριακή", "Sunday"]
+        - name: fuzzytime
+    date:
+      optional: true
+      selector: td.torrent_name:contains("-")
+      remove: span, a
+      filters:
+        - name: replace
+          args: ["Uploaded ", ""]
+        - name: replace
+          args: [" by", ""]
+        - name: replace
+          args: ["at ", ""]
+        - name: replace
+          args: ["Ανέβηκε ", ""] # Uploaded
+        - name: replace
+          args: [" από", ""] # by
+        - name: replace
+          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"
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# TSUE 2.1

src/Jackett.Common/Definitions/feedurneed.yml

@@ -20,6 +20,7 @@ caps:
     - {id: 24, cat: Books/EBook, desc: E-Books}
     - {id: 64, cat: PC/Games, desc: Games/ISO}
     - {id: 65, cat: PC/Games, desc: Games/Rips}
+    - {id: 83, cat: Movies/HD, desc: HeaVen2H3LL}
     - {id: 28, cat: Movies/3D, desc: Movies/3D}
     - {id: 30, cat: Movies, desc: Movies/Cam-TS}
     - {id: 15, cat: Movies/DVD, desc: Movies/DVDR}

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

@@ -74,8 +74,9 @@ download:
       tid: "{{ .DownloadUri.Query.id }}"
       text: "{{ .Config.thankyou }}"
       submit: Opslaan
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/finvip.yml

@@ -96,8 +96,9 @@ login:
     selector: a[href="logout.php"]
 
 download:
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/firebit.yml

@@ -57,8 +57,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="/download.php?id="]
+      attribute: href
 
 search:
   # http://firebit.net/index.php?do=search&type=simple&q=2019

src/Jackett.Common/Definitions/focusx.yml

@@ -1,289 +0,0 @@
----
-id: focusx
-name: FocusX
-description: "FocusX is a RUSSIAN Public torrent site for MOVIES and TV"
-language: ru-ru
-type: public
-encoding: UTF-8
-links:
-  - https://focu.sx/
-
-caps:
-  categorymappings:
-    - {id: 9, cat: TV, desc: "Иерихон"}
-    - {id: 10, cat: Movies, desc: "Мёд в голове"}
-    - {id: 11, cat: TV, desc: "11-22-63"}
-    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
-    - {id: 13, cat: TV, desc: "Смерть в раю"}
-    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
-    - {id: 15, cat: TV, desc: "Чёрные паруса"}
-    - {id: 16, cat: Movies, desc: "Малыш"}
-    - {id: 17, cat: TV, desc: "Карточный домик"}
-    - {id: 18, cat: Movies, desc: "Копенгаген"}
-    - {id: 19, cat: Movies, desc: "Заброшенный"}
-    - {id: 37, cat: TV, desc: "Джек Айриш"}
-    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
-    - {id: 39, cat: TV, desc: "Чужестранка"}
-    - {id: 40, cat: TV, desc: "Девушка по вызову"}
-    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
-    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
-    - {id: 43, cat: TV, desc: "Игра престолов"}
-    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
-    - {id: 45, cat: Movies, desc: "Падение Лондона"}
-    - {id: 46, cat: Movies, desc: "Высотка"}
-    - {id: 47, cat: TV, desc: "Острые козырьки"}
-    - {id: 48, cat: TV, desc: "Странная парочка"}
-    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
-    - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
-    - {id: 51, cat: TV, desc: "Проповедник"}
-    - {id: 52, cat: TV, desc: "Изгой"}
-    - {id: 53, cat: TV, desc: "Рэй Донован"}
-    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
-    - {id: 56, cat: TV, desc: "Бесстыдники"}
-    - {id: 57, cat: Movies, desc: "Портниха"}
-    - {id: 58, cat: TV, desc: "Мистер Робот"}
-    - {id: 59, cat: TV, desc: "Валландер"}
-    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
-    - {id: 61, cat: Movies, desc: "Комета"}
-    - {id: 62, cat: TV, desc: "Штамм"}
-    - {id: 63, cat: TV, desc: "Куорри"}
-    - {id: 64, cat: Movies, desc: "Зоотопия"}
-    - {id: 65, cat: Movies, desc: "В твоих глазах"}
-    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
-    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
-    - {id: 68, cat: TV, desc: "Бесстыжие"}
-    - {id: 69, cat: TV, desc: "Нарко"}
-    - {id: 70, cat: Movies, desc: "Припаркованные"}
-    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
-    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
-    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
-    - {id: 74, cat: Movies, desc: "Варкрафт"}
-    - {id: 75, cat: TV, desc: "Все схвачено"}
-    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
-    - {id: 77, cat: TV, desc: "Граница"}
-    - {id: 79, cat: TV, desc: "Бош"}
-    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
-    - {id: 81, cat: TV, desc: "Викинги"}
-    - {id: 82, cat: TV, desc: "Салем"}
-    - {id: 83, cat: Movies, desc: "Возмущение"}
-    - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
-    - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
-    - {id: 86, cat: TV, desc: "Кровавая Гонка"}
-    - {id: 87, cat: TV, desc: "Сеньор Авила"}
-    - {id: 88, cat: TV, desc: "Стрелок"}
-    - {id: 89, cat: TV, desc: "Миднайт Техас"}
-    - {id: 90, cat: Movies, desc: "Дангал"}
-    - {id: 91, cat: TV, desc: "Утиные Истории"}
-    - {id: 96, cat: TV, desc: "Двойка"}
-    - {id: 97, cat: TV, desc: "Тик-герой"}
-    - {id: 100, cat: TV, desc: "Смертельное оружие"}
-    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
-    - {id: 102, cat: TV, desc: "Черный Список"}
-    - {id: 106, cat: TV, desc: "Одаренные"}
-    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
-    - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
-    - {id: 109, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 110, cat: TV, desc: "Порох"}
-    - {id: 111, cat: Movies, desc: "1922"}
-    - {id: 112, cat: TV, desc: "Субура"}
-    - {id: 115, cat: TV, desc: "Безбожники"}
-    - {id: 116, cat: TV, desc: "Секретные Материалы"}
-    - {id: 118, cat: TV, desc: "Охотник за разумом"}
-    - {id: 119, cat: TV, desc: "Алиенист"}
-    - {id: 120, cat: TV, desc: "Ординатор"}
-    - {id: 121, cat: TV, desc: "Уэйко"}
-    - {id: 122, cat: TV, desc: "Американская история преступлений"}
-    - {id: 124, cat: TV, desc: "Бельвью"}
-    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
-    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
-    - {id: 129, cat: TV, desc: "Взлет"}
-    - {id: 130, cat: TV, desc: "Инстинкт"}
-    - {id: 131, cat: TV, desc: "Стартап"}
-    - {id: 133, cat: TV, desc: "Террор"}
-    - {id: 135, cat: Movies, desc: "Анон"}
-    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
-    - {id: 138, cat: TV, desc: "В пустыне смерти"}
-    - {id: 139, cat: TV, desc: "Дождь"}
-    - {id: 140, cat: TV, desc: "Страйк"}
-    - {id: 141, cat: TV, desc: "Безопасность"}
-    - {id: 143, cat: TV, desc: "Подлый пит"}
-    - {id: 144, cat: TV, desc: "Голиаф"}
-    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
-    - {id: 147, cat: TV, desc: "Королева Сахара"}
-    - {id: 155, cat: TV, desc: "Наследники"}
-    - {id: 156, cat: TV, desc: "Джек Райан"}
-    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
-    - {id: 161, cat: TV, desc: "Частные сыщики"}
-    - {id: 162, cat: TV, desc: "Изнанка дела"}
-    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
-    - {id: 164, cat: TV, desc: "Возвращение домой"}
-    - {id: 165, cat: TV, desc: "Метод Комински"}
-    - {id: 166, cat: TV, desc: "Элита"}
-    - {id: 167, cat: TV, desc: "Грязный Джон"}
-    - {id: 168, cat: Movies, desc: "Воспитательница"}
-    - {id: 169, cat: TV, desc: "Романовы"}
-    - {id: 170, cat: TV, desc: "Страна приливов"}
-    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
-    - {id: 172, cat: TV, desc: "Смертельный класс"}
-    - {id: 173, cat: TV, desc: "Парфюм"}
-    - {id: 174, cat: TV, desc: "Цветочный дом"}
-    - {id: 175, cat: TV, desc: "Каратель"}
-    - {id: 176, cat: TV, desc: "Матрёшка"}
-    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
-    - {id: 179, cat: TV, desc: "Половое Просвещение"}
-    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
-    - {id: 181, cat: TV, desc: "Сорвиголова"}
-    - {id: 182, cat: TV, desc: "Мистер Посредник"}
-    - {id: 183, cat: TV, desc: "Футурама"}
-    - {id: 184, cat: TV, desc: "Доктор Блейк"}
-    - {id: 185, cat: TV, desc: "Стальная Звезда"}
-    - {id: 186, cat: TV, desc: "Изгнание"}
-    - {id: 187, cat: TV, desc: "Крупный Город"}
-    - {id: 189, cat: Movies, desc: "Дедвуд"}
-    - {id: 190, cat: TV, desc: "Кобра Кай"}
-    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
-    - {id: 193, cat: Movies, desc: "Та, которой не было"}
-    - {id: 197, cat: TV, desc: "Западное крыло"}
-    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
-    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
-    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
-    - {id: 202, cat: Movies, desc: "Визит инспектора"}
-    - {id: 203, cat: TV, desc: "Книга Рабов"}
-    - {id: 204, cat: TV, desc: "Ведьмак"}
-    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
-    - {id: 206, cat: Movies, desc: "Брачная история"}
-    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
-    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
-    - {id: 213, cat: Movies, desc: "Борат 2"}
-    - {id: 222, cat: Movies, desc: "Траффик"}
-    - {id: 223, cat: Movies, desc: "На колёсах"}
-    - {id: 224, cat: Movies, desc: "Чудо в камере №7"}
-    - {id: 227, cat: Movies, desc: "Сначала убили моего отца"}
-    - {id: 228, cat: Movies, desc: "Айла: Дочь войны"}
-    - {id: 229, cat: TV, desc: "Танцы с птицами"}
-    - {id: 230, cat: TV, desc: "Жизнь в цвете"}
-
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-search:
-  paths:
-    # https://focu.sx/tracker/search?freeleech=0&query=daredevil
-    - path: "tracker/{{ if .Keywords }}search?freeleech=0&query={{ .Keywords }}&{{ else }}?{{ end }}order={{ .Config.sort }}&direction={{ .Config.type }}"
-      followredirect: true
-
-  rows:
-    selector: ol.torrentListItems li.torrentListItem
-
-  fields:
-    title:
-      selector: h3.title a
-    details:
-      selector: h3.title a
-      attribute: href
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
-    category:
-      selector: div.torrentCategory a
-      attribute: href
-      filters:
-        - name: querystring
-          args: category_id
-    download:
-      selector: div.download a
-      attribute: href
-      filters:
-        - name: prepend
-          args: "{{ .Config.sitelink }}"
-    magnet:
-      selector: div.download a[href^="magnet:?"]
-      attribute: href
-    date:
-      # unix
-      selector: abbr.DateTime
-      optional: true
-      attribute: data-time
-    date:
-      selector: span.DateTime
-      optional: true
-      attribute: title
-      # 7 мар 2019 в 21:06
-      filters:
-        - name: replace
-          args: [" в ", " "]
-        - name: replace
-          args: ["янв", "Jan"]
-        - name: replace
-          args: ["фев", "Feb"]
-        - name: replace
-          args: ["мар", "Mar"]
-        - name: replace
-          args: ["апр", "Apr"]
-        - name: replace
-          args: ["май", "May"]
-        - name: replace
-          args: ["июн", "Jun"]
-        - name: replace
-          args: ["июл", "Jul"]
-        - name: replace
-          args: ["авг", "Aug"]
-        - name: replace
-          args: ["сен", "Sep"]
-        - name: replace
-          args: ["окт", "Oct"]
-        - name: replace
-          args: ["ноя", "Nov"]
-        - name: replace
-          args: ["дек", "Dec"]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2 Jan 2006 15:04 -07:00"
-    size:
-      selector: div.size
-      filters:
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
-        - name: replace
-          args: ["ТБ", "TB"]
-        - name: replace
-          args: ["ГБ", "GB"]
-        - name: replace
-          args: ["МБ", "MB"]
-        - name: replace
-          args: ["КБ", "KB"]
-    grabs:
-      selector: div.snatched
-    seeders:
-      selector: div.seeders
-    leechers:
-      selector: div.leechers
-    downloadvolumefactor:
-      case:
-        span.freeleech: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/fouducinema.yml

@@ -11,16 +11,6 @@ links:
 caps:
   categorymappings:
     # when refreshing categories dont forget to update the category case block
-    - {id: 94, cat: TV/Sport, desc: "sport catch"}
-    - {id: 93, cat: TV/Sport, desc: "sport catch"}
-    - {id: 96, cat: TV/Sport, desc: "sport sport"}
-    - {id: 97, cat: TV/Sport, desc: "sport divers"}
-    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
-    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
-    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
-    - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
-    - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
-    - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
     - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
     - {id: 99, cat: Movies/HD, desc: "Film Hdrip"}
     - {id: 98, cat: Movies/WEB-DL, desc: "Film Webrip"}
@@ -28,11 +18,10 @@ caps:
     - {id: 87, cat: Movies/HD, desc: "Film REMUX"}
     - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
     - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
-    - {id: 67, cat: Movies/Other, desc: "Film Vob"}
+    - {id: 67, cat: Movies/3D, desc: "Film 3D Bluray"}
     - {id: 59, cat: Movies/Other, desc: "Film Divers"}
     - {id: 19, cat: Movies/HD, desc: "Film 720P"}
     - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Webrip - HDrip"}
     - {id: 15, cat: Movies/BluRay, desc: "Film Bluray Full"}
     - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
     - {id: 102, cat: Movies/UHD, desc: "Film HDR"}
@@ -51,19 +40,34 @@ caps:
     - {id: 63, cat: TV/Other, desc: "Pack_Series Divers"}
     - {id: 71, cat: TV/HD, desc: "Pack_Series BRRiP - BDRiP"}
     - {id: 82, cat: TV/Anime, desc: "Pack_Series Animation"}
-    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
+    - {id: 112, cat: TV/HD, desc: "Pack_Series HDTV"}
+    - {id: 105, cat: Books/Mags, desc: "Livres Magazine"}
+    - {id: 116, cat: Books, desc: "Livres Cuisine"}
+    - {id: 123, cat: Books, desc: "Livres Roman"}
+    - {id: 113, cat: Books/EBook, desc: "Livres Ebook"}
+    - {id: 106, cat: Books, desc: "Livres Presse"}
+    - {id: 108, cat: Books/Comics, desc: "Livres Manga"}
+    - {id: 110, cat: Audio/Audiobook, desc: "Livres Audio"}
+    - {id: 109, cat: Books/Comics, desc: "Livres Bd"}
+    - {id: 125, cat: XXX/Other, desc: "livres XXX"}
+    - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 13, cat: PC/0day, desc: "Apps Win"}
     - {id: 14, cat: PC/Mac, desc: "Apps Mac"}
     - {id: 52, cat: PC/Mobile-iOS, desc: "Apps Iphone"}
     - {id: 53, cat: PC/Mobile-Android, desc: "Apps android"}
+    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
+    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
     - {id: 5, cat: Audio/MP3, desc: "Music Mp3"}
     - {id: 6, cat: Audio/Lossless, desc: "Music FLAC"}
+    - {id: 97, cat: TV/Sport, desc: "Sport Divers"}
+    - {id: 96, cat: TV/Sport, desc: "Sport Sport"}
     - {id: 7, cat: PC/Games, desc: "Jeux Win"}
     - {id: 8, cat: Console/PS3, desc: "Jeux PS3"}
     - {id: 54, cat: PC/Games, desc: "Jeux Pc"}
     - {id: 55, cat: Console/PS4, desc: "Jeux PS4"}
     - {id: 56, cat: Console/XBox 360, desc: "Jeux XBOX 360"}
     - {id: 57, cat: Console/Other, desc: "Jeux androïd"}
+    - {id: 10, cat: XXX, desc: "XxX 18 Film"}
 
   modes:
     search: [q]
@@ -161,16 +165,6 @@ search:
       selector: div.kat_cat_pic
       filters:
       case:
-        ":contains(\"sport\"):contains(\"catch\")": 94
-        ":contains(\"sport\"):contains(\"catch\")": 93
-        ":contains(\"sport\"):contains(\"sport\")": 96
-        ":contains(\"sport\"):contains(\"divers\")": 97
-        ":contains(\"Animation\"):contains(\"Séries\")": 81
-        ":contains(\"Animation\"):contains(\"Film\")": 79
-        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
-        ":contains(\"Documentaires\"):contains(\"audio\")": 66
-        ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
-        ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
         ":contains(\"Film\"):contains(\"DVDRip\")": 2
         ":contains(\"Film\"):contains(\"Hdrip\")": 99
         ":contains(\"Film\"):contains(\"Webrip\")": 98
@@ -178,12 +172,11 @@ search:
         ":contains(\"Film\"):contains(\"REMUX\")": 87
         ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
         ":contains(\"Film\"):contains(\"DVD-r\")": 69
-        ":contains(\"Film\"):contains(\"Vob\")": 67
+        ":contains(\"Film\"):contains(\"3D\")": 67
         ":contains(\"Film\"):contains(\"Divers\")": 59
         ":contains(\"Film\"):contains(\"720P\")": 19
         ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"Webrip\")": 16
-        ":contains(\"Film\"):contains(\"Bluray\")": 15
+        ":contains(\"Film\"):contains(\"Full\")": 15
         ":contains(\"Film\"):contains(\"1080P\")": 4
         ":contains(\"Film\"):contains(\"HDR\")": 102
         ":contains(\"Serie\"):contains(\"1080P\")": 46
@@ -201,19 +194,34 @@ search:
         ":contains(\"Pack_Series\"):contains(\"Divers\")": 63
         ":contains(\"Pack_Series\"):contains(\"BRRiP - BDRiP\")": 71
         ":contains(\"Pack_Series\"):contains(\"Animation\")": 82
-        ":contains(\"XxX\"):contains(\"Film\")": 10
+        ":contains(\"Pack_Series\"):contains(\"HDTV\")": 112
+        ":contains(\"Livres\"):contains(\"Magazine\")": 105
+        ":contains(\"Livres\"):contains(\"Cuisine\")": 116
+        ":contains(\"Livres\"):contains(\"Roman\")": 123
+        ":contains(\"Livres\"):contains(\"Ebook\")": 113
+        ":contains(\"Livres\"):contains(\"Presse\")": 106
+        ":contains(\"Livres\"):contains(\"Manga\")": 108
+        ":contains(\"Livres\"):contains(\"Audio\")": 110
+        ":contains(\"Livres\"):contains(\"Bd\")": 109
+        ":contains(\"Livres\"):contains(\"XXX\")": 125
+        ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Apps\"):contains(\"Win\")": 13
         ":contains(\"Apps\"):contains(\"Mac\")": 14
         ":contains(\"Apps\"):contains(\"Iphone\")": 52
         ":contains(\"Apps\"):contains(\"android\")": 53
+        ":contains(\"Animation\"):contains(\"Séries\")": 81
+        ":contains(\"Animation\"):contains(\"Film\")": 79
         ":contains(\"Music\"):contains(\"Mp3\")": 5
         ":contains(\"Music\"):contains(\"FLAC\")": 6
+        ":contains(\"Sport\"):contains(\"Divers\")": 97
+        ":contains(\"Sport\"):contains(\"Sport\")": 96
         ":contains(\"Jeux\"):contains(\"Win\")": 7
         ":contains(\"Jeux\"):contains(\"PS3\")": 8
         ":contains(\"Jeux\"):contains(\"Pc\")": 54
         ":contains(\"Jeux\"):contains(\"PS4\")": 55
         ":contains(\"Jeux\"):contains(\"XBOX 360\")": 56
         ":contains(\"Jeux\"):contains(\"androïd\")": 57
+        ":contains(\"XxX\"):contains(\"Film\")": 10
     title_phase1:
       selector: a[href^="details.php?id="]
     title_multilang:

src/Jackett.Common/Definitions/freetorrent.yml

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

src/Jackett.Common/Definitions/galeriens.yml

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

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -6,11 +6,12 @@ language: es-es
 type: public
 encoding: UTF-8
 links:
-  - https://www.gamestorrents.nu/
+  - https://www.gamestorrents.fm/
   - https://gamestorrents.nocensor.space/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/
+  - https://www.gamestorrents.nu/
 
 caps:
   categorymappings:
@@ -30,8 +31,9 @@ caps:
 settings: []
 
 download:
-  selector: a#download_torrent
-  attribute: href
+  selectors:
+    - selector: a#download_torrent
+      attribute: href
 
 search:
   paths:

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

@@ -8,6 +8,34 @@ encoding: UTF-8
 links:
   - https://www.gay-torrents.net/
 
+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: 0
+    options:
+      0: created
+      1: title
+      4: size
+      5: seeders
+  - name: order
+    type: select
+    label: Order requested from site
+    default: 0
+    options:
+      0: desc
+      1: asc
+
 caps:
   categorymappings:
     - {id: porn, cat: XXX, desc: "Porn"}
@@ -80,9 +108,26 @@ login:
 search:
   paths:
     - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 1
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 2
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 3
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 4
+    - path: "{{ if .Keywords }}search.php{{ else }}torrentslist.php{{ end }}"
+      inputs:
+        page: 5
   inputs:
     $raw: "{{ range .Categories }}type={{.}}&{{end}}"
     textsearch: "{{ .Keywords }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.order }}"
+    freeleech: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
   keywordsfilters:
     - name: re_replace
       args: ["(\\w+)", " +$1"] # prepend + to each word
@@ -120,7 +165,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "02 Jan 06, 15:04 -07:00"
+          args: "15:04 02-Jan-2006 -07:00"
     downloadvolumefactor:
       case:
         ".TorrentList2 > a:contains(\"[FFL]\")": 0

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

@@ -24,6 +24,26 @@ settings:
     type: info
     label: "Search results"
     default: "You can increase the number of search results in your profile.<br />Default is 15."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: data
+    options:
+      data: created
+      seeds: seeders
+      size: size
+      filename: title
+  - name: order
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 caps:
   categorymappings:
@@ -62,6 +82,7 @@ caps:
     - {id: 41, cat: Movies, desc: "Non-Porn"}
     - {id: 41, cat: TV, desc: "Non-Porn"}
     - {id: 41, cat: Other, desc: "Non-Porn"}
+    - {id: 71, cat: XXX, desc: "Fan Sites"}
 
   modes:
     search: [q]
@@ -87,8 +108,10 @@ search:
   inputs:
     $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
-    # 0 both, 1 active, 2 dead
-    active: 0
+    # 0 all, 1 active, 2 dead, 3 free, 4 50%free, 5 25%free, 6 packs
+    active: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.order }}"
 
   rows:
     selector: div.torrent

src/Jackett.Common/Definitions/generationfree.yml

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

src/Jackett.Common/Definitions/girotorrent.yml

@@ -136,8 +136,9 @@ download:
       infohash: "{{ .DownloadUri.Query.id }}"
       thanks: 1
       rndval: "1487013827343"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gktorrent.cc/
+  - https://www.gktorrents.com/
   - https://gktorrent.nocensor.space/
 legacylinks:
   - https://www.gktorrent.com/
@@ -32,6 +32,7 @@ legacylinks:
   - https://www.gktorrent.pw/
   - https://wvw.gktorrent.pw/
   - https://vww.gktorrent.pw/
+  - https://www.gktorrent.cc/
 
 caps:
   categorymappings:
@@ -73,8 +74,9 @@ settings:
     default: false
 
 download:
-  selector: a[href*="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href*="magnet:?xt="]
+      attribute: href
 
 search:
   paths:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.unblockit.ch/
   - https://glotorrents.nocensor.space/
 legacylinks:
   - https://glodls.rocks/
@@ -38,6 +38,9 @@ legacylinks:
   - https://glotorrents.unblockit.buzz/
   - https://glodls.unblocked.monster/
   - https://glotorrents.unblockit.club/
+  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.unblockit.li/
+  - https://glotorrents.unblockit.uno/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gtorrent.yml

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

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -23,8 +23,9 @@ caps:
 settings: []
 
 download:
-  selector: a[href^="/engine/download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="/engine/download.php?id="]
+      attribute: href
 
 search:
   # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+

src/Jackett.Common/Definitions/haitang.yml

@@ -0,0 +1,168 @@
+---
+id: haitang
+name: Haitang
+description: "海棠PT (Hǎitáng PT) is a CHINESE Private Torrent Tracker for OPERA / CROSSTALK"
+language: zh-cn
+type: private
+encoding: UTF-8
+links:
+  - https://www.htpt.cc/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Audio, desc: "相声 Crosstalk"}
+    - {id: 4091, cat: Audio, desc: "评书 Storytelling"}
+    - {id: 4097, cat: Audio, desc: "戏曲 Opera"}
+    - {id: 4098, cat: Audio, desc: "鼓/琴 Drum / Piano"}
+    - {id: 4099, cat: Audio, desc: "小曲 Small Song"}
+    - {id: 4101, cat: Audio, desc: "小品 Sketch"}
+    - {id: 4104, cat: Audio, desc: "二人转 Duets"}
+    - {id: 4105, cat: TV, desc: "小剧种 Puppet shows"}
+    - {id: 4103, cat: Audio/Audiobook, desc: "广播剧 Audiobooks"}
+
+  modes:
+    search: [q]
+    tv-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: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: ["!", 4103]
+    - path: live.php
+      categories: [4103]
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 incldead, 1 onlyactive, 2 onlydead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader
+    search_area: 0
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    title:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
+    minimumratio:
+      text: 1
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# NexusPHP v1.0

src/Jackett.Common/Definitions/happyfappy.yml

@@ -0,0 +1,136 @@
+---
+id: happyfappy
+name: HappyFappy
+description: "HappyFappy is a Private Torrent Tracker for 3X"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://www.happyfappy.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "PRON"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login
+  method: form
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    cinfo: "2550|1350|24|-60"
+    iplocked: 0
+    keeploggedin: 1
+  error:
+    - selector: div.error
+  test:
+    path: /
+    selector: "#nav_userinfo"
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    searchtext: ""
+    title: "{{ .Keywords }}"
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    action: advanced
+    filter_freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    filelist: ""
+    taglist: ""
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="torrent row"]
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: a[href^="/torrents.php?id="]
+    details:
+      selector: a[href^="/torrents.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    description:
+      optional: true
+      selector: div.tags
+    poster:
+      selector: td:nth-child(2) > script
+      filters:
+        - name: regexp
+          args: "src=\\\\\"(.*?)\\\\\""
+        - name: re_replace
+          args: ["\\\\(.)", "$1"]
+        - name: replace
+          args: ["/static/common/noartwork/noimage.png", ""]
+    files:
+      selector: td:nth-child(3)
+    date:
+      selector: td:nth-child(5) > span
+      attribute: title
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 02 2006, 15:04 -07:00"
+    size:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        span.icon[title*="Freeleech"]: 0
+        "img[alt=\"Freeleech\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# Luminance

src/Jackett.Common/Definitions/hdcztorrent.yml

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

src/Jackett.Common/Definitions/hdhouse.yml

@@ -8,21 +8,22 @@ encoding: windows-1251
 links:
   - https://hdhouse.club/
   - https://hdreactor.club/
-  - https://hdreactor.su/
 legacylinks:
   - https://hdreactor.guru/
   - https://hdreactor.net/
+  - https://hdreactor.su/
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/HD, desc: "Кино HD"}
-    - {id: 2, cat: Movies/UHD, desc: "Кино UHD"}
-    - {id: 3, cat: XXX, desc: "18+ HD"}
-    - {id: 4, cat: Audio/Lossless, desc: "Музыка A"}
-    - {id: 5, cat: PC/Games, desc: "Игры"}
-    - {id: 6, cat: TV/HD, desc: "Сериалы HD"}
-    - {id: 7, cat: TV/Anime, desc: "Мультфильмы"}
-    - {id: 9, cat: Audio/Video, desc: "Музыка V"}
+    - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
+    - {id: 5006, cat: Movies/UHD, desc: "Кино UHD"}
+    - {id: 2007, cat: TV/Anime, desc: "Мультфильмы"}
+    - {id: 2006, cat: TV/HD, desc: "Сериалы HD"}
+    - {id: 2004, cat: Audio/Lossless, desc: "Музыка A"}
+    - {id: 5007, cat: Audio/Video, desc: "Музыка V"}
+    - {id: 2003, cat: XXX, desc: "18+ HD"}
+    - {id: 2005, cat: PC/Games, desc: "Игры"}
+    - {id: 5005, cat: TV/Sport, desc: "Спорт HD"} # not shown in list
 
   modes:
     search: [q]
@@ -51,8 +52,9 @@ settings:
       asc: asc
 
 download:
-  selector: a[href^="magnet:?xt="]
-  attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
 
 search:
   # https://hdreactor.net/index.php?do=search&subaction=search&showposts=1&story=2020&catlist[]=2001&catlist[]=2006
@@ -83,14 +85,15 @@ search:
     category:
       selector: div.movie-item__meta > span > a
       case:
-        a[href$="/1/"]: 1
-        a[href$="/3/"]: 3
-        a[href$="/4/"]: 4
-        a[href$="/4k_uhd/"]: 2
-        a[href$="/5/"]: 5
-        a[href$="/6/"]: 6
-        a[href$="/7/"]: 7
-        a[href$="/9/"]: 9
+        a[href$="/1/"]: 2001
+        a[href$="/4k_uhd/"]: 5006
+        a[href$="/7/"]: 2007
+        a[href$="/6/"]: 2006
+        a[href$="/4/"]: 2004
+        a[href$="/9/"]: 5007
+        a[href$="/3/"]: 2003
+        a[href$="/5/"]: 2005
+        a[href$="/sport-hd/"]: 5005 # not shown in list
     title:
       selector: span.movie-item__title
       filters:

src/Jackett.Common/Definitions/hdolimpo.yml

@@ -113,6 +113,8 @@ search:
           args: ["HDOlimpo", ""] # Delete HDOlimpo
         - name: replace
           args: ["HD-Olimpo", ""] # Delete HD-Olimpo
+        - name: replace
+          args: ["E-AC-3", "EAC3"]
         - name: re_replace
           args: ["[ -](?i)español[ -]", " SPANiSH "]
         - name: re_replace

src/Jackett.Common/Definitions/hellastz.yml

@@ -92,8 +92,9 @@ download:
       infohash: "{{ .DownloadUri.Query.id }}"
       thanks: 1
       rndval: "1487013827343"
-  selector: a[href^="download.php?id="]
-  attribute: href
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
 
 search:
   paths: