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,8 +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://ci.appveyor.com/api/projects/status/gaybh5mvyx418nsp/branch/master?svg=true)](https://ci.appveyor.com/project/Jackett/jackett)
-[![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)
@@ -27,6 +26,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
  * 1337x
  * 7torrents
+ * AcademicTorrents
  * ACG.RIP
  * ACGsou
  * Anidex
@@ -37,10 +37,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BigFANGroup
  * BitRu
  * BitTorrent.AM
+ * BT.etree
  * BTDB
  * BTDIGG
  * BTeye
- * BT.etree
  * BTSOW
  * Cili180
  * ConCen
@@ -49,11 +49,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * cpasbienClone
  * Demonoid
  * dmhy
- * ETTV
  * EliteTorrent.biz
  * EstrenosDTL
- * ExtraTorrent.cd
+ * ETTV
  * EXT Torrents
+ * ExtraTorrent.cd
  * EZTV
  * Filebase
  * FireBit
@@ -65,16 +65,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Horrible Subs
  * IBit
  * Idope
+ * Il CorSaRo Blu
  * Il Corsaro Nero <!-- maintained by bonny1992 -->
- * Il Corsaro Blu
  * Internet Archive (archive.org)
  * Isohunt2
  * iTorrent
- * KickAssTorrent (KATcr)
  * KickAssTorrent (kat.li)
+ * KickAssTorrent (KATcr)
  * Legit Torrents
  * LePorno
  * LimeTorrents
+ * LinuxTracker
  * MacTorrents
  * Magnet4You
  * MagnetDL
@@ -82,28 +83,37 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Monova
  * MovCr
  * MoviesDVDR
+ * MyPornClub
  * Newpct (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
  * Newstudio
  * Nitro
  * NNTT
  * NoName Club (NNM-Club)
- * Nyaa.si
  * Nyaa-Pantsu
+ * Nyaa.si
+ * OneJAV
  * OxTorrent
+ * ParnuXi
  * PiratBit
  * Pirateiro
  * PornLeech
+ * PornoLive
+ * PornoRip
+ * PornoTor
  * ProStyleX
+ * Rapidzona
  * RARBG
  * Rus-media
  * RuTor
+ * RuTracker.RU
  * Seedpeer
  * shokweb
  * ShowRSS
  * SkyTorrentsClone
  * SolidTorrents
- * sukebei.Nyaa.si
+ * sosulki
  * sukebei-Pantsu
+ * sukebei.Nyaa.si
  * TFile
  * The Pirate Bay (TPB)
  * Tokyo Tosho
@@ -111,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
@@ -120,51 +132,58 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * TorrentKitty
  * TorrentParadise
  * TorrentProject2
+ * TorrentRex
  * TorrentQuest
  * Torrents.csv
+ * Torrentv
  * TorrentView
  * TorrentWal
  * Torrentz2
  * Underverse
+ * UnionDHT
+ * 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
  * CzTorrent
- * Deildu
  * DXP (Deaf Experts)
+ * Deildu
  * EniaHD
  * Erzsebet
+ * ExKinoRay
  * ExtremlymTorrents
+ * FilmsClub
  * Gay-Torrents.net
  * Gay-Torrents.org
- * HamsterStudio
  * HD Dolby
+ * HamsterStudio
+ * IV-Torrents
+ * KinoNaVse100
  * Kinozal
  * Korsar
  * LostFilm.tv
+ * MVGroup Forum
+ * MVGroup Main
  * Marine Tracker
  * Metal Tracker
  * MuziekFrabriek
- * MVGroup Forum
- * MVGroup Main
  * NetHD (VietTorrent)
  * Pornolab
  * RiperAM
  * RockBox
- * Rustorka
  * RuTracker
+ * Rustorka
  * Sharewood
  * SkTorrent
  * SoundPark
@@ -186,6 +205,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * 4thD (4th Dimension)
  * 52PT
  * 720pier
+ * AST4u
  * Abnormal
  * Acid Lounge (A-L)
  * Aftershock
@@ -197,54 +217,56 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Araba Fenice (Phoenix)
  * Asgaard (AG)
  * AsianCinema
- * AST4u
- * Audiobook Torrents (ABT)
  * AudioNews (AN)
- * Awesome-HD (AHD)
+ * Audiobook Torrents (ABT)
  * Avistaz (AsiaTorrents)
- * Back-ups
- * BakaBT
- * BaconBits (bB)
- * BeiTai
- * BeyondHD (BHD)
- * Bibliotik
+ * Awesome-HD (AHD)
+ * BaibaKo
  * BIGTorrent
- * BigTower
- * Bit-City Reloaded
  * BIT-HDTV
- * BiT-TiTAN
- * Bithorlo (BHO)
- * BitHUmen
- * Bitspyder
- * BitTorrentFiles
- * BitTurk
  * BJ-Share (BJ)
- * BlueBird
- * Blutopia (BLU)
- * Brasil Tracker
- * BroadcastTheNet (BTN)
- * BroadCity
  * BRObits
- * BrokenStones
  * BTGigs (TG)
  * BTNext (BTNT)
  * BTSCHOOL
- * Carpathians
- * CartoonChaos (CC)
- * CasaTorrent
+ * Back-ups
+ * BaconBits (bB)
+ * BakaBT
+ * BeiTai
+ * BeyondHD (BHD)
+ * BiT-TiTAN
+ * Bibliotik
+ * BigTower
+ * Bit-City Reloaded
+ * BitHUmen
+ * BitTorrentFiles
+ * BitTurk
+ * Bithorlo (BHO)
+ * Bitspyder
+ * BlueBird
+ * Blutopia (BLU)
+ * Boxing Torrents
+ * Brasil Tracker
+ * BroadCity
+ * BroadcastTheNet (BTN)
+ * BrokenStones
  * CCFBits
  * CGPeers
  * CHDBits
+ * Carpathians
+ * CartoonChaos (CC)
+ * CasaTorrent
  * ChannelX
- * Cinemageddon
  * CinemaMovies
- * Cinematik
  * CinemaZ (EuTorrents)
+ * Cinemageddon
+ * Cinematik
  * Classix
  * Concertos
  * CrazyHD
  * CrazySpirits
  * CrnaBerza
+ * DXDHD
  * DanishBits (DB)
  * Das Unerwartete
  * DataScene (DS)
@@ -258,18 +280,16 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * DocumentaryTorrents (DT)
  * Downloadville
  * Dragonworld Reloaded
- * DXDHD
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * EggMeOn
  * Elite-Tracker
  * Empornium (EMP)
- * eShareNet
- * eStone (XiDER, BeLoad)
  * Ethor.net (Thor's Land)
+ * ExoticaZ (YourExotic)
  * ExtremeTorrents
  * FANO.IN
+ * Fantastic Heaven
  * FeedUrNeed (FuN)
  * Femdomcult
  * FileList (FL)
@@ -281,24 +301,22 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * FunFile (FF)
  * FunkyTorrents (FT)
  * Fuzer (FZ)
- * Galeriens (LaPauseTorrents)
  * GAYtorrent.ru
+ * GFXPeers
+ * Galeriens (LaPauseTorrents)
  * GazelleGames (GGn)
  * Generation-Free
- * GFXPeers
  * GigaTorrents
- * GimmePeers (formerly ILT) <!-- maintained by jamesb2147 -->
+ * GimmePeers (formerly ILT)
  * GiroTorrent
- * Greek Legends
  * Greek Team
- * HacheDe
+ * HD-Bits.com
  * HD-Forever (HDF)
  * HD-Olimpo
  * HD-Only (HDO)
  * HD-Space (HDS)
  * HD-Spain
  * HD-Torrents (HDT)
- * HD-Bits.com
  * HD4FANS
  * HDArea (HDA)
  * HDBits
@@ -315,23 +333,25 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HDTurk
  * HDU
  * HDZone
+ * HQSource (HQS)
+ * HacheDe
  * Hebits
  * Hon3y HD
- * HQSource (HQS)
  * HuSh
  * ICE Torrent
+ * IPTorrents (IPT)
  * ImmortalSeed (iS)
  * Immortuos
- * inPeril
  * Insane Tracker
- * IPTorrents (IPT)
  * JPopsuki
  * Kapaki
  * Karagarga
- * LegacyHD (HD4Free)
+ * LastFiles
  * Le Saloon
+ * LeChaudron
  * LeagueHD
  * LearnFlakes
+ * LegacyHD (HD4Free)
  * LibraNet (LN)
  * LinkoManija
  * LosslessClub
@@ -339,11 +359,11 @@ 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)
  * MyAnonamouse (MAM)
- * myAmity
  * MySpleen
  * NBTorrents
  * NCore
@@ -353,57 +373,54 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * New Real World
  * Norbits
  * NordicBits (NB)
- * NORDiCHD
- * Nostalgic (The Archive)
- * notwhat.cd
+ * Nostalgic (The Archive / VHSTAPES)
  * OnlineSelfEducation
  * Orpheus
  * Ourbits (HDPter)
  * P2PBG
  * P2PElite
+ * PT99
+ * PTFiles (PTF)
+ * PThome
+ * PWTorrents (PWT)
  * Partis
  * PassThePopcorn (PTP)
  * Peers.FM
+ * PiXELHD (PxHD)
  * PirateTheNet (PTN)
  * PixelCove (Ultimate Gamer)
- * PiXELHD (PxHD)
  * Pleasuredome
  * PolishSource (PS)
  * PolishTracker
- * Pornbay
  * PornBits (PB)
+ * Pornbay
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
  * Psytorrents
- * PT99
- * PTFiles (PTF)
- * PThome
  * PuntoTorrent
- * PWTorrents (PWT)
  * R3V WTF!
+ * RPTorrents
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
  * RainbowNation Sharing (RNS)
- * Redacted (PassTheHeadphones)
  * Red Star Torrent (RST)
+ * Redacted (PassTheHeadphones)
  * RetroFlix
  * RevolutionTT
  * RoDVD (Cinefiles)
  * Romanian Metal Torrent (RMT)
- * RPTorrents
+ * SDBits
  * SceneFZ
  * SceneHD
  * ScenePalace (SP)
  * SceneRush
  * SceneTime
- * SceneXpress
- * SDBits
  * Secret Cinema
  * SeedFile (SF)
- * Shareisland
  * ShareSpaceDB
  * ShareUniversity
+ * Shareisland
  * Shazbat
  * Shellife (SL)
  * SiamBIT
@@ -411,61 +428,63 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * SpaceTorrent
  * SpeedCD
  * SpeedTorrent Reloaded
+ * Spirit of Revolution
  * SportHD
  * SportsCult
  * SpringSunday
  * SuperBits (SBS)
+ * TEKNO3D
+ * TLFBits
+ * TOrrent-tuRK (TORK)
+ * TTsWEB
+ * TV Chaos UK (TVCUK)
+ * TV-Vault
+ * TVstore
  * TakeaByte
  * Tapochek
  * Tasmanit
  * TeamHD
  * TeamOS
- * TEKNO3D
  * TellyTorrent
  * TenYardTorrents (TYT)
- * TheAudioScene
- * TheEmpire (TE)
  * The Falling Angels (TFA)
  * The Geeks
  * The Horror Charnel (THC)
  * The New Retro
  * The Occult
  * The Place
- * The Resurrection
  * The Shinning (TsH)
  * The Show
- * The-Madhouse
  * The Vault
- * TLFBits
+ * The-Madhouse
+ * TheAudioScene
+ * TheEmpire (TE)
+ * ToTheGlory
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
+ * Torrent-Syndikat
  * Torrent.LT
  * TorrentBD
  * TorrentBytes (TBy)
  * TorrentCCF (TCCF)
  * TorrentDay (TD)
- * Torrentech (TTH)
  * TorrentFactory
- * TorrentHeaven
  * TorrentHR
- * Torrenting (TT)
- * Torrentland
+ * TorrentHeaven
  * TorrentLeech (TL)
  * TorrentLeech.pl
  * TorrentSeeds (TS)
- * Torrent-Syndikat
- * TOrrent-tuRK (TORK)
+ * Torrentech (TTH)
+ * Torrenting (TT)
+ * Torrentland
  * TotallyKids (TK)
- * ToTheGlory
  * TranceTraffic
  * Trezzor
  * TurkTorrent (TT)
- * TV Chaos UK (TVCUK)
- * TV-Vault
- * TVstore
  * Twilight Torrents
  * Twilights Zoom
- * u-torrents (SceneFZ)
+ * U-Torrents
+ * U2 (U2分享園@動漫花園)
  * UHDBits
  * UnionGang
  * UnlimitZ
@@ -473,17 +492,22 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * World-In-HD
  * World-of-Tomorrow
- * x-ite.me (XM)
- * xBytesV2
  * XSpeeds (XS)
- * XWTorrents (XWT)
  * XWT-Classics
+ * XWTorrents (XWT)
  * Xthor
- * XtremeFile
  * XtreMeZone (MYXZ)
- * ExoticaZ (YourExotic)
+ * XtremeFile
  * Zamunda.net
  * Zelka.org
+ * eShareNet
+ * eStone (XiDER, BeLoad)
+ * inPeril
+ * myAmity
+ * notwhat.cd
+ * u-torrents (SceneFZ)
+ * x-ite.me (XM)
+ * xBytesV2
 </details>
 
 Trackers marked with  [![(invite needed)][inviteneeded]](#) have no active maintainer and are missing features or are broken. If you have an invite for them please send it to garfieldsixtynine -at- gmail.com to get them fixed/improved.

Upstart.config

@@ -1,20 +1,20 @@
-author "sea3pea0"
-description "Upstart Script to run NzbDrone as a service on Ubuntu/Debian based systems, as well as others"
-
-#Set username for the process. Should probably be what you use for logging in
-setuid {username to run jackett}
-setgid users
-
-#This is the install directory. If you installed using a deb package or the NzbDrone Repository you do not need to change this
-
-env DIR=/opt/Jackett
-env LD_LIBRARY_PATH=/usr/local/nzbdrone/lib
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-respawn
-script
-    chdir $DIR
-    exec /volume1/@appstore/Mono/usr/bin/mono --debug JackettConsole.exe
-end script
+author "sea3pea0"
+description "Upstart Script to run NzbDrone as a service on Ubuntu/Debian based systems, as well as others"
+
+#Set username for the process. Should probably be what you use for logging in
+setuid {username to run jackett}
+setgid users
+
+#This is the install directory. If you installed using a deb package or the NzbDrone Repository you do not need to change this
+
+env DIR=/opt/Jackett
+env LD_LIBRARY_PATH=/usr/local/nzbdrone/lib
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+respawn
+script
+    chdir $DIR
+    exec /volume1/@appstore/Mono/usr/bin/mono --debug JackettConsole.exe
+end script

azure-pipelines.yml

@@ -1,12 +1,19 @@
 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
   netCoreFramework: netcoreapp3.1
   netCoreSdkVersion: 3.1.x
+  system.debug: true
+
+pr:
+  autoCancel: true
+  
+trigger:
+  batch: true
 
 stages:
   - stage: BuildJackett
@@ -352,14 +359,14 @@ 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/*
@@ -367,3 +374,25 @@ stages:
           isDraft: true
           addChangeLog: true
           compareWith: lastNonDraftRelease
+
+      - task: PowerShell@2
+        displayName: Ensure all artifacts are uploaded to Github
+        inputs:
+          targetType: inline
+          script: |
+            $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 '*Creating a release for tag:*') 
+              {
+                $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/DateTimeRoutines/DateTimeRoutines.cs

@@ -286,9 +286,7 @@ namespace DateTimeRoutines
         /// <param name="parsed_time">parsed date-time output</param>
         /// <returns>true if time was found, else false</returns>
         public static bool TryParseTime(this string str, DateTimeFormat default_format, out ParsedDateTime parsed_time)
-        {
-            return TryParseTime(str, default_format, out parsed_time, null);
-        }
+            => TryParseTime(str, default_format, out parsed_time, null);
 
         /// <summary>
         /// Tries to find date and/or time within the passed string and return it as ParsedDateTime object. 

src/DateTimeRoutines/DateTimeRoutines.csproj

@@ -1,7 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>8</LangVersion>
+    <NoWarn />
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningsAsErrors />
   </PropertyGroup>
-
 </Project>

src/Jackett.Common/Content/common.js

@@ -1,4 +1,4 @@
-function getUrlParams() {
+function getUrlParams() {
     var vars = [], hash;
     var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
     for (var i = 0; i < hashes.length; i++) {
@@ -7,4 +7,4 @@
         vars[hash[0]] = hash[1];
     }
     return vars;
-}
+}

src/Jackett.Common/Content/custom.js

@@ -241,9 +241,9 @@ function displayUnconfiguredIndexersList() {
 			        }).fail(function (data) {
                 if(data.responseJSON.error !== undefined) {
                   var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-                  doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                  doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
                 } else {
-                  doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
+                  doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
                 }
 			        });
                 });

src/Jackett.Common/Content/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -691,6 +691,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20200222"></script>
+    <script type="text/javascript" src="../custom.js?changed=20200301"></script>
 </body>
 </html>

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

@@ -86,4 +86,4 @@ var api = {
 	        success: callback
 	    });
 	}
-}
+}

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

@@ -1,6 +1,6 @@
-Handlebars.registerHelper('ifCond', function (v1, v2, options) {
+Handlebars.registerHelper('ifCond', function (v1, v2, options) {
     if(v1 === v2) {
         return options.fn(this);
     }
     return options.inverse(this);
-});
+});

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

@@ -1,4 +1,4 @@
-
+
 Handlebars.registerHelper('dateFormat', function (context, block) {
     if (window.moment) {
         var f = block.hash.format || "YYYY-MM-DD HH:mm:ss";

src/Jackett.Common/Content/login.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>

src/Jackett.Common/Definitions/0daykiev.yml

@@ -1,4 +1,4 @@
----
+---
   site: 0daykiev
   name: 0day.kiev
   description: "0day.kiev.ua is a RUSSIAN Private Torrent Tracker for MOVIES / TV / GENERAL"

src/Jackett.Common/Definitions/2fast4you.yml

@@ -1,4 +1,4 @@
----
+---
   site: 2fast4you
   name: 2 Fast 4 You
   description: "2 Fast 4 You is a FRENCH Private site for TV / MOVIES / GENERAL"

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/3evils.yml

@@ -1,4 +1,4 @@
----
+---
   site: 3evils
   name: 3evils
   description: "3evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"

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/academictorrents.yml

@@ -0,0 +1,100 @@
+---
+  site: academictorrents
+  name: AcademicTorrents
+  description: "AcademicTorrents is a Public Community-Maintained Distributed Repository for datasets and scientific knowledge."
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    - https://academictorrents.com/
+
+  caps:
+    categorymappings:
+      - {id: 5, cat: Books, desc: "Paper"}
+      - {id: 6, cat: Other, desc: "Dataset"}
+      - {id: 7, cat: TV/Documentary, desc: "Course"}
+
+    modes:
+      search: [q]
+
+  settings:
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "DESC"
+      options:
+        "DESC": "desc"
+        "ASC": "asc"
+
+  search:
+    # https://academictorrents.com/browse.php?search=&c5=1&c6=1&c7=1&sort_field=added&sort_dir=DESC
+    paths:
+      - path: browse.php
+      - path: browse.php
+        inputs:
+          page: 1
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      sort_field: "{{ .Config.sort }}"
+      sort_dir: "{{ .Config.type }}"
+      
+    rows:
+      selector: table.table> tbody > tr:has(a[href^="/browse.php?cat="])
+      filters:
+        - name: andmatch
+
+    fields:
+      category:
+        selector: a[href^="/browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="/details/"]
+      details:
+        selector: a[href^="/details/"]
+        attribute: href
+      download:
+        # /download/08078e0894099530913e9335bdbc804f42f6e872.torrent"
+        selector: a[href^="/details/"]
+        attribute: href
+        filters:
+          - name: replace
+            args: ["/details/", "/download/"]
+          - name: append
+            args: ".torrent"
+      date:
+        selector: td:nth-child(4)
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      size:
+        selector: td:nth-child(5)
+      grabs:
+        selector: td:nth-child(6)
+      seeders:
+        text: 0
+      seeders:
+        selector: td:nth-child(7):not(:empty)
+        optional: true
+        filters:
+          - name: replace
+            args: ["+", ""]
+      leechers:
+        selector: td:nth-child(8)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
+# engine n/a

src/Jackett.Common/Definitions/acidlounge.yml

@@ -1,4 +1,4 @@
----
+---
   site: acidlounge
   name: Acid-Lounge
   description: "Acid Lounge (A-L) is a Private Torrent Tracker for 0DAY / GENERAL"

src/Jackett.Common/Definitions/aftershock.yml

@@ -1,4 +1,4 @@
----
+---
   site: aftershock
   name: Aftershock
   description: "Aftershock is a HUNGARIAN Private Torrent Tracker for MOVIES / GENERAL"
@@ -170,4 +170,4 @@
         case:
           span.icon_upload: 2
           "*": 1
-# XBT v3
+# XBT v3

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/alexfilm.yml

@@ -1,4 +1,4 @@
----
+---
   site: alexfilm
   name: AlexFilm
   description: "AlexFilm is a RUSSIAN Semi-Private Torrent Tracker for TV"

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

@@ -1,4 +1,4 @@
----
+---
   site: arabafenice
   name: ArabaFenice
   description: "Araba Fenice (Phoenix) is an ITALIAN Private site for TV / MOVIES / GENERAL"
@@ -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/arenabg.yml

@@ -1,4 +1,4 @@
----
+---
   site: arenabg
   name: ArenaBG
   description: "ArenaBG is a BULGARIAN Semi-Private Torrent Tracker for 0DAY / GENERAL"

src/Jackett.Common/Definitions/asgaard.yml

@@ -1,4 +1,4 @@
----
+---
   site: asgaard
   name: Asgaard
   description: "Asgaard (AG) is a NORDIC Private Torrent Tracker for MOVIES / TV / GENERAL"
@@ -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/audiobooktorrents.yml

@@ -44,15 +44,27 @@
     modes:
       search: [q]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: info_results
+      type: info
+      label: Search results
+      default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."
+
   login:
     path: takelogin.php
     method: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      use_ssl: "1"
-      perm_ssl: "1"
-      submitme: "X"
+      use_ssl: 1
+      perm_ssl: 1
+      submitme: X
     error:
       - selector: td.embedded:has(h2:contains("Oops"))
       - selector: td.embedded:has(h2:contains("failed"))
@@ -65,58 +77,38 @@
     inputs:
       $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
-      searchin: "title"
-      incldead: "1"
+      searchin: title
+      incldead: 1
+
     rows:
       selector: tr.browse_color, tr.freeleech_color, tr[id^="kdescr"]
       after: 1
+
     fields: # some users (rank specific?) have an extra column (td:nth-child(4)) with bookmark features
-      banner:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: src=\'(.*?)\'
-      title:
-        selector: a[href^="details.php?id="][onmouseover]
-        attribute: onmouseover
-        filters:
-          - name: regexp
-            args: Tip\('<b>(.*?)</b>
       category:
         selector: a[href^="browse.php?cat="]
         attribute: href
         filters:
           - name: querystring
             args: cat
+      title:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: Tip\('<b>(.*?)</b>
       details:
         selector: a[href^="details.php?id="][onmouseover]
         attribute: href
       download:
         selector: a[href^="download.php"]
         attribute: href
-      files:
-        selector: a[href^="filelist.php"]
-      size:
-        selector: td:nth-last-child(6)
-      grabs:
-        selector: td:nth-last-child(5)
+      banner:
+        selector: a[href^="details.php?id="][onmouseover]
+        attribute: onmouseover
         filters:
           - name: regexp
-            args: ([\d,]+)
-      seeders:
-        selector: td:nth-last-child(4)
-      leechers:
-        selector: td:nth-last-child(3)
-      date:
-        selector: td:nth-last-child(7)
-      downloadvolumefactor:
-        case:
-          "a.info > b:contains(\"[FREE]\")": "0"
-          "*": "1"
-      uploadvolumefactor:
-        case:
-          "*": "1"
+            args: src=\'(.*?)\'
       description:
         selector: a[href^="details.php?id="][onmouseover]
         attribute: onmouseover
@@ -130,7 +122,29 @@
           - name: prepend
             args: "{{ .Result.description }}<br>\n"
       description:
-        selector: td[colspan=13]
+        selector: td[colspan="13"]
         filters:
           - name: prepend
             args: "{{ .Result.description }}<br>\n"
+      files:
+        selector: td:nth-last-child(9)
+      date:
+        selector: td:nth-last-child(7)
+      size:
+        selector: td:nth-last-child(6)
+      grabs:
+        selector: td:nth-last-child(5)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-last-child(4)
+      leechers:
+        selector: td:nth-last-child(3)
+      downloadvolumefactor:
+        case:
+          "a.info > b:contains(\"[FREE]\")": 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
+# U-232 V4

src/Jackett.Common/Definitions/audionews.yml

@@ -1,4 +1,4 @@
----
+---
   site: audionews
   name: AudioNews
   description: "AudioNews (AN) is a Private Torrent Tracker for AUDIO SOFTWARE / SAMPLES / ETC"

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:
@@ -94,4 +98,4 @@
           "*": 1
       uploadvolumefactor:
         case:
-          "*": 1
+          "*": 1

src/Jackett.Common/Definitions/backups.yml

@@ -1,4 +1,4 @@
-  site: backups
+  site: backups
   name: Back-ups
   description: "Back-Ups is a Private Torrent Tracker for MOVIES / TV / GENERAL"
   language: en-us

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
-# UNIT3D
+        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
-# UNIT3D
+        text: 1
+# UNIT3D

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -1,4 +1,4 @@
----
+---
   site: bigfangroup
   name: BigFANGroup
   description: "BigFANGroup is a RUSSIAN Public Torrent Tracker for MOVIES / TV"

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:
@@ -96,4 +98,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

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/bit-titan.yml

@@ -1,4 +1,4 @@
----
+---
   site: bit-titan
   name: BiT-TiTAN
   description: "BiT-TiTAN is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"

src/Jackett.Common/Definitions/bithorlo.yml

@@ -1,4 +1,4 @@
----
+---
   site: bithorlo
   name: Bithorlo
   description: "Bithorlo (BHO) is a HUNGARIAN Private Torrent Tracker for MOVIES / GENERAL"

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/bluebird.yml

@@ -1,4 +1,4 @@
----
+---
   site: bluebirdhd
   name: BlueBird
   description: "BlueBird is a RUSSIAN Private Torrent Tracker for HD MOVIES"

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/booktracker.yml

@@ -1,4 +1,4 @@
----
+---
   site: booktracker
   name: BookTracker
   description: "BookTracker is a RUSSIAN Semi-Private Torrent Tracker for EBOOKS"

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -0,0 +1,133 @@
+---
+  site: boxingtorrents
+  name: Boxing Torrents
+  description: "Boxing Torrents is a Private Torrent Tracker for BOXING"
+  language: en-us
+  type: private
+  encoding: UTF-8
+  links:
+    - https://tc-boxing.com/
+
+  caps:
+    categorymappings:
+      - {id: 15, cat: TV/Sport, desc: "3D"}
+      - {id: 9, cat: TV/Sport, desc: "Amateur - Full"}
+      - {id: 16, cat: TV/Sport, desc: "Blu-ray"}
+      - {id: 13, cat: TV/Sport, desc: "Career Set"}
+      - {id: 8, cat: TV/Sport, desc: "DVD"}
+      - {id: 10, cat: TV/Sport, desc: "Foreign - Excellent"}
+      - {id: 11, cat: TV/Sport, desc: "Foreign - Fair"}
+      - {id: 6, cat: TV/Sport, desc: "Foreign - Good"}
+      - {id: 12, cat: TV/Sport, desc: "Foreign - Poor"}
+      - {id: 1, cat: TV/Sport, desc: "Full - Excellent"}
+      - {id: 3, cat: TV/Sport, desc: "Full - Fair"}
+      - {id: 2, cat: TV/Sport, desc: "Full - Good"}
+      - {id: 4, cat: TV/Sport, desc: "Full - Poor"}
+      - {id: 14, cat: TV/Sport, desc: "HD"}
+      - {id: 7, cat: TV/Sport, desc: "Misc"}
+
+
+    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: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "DESC"
+      options:
+        "DESC": "desc"
+        "ASC": "asc"
+    - name: info_download
+      type: info
+      label: "Download Restrictions"
+      default: "You must have uploaded at least 10GB before you are able to access all torrent sizes. Until then, you are restricted to torrents no larger than 2.5GB."
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: td.embedded:contains("Login failed!")
+    test:
+      path: browse.php
+      selector: a[href="logout.php"]
+
+  download:
+    selector: a[href^="download.php"]
+    attribute: href
+
+  search:
+    paths:
+      # https://tc-boxing.com/browse.php?c16=1&c8=1&c14=1&incldead=1
+      # https://tc-boxing.com/browse.php?search=tyson&cat=0&incldead=1
+      - path: browse.php
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
+      # 0 active 1 incldead 2 onlydead
+      incldead: 1
+      search: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      d: "{{ .Config.type }}"
+
+    rows:
+      selector: table[border="1"][cellspacing="0"][cellpadding="5"] tr:has(a[href^="details.php?id="])
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      files:
+        selector: td:nth-last-child(8)
+      date:
+        selector: td:nth-last-child(6)
+        filters:
+          - name: dateparse
+            args: "2006-01-0215:04:05"
+      size:
+        selector: td:nth-last-child(5)
+      grabs:
+        selector: td:nth-last-child(4)
+        filters:
+          - name: regexp
+            args: (\d+)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          "b:contains(\"FreeLeech\")": 0
+          "*": 1
+      uploadvolumefactor:
+        text: 1
+# engine n/a

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/btdb.yml

@@ -50,13 +50,15 @@
       category:
         text: 1
       title:
-        selector: a[href^="/torrent/"]
+        selector: a[href*="/torrent/"]
       details:
-        selector: a[href^="/torrent/"]
+        selector: a[href*="/torrent/"]
         attribute: href
       download:
+         # download can be missing despite icon being present. Fortunately the magnet is always there
         selector: a[href$=".torrent"]
         attribute: href
+        optional: true
       magnet:
         selector: a[href^="magnet:?xt="]
         attribute: href

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

@@ -1,4 +1,4 @@
----
+---
   site: btnext
   name: BTNext
   description: "BTNext (BTNT) is a PORTUGUESE Private Torrent Tracker for 0DAY / GENERAL"
@@ -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

@@ -1,4 +1,4 @@
----
+---
   site: btschool
   name: BTSCHOOL
   description: "BTSCHOOL is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
@@ -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/btsow.yml

@@ -6,9 +6,10 @@
   type: public
   encoding: UTF-8
   links:
-    - https://btio.pw/
+    - https://btsow.club/
   legacylinks:
     - https://btos.pw/
+    - https://btio.pw/
 
   caps:
     categories:

src/Jackett.Common/Definitions/carpathians.yml

@@ -1,4 +1,4 @@
----
+---
   site: carpathians
   name: Carpathians
   description: "Carpathians is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -1,4 +1,4 @@
----
+---
   site: cartoonchaos
   name: CartoonChaos
   description: "CartoonChaos (CC) is a Private Torrent Tracker for ANIMATED MOVIES / TV"
@@ -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
@@ -146,4 +154,4 @@
           "*": 1
       uploadvolumefactor:
         text: 1
-# xbtit 2.0.0
+# xbtit 2.0.0

src/Jackett.Common/Definitions/casatorrent.yml

@@ -1,4 +1,4 @@
----
+---
   site: casatorrent
   name: Casa-Torrent
   description: "Casa-Torrent is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"

src/Jackett.Common/Definitions/casstudiotv.yml

@@ -1,4 +1,4 @@
----
+---
   site: casstudiotv
   name: CasStudioTV
   description: "CasStudioTV is a RUSSIAN Semi-Private Torrent Tracker for TV"

src/Jackett.Common/Definitions/ccfbits.yml

@@ -42,9 +42,33 @@
       - {id: 22, cat: Other, desc: "杂项"}
 
     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
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "DESC"
+      options:
+        "DESC": "desc"
+        "ASC": "asc"
 
   login:
     path: takelogin.php
@@ -60,13 +84,14 @@
   search:
     paths:
       - path: browse.php
-        method: get
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 active 1 incldead 2 deadonly
       incldead: 1
-      sort: added
-      d: DESC
+      fullsearch: "{{ if .Query.IMDBID }}1{{else}}{{end}}"
+      sort: "{{ .Config.sort }}"
+      d: "{{ .Config.sort }}"
 
     rows:
       selector: table[border="1"][cellpadding="5"] > tbody > tr:has(a[href^="details.php?id="])
@@ -86,7 +111,7 @@
             args: cat
       details:
         selector: a[href^="details.php?id="]
-        attribute: href    
+        attribute: href
       download:
         selector: a[href^="download.php/"]
         attribute: href
@@ -122,7 +147,10 @@
           "*": 1
       uploadvolumefactor:
         case:
+          "font:has([src=\"/pic/arrowup1.gif\"]):contains(\"1.5x\")": 1.5
+          "font:has([src=\"/pic/arrowup1.gif\"]):contains(\"2x\")": 2
           "*": 1
       description:
         selector: td:nth-child(2) > table > tbody > tr:nth-child(2)
         remove: a, img
+#  Discuz! 7.2

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/cinemageddon.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: UTF-8
   links:
+    - https://cinemageddon.net/
+  legacylinks:
     - http://cinemageddon.net/
 
   caps:
@@ -45,7 +47,7 @@
       - selector: table:contains("Login failed!")
     test:
       path: index.php
- 
+
   search:
     paths:
       - path: browse.php
@@ -94,4 +96,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett.Common/Definitions/cinematik.yml

@@ -117,4 +117,4 @@
       uploadvolumefactor:
         case:
           "img[title=\"Platinum Torrent: No Download Stats are Recorded, Upload Stats are Doubled!\"]": 2
-          "*": 1
+          "*": 1

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:
@@ -63,4 +63,4 @@
           "*": "1"
       uploadvolumefactor:
         case:
-          "*": "1"
+          "*": "1"

src/Jackett.Common/Definitions/cpabien.yml

@@ -1,4 +1,4 @@
----
+---
   site: cpasbien
   name: cpasbien
   description: "cpasbien is a FRENCH Public site for TV / MOVIES / GENERAL"
@@ -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

@@ -1,4 +1,4 @@
----
+---
   site: crazyscorner
   name: Crazy's Corner
   description: "Crazy's Corner is a Private Torrent Tracker for MUSIC"
@@ -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:
@@ -132,9 +132,6 @@
       download:
         selector: a[href*="/details.php?id="]
         attribute: href
-      magnet:
-        selector: a[href^="magnet:?xt="]
-        attribute: href
       banner:
         selector: img[src*="/torrents/images/"]
         attribute: src

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -1,4 +1,4 @@
----
+---
   site: crazyspirits
   name: CrazySpirits
   description: "Crazy Spirits is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
@@ -208,4 +208,4 @@
       uploadvolumefactor:
         case:
           "*": 1
-# TT3.0
+# TT3.0

src/Jackett.Common/Definitions/crnaberza.yml

@@ -1,4 +1,4 @@
----
+---
   site: crnaberza
   name: CrnaBerza
   description: "Crna Berza is a BALKAN Private Torrent Tracker for MOVIES / TV / GENERAL"

src/Jackett.Common/Definitions/cztorrent.yml

@@ -1,4 +1,4 @@
-  site: cztorrent
+  site: cztorrent
   name: CzTorrent
   description: "CzTorrent is a Czech Semi-Private site for TV / MOVIES / GENERAL"
   language: cs-cz
@@ -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/datascene.yml

@@ -1,4 +1,4 @@
----
+---
   site: datascene
   name: DataScene
   description: "DataScene (DS) is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"

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/divteam.yml

@@ -1,4 +1,4 @@
----
+---
   site: divteam
   name: DivTeam
   description: "DivTeam is a SPANISH Private Torrent Tracker for MOVIES / GENERAL"

src/Jackett.Common/Definitions/documentarytorrents.yml

@@ -1,4 +1,4 @@
----
+---
   site: documentarytorrents
   name: DocumentaryTorrents
   description: "Documentary Torrents (DT) is a Private Torrent Tracker for E-LEARNING MOVIES / TV"
@@ -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

@@ -1,4 +1,4 @@
----
+---
   site: downloadville
   name: Downloadville
   description: "Downloadville is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
@@ -34,6 +34,8 @@
       - {id: 40, cat: Movies, desc: "Films V.O. SD"}
       - {id: 41, cat: Movies, desc: "Films V.O. HD"}
       - {id: 42, cat: Movies, desc: "Films TV-Rip"}
+        # 4K LIGHT
+      - {id: 95, cat: Movies, desc: "4K LIGHT"}
         # Séries-Télé
       - {id: 16, cat: TV, desc: "Séries-Télé"}
       - {id: 17, cat: TV, desc: "Séries-Télé TV Pack SD"}
@@ -138,7 +140,7 @@
       default: FRENCH
       options:
         FRENCH : "FRENCH"
-        MULTI.FRENCH : "MULTI.FRENCH" 
+        MULTI.FRENCH : "MULTI.FRENCH"
         ENGLISH: "ENGLISH"
     - name: sort
       type: select
@@ -169,7 +171,7 @@
       uid: "{{ .Config.uid }}"
       pwd: "{{ .Config.pwd }}"
     error:
-      - selector: form[action="index.php?page=login&returnto=index.php"] table tr:nth-of-type(2) td 
+      - selector: form[action="index.php?page=login&returnto=index.php"] table tr:nth-of-type(2) td
         message:
           selector: form[action="index.php?page=login&returnto=index.php"] table tr:nth-of-type(2) td span
     test:
@@ -190,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 }}"
@@ -210,7 +214,7 @@
         text: "{{ .Result.title_phase1 }}"
         filters:
           - name: re_replace
-            args: ["[\\.\\s\\[\\-][Mm][Uu][Ll][Tt][Ii][\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."] 
+            args: ["[\\.\\s\\[\\-][Mm][Uu][Ll][Tt][Ii][\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
       title:
         text: "{{if .Config.multilang }}{{ .Result.title_multilang }}{{else}}{{ .Result.title_phase1 }}{{end}}"
       details:

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -1,4 +1,4 @@
----
+---
   site: dragonworldreloaded
   name: Dragonworld Reloaded
   description: "Dragonworld Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"

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/ebookparadijs.yml

@@ -1,4 +1,4 @@
----
+---
   site: ebookparadijs
   name: EbookParadijs
   description: "EbookParadijs is a DUTCH Private Tracker for EBOOKS"

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

@@ -352,4 +352,4 @@
           "*": 1
       uploadvolumefactor:
         case:
-          "*": 1
+          "*": 1

src/Jackett.Common/Definitions/efectodoppler.yml

@@ -1,4 +1,4 @@
----
+---
   site: efectodoppler
   name: Efecto Doppler
   description: "Efecto Doppler is a SPANISH Private Torrent Tracker for MUSIC"

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

@@ -6,7 +6,7 @@
   type: public
   encoding: UTF-8
   links:
-    - https://www.elitetorrent.bz/
+    - https://www.elitetorrent.nl/
   legacylinks:
     - https://www.elitetorrent.biz/
     - https://www.elitetorrent.io/
@@ -15,6 +15,7 @@
     - https://www.elitetorrent.nu/
     - https://www.elitetorrent.tv/
     - https://www.elitetorrent.li/
+    - https://www.elitetorrent.bz/
 
   caps:
     categories:
@@ -73,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/eniahd.yml

@@ -1,4 +1,4 @@
----
+---
   site: eniahd
   name: EniaHD
   description: "EniaHD is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"

src/Jackett.Common/Definitions/erzsebet.yml

@@ -1,4 +1,4 @@
----
+---
   site: erzsebet
   name: Erzsebet
   description: "Erzsebet is a RUSSIAN Semi-Private Torrent Tracker for 3X"

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

@@ -1,4 +1,4 @@
----
+---
   site: estone
   name: eStone
   description: "eStone (XiDER, BeLoad) is a HUNGARIAN Private Torrent Tracker for 0DAY / GENERAL"
@@ -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/ettv.yml

@@ -1,4 +1,4 @@
----
+---
   site: ettv
   name: ETTV
   description: "ETTV is a Public torrent site for TV / MOVIES, home of the  ETTV, ETHD and DTOne groups."

src/Jackett.Common/Definitions/exkinoray.yml

@@ -0,0 +1,186 @@
+---
+  site: exkinoray
+  name: ExKinoRay
+  description: "ExKinoRay is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - http://exkinoray.tv/ # site forces http, does not support https
+
+  caps:
+    categorymappings:
+      - {id: 92, cat: TV, desc: "Кино Сериал"}
+      - {id: 46, cat: Movies, desc: "Кино Комедия"}
+      - {id: 47, cat: Movies, desc: "Кино Боевик"}
+      - {id: 48, cat: Movies, desc: "Кино Военный"}
+      - {id: 49, cat: Movies, desc: "Кино Вестерн"}
+      - {id: 50, cat: Movies, desc: "Кино Триллер"}
+      - {id: 51, cat: Movies, desc: "Кино Детектив"}
+      - {id: 52, cat: Movies, desc: "Кино Драма"}
+      - {id: 53, cat: Movies, desc: "Кино Мелодрама"}
+      - {id: 54, cat: Movies, desc: "Кино Индийское"}
+      - {id: 55, cat: Movies, desc: "Кино Азиатское"}
+      - {id: 59, cat: Movies, desc: "Кино Фантастика"}
+      - {id: 60, cat: Movies, desc: "Кино Фэнтези"}
+      - {id: 61, cat: Movies, desc: "Кино Ужас"}
+      - {id: 62, cat: Movies, desc: "Кино Мистика"}
+      - {id: 63, cat: Movies, desc: "Кино Приключения"}
+      - {id: 64, cat: Movies, desc: "Кино Наше кино"}
+      - {id: 65, cat: Movies, desc: "Кино Исторический"}
+      - {id: 66, cat: TV/Documentary, desc: "Кино Документальный"}
+      - {id: 67, cat: TV/Sport, desc: "Кино Спорт"}
+      - {id: 68, cat: Movies, desc: "Кино Семейный"}
+      - {id: 69, cat: Movies, desc: "Кино Детский"}
+      - {id: 70, cat: Movies, desc: "Кино Классика"}
+      - {id: 71, cat: Movies, desc: "Кино Концерт"}
+      - {id: 72, cat: TV, desc: "Кино ТВ-шоу"}
+      - {id: 73, cat: Movies, desc: "Кино Театр, опера"}
+      - {id: 74, cat: Movies, desc: "Кино Мюзикл"}
+      - {id: 75, cat: Movies, desc: "Кино Эротика"}
+      - {id: 77, cat: TV, desc: "Мульт Буржуйский"}
+      - {id: 78, cat: TV, desc: "Мульт Русский"}
+      - {id: 79, cat: TV/Anime, desc: "Мульт Аниме"}
+      - {id: 80, cat: Audio, desc: "Музыка Буржуйская"}
+      - {id: 81, cat: Audio, desc: "Музыка Русская"}
+      - {id: 82, cat: Audio, desc: "Музыка Сборники"}
+      - {id: 83, cat: Audio/Audiobook, desc: "Другое Аудио книги"}
+      - {id: 84, cat: Audio/Video, desc: "Другое Видеоклипы"}
+      - {id: 85, cat: PC/Games, desc: "Другое Игры"}
+      - {id: 86, cat: PC/0day, desc: "Другое Программы"}
+      - {id: 87, cat: Console/Xbox, desc: "Другое XBox"}
+      - {id: 88, cat: Console/PSP, desc: "Другое PSP"}
+      - {id: 89, cat: Books/Magazines, desc: "Другое Журналы"}
+      - {id: 90, cat: Other, desc: "Другое Графика"}
+      - {id: 93, cat: Other, desc: "Другое Библиотека"}
+      - {id: 94, cat: Console/PS3, desc: "Другое PS3"}
+
+    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: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+    - name: info_search
+      type: info
+      label: "Searching with Season / Episode (S01E01)"
+      default: "The web site does support season/episode searching. To allow some results for Sonarr, these are stripped from the keywords."
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      autologin: 1
+      returnto: "index.php"
+    error:
+      - selector: td.embedded:contains("Ошибка входа")
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      # http://exkinoray.tv/browse.php?search=&incldead=1&cat=0
+      - path: browse.php
+    keywordsfilters:
+      # the site does not support season/episode searching in the title.
+      - name: re_replace # strip S01 
+        args: ["(?i)\\bS0*(\\d+)\\b", ""]
+      - name: re_replace # strip S01E01 
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
+      # 0 active 1 incldead 2 onlydead 4 noseeds (isn't this == onlydead?)
+      incldead: 1
+      search: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
+    rows:
+      selector: table.begins > tbody > tr:has(a[href^="details.php?id="])
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          # Женские секреты (1 сезон: 1-4 серии из 12) Жіночі секрети | 2020 | HDTVRip (720p)
+          # Мандалорец (1 сезон: 1-8 серии из 8) | The Mandalorian | 2019 | WEB-DL (720p)
+          # Война семей (1-14 серии из 20) | 2019 | WEB-DLRip (AVC) 
+          # normalize to SXXEYY format
+          - name: replace
+            args: [" | ", " "]
+          - name: re_replace
+            args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$3 - S$1E$2 - rus $5"]
+          - name: re_replace
+            args: ["\\((?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$2 - S1E$1 - rus $4"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: re_replace
+            args: ["\\((\\d+p)\\)", "$1"]
+          - name: re_replace
+            args: [" - ", " "]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(2) i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:03"
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
+# engine n/a

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -1,4 +1,4 @@
----
+---
   site: extremetorrents
   name: ExtremeTorrents
   description: "ExtremeTorrents is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -1,4 +1,4 @@
----
+---
   site: extremlymtorrents
   name: ExtremlymTorrents
   description: "ExtremlymTorrents is a Semi-Private tracker for MOVIES / TV / GENERAL"

src/Jackett.Common/Definitions/fanoin.yml

@@ -1,4 +1,4 @@
----
+---
   site: fanoin
   name: FANO.IN
   description: "Fano.in is a LATVIAN Private Torrent Tracker for 0DAY / GENERAL"

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -0,0 +1,193 @@
+---
+  site: fantasticheaven
+  name: Fantastic Heaven
+  description: "Fantastic Heaven is a German Time based tracker"
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://fantastic-heaven.eu/
+
+  caps:
+    categorymappings:
+      - {id: 54, cat: Movies/SD, desc: "kino SD x264/x265"}
+      - {id: 56, cat: Movies/HD, desc: "kino 720p"}
+      - {id: 57, cat: Movies/HD, desc: "kino 1080p"}
+      - {id: 100, cat: Movies/3D, desc: "kino 3D"}
+      - {id: 58, cat: Movies/SD, desc: "Filme SD x264/x265"}
+      - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
+      - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
+      - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
+      - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
+      - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
+      - {id: 63, cat: Movies/HD, desc: "Filme Remux"}
+      - {id: 129, cat: Movies/SD, desc: "Filme Packs SD x264/265"}
+      - {id: 130, cat: Movies/HD, desc: "Filme Packs 720p"}
+      - {id: 131, cat: Movies/HD, desc: "Filme Packs 1080p"}
+      - {id: 64, cat: TV/SD, desc: "Serien SD x264/x265"} 
+      - {id: 65, cat: TV/HD, desc: "Serien 720p"}
+      - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
+      - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
+      - {id: 69, cat: TV/FOREIGN, desc: "Serien Ger-Subbed"}
+      - {id: 70, cat: TV/FOREIGN, desc: "Serien International"}
+      - {id: 76, cat: TV/SD, desc: "Serienpacks SD x264/x265"}
+      - {id: 77, cat: TV/HD, desc: "Serienpacks 720p"}
+      - {id: 78, cat: TV/HD, desc: "Serienpacks 1080p"}
+      - {id: 81, cat: TV/UHD, desc: "Serienpacks 2160p"}
+      - {id: 79, cat: TV/FOREIGN, desc: "Serienpacks Ger-Subbed"}
+      - {id: 80, cat: TV/FOREIGN, desc: "Serienpacks International"}
+      - {id: 115, cat: Movies/SD, desc: "Kids-Filme SD x264/x265"}
+      - {id: 116, cat: Movies/HD, desc: "Kids-Filme 720p"}
+      - {id: 117, cat: Movies/HD, desc: "Kids-Filme 1080p"}
+      - {id: 109, cat: TV/SD, desc: "Kids-Serien SD x264/x265"}
+      - {id: 110, cat: TV/HD, desc: "Kids-Serien 720p"}
+      - {id: 111, cat: TV/HD, desc: "Kids-Serien 1080p"}
+      - {id: 112, cat: TV/SD, desc: "Kids-Serien Packs SD"}
+      - {id: 113, cat: TV/HD, desc: "Kids-Serien Packs 720p"}
+      - {id: 114, cat: TV/HD, desc: "Kids-Serien Packs 1080p"}
+      - {id: 127, cat: TV/FOREIGN, desc: "Kids-Serien International"}
+      - {id: 98, cat: TV/SD, desc: "Tatort SD x264/x265"}
+      - {id: 99, cat: TV/HD, desc: "Tatort 720p"}
+      - {id: 105, cat: TV/SD, desc: "Daily Soaps SD x264/x265"} 
+      - {id: 103, cat: TV/HD, desc: "Daily Soaps 720p"}
+      - {id: 104, cat: TV/HD, desc: "Daily Soaps 1080p"}
+      - {id: 106, cat: TV/Documentary, desc: "Dokus SD x264/x265"} 
+      - {id: 107, cat: TV/Documentary, desc: "Dokus 720p"}
+      - {id: 108, cat: TV/Documentary, desc: "Dokus 1080p"}
+      - {id: 83, cat: Movies/SD, desc: "TV-Filme SD x264/x265"} 
+      - {id: 84, cat: Movies/HD, desc: "TV-Filme 720p"}
+      - {id: 85, cat: Movies/HD, desc: "TV-Filme 1080p"}
+      - {id: 86, cat: TV/SD, desc: "TV-Shows SD x264/x265"} 
+      - {id: 87, cat: TV/HD, desc: "TV-Shows 720p"}
+      - {id: 88, cat: TV/HD, desc: "TV-Shows 1080p"}
+      - {id: 118, cat: TV/Sport, desc: "SportSD x264/x265"}
+      - {id: 119, cat: TV/Sport, desc: "Sport720p"} 
+      - {id: 120, cat: TV/Sport, desc: "Sport1080p"}
+      - {id: 122, cat: TV/Sport, desc: "Sport2160p"}
+      - {id: 121, cat: TV/Sport, desc: "SportInternational"}
+      - {id: 82, cat: Audio/Audiobook, desc: "Audio Audiobooks"}
+      - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
+      - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
+      - {id: 135, cat: Audio/Lossless, desc: "Audio WAV"}
+      - {id: 73, cat: Audio/MP3, desc: "Audio MP3 Packs"}
+      - {id: 74, cat: Audio/Lossless, desc: "Audio Flac Packs"}
+      - {id: 128, cat: Audio, desc: "Audio Kids"}
+      - {id: 75, cat: Audio/Video, desc: "Audio Musikvideo"}
+      - {id: 123, cat: PC, desc: "Software Windows"} 
+      - {id: 124, cat: PC, desc: "Software Linux"}
+      - {id: 125, cat: PC/Phone-Android, desc: "Software Android"}
+      - {id: 126, cat: PC/Mac, desc: "Software MacOS"}
+      - {id: 132, cat: PC/Games, desc: "Spiele Windows"} 
+      - {id: 133, cat: PC/Mac, desc: "Spiele MacOS"}
+      - {id: 134, cat: Console, desc: "Spiele Nintendo"}
+      - {id: 90, cat: Books/Magazines, desc: "Diverses Zeitschriften"} 
+      - {id: 89, cat: Books/Ebook, desc: "Diverses E-Books"}
+      - {id: 91, cat: XXX/x264, desc: "XXX SD x264/x265"} 
+      - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
+      - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
+      - {id: 95, cat: XXX/Packs, desc: "XXX Packs SD"}
+      - {id: 96, cat: XXX/Packs, desc: "XXX Packs HD"}
+      - {id: 94, cat: XXX/Imageset, desc: "XXX Magazine"}
+      - {id: 97, cat: XXX/Imageset, desc: "XXX Pics"}
+
+    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: "added"
+      options:
+        "added": "created"
+        "seeds": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="/login.php"]
+    cookies: ["JAVA=OK"] # avoid jscheck redirect
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      loggiin: "einloggen"
+      
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: selection.php
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{else}}{{end}}"
+      search: "{{ .Keywords }}"
+      blah: 0
+      orderby: "{{ .Config.sort }}"
+      sort: "{{ .Config.type }}"
+
+    rows:
+      selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
+
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      category:
+        selector: a[href^="selection.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+          - name: replace
+            args: ["#2", ""]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      grabs:
+        selector: div.selection_unter_ae
+        filters:
+          - name: replace
+            args: [" x", ""]
+      size:
+        selector: div.selection_unter_ad
+        filters:
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: div.selection_unter_aa > b
+      leechers:
+        selector: div.selection_unter_aaa > b
+      date:
+        selector: div.selection_unter_ab
+        filters:
+          - name: append
+            args: " +01:00"
+          - name: replace
+            args: ["um ", ""]
+          - name: dateparse
+            args: "02.01.2006 15:04:05 -07:00"
+      downloadvolumefactor:
+        text: 1
+      uploadvolumefactor:
+        text: 1
+# engine n/a