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,9 +37,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * BigFANGroup
  * BitRu
  * BitTorrent.AM
+ * BT.etree
  * BTDB
  * BTDIGG
- * BT.etree
+ * BTeye
  * BTSOW
  * Cili180
  * ConCen
@@ -48,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
@@ -64,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
@@ -81,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
@@ -110,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
@@ -119,50 +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
- * Film-Paleis
+ * 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
@@ -171,7 +192,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Torrents-Local
  * TribalMixes
  * Union Fansub
- * Vanila
  * YggTorrent (YGG)
  * Ztracker
 </details>
@@ -185,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
@@ -196,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)
@@ -257,21 +280,20 @@ 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)
+ * Film-Paleis
  * FinVip
  * FocusX
  * FreeTorrent
@@ -279,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
@@ -313,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
@@ -337,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
@@ -351,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
@@ -409,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
@@ -471,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

appveyor.yml

@@ -1,47 +0,0 @@
-version: 0.12.{build}
-skip_tags: true
-image:
-  - Ubuntu
-  - Visual Studio 2019
-environment:
-  APPVEYOR_YML_DISABLE_PS_LINUX: true
-  CAKE_SETTINGS_SKIPPACKAGEVERSIONCHECK: true
-configuration: Release
-assembly_info:
-  patch: true
-  file: '**\AssemblyInfo.*'
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: '{version}'
-dotnet_csproj:
-  patch: true
-  file: '**\*.csproj'
-  version: '{version}'
-  package_version: '{version}'
-  assembly_version: '{version}'
-  file_version: '{version}'
-  informational_version: '{version}'
-build_script:
-- ps: .\build.ps1 --target=Windows-Appveyor 
-- sh: ./build.sh --target=Linux
-test: off
-before_deploy:
-- ps: ${env:release_description} = ( Get-Content -LiteralPath BuildOutput/ReleaseNotes.txt -Encoding UTF8 ) -join "`n";
-deploy:
-- provider: GitHub
-  tag: v$(APPVEYOR_BUILD_VERSION)
-  description: $(release_description)
-  auth_token:
-    secure: hOg+16YTIbq4kO9u4D1YVOTbWDqgCX6mAQYMbnmBBSw2CiUsZh7OKbupoUb3FtWa
-  artifact: /^(?:(?![Ee]xperimental).)*$/
-  draft: true
-  force_update: true
-  on:
-    branch: master
-notifications:
-- provider: Webhook
-  url: https://skyhook.glitch.me/api/webhooks/346588605843767297/_VWi5abKliaWsBmQO7AX69tD28FhqSLjKyLBwkSwwT13uyWJQHx5TSWK_iAs-0RzmyvZ/appveyor
-  method: POST
-  on_build_success: true
-  on_build_failure: true
-  on_build_status_changed: true

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
@@ -321,24 +328,6 @@ stages:
             if [[ "$(artifactName)" == *"macOS"* ]]; then sudo ./install_service_macos; fi
             if [[ "$(artifactName)" == *"LinuxAMDx64"* ]]; then sudo ./install_service_systemd.sh; fi
 
-      #Remove this task once ChromeDriver is deployed to Ubuntu image https://github.com/actions/virtual-environments/issues/9
-      - task: Bash@3
-        displayName: Install ChromeDriver (Linux and Mono)
-        condition: and(succeeded(), eq(variables['imageName'], 'ubuntu-latest'))
-        inputs:
-          targetType: inline
-          script: |
-            CHROME_VERSION=$(google-chrome --version | cut -f 3 -d ' ' | cut -d '.' -f 1) \
-              && CHROMEDRIVER_RELEASE=$(curl --location --fail --retry 3 http://chromedriver.storage.googleapis.com/LATEST_RELEASE_${CHROME_VERSION}) \
-              && curl --silent --show-error --location --fail --retry 3 --output /tmp/chromedriver_linux64.zip "http://chromedriver.storage.googleapis.com/$CHROMEDRIVER_RELEASE/chromedriver_linux64.zip" \
-              && cd /tmp \
-              && unzip chromedriver_linux64.zip \
-              && rm -rf chromedriver_linux64.zip \
-              && sudo mv chromedriver /usr/local/bin/chromedriver \
-              && sudo chmod +x /usr/local/bin/chromedriver \
-              && chromedriver --version
-            echo "##vso[task.setvariable variable=CHROMEWEBDRIVER]/usr/local/bin"
-
       - task: UseDotNet@2
         displayName: Install .NET Core SDK
         inputs:
@@ -370,17 +359,40 @@ stages:
           patterns: '**/Jackett*'
           path: $(Build.ArtifactStagingDirectory)
 
-      - task: GitHubRelease@0
+      - task: GitHubRelease@1
         displayName: Create Github release
         inputs:
           gitHubConnection: github.com_jackett
           repositoryName: '$(Build.Repository.Name)' 
           action: create
           target: $(Build.SourceVersion)
-          tagSource: manual
+          tagSource: userSpecifiedTag
           tag: v$(Build.BuildNumber)
           title: v$(Build.BuildNumber)
           assets: $(Build.ArtifactStagingDirectory)/drop/*
+          assetUploadMode: replace
           isDraft: true
           addChangeLog: true
           compareWith: lastNonDraftRelease
+
+      - 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" } 
+              }
+            }
+

build.cake

@@ -1,510 +0,0 @@
-#tool nuget:?package=NUnit.ConsoleRunner
-#addin nuget:?package=Cake.Git
-
-//////////////////////////////////////////////////////////////////////
-// ARGUMENTS
-//////////////////////////////////////////////////////////////////////
-
-var target = Argument("target", "Default");
-var configuration = Argument("configuration", "Debug");
-
-//////////////////////////////////////////////////////////////////////
-// PREPARATION
-//////////////////////////////////////////////////////////////////////
-
-// Define directories.
-var workingDir = MakeAbsolute(Directory("./"));
-string artifactsDirName = "Artifacts";
-string testResultsDirName = "TestResults";
-string netCoreFramework = "netcoreapp3.1";
-string serverProjectPath = "./src/Jackett.Server/Jackett.Server.csproj";
-string updaterProjectPath = "./src/Jackett.Updater/Jackett.Updater.csproj";
-
-//////////////////////////////////////////////////////////////////////
-// TASKS
-//////////////////////////////////////////////////////////////////////
-
-Task("Info")
-	.Does(() =>
-	{
-		Information(@"Jackett Cake build script starting...");
-		Information(@"Requires InnoSetup and C:\msys64 to be present for packaging (Pre-installed on AppVeyor) on Windows");
-		Information(@"Working directory is: " + workingDir);
-
-		if (IsRunningOnWindows())
-		{
-			Information("Platform is Windows");
-		}
-		else
-		{
-			Information("Platform is Linux, Windows builds will be skipped");
-		}
-	});
-
-Task("Clean")
-	.IsDependentOn("Info")
-	.Does(() =>
-	{
-		CleanDirectories("./src/**/obj");
-		CleanDirectories("./src/**/bin");
-		CleanDirectories("./BuildOutput");
-		CleanDirectories("./" + artifactsDirName);
-		CleanDirectories("./" + testResultsDirName);
-
-		CreateDirectory("./" + artifactsDirName);
-
-		Information("Clean completed");
-	});
-
-Task("Build-Full-Framework")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		NuGetRestore("./src/Jackett.sln");
-
-		var buildSettings = new MSBuildSettings()
-                .SetConfiguration(configuration)
-                .UseToolVersion(MSBuildToolVersion.VS2019);
-		
-		MSBuild("./src/Jackett.sln", buildSettings);
-	});
-
-Task("Run-Unit-Tests")
-	.IsDependentOn("Build-Full-Framework")
-	.Does(() =>
-	{
-		CreateDirectory("./" + testResultsDirName);
-		var resultsFile = $"./{testResultsDirName}/JackettTestResult.xml";
-
-		NUnit3("./src/**/bin/" + configuration + "/net461/*.Test.dll", new NUnit3Settings
-		{
-			Results = new[] { new NUnit3Result { FileName = resultsFile } }
-		});
-
-		if (AppVeyor.IsRunningOnAppVeyor && IsRunningOnWindows())
-		{
-			AppVeyor.UploadTestResults(resultsFile, AppVeyorTestResultsType.NUnit3);
-		}
-	});
-
-Task("Package-Windows-Full-Framework")
-	.IsDependentOn("Run-Unit-Tests")
-	.Does(() =>
-	{
-		string buildOutputPath = "./BuildOutput/net461/win7-x86/Jackett";
-		
-		DotNetCorePublish(serverProjectPath, "net461", "win7-x86", buildOutputPath);
-
-		CopyFiles("./src/Jackett.Service/bin/" + configuration + "/net461" + "/JackettService.*", buildOutputPath);
-		CopyFiles("./src/Jackett.Tray/bin/" + configuration + "/net461" + "/JackettTray.*", buildOutputPath);
-		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);
-
-		Zip("./BuildOutput/net461/win7-x86", $"./{artifactsDirName}/Jackett.Binaries.Windows.zip");
-
-		//InnoSetup
-		string sourceFolder = MakeAbsolute(Directory(buildOutputPath)).ToString();
-
-		InnoSetupSettings settings = new InnoSetupSettings();
-		settings.OutputDirectory = workingDir + "/" + artifactsDirName;
-		//Can remove below line once Cake is updated for InnoSetup 6 - https://github.com/cake-build/cake/pull/2565
-		settings.ToolPath = @"C:\Program Files (x86)\Inno Setup 6\ISCC.exe";
- 		settings.Defines = new Dictionary<string, string>
-			{
-				{ "MyFileForVersion", sourceFolder + "/Jackett.Common.dll" },
-				{ "MySourceFolder",  sourceFolder },
-				{ "MyOutputFilename",  "Jackett.Installer.Windows" },
-			};
-
-		InnoSetup("./Installer.iss", settings);
-	});
-
-Task("Package-Mono-Full-Framework")
-	.IsDependentOn("Run-Unit-Tests")
-	.Does(() =>
-	{
-		string buildOutputPath = "./BuildOutput/net461/linux-x64/Jackett";
-
-		DotNetCorePublish(serverProjectPath, "net461", "linux-x64", buildOutputPath);
-
-		CopyFiles("./src/Jackett.Updater/bin/" + configuration + "/net461" + "/JackettUpdater.*", buildOutputPath);  //builds against multiple frameworks
-
-		CopyFileToDirectory("./install_service_systemd_mono.sh", buildOutputPath);
-		CopyFileToDirectory("./Upstart.config", buildOutputPath);
-
-		//There is an issue with Mono 5.8 (fixed in Mono 5.12) where its expecting to use its own patched version of System.Net.Http.dll, instead of the version supplied in folder
-		//https://github.com/dotnet/corefx/issues/19914
-		//https://bugzilla.xamarin.com/show_bug.cgi?id=60315
-		//The workaround is to delete System.Net.Http.dll and patch the .exe.config file
-
-		DeleteFile(buildOutputPath + "/System.Net.Http.dll");
-
-		var configFile = File(buildOutputPath + "/JackettConsole.exe.config");
-		XmlPoke(configFile, "configuration/runtime/*[name()='assemblyBinding']/*[name()='dependentAssembly']/*[name()='assemblyIdentity'][@name='System.Net.Http']/../*[name()='bindingRedirect']/@newVersion", "4.0.0.0");
-
-		//Mono on FreeBSD doesn't like the bundled System.Runtime.InteropServices.RuntimeInformation
-		//https://github.com/dotnet/corefx/issues/23989
-		//https://github.com/Jackett/Jackett/issues/3547
-
-		DeleteFile(buildOutputPath + "/System.Runtime.InteropServices.RuntimeInformation.dll");
-
-		CheckForGzipAndTar();
-		Gzip("./BuildOutput/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz");
-	});
-
-Task("Package-DotNetCore-macOS")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		string runtimeId = "osx-x64";
-		string buildOutputPath = $"./BuildOutput/{netCoreFramework}/{runtimeId}/Jackett";
-		string updaterOutputPath = buildOutputPath + "/Updater";
-
-		DotNetCorePublish(serverProjectPath, netCoreFramework, runtimeId, buildOutputPath);
-
-		DotNetCorePublish(updaterProjectPath, netCoreFramework, runtimeId, updaterOutputPath);
-		CopyFiles(updaterOutputPath + "/JackettUpdater*", buildOutputPath);
-		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
-
-		CopyFileToDirectory("./install_service_macos", buildOutputPath);
-
-		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.macOS.tar.gz");
-	});
-
-Task("Package-DotNetCore-LinuxAMDx64")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		string runtimeId = "linux-x64";
-		string buildOutputPath = $"./BuildOutput/{netCoreFramework}/{runtimeId}/Jackett";
-		string updaterOutputPath = buildOutputPath + "/Updater";
-
-		DotNetCorePublish(serverProjectPath, netCoreFramework, runtimeId, buildOutputPath);
-
-		DotNetCorePublish(updaterProjectPath, netCoreFramework, runtimeId, updaterOutputPath);
-		CopyFiles(updaterOutputPath + "/JackettUpdater*", buildOutputPath);
-		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
-
-		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
-		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);
-
-		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxAMDx64.tar.gz");
-	});
-
-Task("Package-DotNetCore-LinuxARM32")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		string runtimeId = "linux-arm";
-		string buildOutputPath = $"./BuildOutput/{netCoreFramework}/{runtimeId}/Jackett";
-		string updaterOutputPath = buildOutputPath + "/Updater";
-
-		DotNetCorePublish(serverProjectPath, netCoreFramework, runtimeId, buildOutputPath);
-
-		DotNetCorePublish(updaterProjectPath, netCoreFramework, runtimeId, updaterOutputPath);
-		CopyFiles(updaterOutputPath + "/JackettUpdater*", buildOutputPath);
-		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
-
-		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
-		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);
-
-		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxARM32.tar.gz");
-	});
-
-Task("Package-DotNetCore-LinuxARM64")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		string runtimeId = "linux-arm64";
-		string buildOutputPath = $"./BuildOutput/{netCoreFramework}/{runtimeId}/Jackett";
-		string updaterOutputPath = buildOutputPath + "/Updater";
-
-		DotNetCorePublish(serverProjectPath, netCoreFramework, runtimeId, buildOutputPath);
-
-		DotNetCorePublish(updaterProjectPath, netCoreFramework, runtimeId, updaterOutputPath);
-		CopyFiles(updaterOutputPath + "/JackettUpdater*", buildOutputPath);
-		DeleteDirectory(updaterOutputPath, new DeleteDirectorySettings {Recursive = true, Force = true});
-
-		CopyFileToDirectory("./install_service_systemd.sh", buildOutputPath);
-		CopyFileToDirectory("./jackett_launcher.sh", buildOutputPath);
-
-		Gzip($"./BuildOutput/{netCoreFramework}/{runtimeId}", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.LinuxARM64.tar.gz");
-	});
-
-Task("Appveyor-Push-Artifacts")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		if (AppVeyor.IsRunningOnAppVeyor)
-		{
-			foreach (var file in GetFiles(workingDir + $"/{artifactsDirName}/*"))
-			{
-				AppVeyor.UploadArtifact(file.FullPath);
-			}
-		}
-		else
-		{
-			Information(@"Skipping artifact push as not running in AppVeyor Windows Environment");
-		}
-	});
-
-Task("Release-Notes")
-	.IsDependentOn("Clean")
-	.Does(() =>
-	{
-		string latestTag = GitDescribe(".", false, GitDescribeStrategy.Tags, 0);
-		Information($"Latest tag is: {latestTag}" + Environment.NewLine);
-
-		List<GitCommit> relevantCommits = new List<GitCommit>();
-
-		var commitCollection = GitLog("./", 50);
-
-		foreach(GitCommit commit in commitCollection)
-		{
-			var commitTag = GitDescribe(".", commit.Sha, false, GitDescribeStrategy.Tags, 0);
-
-			if (commitTag == latestTag)
-			{
-				relevantCommits.Add(commit);
-			}
-			else
-			{
-				break;
-			}
-		}
-
-		relevantCommits = relevantCommits.AsEnumerable().Reverse().Skip(1).ToList();
-
-		if (relevantCommits.Count() > 0)
-		{
-			List<string> notesList = new List<string>();
-				
-			foreach(GitCommit commit in relevantCommits)
-			{
-				notesList.Add($"{commit.MessageShort} (Thank you @{commit.Author.Name})");
-			}
-
-			string buildNote = String.Join(Environment.NewLine, notesList);
-			Information(buildNote);
-
-			System.IO.File.WriteAllLines(workingDir + "/BuildOutput/ReleaseNotes.txt", notesList.ToArray());
-		}
-		else
-		{
-			Information($"No commit messages found to create release notes");
-		}
-
-	});
-
-Task("Windows-Environment-Dev")
-	.IsDependentOn("Package-Windows-Full-Framework")
-	.IsDependentOn("Package-Mono-Full-Framework")
-	.IsDependentOn("Package-DotNetCore-macOS")
-	.IsDependentOn("Package-DotNetCore-LinuxAMDx64")
-	.IsDependentOn("Package-DotNetCore-LinuxARM32")
-	.IsDependentOn("Package-DotNetCore-LinuxARM64")
-	.IsDependentOn("Appveyor-Push-Artifacts")
-	.IsDependentOn("Release-Notes")
-	.Does(() =>
-	{
-		Information("Windows-Environment Task Completed");
-	});
-
-Task("Windows-Environment-Appveyor")
-	.IsDependentOn("Package-Windows-Full-Framework")
-	.IsDependentOn("Package-Mono-Full-Framework")
-	.IsDependentOn("Appveyor-Push-Artifacts")
-	.IsDependentOn("Release-Notes")
-	.Does(() =>
-	{
-		Information("Windows-Environment Task Completed");
-	});
-
-Task("Linux-Environment")
-	.IsDependentOn("Package-DotNetCore-macOS")
-	.IsDependentOn("Package-DotNetCore-LinuxAMDx64")
-	.IsDependentOn("Package-DotNetCore-LinuxARM32")
-	.IsDependentOn("Package-DotNetCore-LinuxARM64")
-	.IsDependentOn("Appveyor-Push-Artifacts")
-	.IsDependentOn("Release-Notes")
-	.Does(() =>
-	{
-		Information("Linux-Environment Task Completed");
-	});
-
-
-private void RunMsysCommand(string utility, string utilityArguments)
-{
-	var msysDir = @"C:\msys64\usr\bin\";
-	var utilityProcess = msysDir + utility + ".exe";
-
-	Information("MSYS2 Utility: " + utility);
-	Information("MSYS2 Directory: " + msysDir);
-	Information("Utility Location: " + utilityProcess);
-	Information("Utility Arguments: " + utilityArguments);
-
-	IEnumerable<string> redirectedStandardOutput;
-	IEnumerable<string> redirectedErrorOutput;
-	var exitCodeWithArgument =
-		StartProcess(
-			utilityProcess,
-			new ProcessSettings {
-				Arguments = utilityArguments,
-				WorkingDirectory = msysDir,
-				RedirectStandardOutput = true
-			},
-			out redirectedStandardOutput,
-			out redirectedErrorOutput
-		);
-
-	Information(utility + " output:" + Environment.NewLine + string.Join(Environment.NewLine, redirectedStandardOutput.ToArray()));
-
-	// Throw exception if anything was written to the standard error.
-	if (redirectedErrorOutput != null && redirectedErrorOutput.Any())
-	{
-		throw new Exception(
-			string.Format(
-				utility + " Errors ocurred: {0}",
-				string.Join(", ", redirectedErrorOutput)));
-	}
-
-	Information(utility + " Exit code: {0}", exitCodeWithArgument);
-}
-
-private string RelativeWinPathToFullPath(string relativePath)
-{
-	return (workingDir + relativePath.TrimStart('.'));
-}
-
-private void RunLinuxCommand(string file, string arg)
-{
-	var startInfo = new System.Diagnostics.ProcessStartInfo()
-	{
-		Arguments = arg,
-		FileName = file,
-		UseShellExecute = true
-	};
-
-	var process = System.Diagnostics.Process.Start(startInfo);
-	process.WaitForExit();
-}
-
-private void Gzip(string sourceFolder, string outputDirectory, string tarCdirectoryOption, string outputFileName)
-{
-	var tarFileName = outputFileName.Remove(outputFileName.Length - 3, 3);
-	
-	if (IsRunningOnWindows())
-	{
-		var fullSourcePath = RelativeWinPathToFullPath(sourceFolder);
-		var tarArguments = @"--force-local -cvf " + fullSourcePath + "/" + tarFileName + " -C " + fullSourcePath + $" {tarCdirectoryOption} --mode ='755'";
-		var gzipArguments = @"-k " + fullSourcePath + "/" + tarFileName;
-
-		RunMsysCommand("tar", tarArguments);
-		RunMsysCommand("gzip", gzipArguments);
-		MoveFile($"{sourceFolder}/{tarFileName}.gz", $"{outputDirectory}/{tarFileName}.gz");
-	}
-	else
-	{
-		RunLinuxCommand("find",  MakeAbsolute(Directory(sourceFolder)) + @" -type d -exec chmod 755 {} \;");
-		RunLinuxCommand("find",  MakeAbsolute(Directory(sourceFolder)) + @" -type f -exec chmod 644 {} \;");
-		RunLinuxCommand("chmod", $"755 {MakeAbsolute(Directory(sourceFolder))}/Jackett/jackett");
-		RunLinuxCommand("chmod", $"755 {MakeAbsolute(Directory(sourceFolder))}/Jackett/JackettUpdater");
-
-		string macOsServiceScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_macos";
-		if (FileExists(macOsServiceScript))
-		{
-			RunLinuxCommand("chmod", $"755 {macOsServiceScript}");
-		}
-
-		string systemdMonoScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd_mono.sh";
-		if (FileExists(systemdMonoScript))
-		{
-			RunLinuxCommand("chmod", $"755 {systemdMonoScript}");
-		}
-
-		string systemdScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/install_service_systemd.sh";
-		if (FileExists(systemdScript))
-		{
-			RunLinuxCommand("chmod", $"755 {systemdScript}");
-		}
-
-		string launcherScript = MakeAbsolute(Directory(sourceFolder)) + "/Jackett/jackett_launcher.sh";
-		if (FileExists(launcherScript))
-		{
-			RunLinuxCommand("chmod", $"755 {launcherScript}");
-		}
-
-		RunLinuxCommand("tar",  $"-C {sourceFolder} -zcvf {outputDirectory}/{tarFileName}.gz {tarCdirectoryOption}");
-	}	
-}
-
-private void CheckForGzipAndTar()
-{
-	if (FileExists(@"C:\msys64\usr\bin\tar.exe") && FileExists(@"C:\msys64\usr\bin\gzip.exe"))
-	{
-		Information("tar.exe and gzip.exe were found");
-	}
-	else
-    {
-        throw new Exception("tar.exe and gzip.exe were NOT found");   
-    }
-}
-
-private void DotNetCorePublish(string projectPath, string framework, string runtime, string outputPath)
-{
-	bool publishSingleFile = false;
-
-	if (publishSingleFile && framework != "net461")
-	{
-		var settings = new DotNetCorePublishSettings
-		{
-			Framework = framework,
-			Runtime = runtime,
-			OutputDirectory = outputPath,
-			ArgumentCustomization = args=>args.Append("/p:PublishSingleFile=true")
-		};
-
-		DotNetCorePublish(projectPath, settings);
-	}
-	else
-	{
-		var settings = new DotNetCorePublishSettings
-		{
-			Framework = framework,
-			Runtime = runtime,
-			OutputDirectory = outputPath
-		};
-
-		DotNetCorePublish(projectPath, settings);
-	}
-}
-
-//////////////////////////////////////////////////////////////////////
-// TASK TARGETS
-//////////////////////////////////////////////////////////////////////
-
-Task("Default")
-	.IsDependentOn("Windows-Environment-Dev")
-	.Does(() =>
-	{
-		Information("Default Task Completed");
-	});
-
-Task("Windows-Appveyor")
-	.IsDependentOn("Windows-Environment-Appveyor")
-	.Does(() =>
-	{
-		Information("Windows Appveyor Task Completed");
-	});
-
-Task("Linux")
-	.IsDependentOn("Linux-Environment")
-	.Does(() =>
-	{
-		Information("Linux Task Completed");
-	});
-
-//////////////////////////////////////////////////////////////////////
-// EXECUTION
-//////////////////////////////////////////////////////////////////////
-
-RunTarget(target);

build.ps1

@@ -1,242 +0,0 @@
-##########################################################################
-# This is the Cake bootstrapper script for PowerShell.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
-
-<#
-
-.SYNOPSIS
-This is a Powershell script to bootstrap a Cake build.
-
-.DESCRIPTION
-This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
-and execute your Cake build script with the parameters you provide.
-
-.PARAMETER Script
-The build script to execute.
-.PARAMETER Target
-The build script target to run.
-.PARAMETER Configuration
-The build configuration to use.
-.PARAMETER Verbosity
-Specifies the amount of information to be displayed.
-.PARAMETER ShowDescription
-Shows description about tasks.
-.PARAMETER DryRun
-Performs a dry run.
-.PARAMETER SkipToolPackageRestore
-Skips restoring of packages.
-.PARAMETER ScriptArgs
-Remaining arguments are added here.
-
-.LINK
-https://cakebuild.net
-
-#>
-
-[CmdletBinding()]
-Param(
-    [string]$Script = "build.cake",
-    [string]$Target,
-    [string]$Configuration,
-    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
-    [string]$Verbosity,
-    [switch]$ShowDescription,
-    [Alias("WhatIf", "Noop")]
-    [switch]$DryRun,
-    [switch]$SkipToolPackageRestore,
-    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
-    [string[]]$ScriptArgs
-)
-
-# Attempt to set highest encryption available for SecurityProtocol.
-# PowerShell will not set this by default (until maybe .NET 4.6.x). This
-# will typically produce a message for PowerShell v2 (just an info
-# message though)
-try {
-    # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48)
-    # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't
-    # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is
-    # installed (.NET 4.5 is an in-place upgrade).
-    [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48
-  } catch {
-    Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3'
-  }
-
-[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null
-function MD5HashFile([string] $filePath)
-{
-    if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf))
-    {
-        return $null
-    }
-
-    [System.IO.Stream] $file = $null;
-    [System.Security.Cryptography.MD5] $md5 = $null;
-    try
-    {
-        $md5 = [System.Security.Cryptography.MD5]::Create()
-        $file = [System.IO.File]::OpenRead($filePath)
-        return [System.BitConverter]::ToString($md5.ComputeHash($file))
-    }
-    finally
-    {
-        if ($file -ne $null)
-        {
-            $file.Dispose()
-        }
-    }
-}
-
-function GetProxyEnabledWebClient
-{
-    $wc = New-Object System.Net.WebClient
-    $proxy = [System.Net.WebRequest]::GetSystemWebProxy()
-    $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials
-    $wc.Proxy = $proxy
-    return $wc
-}
-
-Write-Host "Preparing to run build script..."
-
-if(!$PSScriptRoot){
-    $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
-}
-
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
-$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins"
-$MODULES_DIR = Join-Path $TOOLS_DIR "Modules"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
-$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
-$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
-$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
-$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum"
-$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config"
-$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config"
-
-# Make sure tools folder exists
-if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
-    Write-Verbose -Message "Creating tools directory..."
-    New-Item -Path $TOOLS_DIR -Type directory | out-null
-}
-
-# Make sure that packages.config exist.
-if (!(Test-Path $PACKAGES_CONFIG)) {
-    Write-Verbose -Message "Downloading packages.config..."
-    try {
-        $wc = GetProxyEnabledWebClient
-        $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG)
-    } catch {
-        Throw "Could not download packages.config."
-    }
-}
-
-# Try find NuGet.exe in path if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
-    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) }
-    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
-    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
-        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
-        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
-    }
-}
-
-# Try download NuGet.exe if not exists
-if (!(Test-Path $NUGET_EXE)) {
-    Write-Verbose -Message "Downloading NuGet.exe..."
-    try {
-        $wc = GetProxyEnabledWebClient
-        $wc.DownloadFile($NUGET_URL, $NUGET_EXE)
-    } catch {
-        Throw "Could not download NuGet.exe."
-    }
-}
-
-# Save nuget.exe path to environment to be available to child processed
-$ENV:NUGET_EXE = $NUGET_EXE
-
-# Restore tools from NuGet?
-if(-Not $SkipToolPackageRestore.IsPresent) {
-    Push-Location
-    Set-Location $TOOLS_DIR
-
-    # Check for changes in packages.config and remove installed tools if true.
-    [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG)
-    if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
-      ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
-        Write-Verbose -Message "Missing or changed package.config hash..."
-        Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery |
-        Remove-Item -Recurse
-    }
-
-    Write-Verbose -Message "Restoring tools from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occurred while restoring NuGet tools."
-    }
-    else
-    {
-        $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
-    }
-    Write-Verbose -Message ($NuGetOutput | out-string)
-
-    Pop-Location
-}
-
-# Restore addins from NuGet
-if (Test-Path $ADDINS_PACKAGES_CONFIG) {
-    Push-Location
-    Set-Location $ADDINS_DIR
-
-    Write-Verbose -Message "Restoring addins from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occurred while restoring NuGet addins."
-    }
-
-    Write-Verbose -Message ($NuGetOutput | out-string)
-
-    Pop-Location
-}
-
-# Restore modules from NuGet
-if (Test-Path $MODULES_PACKAGES_CONFIG) {
-    Push-Location
-    Set-Location $MODULES_DIR
-
-    Write-Verbose -Message "Restoring modules from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`""
-
-    if ($LASTEXITCODE -ne 0) {
-        Throw "An error occurred while restoring NuGet modules."
-    }
-
-    Write-Verbose -Message ($NuGetOutput | out-string)
-
-    Pop-Location
-}
-
-# Make sure that Cake has been installed.
-if (!(Test-Path $CAKE_EXE)) {
-    Throw "Could not find Cake.exe at $CAKE_EXE"
-}
-
-
-
-# Build Cake arguments
-$cakeArguments = @("$Script");
-if ($Target) { $cakeArguments += "-target=$Target" }
-if ($Configuration) { $cakeArguments += "-configuration=$Configuration" }
-if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" }
-if ($ShowDescription) { $cakeArguments += "-showdescription" }
-if ($DryRun) { $cakeArguments += "-dryrun" }
-$cakeArguments += $ScriptArgs
-
-# Start Cake
-Write-Host "Running build script..."
-&$CAKE_EXE $cakeArguments
-exit $LASTEXITCODE

build.sh

@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-
-##########################################################################
-# This is the Cake bootstrapper script for Linux and OS X.
-# This file was downloaded from https://github.com/cake-build/resources
-# Feel free to change this file to fit your needs.
-##########################################################################
-
-# Define directories.
-SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-TOOLS_DIR=$SCRIPT_DIR/tools
-ADDINS_DIR=$TOOLS_DIR/Addins
-MODULES_DIR=$TOOLS_DIR/Modules
-NUGET_EXE=$TOOLS_DIR/nuget.exe
-CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
-PACKAGES_CONFIG=$TOOLS_DIR/packages.config
-PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum
-ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config
-MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config
-
-# Define md5sum or md5 depending on Linux/OSX
-MD5_EXE=
-if [[ "$(uname -s)" == "Darwin" ]]; then
-    MD5_EXE="md5 -r"
-else
-    MD5_EXE="md5sum"
-fi
-
-# Define default arguments.
-SCRIPT="build.cake"
-CAKE_ARGUMENTS=()
-
-# Parse arguments.
-for i in "$@"; do
-    case $1 in
-        -s|--script) SCRIPT="$2"; shift ;;
-        --) shift; CAKE_ARGUMENTS+=("$@"); break ;;
-        *) CAKE_ARGUMENTS+=("$1") ;;
-    esac
-    shift
-done
-
-# Make sure the tools folder exist.
-if [ ! -d "$TOOLS_DIR" ]; then
-  mkdir "$TOOLS_DIR"
-fi
-
-# Make sure that packages.config exist.
-if [ ! -f "$TOOLS_DIR/packages.config" ]; then
-    echo "Downloading packages.config..."
-    curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages
-    if [ $? -ne 0 ]; then
-        echo "An error occurred while downloading packages.config."
-        exit 1
-    fi
-fi
-
-# Download NuGet if it does not exist.
-if [ ! -f "$NUGET_EXE" ]; then
-    echo "Downloading NuGet..."
-    curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-    if [ $? -ne 0 ]; then
-        echo "An error occurred while downloading nuget.exe."
-        exit 1
-    fi
-fi
-
-# Restore tools from NuGet.
-pushd "$TOOLS_DIR" >/dev/null
-if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then
-    find . -type d ! -name . ! -name 'Cake.Bakery' | xargs rm -rf
-fi
-
-mono "$NUGET_EXE" install -ExcludeVersion
-if [ $? -ne 0 ]; then
-    echo "Could not restore NuGet tools."
-    exit 1
-fi
-
-$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5"
-
-popd >/dev/null
-
-# Restore addins from NuGet.
-if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then
-    pushd "$ADDINS_DIR" >/dev/null
-
-    mono "$NUGET_EXE" install -ExcludeVersion
-    if [ $? -ne 0 ]; then
-        echo "Could not restore NuGet addins."
-        exit 1
-    fi
-
-    popd >/dev/null
-fi
-
-# Restore modules from NuGet.
-if [ -f "$MODULES_PACKAGES_CONFIG" ]; then
-    pushd "$MODULES_DIR" >/dev/null
-
-    mono "$NUGET_EXE" install -ExcludeVersion
-    if [ $? -ne 0 ]; then
-        echo "Could not restore NuGet modules."
-        exit 1
-    fi
-
-    popd >/dev/null
-fi
-
-# Make sure that Cake has been installed.
-if [ ! -f "$CAKE_EXE" ]; then
-    echo "Could not find Cake.exe at '$CAKE_EXE'."
-    exit 1
-fi
-
-# Start Cake
-exec mono "$CAKE_EXE" $SCRIPT "${CAKE_ARGUMENTS[@]}"

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.css

@@ -55,6 +55,14 @@ body {
     max-width: 255px;
 }
 
+.setup-item-inputcheckbox label {
+    padding: 0 1.5em;
+}
+
+.setup-item-inputcheckbox input {
+    height: 20px;
+}
+
 .setup-item-inputbool input {
     max-width: 100px;
     height: 20px;
@@ -175,6 +183,12 @@ hr {
     border-bottom:   1px solid #ddd;
 }
 
+.jackettlog-narrowcol {
+    width: 1px;
+    white-space: nowrap;
+    vertical-align: top;
+}
+
 .jackettlogWarn {
     background-color: #FFFF8E !important;
 }
@@ -202,11 +216,15 @@ pre {
     font-size: 13px;
     line-height: 1.42857143;
     color: #333;
-    word-break: break-all;
-    word-wrap: break-word;
     background-color: transparent;
     border: 0;
     border-radius: 0;
+    word-break: normal;
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 .modal-open .modal {
@@ -277,7 +295,7 @@ table td.fit{
 
 .tooltip-inner img {
     max-width: 250px;
-    height: auto;      
+    height: auto;
 }
 
 .type-public {

src/Jackett.Common/Content/custom.js

@@ -32,7 +32,15 @@ $(document).ready(function () {
 	        return opts.fn(this);
 	    else
 	        return opts.inverse(this);
-	});
+    });
+
+    Handlebars.registerHelper('if_in', function(elem, list, opts) {
+        if(list.indexOf(elem) > -1) {
+            return opts.fn(this);
+        }
+
+        return opts.inverse(this);
+    });
 
     var index = window.location.pathname.indexOf("/UI");
     var pathPrefix = window.location.pathname.substr(0, index);
@@ -43,7 +51,12 @@ $(document).ready(function () {
 });
 
 function openSearchIfNecessary() {
-    const hashArgs = location.hash.substring(1).split('&').reduce((prev, item) => Object.assign({ [item.split('=')[0]]: (item.split('=').length < 2 ? undefined : decodeURIComponent(item.split('=')[1])) }, prev), {});
+    const hashArgs = location.hash.substring(1).split('&').reduce((prev, item) =>
+      Object.assign({
+        [item.split('=')[0]]: (item.split('=').length < 2 ?
+          undefined :
+          decodeURIComponent(item.split('=')[1].replace(/\+/g,'%20')))
+      }, prev), {});
     if ("search" in hashArgs) {
         showSearch(hashArgs.tracker, hashArgs.search, hashArgs.category);
     }
@@ -228,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");
                 }
 			        });
                 });
@@ -608,6 +621,11 @@ function getConfigModalJson(configForm) {
             case "inputbool":
                 itemEntry.value = $el.find(".setup-item-inputbool input").is(":checked");
                 break;
+            case "inputcheckbox":
+                itemEntry.values = [];
+                $el.find(".setup-item-inputcheckbox input:checked").each(function () {
+                  itemEntry.values.push($(this).val());
+                });
             case "inputselect":
                 itemEntry.value = $el.find(".setup-item-inputselect select").val();
                 break;
@@ -762,7 +780,7 @@ function updateReleasesRow(row)
 }
 
 function showSearch(selectedIndexer, query, category) {
-    var selectedIndexers = []
+    var selectedIndexers = [];
     if (selectedIndexer)
         selectedIndexers = selectedIndexer.split(",");
     $('#select-indexer-modal').remove();
@@ -829,7 +847,11 @@ function showSearch(selectedIndexer, query, category) {
             Tracker: releaseDialog.find('#searchTracker').val()
         };
 
-        window.location.hash = $.param({ search: queryObj.Query, tracker: queryObj.Tracker.join(","), category: queryObj.Category.join(",") });
+        window.location.hash = Object.entries({
+          search: encodeURIComponent(queryObj.Query).replace(/%20/g,'+'),
+          tracker: queryObj.Tracker.join(","),
+          category: queryObj.Category.join(",")
+        }).map(([k, v], i) => k + '=' + v).join('&');
 
         $('#jackett-search-perform').html($('#spinner').html());
         $('#searchResults div.dataTables_filter input').val("");
@@ -877,7 +899,7 @@ function showSearch(selectedIndexer, query, category) {
         enableCaseInsensitiveFiltering: true,
         nonSelectedText: 'All'
     });
-    
+
 
     if (category !== undefined) {
         searchCategory.val(category.split(","));
@@ -1155,8 +1177,8 @@ function bindUIButtons() {
         var jackett_port = Number($("#jackett-port").val());
         var jackett_basepathoverride = $("#jackett-basepathoverride").val();
         var jackett_external = $("#jackett-allowext").is(':checked');
-        var jackett_update = $("#jackett-allowupdate").is(':checked'); 
-        var jackett_prerelease = $("#jackett-prerelease").is(':checked'); 
+        var jackett_update = $("#jackett-allowupdate").is(':checked');
+        var jackett_prerelease = $("#jackett-prerelease").is(':checked');
         var jackett_logging = $("#jackett-logging").is(':checked');
         var jackett_omdb_key = $("#jackett-omdbkey").val();
         var jackett_omdb_url = $("#jackett-omdburl").val();

src/Jackett.Common/Content/custom_mobile.css

@@ -175,6 +175,12 @@ hr {
     border-bottom:   1px solid #ddd;
 }
 
+.jackettlog-narrowcol {
+    width: 1px;
+    white-space: nowrap;
+    vertical-align: top;
+}
+
 .jackettlogWarn {
     background-color: #FFFF8E !important;
 }
@@ -202,11 +208,15 @@ pre {
     font-size: 13px;
     line-height: 1.42857143;
     color: #333;
-    word-break: break-all;
-    word-wrap: break-word;
     background-color: transparent;
     border: 0;
     border-radius: 0;
+    word-break: normal;
+    white-space: pre-wrap;       /* Since CSS 2.1 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
 
 .modal-open .modal {
@@ -276,7 +286,7 @@ table td.fit{
 
 .tooltip-inner img {
     max-width: 250px;
-    height: auto;     
+    height: auto;
 }
 
 .type-public {

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>
@@ -34,8 +34,8 @@
 
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20200102" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20200102" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=20200223" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=20200223" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">
@@ -52,11 +52,11 @@
         </div>
         <hr />
 
-        <div id="can-upgrade-from-mono" hidden class="alert alert-info" role="alert"> 
+        <div id="can-upgrade-from-mono" hidden class="alert alert-info" role="alert">
             <strong>Standalone version of Jackett is now available - Mono not required</strong> <br>
-            To upgrade to the standalone version of Jackett, <a href="https://github.com/Jackett/Jackett#install-on-linux-amdx64" target="_blank" class="alert-link">click here</a> for install instructions. 
-            Upgrading is straight forward, simply install the standalone version and your indexers/configuration will carry over. 
-            Benefits include: increased performance, improved stability and no dependency on Mono. 
+            To upgrade to the standalone version of Jackett, <a href="https://github.com/Jackett/Jackett#install-on-linux-amdx64" target="_blank" class="alert-link">click here</a> for install instructions.
+            Upgrading is straight forward, simply install the standalone version and your indexers/configuration will carry over.
+            Benefits include: increased performance, improved stability and no dependency on Mono.
         </div>
 
         <div class="pull-right">
@@ -235,6 +235,19 @@
             {{/if}}
         </div>
     </script>
+    <script id="setup-item-inputcheckbox" type="text/x-handlebars-template">
+        <div class="setup-item-inputcheckbox">
+            {{#each options}}
+            <div class="checkbox"><label>
+            {{#if_in @key ../values}}
+            <input type="checkbox" data-id="{{../../id}}" class="form-control" value="{{@key}}" checked />
+            {{else}}
+            <input type="checkbox" data-id="{{../../id}}" class="form-control" value="{{@key}}" />
+            {{/if_in}}
+            {{this}}</label></div>
+            {{/each}}
+        </div>
+    </script>
     <script id="setup-item-inputselect" type="text/x-handlebars-template">
         <div class="setup-item-inputselect">
             <select class="form-control" data-id="{{id}}">
@@ -603,16 +616,16 @@
                         <table class="dataTable compact cell-border hover stripe">
                             <thead>
                                 <tr>
-                                    <th style="width: 200px">When</th>
-                                    <th style="width: 80px">Level</th>
+                                    <th>Date</th>
+                                    <th>Level</th>
                                     <th>Message</th>
                                 </tr>
                             </thead>
                             <tbody>
                                 {{#each logs}}
                                 <tr class="jackettlog{{Level}}">
-                                    <td>{{dateFormat When}}</td>
-                                    <td>{{Level}}</td>
+                                    <td class="jackettlog-narrowcol">{{dateFormat When}}</td>
+                                    <td class="jackettlog-narrowcol">{{Level}}</td>
                                     <td><pre>{{Message}}</pre></td>
                                 </tr>
                                 {{/each}}
@@ -678,6 +691,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20200102"></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,11 +1,11 @@
-
+
 Handlebars.registerHelper('dateFormat', function (context, block) {
     if (window.moment) {
-        var f = block.hash.format || "MMM DD, YYYY hh:mm:ss A";
+        var f = block.hash.format || "YYYY-MM-DD HH:mm:ss";
         return moment(context).format(f); //had to remove Date(context)
     } else {
         return context;   //  moment plugin not available. return data as is.
-    };
+    }
 });
 
 Handlebars.registerHelper('jacketTimespan', function (context, block) {
@@ -22,7 +22,7 @@ Handlebars.registerHelper('jacketTimespan', function (context, block) {
     if (hours < 48) {
         return Math.round(hours) + 'h ago';
     }
-    
+
     var days = timeSpan.asDays();
     if (days < 365) {
         return Math.round(days) + 'd ago';
@@ -34,4 +34,4 @@ Handlebars.registerHelper('jacketTimespan', function (context, block) {
 
 Handlebars.registerHelper('jacketSize', function (context, block) {
     return filesize(context, { round: 1 });
-});
+});

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>
@@ -16,7 +16,7 @@
 
     <link href="../bootstrap/bootstrap.min.css" rel="stylesheet">
     <link href="../animate.css" rel="stylesheet">
-    <link href="../custom.css" rel="stylesheet">
+    <link href="../custom.css?changed=20200223" rel="stylesheet">
 
     <title>Jackett</title>
 </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/bitspyder.yml

@@ -6,6 +6,8 @@
   type: private
   encoding: windows-1252
   links:
+    - https://bitspyder.net/
+  legacylinks:
     - http://bitspyder.net/
 
   caps:
@@ -47,9 +49,34 @@
     modes:
       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: "8"
+      options:
+        "8": "created"
+        "6": "seeders"
+        "4": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
   login:
-    path: processf.php
-    method: post
+    path: login.php
+    method: form
+    form: form
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
@@ -61,17 +88,20 @@
   search:
     paths:
       - path: browse.php
-        method: post
     inputs:
       search: "{{ .Keywords }}"
       # 0 active 1 incldead 2 onlydead
       incldead: 1
       # 0 title 1 default
       scope: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
     rows:
       selector: table > tbody > tr[class]
       filters:
         - name: andmatch
+
     fields:
       # there are two styles, we support both
       title:
@@ -101,7 +131,7 @@
         selector: td.rowcol:nth-child(7):has(br), td.clear:nth-child(4)
         filters:
           - name: regexp
-            args: ([\d,]+)
+            args: (\d+)
       seeders:
         selector: td.rowcol:nth-last-child(3)
       leechers:
@@ -138,3 +168,4 @@
       description:
         optional: true
         selector: font[color="#990000"]
+# custom v4

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

@@ -33,39 +33,59 @@
       options:
         "time": "created"
         "length": "size"
-        "popular": "seeders"
+        "seeders": "seeders"
 
   search:
     paths:
-      - path: "{{ if .Keywords }}?s={{ .Keywords }}&sort={{ .Config.sort }}{{else}}recent?sort={{ .Config.sort }}{{end}}"
+      - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}"
+      - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=2"
+      - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=3"
+      - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=4"
+      - path: "{{ if .Keywords }}search/{{ .Keywords }}/{{else}}recent{{end}}?sort={{ .Config.sort }}&page=5"
 
     rows:
-      selector: li[class$="item"]
+      selector: div.media
 
     fields:
-      title:
-        selector: h2[class$="title"] a[href*="/torrent/"]
-        attribute: title
       category:
         text: 1
+      title:
+        selector: a[href*="/torrent/"]
       details:
-        selector: h2[class$="title"] 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: div[class$="info"] a[href^="magnet:?xt="]
+        selector: a[href^="magnet:?xt="]
         attribute: href
+      banner:
+        selector: a.img-thumbnail img
+        attribute: src
+        filters:
+          - name: replace
+            args: ["https://btdb.io/assets/img/placeholder.png", ""]
       size:
-        selector: div[class$="info"] span:nth-of-type(1)
+        selector: small:nth-of-type(1) strong
       files:
-        selector: div[class$="info"] span:nth-of-type(2)
+        selector: small:nth-of-type(2) strong
+      seeders:
+        selector: small:nth-of-type(3) strong
+        filters:
+          - name: replace
+            args: [",", ""]
+      leechers:
+        selector: small:nth-of-type(4) strong
+        filters:
+          - name: replace
+            args: [",", ""]
       date:
-        selector: div[class$="info"] span:nth-of-type(3)
+        selector: small:nth-of-type(5) strong
         filters:
           - name: timeago
-      seeders:
-        selector: div[class$="info"] span:nth-of-type(4)
-      leechers:
-        selector: div[class$="info"] span:nth-of-type(5)
       downloadvolumefactor:
         text: 0
       uploadvolumefactor:

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

@@ -0,0 +1,68 @@
+---
+  site: bteye
+  name: BTeye
+  description: "BTeye is a Public BitTorrent DHT search engine."
+  language: en-us
+  type: public
+  encoding: UTF-8
+  links:
+    -  https://www.bteye.org/
+
+  caps:
+    categories:
+      1: Other
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: info
+      type: info
+      default: BTeye does not use categories. In your software Indexer settings, set the category to 7000.
+
+  download:
+    selector: a[href^="magnet:?xt="]
+    attribute: href
+
+  search:
+    # https://www.bteye.org/q/2020
+    paths:
+      - path: "q/{{ if .Keywords }}{{ .Keywords }}{{else}}2020{{end}}"
+
+    rows:
+      selector: div.plist
+      filters:
+        - name: andmatch
+
+    fields:
+      category:
+        text: 1
+      title:
+        selector: div.pname a
+        attribute: title
+      details:
+        selector: div.pname a
+        attribute: href
+      download:
+        selector: div.pname a
+        attribute: href
+      date:
+        selector: div.plink b:nth-of-type(3)
+        filters:
+          - name: dateparse
+            args: "2006-01-02"
+      files:
+        selector: div.plink b:nth-of-type(2)
+      size:
+        selector: div.plink b:nth-of-type(1)
+      seeders:
+        text: 1
+      leechers:
+        text: 1
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
+# engine n/a

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,7 +6,7 @@
   type: private
   encoding: UTF-8
   links:
-    - http://tracker.btnext.com/
+    - http://tracker.btnext.com/ # site forces http, https is not supported
 
   caps:
     categorymappings:
@@ -15,67 +15,76 @@
       - {id: 89, cat: Console, desc: "Games"}
       - {id: 87, cat: TV, desc: "Series"}
       - {id: 93, cat: Audio, desc: "Musica"}
+      - {id: 108, cat: Movies, desc: "ViP"}
       - {id: 1, cat: Movies, desc: "Movies"}
-      - {id: 70, cat: Movies/3D, desc: "3D"}
-      - {id: 71, cat: Movies/Sd, desc: "480p"}
-      - {id: 72, cat: Movies/BluRay, desc: "BD-R"}
-      - {id: 31, cat: Movies/HD, desc: "BDRIP/BRRip"}
-      - {id: 16, cat: Movies/SD, desc: "CAM"}
-      - {id: 74, cat: Movies/DVD, desc: "DvD-R"}
-      - {id: 17, cat: Movies/HD, desc: "HD"}
-      - {id: 91, cat: Movies/Other, desc: "Kids"}
-      - {id: 76, cat: Movies, desc: "Packs"}
-      - {id: 77, cat: Movies/WEBDL, desc: "WEB-DL"}
-      - {id: 14, cat: Movies/SD, desc: "DVDRip/XViD"}
-      - {id: 85, cat: Movies/DVD, desc: "Custom-DVDR"}
-      - {id: 96, cat: Movies/HD, desc: "4K"}
-      - {id: 6, cat: PC, desc: "Applications"}
-      - {id: 18, cat: PC/ISO, desc: "PC Applications"}
-      - {id: 19, cat: PC/Mac, desc: "Macintosh Applications"}
-      - {id: 34, cat: PC/ISO, desc: "Linux Applications"}
-      - {id: 7, cat: Audio, desc: "Music"}
-      - {id: 20, cat: Audio/Video, desc: "MVideo"}
-      - {id: 21, cat: Audio/MP3, desc: "Mp3"}
-      - {id: 33, cat: Audio/Other, desc: "Mp4"}
-      - {id: 32, cat: Audio/Lossless, desc: "FLAC"}
-      - {id: 2, cat: Console, desc: "Games"}
-      - {id: 78, cat: PC/Games, desc: "Linux"}
-      - {id: 79, cat: PC/Mac, desc: "MacOSX"}
-      - {id: 28, cat: Console/NDS, desc: "Nintendo DS"}
-      - {id: 27, cat: PC/Games, desc: "PC/Windows"}
-      - {id: 80, cat: Console/PS3, desc: "PS2"}
-      - {id: 81, cat: Console/PS3, desc: "PS3"}
-      - {id: 82, cat: Console/PS4, desc: "PS4"}
-      - {id: 83, cat: Console/PSP, desc: "PSP"}
-      - {id: 95, cat: Console/PSVita, desc: "PSVITA"}
-      - {id: 4, cat: Console/Wii, desc: "Wii"}
-      - {id: 26, cat: Console/Xbox360, desc: "XBOX360"}
-      - {id: 84, cat: Console/Xbox, desc: "XONE"}
+      - {id: 70, cat: Movies/3D, desc: "Movies 3D"}
+      - {id: 71, cat: Movies/SD, desc: "Movies 480p"}
+      - {id: 72, cat: Movies/BluRay, desc: "Movies BD-R"}
+      - {id: 31, cat: Movies/HD, desc: "Movies BDRIP/BRRip"}
+      - {id: 16, cat: Movies/SD, desc: "Movies CAM"}
+      - {id: 74, cat: Movies/DVD, desc: "Movies DvD-R"}
+      - {id: 76, cat: Movies, desc: "Movies Packs"}
+      - {id: 91, cat: Movies/Other, desc: "Movies Kids"}
+      - {id: 77, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
+      - {id: 85, cat: Movies/DVD, desc: "Movies Custom-DVDR"}
+      - {id: 14, cat: Movies/SD, desc: "Movies DVDRip/XViD"}
+      - {id: 98, cat: Movies/Other, desc: "Movies Juvenil"}
+      - {id: 104, cat: Movies/UHD, desc: "Movies Bluray-UHD"}
+      - {id: 102, cat: Movies/HD, desc: "Movies HD-720p"}
+      - {id: 101, cat: Movies/HD, desc: "Movies HD-1080p"}
+      - {id: 103, cat: Movies/UHD, desc: "Movies HD-2160p"}
       - {id: 42, cat: TV, desc: "TV Series"}
       - {id: 45, cat: TV/Documentary, desc: "Documentaries"}
       - {id: 46, cat: TV/Sport, desc: "Sports"}
-      - {id: 47, cat: TV/HD, desc: "TV-Bluray"}
-      - {id: 48, cat: TV/SD, desc: "TV-Dvd-R"}
-      - {id: 49, cat: TV/SD, desc: "TV-DVDRiP"}
-      - {id: 50, cat: TV, desc: "TV-Packs"}
-      - {id: 92, cat: TV/Anime, desc: "TV-Kids"}
-      - {id: 52, cat: TV/SD, desc: "TV-SDx264"}
-      - {id: 53, cat: TV/WEB-DL, desc: "TV-WEB-DL"}
-      - {id: 55, cat: TV/HD, desc: "TV-X264"}
+      - {id: 47, cat: TV/HD, desc: "TV Bluray"}
+      - {id: 48, cat: TV/SD, desc: "TV Dvd-R"}
+      - {id: 49, cat: TV/SD, desc: "TV DVDRiP"}
+      - {id: 50, cat: TV, desc: "TV Packs"}
+      - {id: 92, cat: TV, desc: "TV Kids"}
+      - {id: 112, cat: TV, desc: "TV Juvenil"}
+      - {id: 52, cat: TV/SD, desc: "TV SDx264"}
+      - {id: 53, cat: TV/WEB-DL, desc: "TV WEB-DL"}
+      - {id: 55, cat: TV/HD, desc: "TV X264"}
       - {id: 56, cat: TV/SD, desc: "TV-XViD"}
-      - {id: 44, cat: TV, desc: "Miscellaneous"}
-      - {id: 51, cat: TV/Anime, desc: "Anime"}
-      - {id: 54, cat: Audio/Audiobook, desc: "Audiobook"}
-      - {id: 57, cat: Books, desc: "E-Books"}
-      - {id: 58, cat: Books/Comics, desc: "Comics"}
-      - {id: 59, cat: Books, desc: "Educational"}
-      - {id: 60, cat: Books, desc: "Magazines/Journals"}
+      - {id: 7, cat: Audio, desc: "Music"}
+      - {id: 20, cat: Audio/Video, desc: "Music MVideo"}
+      - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
+      - {id: 33, cat: Audio/Other, desc: "Music MP4"}
+      - {id: 32, cat: Audio/Lossless, desc: "Music FLAC"}
+      - {id: 2, cat: Console, desc: "Games"}
+      - {id: 78, cat: PC/Games, desc: "Games Linux"}
+      - {id: 79, cat: PC/Mac, desc: "Games MacOSX"}
+      - {id: 28, cat: Console/NDS, desc: "Games Nintendo DS"}
+      - {id: 27, cat: PC/Games, desc: "Games PC/Windows"}
+      - {id: 80, cat: Console/PS3, desc: "Games PS2"}
+      - {id: 81, cat: Console/PS3, desc: "Games PS3"}
+      - {id: 82, cat: Console/PS4, desc: "Games PS4"}
+      - {id: 83, cat: Console/PSP, desc: "Games PSP"}
+      - {id: 95, cat: Console/PSVita, desc: "Games PSVITA"}
+      - {id: 4, cat: Console/Wii, desc: "Games Wii"}
+      - {id: 26, cat: Console/Xbox360, desc: "Games XBOX360"}
+      - {id: 84, cat: Console/Xbox, desc: "Games XONE"}
+      - {id: 6, cat: PC, desc: "Applications"}
+      - {id: 18, cat: PC/ISO, desc: "Applications PC"}
+      - {id: 19, cat: PC/Mac, desc: "Applications Macintosh"}
+      - {id: 34, cat: PC/ISO, desc: "Applications Linux"}
+      - {id: 44, cat: Other, desc: "Miscellaneous"}
+      - {id: 54, cat: Audio/Audiobook, desc: "Books Audiobook"}
+      - {id: 57, cat: Books, desc: "Books E-Books"}
+      - {id: 58, cat: Books/Comics, desc: "Books Comics"}
+      - {id: 59, cat: Books, desc: "Books Educational"}
+      - {id: 60, cat: Books, desc: "Books Magazines/Journals"}
       - {id: 61, cat: Other, desc: "Pics/Wallpapers"}
       - {id: 62, cat: PC/Phone-Android, desc: "Android"}
       - {id: 63, cat: PC/Phone-IOS, desc: "iOS"}
       - {id: 66, cat: PC/Phone-Other, desc: "WindowsPhone"}
       - {id: 90, cat: Other, desc: "GPS"}
       - {id: 68, cat: Other, desc: "Others"}
+      - {id: 100, cat: Other, desc: "Revistas"}
+      - {id: 109, cat: TV/Anime, desc: "Anime"}
+      - {id: 51, cat: TV/Anime, desc: "Anime Filmes"}
+      - {id: 99, cat: TV/Anime, desc: "Anime Hentai"}
+      - {id: 110, cat: TV/Anime, desc: "Anime TV Séries"}
       - {id: 41, cat: XXX, desc: "XXX"}
       - {id: 64, cat: XXX, desc: "XXX-Magazines"}
       - {id: 65, cat: XXX, desc: "XXX-Movies"}
@@ -85,6 +94,34 @@
     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: info
+      type: info
+      label: Layout
+      default: "<ol><li>Only the English Classic profile is supported.<li>Make sure to set the <b>Torrent Listing (Lista de Torrents)</b> option in your profile to <b>Classic (Clássico)</b><li>Using the <i>Moderna</i> theme will prevent results.</ol>"
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeders": "seeders"
+        "size": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
 
   login:
     path: ?p=home&pid=1
@@ -92,7 +129,7 @@
     form: form#loginbox_form
     submitpath: /ajax/login.php
     inputs:
-      action: "login"
+      action: login
       loginbox_membername: "{{ .Config.username }}"
       loginbox_password: "{{ .Config.password }}"
       loginbox_remember: 1
@@ -111,7 +148,7 @@
   search:
     paths:
       - path: /
-    keywordsfilters: 
+    keywordsfilters:
       - name: re_replace
         args: ["[^a-zA-Z0-9]+", "%25"]
     inputs:
@@ -121,6 +158,8 @@
       keywords: "{{ .Keywords }}"
       search_type: name
       searchin: title
+      "sortOptions[sortBy]": "{{ .Config.sort }}"
+      "sortOptions[sortOrder]": "{{ .Config.type }}"
     error:
       - selector: div.error:not(:contains("Não existem resultados encontrados.")):not(:contains("There are no results found."))
 

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,28 +23,27 @@
       - {id: 415, cat: Other, desc: "其他/Other"}
 
     modes:
-      search: [q]
+      search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
+  settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+
   login:
-    path: login.php
-    method: form
-    form: form[action="takelogin.php"]
-    captcha:
-      type: image
-      selector: img[alt="CAPTCHA"]
-      input: imagestring
+    method: cookie
     inputs:
-      username: "{{ .Config.username }}"
-      password: "{{ .Config.password }}"
-    error:
-      - selector: td.embedded:has(h2:contains("登錄失敗"))
-      - selector: td.embedded:has(h2:contains("失败"))
+      cookie: "{{ .Config.cookie }}"
     test:
       path: index.php
       selector: a[href="logout.php"]
-        
+
   search:
     paths:
       - path: torrents.php
@@ -79,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

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

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: