moecat: add 2FA to config. resollves #7644

This reverts commit 0b45557292.

.gitignore

@@ -195,9 +195,6 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 /tools
-/BuildOutput
-/Artifacts
-/TestResults
 *.DS_Store
 .idea/
 launchSettings.json

README.md

@@ -2,7 +2,7 @@
 
 [![GitHub issues](https://img.shields.io/github/issues/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/issues)
 [![GitHub pull requests](https://img.shields.io/github/issues-pr/Jackett/Jackett.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/pulls)
-[![Build Status](https://dev.azure.com/Jackett-project/Jackett/_apis/build/status/Jackett.Jackett?branchName=master)](https://dev.azure.com/Jackett-project/Jackett/_build/latest?definitionId=1&branchName=master)
+[![Build Status](https://dev.azure.com/Jackett-project/Jackett/_apis/build/status/Jackett.Jackett?branchName=master)](https://dev.azure.com/jackett/jackett/_build/latest?definitionId=1&branchName=master)
 [![GitHub Releases](https://img.shields.io/github/downloads/Jackett/Jackett/total.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/jackett.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/jackett/)
 [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA)
@@ -93,20 +93,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Nyaa.si
  * OneJAV
  * OxTorrent
+ * ParnuXi
  * PiratBit
  * Pirateiro
  * PornLeech
+ * PornoLive
  * PornoRip
  * PornoTor
  * ProStyleX
+ * Rapidzona
  * RARBG
  * Rus-media
  * RuTor
+ * RuTracker.RU
  * Seedpeer
  * shokweb
  * ShowRSS
  * SkyTorrentsClone
  * SolidTorrents
+ * sosulki
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * TFile
@@ -116,6 +121,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torlock
  * TOROS
  * Torrent Downloads (TD)
+ * Torrent Oyun indir
+ * torrent-pirat
  * Torrent4You
  * Torrent9
  * Torrent9Clone
@@ -128,6 +135,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentRex
  * TorrentQuest
  * Torrents.csv
+ * Torrentv
  * TorrentView
  * TorrentWal
  * Torrentz2
@@ -136,16 +144,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * xxxtor
  * YourBittorrent
  * YTS.ag
+ * zetorrents
  * Zooqle
 </details>
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
- * Alein
  * AlexFilm
  * AniDUB
  * ArenaBG
- * BaibaKo
  * BookTracker
  * CasStudioTV
  * Crazy's Corner
@@ -161,6 +168,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Gay-Torrents.org
  * HD Dolby
  * HamsterStudio
+ * IV-Torrents
  * KinoNaVse100
  * Kinozal
  * Korsar
@@ -213,6 +221,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Audiobook Torrents (ABT)
  * Avistaz (AsiaTorrents)
  * Awesome-HD (AHD)
+ * BaibaKo
  * BIGTorrent
  * BIT-HDTV
  * BJ-Share (BJ)
@@ -274,7 +283,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * EggMeOn
  * Elite-Tracker
  * Empornium (EMP)
  * Ethor.net (Thor's Land)
@@ -301,7 +309,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
- * Greek Legends
  * Greek Team
  * HD-Bits.com
  * HD-Forever (HDF)
@@ -339,6 +346,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * JPopsuki
  * Kapaki
  * Karagarga
+ * LastFiles
  * Le Saloon
  * LeChaudron
  * LeagueHD
@@ -351,6 +359,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
  * MicroBit (µBit)
+ * MMA-Torrents
  * MoeCat
  * Mononoké-BT
  * MoreThanTV (MTV)
@@ -364,7 +373,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * New Real World
  * Norbits
  * NordicBits (NB)
- * Nostalgic (The Archive)
+ * Nostalgic (The Archive / VHSTAPES)
  * OnlineSelfEducation
  * Orpheus
  * Ourbits (HDPter)
@@ -474,6 +483,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TurkTorrent (TT)
  * Twilight Torrents
  * Twilights Zoom
+ * U-Torrents
  * U2 (U2分享園@動漫花園)
  * UHDBits
  * UnionGang

azure-pipelines.yml

@@ -1,7 +1,7 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
   majorVersion: 0
-  minorVersion: 13
+  minorVersion: 14
   patchVersion: $[counter(variables['minorVersion'], 1)] #this will reset when we bump minor
   jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
   buildConfiguration: Release
@@ -9,6 +9,12 @@ variables:
   netCoreSdkVersion: 3.1.x
   system.debug: true
 
+pr:
+  autoCancel: true
+  
+trigger:
+  batch: true
+
 stages:
   - stage: BuildJackett
     displayName: Create Binaries
@@ -353,17 +359,18 @@ stages:
           patterns: '**/Jackett*'
           path: $(Build.ArtifactStagingDirectory)
 
-      - task: GitHubRelease@0
+      - task: GitHubRelease@1
         displayName: Create Github release
         inputs:
           gitHubConnection: github.com_jackett
           repositoryName: '$(Build.Repository.Name)' 
           action: create
           target: $(Build.SourceVersion)
-          tagSource: manual
+          tagSource: userSpecifiedTag
           tag: v$(Build.BuildNumber)
           title: v$(Build.BuildNumber)
           assets: $(Build.ArtifactStagingDirectory)/drop/*
+          assetUploadMode: replace
           isDraft: true
           addChangeLog: true
           compareWith: lastNonDraftRelease
@@ -373,17 +380,18 @@ stages:
         inputs:
           targetType: inline
           script: |
-            $json = Invoke-WebRequest 'https://dev.azure.com/jackett-project/jackett/_apis/build/builds/$(Build.BuildId)/logs?api-version=5.0' | ConvertFrom-Json
+            $json = Invoke-WebRequest 'https://dev.azure.com/jackett/jackett/_apis/build/builds/$(Build.BuildId)/logs?api-version=5.0' | ConvertFrom-Json
             $lastTwoLogUrls = $json.value[-1..-2].url
             foreach($logUrl in $lastTwoLogUrls)
             {
               Write-Output $logUrl
               $logText = Invoke-WebRequest $logUrl
-              if ($logText -like '*: GitHub Release*') 
+              if ($logText -like '*Creating a release for tag:*') 
               {
-                $successCount = (Select-String "Uploaded file successfully:" -InputObject $logText -AllMatches).Matches.Count
-                $failureCount = (Select-String "Duplicate asset found:" -InputObject $logText -AllMatches).Matches.Count
-                Write-Host "Success count is: $successCount and failure count is: $failureCount"
+                $logInspect = ($logText -split "Creating a release for tag:")[-1]
+                $successCount = (Select-String "Uploaded file successfully:" -InputObject $logInspect -AllMatches).Matches.Count
+                $failureCount = (Select-String "Duplicate asset found:" -InputObject $logInspect -AllMatches).Matches.Count
+                Write-Output "Success count is: $successCount and failure count is: $failureCount"
                 if (($successCount -ne 7) -or ($failureCount -ne 0)) { Write-Host "##vso[task.complete result=Failed;]DONE" } 
               }
             }

install_service_systemd.sh

@@ -1,39 +1,66 @@
 #!/bin/bash
 
-#Setting up colors
+# If you have problems installing Jackett, please open an issue on
+# https://github.com/Jackett/Jackett/issues
+
+# 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
-jackettservice="jackett.service"
-systemctl stop ${jackettservice}
+# Check if the install script is running as root
+if [ "$EUID" -ne 0 ]; then
+    echo "${BOLDRED}ERROR${NC}: Please run this script as root"
+    exit 1
+fi
+
+# Check if Jackett service is running
+JACKETT_SERVICE="jackett.service"
+echo "Checking if the service '${JACKETT_SERVICE}' is running ..."
+if systemctl is-active --quiet "${JACKETT_SERVICE}"; then
+    echo "Service '${JACKETT_SERVICE}' is running"
+
+    # Stop and unload the service
+    if systemctl stop "${JACKETT_SERVICE}"; then
+        echo "Service '${JACKETT_SERVICE}' stopped"
+    else
+        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' Can not be stopped"
+        exit 1
+    fi
+
+else
+    echo "Service '${JACKETT_SERVICE}' is not running"
+fi
 
 # Move working directory to Jackett's
-cd "$(dirname "$0")"
+JACKETT_DIR="$(dirname "$(readlink -f "$0")")"
+echo "Jackett will be installed in '${JACKETT_DIR}'"
+if ! cd "${JACKETT_DIR}"; then
+    echo "${BOLDRED}ERROR${NC}: Can not cd into '${JACKETT_DIR}' folder"
+    exit 1
+fi
 
 # Check if we're running from Jackett's directory
 if [ ! -f ./jackett ]; then
-echo "${BOLDRED}ERROR${NC}: Couldn't locate jackett. Is the script in the right directory?"
+    echo "${BOLDRED}ERROR${NC}: Can not locate 'jackett' file in '${JACKETT_DIR}'."
+    echo "Is the script in the right directory?"
     exit 1
 fi
-jackettdir="$(pwd)"
 
 # Check if Jackett's owner is root
-jackettuser="$(stat -c "%U" ./jackett)"
-if [ "${jackettuser}" == "root" ]; then
-echo "${BOLDRED}ERROR${NC}: Jackett shouldn't run as root. Please, change the owner of the Jackett directory."
-    exit 1
-fi
-
-# Check that no other service called Jackett is already running
-if [[ $(systemctl status ${jackettservice} | grep "active (running)") ]]; then
-    echo "${BOLDRED}ERROR${NC}: Jackett already seems to be running as a service. Please stop it before running this script again."
+JACKETT_USER="$(stat -c "%U" ./jackett)"
+if [ "${JACKETT_USER}" == "root" ] || [ "${JACKETT_USER}" == "UNKNOWN" ] ; then
+    echo "${BOLDRED}ERROR${NC}: The owner of Jackett directory is '${JACKETT_USER}'."
+    echo "Please, change the owner with the command 'chown <user>:<user> -R \"${JACKETT_DIR}\"'"
+    echo "The user <user> will be used to run Jackett."
     exit 1
 fi
+echo "Jackett will be executed with the user '${JACKETT_USER}'"
 
 # Write the systemd service descriptor
-cat >"/etc/systemd/system/${jackettservice}" <<EOL
+JACKETT_SERVICE_PATH="/etc/systemd/system/${JACKETT_SERVICE}"
+echo "Creating Jackett unit file in '${JACKETT_SERVICE_PATH}' ..."
+cat > "${JACKETT_SERVICE_PATH}" <<EOL
 [Unit]
 Description=Jackett Daemon
 After=network.target
@@ -43,35 +70,39 @@ SyslogIdentifier=jackett
 Restart=always
 RestartSec=5
 Type=simple
-User=${jackettuser}
-Group=${jackettuser}
-WorkingDirectory=${jackettdir}
-ExecStart=${jackettdir}/jackett_launcher.sh
-TimeoutStopSec=20
+User=${JACKETT_USER}
+Group=${JACKETT_USER}
+WorkingDirectory=${JACKETT_DIR}
+ExecStart=/bin/sh "${JACKETT_DIR}/jackett_launcher.sh"
+TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target
 
 EOL
+if [ $? -ne 0 ]; then
+    echo "${BOLDRED}ERROR${NC}: Can not create the file '${JACKETT_SERVICE_PATH}'"
+    echo "The UnitPath of systemd changes from one distribution to another. You may have to edit the script and change the path manually."
+    exit 1
+fi
 
+echo "Installing Jackett service ..."
 # Reload systemd daemon
-systemctl daemon-reload
+if ! systemctl daemon-reload; then
+    echo "${BOLDRED}ERROR${NC}: Can not reload systemd daemon"
+    exit 1
+fi
 
 # Enable the service for following restarts
-systemctl enable ${jackettservice}
+if ! systemctl enable "${JACKETT_SERVICE}"; then
+    echo "${BOLDRED}ERROR${NC}: Can not enable the service '${JACKETT_SERVICE}'"
+    exit 1
+fi
 
 # Run the service
-systemctl start ${jackettservice}
-
-# Check that it's running
-if [[ $(systemctl status ${jackettservice} | grep "active (running)") ]]; then
-    echo "${BOLDGREEN}Agent successfully installed and launched!${NC}"
+if systemctl start "${JACKETT_SERVICE}"; then
+    echo "${BOLDGREEN}Service successfully installed and launched!${NC}"
 else
-    cat << EOL
-${BOLDRED}ERROR${NC}: Could not launch service. The installation might have failed.
-Please open an issue on https://github.com/Jackett/Jackett/issues and paste following information:
-Jackett directory: \`${jackettdir}\`
-Jackett user: \`${jackettuser}\`
-
-EOL
+    echo "${BOLDRED}ERROR${NC}: Can not start the service '${JACKETT_SERVICE}'"
+    exit 1
 fi

install_service_systemd_mono.sh

@@ -1,43 +1,75 @@
 #!/bin/bash
 
-#Setting up colors
+# If you have problems installing Jackett, please open an issue on
+# https://github.com/Jackett/Jackett/issues
+
+# 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
-jackettservice="jackett.service"
-systemctl stop ${jackettservice}
+# Check if the install script is running as root
+if [ "$EUID" -ne 0 ]; then
+    echo "${BOLDRED}ERROR${NC}: Please run this script as root"
+    exit 1
+fi
+
+# Check if Jackett service is running
+JACKETT_SERVICE="jackett.service"
+echo "Checking if the service '${JACKETT_SERVICE}' is running ..."
+if systemctl is-active --quiet "${JACKETT_SERVICE}"; then
+    echo "Service '${JACKETT_SERVICE}' is running"
+
+    # Stop and unload the service
+    if systemctl stop "${JACKETT_SERVICE}"; then
+        echo "Service '${JACKETT_SERVICE}' stopped"
+    else
+        echo "${BOLDRED}ERROR${NC}: The service '${JACKETT_SERVICE}' Can not be stopped"
+        exit 1
+    fi
+
+else
+    echo "Service '${JACKETT_SERVICE}' is not running"
+fi
 
 # Move working directory to Jackett's
-cd "$(dirname "$0")"
+JACKETT_DIR="$(dirname "$(readlink -f "$0")")"
+echo "Jackett will be installed in '${JACKETT_DIR}'"
+if ! cd "${JACKETT_DIR}"; then
+    echo "${BOLDRED}ERROR${NC}: Can not cd into '${JACKETT_DIR}' folder"
+    exit 1
+fi
 
 # Check if we're running from Jackett's directory
 if [ ! -f ./JackettConsole.exe ]; then
-echo "${BOLDRED}ERROR${NC}: Couldn't locate JackettConsole.exe. Is the script in the right directory?"
+    echo "${BOLDRED}ERROR${NC}: Can not locate 'JackettConsole.exe' file in '${JACKETT_DIR}'."
+    echo "Is the script in the right directory?"
     exit 1
 fi
-jackettdir="$(pwd)"
 
 # Check if Jackett's owner is root
-jackettuser="$(stat -c "%U" ./JackettConsole.exe)"
-if [ "${jackettuser}" == "root" ]; then
-echo "${BOLDRED}ERROR${NC}: Jackett shouldn't run as root. Please, change the owner of the Jackett directory."
+JACKETT_USER="$(stat -c "%U" ./JackettConsole.exe)"
+if [ "${JACKETT_USER}" == "root" ] || [ "${JACKETT_USER}" == "UNKNOWN" ] ; then
+    echo "${BOLDRED}ERROR${NC}: The owner of Jackett directory is '${JACKETT_USER}'."
+    echo "Please, change the owner with the command 'chown <user>:<user> -R \"${JACKETT_DIR}\"'"
+    echo "The user <user> will be used to run Jackett."
     exit 1
 fi
+echo "Jackett will be executed with the user '${JACKETT_USER}'"
 
-# Check if mono is installed
-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 [[ $(systemctl status ${jackettservice} | grep "active (running)") ]]; then
-    echo "${BOLDRED}ERROR${NC}: Jackett already seems to be running as a service. Please stop it before running this script again."
+# Check if Mono is installed
+echo "Checking if Mono is installed ..."
+if ! command -v mono > /dev/null; then
+    echo "${BOLDRED}ERROR${NC}: Jackett requires Mono but it's not installed"
     exit 1
 fi
+MONO_DIR="$(dirname "$(command -v mono)")"
+echo "Mono is installed in '${MONO_DIR}'"
 
 # Write the systemd service descriptor
-cat >"/etc/systemd/system/${jackettservice}" <<EOL
+JACKETT_SERVICE_PATH="/etc/systemd/system/${JACKETT_SERVICE}"
+echo "Creating Jackett unit file in '${JACKETT_SERVICE_PATH}' ..."
+cat > "${JACKETT_SERVICE_PATH}" <<EOL
 [Unit]
 Description=Jackett Daemon
 After=network.target
@@ -47,36 +79,39 @@ SyslogIdentifier=jackett
 Restart=always
 RestartSec=5
 Type=simple
-User=${jackettuser}
-Group=${jackettuser}
-WorkingDirectory=${jackettdir}
-ExecStart=${monodir}/mono --debug ${jackettdir}/JackettConsole.exe --NoRestart
-TimeoutStopSec=20
+User=${JACKETT_USER}
+Group=${JACKETT_USER}
+WorkingDirectory=${JACKETT_DIR}
+ExecStart="${MONO_DIR}/mono" --debug "${JACKETT_DIR}/JackettConsole.exe" --NoRestart
+TimeoutStopSec=30
 
 [Install]
 WantedBy=multi-user.target
 
 EOL
+if [ $? -ne 0 ]; then
+    echo "${BOLDRED}ERROR${NC}: Can not create the file '${JACKETT_SERVICE_PATH}'"
+    echo "The UnitPath of systemd changes from one distribution to another. You may have to edit the script and change the path manually."
+    exit 1
+fi
 
+echo "Installing Jackett service ..."
 # Reload systemd daemon
-systemctl daemon-reload
+if ! systemctl daemon-reload; then
+    echo "${BOLDRED}ERROR${NC}: Can not reload systemd daemon"
+    exit 1
+fi
 
 # Enable the service for following restarts
-systemctl enable ${jackettservice}
+if ! systemctl enable "${JACKETT_SERVICE}"; then
+    echo "${BOLDRED}ERROR${NC}: Can not enable the service '${JACKETT_SERVICE}'"
+    exit 1
+fi
 
 # Run the service
-systemctl start ${jackettservice}
-
-# Check that it's running
-if [[ $(systemctl status ${jackettservice} | grep "active (running)") ]]; then
-    echo "${BOLDGREEN}Agent successfully installed and launched!${NC}"
+if systemctl start "${JACKETT_SERVICE}"; then
+    echo "${BOLDGREEN}Service successfully installed and launched!${NC}"
 else
-    cat << EOL
-${BOLDRED}ERROR${NC}: Could not launch service. 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}\`
-Jackett user: \`${jackettuser}\`
-
-EOL
+    echo "${BOLDRED}ERROR${NC}: Can not start the service '${JACKETT_SERVICE}'"
+    exit 1
 fi

jackett_launcher.sh

@@ -7,12 +7,12 @@
 JACKETT_DIR="$(dirname "$(readlink -f "$0")")"
 
 # Launch Jackett
-${JACKETT_DIR}/jackett --NoRestart
+"${JACKETT_DIR}/jackett" --NoRestart
 
 # Get user running the service
 JACKETT_USER=$(whoami)
 
 # Wait until the updater ends
-while pgrep -u ${JACKETT_USER} JackettUpdater > /dev/null; do
+while pgrep -u "${JACKETT_USER}" JackettUpdater > /dev/null; do
      sleep 1
 done

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

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://www.3dtorrents.org/
+    - http://www.3dtorrents.org/ # site does not support https ERR_CONNECTION_CLOSED
 
   caps:
     categorymappings:
@@ -60,7 +60,7 @@
       - selector: span.errormsg
     test:
       path: index.php
-        
+
   search:
     paths:
       - path: index.php

src/Jackett.Common/Definitions/52pt.yml

@@ -22,7 +22,7 @@
       - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -103,7 +103,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/7torrents.yml

@@ -20,7 +20,7 @@
   settings:
     - name: info
       type: info
-      default: 7torrents does not use categories. In your software Indexer settings, set the category to 100001.
+      default: 7torrents does not use categories. In your software Indexer settings, set the category to 7000.
     - name: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/alein.yml

@@ -1,146 +0,0 @@
----
-  site: alein
-  name: Alein
-  description: "Alein is a BULGARIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
-  language: bg
-  type: semi-private
-  encoding: UTF-8
-  links:
-    - http://alein.org/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies/SD, desc: "Movies-XviD"}
-      - {id: 15, cat: Movies/HD, desc: "Movies-x264"}
-      - {id: 41, cat: Movies, desc: "Movies-BG"}
-      - {id: 14, cat: Movies/HD, desc: "Movies-HD"}
-      - {id: 48, cat: Movies/UHD, desc: "Movies-x265"}
-      - {id: 39, cat: Movies/Foreign, desc: "Movies-XviD-Rus"}
-      - {id: 40, cat: Movies/Foreign, desc: "Movies-x264-Rus"}
-      - {id: 20, cat: Movies/Other, desc: "Movies-Animations"}
-      - {id: 16, cat: Movies/3D, desc: "Movies-3D"}
-      - {id: 5, cat: TV/Anime, desc: "Movies-Anime"}
-      - {id: 21, cat: Movies/BluRay, desc: "Movies-Blu-ray"}
-      - {id: 22, cat: TV/Documentary , desc: "Movies-Documentaries"}
-      - {id: 11, cat: Movies/DVD, desc: "Movies-DVD-R"}
-      - {id: 47, cat: TV/SD, desc: "TV-Episodes"}
-      - {id: 46, cat: TV/HD, desc: "TV-Episodes-HD"}
-      - {id: 3, cat: PC/ISO, desc: "Games-PC ISO"}
-      - {id: 31, cat: Console/Xbox, desc: "Games-XBOX"}
-      - {id: 33, cat: Console/PSP, desc: "Games-PS"}
-      - {id: 2, cat: Audio/MP3, desc: "Music-MP3"}
-      - {id: 50, cat: Audio/Lossless, desc: "Music-FLAC"}
-      - {id: 18, cat: Audio/Video, desc: "Music-Video"}
-      - {id: 9, cat: PC/0day, desc: "Software-Windows"}
-      - {id: 8, cat: PC, desc: "Software-Linux"}
-      - {id: 36, cat: Other, desc: "Trailer"}
-      - {id: 34, cat: Other/Misc, desc: "Pictures"}
-      - {id: 4, cat: Other, desc: "Other"}
-      - {id: 6, cat: Books/Comics, desc: "Books-Comics"}
-      - {id: 24, cat: PC/Phone-Other, desc: "Mobile-GSM"}
-      - {id: 23, cat: TV/Sport, desc: "Sport"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-    - name: sort
-      type: select
-      label: Sort requested from site
-      default: "3"
-      options:
-        "3": "created"
-        "5": "seeders"
-        "4": "size"
-        "2": "title"
-    - name: type
-      type: select
-      label: Order requested from site
-      default: "2"
-      options:
-        "2": "desc"
-        "1": "asc"
-
-  login:
-    path: index.php?page=login
-    method: form
-    form: form[action*="/index.php?page=login"]
-    inputs:
-      uid: "{{ .Config.username }}"
-      pwd: "{{ .Config.password }}"
-    error:
-      - selector: td.lista span[style="color:#FF0000;"]
-    test:
-      path: /
-      selector: a[href="logout.php"]
-
-  search:
-    paths:
-      # http://alein.org/index.php?page=torrents&category=1;15;41;14;48;39;20;16;5;21;22;11&search=venom&active=1
-      - path: index.php
-    inputs:
-      page: torrents
-      category: "{{ range .Categories }}{{.}};{{end}}"
-      search: "{{ .Keywords }}"
-      # 0 all 1 active only 2 dead only
-      active: 0
-      order: "{{ .Config.sort }}"
-      by: "{{ .Config.type }}"
-
-    rows:
-      selector: tr.trclass:not(:has(td.lista-cat-rec))
-
-    fields:
-      title:
-        selector: td a[href*="id="]
-      details:
-        selector: td a[href*="id="]
-        attribute: href
-      category:
-        selector: td a[href*="category="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: category
-      download:
-        selector: td a[href*="id="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: id
-          - name: prepend
-            args: "download.php?id="
-          - name: append
-            args: "&f={{ .Result.title }}.torrent"
-      banner:
-        selector: td a[href*="id="]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: "src=(.+?) width="
-      size:
-        selector: td:nth-child(6)
-      seeders:
-        selector: td:nth-child(7)
-      leechers:
-        selector: td:nth-child(8)
-      grabs:
-        selector: td:nth-child(9)
-      date:
-        selector: td:nth-child(5)
-        filters:
-          - name: dateparse
-            args: "02/01/2006"
-      downloadvolumefactor:
-        text: 0
-      uploadvolumefactor:
-        text: 1
-# xbtit 2.3

src/Jackett.Common/Definitions/amigosshare.yml

@@ -158,8 +158,10 @@
     keywordsfilters:
       - name: re_replace
         args: ["([12][0-9]{3})", ""]
+
     rows:
       selector: div#fancy-list-group ul.list-group li.list-group-item
+
     fields:
       _quality:
         selector: div.list-group-item-content p.m-0 span.badge-primary:contains("1080p"), div.list-group-item-content p.m-0 span.badge-primary:contains("720p"), div.list-group-item-content p.m-0 span.badge-primary:contains("4k")
@@ -196,69 +198,70 @@
         attribute: src
         case:
         # unfortunately the site does not have category numbers on the results page, just a .png which can apply to both movies and tv.
-        # therefore I've order the list to favour movies, 
+        # therefore I've order the list to favour movies,
         # also, not all .png have been verified as the site has many empty categories. their image names have been extrapolated from the cat desc.
-         "[src$=\"/XXXZ.png\"]": "74"
-         "[src$=\"/Hentai.png\"]": "75"
-         "[src$=\"/Anime.png\"]": "69"
-         "[src$=\"/Windows.png\"]": "21"
-         "[src$=\"/Mac.png\"]": "22"
-         "[src$=\"/Android.png\"]": "23"
-         "[src$=\"/Linux.png\"]": "25"
-         "[src$=\"/iPhone.png\"]": "26"
-         "[src$=\"/iPad.png\"]": "27"
-         "[src$=\"/iPod.png\"]": "28"
-         "[src$=\"/Cursos.png\"]": "71"
-         "[src$=\"/Apostila.png\"]": "72"
-         "[src$=\"/E-books.png\"]": "67"
-         "[src$=\"/Revista.png\"]": "68"
-         "[src$=\"/HQ.png\"]": "112"
-         "[src$=\"/Filmes.png\"]": "119"
-         "[src$=\"/Revistas-XXX.png\"]": "70"
-         "[src$=\"/PS4.png\"]": "79"
-         "[src$=\"/Jogos-PC.png\"]": "47"
-         "[src$=\"/Emulador.png\"]": "61"
-         "[src$=\"/Emulacao.png\"]": "109"
-         "[src$=\"/Jogos-Mac.png\"]": "48"
-         "[src$=\"/Jogos-PS1.png\"]": "49"
-         "[src$=\"/Jogos-PS2.png\"]": "50"
-         "[src$=\"/Jogos-PS3.png\"]": "51"
-         "[src$=\"/Jogos-Dreamcast.png\"]": "52"
-         "[src$=\"/Jogos-Xbox360.png\"]": "54"
-         "[src$=\"/Jogos-Xbox.png\"]": "56"
-         "[src$=\"/Jogos-Wii.png\"]": "55"
-         "[src$=\"/Jogos-DS.png\"]": "58"
-         "[src$=\"/jogosandroid.png\"]": "57"
-         "[src$=\"/Jogos-PSP.png\"]": "82"
-         "[src$=\"/Jogos-NS.png\"]": "110"
-         "[src$=\"/Jogos-XboxOne.png\"]": "78"
-         "[src$=\"/Axe.png\"]": "29"
-         "[src$=\"/Funk.png\"]": "31"
-         "[src$=\"/Pagode.png\"]": "32"
-         "[src$=\"/HIP_HOP.png\"]": "33"
-         "[src$=\"/Rap.png\"]": "34"
-         "[src$=\"/Rock.png\"]": "36"
-         "[src$=\"/Hard-Rock.png\"]": "37"
-         "[src$=\"/Blues.png\"]": "38"
-         "[src$=\"/Dance.png\"]": "39"
-         "[src$=\"/Discografia.png\"]": "40"
-         "[src$=\"/Erudita.png\"]": "41"
-         "[src$=\"/Forro.png\"]": "42"
-         "[src$=\"/Dubstep.png\"]": "43"
-         "[src$=\"/Sertanejo.png\"]": "46"
-         "[src$=\"/Samba.png\"]": "45"
-         "[src$=\"/Musica-Outros.png\"]": "77"
-         "[src$=\"/Reggae.png\"]": "76"
-         "[src$=\"/Gospel.png\"]": "83"
-         "[src$=\"/POP.png\"]": "115"
-         "[src$=\"/MPB.png\"]": "114"
-         "[src$=\"/OST.png\"]": "84"
-         "[src$=\"/Seriados.png\"]": "120"
-         "[src$=\"/Shows.png\"]": "65"
-         "[src$=\"/Aberta.png\"]": "63"
-         "[src$=\"/Esporte.png\"]": "62"
-         "[src$=\"/Fechada.png\"]": "64"
-         "[src$=\"/Videoaula.png\"]": "73"
+         "[src$=\"/XXXZ.png\"]": 74
+         "[src$=\"/Hentai.png\"]": 75
+         "[src$=\"/Anime.png\"]": 69
+         "[src$=\"/Windows.png\"]": 21
+         "[src$=\"/Mac.png\"]": 22
+         "[src$=\"/Android.png\"]": 23
+         "[src$=\"/Linux.png\"]": 25
+         "[src$=\"/iPhone.png\"]": 26
+         "[src$=\"/iPad.png\"]": 27
+         "[src$=\"/iPod.png\"]": 28
+         "[src$=\"/Cursos.png\"]": 71
+         "[src$=\"/Apostila.png\"]": 72
+         "[src$=\"/E-books.png\"]": 67
+         "[src$=\"/Revista.png\"]": 68
+         "[src$=\"/HQ.png\"]": 112
+         "[src$=\"/Filmes.png\"]": 119
+         "[src$=\"/Revistas-XXX.png\"]": 70
+         "[src$=\"/PS4.png\"]": 79
+         "[src$=\"/Jogos-PC.png\"]": 47
+         "[src$=\"/Emulador.png\"]": 61
+         "[src$=\"/Emulacao.png\"]": 109
+         "[src$=\"/Jogos-Mac.png\"]": 48
+         "[src$=\"/Jogos-PS1.png\"]": 49
+         "[src$=\"/Jogos-PS2.png\"]": 50
+         "[src$=\"/Jogos-PS3.png\"]": 51
+         "[src$=\"/Jogos-Dreamcast.png\"]": 52
+         "[src$=\"/Jogos-Xbox360.png\"]": 54
+         "[src$=\"/Jogos-Xbox.png\"]": 56
+         "[src$=\"/Jogos-Wii.png\"]": 55
+         "[src$=\"/Jogos-DS.png\"]": 58
+         "[src$=\"/jogosandroid.png\"]": 57
+         "[src$=\"/Jogos-PSP.png\"]": 82
+         "[src$=\"/Jogos-NS.png\"]": 110
+         "[src$=\"/Jogos-XboxOne.png\"]": 78
+         "[src$=\"/Axe.png\"]": 29
+         "[src$=\"/Funk.png\"]": 31
+         "[src$=\"/Pagode.png\"]": 32
+         "[src$=\"/HIP_HOP.png\"]": 33
+         "[src$=\"/Rap.png\"]": 34
+         "[src$=\"/Rock.png\"]": 36
+         "[src$=\"/Hard-Rock.png\"]": 37
+         "[src$=\"/Blues.png\"]": 38
+         "[src$=\"/Dance.png\"]": 39
+         "[src$=\"/Discografia.png\"]": 40
+         "[src$=\"/Erudita.png\"]": 41
+         "[src$=\"/Forro.png\"]": 42
+         "[src$=\"/Dubstep.png\"]": 43
+         "[src$=\"/Sertanejo.png\"]": 46
+         "[src$=\"/Samba.png\"]": 45
+         "[src$=\"/Musica-Outros.png\"]": 77
+         "[src$=\"/Reggae.png\"]": 76
+         "[src$=\"/Gospel.png\"]": 83
+         "[src$=\"/POP.png\"]": 115
+         "[src$=\"/MPB.png\"]": 114
+         "[src$=\"/OST.png\"]": 84
+         "[src$=\"/Seriados.png\"]": 120
+         "[src$=\"/Shows.png\"]": 65
+         "[src$=\"/Aberta.png\"]": 63
+         "[src$=\"/Esporte.png\"]": 62
+         "[src$=\"/Fechada.png\"]": 64
+         "[src$=\"/Videoaula.png\"]": 73
+         "*": 999
       date:
         text: now
       date:
@@ -284,5 +287,5 @@
           "span.badge-success:contains(\"FREE\")": 0
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
+# engine n/a

src/Jackett.Common/Definitions/arabafenice.yml

@@ -65,7 +65,7 @@
       - {id: 32, cat: PC/Phone-Android, desc: "Android APP"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 

src/Jackett.Common/Definitions/asgaard.yml

@@ -57,7 +57,7 @@
       - {id: 43, cat: Books/Technical, desc: "Books Education"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -104,7 +104,7 @@
     test:
       path: /
       selector: a[href$="/logout.php"]
-      
+
   search:
     paths:
     # https://asgrd.org/browse.php?sns=&sna=&spf=&sr=&sg=&sys=&sye=&srs=&sre=&si=tt2401090&ss=&incldead=0&only_free=0&sort=4&type=desc
@@ -178,6 +178,5 @@
           img[src="./images/gold.png"]: 0
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # Midgaard

src/Jackett.Common/Definitions/asiancinema.yml

@@ -15,7 +15,7 @@
       - {id: 3, cat: Audio, desc: "Music"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://audiobookbay.nl/
+    - http://audiobookbay.nl/ # site forces http, does not support https
   legacylinks:
     - https://audiobookbay.la/
 

src/Jackett.Common/Definitions/awesomehd.yml

@@ -40,6 +40,10 @@
       options:
         "desc": "desc"
         "asc": "asc"
+    - name: info_login
+      type: info
+      label: "Password Changes"
+      default: "This site forces you to change your <b>Password</b> every <b>90 days</b>.<br/>If you get a <b>Login Failed, got redirected</b> error, then access the site with your browser and check if you need to change your password. Logout after saving, and update this config to login."
 
   login:
     path: login.php
@@ -65,7 +69,7 @@
       order_way: "{{ .Config.type }}"
 
     rows:
-      selector: table#torrent_table > tbody > tr.group, tr.torrent, tr.group_torrent:not(.edition_info) 
+      selector: table#torrent_table > tbody > tr.group, tr.torrent, tr.group_torrent:not(.edition_info)
 
     fields:
       download:

src/Jackett.Common/Definitions/baibako.yml

@@ -1,12 +1,12 @@
 ---
   site: baibako
   name: BaibaKo
-  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
+  description: "BaibaKo is a RUSSIAN Private Torrent Tracker for TV"
   language: ru-ru
-  type: semi-private
+  type: private
   encoding: windows-1251
   links:
-    - http://baibako.tv/
+    - http://baibako.tv/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/beitai.yml

@@ -21,7 +21,7 @@
       - {id: 408, cat: Audio, desc: "HQ Audio/无损音乐"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -96,7 +96,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href
@@ -148,4 +148,4 @@
       description:
         selector: td:nth-child(2)
         remove: a, img
-# NexusPHP 	Standard v1.5 Beta 4
+# NexusPHP Standard v1.5 Beta 4

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

@@ -35,7 +35,7 @@
       - {id: 2, cat: TV, desc: "TV"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -50,8 +50,8 @@
     paths:
       - path: torrents
     inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
@@ -114,6 +114,5 @@
           i[data-original-title="75% Promo"]: 0.25
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # UNIT3D

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

@@ -14,7 +14,7 @@
       - {id: 2, cat: TV, desc: "TV"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -126,6 +126,5 @@
           i[data-original-title="75% Promo"]: 0.25
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # UNIT3D

src/Jackett.Common/Definitions/bigtorrent.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://www.bigtorrent.eu/
+  legacylinks:
     - http://www.bigtorrent.eu/
 
   caps:

src/Jackett.Common/Definitions/bigtower.yml

@@ -6,14 +6,16 @@
   type: private
   encoding: UTF-8
   links:
-    - http://bigtower.info/
+    - http://bigtower.info/ # site does not support https NET::ERR_CERT_DATE_INVALID
+  legacylinks:
+    - https://bigtower.info/
 
   caps:
     categorymappings:
 
       # Movies
       - {id: 11, cat: Movies/HD, desc: "DSS"}
-      - {id: 1, cat: Movies, desc: "Screener"}     
+      - {id: 1, cat: Movies, desc: "Screener"}
       - {id: 2, cat: Movies, desc: "DVDRip & BDRip"}
       - {id: 3, cat: Movies/BluRay, desc: "Bluray 1080p & 720p"}
       - {id: 5, cat: Movies/UHD, desc: "Ultra HD 4K"}
@@ -25,10 +27,10 @@
 
       # MUSIC
       - {id: 8, cat: Audio, desc: "Musica"}
-    
+
       # SOFTWARE
       - {id: 9, cat: PC/0day, desc: "Software"}
-    
+
       # PHONE
       - {id: 12, cat: PC/Phone-Other, desc: "Applicazioni"}
 

src/Jackett.Common/Definitions/bithumen.yml

@@ -42,8 +42,8 @@
       - {id: 27, cat: Other, desc: "Klipek"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
   login:
@@ -61,13 +61,15 @@
     paths:
       - path: browse.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       incldead: 1
+
     rows:
       selector: table#torrenttable > tbody > tr:has(a[href^="details.php?id="])
       filters:
         - name: andmatch
+
     fields:
 # download button can be disbled in the profile, use details link instead
 #      download:
@@ -156,3 +158,4 @@
             args: ["tegnap", "yesterday"]
       description:
         selector: td:nth-child(2) > div
+# engine tbd

src/Jackett.Common/Definitions/bitru.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://bitru.org/
+    - http://bitru.org/ # site forces http, https is not supported
 
   caps:
     categories:
@@ -84,8 +84,8 @@
           - name: regexp
             args: "src=(.*?) "
       date:
-        # Сегодня в 09:09 от 
-        # Вчера в 22:47 от 
+        # Сегодня в 09:09 от
+        # Вчера в 22:47 от
         selector: td:nth-child(2) div.b-info div span:nth-child(2):contains("Сегодня"),  td:nth-child(2) div.b-info div span:nth-child(2):contains("Вчера")
         optional: true
         filters:
@@ -96,7 +96,7 @@
           - name: replace
             args: ["Вчера в", "Yesterday"]
       date:
-        # 08 ноября 2019 в 23:53 от 
+        # 08 ноября 2019 в 23:53 от
         selector: td:nth-child(2) div.b-info div span:nth-child(2):not(:contains("Сегодня")):not(:contains("Вчера"))
         optional: true
         filters:
@@ -134,7 +134,7 @@
         selector: td:nth-child(3)
         filters:
           - name: replace
-            args: ["ТБ", "TB"] 
+            args: ["ТБ", "TB"]
           - name: replace
             args: ["ГБ", "GB"]
           - name: replace
@@ -145,12 +145,12 @@
         selector: td:nth-child(4)
         filters:
           - name: replace
-            args: ["?", "1"] 
+            args: ["?", "1"]
       leechers:
-        selector: td:nth-child(5) 
+        selector: td:nth-child(5)
         filters:
           - name: replace
-            args: ["?", "0"] 
+            args: ["?", "0"]
       downloadvolumefactor:
         text: 0
       uploadvolumefactor:

src/Jackett.Common/Definitions/bitturk.yml

@@ -6,8 +6,8 @@
   type: private
   encoding: UTF-8
   links:
-    - http://www.bitturk.net/
-  
+    - http://www.bitturk.net/ # site does not support https ERR_CONNECTION_REFUSED
+
   caps:
     categorymappings:
       - {id: 69, cat: Movies, desc: "BiTTuRK Altın"}
@@ -52,12 +52,12 @@
       - {id: 50, cat: TV, desc: "Yab@ncı Dizi"}
       - {id: 51, cat: TV, desc: "Yerli Dizi"}
       - {id: 44, cat: Books, desc: "E-BooK"}
-      
+
     modes:
       search: [q]
       tv-search: [q, season, ep]
       movie-search: [q]
-      
+
   settings:
     - name: username
       type: text
@@ -84,7 +84,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-      
+
   login:
     path: ?p=home&pid=1
     method: form
@@ -106,11 +106,11 @@
     test:
       path: ?p=home&pid=1
       selector: a[href*="/?p=logout&"]
-      
+
   search:
     paths:
       - path: /
-    keywordsfilters: 
+    keywordsfilters:
       - name: re_replace
         args: ["[^a-zA-Z0-9]+", "%25"]
     inputs:
@@ -145,7 +145,7 @@
         attribute: href
       date:
         optional: true
-         # Uploaded 30-01-2019 15:02 by 
+         # Uploaded 30-01-2019 15:02 by
         selector: td.torrent_name:not(:contains(" at "))
         filters:
           - name: regexp

src/Jackett.Common/Definitions/blutopia.yml

@@ -15,7 +15,7 @@
       - {id: 3, cat: Movies, desc: "FANRES"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -51,7 +51,7 @@
     test:
       path: /
       selector: a[href$="/logout"]
-      
+
   ratio:
     path: /
     selector: li:has(i.fa-sync-alt)

src/Jackett.Common/Definitions/broadcity.yml

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

src/Jackett.Common/Definitions/brobits.yml

@@ -15,7 +15,7 @@
       - {id: 410, cat: TV, desc: "TV Series/剧集"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -43,7 +43,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-          
+
   login:
     method: cookie
     inputs:
@@ -86,7 +86,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/btdigg.yml

@@ -20,7 +20,7 @@
   settings:
     - name: info
       type: info
-      default: BTDigg does not use categories. In your software Indexer settings, set the category to 100001.
+      default: BTDigg does not use categories. In your software Indexer settings, set the category to 7000.
     - name: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/bteye.yml

@@ -20,7 +20,7 @@
   settings:
     - name: info
       type: info
-      default: BTeye does not use categories. In your software Indexer settings, set the category to 100001.
+      default: BTeye does not use categories. In your software Indexer settings, set the category to 7000.
 
   download:
     selector: a[href^="magnet:?xt="]

src/Jackett.Common/Definitions/btnext.yml

@@ -6,8 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://tracker.btnext.com/
-    # note: the site forces http, https is not supported
+    - http://tracker.btnext.com/ # site forces http, https is not supported
 
   caps:
     categorymappings:
@@ -149,7 +148,7 @@
   search:
     paths:
       - path: /
-    keywordsfilters: 
+    keywordsfilters:
       - name: re_replace
         args: ["[^a-zA-Z0-9]+", "%25"]
     inputs:

src/Jackett.Common/Definitions/btschool.yml

@@ -23,7 +23,7 @@
       - {id: 415, cat: Other, desc: "其他/Other"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -78,7 +78,7 @@
         attribute: title
       details:
         selector: a[title][href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://www.cartoonchaos.org/
+    - http://www.cartoonchaos.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
 
   settings:
     - name: username
@@ -115,6 +115,14 @@
             args: [" http://anonym.to?javascript:popdetails('", ""]
           - name: replace
             args: ["');", ""]
+      banner:
+        selector: td a[href^="index.php?page=torrent-details"]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) width"
+          - name: replace
+            args: ["torrentimg/nocover.jpg", ""]
       size:
         selector: td:nth-child(10)
         # two flavours of dates

src/Jackett.Common/Definitions/channelx.yml

@@ -18,7 +18,7 @@
       - {id: 4, cat: TV/Sport, desc: "Sports"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -85,8 +85,10 @@
       sort: "{{ .Config.sort }}"
       direction: "{{ .Config.type }}"
       qty: 100
+
     rows:
       selector: table > tbody > tr
+
     fields:
       category:
         selector: a[href*="/categories/"]

src/Jackett.Common/Definitions/cili180.yml

@@ -6,9 +6,10 @@
   type: public
   encoding: UTF-8
   links:
-    -  http://www.cilijj.xyz/
+    -  https://www.cilijj.xyz/
   legacylinks:
     -  http://www.cili180.com/
+    -  http://www.cilijj.xyz/
 
   caps:
     categories:

src/Jackett.Common/Definitions/classix.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://classix-unlimited.co.uk/
+    - http://classix-unlimited.co.uk/ # site does not support https ERR_CONNECTION_CLOSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,7 +7,7 @@
   encoding: UTF-8
   followredirect: true
   links:
-    - https://vww.cpasbien-fr.fr/
+    - https://wvw.cpasbien-fr.fr/
   legacylinks:
     - http://www.cpasbiens.cc/
     - http://www.cpabien.cm/
@@ -38,6 +38,7 @@
     - https://www.cpasbien.vg/
     - https://www.cpasbien.lol/
     - https://www.gktorrent.biz/
+    - https://vww.cpasbien-fr.fr/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/crazyscorner.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://crazys-corner.info/
+    - http://crazys-corner.info/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/cztorrent.yml

@@ -79,6 +79,10 @@
 
     rows:
       selector: tr.torr_hover
+     
+    keywordsfilters:
+      - name: re_replace
+        args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
 
     fields:
       title:

src/Jackett.Common/Definitions/desireleasers.yml

@@ -17,7 +17,7 @@
       - {id: 5, cat: Console, desc: "Game"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 

src/Jackett.Common/Definitions/documentarytorrents.yml

@@ -88,7 +88,7 @@
       label: Sort requested from site
       default: "id"
       options:
-        "is": "created"
+        "id": "created"
         "seeders": "seeders"
         "size": "size"
         "name": "title"

src/Jackett.Common/Definitions/downloadville.yml

@@ -192,6 +192,8 @@
   search:
     paths:
       - path: tracker/index.php
+    headers:
+      Referer: ["https://downloadville.net/tracker/index.php?page=torrents&search=fake_referer&active=0"]
     inputs:
       page: torrents
       search: "{{ .Keywords }}"

src/Jackett.Common/Definitions/dxdhd.yml

@@ -24,7 +24,7 @@
       - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 

src/Jackett.Common/Definitions/eggmeon.yml

@@ -1,140 +0,0 @@
----
-  site: eggmeon
-  name: EggMeOn
-  description: "EggMeOn is a Private Torrent Tracker for nostalgic TV / CONSOLE / PODCASTS"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://www.eggmeon.xyz/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: TV, desc: "AdultSwim"}
-      - {id: 2, cat: TV/Anime, desc: "Animation"}
-      - {id: 14, cat: Audio, desc: "Audio"}
-      - {id: 3, cat: TV, desc: "Cartoon Network"}
-      - {id: 4, cat: TV, desc: "Comedy"}
-      - {id: 5, cat: TV, desc: "Disney"}
-      - {id: 6, cat: Console, desc: "Games"}
-      - {id: 7, cat: TV, desc: "MST3K"}
-      - {id: 8, cat: Audio/Video, desc: "MTV"}
-      - {id: 9, cat: TV, desc: "Nickelodeon"}
-      - {id: 10, cat: Movies, desc: "Other"}
-      - {id: 13, cat: Audio/Other, desc: "Podcast"}
-      - {id: 11, cat: Books, desc: "Publication"}
-      - {id: 12, cat: Movies, desc: "Star Wars"}
-
-    modes:
-      search: [q]
-      tv-search: [q]
-      movie-search: [q]
-
-  settings:
-    - name: username
-      type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
-    - name: sort
-      type: select
-      label: Sort requested from site
-      default: "time"
-      options:
-        "time": "created"
-        "seeders": "seeders"
-        "size": "size"
-    - name: type
-      type: select
-      label: Order requested from site
-      default: "desc"
-      options:
-        "desc": "desc"
-        "asc": "asc"
-
-  login:
-    path: login
-    method: form
-    form: form[action="/login"]
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      cinfo: "1536|864|24|-780"
-      iplocked: 0
-      keeploggedin: 1
-      submit: login
-    selectorinputs:
-      token:
-        selector: input[name="token"]
-        attribute: value
-    error:
-      - selector: table#maincontent tr td div div#messagebarA
-
-  search:
-    paths:
-      - path: torrents.php
-    inputs:
-      $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-      order_by: "{{ .Config.sort }}"
-      order_way: "{{ .Config.type }}"
-      searchtext: ""
-      action: advanced
-      title: "{{ .Keywords }}"
-      sizeall: ""
-      sizetype: gb
-      sizerange: 0.01
-      filelist: ""
-      taglist: ""
-      autocomplete_toggle: 1
-
-    rows:
-      selector: table#torrent_table tr:has(a[href^="torrents.php?action=download"])
-
-    fields:
-      category:
-        selector: a[href^="/torrents.php?filter_cat"]
-        attribute: href
-        filters:
-          - name: regexp
-            args: "(\\d+)]=1"
-      title:
-        selector: a[href^="/torrents.php?id="]
-      details:
-        selector: a[href^="/torrents.php?id="]
-        attribute: href
-      download:
-        selector: a[href^="torrents.php?action=download"]
-        attribute: href
-      description:
-        selector: div.tags
-      banner:
-        selector: td:nth-child(2) > script
-        filters:
-          - name: regexp
-            args: "src=\\\\\"(.*?)\\\\\">"
-          - name: re_replace
-            args: ["\\\\(.)", "$1"]
-          - name: replace
-            args: ["/static/common/noartwork/noimage.png", ""]
-      files:
-        selector: td:nth-last-child(8)
-      date:
-        selector: td:nth-last-child(6)
-        filters:
-          - name: timeago
-      size:
-        selector: td:nth-last-child(5)
-      grabs:
-        selector: td:nth-last-child(4)
-      seeders:
-        selector: td:nth-last-child(3)
-      leechers:
-        selector: td:nth-last-child(2)
-      downloadvolumefactor:
-        case:
-          "img[alt=\"Freeleech\"]": 0
-          "*": 1
-      uploadvolumefactor:
-        text: 1
-# luminance

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

@@ -74,6 +74,9 @@
       download:
         selector: .meta a
         attribute: href
+      banner:
+        selector: .imagen img
+        attribute: data-src
       category:
         selector: .meta a
         attribute: href

src/Jackett.Common/Definitions/esharenet.yml

@@ -41,7 +41,7 @@
       - {id: 31, cat: TV, desc: "Subtitles - english subs"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 

src/Jackett.Common/Definitions/estone.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://estone.cc/
+    - http://estone.cc/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/ethor.yml

@@ -36,8 +36,8 @@
       - {id: 9, cat: XXX, desc: "XXX"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
   settings:
@@ -57,9 +57,9 @@
       default: MULTI.FRENCH
       options:
         FRENCH : "FRENCH"
-        MULTI.FRENCH : "MULTI.FRENCH" 
+        MULTI.FRENCH : "MULTI.FRENCH"
         ENGLISH: "ENGLISH"
-      
+
   login:
     path: login3.php
     method: form
@@ -85,15 +85,17 @@
     paths:
       - path: browse.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
-      advcat: "0"
-      incldead: "1"
-      stype: "b"
-      dp: "0"
-      isUserClick: "0"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      advcat: 0
+      incldead: 1
+      stype: b
+      dp: 0
+      isUserClick: 0
+
     rows:
       selector: p + table > tbody > tr:has(a[href^="/details.php"])
+
     fields:
       download:
         selector: a[href^="/details.php"]:has(b)
@@ -154,9 +156,9 @@
             args: "2006-01-0215:04:05 -07:00"
       downloadvolumefactor:
         case:
-          "img[title^=\"Freeleech: \"]": "0"
-          "img[title^=\"Half Freeleech: \"]": "0.5"
-          "*": "1"
+          "img[title^=\"Freeleech: \"]": 0
+          "img[title^=\"Half Freeleech: \"]": 0.5
+          "*": 1
       uploadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
+# engine tbd

src/Jackett.Common/Definitions/filebase.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://www.filebase.ws/ # https is not supported
+    - http://www.filebase.ws/ # https is not supported ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:
@@ -182,7 +182,7 @@
         selector: td:nth-child(5)
         filters:
           - name: replace
-            args: ["ТБ", "TB"] 
+            args: ["ТБ", "TB"]
           - name: replace
             args: ["ГБ", "GB"]
           - name: replace

src/Jackett.Common/Definitions/freetorrent.yml

@@ -28,7 +28,7 @@
       - {id: 15, cat: PC/Phone-Android, desc: "Apps APK"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -70,7 +70,7 @@
     test:
       path: /
       selector: a[href$="/logout"]
-      
+
   ratio:
     path: /
     selector: li:has(i.fa-sync-alt)

src/Jackett.Common/Definitions/funkytorrents.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://funkytorrents.com/
+    - http://funkytorrents.com/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categories:

src/Jackett.Common/Definitions/galeriens.yml

@@ -182,12 +182,19 @@
       movie-search: [q]
 
   settings:
-    - name: username
+#    - name: username
+#      type: text
+#      label: Username
+#    - name: password
+#      type: password
+#      label: Password
+    - name: cookie
       type: text
-      label: Username
-    - name: password
-      type: password
-      label: Password
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
     - name: torrentlanguage
       type: select
       label: Torrent Language
@@ -220,13 +227,16 @@
         "23": "Ukrainien"
 
   login:
-    path: TTV3/Connexion
-    method: post
+#    path: TTV3/Connexion
+#    method: post
+#    inputs:
+#      username: "{{ .Config.username }}"
+#      password: "{{ .Config.password }}"
+#    error:
+#      - selector: font[color="red"]
+    method: cookie
     inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: font[color="red"]
+      cookie: "{{ .Config.cookie }}"
     test:
       path: TTV3/Bienvenue
       selector: a[href$="/TTV3/Deconnexion"]
@@ -246,7 +256,7 @@
       type: "tout"
       # searchin  nomtorrent (name) or desctorrent (descr)
       endroit: "nomtorrent"
-      # language 11 french 17 multi 
+      # language 11 french 17 multi
       langue: "{{ .Config.torrentlanguage }}"
       # freeleech oui (yes) non (no) peuimporte (ignore)
       tl: "peuimporte"
@@ -257,7 +267,7 @@
       category:
         selector: a[href*="/SousCategories/"]
         attribute: href
-        filters:        
+        filters:
           - name: regexp
             args: (\d+)$
       title:

src/Jackett.Common/Definitions/girotorrent.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://girotorrent.org/
+    - http://girotorrent.org/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/greeklegends.yml

@@ -1,187 +0,0 @@
----
-  site: greeklegends
-  name: GreekLegends
-  description: "Greek Legends is a Private Torrent Tracker for High Quality Content"
-  language: en-us
-  type: private
-  encoding: UTF-8
-  links:
-    - https://greeklegends.net/
-
-  caps:
-    categorymappings:
-      - {id: 1, cat: Movies, desc: "Movies"}
-      - {id: 2, cat: TV, desc: "TV"}
-      - {id: 3, cat: Audio, desc: "Music"}
-      - {id: 4, cat: PC, desc: "Apps"}
-      - {id: 5, cat: Books, desc: "Books"}
-      - {id: 6, cat: Console, desc: "Games"}
-      - {id: 7, cat: TV/Documentary, desc: "Documentaries"}
-      - {id: 8, cat: PC/Phone-Other, desc: "Mobile Apps"}
-      - {id: 9, cat: Other/Misc, desc: "misc"}
-      - {id: 10, cat: TV/Sport, desc: "Sports"}
-      - {id: 11, cat: TV/Anime, desc: "Anime/Cartoon"}
-
-    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: sort
-      type: select
-      label: Sort requested from site
-      default: "created_at"
-      options:
-        "created_at": "created"
-        "seeders": "seeders"
-        "size": "size"
-        "name": "title"
-    - name: type
-      type: select
-      label: Order requested from site
-      default: "desc"
-      options:
-        "desc": "desc"
-        "asc": "asc"
-
-  login:
-    path: login
-    method: form
-    inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-      remember: on
-    error:
-      - selector: script[nonce]:contains("Error")
-        message:
-          selector: script[nonce]:contains("Error")
-    test:
-      path: /
-      selector: a[href$="/logout"]
-
-  ratio:
-    path: /
-    selector: li:has(i.fa-sync-alt)
-    filters:
-      - name: regexp
-        args: "Ratio : (\\d+)"
-
-  search:
-    paths:
-      - path: torrents/filter
-    inputs:
-      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      description: ""
-      uploader: ""
-      imdb: "{{ .Query.IMDBIDShort }}"
-      tvdb: ""
-      tmdb: ""
-      mal: ""
-      igdb: ""
-      sorting: "{{ .Config.sort }}"
-      sort: "{{ .Config.sort }}"
-      direction: "{{ .Config.type }}"
-      qty: 100
-
-    rows:
-      selector: table > tbody > tr
-
-    fields:
-      category:
-        selector: a[href*="/categories/"]
-        attribute: href
-        filters:
-          - name: regexp
-            args: "/categories/(\\d+)"
-      title:
-        selector: a.view-torrent
-      download:
-        selector: a[href*="/download/"]
-        attribute: href
-      details:
-        selector: a.view-torrent
-        attribute: href
-      banner:
-        optional: true
-        selector: div.torrent-poster img
-        attribute: src
-        filters:
-          - name: replace
-            args: ["https://via.placeholder.com/600x900", ""]
-      comments:
-        selector: a[href*="#comments"]
-        attribute: href
-      size:
-        selector: td:nth-last-child(4)
-      seeders:
-        selector: td:nth-last-child(3)
-      leechers:
-        selector: td:nth-last-child(2)
-      grabs:
-        selector: td:nth-last-child(1)
-        filters:
-          - name: regexp
-            args: (\d+)
-      imdb:
-        optional: true
-        selector: a[href*="www.imdb.com/title/tt"]
-        attribute: href
-      date:
-        selector: time
-        filters:
-            # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese
-          - name: re_replace
-            args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前)", " ago"]
-          - name: re_replace
-            args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten)", "minutes"]
-          - name: re_replace
-            args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟)", " minute"]
-          - name: re_replace
-            args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden)", "hours"]
-          - name: re_replace
-            args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时)", " hour"]
-          - name: re_replace
-            args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen)", "days"]
-          - name: re_replace
-            args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天)", " day"]
-          - name: re_replace
-            args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken)", "weeks"]
-          - name: re_replace
-            args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周)", " week"]
-          - name: re_replace
-            args: ["(?i) (ay)", "month"]
-          - name: re_replace
-            args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden)", "months"]
-          - name: re_replace
-            args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月)", " month"]
-          - name: re_replace
-            args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-          - name: re_replace
-            args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-          - name: re_replace
-            args: ["(?i) (an)", "year"]
-      downloadvolumefactor:
-        case:
-          i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-          i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-          i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-          i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-          i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-          i[class*="fa-star text-gold"]: 0 # Freeleech
-          i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-          "*": 1
-      uploadvolumefactor:
-        case:
-          i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-          i[class*="fa-globe text-green"]: 2 # Global Double Upload
-          i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-          "*": 1
-# UNIT3D 2.2.7

src/Jackett.Common/Definitions/hamsterstudio.yml

@@ -6,7 +6,7 @@
   type: semi-private
   encoding: windows-1251
   links:
-    - http://hamsterstudio.org/
+    - http://hamsterstudio.org/ # site does not support https ERR_CONNECTION_TIMED_OUT
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/hd4fans.yml

@@ -21,7 +21,7 @@
       - {id: 408, cat: Audio, desc: "Music"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -81,7 +81,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hdarea.yml

@@ -30,9 +30,9 @@
       - {id: 408, cat: Audio, desc: "HQ Audio"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: username
@@ -84,7 +84,7 @@
     method: post
     inputs:
       $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       # 0 incldead 1 active 2 onlydead
       incldead: 1
       # 0 all 1 normal 2 free 2 2x 4 2xFree 5 50% 6 2x50% 7 30%
@@ -114,7 +114,7 @@
         attribute: title
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hdcenter.yml

@@ -28,7 +28,7 @@
       - {id: 16, cat: Audio/Video, desc: "Live"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -48,8 +48,8 @@
     paths:
       - path: torrents.php
     inputs:
-      $raw: "{{range .Categories}}filter_cat[{{.}}]=1&{{end}}"
-      searchstr: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+      searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
     rows:
       selector: table#torrent_table > tbody > tr.torrent
     fields:
@@ -97,9 +97,9 @@
         selector: td.leecher_col
       downloadvolumefactor:
         case:
-          "span.freeleech_slot": "0" # 24h freeelech slot
-          "span.freeleech": "0"
-          "*": "1"
+          "span.freeleech_slot": 0 # 24h freeelech slot
+          "span.freeleech": 0
+          "*": 1
       uploadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
+# engine tbd

src/Jackett.Common/Definitions/hdchina.yml

@@ -40,7 +40,7 @@
       - {id: 412, cat: TV, desc: "Food"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -52,7 +52,7 @@
       type: info
       label: How to get the Cookie
       default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
-          
+
   login:
     method: cookie
     inputs:
@@ -86,7 +86,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?hash="]
         attribute: href
@@ -127,4 +127,4 @@
           img.pro_free2up: 2
           img.pro_2up: 2
           "*": 1
-# NexusPHP tbc
+# NexusPHP tbd

src/Jackett.Common/Definitions/hddisk.yml

@@ -23,7 +23,7 @@
       - {id: 424, cat: Other, desc: "Other/其他"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -108,7 +108,7 @@
         attribute: title
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hddolby.yml

@@ -23,7 +23,7 @@
       - {id: 411, cat: Books, desc: "Study学习"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -83,7 +83,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hdhome.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://hdhome.org/
+    - http://hdhome.org/ # site does not support https #6460
   legacylinks:
     - https://hdhome.org/
 
@@ -64,7 +64,7 @@
       - {id: 501, cat: TV/Anime, desc: "Anime UHD Blu-ray"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -83,7 +83,7 @@
       cookie: "{{ .Config.cookie }}"
     test:
       path: index.php
-        
+
   search:
     paths:
       - path: torrents.php
@@ -111,7 +111,7 @@
             args: cat
       details:
         selector: a[title][href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hdreactor.yml

@@ -141,4 +141,4 @@
         text: 0
       uploadvolumefactor:
         text: 1
-# engine n/a
+# DataLife

src/Jackett.Common/Definitions/hdroute.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://hdroute.org/
+    - http://hdroute.org/ # site does not support https: NET::ERR_CERT_REVOKED 21 Aug 2015
 
   caps:
     categorymappings:
@@ -20,10 +20,10 @@
       - {id: 8, cat: Audio/Lossless, desc: "无损音乐 (Lossless)"}
       - {id: 9, cat: Other, desc: "其他 (Other)"}
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
-          
+
   login:
     path: login.php?action=login
     method: post
@@ -47,7 +47,7 @@
       dp: 0
       # dates 0 all  1 thes week 2 this month 3 this season 4 this year
       add: 0
-      # order: 1 uptime 2 imdb 3 comment 4 size 5 complete 6 upload 
+      # order: 1 uptime 2 imdb 3 comment 4 size 5 complete 6 upload
       or: 1
       action: s
       imdb: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{else}}{{end}}"
@@ -62,7 +62,7 @@
         selector: div.torrent_title
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="details.php?id="]
         attribute: href
@@ -103,4 +103,4 @@
       uploadvolumefactor:
         case:
           "*": 1
-# engine tbc
+# engine tbd

src/Jackett.Common/Definitions/hdsky.yml

@@ -22,7 +22,7 @@
       - {id: 409, cat: Other, desc: "Misc/其他"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -48,7 +48,7 @@
     filters:
       - name: regexp
         args: "Ratio:\\s(.*?)\\s\\s"
-        
+
   download:
     method: post
 
@@ -86,7 +86,7 @@
             args: cat
       details:
         selector: a[title][href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: form[action^="download.php?id="]
         attribute: action

src/Jackett.Common/Definitions/hdtime.yml

@@ -25,7 +25,7 @@
       - {id: 409, cat: Other, desc: "Misc/其他"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -104,7 +104,7 @@
         attribute: title
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hdu.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://pt.upxin.net/
+  legacylinks:
     - http://pt.upxin.net/
 
   caps:
@@ -22,7 +24,7 @@
       - {id: 410, cat: PC/Games, desc: "Games/游戏"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -86,7 +88,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hdzone.yml

@@ -62,7 +62,7 @@
       - {id: 501, cat: TV/Anime, desc: "Anime UHD Blu-ray"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -90,7 +90,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-          
+
   login:
     method: cookie
     inputs:
@@ -136,7 +136,7 @@
         attribute: title
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/hqsource.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: ISO-8859-2
   links:
+    - https://hqsource.org/
+  legacylinks:
     - http://hqsource.org/
 
   caps:
@@ -30,7 +32,7 @@
       search: [q]
       tv-search: [q, season, ep]
       movie-search: [q]
-       
+
   settings:
     - name: username
       type: text
@@ -40,7 +42,7 @@
       label: Password
     - name: pin
       type: text
-      label: Pin     
+      label: Pin
 
   login:
     path: takelogin.php
@@ -56,7 +58,7 @@
     test:
       selector: a[href^="logout.php"]
       path: browse.php
-        
+
   search:
     paths:
       - path: browse.php

src/Jackett.Common/Definitions/hush.yml

@@ -18,7 +18,7 @@
       - {id: 6, cat: Movies, desc: "Media"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -48,8 +48,8 @@
     paths:
       - path: filterTorrents
     inputs:
-      $raw: "{{range .Categories}}categories[]={{.}}&{{end}}"
-      search: "{{if .Query.IMDBID}}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       description: ""
       uploader: ""
       imdb: "{{ .Query.IMDBIDShort }}"
@@ -60,8 +60,10 @@
       sort: created_at
       direction: desc
       qty: 100
+
     rows:
       selector: table > tbody > tr
+
     fields:
       category:
         selector: a[href*="/categories/"]

src/Jackett.Common/Definitions/icetorrent.yml

@@ -50,7 +50,7 @@
       - {id: 58, cat: XXX, desc: "XXX Pictures"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -91,7 +91,7 @@
     test:
       path: /
       selector: a[href^="/logout?_csrf_token="]
-      
+
   ratio:
     text: -1
 
@@ -152,7 +152,7 @@
           - name: replace
             args: ["nd ", " "]
           - name: replace
-            args: ["rd ", " "]  
+            args: ["rd ", " "]
           - name: replace
             args: ["th ", " "]
           - name: regexp

src/Jackett.Common/Definitions/immortuos.yml

@@ -23,7 +23,7 @@
       - {id: 9, cat: Movies, desc: "Kino"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -61,8 +61,8 @@
       tvdb: ""
       tmdb: ""
       mal: ""
-      sort: "created_at"
-      direction: "desc"
+      sort: created_at
+      direction: desc
       qty: 100
     rows:
       selector: table > tbody > tr

src/Jackett.Common/Definitions/inperil.yml

@@ -7,6 +7,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://www.inperil.net/
+  legacylinks:
     - http://www.inperil.net/
 
   caps:
@@ -44,7 +46,7 @@
       - selector: font.logintext
     test:
       path: browse.php
-      
+
   search:
     paths:
       - path: browse.php

src/Jackett.Common/Definitions/insanetracker.yml

@@ -41,8 +41,8 @@
 
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
   login:
@@ -56,16 +56,18 @@
       - selector: div.login_error_content_text
     test:
       path: browse.php
-        
+
   search:
     paths:
       - path: browse.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
-      t: "all"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      t: all
+
     rows:
       selector: table.torrenttable > tbody > tr:has(td.torrentmain)
+
     fields:
       title:
         selector: td.torrentmain > a.torrentname
@@ -131,13 +133,14 @@
           - name: dateparse
             args: "2006-01-02 15:04"
       downloadvolumefactor:
-        text: "0"
+        text: 0
       uploadvolumefactor:
         case:
-          a[href^="?doubleup=four"]: "4"
-          a[href^="?doubleup=three"]: "3"
-          a[href^="?doubleup=two"]: "2"
-          "*" : "1"
+          a[href^="?doubleup=four"]: 4
+          a[href^="?doubleup=three"]: 3
+          a[href^="?doubleup=two"]: 2
+          "*" : 1
       description:
         selector: div.contenttext
         remove: div.contenttitle
+# engine tbd

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

@@ -0,0 +1,680 @@
+---
+  site: iv-torrents
+  name: IV-Torrents
+  description: "IV-Torrents is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://iv-torrents.ru/
+
+  caps:
+    categorymappings:
+      # Navigon / Navitel Other
+      - {id: 710, cat: Other, desc: "Навител/Navitel "}
+      # Кинематограф Movies
+      - {id: 687, cat: Movies, desc: "Трейлеры к фильмам"}
+      - {id: 15, cat: Movies, desc: "Кино (общение)"}
+      - {id: 302, cat: Movies, desc: " |- Правила раздела"}
+      - {id: 134, cat: Movies, desc: " |- Обсуждение ожидаемого кино"}
+      - {id: 133, cat: Movies, desc: " |- Зарубежное кино"}
+      - {id: 132, cat: Movies, desc: " |- Отечественное кино"}
+      - {id: 16, cat: Movies, desc: "Фильмы в идеальном качестве"}
+      - {id: 43, cat: Movies, desc: " |- Новые релизы"}
+      - {id: 66, cat: Movies, desc: " |- Зарубежные фильмы (Новинки)"}
+      - {id: 67, cat: Movies, desc: " |- Зарубежные фильмы"}
+      - {id: 68, cat: Movies, desc: " |- Отечественные фильмы (Новинки)"}
+      - {id: 69, cat: Movies, desc: " |- Отечественные фильмы"}
+      - {id: 128, cat: Movies, desc: " |- Классика зарубежного кино (фильмы вышедшие до 1980 года)"}
+      - {id: 129, cat: Movies, desc: " |- Классика отечественного кино (фильмы вышедшие до ..."}
+      - {id: 46, cat: Movies, desc: " |- Антологии"}
+      - {id: 17, cat: Movies, desc: "Фильмы в хорошем качестве"}
+      - {id: 127, cat: Movies, desc: " |- Новые релизы"}
+      - {id: 125, cat: Movies, desc: " |- Зарубежные фильмы (Новинки)"}
+      - {id: 124, cat: Movies, desc: " |- Зарубежные фильмы"}
+      - {id: 123, cat: Movies, desc: " |- Отечественные фильмы (Новинки)"}
+      - {id: 122, cat: Movies, desc: " |- Отечественные фильмы"}
+      - {id: 689, cat: Movies/WEBDL, desc: " |- Фильмы WEB-DLRip, HDTVRip "}
+      - {id: 121, cat: Movies, desc: " |- Классика зарубежного кино (фильмы вышедшие до 1980 года)"}
+      - {id: 120, cat: Movies, desc: " |- Классика отечественного кино (фильмы вышедшие до ..."}
+      - {id: 126, cat: Movies, desc: " |- Антологии"}
+      - {id: 18, cat: Movies, desc: "Фильмы в плохом качестве"}
+      - {id: 45, cat: Movies, desc: " |- Новые релизы"}
+      - {id: 117, cat: Movies, desc: " |- Зарубежные фильмы (новинки)"}
+      - {id: 116, cat: Movies, desc: " |- Отечественные фильмы (новинки)"}
+      - {id: 415, cat: Movies, desc: " |- Разное"}
+      - {id: 19, cat: Movies/HD, desc: "HD "}
+      - {id: 48, cat: Movies/HD, desc: " |- Новые релизы"}
+      - {id: 50, cat: Movies/HD, desc: " |- Зарубежные фильмы HD (Новинки)"}
+      - {id: 516, cat: Movies/HD, desc: " |- Антологии"}
+      - {id: 51, cat: Movies/HD, desc: " |- Наши фильмы HD (Новинки)"}
+      - {id: 52, cat: Movies/HD, desc: " |- Зарубежные фильмы HD (BD и Remux)"}
+      - {id: 54, cat: Movies/HD, desc: " |- Наши фильмы HD (BD и Remux)"}
+      - {id: 53, cat: Movies/HD, desc: " |- Зарубежные фильмы (Рипы 720p и 1080p)"}
+      - {id: 55, cat: Movies/HD, desc: " |- Наши фильмы (Рипы 720p и 1080p)"}
+      - {id: 686, cat: Movies/HD, desc: " |- HD фильмы WEB-DLRip, HDTVRip (720 и 1080)"}
+      - {id: 681, cat: Movies/HD, desc: " |- Классика зарубежного кино (фильмы вышедшие до 1980 года)"}
+      - {id: 682, cat: Movies/HD, desc: " |- Классика отечественного кино (фильмы вышедшие до ..."}
+      - {id: 683, cat: Movies/HD, desc: " |- Временные HD фильмы"}
+      - {id: 20, cat: Movies/DVD, desc: "DVD "}
+      - {id: 49, cat: Movies/DVD, desc: " |- Новые релизы"}
+      - {id: 56, cat: Movies/DVD, desc: " |- Зарубежные фильмы DVD "}
+      - {id: 57, cat: Movies/DVD, desc: " |- Наши фильмы DVD "}
+      - {id: 58, cat: Movies/DVD, desc: " |- Зарубежные мультфильмы DVD "}
+      - {id: 59, cat: Movies/DVD, desc: " |- Наши мультфильмы DVD "}
+      - {id: 400, cat: TV/Documentary, desc: "Документальные фильмы, Научно-познавательные фильмы"}
+      - {id: 401, cat: TV/Documentary, desc: " |- Новые релизы"}
+      - {id: 405, cat: TV/Documentary, desc: " |- BBC / Discovery / National Geographic "}
+      - {id: 410, cat: TV/Documentary, desc: " |- О рыбалке и охоте"}
+      - {id: 408, cat: TV/Documentary, desc: " |- Криминальные документальные фильмы"}
+      - {id: 402, cat: TV/Documentary, desc: " |- Документальные научно-познавательные"}
+      - {id: 520, cat: TV/Documentary, desc: " |- Вторая мировая война"}
+      - {id: 519, cat: TV/Documentary, desc: " |- Космос"}
+      - {id: 407, cat: TV/Documentary, desc: " |- Документальные фильмы о военной технике"}
+      - {id: 409, cat: TV/Documentary, desc: " |- Информационные, политические и аналитические телепередачи"}
+      - {id: 403, cat: TV/Documentary, desc: " |- Документальные фильмы о трагедиях и катаклизмах"}
+      - {id: 482, cat: TV/Documentary, desc: " |- История"}
+      - {id: 411, cat: TV/Documentary, desc: " |- Другое документальное кино"}
+      - {id: 418, cat: Movies, desc: "Фильмы в авторском одноголосным переводе"}
+      - {id: 421, cat: Movies, desc: " |- Новые релизы"}
+      - {id: 498, cat: Movies, desc: " |- Гаврилов Андрей Юрьевич"}
+      - {id: 499, cat: Movies, desc: " |- Сербин, Юрий Владимирович"}
+      - {id: 419, cat: Movies, desc: " |- Пучков Дмитрий Юрьевич [Гоблин / Goblin]"}
+      - {id: 420, cat: Movies, desc: " |- Володарский Леонид Вениаминович"}
+      - {id: 527, cat: Movies, desc: " |- Новые релизы"}
+      - {id: 528, cat: Movies, desc: " |- Фильмографии зарубежных актёров"}
+      - {id: 529, cat: Movies, desc: " |- Фильмографии отечественных актёров"}
+      - {id: 561, cat: XXX, desc: "Pron (+18)"}
+      - {id: 562, cat: XXX, desc: " |- Новые релизы"}
+      - {id: 563, cat: XXX, desc: " |- Pron (DVDRip & others)"}
+      - {id: 564, cat: XXX, desc: " |- Pron DVD (DVD5/DVD9)"}
+      - {id: 565, cat: XXX, desc: " |- Pron HD (720p/1080p/1080i)"}
+      - {id: 566, cat: XXX, desc: " |- Паки Pron "}
+      - {id: 567, cat: XXX, desc: " |- Эротика"}
+      - {id: 568, cat: XXX, desc: " |- Эротика HD (720p/1080p/1080i)"}
+      - {id: 569, cat: XXX, desc: " |- Мульты"}
+      - {id: 570, cat: XXX, desc: " |- Документальные фильмы/Обучающее видео"}
+      - {id: 571, cat: XXX, desc: " |- Фото"}
+      - {id: 572, cat: XXX, desc: " |- Журналы/Книги"}
+      - {id: 573, cat: XXX, desc: " |- Полнометражные PRON-фильмы (с русским переводом)"}
+      - {id: 574, cat: XXX, desc: " |- Разное"}
+      # 3D Movies
+      - {id: 346, cat: Movies/3D, desc: "F.A.Q."}
+      - {id: 338, cat: Movies/3D, desc: "3D "}
+      - {id: 339, cat: Movies/3D, desc: " |- Новые релизы"}
+      - {id: 340, cat: Movies/3D, desc: " |- 3D Зарубежные фильмы"}
+      - {id: 341, cat: Movies/3D, desc: " |- 3D Отечественные фильмы"}
+      - {id: 343, cat: Movies/3D, desc: " |- 3D Зарубежные мультфильмы"}
+      - {id: 344, cat: Movies/3D, desc: " |- 3D отечественные мультфильмы"}
+      - {id: 342, cat: Movies/3D, desc: " |- 3D Документальные фильмы"}
+      - {id: 345, cat: Movies/3D, desc: " |- 3D Спорт"}
+      # Обучающее видео Other
+      - {id: 468, cat: Other, desc: "Видеоуроки и обучающие интерактивные диски"}
+      - {id: 470, cat: Other, desc: " |- Новые релизы"}
+      - {id: 522, cat: Other, desc: " |- Спорт, Фитнес и аэробика"}
+      - {id: 579, cat: Other, desc: " |- Беременность, роды, материнство"}
+      - {id: 521, cat: Other, desc: " |- Бизнес, экономика и финансы"}
+      - {id: 576, cat: Other, desc: " |- Кулинария"}
+      - {id: 525, cat: Other, desc: " |- Пикап и психология"}
+      - {id: 580, cat: Other, desc: " |- Рыболовство и подводная охота"}
+      - {id: 581, cat: Other, desc: " |- Строительство, ремонт и дизайн"}
+      - {id: 523, cat: Other, desc: " |- Учебные видео для детей и родителей"}
+      - {id: 577, cat: Other, desc: " |- Уличные и клубные танцы"}
+      - {id: 578, cat: Other, desc: " |- Фокусы и трюки"}
+      - {id: 680, cat: Other, desc: " |- Фотография, работа с фото"}
+      - {id: 696, cat: Other, desc: " |- Прочие видеокурсы и уроки"}
+      - {id: 469, cat: Other, desc: "Компьютерные видеоуроки и обучающие интерактивные диски"}
+      - {id: 475, cat: Other, desc: " |- Новые релизы"}
+      - {id: 472, cat: Other, desc: " |- Веб-дизайн, Программирование"}
+      - {id: 517, cat: Other, desc: " |- 2D-графика"}
+      - {id: 694, cat: Other, desc: " |- 3D-графика, моделирование"}
+      - {id: 473, cat: Other, desc: " |- Работа с видео"}
+      - {id: 474, cat: Other, desc: " |- Компьютерные сети и безопасность"}
+      # Игры Games
+      - {id: 97, cat: Console, desc: " |- Новые релизы"}
+      - {id: 287, cat: Console, desc: " |- MMORPG "}
+      - {id: 286, cat: Console, desc: " |- Online / Онлайн Игры"}
+      - {id: 111, cat: Console, desc: " |- Аркады"}
+      - {id: 96, cat: Console, desc: " |- Горячие новинки"}
+      - {id: 90, cat: Console, desc: " |- Гонки"}
+      - {id: 95, cat: Console, desc: " |- Action / Shooter / FPS "}
+      - {id: 94, cat: Console, desc: " |- Action / Shooter / TPS "}
+      - {id: 285, cat: Console, desc: " |- Детские игры"}
+      - {id: 93, cat: Console, desc: " |- RPG "}
+      - {id: 92, cat: Console, desc: " |- RTS (стратегии в реальном времени)"}
+      - {id: 91, cat: Console, desc: " |- TBS (пошаговые стратегии)"}
+      - {id: 88, cat: Console, desc: " |- Многопользовательские игры"}
+      - {id: 416, cat: Console, desc: " |- Спорт"}
+      - {id: 87, cat: Console, desc: " |- Cтратегии"}
+      - {id: 89, cat: Console, desc: " |- Симуляторы"}
+      - {id: 301, cat: Console, desc: " |- Логические Игры"}
+      - {id: 553, cat: Console, desc: " |- Эротические игры"}
+      - {id: 12, cat: PC/Games, desc: "Игры для PC (Repack)"}
+      - {id: 109, cat: PC/Games, desc: " |- Новые релизы"}
+      - {id: 107, cat: PC/Games, desc: " |- Action / Shooter / FPS "}
+      - {id: 463, cat: PC/Games, desc: " |- Горячие новинки"}
+      - {id: 102, cat: PC/Games, desc: " |- Аркады"}
+      - {id: 106, cat: PC/Games, desc: " |- Action / Shooter / TPS "}
+      - {id: 105, cat: PC/Games, desc: " |- RPG "}
+      - {id: 104, cat: PC/Games, desc: " |- RTS (стратегии в реальном времени)"}
+      - {id: 103, cat: PC/Games, desc: " |- TBS (пошаговые стратегии)"}
+      - {id: 530, cat: PC/Games, desc: " |- Детские игры"}
+      - {id: 101, cat: PC/Games, desc: " |- Гонки"}
+      - {id: 417, cat: PC/Games, desc: " |- Спорт"}
+      - {id: 110, cat: PC/Games, desc: " |- Cтратегии"}
+      - {id: 99, cat: PC/Games, desc: " |- Симуляторы"}
+      - {id: 98, cat: PC/Games, desc: " |- Многопользовательские игры"}
+      - {id: 554, cat: PC/Games, desc: " |- Эротические игры"}
+      - {id: 14, cat: Console, desc: "Игры для Консолей"}
+      - {id: 115, cat: Console, desc: " |- Новые релизы"}
+      - {id: 114, cat: Console/Xbox 360, desc: " |- XBox360 "}
+      - {id: 674, cat: Console/Xbox 360, desc: " |- XBox360 | Kinect "}
+      - {id: 113, cat: Console/NDS, desc: " |- NDS "}
+      - {id: 288, cat: Console/PS3, desc: " |- Playstation 2 "}
+      - {id: 290, cat: Console/PS3, desc: " |- Playstation 3 "}
+      - {id: 531, cat: Console, desc: "Программы / Прошивки"}
+      - {id: 532, cat: Console, desc: " |- Новые релизы"}
+      - {id: 533, cat: Console/PS3, desc: " |- Playstation 3 "}
+      - {id: 535, cat: Console/Xbox 360, desc: " |- XBox360 "}
+      - {id: 534, cat: Console/PSP, desc: " |- PSP "}
+      - {id: 277, cat: Console, desc: "Всё для игр"}
+      - {id: 291, cat: Console, desc: " |- Новые релизы"}
+      - {id: 284, cat: Console, desc: " |- Трейлеры/Геймплей видео"}
+      - {id: 283, cat: Console, desc: " |- Различные моды и дополнения к играм"}
+      - {id: 281, cat: Console, desc: " |- Софт для игр"}
+      - {id: 280, cat: Console, desc: " |- NoCD/NoDVD "}
+      - {id: 279, cat: Console, desc: " |- Патчи"}
+      - {id: 278, cat: Console, desc: " |- Русификаторы"}
+      # Мультипликация TV
+      - {id: 21, cat: TV, desc: "Зарубежные мультипликационные фильмы"}
+      - {id: 170, cat: TV, desc: " |- Новые релизы"}
+      - {id: 169, cat: TV, desc: " |- Зарубежные мультфильмы в идеальном качестве"}
+      - {id: 168, cat: TV, desc: " |- Зарубежные мультфильмы в хорошем качестве"}
+      - {id: 167, cat: TV, desc: " |- Зарубежные мультфильмы в плохом качестве"}
+      - {id: 166, cat: TV, desc: " |- Короткометражная мультипликация (анимация)"}
+      - {id: 165, cat: TV, desc: " |- Сборники зарубежных мультфильмов и сиквелы"}
+      - {id: 22, cat: TV, desc: "Отечественные мультипликационные фильмы"}
+      - {id: 164, cat: TV, desc: " |- Новые релизы"}
+      - {id: 163, cat: TV, desc: " |- Отечественные мультфильмы в идеальном качестве"}
+      - {id: 162, cat: TV, desc: " |- Отечественные мультфильмы в хорошем качестве"}
+      - {id: 161, cat: TV, desc: " |- Отечественные мультфильмы в плохом качестве"}
+      - {id: 160, cat: TV, desc: " |- Короткометражная мультипликация (анимация)"}
+      - {id: 159, cat: TV, desc: " |- Сборники отечественных мультфильмов и сиквелы"}
+      - {id: 23, cat: TV, desc: "Зарубежные мультсериалы"}
+      - {id: 158, cat: TV, desc: " |- Новые релизы"}
+      - {id: 157, cat: TV, desc: " |- Disney "}
+      - {id: 156, cat: TV, desc: " |- Гриффины"}
+      - {id: 155, cat: TV, desc: " |- Симпсоны"}
+      - {id: 154, cat: TV, desc: " |- Южный Парк / South Park "}
+      - {id: 153, cat: TV, desc: " |- Звездные войны"}
+      - {id: 152, cat: TV, desc: " |- Том и Джерри"}
+      - {id: 151, cat: TV, desc: " |- Футурама"}
+      - {id: 150, cat: TV, desc: " |- Другие зарубежные мультсериалы"}
+      - {id: 24, cat: TV, desc: "Отечественные мультсериалы"}
+      - {id: 149, cat: TV, desc: " |- Новые релизы"}
+      - {id: 148, cat: TV, desc: " |- Смешарики"}
+      - {id: 147, cat: TV, desc: " |- Маша и медведь"}
+      - {id: 146, cat: TV, desc: " |- Другие отечественные мультсериалы"}
+      - {id: 478, cat: TV/HD, desc: "HD мультфильмы"}
+      - {id: 479, cat: TV/HD, desc: " |- Новые релизы"}
+      - {id: 480, cat: TV/HD, desc: " |- Зарубежные мультфильмы (Рипы 720p и 1080p)"}
+      - {id: 481, cat: TV/HD, desc: " |- Наши мультфильмы (Рипы 720p и 1080p)"}
+      - {id: 684, cat: TV/HD, desc: " |- Зарубежные мультфильмы HD (BD и Remux)"}
+      - {id: 685, cat: TV/HD, desc: " |- Отечественные мультфильмы HD (BD и Remux)"}
+      # Сериалы TV
+      - {id: 25, cat: TV, desc: "Российские сериалы"}
+      - {id: 251, cat: TV, desc: " |- Новые релизы"}
+      - {id: 250, cat: TV, desc: " |- Воронины / Папины дочки"}
+      - {id: 245, cat: TV, desc: " |- Детективы"}
+      - {id: 550, cat: TV, desc: " |- Деффчонки"}
+      - {id: 242, cat: TV, desc: " |- Зайцев +1 "}
+      - {id: 546, cat: TV, desc: " |- Закрытая школа"}
+      - {id: 249, cat: TV, desc: " |- Ментовские войны"}
+      - {id: 247, cat: TV, desc: " |- Кадетство / Кремлёвские курсанты"}
+      - {id: 551, cat: TV, desc: " |- Карпов"}
+      - {id: 246, cat: TV, desc: " |- Кулагин и партнеры"}
+      - {id: 547, cat: TV, desc: " |- Кухня"}
+      - {id: 243, cat: TV, desc: " |- Интерны"}
+      - {id: 240, cat: TV, desc: " |- Реальные пацаны"}
+      - {id: 500, cat: TV, desc: " |- Сашатаня"}
+      - {id: 548, cat: TV, desc: " |- Сваты"}
+      - {id: 549, cat: TV, desc: " |- Светофор"}
+      - {id: 248, cat: TV, desc: " |- След"}
+      - {id: 244, cat: TV, desc: " |- Тайны следствия"}
+      - {id: 241, cat: TV, desc: " |- Универ"}
+      - {id: 239, cat: TV, desc: " |- Убойная сила / Менты / Опера"}
+      - {id: 238, cat: TV, desc: " |- Другие российские сериалы"}
+      - {id: 26, cat: TV, desc: "Зарубежные сериалы"}
+      - {id: 237, cat: TV, desc: " |- Новые релизы"}
+      - {id: 544, cat: TV, desc: " |- Анатомия страсти / Grey's anatomy "}
+      - {id: 236, cat: TV, desc: " |- Доктор Хаус / House M.D."}
+      - {id: 545, cat: TV, desc: " |- Друзья / Friends "}
+      - {id: 537, cat: TV, desc: " |- Звёздные врата / Stargate "}
+      - {id: 536, cat: TV, desc: " |- Игра престолов / Game of Thrones "}
+      - {id: 235, cat: TV, desc: " |- Остаться в живых / Lost "}
+      - {id: 234, cat: TV, desc: " |- Сверхъестественное / Supernatural "}
+      - {id: 538, cat: TV, desc: " |- Секретные материалы / The X-Files "}
+      - {id: 539, cat: TV, desc: " |- Спартак / Spartacus "}
+      - {id: 540, cat: TV, desc: " |- Тайны Смолвиля / Smallville "}
+      - {id: 541, cat: TV, desc: " |- Теория Большого Взрыва / The Big Bang Theory "}
+      - {id: 542, cat: TV, desc: " |- Холм одного дерева / One tree hill "}
+      - {id: 543, cat: TV, desc: " |- Ходячие мертвецы / The Walking Dead "}
+      - {id: 233, cat: TV, desc: " |- Другие зарубежные сериалы"}
+      # Мир Аниме Anime
+      - {id: 32, cat: TV/Anime, desc: "Аниме (общение)"}
+      - {id: 232, cat: TV/Anime, desc: " |- Ищу/Предлагаю"}
+      - {id: 231, cat: TV/Anime, desc: " |- Поговорим об аниме"}
+      - {id: 27, cat: TV/Anime, desc: "Аниме"}
+      - {id: 60, cat: TV/Anime, desc: " |- Новые релизы"}
+      - {id: 61, cat: TV/Anime, desc: " |- HD Аниме"}
+      - {id: 63, cat: TV/Anime, desc: " |- Видео"}
+      - {id: 65, cat: TV/Anime, desc: " |- Анонсы и трейлеры"}
+      - {id: 62, cat: TV/Anime, desc: " |- Разное"}
+      - {id: 555, cat: TV/Anime, desc: "Хентай"}
+      - {id: 556, cat: TV/Anime, desc: " |- Новые релизы"}
+      - {id: 557, cat: TV/Anime, desc: " |- Традиционное (Rips)"}
+      - {id: 559, cat: TV/Anime, desc: " |- Юри (Rips)"}
+      - {id: 558, cat: TV/Anime, desc: " |- Яой (Rips)"}
+      # Развлекательные телепередачи, шоу и сюжеты Other
+      - {id: 293, cat: Other, desc: "Обсуждение юмора"}
+      - {id: 294, cat: Other, desc: "Развлекательные телепередачи"}
+      - {id: 300, cat: Other, desc: " |- Новые релизы"}
+      - {id: 299, cat: Other, desc: " |- Прожекторперисхилтон"}
+      - {id: 298, cat: Other, desc: " |- КВН (юмор-видео)"}
+      - {id: 297, cat: Other, desc: " |- Комеди клаб (Юмор видео)"}
+      - {id: 560, cat: Other, desc: " |- Уральские пельмени"}
+      - {id: 296, cat: Other, desc: " |- Смешное видео (короткометражный формат)"}
+      - {id: 295, cat: Other, desc: " |- Другие юмористические ролики и передачи"}
+      # Программное обеспечение Software
+      - {id: 185, cat: PC, desc: " |- Новые релизы"}
+      - {id: 184, cat: PC, desc: " |- Настольные OS, выпущенные до 2001 года (Microsoft Windows..."}
+      - {id: 183, cat: PC, desc: " |- Windows XP "}
+      - {id: 182, cat: PC, desc: " |- Windows Vista "}
+      - {id: 181, cat: PC, desc: " |- Windows 7 "}
+      - {id: 180, cat: PC, desc: " |- Windows 8, 8.1 "}
+      - {id: 702, cat: PC, desc: " |- Windows 10 "}
+      - {id: 708, cat: PC, desc: " |- Мультисборки Windows OS "}
+      - {id: 179, cat: PC, desc: " |- Серверные (Microsoft Windows OS)"}
+      - {id: 34, cat: PC, desc: "Mac OS. Программное обеспечение под них"}
+      - {id: 189, cat: PC, desc: " |- Новые релизы"}
+      - {id: 188, cat: PC/Mac, desc: " |- Mac OS (для Apple Macintosh)"}
+      - {id: 187, cat: PC/Mac, desc: " |- Mac OS (для РС-Hackintosh)"}
+      - {id: 186, cat: PC/Mac, desc: " |- Системные программы для Mac OS "}
+      - {id: 35, cat: PC, desc: "Linux, Unix и другие ОС"}
+      - {id: 194, cat: PC, desc: " |- Новые релизы"}
+      - {id: 193, cat: PC, desc: " |- ОС (Linux, Unix)"}
+      - {id: 192, cat: PC, desc: " |- Игры (Linux, Unix)"}
+      - {id: 191, cat: PC, desc: " |- ПО (Linux, Unix)"}
+      - {id: 190, cat: PC, desc: " |- Другие ОС и ПО"}
+      - {id: 36, cat: PC, desc: "Системные программы"}
+      - {id: 219, cat: PC, desc: " |- Новые релизы"}
+      - {id: 218, cat: PC, desc: " |- Антивирусы и файерволы"}
+      - {id: 217, cat: PC, desc: " |- Архиваторы и файловые менеджеры"}
+      - {id: 216, cat: PC, desc: " |- Драйвера"}
+      - {id: 215, cat: PC, desc: " |- Изменение интерфейса ОС Windows и скринсейверы"}
+      - {id: 214, cat: PC, desc: " |- Программы для интернет и сетей"}
+      - {id: 213, cat: PC, desc: " |- Программы для настройки и оптимизации ОС, информаци..."}
+      - {id: 212, cat: PC, desc: " |- Работа с жёстким диском"}
+      - {id: 211, cat: PC, desc: " |- Работа с носителями информации"}
+      - {id: 210, cat: PC, desc: " |- Резервное копирование и программы для защиты информации"}
+      - {id: 209, cat: PC, desc: " |- Разное"}
+      - {id: 37, cat: PC, desc: "Программы для работы с мультимедиа и 3D "}
+      - {id: 208, cat: PC, desc: " |- Новые релизы"}
+      - {id: 207, cat: PC, desc: " |- Графические редакторы"}
+      - {id: 206, cat: PC, desc: " |- Редакторы видео"}
+      - {id: 205, cat: PC, desc: " |- Видео- и аудио-конверторы"}
+      - {id: 204, cat: PC, desc: " |- Программы для анимации"}
+      - {id: 203, cat: PC, desc: " |- Каталогизаторы и просмотрщики графики"}
+      - {id: 202, cat: PC, desc: " |- Аудио- и видео-, CD- проигрыватели и каталогизаторы"}
+      - {id: 201, cat: PC, desc: " |- Работа со звуком"}
+      - {id: 38, cat: PC, desc: "Веб-разработка и программирование"}
+      - {id: 200, cat: PC, desc: " |- Новые релизы"}
+      - {id: 199, cat: PC, desc: " |- Редакторы для веб-дизайна"}
+      - {id: 198, cat: PC, desc: " |- Скрипты и шаблоны"}
+      - {id: 197, cat: PC, desc: " |- Среды программирования, компиляторы и вспомогател..."}
+      - {id: 196, cat: PC, desc: " |- СУБД"}
+      - {id: 195, cat: PC, desc: " |- Разное"}
+      - {id: 39, cat: PC, desc: "Системы для бизнеса, офиса, научной и проектной работ..."}
+      - {id: 230, cat: PC, desc: " |- Новые релизы"}
+      - {id: 228, cat: PC, desc: " |- Системы для офиса, бизнеса и научной работы"}
+      - {id: 227, cat: PC, desc: " |- Распознавание текста, звука и синтез речи"}
+      - {id: 226, cat: PC, desc: " |- Работа с PDF и DjVu "}
+      - {id: 225, cat: PC, desc: " |- Словари, переводчики"}
+      - {id: 695, cat: PC, desc: " |- Текстовые редакторы"}
+      - {id: 223, cat: PC, desc: " |- САПР"}
+      - {id: 675, cat: PC, desc: " |- Сборники программ"}
+      - {id: 222, cat: PC, desc: " |- Программы для архитекторов и дизайнеров интерьеров"}
+      - {id: 221, cat: PC, desc: " |- Прочие справочные системы"}
+      - {id: 220, cat: PC, desc: " |- Разное (Системы для бизнеса, офиса, научной и проектн..."}
+      - {id: 423, cat: PC, desc: "ГИС, системы навигации и карты"}
+      - {id: 424, cat: PC, desc: " |- Новые релизы"}
+      - {id: 425, cat: PC, desc: " |- ГИС (Геоинформационные системы)"}
+      - {id: 427, cat: PC, desc: " |- Встроенная автомобильная навигация"}
+      # Музыка и Музыкальное видео Music
+      - {id: 258, cat: Audio, desc: "Правила и инструкции раздела Музыка"}
+      - {id: 257, cat: Audio, desc: "Предложения по улучшению раздела Музыка"}
+      - {id: 41, cat: Audio, desc: "Отечественная музыка"}
+      - {id: 273, cat: Audio, desc: " |- Новые релизы"}
+      - {id: 272, cat: Audio, desc: " |- Электронная музыка"}
+      - {id: 271, cat: Audio, desc: " |- Рэп, Хип - Хоп, R'n'B "}
+      - {id: 270, cat: Audio, desc: " |- Поп музыка"}
+      - {id: 269, cat: Audio, desc: " |- Рок"}
+      - {id: 268, cat: Audio, desc: " |- Metal "}
+      - {id: 267, cat: Audio, desc: " |- Шансон"}
+      - {id: 678, cat: Audio, desc: " |- Джаз / блюз"}
+      - {id: 266, cat: Audio, desc: " |- Классика и Инструментал"}
+      - {id: 676, cat: Audio, desc: " |- Отечественная музыка других жанров"}
+      - {id: 40, cat: Audio, desc: "Зарубежная музыка"}
+      - {id: 265, cat: Audio, desc: " |- Новые релизы"}
+      - {id: 264, cat: Audio, desc: " |- Электронная музыка"}
+      - {id: 505, cat: Audio, desc: " |- Trance "}
+      - {id: 263, cat: Audio, desc: " |- Рэп, Хип - Хоп, R'n'B "}
+      - {id: 501, cat: Audio, desc: " |- Drum & Bass "}
+      - {id: 503, cat: Audio, desc: " |- House "}
+      - {id: 504, cat: Audio, desc: " |- Dubstep "}
+      - {id: 412, cat: Audio, desc: " |- Soundtrack / OST "}
+      - {id: 502, cat: Audio, desc: " |- Hardcore, Hardstyle, Jumpstyle "}
+      - {id: 262, cat: Audio, desc: " |- Поп музыка"}
+      - {id: 261, cat: Audio, desc: " |- Рок"}
+      - {id: 260, cat: Audio, desc: " |- Metal "}
+      - {id: 259, cat: Audio, desc: " |- Шансон"}
+      - {id: 679, cat: Audio, desc: " |- Джаз / блюз"}
+      - {id: 42, cat: Audio/Video, desc: "Музыкальное видео"}
+      - {id: 256, cat: Audio/Video, desc: " |- Новые релизы"}
+      - {id: 255, cat: Audio/Video, desc: " |- Музыкальные DVD "}
+      - {id: 254, cat: Audio/Video, desc: " |- Музыкальные HD "}
+      - {id: 253, cat: Audio/Video, desc: " |- Клипы (видео)"}
+      - {id: 252, cat: Audio/Video, desc: " |- Концерты (видео)"}
+      # Спорт Sport
+      - {id: 511, cat: TV/Sport, desc: " |- Новые релизы"}
+      - {id: 509, cat: TV/Sport, desc: " |- Автогонки"}
+      - {id: 508, cat: TV/Sport, desc: " |- Баскетбол"}
+      - {id: 693, cat: TV/Sport, desc: " |- Бокс"}
+      - {id: 692, cat: TV/Sport, desc: " |- Бои без правил"}
+      - {id: 510, cat: TV/Sport, desc: " |- Боевые единоборства"}
+      - {id: 691, cat: TV/Sport, desc: " |- Рестлинг"}
+      - {id: 513, cat: TV/Sport, desc: " |- Теннис"}
+      - {id: 507, cat: TV/Sport, desc: " |- Хоккей"}
+      - {id: 690, cat: TV/Sport, desc: " |- Формула 1 "}
+      - {id: 506, cat: TV/Sport, desc: " |- Футбол"}
+      - {id: 514, cat: TV/Sport, desc: " |- Другие виды спорта"}
+      # Все по авто и мото Other
+      - {id: 583, cat: Other, desc: "Ремонт и эксплуатация транспортных средств"}
+      - {id: 584, cat: Other, desc: " |- Новые релизы"}
+      - {id: 585, cat: Other, desc: " |- Оригинальные каталоги по подбору запчастей"}
+      - {id: 586, cat: Other, desc: " |- Неоригинальные каталоги по подбору запчастей"}
+      - {id: 588, cat: Other, desc: " |- Тюнинг, чиптюнинг, настройка"}
+      - {id: 590, cat: Other, desc: " |- Мультимедийки по ремонту/обслуживанию/эксплуатации ТС"}
+      - {id: 592, cat: Other, desc: " |- Виртуальная автошкола"}
+      - {id: 593, cat: Other, desc: " |- Видеоуроки по вождению транспортных средств"}
+      - {id: 595, cat: Other, desc: " |- Журналы по авто/мото"}
+      - {id: 598, cat: Other, desc: " |- Новые релизы"}
+      - {id: 599, cat: Other, desc: " |- Документальные/познавательные фильмы"}
+      - {id: 600, cat: Other, desc: " |- Развлекательные передачи"}
+      - {id: 601, cat: Other, desc: " |- Top Gear/Топ Гир"}
+      - {id: 602, cat: Other, desc: " |- Тест драйв/Обзоры/Автосалоны"}
+      - {id: 603, cat: Other, desc: " |- Тюнинг/форсаж"}
+      # Книги и журналы Books
+      - {id: 610, cat: Books, desc: " |- Новые релизы"}
+      - {id: 611, cat: Books, desc: " |- Кино, театр, ТВ, мультипликация"}
+      - {id: 612, cat: Books, desc: " |- Рисунок, графический дизайн"}
+      - {id: 613, cat: Books, desc: " |- Фото и видеосъемка"}
+      - {id: 614, cat: Books, desc: " |- Журналы и газеты (общий раздел)"}
+      - {id: 615, cat: Books, desc: " |- Эзотерика, гадания, магия, фен-шуй"}
+      - {id: 616, cat: Books, desc: " |- Астрология"}
+      - {id: 617, cat: Books, desc: " |- Для женщин"}
+      - {id: 618, cat: Books, desc: " |- Путешествия и туризм"}
+      - {id: 619, cat: Books, desc: " |- Знаменитости и кумиры"}
+      - {id: 620, cat: Books, desc: " |- Разное"}
+      - {id: 621, cat: Books, desc: "Для детей, родителей и учителей"}
+      - {id: 622, cat: Books, desc: " |- Новые релизы"}
+      - {id: 623, cat: Books, desc: " |- Учебная литература для детского сада и начальной шко..."}
+      - {id: 624, cat: Books, desc: " |- Учебная литература для старших классов (5-11 класс)"}
+      - {id: 625, cat: Books, desc: " |- Учителям и педагогам"}
+      - {id: 626, cat: Books, desc: " |- Научно-популярная и познавательная литература (для детей)"}
+      - {id: 627, cat: Books, desc: " |- Досуг и творчество"}
+      - {id: 628, cat: Books, desc: " |- Воспитание и развитие"}
+      - {id: 629, cat: Books, desc: " |- Худ. лит-ра для дошкольников и младших классов"}
+      - {id: 630, cat: Books, desc: " |- Худ. лит-ра для средних и старших классов"}
+      - {id: 703, cat: Books, desc: "Компьютерная литература"}
+      - {id: 706, cat: Books, desc: " |- Разное"}
+      - {id: 705, cat: Books, desc: " |- Интернет, сети"}
+      - {id: 704, cat: Books, desc: " |- Программирование и алгоритмы"}
+      - {id: 631, cat: Books, desc: "Спорт, физическая культура, боевые искусства"}
+      - {id: 632, cat: Books, desc: " |- Футбол"}
+      - {id: 633, cat: Books, desc: " |- Хоккей"}
+      - {id: 634, cat: Books, desc: " |- Игровые виды спорта"}
+      - {id: 635, cat: Books, desc: " |- Шахматы. Шашки"}
+      - {id: 636, cat: Books, desc: " |- Физкультура, фитнес, бодибилдинг"}
+      - {id: 637, cat: Books, desc: " |- Боевые искусства, единоборства"}
+      - {id: 638, cat: Books, desc: " |- Спортивная пресса"}
+      - {id: 641, cat: Books, desc: "Гуманитарные науки"}
+      - {id: 642, cat: Books, desc: " |- Новые релизы"}
+      - {id: 643, cat: Books, desc: " |- Искусствоведение. Культурология"}
+      - {id: 644, cat: Books, desc: " |- Фольклор. Эпос. Мифология"}
+      - {id: 645, cat: Books, desc: " |- Литературоведение"}
+      - {id: 646, cat: Books, desc: " |- Лингвистика"}
+      - {id: 647, cat: Books, desc: " |- Философия"}
+      - {id: 648, cat: Books, desc: " |- Политология"}
+      - {id: 649, cat: Books, desc: " |- Социология"}
+      - {id: 650, cat: Books, desc: " |- Публицистика, журналистика"}
+      - {id: 651, cat: Books, desc: " |- Бизнес, менеджмент"}
+      - {id: 652, cat: Books, desc: " |- Маркетинг"}
+      - {id: 653, cat: Books, desc: " |- Экономика"}
+      - {id: 654, cat: Books, desc: " |- Финансы"}
+      - {id: 655, cat: Books, desc: " |- Юридические науки. Право. Криминалистика"}
+      - {id: 656, cat: Books, desc: "Исторические науки"}
+      - {id: 657, cat: Books, desc: " |- Новые релизы"}
+      - {id: 658, cat: Books, desc: " |- Исторические источники"}
+      - {id: 659, cat: Books, desc: " |- Исторические персоны"}
+      - {id: 661, cat: Books, desc: " |- Альтернативные исторические теории"}
+      - {id: 660, cat: Books, desc: " |- Археология"}
+      - {id: 662, cat: Books, desc: " |- Древний мир. Античность"}
+      - {id: 663, cat: Books, desc: " |- Средние века"}
+      - {id: 664, cat: Books, desc: " |- История Нового и Новейшего времени"}
+      - {id: 665, cat: Books, desc: " |- История Востока"}
+      - {id: 666, cat: Books, desc: " |- История Америки, Австралии, Океании"}
+      - {id: 667, cat: Books, desc: " |- История России"}
+      - {id: 668, cat: Books, desc: " |- Эпоха СССР"}
+      - {id: 669, cat: Books, desc: " |- История стран бывшего СССР"}
+      - {id: 670, cat: Books, desc: " |- История отдельных стран и регионов"}
+      - {id: 671, cat: Books, desc: " |- Этнография, антропология"}
+      - {id: 672, cat: Books, desc: " |- Международные отношения. Дипломатия"}
+      - {id: 496, cat: Audio/Audiobook, desc: "Аудиокниги"}
+      - {id: 639, cat: Audio/Audiobook, desc: " |- Новые релизы"}
+      - {id: 640, cat: Audio/Audiobook, desc: " |- Фантастика, фэнтези"}
+      - {id: 697, cat: Audio/Audiobook, desc: "Коллекционирование, увлечения и хобби"}
+      - {id: 698, cat: Audio/Audiobook, desc: " |- Моделизм"}
+      - {id: 699, cat: Audio/Audiobook, desc: " |- Настольные игры"}
+      - {id: 700, cat: Audio/Audiobook, desc: " |- Прочие хобби"}
+      # Мобильные устройства Mobile
+      - {id: 433, cat: PC/Phone-Other, desc: "Приложения для мобильных телефонов и КПК, КМК"}
+      - {id: 436, cat: PC/Phone-Other, desc: " |- Новые релизы"}
+      - {id: 437, cat: PC/Phone-Android, desc: " |- Android OS "}
+      - {id: 435, cat: PC/Phone-Other, desc: " |- Windows Mobile "}
+      - {id: 439, cat: PC/Phone-Other, desc: " |- Symbian "}
+      - {id: 438, cat: PC/Phone-IOS, desc: " |- iOS "}
+      - {id: 440, cat: PC/Phone-Other, desc: " |- Java "}
+      - {id: 434, cat: PC/Phone-Other, desc: "Игры"}
+      - {id: 441, cat: PC/Phone-Other, desc: " |- Новые релизы"}
+      - {id: 442, cat: PC/Phone-Android, desc: " |- Android OS "}
+      - {id: 443, cat: PC/Phone-Other, desc: " |- Symbian "}
+      - {id: 444, cat: PC/Phone-IOS, desc: " |- iOS "}
+      - {id: 446, cat: PC/Phone-Other, desc: " |- Java "}
+      - {id: 445, cat: PC/Phone-Other, desc: " |- Windows Mobile "}
+      - {id: 575, cat: PC/Phone-Other, desc: " |- Игры для Windows Phone 7,8 "}
+      - {id: 447, cat: PC/Phone-Other, desc: "Софт для работы с телефоном"}
+      - {id: 448, cat: PC/Phone-Other, desc: "Прошивки"}
+      - {id: 449, cat: PC/Phone-Other, desc: " |- Новые релизы"}
+      - {id: 450, cat: PC/Phone-Android, desc: " |- Android OS "}
+      - {id: 451, cat: PC/Phone-Other, desc: " |- Windows Mobile "}
+      - {id: 452, cat: PC/Phone-Other, desc: " |- Symbian "}
+      - {id: 454, cat: PC/Phone-IOS, desc: " |- iOS "}
+      - {id: 455, cat: PC/Phone-Other, desc: " |- Java "}
+      # Обои / Рисунки / Картинки Other
+      - {id: 457, cat: Other, desc: "Обои"}
+      - {id: 458, cat: Other, desc: "Иконки"}
+      - {id: 515, cat: Other, desc: "Другие картинки"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "1"
+      options:
+        "1": "created"
+        "10": "seeders"
+        "7": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="login.php"]
+    inputs:
+      login_username: "{{ .Config.username }}"
+      login_password: "{{ .Config.password }}"
+      redirect: /
+      autologin: on
+    error:
+      - selector: table.error
+    test:
+      path: index.php
+      selector: a[href="./login.php?logout=1"]
+
+  search:
+    paths:
+      - path: tracker.php
+    keywordsfilters:
+      - name: diacritics
+        args: replace
+      - name: re_replace # S01 to сезон 1
+        args: ["(?i)\\bS0*(\\d+)\\b", "сезон $1"]
+      - name: re_replace # S01E01 to сезон 1 серии 1
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "сезон $1 серии $2"]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}"
+      prev_allw: 1
+      prev_a: 0
+      prev_dla: 0
+      prev_dlc: 0
+      prev_dld: 0
+      prev_dlw: 0
+      prev_my: 0
+      prev_new: 0
+      prev_sd: 0
+      prev_da: 1
+      prev_dc: 0
+      prev_df: 1
+      prev_ds: 0
+      prev_tor_type: 0
+      # sort by 1=registered 2=topicTitle 4=completed 10=seed 11=leech 12=up 13=down 5=replies 6=views 7=size 8=lastPost 9=seedLastSeen
+      o: "{{ .Config.sort }}"
+      # 1=asc 2=desc
+      s: "{{ .Config.type }}"
+      # show category
+      dc: 0
+      # show forum
+      df: 1
+      # show author
+      da: 1
+      # show speed
+      ds: 0
+      # -1=all time
+      tm: -1
+      # seed not seen -1=disregard
+      sns: -1
+      # group releases -1=not selected
+      srg: -1
+      nm: "{{ .Keywords }}"
+      # find a username
+      pn: ""
+      # search by partial word
+      allw: 0
+
+    rows:
+      selector: tr[id^="tor_"]:has(a[href^="./dl.php?id="])
+
+    fields:
+      category:
+        selector: a[href^="tracker.php?f="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: f
+      title:
+        selector: a[href^="./viewtopic.php?t="]
+        filters:
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["[\\.\\,\\:\\-\\/\\|\\[\\]\\(\\)]", " "]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)(\\d+)\\s*[CСcс]езон\\s*(\\d+)\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*из\\s*\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*(\\d+)\\s*(.*)", "$1 S$2E$3-$4 rus $5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)\\s*[CСcс]ери[ияй]\\s*(\\d+)\\s*из\\s*\\d+(.*)", "$1 S$2E$3 rus $4"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон\\s*(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(.*)[CСcс]]ери[ия]\\s*(\\d+)(.*)", "$1 E$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEB DLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a[href^="./viewtopic.php?t="]
+        attribute: href
+      download:
+        selector: a[href^="./dl.php?id="]
+        attribute: href
+      size:
+        selector: td:nth-child(6) > u
+      seeders:
+        selector: td.seedmed > b
+      leechers:
+        selector: td.leechmed > b
+      grabs:
+        selector: td:nth-child(9)
+      date:
+        selector: td:last-child > u
+      downloadvolumefactor:
+        case:
+          img[src="styles/images/tor_gold.gif"]: 0
+          img[src="styles/images/tor_silver.gif"]: 0.5
+          "*": 1
+      uploadvolumefactor:
+        text: 1
+# TorrentPier II

src/Jackett.Common/Definitions/kinonavse100.yml

@@ -6,7 +6,7 @@
   type: semi-private
   encoding: UTF-8
   links:
-    - http://kinonavse100.com/ # https is not supported
+    - http://kinonavse100.com/ # https is not supported self signed ca is untrusted
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/kinozal.yml

@@ -6,7 +6,7 @@
   type: semi-private
   encoding: windows-1251
   links:
-    - http://kinozal.tv/
+    - http://kinozal.tv/ # site forces http, https is not supported
 
   caps:
     categorymappings:
@@ -178,7 +178,7 @@
         selector: td:nth-child(4)
         filters:
           - name: replace
-            args: ["ТБ", "TB"] 
+            args: ["ТБ", "TB"]
           - name: replace
             args: ["ГБ", "GB"]
           - name: replace

src/Jackett.Common/Definitions/korsar.yml

@@ -6,9 +6,10 @@
   type: semi-private
   encoding: UTF-8
   links:
-    - http://korsar.info/
+    - https://korsar.info/
   legacylinks:
     - http://korsar.tv/
+    - http://korsar.info/
 
   caps:
     categorymappings:
@@ -482,7 +483,7 @@
           - name: regexp
             args: "Размер: (.+?),"
           - name: replace
-            args: ["ТБ", "TB"] 
+            args: ["ТБ", "TB"]
           - name: replace
             args: ["ГБ", "GB"]
           - name: replace
@@ -506,7 +507,6 @@
         filters:
           - name: prepend
             args: "({{ .Result.description_category }}) "
-          - name: strdump
       date:
         # Сегодня, 15:10 (today)
         # Вчера, 23:28 (yesterday)

src/Jackett.Common/Definitions/lastfiles.yml

@@ -0,0 +1,163 @@
+---
+  site: lastfiles
+  name: LastFiles
+  description: "LastFiles (LF) is a ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
+  language: ro-ro
+  type: private
+  encoding: windows-1252
+  links:
+    - http://last-torrents.org/ # site does not support https ERR_CONNECTION_REFUSED
+
+  caps:
+    categorymappings:
+      - {id: 31, cat: Movies/UHD, desc: "Movies/4K"}
+      - {id: 5, cat: Movies/BluRay, desc: "Movies/BluRay"}
+      - {id: 9, cat: Movies/DVD, desc: "Movies/DVD"}
+      - {id: 11, cat: Movies/HD, desc: "Movies/HD"}
+      - {id: 58, cat: Movies/SD, desc: "Movies/Cam"}
+      - {id: 61, cat: Movies/3D, desc: "Movies/3D"}
+      - {id: 24, cat: Movies/SD, desc: "Movies/XVID"}
+      - {id: 16, cat: Movies, desc: "Old Movies"}
+      - {id: 15, cat: Movies, desc: "Movies Mobile"}
+      - {id: 54, cat: Movies/WEBDL, desc: "Movies/WEB-DL"}
+      - {id: 56, cat: TV/Documentary, desc: "Documentary"}
+      - {id: 18, cat: Movies, desc: "Movie Packs"}
+      - {id: 32, cat: Movies/UHD, desc: "Movies/4K-RO"}
+      - {id: 6, cat: Movies/BluRay, desc: "Movies/BluRay-Ro"}
+      - {id: 12, cat: Movies/HD, desc: "Movies/HD-Ro"}
+      - {id: 81, cat: Movies/HD, desc: "Movies/x265-Ro"}
+      - {id: 82, cat: Movies/HD, desc: "Movies/x265"}
+      - {id: 10, cat: Movies/DVD, desc: "Movies/DVD-Ro"}
+      - {id: 59, cat: Movies/SD, desc: "Movies/Cam-Ro"}
+      - {id: 25, cat: Movies/SD, desc: "Movies/XVID-Ro"}
+      - {id: 17, cat: Movies, desc: "Old Movies Ro"}
+      - {id: 55, cat: Movies/WEBDL, desc: "Movies/WEB-DL Ro"}
+      - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro"}
+      - {id: 62, cat: Movies/3D, desc: "Movies/3D-RO"}
+      - {id: 19, cat: Movies, desc: "Movie Packs Ro"}
+      - {id: 20, cat: TV, desc: "TV Episodes"}
+      - {id: 21, cat: TV, desc: "TV Episodes Ro"}
+      - {id: 13, cat: TV/HD, desc: "HDTV"}
+      - {id: 14, cat: TV/HD, desc: "HDTV-Ro"}
+      - {id: 28, cat: Audio, desc: "Music"}
+      - {id: 51, cat: PC/Phone-Android, desc: "Android Apps & Games"}
+      - {id: 26, cat: PC/0day, desc: "Software"}
+      - {id: 30, cat: PC/ISO, desc: "Games PC-ISO"}
+      - {id: 33, cat: PC/Games, desc: "Game Packs"}
+      - {id: 1, cat: TV/Anime, desc: "Anime/Hentai"}
+      - {id: 2, cat: TV/Anime, desc: "Anime-Ro"}
+      - {id: 42, cat: TV/Sport, desc: "Sport"}
+      - {id: 43, cat: Books, desc: "Books"}
+      - {id: 44, cat: Other, desc: "Images"}
+      - {id: 49, cat: Other, desc: "Diverse"}
+      - {id: 22, cat: Other, desc: "RoContent"}
+      - {id: 60, cat: XXX, desc: "Images/XXX"}
+      - {id: 27, cat: XXX, desc: "XXX"}
+
+    modes:
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:has(h2:contains("failed"))
+    test:
+      path: browse.php
+
+  ratio:
+    path: browse.php
+    selector: font:contains("Ratio:") ~ font
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 name 1 genre 2 descr
+      genre: "{{ if .Query.IMDBID }}2{{else}}0{{end}}"
+      # 0 active 1 incldead 2 onlydead 3 free 4 double
+      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
+    rows:
+      selector: table.browser > tbody > tr:has(a[href^="download.php/"])
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      banner:
+        selector: a[href^="details.php?id="]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: src=([^\s]+)
+      download:
+        selector: a[href^="download.php/"]
+        attribute: href
+      date:
+        selector: td:nth-child(3)
+        filters:
+          - name: dateparse
+            args: "02-01-200615:04:05"
+      size:
+        selector: td:nth-child(4)
+      grabs:
+        selector: td:nth-child(5)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        case:
+          "span:contains(\"FREE\")": 0
+          "span:contains(\"Half\")": 0.5
+          "*": 1
+      uploadvolumefactor:
+        case:
+          "span:contains(\"2XUP\")": 2
+          "*": 1
+# engine n/a

src/Jackett.Common/Definitions/leaguehd.yml

@@ -33,7 +33,7 @@
       - {id: 409, cat: Other, desc: "Misc(其他)"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -105,7 +105,7 @@
         attribute: title
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/legacyhd.yml

@@ -21,7 +21,7 @@
       - {id: 9, cat: TV/Anime, desc: "Animation"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -63,7 +63,7 @@
     test:
       path: /
       selector: a[href$="/logout"]
-      
+
   ratio:
     path: /
     selector: li:has(i.fa-sync-alt)

src/Jackett.Common/Definitions/legittorrents.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://www.legittorrents.info/
+    - http://www.legittorrents.info/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/leporno.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://leporno.org/
+    - http://leporno.org/ # site does not support https ERR_SSL_VERSION_OR_CIPHER_MISMATCH
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/lesaloon.yml

@@ -6,7 +6,9 @@
   type: private
   encoding: UTF-8
   links:
-    - http://lesaloonv2-0.net/
+    - http://lesaloonv2-0.net/ # site does not support https
+  legacylinks:
+    - https://lesaloonv2-0.net/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/magnet4you.yml

@@ -22,7 +22,7 @@
   settings:
     - name: info
       type: info
-      default: Magnet4You does not use categories. In your software Indexer settings, set the category to 100001.
+      default: Magnet4You does not use categories. In your software Indexer settings, set the category to 7000.
     - name: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/majomparade.yml

@@ -50,8 +50,8 @@
 
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
   login:
@@ -74,21 +74,23 @@
       - path: letoltes.php
         categorymappings: ["!", 70, 39, 57]
         inputs:
-          tipus: "1"
+          tipus: 1
       - path: letoltes.php
         categorymappings: ["!", 70, 39, 57]
         inputs:
-          tipus: "2"
+          tipus: 2
       - path: xxx.php
         categorymappings: [70, 39, 57]
     inputs:
-      $raw: "{{range .Categories}}category[]={{.}}&{{end}}"
-      name: "{{if .Query.IMDBID}}http://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Query.Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
+      name: "{{ if .Query.IMDBID }}http://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       imdb_search: "{{ if .Query.IMDBID }}yes{{else}}{{end}}"
-      k: "yes"
-      tipuska: "1"
+      k: yes
+      tipuska: 1
+
     rows:
       selector: table#table > tbody > tr:has(a[href^="details.php?id="])
+
     fields:
       download:
         selector: a[href^="download.php?torrent="]
@@ -147,10 +149,11 @@
           - name: dateparse
             args: "2006-01-02 15:04:05 -07:00"
       downloadvolumefactor:
-        text: "0"
+        text: 0
       uploadvolumefactor:
         case:
-          img[title="Ennél a torrentnél 2x szorzó van."]: "2"
-          img[title="Ennél a torrentnél 3x szorzó van."]: "3"
-          img[title="Ennél a torrentnél 4x szorzó van."]: "4"
-          "*": "1"
+          img[title="Ennél a torrentnél 2x szorzó van."]: 2
+          img[title="Ennél a torrentnél 3x szorzó van."]: 3
+          img[title="Ennél a torrentnél 4x szorzó van."]: 4
+          "*": 1
+# engine tbd

src/Jackett.Common/Definitions/microbit.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://microbit.eu/
+    - http://microbit.eu/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

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

@@ -0,0 +1,165 @@
+---
+  site: mma-torrents
+  name: MMA-torrents
+  description: "MMA-Torrents is a Private Torrent Tracker for MMA (Mixed Martial Arts)"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://mma-torrents.com/
+
+  caps:
+    categorymappings:
+      - {id: 92, cat: Audio/Other, desc: "Audio - Podcast"}
+      - {id: 128, cat: TV/Sport, desc: "Boxing - Bare Knuckle"}
+      - {id: 105, cat: TV/Sport, desc: "Boxing - HD"}
+      - {id: 71, cat: TV/Sport, desc: "Boxing - SD"}
+      - {id: 86, cat: TV/Documentary, desc: "Documentary - All"}
+      - {id: 109, cat: TV/Sport, desc: "Events - Bellator/HD"}
+      - {id: 89, cat: TV/Sport, desc: "Events - Bellator/SD"}
+      - {id: 131, cat: TV/Sport, desc: "Events - Cage Warriors"}
+      - {id: 132, cat: TV/Sport, desc: "Events - Invicta FC"}
+      - {id: 130, cat: TV/Sport, desc: "Events - KOTC"}
+      - {id: 90, cat: TV/Sport, desc: "Events - M-1"}
+      - {id: 120, cat: TV/Sport, desc: "Events - MMA/Brazil"}
+      - {id: 70, cat: TV/Sport, desc: "Events - MMA/Other/HD"}
+      - {id: 47, cat: TV/Sport, desc: "Events - MMA/Other/SD"}
+      - {id: 129, cat: TV/Sport, desc: "Events - ONE"}
+      - {id: 126, cat: TV/Sport, desc: "Events - Other/Other"}
+      - {id: 96, cat: TV/Sport, desc: "Events - UFC/HD"}
+      - {id: 103, cat: TV/Sport, desc: "Events - UFC/SD"}
+      - {id: 93, cat: Audio/Other, desc: "Instructional - Audio"}
+      - {id: 112, cat: TV/Sport, desc: "Instructional - DVD/ISO/WEB"}
+      - {id: 113, cat: Movies/DVD, desc: "Instructional - DVDRip/Other"}
+      - {id: 73, cat: Books/Ebook, desc: "Instructional - E-book"}
+      - {id: 83, cat: TV/OTHER, desc: "Instructional - Fitness"}
+      - {id: 124, cat: TV/Sport, desc: "JJ/BJJ - Events"}
+      - {id: 85, cat: TV/Sport, desc: "JJ/BJJ - Misc/Other"}
+      - {id: 99, cat: TV/Sport, desc: "Kickboxing - HD"}
+      - {id: 84, cat: TV/Sport, desc: "Kickboxing - SD"}
+      - {id: 111, cat: Books/Magazines, desc: "Magazines - All"}
+      - {id: 58, cat: Other/Misc, desc: "Misc - All"}
+      - {id: 63, cat: TV/Sport, desc: "Misc - MMA Special"}
+      - {id: 62, cat: Movies/Other, desc: "Movies - MMA Related"}
+      - {id: 77, cat: TV/Sport, desc: "Muay Thai - All"}
+      - {id: 110, cat: TV/Sport, desc: "Packs - Career"}
+      - {id: 115, cat: TV/Sport, desc: "Packs - Instructionals"}
+      - {id: 91, cat: TV/Sport, desc: "Packs - Other/HD"}
+      - {id: 64, cat: TV/Sport, desc: "Packs - Other/SD"}
+      - {id: 95, cat: TV/Sport, desc: "Packs - Pride"}
+      - {id: 59, cat: TV/Sport, desc: "Packs - TUF"}
+      - {id: 114, cat: TV/Sport, desc: "Packs - UFC"}
+      - {id: 122, cat: TV/Sport, desc: "Packs - Userpacks"}
+      - {id: 72, cat: TV/Sport, desc: "Retro - K-1"}
+      - {id: 61, cat: TV/Sport, desc: "Retro - Other/All"}
+      - {id: 66, cat: TV/Sport, desc: "Retro - PRIDE"}
+      - {id: 67, cat: TV/Sport, desc: "Retro - UFC"}
+      - {id: 69, cat: TV/Sport, desc: "Retro - WEC"}
+      - {id: 97, cat: TV/Sport, desc: "TUF - Episode/HD"}
+      - {id: 104, cat: TV/Sport, desc: "TUF - Episode/SD"}
+      - {id: 101, cat: TV/Sport, desc: "TV Show - Episode/HD"}
+      - {id: 94, cat: TV/Sport, desc: "TV Show - Episode/SD"}
+      - {id: 127, cat: TV/Sport, desc: "TV Show - WebRip"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "seeders"
+      options:
+        "name": "title"
+        "size": "size"
+        "seeders": "seeders"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: account-login.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      returnto: "/"
+    error:
+      - selector: table.main:contains("Login failed!")
+        message:
+          selector: table tr td.text
+    test:
+      path: torrents.php
+      selector: a[href="account-logout.php"]
+
+  search:
+    paths:
+      - path: torrents.php
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      incldead: 1
+      lang: 0
+      # 0 all 1 notfree 2 onlyfree
+      freeleech: 0
+      search: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      order: "{{ .Config.type }}"
+
+    rows:
+      selector: table[class="ttable_headinner"] tr:has(a[href^="download.php?id="])
+
+    fields:
+      category:
+        selector: a[href^="torrents.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="torrents-details.php?id="]
+        attribute: href
+      comments:
+        selector: a[href^="comments.php?type=torrent&id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(2)
+        filters:
+          - name: regexp
+            args: "(\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2})"
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      grabs:
+        selector: td:nth-child(2)
+        filters:
+          - name: regexp
+            args: "Completed.*(\\d+)"
+      size:
+        selector: td:nth-child(6)
+      seeders:
+        selector: td:nth-child(7)
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        case:
+          img[src="img/freeleech_star.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
+# TorrentTrader 2.03

src/Jackett.Common/Definitions/moecat.yml

@@ -29,7 +29,7 @@
       - {id: 428, cat: TV/Anime, desc: "Animations/官方-动漫"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -40,6 +40,13 @@
     - name: password
       type: password
       label: Password
+    - name: 2facode
+      type: text
+      label: 2FA code
+    - name: info_2fa
+      type: info
+      label: "About 2FA code"
+      default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the MoeCat Web Site. Otherwise just leave it empty."
     - name: sort
       type: select
       label: Sort requested from site
@@ -65,10 +72,12 @@
       logintype: username
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
+      scode: "{{ .Config.2facode }}"
       thispagewidth: yes
       logout: 720
     error:
       - selector: td.embedded:has(h2:contains("姿势不正确"))
+      - selector: td.embedded:has(h2:contains("登录失败"))
     test:
       path: index.php
       selector: a[href="logout.php"]
@@ -112,7 +121,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href

src/Jackett.Common/Definitions/mononokebt.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: iso-8859-15
   links:
-    - http://mononoke-bt.org/
+    - http://mononoke-bt.org/ # site does not support https NET::ERR_CERT_DATE_INVALID expired 10 Dec 2018
 
   caps:
     categories:
@@ -79,4 +79,4 @@
           - name: dateparse
             args: "2006-01-0215:04:05 -07:00"
 
-        
+

src/Jackett.Common/Definitions/moviesdvdr.yml

@@ -47,14 +47,16 @@
         selector: a
         attribute: href
       banner:
-        selector: img
+        selector: img.attachment-post-thumbnail
         attribute: src
       date:
         text: now
       description:
         selector: span
+      files:
+        text: 1
       size:
-        text: "500 MB"
+        text: "4.5 GB"
       seeders:
         text: 1
       leechers:

src/Jackett.Common/Definitions/mteamtp.yml

@@ -49,7 +49,7 @@
 
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -91,11 +91,10 @@
         categorymappings: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
     method: post
     inputs:
-      $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
-      search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       incldead: 1
       spstate: 0
-      inclbookmarked: 0
       search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
       search_mode: 0
     rows:
@@ -115,7 +114,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href
@@ -152,18 +151,19 @@
             args: "2006-01-02 15:04:05 -07:00"
       downloadvolumefactor:
         case:
-          img.pro_free: "0"
-          img.pro_free2up: "0"
-          img.pro_50pctdown: "0.5"
-          img.pro_50pctdown2up: "0.5"
-          img.pro_30pctdown: "0.3"
-          "*": "1"
+          img.pro_free: 0
+          img.pro_free2up: 0
+          img.pro_50pctdown: 0.5
+          img.pro_50pctdown2up: 0.5
+          img.pro_30pctdown: 0.3
+          "*": 1
       uploadvolumefactor:
         case:
-          img.pro_50pctdown2up: "2"
-          img.pro_free2up: "2"
-          img.pro_2up: "2"
-          "*": "1"
+          img.pro_50pctdown2up: 2
+          img.pro_free2up: 2
+          img.pro_2up: 2
+          "*": 1
       description:
         selector: td:nth-child(2)
         remove: a, img
+# NexusPHP

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -48,7 +48,7 @@
       - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -111,7 +111,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php?id="]
         attribute: href
@@ -148,18 +148,19 @@
             args: "2006-01-02 15:04:05 -07:00"
       downloadvolumefactor:
         case:
-          img.pro_free: "0"
-          img.pro_free2up: "0"
-          img.pro_50pctdown: "0.5"
-          img.pro_50pctdown2up: "0.5"
-          img.pro_30pctdown: "0.3"
-          "*": "1"
+          img.pro_free: 0
+          img.pro_free2up: 0
+          img.pro_50pctdown: 0.5
+          img.pro_50pctdown2up: 0.5
+          img.pro_30pctdown: 0.3
+          "*": 1
       uploadvolumefactor:
         case:
-          img.pro_50pctdown2up: "2"
-          img.pro_free2up: "2"
-          img.pro_2up: "2"
-          "*": "1"
+          img.pro_50pctdown2up: 2
+          img.pro_free2up: 2
+          img.pro_2up: 2
+          "*": 1
       description:
         selector: td:nth-child(2)
         remove: a, img
+# NexusPHP

src/Jackett.Common/Definitions/netcosmo.yml

@@ -6,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://netcosmo.it/
+    - http://netcosmo.it/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
 
   caps:
     categorymappings:
@@ -25,7 +25,7 @@
       - {id: 37, cat: Other, desc: "Tutte le saghe"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 

src/Jackett.Common/Definitions/nethd.yml

@@ -6,7 +6,7 @@
   type: semi-private
   encoding: UTF-8
   links:
-    - http://nethd.org/
+    - http://nethd.org/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID
 
   caps:
     categorymappings:
@@ -18,7 +18,7 @@
       - {id: 406, cat: Books, desc: "Book"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
@@ -129,4 +129,4 @@
         case:
           "span.label:contains(\"2X\")": 2
           "*": 1
-# engine n/a
+# NexusPHP

src/Jackett.Common/Definitions/newstudio.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://newstudio.tv/
+    - http://newstudio.tv/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/newstudiol.yml

@@ -6,7 +6,7 @@
   type: semi-private
   encoding: UTF-8
   links:
-    - http://newstudio.tv/
+    - http://newstudio.tv/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/nitro.yml

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - http://nitro.to/
+    - http://nitro.to/ # does not support https NET::ERR_CERT_AUTHORITY_INVALID
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/nntt.yml

@@ -6,13 +6,13 @@
   type: public
   encoding: UTF-8
   links:
-    - http://www.nntt.org/
+    - http://www.nntt.org/ # site does not support https ERR_CONNECTION_REFUSED
 
   caps:
     categorymappings:
       - {id: 1, cat: Movies, desc: "Кино, Видео и ТВ"}
       - {id: 154, cat: Movies/HD, desc: "Зарубежное кино (HD Video)"}
-      - {id: 153, cat: Movies/DVD, desc: "Зарубежное кино (DVD Video)"} 
+      - {id: 153, cat: Movies/DVD, desc: "Зарубежное кино (DVD Video)"}
       - {id: 157, cat: Movies/3D, desc: "Кино в 3D"}
       - {id: 5, cat: Movies/SD, desc: "Зарубежное кино (DVDRip, HQRip)"}
       - {id: 6, cat: Movies/Foreign, desc: "Наше кино (DVDRip, HQRip)"}
@@ -675,7 +675,7 @@
       sd: "{{ .Config.type }}"
       keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}2019{{end}}"
       $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
-      
+
     rows:
       selector: table.tablebg tr.col_line
 
@@ -698,7 +698,7 @@
         selector: td:nth-of-type(5) p
         filters:
           - name: replace
-            args: ["ТБ", "TB"] 
+            args: ["ТБ", "TB"]
           - name: replace
             args: ["ГБ", "GB"]
           - name: replace

src/Jackett.Common/Definitions/nostalgic.yml

@@ -1,7 +1,7 @@
 ---
   site: nostalgic
   name: Nostalgic
-  description: "Nostalgic Torrents (The Archive) is a Private Torrent Tracker for MOVIES / TV / GENERAL NOSTALGIA"
+  description: "Nostalgic Torrents (The Archive / VHSTAPES) is a Private Torrent Tracker for MOVIES / TV / GENERAL NOSTALGIA"
   language: en-us
   type: private
   encoding: UTF-8