BitMeTV: use and filter

fix #1844

README.md

@@ -10,7 +10,7 @@
 
 This project is a new fork and is recruiting development help.  If you are able to help out please contact us.
 
-Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
+Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
 
 Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
@@ -21,17 +21,22 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Linux and macOS using Mono 4 (mono 3 is no longer supported).
 
 ### Supported Public Trackers
+ * 1337x
  * Anidex
  * Anime Tosho
  * AniRena
+ * btbit
+ * BTDB
  * cpasbien
  * EZTV
+ * GkTorrent
  * Horrible Subs
+ * Idope
  * Il Corsaro Nero <!-- maintained by bonny1992 -->
- * Isohunt
  * KickAssTorrent
  * KickAssTorrent (thekat.se clone)
  * LimeTorrents
+ * MagnetDL
  * NextTorrent
  * Nyaa.si
  * Nyaa-Pantsu
@@ -48,16 +53,20 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torrent9
  * TorrentProject
  * Torrentz2
+ * World Wide Torrents
  * YTS.ag
- * zetorrents
+ * Zooqle
  
 ### Supported Semi-Private Trackers
  * 7tor
  * CzTorrent
  * Deildu
  * Gay-Torrents.net
+ * LostFilm.tv
+ * Metal Tracker
  * NetHD
  * RuTracker
+ * SkTorrent
  * TorrentBytes
  * Xtreme Zone
  * YggTorrent
@@ -77,10 +86,12 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * ArabaFenice
  * Arche Torrent
  * AsianDVDClub
+ * AST4u
  * Audiobook Torrents
  * Awesome-HD
  * Avistaz
  * B2S-Share
+ * Back-ups
  * BakaBT  [![(invite needed)][inviteneeded]](#)
  * bB
  * BeyondHD
@@ -114,6 +125,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * DigitalHive
  * Dragonworld Reloaded
  * Dream Team
+ * EliteHD  [![(invite needed)][inviteneeded]](#)
  * Elite-Tracker
  * EoT-Forum
  * eStone
@@ -129,7 +141,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * GFTracker
  * GFXPeers
  * Ghost City
- * GigaTorrents  [![(invite needed)][inviteneeded]](#)
+ * GigaTorrents
  * GimmePeers <!-- maintained by jamesb2147 -->
  * GODS  [![(invite needed)][inviteneeded]](#)
  * Gormogon
@@ -143,7 +155,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HD4Free
  * HDBits
  * HDChina
- * HDClub
  * HDHome
  * HDME
  * HDSky
@@ -194,7 +205,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * RevolutionTT
  * Rockhard Lossless
  * RoDVD
- * SceneAccess
  * SceneFZ
  * SceneTime
  * SDBits
@@ -208,6 +218,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * SportsCult
  * SportHD
  * Superbits
+ * Synthesiz3r
  * Tasmanit
  * The Empire
  * The Geeks
@@ -232,6 +243,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torrenting
  * TorrentLeech
  * Torrents.Md
+ * TorrentVault
  * Torrent-Syndikat
  * TorViet
  * ToTheGlory
@@ -283,6 +295,8 @@ Jackett can also be run from the command line if you would like to see log messa
 
 Detailed instructions for [Ubuntu 14.x](http://www.htpcguides.com/install-jackett-on-ubuntu-14-x-for-custom-torrents-in-sonarr/) and [Ubuntu 15.x](http://www.htpcguides.com/install-jackett-ubuntu-15-x-for-custom-torrents-in-sonarr/)
 
+If you want to run it with a user without a /home directory you need to add `Environment=XDG_CONFIG_HOME=/path/to/folder` to your systemd file, this folder will be used to store your config files.  
+
 ## Installation on macOS
 
 ### Prerequisites
@@ -291,7 +305,8 @@ Install [Mono 4](http://www.mono-project.com/download/#download-mac) or better (
 
 ### Install as service
 1. Download and extract the latest `Jackett.Binaries.Mono.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
-2. In Terminal, run the install script from the extracted directory using `./install_service_macos.sh`
+2. Open the extracted folder and double-click on `install_service_macos`.
+3. If the installation was a success, you can close the Terminal window.
        
 The service will start on each logon. You can always stop it by running `launchctl unload ~/Library/LaunchAgents/org.user.Jackett.plist` from Terminal. You can start it again it using `launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist`.
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
@@ -311,15 +326,13 @@ Jackett is available as beta package from [SynoCommunity](https://synocommunity.
 
   You can pass various options when running via the command line, see --help for details.
 
-* __Unable to  connect to trackers with invalid SSL certificates__
+* __Error "The underlying connection was closed: Could not establish trust relationship for the SSL/TLS secure channel."__
 
-  If you're using mono this is often caused by missing ca-certificates.
+  This is often caused by missing CA certificates.
   Try reimporting the certificates in this case:
-   - On Linux: `wget -O - https://curl.haxx.se/ca/cacert.pem | cert-sync /dev/stdin`
+   - On Linux (as user root): `wget -O - https://curl.haxx.se/ca/cacert.pem | cert-sync /dev/stdin`
    - On macOS: `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`
 
-  As a option of last resort you can disable certificate validation using the `--IgnoreSslErrors true` option but it's not recommended to use it as it enables Man-in-the-middle attacks on your connections.
-
 *  __Enable logging__
 
   You can get additional logging with the command line switches `-t -l` or by enabling `Enhanced logging` via the web interface.

src/Jackett.Console/Jackett.Console.csproj

@@ -153,7 +153,7 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="packages.config" />
-    <Content Include="install_service_macos.sh">
+    <Content Include="install_service_macos">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

src/Jackett.Console/install_service_macos

@@ -1,22 +1,30 @@
 #!/bin/bash
 
+#Setting up colors
+BOLDRED="$(printf '\033[1;31m')"
+BOLDGREEN="$(printf '\033[1;32m')"
+NC="$(printf '\033[0m')" # No Color
+
 # Stop and unload the service if it's running
 launchctl remove org.user.Jackett
 
+# Move working directory to Jackett's
+cd "$(dirname "$0")"
+
 # Check if we're running from Jackett's directory
 if [ ! -f ./JackettConsole.exe ]; then
-    echo "Couldn't locate JackettConsole.exe. Are you running from the right directory?"
+echo "${BOLDRED}ERROR${NC}: Couldn't locate JackettConsole.exe. Is the script in the right directory?"
     exit 1
 fi
 jackettdir="$(pwd)"
 
 # Check if mono is installed
-command -v mono >/dev/null 2>&1 || { echo >&2 "Jackett requires Mono but it's not installed. Aborting."; exit 1; }
+command -v mono >/dev/null 2>&1 || { echo >&2 "${BOLDRED}ERROR${NC}: Jackett requires Mono but it's not installed. Aborting."; exit 1; }
 monodir="$(dirname $(command -v mono))"
 
 # Check that no other service called Jackett is already running
 if [[ $(launchctl list | grep org.user.Jackett) ]]; then
-    echo "Jackett already seems to be running as a service. Please stop it before running this script again."
+    echo "${BOLDRED}ERROR${NC}: Jackett already seems to be running as a service. Please stop it before running this script again."
     exit 1
 fi
 
@@ -56,12 +64,13 @@ launchctl load ~/Library/LaunchAgents/org.user.Jackett.plist
 
 # Check that it's running
 if [[ $(launchctl list | grep org.user.Jackett) ]]; then
-    echo "Agent successfully installed and launched!"
+echo "${BOLDGREEN}Agent successfully installed and launched!${NC}"
 else
     cat << EOL
-Could not launch agent. The installation might have failed.
+${BOLDRED}ERROR${NC}: Could not launch agent. The installation might have failed.
 Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
 Mono directory: \`${monodir}\`
 Jackett directory: \`${jackettdir}\`
+
 EOL
 fi

src/Jackett.Updater/Program.cs

@@ -191,6 +191,11 @@ namespace Jackett.Updater
                 "Definitions/leparadisdunet.yml",
                 "Definitions/qctorrent.yml",
                 "Definitions/dragonworld.yml",
+                "Definitions/hdclub.yml",
+                "Definitions/polishtracker.yml",
+                "Definitions/zetorrents.yml",
+                "Definitions/rapidetracker.yml",
+                "Definitions/isohunt.yml",
             };
 
             foreach (var oldFIle in oldFiles)

src/Jackett/Content/custom.js

@@ -111,16 +111,16 @@ function reloadIndexers() {
                 item.state = "success";
 
             if (item.type == "public") {
-                item.type_icon_content = "🔓\uFE0E";
+                item.type_label = "success";
             }
             else if (item.type == "private") {
-                item.type_icon_content = "🔐\uFE0E";
+                item.type_label = "danger";
             }
             else if (item.type == "semi-private") {
-                item.type_icon_content = "🔒\uFE0E";
+                item.type_label = "warning";
             }
             else {
-                item.type_icon_content = "";
+                item.type_label = "default";
             }
 
             var main_cats_list = item.caps.filter(function(c) {
@@ -187,7 +187,7 @@ function displayUnconfiguredIndexersList() {
         var indexer = unconfiguredIndexers[i];
         $(btn).click(function () {
             $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
-                displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks);
+                displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description);
             });
         });
     });
@@ -378,7 +378,7 @@ 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);
+            displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description);
         });
     });
 }
@@ -456,14 +456,14 @@ function prepareTestButtons(element) {
     });
 }
 
-function displayIndexerSetup(id, name, caps, link, alternativesitelinks) {
+function displayIndexerSetup(id, name, caps, link, alternativesitelinks, description) {
     api.getIndexerConfig(id, function (data) {
         if (data.result !== undefined && data.result == "error") {
             doNotify("Error: " + data.error, "danger", "glyphicon glyphicon-alert");
             return;
         }
 
-        populateSetupForm(id, name, data, caps, link, alternativesitelinks);
+        populateSetupForm(id, name, data, caps, link, alternativesitelinks, description);
     }).fail(function () {
         doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
     });
@@ -539,9 +539,9 @@ function populateConfigItems(configForm, config) {
     }
 }
 
-function newConfigModal(title, config, caps, link, alternativesitelinks) {
+function newConfigModal(title, config, caps, link, alternativesitelinks, description) {
     var configTemplate = Handlebars.compile($("#jackett-config-setup-modal").html());
-    var configForm = $(configTemplate({ title: title, caps: caps, link:link }));
+    var configForm = $(configTemplate({ title: title, caps: caps, link: link, description: description }));
     $("#modals").append(configForm);
     populateConfigItems(configForm, config);
 
@@ -602,8 +602,8 @@ function getConfigModalJson(configForm) {
     return configJson;
 }
 
-function populateSetupForm(indexerId, name, config, caps, link, alternativesitelinks) {
-    var configForm = newConfigModal(name, config, caps, link, alternativesitelinks);
+function populateSetupForm(indexerId, name, config, caps, link, alternativesitelinks, description) {
+    var configForm = newConfigModal(name, config, caps, link, alternativesitelinks, description);
     var $goButton = configForm.find(".setup-indexer-go");
     $goButton.click(function () {
         var data = getConfigModalJson(configForm);

src/Jackett/Content/index.html

@@ -236,7 +236,7 @@
                 <tbody>
                     {{#each indexers}}
                     <tr class="configured-indexer-row">
-                        <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a> <span title="{{type}}" class="type-{{type}}">{{type_icon_content}}</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></td>
                         <td class="fit">
                             <div class="indexer-buttons">
                                 <a href="{{torznab_host}}" title="{{torznab_host}}" role="button" class="indexer-button-copy btn btn-xs btn-info">Copy Torznab Feed</a>
@@ -287,7 +287,7 @@
                     <tr class="unconfigured-indexer-row">
                         <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
                         <td>{{mains_cats}}</td>
-                        <td class="fit"><span title="{{type}}" class="type-{{type}}">{{type_icon_content}}</span></td>
+                        <td class="fit"><span title="{{type}}" class="label label-{{type_label}}" style="text-transform: capitalize;">{{type}}</span></td>
                         <td>{{type}}</td>
                         <td class="fit">{{language}}</td>
                         <td class="fit">
@@ -581,6 +581,9 @@
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                         <h4 class="modal-title">{{title}} - <a target="_blank" href="{{link}}">{{link}}</a></h4>
+                        {{#if description}}
+                        <div class="alert alert-info">{{description}}</div>
+                        {{/if}}
                     </div>
                     <div class="modal-body">
                         <form class="config-setup-form"></form>
@@ -622,6 +625,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2017083001"></script>
+    <script type="text/javascript" src="../custom.js?changed=2017090502"></script>
 </body>
 </html>

src/Jackett/Controllers/IndexerApiController.cs

@@ -154,7 +154,7 @@ namespace Jackett.Controllers.V20
 
         private void ConfigureCacheResults(IEnumerable<TrackerCacheResult> results)
         {
-            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
+            var serverUrl = serverService.GetServerUrl(Request);
             foreach (var result in results)
             {
                 var link = result.Link;

src/Jackett/Controllers/ResultsController.cs

@@ -125,6 +125,9 @@ namespace Jackett.Controllers.V20
         {
             base.OnActionExecuted(actionExecutedContext);
 
+            if (actionExecutedContext.Exception != null)
+                throw new Exception("Error while executing request", actionExecutedContext.Exception);
+
             var content = actionExecutedContext.Response.Content as ObjectContent;
             actionExecutedContext.Response.Content = new JsonContent(content.Value);
         }
@@ -306,7 +309,7 @@ namespace Jackett.Controllers.V20
 
             logger.Info(logBuilder.ToString());
 
-            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
+            var serverUrl = serverService.GetServerUrl(Request);
             var resultPage = new ResultPage(new ChannelInfo
             {
                 Title = CurrentIndexer.DisplayName,
@@ -368,7 +371,7 @@ namespace Jackett.Controllers.V20
             else
                 logger.Info($"Found {result.Releases.Count()} torrentpotato releases from {CurrentIndexer.DisplayName} for: {CurrentQuery.GetQueryString()}");
 
-            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
+            var serverUrl = serverService.GetServerUrl(Request);
             var potatoReleases = result.Releases.Where(r => r.Link != null || r.MagnetUri != null).Select(r =>
             {
                 var release = AutoMapper.Mapper.Map<ReleaseInfo>(r);
@@ -400,7 +403,7 @@ namespace Jackett.Controllers.V20
 
         private void ConfigureCacheResults(IEnumerable<TrackerCacheResult> results)
         {
-            var serverUrl = string.Format("{0}://{1}:{2}{3}", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port, serverService.BasePath());
+            var serverUrl = serverService.GetServerUrl(Request);
             foreach (var result in results)
             {
                 var link = result.Link;

src/Jackett/Definitions/1337x.yml

@@ -0,0 +1,182 @@
+---
+  site: 1337x
+  name: 1337x
+  description: "1337X is a Public torrent site that offers verified torrent downloads"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://1337x.to
+
+  caps:
+    categorymappings:
+      #Audio
+      - {id: 22, cat: Audio/MP3, desc: "Music/MP3"}
+      - {id: 23, cat: Audio/Lossless, desc: "Music/Lossless"}
+      - {id: 24, cat: Audio, desc: "Music/DVD"}
+      - {id: 25, cat: Audio/Video, desc: "Music/Video"}
+      - {id: 26, cat: Audio, desc: "Music/Radio"}
+      - {id: 27, cat: Audio/Other, desc: "Music/Other"}
+      - {id: 52, cat: Audio/Audiobook, desc: "Other/Audiobook"}
+      - {id: 53, cat: Audio, desc: "Music/Album"}
+      - {id: 58, cat: Audio, desc: "Music/Box set"}
+      - {id: 59, cat: Audio, desc: "Music/Discography"}
+      - {id: 60, cat: Audio, desc: "Music/Single"}
+      - {id: 68, cat: Audio, desc: "Music/Concerts"}
+      - {id: 69, cat: Audio, desc: "Music/AAC"}
+
+      #Movies
+      - {id: 1, cat: Movies/DVD, desc: "Movies/DVD"}
+      - {id: 2, cat: Movies/SD, desc: "Movies/Divx/Xvid"}
+      - {id: 3, cat: Movies, desc: "Movies/SVCD/VCD"}
+      - {id: 4, cat: Movies/Foreign, desc: "Movies/Dubs/Dual Audio"}
+      - {id: 9, cat: Movies, desc: "Documentaries/Documentary"}
+      - {id: 42, cat: Movies/HD, desc: "Movies/HD"}
+      - {id: 54, cat: Movies, desc: "Movies/h.264/x264"}
+      - {id: 55, cat: Movies, desc: "Movies/Mp4"}
+      - {id: 66, cat: Movies/3D, desc: "Movies/3D"}
+      - {id: 70, cat: Movies, desc: "Movies/HEVC/x265"}
+      - {id: 73, cat: Movies, desc: "Movies/Bollywood"}
+
+      #TV
+      - {id: 5, cat: TV, desc: "TV/DVD"}
+      - {id: 6, cat: TV/SD, desc: "TV/Divx/Xvid"}
+      - {id: 7, cat: TV, desc: "TV/SVCD/VCD"}
+      - {id: 28, cat: TV/Anime, desc: "Anime/Anime"}
+      - {id: 41, cat: TV/HD, desc: "TV/HD"}
+      - {id: 71, cat: TV, desc: "TV/HEVC/x265"}
+
+      #Apps
+      - {id: 18, cat: PC, desc: "Apps/PC Software"}
+      - {id: 19, cat: PC/Mac, desc: "Apps/Mac"}
+      - {id: 20, cat: PC, desc: "Apps/Linux"}
+      - {id: 21, cat: PC, desc: "Apps/Other"}
+      - {id: 56, cat: PC/Phone-Android, desc: "Apps/Android"}
+      - {id: 57, cat: PC/Phone-IOS, desc: "Apps/iOS"}
+
+      #Games
+      - {id: 10, cat: PC/Games, desc: "Games/PC Game"}
+      - {id: 11, cat: Console, desc: "Games/PS2"}
+      - {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, desc: "Games/PS1"}
+      - {id: 16, cat: Console/Other, desc: "Games/Dreamcast"}
+      - {id: 17, cat: PC/Phone-Other, desc: "Games/Other"}
+      - {id: 43, cat: Console/PS3, desc: "Games/PS3"}
+      - {id: 44, cat: Console/Wii, desc: "Games/Wii"}
+      - {id: 45, cat: Console/NDS, desc: "Games/DS"}
+      - {id: 46, cat: Console, desc: "Games/GameCube"}
+      - {id: 72, cat: Console/3DS, desc: "Games/3DS"}
+
+      #XXX
+      - {id: 48, cat: XXX/DVD, desc: "XXX/Video"}
+      - {id: 49, cat: XXX/Imageset, desc: "XXX/Picture"}
+      - {id: 50, cat: XXX, desc: "XXX/Magazine"}
+      - {id: 51, cat: XXX, desc: "XXX/Hentai"}
+      - {id: 67, cat: XXX, desc: "XXX/Games"}
+
+      #Other
+      - {id: 33, cat: Other, desc: "Other/Emulation"}
+      - {id: 34, cat: Books, desc: "Other/Tutorial"}
+      - {id: 35, cat: Other, desc: "Other/Sounds"}
+      - {id: 36, cat: Books/Ebook, desc: "Other/E-books"}
+      - {id: 37, cat: Other, desc: "Other/Images"}
+      - {id: 38, cat: Other, desc: "Other/Mobile Phone"}
+      - {id: 39, cat: Books/Comics, desc: "Other/Comics"}
+      - {id: 40, cat: Other/Misc, desc: "Other/Other"}
+      - {id: 47, cat: Other, desc: "Other/Nulled Script"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  download:
+    # the .torrent url is on the on the details page 
+    selector: ul li a[href^="http://itorrents.org/"]
+
+# it appears that Jackett Definitions do not currently support fetching magnets from the details page :-(
+#  magnet:
+    # the magnet url is on the on the details page 
+#    selector: ul li a[href^="magnet:?"]
+
+  search:
+    # present trending results if there are no search parms supplied
+    path: "{{if .Keywords}}/search/{{ .Keywords}}/1/{{else}}/trending{{end}}"
+    rows:
+      selector: tr:has(a[href^="/torrent/"])
+    fields:
+      title:
+        selector: td[class^="coll-1"] a[href^="/torrent/"]
+      category:
+        optional: true
+        selector:  td[class^="coll-1"] a[href^="/sub/"]
+        attribute: href
+        filters:
+          # extract the third part
+          - name: split
+            args: ["/", 2]
+      details:
+        selector: td[class^="coll-1"] a[href^="/torrent/"]
+        attribute: href
+      download:
+        # .torrent link is on the details page
+        selector: td[class^="coll-1"] a[href^="/torrent/"]
+        attribute: href
+#      magnet:
+        # magnet URI is on the details page
+#        selector: td[class^="coll-1"] a[href^="/torrent/"]
+#        attribute: href
+      # dates come in three flavours:
+      date:
+        # (within this year) 7am Sep. 14th
+        optional: true
+        selector: td[class^="coll-date"]:not(:contains(":")):not(:contains("'"))
+        filters:
+          - name: replace
+            args: ["st", ""]
+          - name: replace
+            args: ["nd", ""]
+          - name: replace
+            args: ["rd", ""]
+          - name: replace
+            args: ["th", ""]
+          - name: dateparse
+            args: "3pm Jan. 2"
+      date:
+        # (more than a year ago) Apr. 18th '11
+        optional: true
+        selector: td[class^="coll-date"]:contains("'")
+        filters:
+          - name: replace
+            args: ["'", ""]
+          - name: replace
+            args: ["st", ""]
+          - name: replace
+            args: ["nd", ""]
+          - name: replace
+            args: ["rd", ""]
+          - name: replace
+            args: ["th", ""]
+          - name: dateparse
+            args: "Jan. 2 06"
+      date:
+        # # (today) 12:25am
+        optional: true
+        selector: td[class^="coll-date"]:contains(":")
+        filters:
+          - name: dateparse
+            args: "3:04pm"
+      size:
+        selector: td[class^="coll-4"]
+      seeders:
+        selector: td[class^="coll-2"]
+      leechers:
+        selector: td[class^="coll-3"]
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/2fast4you.yml

@@ -1,6 +1,7 @@
 ---
   site: 2fast4you
   name: 2 Fast 4 You
+  description: "2 Fast 4 You is a FRENCH Private site for TV / MOVIES / GENERAL"
   language: fr-fr
   type: private
   encoding: UTF-8
@@ -139,4 +140,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/acidlounge.yml

@@ -1,6 +1,7 @@
 ---
   site: acidlounge
   name: Acid-Lounge
+  description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL"
   language: en-us
   type: private
   encoding: UTF-8

src/Jackett/Definitions/anidex.yml

@@ -1,7 +1,7 @@
----
+---
   site: anidex
   name:  Anidex
-  description: "Anidex is a torrent tracker and indexer, primarily for English fansub groups of anime"
+  description: "Anidex is a Public torrent tracker and indexer, primarily for English fansub groups of anime"
   language: en-us
   encoding: UTF-8
   type: public
@@ -34,42 +34,22 @@
     - name: cat-id
       type: text
       label: Category Id
-    - name: lang-id
-      type: text
-      label: Language Id
+    - name: info
+      type: info
+      label: Category Id Note
+      default: "You can filter your searches by using any of the following category numbers (comma delimited):<br>1 :Anime - Sub<br>2 :Anime - Raw<br>3 :Anime - Dub<br>4 :LA - Sub<br>5 :LA - Raw<br>6 :Light Novel<br>7 :Manga - TLed<br>8 :Manga - Raw<br>9 :♫ - Lossy<br>10 :♫ - Lossless<br>11 :♫ - Video<br>12 :Games<br>13 :Applications<br>14 :Pictures<br>15 :Adult Video<br>16 :Other"
       
   search:
-    path: "ajax/page.ajax.php"
-    headers:
-      x-requested-with: ["XMLHttpRequest"]
-    inputs:
-      page: "torrents"
-      filename: "{{ .Query.Keywords }}"
-      category: "{{ .Config.cat-id }}"
-      lang_id: "{{ .Config.lang-id }}"
+    path: "?{{if .Config.cat-id}}id={{.Config.cat-id }}&{{else}}{{end}}q={{if .Keywords}}{{.Keywords}}{{else}}{{end}}"
     rows:
       selector: div.table-responsive > table > tbody > tr
     fields:
       category:
-        selector: td:nth-child(1) > div
-        case:
-          ":contains(\"Anime - Sub\")": 1
-          ":contains(\"Anime - Raw\")": 2
-          ":contains(\"Anime - Dub\")": 3
-          ":contains(\"LA - Sub\")": 4
-          ":contains(\"LA - Raw\")": 5
-          ":contains(\"Light Novel\")": 6
-          ":contains(\"Manga - TLed\")": 7
-          ":contains(\"Manga - Raw\")": 8
-          ":contains(\"♫ - Lossy\")": 9
-          ":contains(\"♫ - Lossless\")": 10
-          ":contains(\"♫ - Video\")": 11
-          ":contains(\"Games\")": 12
-          ":contains(\"Applications\")": 13
-          ":contains(\"Pictures\")": 14
-          ":contains(\"Adult Video\")": 15
-          ":contains(\"Other\")": 16
-          "*": 0 # some old torrents don't have a category
+        selector: a[href^="/?id="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: id
       title:
         selector: td:nth-child(3) > a.torrent > span.span-1440
       details:
@@ -78,6 +58,9 @@
       download:
         selector: td:nth-child(5) > a
         attribute: href
+      magnet:
+        selector: a[href^="magnet:?"]
+        attribute: href
       size:
         selector: td:nth-child(7)
       date:
@@ -92,3 +75,9 @@
         selector: td:nth-child(9)
       leechers:
         selector: td:nth-child(10)
+      grabs:
+        selector: td:nth-child(11)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/anirena.yml

@@ -1,6 +1,7 @@
 ---
   site: aniRena
   name: AniRena
+  description: "AniRena is a Public torrent tracker for the latest anime and Japanese related torrents"
   language: en-us
   type: public
   encoding: UTF-8
@@ -12,28 +13,30 @@
   caps:
     categorymappings:
       # Anime
+      - {id: 1,   cat: TV/Anime, desc: "Raw Animes"}
       - {id: 2,   cat: TV/Anime, desc: "Anime"}
+      - {id: 3,   cat: TV/Anime, desc: "Hentai"}
+      - {id: 4,   cat: TV/Anime, desc: "Drama"}
       - {id: 9,   cat: TV/Anime, desc: "Anime Music Videos"}
       - {id: 10,  cat: TV/Anime, desc: "Non-English"}
-      - {id: 1,   cat: TV/Anime, desc: "Raw Animes"}
-      # Audio
-      - {id: 8,   cat: Audio, desc: "Audio"}
-      # Literature
-      - {id: 7,   cat: Books, desc: "Manga"}
       # Software
       - {id: 5,   cat: PC/ISO, desc: "DVD/ISO"}
+      - {id: 6,   cat: PC, desc: "Hentai-Game"}
+      # Literature
+      - {id: 7,   cat: Books, desc: "Manga"}
+      # Audio
+      - {id: 8,   cat: Audio, desc: "Audio"}
+      # Other
+      - {id: 11,  cat: Other, desc: "Other"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
 
-
   search:
-    path: "/"
-    inputs:
-      s: "{{ .Query.Keywords }}"
+    path: "/{{if .Keywords}}?s={{ .Keywords}}{{else}}{{end}}"
     rows:
-      selector: table tbody tr
+      selector: table tbody tr:has(td.torrents_small_type_data1)
     fields:
       title:
         selector: .torrents_small_info_data1 div
@@ -43,6 +46,8 @@
       magnet:
         selector: .torrents_small_info_data2 a[title="Magnet Link"]
         attribute: href
+      date:
+        text: now
       size:
         selector: .torrents_small_size_data1
       seeders:
@@ -51,3 +56,22 @@
         selector: .torrents_small_leechers_data1 b big
       grabs:
         selector: .torrents_small_downloads_data1
+      category:
+        selector: .torrents_small_type_data1 img
+        attribute: src
+        case:
+          "[src=\"./styles/tracker/imageset/cat_raw_small.png\"]": "1"
+          "[src=\"./styles/tracker/imageset/cat_anime_small.png\"]": "2"
+          "[src=\"./styles/tracker/imageset/cat_hentai_small.png\"]": "3"
+          "[src=\"./styles/tracker/imageset/cat_drama_small.png\"]": "4"
+          "[src=\"./styles/tracker/imageset/cat_dvd_small.png\"]": "5"
+          "[src=\"./styles/tracker/imageset/cat_hgame2_small.png\"]": "6"
+          "[src=\"./styles/tracker/imageset/cat_manga_small.png\"]": "7"
+          "[src=\"./styles/tracker/imageset/cat_music_small.png\"]": "8"
+          "[src=\"./styles/tracker/imageset/cat_musicvid_small.png\"]": "9"
+          "[src=\"./styles/tracker/imageset/cat_noneng_small.png\"]": "10"
+          "[src=\"./styles/tracker/imageset/cat_other_small.png\"]": "11"
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/aox.yml

@@ -1,6 +1,7 @@
 ---
   site: aox
   name: AOX
+  description: "AOX (Chippu) is a Private Torrent Tracker for ASIAN MOVIES / TV"
   language: en-us
   type: private
   encoding: UTF-8
@@ -121,4 +122,4 @@
           - name: prepend
             args: "<br>Language: "
         
-        
+        

src/Jackett/Definitions/arabafenice.yml

@@ -1,6 +1,7 @@
 ---
   site: arabafenice
   name: ArabaFenice
+  description: "Araba Fenice (Phoenix) is an ITALIAN Private site for TV / MOVIES / GENERAL"
   language: it-it
   type: private
   encoding: UTF-8

src/Jackett/Definitions/archetorrent.yml

@@ -0,0 +1,135 @@
+---
+  site: archetorrent
+  name: ArcheTorrent
+  description: "ArcheTorrent is a FRENCH Private Torrent Tracker"
+  language: fr-fr
+  type: private
+  encoding: UTF-8
+  links:
+    - https://archetorrent.com
+
+  caps:
+    categorymappings:
+      - {id: 18, cat: PC, desc: "Applications: PC"}
+      - {id: 19, cat: PC/Mac, desc: "Applications: Mac"}
+      - {id: 54, cat: PC, desc: "Applications: linux"}
+      - {id: 56, cat: XXX/Other, desc: "Autres: ebook xxx"}
+      - {id: 36, cat: Books, desc: "Autres: E-Books"}
+      - {id: 37, cat: Other, desc: "Autres: Images"}
+      - {id: 38, cat: PC/Phone-Other, desc: "Autres: Telephone-mobile"}
+      - {id: 47, cat: Movies, desc: "Films: Animé"}
+      - {id: 1, cat: Movies/DVD, desc: "Films: DVD"}
+      - {id: 2, cat: Movies/SD, desc: "Films: Dvdrip"}
+      - {id: 68, cat: Movies, desc: "Films: TAT Releases"}
+      - {id: 70, cat: Movies/HD, desc: "Films: UHD 4K"}
+      - {id: 69, cat: Movies, desc: "Films: Retro"}
+      - {id: 3, cat: Movies/HD, desc: "Films: HD1080"}
+      - {id: 42, cat: Movies/HD, desc: "Films: HD720"}
+      - {id: 4, cat: Movies, desc: "Films: Cam/Ts"}
+      - {id: 22, cat: Movies/BluRay, desc: "Films: bluray"}
+      - {id: 23, cat: Movies/3D, desc: "Films: 3D"}
+      - {id: 24, cat: Movies/Foreign, desc: "Films: VOSTFR"}
+      - {id: 25, cat: XXX, desc: "Films: Adulte"}
+      - {id: 48, cat: TV/Documentary, desc: "Films: Documentaire"}
+      - {id: 49, cat: Movies/Other, desc: "Films: Spectacle"}
+      - {id: 51, cat: Movies/SD, desc: "Films: R5"}
+      - {id: 52, cat: Movies/SD, desc: "Films: bdrip"}
+      - {id: 53, cat: Movies/SD, desc: "Films: brrip"}
+      - {id: 55, cat: Movies/DVD, desc: "Films: dvd-pack"}
+      - {id: 57, cat: Movies, desc: "Films: manga"}
+      - {id: 59, cat: Movies/WEBDL, desc: "Films: Webrip"}
+      - {id: 63, cat: Movies/SD, desc: "Films: M-HD"}
+      - {id: 10, cat: PC/Games, desc: "Jeux: PC"}
+      - {id: 11, cat: Console/Other, desc: "Jeux: PS2"}
+      - {id: 43, cat: Console/PS3, desc: "Jeux: PS3"}
+      - {id: 12, cat: Console/PSP, desc: "Jeux: PSP"}
+      - {id: 14, cat: Console/Xbox 360, desc: "Jeux: Xbox360"}
+      - {id: 44, cat: Console/Wii, desc: "Jeux: Wii"}
+      - {id: 45, cat: Console/NDS, desc: "Jeux: DS"}
+      - {id: 27, cat: Audio/Video, desc: "Musique: Clip Video"}
+      - {id: 62, cat: TV/SD, desc: "Serie tv: TV BDRip"}
+      - {id: 5, cat: TV/SD, desc: "Serie tv: Dvdrip"}
+      - {id: 41, cat: TV/HD, desc: "Serie tv: Hd"}
+      - {id: 60, cat: TV/SD, desc: "Serie tv: pack série tv"}
+      - {id: 64, cat: TV/FOREIGN, desc: "Serie tv: vostfr"}
+      - {id: 65, cat: TV/HD, desc: "Serie tv: Série tv 720P"}
+      - {id: 66, cat: TV/HD, desc: "Serie tv: Série tv 1080P"}
+      - {id: 67, cat: TV/HD, desc: "Serie tv: Série tv PackHD"}
+      - {id: 73, cat: TV/Anime, desc: "Serie tv: Anime "}
+      - {id: 72, cat: TV/Sport, desc: "Sport: sport"}
+      - {id: 61, cat: TV/SD, desc: "Tv: DVDRip"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: form:contains("Erreur")
+        message:
+          selector: form
+          remove: table
+    test:
+      path: torrents-search.php
+
+  search:
+    path: torrents-search.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "1"
+
+    rows:
+      selector: table.ttable_headinner > tbody > tr[class^="t-row"]
+    fields:
+      download:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["torrents-details.php", "download.php"]
+      date:
+        selector: td:nth-child(2) a
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "Poster le: </b>(.*?)<br />"
+          - name: dateparse
+            args: "02-01-2006"
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        filters:
+          - name: replace
+            args: [" - (Nouveau!)", ""]
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      banner:
+        selector: img.rounded-img
+        attribute: src
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(8) font b
+      seeders:
+        selector: td:nth-child(6) font b
+      leechers:
+        selector: td:nth-child(7) font b
+      downloadvolumefactor:
+        case:
+          img[title="freeleech"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/asiandvdclub.yml

@@ -1,6 +1,7 @@
 ---
   site: asiandvdclub
   name: AsianDVDClub
+  description: "AsianDVDClub is an ASIAN Private Torrent Tracker for HD MOVIES / TV"
   language: en-us
   type: private
   encoding: UTF-8

src/Jackett/Definitions/ast4u.yml

@@ -0,0 +1,110 @@
+---
+  site: ast4u
+  name: AST4u
+  description: "AST4u is a GERMAN Private site for TV / MOVIES / ANIME / HENTAI"
+  language: de-de
+  type: private
+  encoding: iso-8859-1
+  links:
+    - 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"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/index.php"
+    test:
+      path: browse.php
+
+  search:
+    path: browse.php
+    inputs:
+      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      search: "{{ .Query.Keywords }}"
+      incldead: "0"
+      orderby: "added"
+      sort: "desc"
+
+    rows:
+      selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
+    fields:
+      title:
+        selector: a[href^="details.php"]
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      details:
+        selector: a[href^="details.php"]
+        attribute: href
+      download:
+        selector: a[href^=" /gettorrent/ssl/"]
+        attribute: href
+      files:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2)
+      grabs:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1)
+      size:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1)
+        filters:
+          - name: replace
+            args: [".", ""]
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1)
+      leechers:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3)
+      date:
+        selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5)
+        filters:
+          - name: append
+            args: " +2:00"
+          - name: replace
+            args: ["\xA0", " "]
+          - name: dateparse
+            args: "02.01.2006 15:04:05 -07:00"
+      downloadvolumefactor:
+        case:
+          img[src="/pic/free.gif"]: "0"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/audiobooktorrents.yml

@@ -1,6 +1,7 @@
 ---
   site: audiobooktorrents
   name: Audiobook Torrents
+  description: "Audiobook Torrents (ABT) is a Private Torrent Tracker for AUDIOBOOKS"
   language: en-us
   type: private
   encoding: UTF-8
@@ -133,4 +134,4 @@
         selector: td[colspan=13]
         filters:
           - name: prepend
-            args: "{{ .Result.description }}<br>\n"
+            args: "{{ .Result.description }}<br>\n"

src/Jackett/Definitions/b2s-share.yml

@@ -1,6 +1,7 @@
 ---
   site: b2s-share
   name: B2S-Share
+  description: "B2S-Share is a Brazilian Private site for TV / MOVIES / GENERAL"
   language: pt-br
   type: private
   encoding: iso-8859-1

src/Jackett/Definitions/backups.yml

@@ -0,0 +1,122 @@
+  site: backups
+  name: Back-ups
+  description: "Back-Ups is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://back-ups.me/
+
+  caps:
+    categorymappings:
+      - {id: 12, cat: Console, desc: "XBOX360"}
+      - {id: 9, cat: TV, desc: "TV-Boxsets"}
+      - {id: 3, cat: PC, desc: "Apps"}
+      - {id: 24, cat: PC, desc: "Apple"}
+      - {id: 11, cat: TV, desc: "TV/x264"}
+      - {id: 23, cat: Console, desc: "Visionary"}
+      - {id: 14, cat: TV/Sport, desc: "WWE"}
+      - {id: 26, cat: Console, desc: "Xbox"}
+      - {id: 13, cat: Console, desc: "XBOX-JTAG"}
+      - {id: 35, cat: Movies/Other, desc: "Anime"}
+      - {id: 4, cat: Movies/BluRay, desc: "Blu-Ray"}
+      - {id: 6, cat: Movies, desc: "Movies/XVID"}
+      - {id: 10, cat: TV, desc: "TV/Xvid"}
+      - {id: 29, cat: TV/Sport, desc: "Sport"}
+      - {id: 40, cat: TV, desc: "Soaps"}
+      - {id: 27, cat: Console, desc: "Roms and Emulators"}
+      - {id: 30, cat: Console, desc: "Playstation"}
+      - {id: 7, cat: Audio, desc: "Music"}
+      - {id: 16, cat:  TV/Documentary, desc: "Docu"}
+      - {id: 5, cat: Books, desc: "EBooks"}
+      - {id: 38, cat: Console, desc: "Hyperspin Bolt-on Edition"}
+      - {id: 34, cat: TV, desc: "Kids"}
+      - {id: 8, cat: PC/Games, desc: "PC Games"}
+      - {id: 22, cat: PC/Games, desc: "CoinOPS"}
+      - {id: 33, cat: TV/Sport, desc: "MMA/Boxing"}
+      - {id: 32, cat:  Movies, desc: "Movie Pack"}
+      - {id: 31, cat: Console, desc: "Nintendo"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: /takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td:contains("remaining tries")
+    test:
+      path: browse.php
+      selector: a[href*="/logout.php"]
+
+  search:
+    path: browse.php
+    keywordsfilters:
+      # remove words <= 3 characters and surrounding special characters
+      - name: re_replace
+        args: ["(?:^|\\s)[_\\+\\/\\.\\-\\(\\)]*[\\S]{0,3}[_\\+\\/\\.\\-\\(\\)]*(?:\\s|$)", " "]
+    inputs:
+      do: "search"
+      keywords: "{{ .Keywords }}"
+      search_type: "t_name"
+      category: "0" # multi cat search not supported
+      include_dead_torrents: "yes"
+    rows:
+      selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
+      filters:
+        - name: andmatch
+          args: 66
+    fields:
+      title:
+        selector: a[href*="/details.php?id="]
+      title:
+        optional: true
+        selector: div.tooltip-content > div
+      details:
+        selector: a[href*="/details.php?id="]
+        attribute: href
+      download:
+        selector: a[href*="/download.php?id="]
+        attribute: href
+      magnet:
+        selector: a[href^="magnet:?xt="]
+        attribute: href
+      category:
+        selector: a[href*="/browse.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      date:
+        selector: "td:nth-child(2) > div:has(span[style=\"float: right;\"])"
+        remove: span
+        filters:
+          - name: append
+            args: " +00:00"
+          - name: dateparse
+            args: "02-01-2006 15:04 -07:00"
+      banner:
+        optional: true
+        selector: div.tooltip-content > img
+        attribute: src
+      downloadvolumefactor:
+        case:
+          img[alt^="Free Torrent "]: "0"
+          img[alt^="Silver Torrent "]: "0.5"
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/bithq.yml

@@ -1,6 +1,7 @@
 ---
   site: bithq
   name: BitHQ
+  description: "BitHQ is a Private Torrent Tracker for DVD-R / BLURAY MOVIES / TV"
   language: en-us
   type: private
   encoding: windows-1252
@@ -90,4 +91,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/bithumen.yml

@@ -1,6 +1,7 @@
----
+---
   site: bithumen
   name: BitHUmen
+  description: "BitHUmen is a Hungarian Private site for TV / MOVIES / GENERAL"
   language: hu-hu
   type: private
   encoding: ISO-8859-2
@@ -72,7 +73,8 @@
         attribute: href
       title:
         selector: a[href^="details.php?id="]
-      title|optional:
+      title:
+        optional: true
         selector: a[href^="details.php?id="]
         attribute: title
       details:
@@ -108,14 +110,16 @@
         selector: td:nth-child(6) > u
       downloadvolumefactor:
         text: "1"
-      downloadvolumefactor|optional:
+      downloadvolumefactor:
+        optional: true
         selector: td:nth-child(6) > nobr > font:contains(" × ")
         filters:
           - name: replace
             args: ["×", ""]
       uploadvolumefactor:
         text: "1"
-      uploadvolumefactor|optional:
+      uploadvolumefactor:
+        optional: true
         selector: td:nth-child(5) > nobr > font:contains(" × ")
         filters:
           - name: replace
@@ -131,4 +135,3 @@
       
       description:
         selector: td:nth-child(2) > div
-        

src/Jackett/Definitions/bitspyder.yml

@@ -1,6 +1,7 @@
----
+---
   site: bitspyder
   name: Bitspyder
+  description: "Bitspyder is a Private site for Educational BOOKS / AUDIO"
   language: en-us
   type: private
   encoding: windows-1252
@@ -94,7 +95,7 @@
       files:
         selector: a[href*="&filelist=1"]
       grabs:
-        selector: td.rowcol:nth-child(7):has(br)
+        selector: td.rowcol:nth-child(7):has(br), td.clear:nth-child(4)
         filters:
           - name: regexp
             args: ([\d,]+)
@@ -102,7 +103,8 @@
         selector: td.rowcol:nth-last-child(3)
       leechers:
         selector: td.rowcol:nth-last-child(2)
-      date|optional|1:
+      date:
+        optional: true
         selector: font[color="5F5F5F"]
         filters:
           - name: split
@@ -113,7 +115,8 @@
             args: " +00:00"
           - name: dateparse 
             args: "2006-01-02 15:04:05 -07:00"
-      date|optional|2:
+      date:
+        optional: true
         selector: a[title^="Upploaded at"]
         attribute: title
         filters:
@@ -129,5 +132,6 @@
       uploadvolumefactor:
         case:
           "*": "1"
-      description|optional:
+      description:
+        optional: true
         selector: font[color="#990000"]

src/Jackett/Definitions/bluebird.yml

@@ -1,6 +1,7 @@
 ---
   site: bluebirdhd
   name: BlueBird
+  description: "BlueBird is a RUSSIAN Private Torrent Tracker for HD MOVIES"
   language: ru-ru
   type: private
   encoding: windows-1251

src/Jackett/Definitions/blutopia.yml

@@ -16,6 +16,8 @@
 
     modes:
       search: [q]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   login:
     path: /login
@@ -28,56 +30,74 @@
     test:
       path: /torrents
 
-  download:
-    selector: a[href^="/download.php/"]
-        
   search:
-    path: /torrents/search
+    path: /filter
     inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      name: "{{ .Query.Keywords }}"
-      category_id: 1
-      type: BD50
-      order: created_at:desc
+      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
+      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      imdb: "{{ .Query.IMDBIDShort }}"
+      tvdb: ""
+      tmdb: ""
+      sorting: created_at
+      direction: desc
+      qty: 100
+    preprocessingfilters:
+      - name: jsonjoinarray
+        args: ["$.result", ""]
+      - name: prepend
+        args: "<table>"
+      - name: append
+        args: "</table>"
     rows:
-      selector: table.table > tbody > tr
+      selector: tr
     fields:
-      # category:
-      #   selector: a[href^="categories"]
-      #   attribute: href
+      category:
+        selector: a[href*="/categories/"]
+        attribute: href
+        filters:
+          - name: strdump
+          - name: regexp
+            args: "/categories/.*?\\.(\\d+)"
+          - name: strdump
       title:
-        remove: ul
-        selector: td:nth-child(2)
-      download:
         selector: a.view-torrent
+      download:
+        selector: a[href*="/download_check/"]
         attribute: href
         filters:
           - name: replace
-            args: ["/torrents/", "/download/"]
+            args: ["/download_check/", "/download/"]
       details:
         selector: a.view-torrent
         attribute: href
+      imdb:
+        optional: true
+        selector: a[href*="://www.imdb.com/title/"]
+        attribute: href
       size:
-        selector: td:nth-child(4)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
-      grabs:
         selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      grabs:
+        selector: td:nth-child(6)
         filters:
           - name: regexp
-            args: (\d+)
+            args: ([\d\.]+)
       date:
-        selector: td:nth-child(3)
+        selector: time
+        attribute: datetime
         filters:
           - name: append
-            args: " ago"
+            args: " +00:00"
+          - name: dateparse
+            args: "2006-01-02 15:04:05 -07:00"
       downloadvolumefactor:
         case:
-          #"i[data-original-title=\"100% Free\"]": "0"
+          "i[data-original-title=\"100% Free\"]": "0"
           "*": "1"
       uploadvolumefactor:
         case:
-          #"i[data-original-title=\"Double upload\"]": "2"
+          "i[data-original-title=\"Double upload\"]": "2"
           "*": "1"

src/Jackett/Definitions/btbit.yml

@@ -0,0 +1,58 @@
+---
+  site: btbit
+  name: btbit
+  description: "btbit is a public magnet search engine for MOVIES / GENERAL. This definition is for the English site."
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - http://en.btbit.org/
+
+  caps:
+    categories:
+      "Movie": Movies
+      "Package": PC/0day
+      "Other": Other
+      "Software": PC
+      "Mirror": PC/ISO
+      "Music": Audio
+      "Picture": Other/Misc
+      "Document": Books
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}.html"
+    rows:
+      selector: .rs
+    fields:
+      title:
+        selector: .title
+      category:
+        selector: .sbar span[class^="cpill"]
+      details:
+        selector: .title h3 a
+        attribute: href
+      download:
+        selector: .sbar a[href^="magnet:?xt"]
+        attribute: href
+      date:
+        selector: .sbar span:nth-of-type(3) b
+        filters:
+          - name: dateparse 
+            args: "2006-01-02"
+      size:
+        selector: .sbar span:nth-of-type(4) b
+      files:
+        selector: .sbar span:nth-of-type(5) b
+      grabs:
+        selector: .sbar span:nth-of-type(6) b
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/btdb.yml

@@ -0,0 +1,77 @@
+---
+  site: btdb
+  name: BTDB
+  description: "BTDB is a Public BitTorrent DHT search engine. Torrents can be downloaded via magnet links"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    -  https://btdb.to/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Other, desc: "Other"}
+      - {id: 2, cat: TV, desc: "TV"}
+      - {id: 3, cat: Movies, desc: ""}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: info
+      type: info
+      label: Category for Sonarr and Radarr
+      default: BTDB does not use categories. In your Sonarr or Radarr Torznab Indexer settings, set the category to 100001.
+
+  search:
+    path: "{{if .Keywords}}q/{{ .Keywords}}/?sort=time{{else}}recent{{end}}"
+    rows:
+      selector: li[class$="item"]
+    fields:
+      title:
+        selector: h2[class$="title"] a[href^="/torrent/"]
+        attribute: title
+      category:
+        text: "1"
+      details:
+        selector: h2[class$="title"] a[href^="/torrent/"]
+        attribute: href
+      magnet:
+        selector: div[class$="info"] a[href^="magnet:"]
+        attribute: href
+      date:
+        selector: div[class$="info"]
+        filters:
+          - name: split
+            args: ["\n", 3]
+          - name: replace
+            args: ["AddTime: ", ""]
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      size:
+        selector: div[class$="info"]
+        filters:
+          - name: split
+            args: ["\n", 1]
+          - name: replace
+            args: ["Size: ", ""]
+      files:
+        selector: div[class$="info"]
+        filters:
+          - name: split
+            args: ["\n", 2]
+          - name: replace
+            args: ["Files: ", ""]
+      grabs:
+        selector: div[class$="info"]
+        filters:
+          - name: split
+            args: ["\n", 4]
+          - name: replace
+            args: ["Popularity: ", ""]
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/btnext.yml

@@ -1,6 +1,7 @@
 ---
   site: btnext
   name: BTNext
+  description: "BTNext (BTNT) is a PORTUGUESE Private Torrent Tracker for 0DAY / GENERAL"
   language: pt-pt
   type: private
   encoding: UTF-8

src/Jackett/Definitions/carpathians.yml

@@ -1,6 +1,7 @@
 ---
   site: carpathians
   name: Carpathians
+  description: "Carpathians is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
   language: hu-hu
   type: private
   encoding: UTF-8

src/Jackett/Definitions/chdbits.yml

@@ -1,4 +1,4 @@
----
+---
   site: chdbits
   name: CHDBits
   description: "A general tracker"
@@ -54,7 +54,8 @@
     fields:
       title:
         selector: a[href^="details.php?id="]
-      title|optional:
+      title:
+        optional: true
         selector: a[title][href^="details.php?id="]
         attribute: title
       category:

src/Jackett/Definitions/cpabien.yml

@@ -1,11 +1,16 @@
 ---
   site: cpasbien
   name: cpasbien
+  description: "cpasbien is a FRENCH Public site for TV / MOVIES / GENERAL"
   language: fr-fr
   type: public
   encoding: UTF-8
   links:
+    - http://cpabien.la/
+  legacylinks:
+    - http://cpabien.org/
     - http://cpabien.cc/
+    - http://cpabien.co/
 
   caps:
     categorymappings:
@@ -72,6 +77,8 @@
             args: [ " To", "000000000000"]
           - name: replace
             args: [ "X", "" ]
+      date:
+        text: "now"
       seeders:
         text: 0
       seeders:
@@ -85,4 +92,4 @@
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
-        text: "1"
+        text: "1"

src/Jackett/Definitions/czteam.yml

@@ -1,6 +1,7 @@
 ---
   site: czteam
   name: CZTeam
+  description: "CZTeam (CZT) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: cs-cz
   type: private
   encoding: UTF-8
@@ -91,4 +92,4 @@
           "*": "1"
       description:
         selector: div.torrent_info
-        remove: strong
+        remove: strong

src/Jackett/Definitions/cztorrent.yml

@@ -1,6 +1,6 @@
----
-  site: cztorrent
+  site: cztorrent
   name: CzTorrent
+  description: "CzTorrent is a Czech Semi-Private site for TV / MOVIES / GENERAL"
   language: cs-cz
   type: semi-private
   encoding: UTF-8
@@ -65,6 +65,16 @@
         filters:
           - name: re_replace
             args: [".*? / ", ""]
+          - name: diacritics
+            args: replace
+          - name: replace
+            args: ["serie", ""] 
+          - name: replace
+            args: ["Serie", ""] 
+          - name: re_replace
+            args: ["(\\d{2})\\.", "S$1"]
+          - name: re_replace
+            args: ["(\\d{1})\\.", "S0$1"]
       category:
         selector: td:nth-child(2)
         case:
@@ -113,6 +123,8 @@
             args: "Přidán: (.+?) ?$"
           - name: append
             args: " +02:00"
+          - name: dateparse 
+            args: "2.1.2006 15:04 -07:00"
       seeders:
         selector: td:nth-child(7) span
       leechers:
@@ -122,4 +134,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/datascene.yml

@@ -1,6 +1,7 @@
 ---
   site: datascene
   name: DataScene
+  description: "DataScene (DS) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: ro-ro
   type: private
   encoding: windows-1252
@@ -123,4 +124,4 @@
           "*": "1"
       description:
         selector: td:nth-child(2) > right
-        remove: div
+        remove: div

src/Jackett/Definitions/deildu.yml

@@ -1,6 +1,7 @@
 ---
   site: deildu
   name: Deildu
+  description: "Deildu is an Icelandic Semi-Private site for TV / MOVIES / GENERAL"
   language: is-is
   type: semi-private
   encoding: iso-8859-1

src/Jackett/Definitions/diablotorrent.yml

@@ -1,6 +1,7 @@
----
+---
   site: diablotorrent
   name: Diablo Torrent
+  description: " Diablo Torrent is a Hungarian Private site for TV / MOVIES / GENERAL"
   language: hu-hu
   type: private
   encoding: UTF-8
@@ -114,13 +115,15 @@
             args: "2006-01-0215:04:05 -07:00"
       size:
         selector: div.box_size
-      banner|optional:
+      banner:
+        optional: true
         selector: a.cover_a
         attribute: title
         filters:
           - name: regexp
             args: src='(.*?)' 
-      imdb|optional:
+      imdb:
+        optional: true
         selector: a[href^="http://www.imdb.com/title/"]
         attribute: href
       description:

src/Jackett/Definitions/dragonworldreloaded.yml

@@ -1,6 +1,7 @@
 ---
   site: dragonworldreloaded
   name: Dragonworld Reloaded
+  description: "Dragonworld Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: de-de
   type: private
   encoding: UTF-8

src/Jackett/Definitions/dreamteam.yml

@@ -1,10 +1,13 @@
 ---
   site: dreamteam
   name: Dream Team
+  description: "Dream Team is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: el-gr
   type: private
   encoding: UTF-8
   links:
+    - http://dream-team.ga/
+  legacylinks:
     - http://dream-team.ml/
 
   caps:
@@ -249,7 +252,7 @@
       - selector: td:contains("remaining tries")
     test:
       path: browse.php
-      selector: a[href^="http://dream-team.ml/logout.php"]
+      selector: a[href*="/logout.php"]
 
   download:
     before:
@@ -271,29 +274,32 @@
       category: "0" # multi cat search not supported
       include_dead_torrents: "yes"
     rows:
-      selector: table#sortabletable > tbody > tr:has(a[href^="http://dream-team.ml/details.php?id="])
+      selector: table#sortabletable > tbody > tr:has(a[href*="/details.php?id="])
       filters:
         - name: andmatch
           args: 66
     fields:
       download:
-        selector: a[href^="http://dream-team.ml/download.php?id="]
+        selector: a[href*="/download.php?id="]
         attribute: href
       title:
-        selector: a[href^="http://dream-team.ml/details.php?id="]
-      title|optional:
+        selector: a[href*="/details.php?id="]
+      title:
+        optional: true
         selector: div.tooltip-content > div
       details:
-        selector: a[href^="http://dream-team.ml/details.php?id="]
+        selector: a[href*="/details.php?id="]
         attribute: href
       category:
-        selector: a[href^="http://dream-team.ml/browse.php?category="]
+        selector: a[href*="/browse.php?category="]
         attribute: href
         filters:
           - name: querystring
             args: category
-      banner|optional:
+      banner:
+        optional: true
         selector: div.tooltip-content > img
+        attribute: src
       size:
         selector: td:nth-child(5)
       grabs:

src/Jackett/Definitions/elitehd.yml

@@ -1,11 +1,12 @@
----
-  site: hdclub
-  name: HDClub
+---
+  site: elitehd
+  name: EliteHD
+  description: "EliteHD (HDClub) is a RUSSIAN Private Torrent Tracker for HD MOVIES / TV / GENERAL"
   language: ru-ru
   type: private
   encoding: windows-1251
   links:
-    - http://hdclub.org
+    - https://elitehd.org/
 
   caps:
     categorymappings:
@@ -95,4 +96,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/estone.yml

@@ -1,6 +1,7 @@
 ---
   site: estone
   name: eStone
+  description: "eStone (XiDER, BeLoad) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
   language: hu-hu
   type: private
   encoding: UTF-8

src/Jackett/Definitions/ethor.yml

@@ -52,6 +52,8 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
       secure_cookie: "0"
+    error:
+      - selector: :contains("\"status\":\"error\"")
     test:
       path: browse.php
 

src/Jackett/Definitions/eztv.yml

@@ -1,6 +1,7 @@
 ---
   site: eztv
   name: EZTV
+  description: "EZTV is a Public torrent site for TV shows"
   language: en-us
   type: public
   encoding: UTF-8
@@ -43,7 +44,8 @@
       download:
         selector: td:nth-child(3) a.magnet, td:nth-child(3) a
         attribute: href
-      size|optional:
+      size:
+        optional: true
         selector: td:nth-child(4)
       date:
         selector: td:nth-child(5)

src/Jackett/Definitions/fanoin.yml

@@ -1,6 +1,7 @@
 ---
   site: fanoin
   name: FANO.IN
+  description: "Fano.in is a LATVIAN Private Torrent Tracker for 0DAY / GENERAL"
   language: lv-lv
   type: private
   encoding: UTF-8

src/Jackett/Definitions/freedomhd.yml

@@ -1,6 +1,7 @@
 ---
   site: freedomhd
   name: Freedom-HD
+  description: "Freedom-HD (Freedom Paradise) is a ratioless FRENCH Private Torrent Tracker for HD MOVIES / GENERAL"
   language: fr-fr
   type: private
   encoding: UTF-8
@@ -137,4 +138,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/fullmixmusic.yml

@@ -1,6 +1,7 @@
 ---
   site: fullmixmusic
   name: FullMixMusic
+  description: "FullMixMusic is a HUNGARIAN Private Torrent Tracker for MUSIC"
   language: hu-hu
   type: private
   encoding: UTF-8

src/Jackett/Definitions/funkytorrents.yml

@@ -1,6 +1,7 @@
----
+---
   site: funkytorrents
   name: FunkyTorrents
+  description: "FunkyTorrents (FT) is a Private Torrent Tracker for MUSIC"
   language: en-us
   type: private
   encoding: UTF-8
@@ -72,7 +73,8 @@
     rows:
       selector: table.mainouter > tbody > tr > td.outer > table > tbody > tr.mouse_out
     fields:
-      description|optional:
+      description:
+        optional: true
         selector: td:nth-child(2) > font
       title:
         selector: td:nth-child(2)
@@ -83,7 +85,8 @@
         filters:
           - name: querystring
             args: cat
-      category|optional:
+      category:
+        optional: true
         case:
           a[href="/browse.php?ext=1&bitrate=Lossless"]: "3040"
           a[href="/browse.php?ext=1&format=MP3"]: "3010"
@@ -116,4 +119,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/gfxpeers.yml

@@ -1,6 +1,7 @@
 ---
   site: gfxpeers
   name: GFXPeers
+  description: "GFXPeers is a ratio-based torrent tracker for all things graphic design and visual effects"
   language: en-us
   type: private
   encoding: UTF-8

src/Jackett/Definitions/gigatorrents.yml

@@ -1,6 +1,7 @@
 ---
   site: gigatorrents
   name: GigaTorrents
+  description: "Giga Torrents is a Hungarian Private site for TV / MOVIES / GENERAL"
   language: hu-hu
   type: private
   encoding: UTF-8
@@ -140,4 +141,4 @@
       size:
         selector: td:nth-child(6)
         remove: span
-        
+        

src/Jackett/Definitions/gktorrent.yml

@@ -1,20 +1,28 @@
 ---
-  site: zetorrents
-  name: zetorrents
+  site: gktorrent
+  name: GkTorrent
+  description: "GkTorrent is a French Public site for TV / MOVIES / GENERAL"
   language: fr-fr
   type: public
   encoding: UTF-8
   links:
-    - http://www.zetorrents.cc/
+    - http://www.gktorrent.com
+  legacylinks:
+    - https://www.gktorrent.com # they're forcing http
 
   caps:
     categorymappings:
-      - {id: films, cat: Movies, desc: "Movies"}
-      - {id: series, cat: TV, desc: "TV"}
+      - {id: movies, cat: Movies, desc: "Movies"}
+      - {id: tvshows, cat: TV, desc: "TV Shows"}
+      - {id: softwares, cat: PC, desc: "Softwares"}
+      - {id: music, cat: Audio, desc: "Music"}
+      - {id: games, cat: Console, desc: "Games"}
+      - {id: books, cat: Books, desc: "Books"}
 
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings: []
 
@@ -22,9 +30,9 @@
     selector: a[href^="/get_torrent/"]
 
   search:
-    path: "/recherche/{{ .Query.Keywords }}"
+    path: "{{if .Keywords}}/recherche/{{.Keywords}}{{else}}{{end}}"
     rows:
-      selector: div.content-list-torrent > table tbody tr:has(a)
+      selector: div.listing-torrent > table > tbody > tr:has(a)
     fields:
       site_date:
         selector: td:nth-child(1) a
@@ -53,36 +61,22 @@
         attribute: href
       size:
         selector: td:nth-child(2)
-        filters:
-          - name: re_replace
-            args: [ "\\.(\\d) Ko", "$1X00"]
-          - name: re_replace
-            args: [ " Ko", "000"]
-          - name: re_replace
-            args: [ "\\.(\\d) Mo", "$1X00000"]
-          - name: re_replace
-            args: [ " Mo", "000000"]
-          - name: re_replace
-            args: [ "\\.(\\d) Go", "$1X00000000"]
-          - name: re_replace
-            args: [ " Go", "000000000"]
-          - name: re_replace
-            args: [ "\\.(\\d) To", "$1X00000000000"]
-          - name: re_replace
-            args: [ " To", "000000000000"]
-          - name: replace
-            args: [ "X", "" ]
-      seeders:
-        text: 0
       seeders:
         selector: td:nth-child(3)
-        optional: true
-      leechers:
-        text: 0
       leechers:
         selector: td:nth-child(4)
-        optional: true
       downloadvolumefactor:
         text: "0"
       uploadvolumefactor:
         text: "1"
+      category:
+        selector: td:nth-child(1) > i
+        case:
+          .Films: "movies"
+          .Séries: "tvshows"
+          .Logiciels: "softwares"
+          .Musiques: "music"
+          .Jeux: "games"
+          .Ebooks: "books"
+      date:
+        text: "now"

src/Jackett/Definitions/gods.yml

@@ -1,6 +1,7 @@
 ---
   site: gods
   name: GODS
+  description: "GODS is a German Private site for TV / MOVIES / GENERAL"
   language: de-de
   type: private
   encoding: windows-1252
@@ -159,4 +160,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/gormogon.yml

@@ -1,6 +1,7 @@
 ---
   site: gormogon
   name: Gormogon
+  description: "Gormogon is a Private Torrent Tracker for CLASSIC MOVIES / TV / GENERAL"
   language: en-us
   type: private
   encoding: UTF-8
@@ -190,4 +191,4 @@
           img[alt="8x Upload Multiplier"]: "8"
           img[alt="9x Upload Multiplier"]: "9"
           img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/greekteam.yml

@@ -2,6 +2,7 @@
   site: greekteam
   name: Greek Team
   language: el-gr
+  description: "Greek Team is a GREEK Private site for TV / MOVIES / GENERAL"
   type: private
   encoding: windows-1253
   links:

src/Jackett/Definitions/hdhome.yml

@@ -1,6 +1,7 @@
 ---
   site: hdhome
   name: HDHome
+  description: "HDHome (HDBiger) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
   language: zh-cn
   type: private
   encoding: UTF-8
@@ -139,4 +140,4 @@
           "*": "1"
       description:
         selector: td:nth-child(2)
-        remove: a, img
+        remove: a, img

src/Jackett/Definitions/hdme.yml

@@ -1,6 +1,7 @@
 ---
   site: hdme
   name: HDME
+  description: "HDME is a Private Torrent Tracker for HD MOVIES / TV / GENERAL"
   language: en-us
   type: private
   encoding: windows-1252

src/Jackett/Definitions/hdtorrentsit.yml

@@ -1,6 +1,7 @@
 ---
   site: hdtorrentsit
   name: HDTorrents.it
+  description: "HDTorrents.it is an ITALIAN Private site for TV / MOVIES"
   language: it-it
   type: private
   encoding: UTF-8
@@ -31,34 +32,71 @@
     paths:
       - path: browse.php
         method: post
+    keywordsfilters:
+      - name: re_replace
+        args: ["[^a-zA-Z0-9]+", "%"]
+      - name: diacritics
+        args: replace
+      - name: re_replace #remove SXXEYY from research
+        args: ["(S\\d{1,2}E\\d{1,2})", ""]
+      - name: re_replace #remove SXX from research
+        args: ["(S\\d{1,2})", ""]
     inputs:
       ajax: false
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
       incldead: 0
     rows:
       selector: tbody#highlighted tr
     fields:
-      title-no-filters:
-        selector: td:nth-child(2) a:nth-child(1)
       title:
         selector: td:nth-child(2) a:nth-child(1)
         filters:
+          - name: re_replace #separate title
+            args: ["(\\s+\\/\\s+|\\/\\s+|\\s+\\/|\\/)(.*)\\s\\(", " ("]
+          - name: re_replace #remove (yyyy) from the title
+            args: ["(\\(\\d{4}\\))|(\\(\\d{4})", ""]
+          - name: re_replace #remove |
+            args: ["(\\s\\|\\s)", " "]
+          - name: re_replace #Stagione X --> S0X
+            args: ["Stagione (\\d{0,1}\\s)", "S0$1"]
+          - name: re_replace #Stagione XX --> SXX
+            args: ["Stagione (\\d{2}\\s)", "S$1"]
+          - name: re_replace #/ Episodio [YY-YY --> EYY-YY
+            args: ["(\\s\\/\\sEpisodio|\\s\\/\\sEpisodi|\\sEpisodio|\\s\\|\\sEpisodio|\\sEpisodi)\\s\\[", "E"]
+          - name: re_replace #/ Completa [episodi  YY-YY --> EYY-YY
+            args: ["(\\s\\/\\sCompleta\\s\\[episodi\\s)", "E"]
+          - name: re_replace #remove  di YY] | remove /YY]
+            args: ["(\\sdi\\s\\d{1,2}|\\/\\d{1,2})\\]", " "]
+          - name: re_replace #remove various
+            args: ["(Serie completa|Completa|\\[in pausa\\])", ""]
+      title|append: #start year
+        text: "("
+      title|append: #add year
+        selector: td:nth-child(2) a:nth-child(1)
+        filters:
+          - name: regexp #find torrent year
+            args: (\d{4})
+      title|append: #end year
+        text: ") "
+      title|append: #start quality TAG
+        text: "["
+      title|append: #quality TAG (BDRip 1080, BDRip 720p etc)
+        selector: td:nth-child(1) a:nth-child(1) img
+        attribute: alt
+      title|append: #separator
+        text: " - "
+      title|append: #ita audio TAG
+        selector: a[href^="download.php?id="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: name
+          - name: regexp
+            args: (DTS AC3 ITA|DTS ITA|AC3 ITA)
           - name: re_replace
-            args: ["Stagione (\\d{0,1})", "S0$1"]
-          - name: re_replace
-            args: ["Stagione (\\d{2})", "S$1"]
-          - name: re_replace
-            args: ["Episodio{0,1} \\[(\\d{0,1})", "E0$1"]
-          - name: re_replace
-            args: ["Episodio{0,1} \\[(\\d{2})", "E$1"]
-          - name: re_replace
-            args: ["-(\\d{0,1}) ", "-0$1 "]
-          - name: re_replace
-            args: ["-(\\d{2}) ", "-$1 "]
-          - name: re_replace
-            args: ["(\\d) *\\/ *(E)", "$1$2"]
-          - name: replace
-            args: ["]", ""]
+            args: ["ITA", ""]
+      title|append: #end TAG
+        text: "ITA]"
       details:
         selector: td:nth-child(2) a:nth-child(1)
         attribute: href
@@ -86,8 +124,10 @@
       date:
         selector: td:nth-child(2) i
         filters:
+          - name: append
+            args: " +02:00"
           - name: dateparse
-            args: "2006-02-01 15:04:05"
+            args: "2006-01-02 15:04:05 -07:00"
       category:
         case:
           "a[href^=\"details.php\"]:contains(\"Stagione\")": 5040 # TV/HD

src/Jackett/Definitions/hon3yhd.yml

@@ -1,6 +1,7 @@
----
+---
   site: hon3yhd
   name: Hon3y HD
+  description: "Hon3yHD is an INDIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: en-us
   type: private
   encoding: UTF-8
@@ -68,9 +69,15 @@
     path: /browse.php
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      search: "{{ .Keywords }}"
       searchin: "title"
       incldead: "1"
+    keywordsfilters:
+      # by default the search returns unordered resuts of an OR query making the results useless in many cases, adding + to the keywords improves the situration (Issue #1859)
+      - name: re_replace # replace special characters with " +"
+        args: ["[^\\w\\d]+", " +"]
+      - name: prepend
+        args: "+"
     rows:
       selector: table > tbody > tr.tt
     fields:
@@ -88,7 +95,8 @@
       download:
         selector: a[href^="download.php?torrent="]
         attribute: href
-      banner|optional:
+      banner:
+        optional: true
         selector: a[href^="details.php?id="]
         attribute: onmouseover
         filters:

src/Jackett/Definitions/hyperay.yml

@@ -1,10 +1,13 @@
 ---
   site: hyperay
   name: Hyperay
+  description: "Hyperay is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
   language: zh-cn
   type: private
   encoding: UTF-8
   links:
+    - https://www.hyperay.org
+  legacylinks:
     - https://www.hyperay.cc
 
   caps:

src/Jackett/Definitions/icetorrent.yml

@@ -1,6 +1,7 @@
 ---
   site: icetorrent
   name: ICE Torrent
+  description: "ICE Torrent is a ratioless ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
   language: ro-ro
   type: private
   encoding: UTF-8

src/Jackett/Definitions/idope.yml

@@ -0,0 +1,101 @@
+---
+  site: idope
+  name: Idope
+  description: "iDope is a Public torrent search engine presenting direct magnet links"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://idope.se/
+
+  caps:
+    categorymappings:
+      - {id: 0, cat: Other, desc: "Others"}
+      - {id: 1, cat: Movies, desc: "Movies"}
+      - {id: 2, cat: Other, desc: "Video"}
+      - {id: 3, cat: TV, desc: "TV"}
+      - {id: 4, cat: TV/Anime, desc: "Anime"}
+      - {id: 5, cat: XXX, desc: "XXX"}
+      - {id: 6, cat: Audio, desc: "Music"}
+      - {id: 7, cat: PC/Games, desc: "Games"}
+      - {id: 8, cat: PC, desc: "Apps"}
+      - {id: 9, cat: Books, desc: "Books"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: itorrents-links
+      type: checkbox
+      label: Add download links via itorrents.org
+    - name: info
+      type: info
+      label: ITorrents Note
+      default: Without the itorrents option only magnet links will be provided.
+
+  search:
+    # present trending results if there are no search parms supplied
+    # sort torrent-list by age in descending order
+    path: "{{if .Keywords}}torrent-list/{{ .Keywords}}?&o=-3&c={{range .Categories }}{{.}}{{end}}{{else}}browse.html{{end}}"
+    rows:
+      selector: div[class="resultdiv"]
+    fields:
+      title:
+        selector: div[class="resultdivtop"] a div[class="resultdivtopname"]
+      category:
+        optional: true
+        selector:  div[class="resultdivbotton"] div[class="resultdivbottoncategory"]
+        case:
+          ":contains(\"Others\")": 0
+          ":contains(\"Movies\")": 1
+          ":contains(\"Video\")": 2
+          ":contains(\"TV\")": 3
+          ":contains(\"Anime\")": 4
+          ":contains(\"XXX\")": 5
+          ":contains(\"Music\")": 6
+          ":contains(\"Games\")": 7
+          ":contains(\"Apps\")": 8
+          ":contains(\"Books\")": 9
+      details:
+        selector: div[class="resultdivtop"] a
+        attribute: href
+      download-itorrents:
+        selector: div[class="resultdivbotton"] div[id^="hideinfohash"]
+        filters:
+          - name: toupper
+          - name: prepend
+            args: http://itorrents.org/torrent/
+          - name: append
+            args: ".torrent"
+      download:
+        text: "{{if .Config.itorrents-links}}{{ .Result.download-itorrents }}{{else}}{{end}}"
+      magfile:
+        text: "{{ .Result.title }}"
+        filters:
+          - name: validfilename
+          - name: urlencode
+      magnet:
+        selector: div[class="resultdivbotton"] div[id^="hideinfohash"]
+        filters:
+          - name: prepend
+            args: "magnet:?xt=urn:btih:"
+          - name: append
+            args: "&dn={{ .Result.magfile }}.torrent"
+          - name: append
+            args: "&tr=http://182.176.139.129:6969/announce&tr=http://explodie.org:6969/announce&tr=http://tracker.mgtracker.org:2710/announce&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.leechers-paradise.org:6969/announce&tr=udp://tracker.pirateparty.gr:6969/announce&tr=udp://tracker.sktorrent.net:6969/announce&tr=udp://tracker.zer0day.to:1337/announce"
+      date:
+        selector: div[class="resultdivbotton"] div[class="resulttime"] div[class="resultdivbottontime"]
+        filters:
+          - name: timeago
+      size:
+        selector: div[class="resultdivbotton"] div[class="resultlength"] div[class="resultdivbottonlength"]
+      seeders:
+        selector: div[class="resultdivbotton"] div[class="resultseed"] div[class="resultdivbottonseed"]
+      files:
+        selector: div[class="resultdivbotton"] div[class="resultfile"] div[class="resultdivbottonfiles"]
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/ilcorsaronero.yml

@@ -1,13 +1,14 @@
 ---
   site: ilcorsaronero
   name: Il Corsaro Nero
+  description: "Il Corsaro Nero is an ITALIAN Public site for TV / MOVIES / GENERAL"
   language: it-it
   type: public
   encoding: UTF-8
   links:
     - https://ilcorsaronero.info/
   certificates:
-    - FFB230323B987B07C24DCC13BC892CF30536F015 # incomplete CA chain
+    - 8D4B5B12D12693F29271C6A0A65ACB3DF6029202 # incomplete CA chain
 
   caps:
     categorymappings:

src/Jackett/Definitions/infinityt.yml

@@ -1,6 +1,7 @@
 ---
   site: infinityt
   name: Infinity-T
+  description: "Infinity-T is a DANISH Private Torrent Tracker for 0DAY / GENERAL"
   language: da-dk
   type: private
   encoding: UTF-8
@@ -103,4 +104,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/inperil.yml

@@ -1,6 +1,7 @@
 ---
   site: inperil
   name: inPeril
+  description: "InPeril is a LATVIAN Private Torrent Tracker for 0DAY / GENERAL"
   type: private
   language: lv-lv
   type: private

src/Jackett/Definitions/insanetracker.yml

@@ -1,6 +1,7 @@
----
+---
   site: insanetracker
   name: Insane Tracker
+  description: "Insane Tracker is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
   language: hu-hu
   type: private
   encoding: UTF-8
@@ -80,13 +81,16 @@
       download:
         selector: a[href^="download.php/"]
         attribute: href
-      imdb|optional:
+      imdb:
+        optional: true
         selector: a[title="IMDb link"]
         attribute: href
-      banner|optional|1:
+      banner:
+        optional: true
         selector: img[alt="offer"]
         attribute: src
-      banner|optional|2:
+      banner:
+        optional: true
         selector: a.cover
         attribute: href
       files:

src/Jackett/Definitions/isohunt.yml

@@ -1,61 +0,0 @@
----
-  site: isohunt
-  name: Isohunt
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - https://isohunt.to/
-
-  caps:
-    categories:
-      "series+&+tv": TV
-      "movies": Movies
-      "other": Other/Misc
-      "music": Audio
-      "games": PC/Games
-      "software": PC/0day
-      "anime": TV/Anime
-      "adult": XXX
-      "books": Other
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-
-  settings: []
-
-  download:
-    selector: a.btn-download
-      
-  search:
-    path: "{{if .Query.Keywords}}torrents/{{else}}latest.php{{end}}"
-    inputs:
-      ihq: "{{ .Keywords }}"
-    rows:
-      selector: "#serps > table > tbody > tr:has(td.title-row)"
-    fields:
-      title:
-        selector: td.title-row > a[href^="/"] > span
-      details:
-        selector: td.title-row > a[href^="/"]
-        attribute: href
-      download:
-        selector: td.title-row > a[href^="/"]
-        attribute: href
-      size:
-        selector: td.size-row
-      seeders:
-        selector: td.sy, td.sn
-      date:
-        selector: td.date-row
-        filters:
-          - name: append
-            args: " ago"
-      category:
-        selector: td.category-row > span
-        attribute: title
-      downloadvolumefactor:
-        text: "0"
-      uploadvolumefactor:
-        text: "1"

src/Jackett/Definitions/jpopsuki.yml

@@ -1,6 +1,7 @@
 ---
   site: jpopsuki
   name: JPopsuki
+  description: "JPopSuki is a Private Torrent Tracker for ASIAN MUSIC"
   language: en-us
   type: private
   encoding: UTF-8
@@ -102,4 +103,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/kapaki.yml

@@ -1,6 +1,7 @@
----
+---
   site: kapaki
   name: Kapaki
+  description: "Kapaki is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: el-gr
   type: private
   encoding: UTF-8
@@ -108,7 +109,8 @@
         selector: a[rel="torrent_leechers"]
       grabs:
         selector: a[rel="times_completed"]
-      banner|optional:
+      banner:
+        optional: true
         selector: a[rel="fancybox"]
         attribute: href
       description:
@@ -120,10 +122,12 @@
       uploadvolumefactor:
         case:
           "*": "1"
-      date|optional|1:
+      date:
+        optional: true
         selector: div.torrentOwner > abbr.timeago
         attribute: data-time
-      date|optional|2:
+      date:
+        optional: true
         selector: div.torrentOwner:not(:has(abbr.timeago))
         remove: span
         filters:
@@ -156,4 +160,4 @@
           - name: dateparse
             args: "02-01-2006 15:04"
 
-        
+        

src/Jackett/Definitions/karagarga.yml

@@ -29,7 +29,7 @@
       - selector: table:contains("Login failed!")
     test:
       path: index.php
-
+        
   search:
     path: browse.php
     inputs:
@@ -44,8 +44,11 @@
       title:
         selector: td:nth-child(2) span
       download:
-        selector: a[href^="down.php"]
+        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

src/Jackett/Definitions/kickasstorrent-kathow.yml

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

src/Jackett/Definitions/kickasstorrent.yml

@@ -1,6 +1,7 @@
 ---
   site: kickasstorrent
   name: KickAssTorrent
+  description: "Kickass Torrents (KATcr) is a well-know Public torrent site indexing thousands of torrents verified and commented by a large file-sharing community"
   language: en-us
   type: public
   encoding: UTF-8
@@ -84,14 +85,12 @@
     modes:
       search: [q]
       tv-search: [q, season, ep]
+      movie-search: [q]
 
   settings: []
 
   search:
-    path: "/new/{{if .Query.Keywords}}search-torrents.php{{else}}index.php{{end}}"
-    inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "\"{{ .Query.Keywords }}\""
+    path: "/new/{{if .Keywords}}search-torrents.php?{{range .Categories }}c{{.}}=1&{{end}}search={{.Keywords}}{{else}}{{end}}"
     rows:
       selector: table.ttable_headinner > tbody > tr[class^="t-row"]
       filters:

src/Jackett/Definitions/limetorrents.yml

@@ -1,6 +1,7 @@
 ---
   site: limetorrents
   name: LimeTorrents
+  description: "LimeTorrents is a Public general torrent index with mostly verified torrents"
   language: en-us
   type: public
   encoding: UTF-8
@@ -57,7 +58,8 @@
       download:
         selector: div.tt-name > a[href^="/"]
         attribute: href
-      category|optional:
+      category:
+        optional: true
         selector: td:nth-child(2)
         filters:
           - name: split

src/Jackett/Definitions/linkomanija.yml

@@ -1,6 +1,7 @@
----
+---
   site: linkomanija
   name: LinkoManija
+  description: "LinkoManija is an ITALIAN Private site for TV / MOVIES / GENERAL"
   language: lt-lt
   type: private
   encoding: UTF-8
@@ -72,7 +73,8 @@
         attribute: href
       title:
         selector: a[href^="details?"]
-      description|optional:
+      description:
+        optional: true
         selector: td:nth-child(2) > span
       details:
         selector: a[href^="details?"]
@@ -108,4 +110,4 @@
           - name: dateparse
             args: "2006-01-0215:04:05 -07:00"
 
-        
+        

src/Jackett/Definitions/losslessclub.yml

@@ -1,6 +1,7 @@
----
+---
   site: losslessclub
   name: LosslessClub
+  description: "LosslessClub is a Romanian Private site for High Quality Music"
   language: ru-ru
   type: private
   encoding: windows-1251
@@ -45,12 +46,14 @@
       download:
         selector: a[href^="download.php?id="]
         attribute: href
-      banner|optional:
+      banner:
+        optional: true
         selector: img.thumbnail
         attribute: src
       size:
         selector: td:nth-child(5)
-      grabs|optional:
+      grabs:
+        optional: true
         selector: td:nth-child(6) br + span
       seeders:
         selector: td:nth-child(6)

src/Jackett/Definitions/magico.yml

@@ -1,6 +1,7 @@
----
+---
   site: magico
   name: Magico
+  description: "Magico (Trellas) is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: el-gr
   type: private
   encoding: UTF-8
@@ -165,7 +166,8 @@
         selector: a[rel="torrent_leechers"]
       grabs:
         selector: a[rel="times_completed"]
-      banner|optional:
+      banner:
+        optional: true
         selector: a[rel="fancybox"]
         attribute: href
       description:
@@ -177,10 +179,12 @@
       uploadvolumefactor:
         case:
           "*": "1"
-      date|optional|1:
+      date:
+        optional: true
         selector: div.torrentOwner > abbr.timeago
         attribute: data-time
-      date|optional|2:
+      date:
+        optional: true
         selector: div.torrentOwner:not(:has(abbr.timeago))
         remove: span
         filters:
@@ -213,4 +217,4 @@
           - name: dateparse
             args: "02-01-2006 15:04"
 
-        
+        

src/Jackett/Definitions/magnetdl.yml

@@ -0,0 +1,68 @@
+---
+  site: magnetdl
+  name: MagnetDL
+  description: "MagnetDL is a Public torrent Magnet Links search engine"
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - http://www.magnetdl.com/
+
+  caps:
+    categories:
+      "TV": TV
+      "Movie": Movies
+      "Music": Audio
+      "E-Book": Books/Ebook
+      "Game": PC/Games
+      "Software": PC
+      "Other": Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings: []
+
+  search:
+    headers:
+      # prevent redirect
+      Accept: ["text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8"]
+    keywordsfilters:
+      # replace space between keywords with - to prevent 404 Not Found
+      - name: re_replace
+        args: [" ", "-"]
+      - name: tolower
+    # return movie results if there are no search parms supplied (for use with the TEST button)
+    # http://www.magnetdl.com/m/midnight-texas-s01e10/
+    path: "{{if .Keywords}}/{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}"
+    rows:
+      selector: tr:has(td[class="m"])
+    fields:
+      title:
+        selector: td[class="n"] a
+        attribute: title
+      category:
+        optional: true
+        selector:  td[class^="t"]
+      details:
+        selector: td[class="n"] a
+        attribute: href
+      magnet:
+        selector: td[class="m"] a
+        attribute: href
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: timeago
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td[class="s"]
+      files:
+        selector: td[class="l"]
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"

src/Jackett/Definitions/majomparade.yml

@@ -1,6 +1,7 @@
----
+---
   site: majomparade
   name: Majomparádé
+  description: "Majomparádé (TurkDepo) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
   language: hu-hu
   type: private
   encoding: UTF-8
@@ -115,10 +116,12 @@
       details:
         selector: a[href^="details.php?id="]
         attribute: href
-      imdb|optional:
+      imdb:
+        optional: true
         selector: a[href^="https://www.imdb.com/title/"]
         attribute: href
-      banner|optional:
+      banner:
+        optional: true
         selector: img[src="pic/borito.png"]
         attribute: title
         filters:

src/Jackett/Definitions/manicomioshare.yml

@@ -1,6 +1,7 @@
 ---
   site: manicomioshare
   name: Manicomio Share
+  description: "Manicomio Share is a Brazilian Private site for TV / MOVIES / GENERAL"
   language: pt-br
   type: private
   encoding: iso-8859-1
@@ -240,6 +241,8 @@
         filters:
           - name: replace
             args: ["|", ""]
+          - name: replace
+            args: ["Ep. ","E"]
       size:
         selector: td:nth-child(4)
       grabs:

src/Jackett/Definitions/metaltracker.yml

@@ -0,0 +1,78 @@
+---
+  site: metaltracker
+  name: Metal Tracker
+  description: "Metal Tracker is a Semi-Private site dedicated to HEAVY METAL MUSIC. This definition is for the English site."
+  language: en-us
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - http://en.metal-tracker.com/
+
+  caps:
+    categories:
+      "Books": Audio/Audiobook
+      "Video": Audio/Video
+      "Music": Audio/MP3
+
+    modes:
+      search: [q]
+      music-search: [q, album, artist, label, year]
+
+  login:
+    path: /user/login.html
+    method: form
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      go: "Enter"
+    error:
+      - selector: div.errorSummary
+        message:
+          selector: div.errorSummary ul li
+    test:
+      path: /torrents/search.html
+      selector: li li:has(a[href="/user/logout.html"])
+
+  search:
+    paths:
+      - path: /torrents/search.html
+        method: post
+    inputs:
+      "SearchTorrentsForm[nameTorrent]": "{{ .Keywords }}"
+      go-search: "Search"
+    rows:
+      selector: .smallalbum
+    fields:
+      title:
+        selector: a h3
+      banner:
+        selector: .thumb a img
+        attribute: src
+      details:
+        selector: .thumb a
+        attribute: href
+      download:
+        selector: .center a[href^="/torrents/download/id/"]
+        attribute: href
+      date:
+        text: "now"
+      seeders:
+        selector: .center font:nth-of-type(1)
+      leechers:
+        selector: .center font:nth-of-type(2)
+      downloadvolumefactor:
+        text: "0"
+      uploadvolumefactor:
+        text: "1"
+      category:
+        selector: .smallalbum
+        remove: div.thumb, div.center, a
+        case:
+          ":contains(\"Type: Music\")": "Music"
+          ":contains(\"Type: Video\")": "Video"
+          ":contains(\"Type: Books\")": "Books"
+      size:
+        selector: .smallalbum
+        filters:
+          - name: regexp
+            args: "Size:\\s+([\\w\\d\\.,]+ \\w\\w)"

src/Jackett/Definitions/mononokebt.yml

@@ -1,6 +1,7 @@
 ---
   site: mononokebt
   name: Mononoké-BT
+  description: "Mononoke-BT is a FRENCH Private Torrent Tracker for ANIME"
   language: fr-fr
   type: private
   encoding: ISO-8859-15
@@ -77,4 +78,4 @@
           - name: dateparse
             args: "2006-01-0215:04:05 -07:00"
 
-        
+        

src/Jackett/Definitions/mteamtp.yml

@@ -29,12 +29,40 @@
       - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
       - {id: 427, cat: Books, desc: "eBook(電子書)"}
       - {id: 409, cat: Other, desc: "Misc(其他)"}
+      # adult
+      - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"}
+      - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"}
+      - {id: 424, cat: XXX, desc: "AV(有碼)/SD Censored"}
+      - {id: 430, cat: XXX, desc: "AV(無碼)/SD Uncensored"}
+      - {id: 426, cat: XXX, desc: "AV(無碼)/DVDiSo Uncensored"}
+      - {id: 437, cat: XXX, desc: "AV(有碼)/DVDiSo Censored"}
+      - {id: 431, cat: XXX, desc: "AV(有碼)/Blu-Ray Censored"}
+      - {id: 432, cat: XXX, desc: "AV(無碼)/Blu-Ray Uncensored"}
+      - {id: 436, cat: XXX, desc: "AV(網站)/0Day"}
+      - {id: 425, cat: XXX, desc: "IV(寫真影集)/Video Collection"}
+      - {id: 433, cat: XXX, desc: "IV(寫真圖集)/Picture Collection"}
+      - {id: 411, cat: XXX, desc: "H-Game(遊戲)"}
+      - {id: 412, cat: XXX, desc: "H-Anime(動畫)"}
+      - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"}
+
 
     modes:
       search: [q]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: info
+      type: info
+      label: ""
+      default: For best results disable the torrent name tooltip (User CP/Tracker Settings/Torrents Page). Otherwise long release names will be cut off.
+
   login:
     path: takelogin.php
     method: post
@@ -54,7 +82,11 @@
         args: "Ratio:\\s(.*?)\\s\\s"
 
   search:
-    path: /torrents.php
+    paths:
+      - path: torrents.php
+        categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
+      - path: adult.php
+        categorymappings: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
     method: post
     inputs:
       $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
@@ -67,7 +99,10 @@
     rows:
       selector: table.torrents > tbody > tr:has(table.torrentname)
     fields:
+      title: # shortened for long release names
+        selector: a[href^="details.php?id="] > b
       title:
+        optional: true # not available if IMDB tooltips are turned on
         selector: a[title][href^="details.php?id="]
         attribute: title
       category:
@@ -77,7 +112,7 @@
           - name: querystring
             args: cat
       details:
-        selector: a[title][href^="details.php?id="]
+        selector: a[href^="details.php?id="]
         attribute: href    
       download:
         selector: a[href^="download.php?id="]

src/Jackett/Definitions/myspleen.yml

@@ -1,6 +1,7 @@
 ---
   site: myspleen
   name: MySpleen
+  description: "MySpleen is a Private Torrent Tracker for TV / COMEDY / ANIMATION / 80-90’S VHS NOSTALGIA"
   language: en-us
   type: private
   encoding: UTF-8
@@ -96,4 +97,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/nexttorrent.yml

@@ -1,10 +1,14 @@
 ---
   site: nexttorrent
   name: NextTorrent
+  description: "NextTorrent is a FRENCH Public site for TV / MOVIES / GENERAL"
   language: fr-fr
   type: public
   encoding: UTF-8
   links:
+    - https://www.nextorrent.tv/
+  legacylinks:
+    - https://www.nextorrent.cc/
     - https://www.nextorrent.org/
 
   caps:
@@ -72,6 +76,8 @@
             args: [ " To", "000000000000"]
           - name: replace
             args: [ "X", "" ]
+      date:
+        text: "now"
       seeders:
         text: 0
       seeders:

src/Jackett/Definitions/nyaa-pantsu.yml

@@ -6,6 +6,7 @@
 ---
   site: nyaa-pantsu
   name: Nyaa-pantsu
+  description: "Nyaa-pantsu is a Public site for dedicated to Asian ANIME"
   language: en-en
   type: public
   encoding: UTF-8
@@ -110,4 +111,4 @@
         selector: td.tr-size
         filters:
           - name: replace
-            args: ["Unknown", "0"]
+            args: ["Unknown", "0"]

src/Jackett/Definitions/nyaasi.yml

@@ -1,6 +1,7 @@
 ---
   site: nyaasi
   name: Nyaa.si
+  description: "Nyaa is a Public torrent site focused on Eastern Asian media including anime, manga, literature and music"
   language: en-us
   type: public
   encoding: UTF-8

src/Jackett/Definitions/nyoo.yml

@@ -2,6 +2,7 @@
 ---
   site: nyoo
   name: Nyoo
+  description: "Nyoo is a mirror for Nyaa-Pantsu, a Public site for Asian ANIME"
   language: en-en
   type: public
   encoding: UTF-8

src/Jackett/Definitions/ourbits.yml

@@ -1,6 +1,7 @@
----
+---
   site: ourbits
   name: Ourbits
+  description: "Ourbits (HDPter) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
   language: zh-cn
   type: private
   encoding: UTF-8
@@ -56,7 +57,8 @@
     fields:
       title:
         selector: a[href^="details.php?id="]
-      title|optional:
+      title:
+        optional: true
         selector: a[title][href^="details.php?id="]
         attribute: title
       category:
@@ -71,7 +73,8 @@
       download:
         selector: a[href^="download.php?id="]
         attribute: href
-      imdb|optional:
+      imdb:
+        optional: true
         selector: div.imdb_100 > a
         attribute: href
       size:

src/Jackett/Definitions/passionetorrent.yml

@@ -1,6 +1,7 @@
 ---
   site: passionetorrent
   name: Passione Torrent
+  description: "PassioneTorrent is an ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: it-it
   type: private
   encoding: UTF-8
@@ -155,4 +156,4 @@
           img[alt="8x Upload Multiplier"]: "8"
           img[alt="9x Upload Multiplier"]: "9"
           img[alt="10x Upload Multiplier"]: "10"
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/polishsource.yml

@@ -1,6 +1,7 @@
----
+---
   site: polishsource
   name: PolishSource
+  description: "PolishSource (PS) is a POLISH Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: pl-pl
   type: private
   encoding: ISO-8859-2
@@ -72,24 +73,32 @@
       download:
         selector: a[href^="downloadssl.php?id="]
         attribute: href
-      description|optional:
+      description:
+        optional: true
         selector: td:nth-child(2) > small
         filters:
           - name: prepend
             args: "Genre: "
           - name: append
             args: "\n<br>"
-      description|optional|append|1:
+      description:
+        optional: true
         selector: img[src="pic/pl.png"]
         filters:
           - name: append
             args: "Language: polish\n<br>"
-      description|optional|append|2:
+          - name: prepend
+            args: {{ .Result.description }}
+      description:
+        optional: true
         selector: img[src="pic/napisy.png"]
         filters:
           - name: append
             args: "Subbed\n<br>"
-      imdb|optional:
+          - name: prepend
+            args: {{ .Result.description }}
+      imdb:
+        optional: true
         selector: a[href^="http://www.imdb.com/title/tt"]
       grabs:
         selector: td:nth-child(6)

src/Jackett/Definitions/polishtracker.yml

@@ -1,118 +0,0 @@
----
-  site: polishtracker
-  name: PolishTracker
-  language: pl-pl
-  type: private
-  encoding: UTF-8
-  links:
-    - https://polishtracker.net/
-  certificates:
-    - 95EAB2795D8E35A14A9B35619C2568F974AE4D95 # expired
-
-  caps:
-    categorymappings:
-      - {id: 32, cat: PC/0day, desc: "0day"}
-      - {id: 21, cat: TV/Anime, desc: "Anime"}
-      - {id: 1, cat: PC/ISO, desc: "Apps"}
-      - {id: 17, cat: Console, desc: "Consoles"}
-      - {id: 33, cat: Movies/DVD, desc: "DVDR Custom"}
-      - {id: 3, cat: Books, desc: "E-Books"}
-      - {id: 28, cat: Movies/BluRay, desc: "Movies BDiSC"}
-      - {id: 20, cat: Movies/DVD, desc: "Movies DVD"}
-      - {id: 26, cat: Movies/HD, desc: "Movies HD"}
-      - {id: 19, cat: Movies/SD, desc: "Movies SD"}
-      - {id: 6, cat: Audio, desc: "Music"}
-      - {id: 24, cat: Audio/Other, desc: "Music DVD"}
-      - {id: 8, cat: Audio/Video, desc: "Music Video"}
-      - {id: 4, cat: PC/Games, desc: "PC Games"}
-      - {id: 29, cat: TV/SD, desc: "TV DVDRip"}
-      - {id: 31, cat: TV/HD, desc: "TV HD"}
-      - {id: 7, cat: TV/SD, desc: "TV SD"}
-      - {id: 9, cat: XXX, desc: "XXX"}
-
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  login:
-    path: login.php
-    method: form
-    cookies: ["language=1", "eid=123", "dabg=yes", "dasc=yes", "dafx=yes", "dabo=yes", "dapi=yes"]
-    captcha:
-      type: image
-      image: img[src^="/login.php?rand="]
-      input: kodzik
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("FAILED"))
-    test:
-      path: browse.php
-      selector: a[href^="logout.php?"]
-
-  search:
-    path: browse.php
-    inputs:
-      search: "{{ .Query.Keywords }}"
-    rows:
-      selector: div#bro1 > table.shad1 > tbody > tr[class^="rowfx"]
-    error:
-      - selector: table.textfx2 td:contains("In order to use PolishTracker we require users to familiarize with FAQ, Rules and any News from Home Page.")
-    fields:
-      download:
-        selector: a[href^="/download.php/"]
-        attribute: href
-      title:
-        selector: a[href^="/details.php?id="]
-      title:
-        selector: a[href^="/details.php?id="][onmouseover]
-        optional: true
-        attribute: title
-        filters:
-          - name: strdump
-          - name: regexp
-            args: "<td class=nobotol>(.*?)</td>"
-      details:
-        selector: a[href^="/details.php?id="]
-        attribute: href
-      category:
-        selector: a[href^="browse.php?cat="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: cat
-      imdb:
-        selector: a[href^="http://www.imdb.com/title/tt"]
-        optional: true
-        attribute: href
-      date:
-        selector: td:nth-child(4)
-        filters:
-          - name: append
-            args: " +00:00"
-          - name: dateparse
-            args: "2006-01-0215:04:05 -07:00"
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      grabs:
-        selector: td:nth-child(6) > b
-      size:
-        selector: td:nth-child(5)
-        remove: font
-      downloadvolumefactor:
-        case:
-          img[alt^="Freebie torrent."]: "0"
-          img[alt*="-50% download"]: "0.5"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          img[alt*="+50% upload"]: "1.5"
-          "*": "1"
-      description:
-        selector: td:nth-child(2)
-        remove: a

src/Jackett/Definitions/ptfiles.yml

@@ -1,6 +1,7 @@
 ---
   site: ptfiles
   name: PTFiles
+  description: "PTFiles (PTF) is a Private site for TV / MOVIES / GENERAL"
   language: en-us
   type: private
   encoding: windows-1252
@@ -62,7 +63,8 @@
       onlyname: 1
       onlyname2: true
     rows:
-      selector: table#tortable > tbody > tr.rowhead
+      # for some users (don't know why) the table is called tablethree instead of tortable
+      selector: table#tortable > tbody > tr.rowhead, table#tablethree > tbody > tr.rowhead
     fields:
       download:
         selector: a[href^="dl.php/"]

src/Jackett/Definitions/rockhardlossless.yml

@@ -1,6 +1,7 @@
 ---
   site: rockhardlossless
   name: Rockhard Lossless
+  description: "RockHard Lossless is a Private Torrent Tracker for LOSSLESS ROCK MUSIC"
   language: en-us
   type: private
   encoding: UTF-8

src/Jackett/Definitions/rodvd.yml

@@ -1,6 +1,7 @@
----
+---
   site: rodvd
   name: RoDVD
+  description: "RoDVD (Cinefiles) is a ROMANIAN Private Torrent Tracker for DVD-R / HD MOVIES"
   language: ro-ro
   type: private
   encoding: windows-1252
@@ -98,7 +99,8 @@
       download:
         selector: a[href^="download.php"]
         attribute: href
-      imdb|optional:
+      imdb:
+        optional: true
         selector: a[href*="http://www.imdb.com/title/tt"]
         attribute: href
       size:

src/Jackett/Definitions/secretcinema.yml

@@ -10,121 +10,82 @@
 
   caps:
     categorymappings:
-      - {id: 1, cat: TV/Anime, desc: "Animation"}
-      - {id: 2, cat: Movies, desc: "Arthouse"}
-      - {id: 3, cat: Movies, desc: "Asian"}
-      - {id: 19, cat: Audio/Audiobook, desc: "Audiobooks"}
-      - {id: 29, cat: Movies, desc: "Badfilm"}
-      - {id: 18, cat: Books, desc: "Books"}
-      - {id: 4, cat: Movies, desc: "Classics"}
-      - {id: 5, cat: Movies, desc: "Comedy"}
-      - {id: 20, cat: Books/Comics, desc: "Comix"}
-      - {id: 6, cat: Movies, desc: "Cult"}
-      - {id: 7, cat: TV/Documentary, desc: "Documentary"}
-      - {id: 8, cat: Movies, desc: "Fantasy & SF"}
-      - {id: 9, cat: Movies, desc: "Horror"}
-      - {id: 22, cat: Movies, desc: "Noir"}
-      - {id: 17, cat: Audio, desc: "OST"}
-      - {id: 10, cat: Other, desc: "Other"}
-      - {id: 15, cat: TV, desc: "Other TV"}
-      - {id: 16, cat: Audio, desc: "Radio"}
-      - {id: 11, cat: Movies, desc: "Silent"}
-      - {id: 12, cat: TV, desc: "Talent Show!"}
-      - {id: 14, cat: Movies, desc: "TV Movies"}
-      - {id: 13, cat: TV, desc: "TV Series"}
+      - { id: 1, cat: Movies, desc: "Movies" }
+      - { id: "1]=1&nzbcat[2030", cat: Movies/SD, desc: "Movies/SD" }
+      - { id: "1]=1&nzbcat[2040", cat: Movies/HD, desc: "Movies/HD" }
+      - { id: "1]=1&nzbcat[2060", cat: Movies/BluRay, desc: "Movies/BluRay" }
+      - { id: "1]=1&nzbcat[2070", cat: Movies/DVD, desc: "Movies/DVD" }
+      - { id: 2, cat: Audio/MP3, desc: "Music" }
+      - { id: 3, cat: Books/Ebook, desc: "E-Books" }
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      movie-search: [q, imdbid]
 
   login:
-    path: /takelogin.php
-    method: post
+    path: login.php
+    method: form
+    form: form
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      returnto: "index.php"
+    error:
+      - selector: table:contains("Login failed!")
     test:
-      path: /browse.php
-      selector: div.Userstats
+      path: index.php
 
   ratio:
-    path: /browse.php
-    selector: div.Userstats
-    filters:
-      - name: regexp
-        args: "\n\u00a0(.*) \u00a0"
+    path: torrents.php
+    selector: li#stats_ratio > span
 
   search:
-    path: /browse.php
+    path: torrents.php
     inputs:
-      $raw: "{{range .Categories}}cat{{.}}=on&{{end}}"
-      search: "{{ .Query.Keywords }}"
-      incldead: "1"
-      tpp: "100"
-      dirty: "1"
+      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      cataloguenumber: "{{ .Query.IMDBID }}"
+      searchsubmit: 1
     rows:
-      selector: td > table[id="large"] > tbody > tr:has(div.browsing)
-      filters:
-        - name: andmatch
-      dateheaders:
-        selector: ":has(td.colhead[title] > b)"
-        filters:
-          - name: dateparse
-            args: "Mon 02 Jan"
+      selector: table#torrent_table > tbody > tr.torrent
     fields:
-      title:
-        selector: a[href^="viewtopic.php?id="]
-      description:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(2)
-      category:
-        selector: a[href^="browse.php?cat"]
-        attribute: href
-        filters:
-          - name: replace
-            args: ["browse.php?cat", ""]
-          - name: replace
-            args: ["=on", ""]
-      details:
-        selector: a[href^="viewtopic.php?id="]
-        attribute: href      
       download:
-        selector: a[href^="download.php/"]
+        selector: a[href^="torrents.php?action=download&id="]
+        attribute: href
+      description:
+        selector: div.group_info > a.tooltip
+        remove: span, div.tags, div.torrent_info
+      title:
+        selector: div.group_info > a.tooltip
+        remove: span, div.tags, div.torrent_info
+      category:
+        selector: tr.torrent
+        case:
+          div.torrent_info:contains('720'), div.torrent_info:contains('1080p'), div.torrent_info:contains('4k'): "1]=1&nzbcat[2040"
+          div.torrent_info:contains('SD'): "1]=1&nzbcat[2030"
+          div.torrent_info:contains('BDMV'): "1]=1&nzbcat[2060"
+          div.torrent_info:contains('DVD-R'): "1]=1&nzbcat[2070"
+          div.cats_movies: 1
+          div.cats_music: 2
+          div.cats_ebooks: 3
+      comments:
+        selector: a[href^="torrents.php?id="]
         attribute: href
-      size:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(4)
       files:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(3)
-        filters:
-        - name: regexp
-          args: "(\\d+)"
-      grabs:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(5)
-        filters:
-        - name: regexp
-          args: "(\\d+)"
-      seeders:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(6)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
-      leechers:
-        selector: table > tbody > tr:nth-child(2) > td:nth-child(7)
-        filters:
-          - name: regexp
-            args: "(\\d+)"
+        selector: td:nth-child(4)
       date:
-        selector: td:nth-child(1) > div > table > tbody > tr:nth-child(2) > td:nth-child(1)
-        filters:
-          - name: replace
-            args: ["'", ""]
-          - name: replace
-            args: ["\xA0", ""]
-          - name: dateparse
-            args: "02 Jan 0615:04"
+        selector: td:nth-child(5)
+      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:
+          "strong.tl_free:contains(\"Freeleech!\")": "0"
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/shellife.yml

@@ -1,6 +1,7 @@
 ---
   site: shellife
   name: Shellife
+  description: "Shellife (SL) is a Private Torrent Tracker for NON MAINSTREAM MUSIC"
   language: en-us
   type: private
   encoding: UTF-8
@@ -78,4 +79,4 @@
           - name: trim
             args: " "
           
-      
+      

src/Jackett/Definitions/sktorrent.yml

@@ -0,0 +1,132 @@
+---
+  site: sktorrent
+  name: SkTorrent
+  description: "SkTorrent is a CZECH/SLOVAK Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: cs-cz
+  type: semi-private
+  encoding: windows-1250
+  links:
+    - http://sktorrent.eu/torrent/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Filmy CZ/SK dabing"}
+      - {id: 16, cat: TV, desc: "Seriály"}
+      - {id: 17, cat: TV, desc: "Dokument"}
+      - {id: 42, cat: TV, desc: "TV Pořad"}
+      - {id: 44, cat: TV, desc: "Sport"}
+      - {id: 22, cat: Audio, desc: "Autorska Hudba"}
+      - {id: 21, cat: PC, desc: "Programy"}
+      - {id: 3, cat: Movies/3D, desc: "3D Filmy"}
+      - {id: 14, cat: Movies/Other, desc: "Filmy Kamera"}
+      - {id: 15, cat: Movies, desc: "Filmy s titulkama"}
+      - {id: 20, cat: Movies/DVD, desc: "DVD Filmy"}
+      - {id: 31, cat: Movies, desc: "Filmy bez titulků"}
+      - {id: 5, cat: Movies, desc: "Filmy Kreslené"}
+      - {id: 19, cat: Movies/HD, desc: "HD Filmy"}
+      - {id: 29, cat: Movies/3D, desc: "3D Blu-ray"}
+      - {id: 43, cat: Movies/HD, desc: "UHD Filmy"}
+      - {id: 28, cat: Movies/BluRay, desc: "Blu-ray"}
+      - {id: 18, cat: PC/Games, desc: "Hry na Windows"}
+      - {id: 30, cat: PC/Games, desc: "Hry na Konzole"}
+      - {id: 37, cat: PC/Games, desc: "Hry na Linux"}
+      - {id: 2, cat: Audio, desc: "Hudba"}
+      - {id: 55, cat:  Other, desc: "Neschválené"}
+      - {id: 23, cat: Books, desc: "Knihy a Časopisy"}
+      - {id: 24, cat: Audio, desc: "Mluvené slovo"}
+      - {id: 27, cat: PC/Phone-Other, desc: "Mobil, PDA"}
+      - {id: 25, cat: Other, desc: "Ostatní"}
+      - {id: 45, cat: Audio, desc: "Soundtrack"}
+      - {id: 26, cat:  Audio/Video, desc: "Hudební videa"}
+      - {id: 9, cat: XXX, desc: "xXx"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  login:
+    path: /torrent/login.php
+    method: form
+    form: form[action^="login.php?returnto=index.php"]
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: font:contains("Incorrect")
+    test:
+      path: /torrent/index.php
+
+  search:
+    path: /torrent/torrents.php
+    inputs:
+      search: "{{ .Keywords }}"
+      category: "{{range .Categories}}{{.}};{{end}}"
+      active: "1"
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+    rows:
+      selector: table.lista > tbody > tr > td > table.lista > tbody > tr:has(a[href^="details.php?id="])
+    fields:
+      title:
+        selector: td.lista a[href^="details.php?id="]
+        attribute: title
+        filters:
+          - name: re_replace
+            args: [".*? / ", ""]
+          - name: diacritics
+            args: replace
+          - name: replace
+            args: ["serie", ""] 
+          - name: replace
+            args: ["Serie", ""] 
+          - name: re_replace
+            args: ["(\\d{2})\\.", "S$1"]
+          - name: re_replace
+            args: ["(\\d{1})\\.", "S0$1"]
+      category:
+        selector: td:nth-child(1) a[href^="torrents.php?category="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: category
+      details:
+        selector: td.lista a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: td.lista a[href^="download.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(3)
+        filters:
+          - name: split
+            args: [ "|", 0 ]
+          - name: regexp
+            args: "Velkost (.+?) ?$"
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: split
+            args: [ "|", 1 ]
+          - name: replace
+            args: ["Pridany ", ""]
+          - name: replace
+            args: ["o ", ""]
+          - name: dateparse
+            args: "02/01/2006 15:04"
+      seeders:
+        selector: td:nth-child(5) > a
+      leechers:
+        selector: td:nth-child(6) > a
+      grabs:
+        selector: td:nth-child(7)
+        filters:
+          - name: replace
+            args: ["---", "0"]
+      downloadvolumefactor:
+        case:
+          "*": "1"
+      uploadvolumefactor:
+        case:
+          "*": "1"

src/Jackett/Definitions/skytorrents.yml

@@ -1,6 +1,7 @@
 ---
   site: skytorrents
   name: Sky torrents
+  description: "SkyTorrents is a Public privacy-focused torrent search engine with no adverts or tracking"
   language: en-us
   type: public
   encoding: UTF-8

src/Jackett/Definitions/speedtorrentreloaded.yml

@@ -1,6 +1,7 @@
 ---
   site: speedtorrentreloaded
   name: SpeedTorrent Reloaded
+  description: "SpeedTorrent Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: de-de
   type: private
   encoding: UTF-8
@@ -119,4 +120,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/t411v2.yml

@@ -1,6 +1,7 @@
 ---
   site: t411v2
   name: t411 v2
+  description: "t411 v2 is a FRENCH Public site for TV / MOVIES / GENERAL"
   language: fr-fr
   type: public
   encoding: UTF-8
@@ -26,7 +27,12 @@
     selector: a[href^="/telecharger-torrent/"]
 
   search:
-    path: /torrents/search/?search={{ .Keywords}}
+    path: /torrents/search/
+    keywordsfilters: #1963
+      - name: replace # Add Keywords
+        args: ["Greys Anatomy", "Grey's Anatomy"]
+    inputs:
+      search: "{{ .Keywords }}"
     rows:
       selector: tr.isItem.isItemDesk
     fields:
@@ -46,6 +52,8 @@
      title:
         selector: td.m-name > a
         filters:
+          - name: replace #1963 Fix Grey's Anatomy results V2 
+            args: ["Grey's Anatomy", "Greys Anatomy"]
           # now we put the date at the right place according scene 
           # naming rules using .Result.site_date
           - name: replace

src/Jackett/Definitions/tasmanit.yml

@@ -1,6 +1,7 @@
 ---
   site: tasmanit
   name: Tasmanit
+  description: "Tasmanit.es is a AUSTRALIAN / NEW ZEALAND Private Torrent Tracker for AUS / NZ TV"
   language: en-us
   type: private
   encoding: UTF-8
@@ -109,4 +110,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett/Definitions/tenyardtracker.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://tenyardtracker.com/
+  legacylinks:
     - http://tenyardtracker.com/
 
   caps: