pornorip: andmatch

add pornorip a 3x site. resolves #7524
add pornotor a 3x site. resolves #7523
2025-09-11 14:19:17 +02:00 · 2020-03-07 17:47:28 +13:00 · 2020-03-07 17:43:33 +13:00 · 2020-03-07 16:20:03 +13:00 · 2020-03-07 15:09:10 +13:00 · 2020-03-07 14:51:06 +13:00
385 changed files with 6666 additions and 4441 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@

 [![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)
 [![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/)
@@ -27,6 +26,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/

 * 1337x
 * 7torrents
+ * AcademicTorrents
 * ACG.RIP
 * ACGsou
 * Anidex
@@ -37,10 +37,10 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * BigFANGroup
 * BitRu
 * BitTorrent.AM
+ * BT.etree
 * BTDB
 * BTDIGG
 * BTeye
- * BT.etree
 * BTSOW
 * Cili180
 * ConCen
@@ -49,11 +49,11 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * cpasbienClone
 * Demonoid
 * dmhy
- * ETTV
 * EliteTorrent.biz
 * EstrenosDTL
- * ExtraTorrent.cd
+ * ETTV
 * EXT Torrents
+ * ExtraTorrent.cd
 * EZTV
 * Filebase
 * FireBit
@@ -65,16 +65,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Horrible Subs
 * IBit
 * Idope
+ * Il CorSaRo Blu
 * Il Corsaro Nero <!-- maintained by bonny1992 -->
- * Il Corsaro Blu
 * Internet Archive (archive.org)
 * Isohunt2
 * iTorrent
- * KickAssTorrent (KATcr)
 * KickAssTorrent (kat.li)
+ * KickAssTorrent (KATcr)
 * Legit Torrents
 * LePorno
 * LimeTorrents
+ * LinuxTracker
 * MacTorrents
 * Magnet4You
 * MagnetDL
@@ -82,17 +83,21 @@ 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
 * PiratBit
 * Pirateiro
 * PornLeech
+ * PornoRip
+ * PornoTor
 * ProStyleX
 * RARBG
 * Rus-media
@@ -102,8 +107,8 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * ShowRSS
 * SkyTorrentsClone
 * SolidTorrents
- * sukebei.Nyaa.si
 * sukebei-Pantsu
+ * sukebei.Nyaa.si
 * TFile
 * The Pirate Bay (TPB)
 * Tokyo Tosho
@@ -120,12 +125,15 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * TorrentKitty
 * TorrentParadise
 * TorrentProject2
+ * TorrentRex
 * TorrentQuest
 * Torrents.csv
 * TorrentView
 * TorrentWal
 * Torrentz2
 * Underverse
+ * UnionDHT
+ * xxxtor
 * YourBittorrent
 * YTS.ag
 * Zooqle
@@ -142,29 +150,32 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * CasStudioTV
 * Crazy's Corner
 * CzTorrent
- * Deildu
 * DXP (Deaf Experts)
+ * Deildu
 * EniaHD
 * Erzsebet
+ * ExKinoRay
 * ExtremlymTorrents
+ * FilmsClub
 * Gay-Torrents.net
 * Gay-Torrents.org
- * HamsterStudio
 * HD Dolby
+ * HamsterStudio
+ * KinoNaVse100
 * Kinozal
 * Korsar
 * LostFilm.tv
+ * MVGroup Forum
+ * MVGroup Main
 * Marine Tracker
 * Metal Tracker
 * MuziekFrabriek
- * MVGroup Forum
- * MVGroup Main
 * NetHD (VietTorrent)
 * Pornolab
 * RiperAM
 * RockBox
- * Rustorka
 * RuTracker
+ * Rustorka
 * Sharewood
 * SkTorrent
 * SoundPark
@@ -186,6 +197,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * 4thD (4th Dimension)
 * 52PT
 * 720pier
+ * AST4u
 * Abnormal
 * Acid Lounge (A-L)
 * Aftershock
@@ -197,54 +209,55 @@ 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)
 * BIGTorrent
- * BigTower
- * Bit-City Reloaded
 * BIT-HDTV
- * BiT-TiTAN
- * Bithorlo (BHO)
- * BitHUmen
- * Bitspyder
- * BitTorrentFiles
- * BitTurk
 * BJ-Share (BJ)
- * BlueBird
- * Blutopia (BLU)
- * Brasil Tracker
- * BroadcastTheNet (BTN)
- * BroadCity
 * BRObits
- * BrokenStones
 * BTGigs (TG)
 * BTNext (BTNT)
 * BTSCHOOL
- * Carpathians
- * CartoonChaos (CC)
- * CasaTorrent
+ * Back-ups
+ * BaconBits (bB)
+ * BakaBT
+ * BeiTai
+ * BeyondHD (BHD)
+ * BiT-TiTAN
+ * Bibliotik
+ * BigTower
+ * Bit-City Reloaded
+ * BitHUmen
+ * BitTorrentFiles
+ * BitTurk
+ * Bithorlo (BHO)
+ * Bitspyder
+ * BlueBird
+ * Blutopia (BLU)
+ * Boxing Torrents
+ * Brasil Tracker
+ * BroadCity
+ * BroadcastTheNet (BTN)
+ * BrokenStones
 * CCFBits
 * CGPeers
 * CHDBits
+ * Carpathians
+ * CartoonChaos (CC)
+ * CasaTorrent
 * ChannelX
- * Cinemageddon
 * CinemaMovies
- * Cinematik
 * CinemaZ (EuTorrents)
+ * Cinemageddon
+ * Cinematik
 * Classix
 * Concertos
 * CrazyHD
 * CrazySpirits
 * CrnaBerza
+ * DXDHD
 * DanishBits (DB)
 * Das Unerwartete
 * DataScene (DS)
@@ -258,18 +271,17 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * DocumentaryTorrents (DT)
 * Downloadville
 * Dragonworld Reloaded
- * DXDHD
 * EbookParadijs
 * Ebooks-Shares
 * EfectoDoppler
 * EggMeOn
 * Elite-Tracker
 * Empornium (EMP)
- * eShareNet
- * eStone (XiDER, BeLoad)
 * Ethor.net (Thor's Land)
+ * ExoticaZ (YourExotic)
 * ExtremeTorrents
 * FANO.IN
+ * Fantastic Heaven
 * FeedUrNeed (FuN)
 * Femdomcult
 * FileList (FL)
@@ -281,24 +293,23 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * FunFile (FF)
 * FunkyTorrents (FT)
 * Fuzer (FZ)
- * Galeriens (LaPauseTorrents)
 * GAYtorrent.ru
+ * GFXPeers
+ * Galeriens (LaPauseTorrents)
 * GazelleGames (GGn)
 * Generation-Free
- * GFXPeers
 * GigaTorrents
- * GimmePeers (formerly ILT) <!-- maintained by jamesb2147 -->
+ * GimmePeers (formerly ILT)
 * GiroTorrent
 * Greek Legends
 * Greek Team
- * HacheDe
+ * HD-Bits.com
 * HD-Forever (HDF)
 * HD-Olimpo
 * HD-Only (HDO)
 * HD-Space (HDS)
 * HD-Spain
 * HD-Torrents (HDT)
- * HD-Bits.com
 * HD4FANS
 * HDArea (HDA)
 * HDBits
@@ -315,23 +326,24 @@ 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)
 * Le Saloon
+ * LeChaudron
 * LeagueHD
 * LearnFlakes
+ * LegacyHD (HD4Free)
 * LibraNet (LN)
 * LinkoManija
 * LosslessClub
@@ -343,7 +355,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * Mononoké-BT
 * MoreThanTV (MTV)
 * MyAnonamouse (MAM)
- * myAmity
 * MySpleen
 * NBTorrents
 * NCore
@@ -353,57 +364,54 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 * New Real World
 * Norbits
 * NordicBits (NB)
- * NORDiCHD
 * Nostalgic (The Archive)
- * notwhat.cd
 * OnlineSelfEducation
 * Orpheus
 * Ourbits (HDPter)
 * P2PBG
 * P2PElite
+ * PT99
+ * PTFiles (PTF)
+ * PThome
+ * PWTorrents (PWT)
 * Partis
 * PassThePopcorn (PTP)
 * Peers.FM
+ * PiXELHD (PxHD)
 * PirateTheNet (PTN)
 * PixelCove (Ultimate Gamer)
- * PiXELHD (PxHD)
 * Pleasuredome
 * PolishSource (PS)
 * PolishTracker
- * Pornbay
 * PornBits (PB)
+ * Pornbay
 * Pretome
 * PrivateHD (PHD)
 * ProAudioTorrents (PAT)
 * Psytorrents
- * PT99
- * PTFiles (PTF)
- * PThome
 * PuntoTorrent
- * PWTorrents (PWT)
 * R3V WTF!
+ * RPTorrents
 * Racing4Everyone (R4E)
 * RacingForMe (RFM)
 * RainbowNation Sharing (RNS)
- * Redacted (PassTheHeadphones)
 * Red Star Torrent (RST)
+ * Redacted (PassTheHeadphones)
 * RetroFlix
 * RevolutionTT
 * RoDVD (Cinefiles)
 * Romanian Metal Torrent (RMT)
- * RPTorrents
+ * SDBits
 * SceneFZ
 * SceneHD
 * ScenePalace (SP)
 * SceneRush
 * SceneTime
- * SceneXpress
- * SDBits
 * Secret Cinema
 * SeedFile (SF)
- * Shareisland
 * ShareSpaceDB
 * ShareUniversity
+ * Shareisland
 * Shazbat
 * Shellife (SL)
 * SiamBIT
@@ -411,61 +419,62 @@ 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)
+ * U2 (U2分享園@動漫花園)
 * UHDBits
 * UnionGang
 * UnlimitZ
@@ -473,17 +482,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.
--- a/Upstart.config
+++ b/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
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,6 +7,7 @@ variables:
  buildConfiguration: Release
  netCoreFramework: netcoreapp3.1
  netCoreSdkVersion: 3.1.x
+  system.debug: true

 stages:
  - stage: BuildJackett
@@ -363,7 +364,27 @@ stages:
          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-project/jackett/_apis/build/builds/$(Build.BuildId)/logs?api-version=5.0' | ConvertFrom-Json
+            $lastTwoLogUrls = $json.value[-1..-2].url
+            foreach($logUrl in $lastTwoLogUrls)
+            {
+              Write-Output $logUrl
+              $logText = Invoke-WebRequest $logUrl
+              if ($logText -like '*: GitHub Release*') 
+              {
+                $successCount = (Select-String "Uploaded file successfully:" -InputObject $logText -AllMatches).Matches.Count
+                $failureCount = (Select-String "Duplicate asset found:" -InputObject $logText -AllMatches).Matches.Count
+                Write-Host "Success count is: $successCount and failure count is: $failureCount"
+                if (($successCount -ne 7) -or ($failureCount -ne 0)) { Write-Host "##vso[task.complete result=Failed;]DONE" } 
+              }
+            }
+
--- a/src/DateTimeRoutines/DateTimeRoutines.cs
+++ b/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. 
--- a/src/DateTimeRoutines/DateTimeRoutines.csproj
+++ b/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>
--- a/src/Jackett.Common/Content/common.js
+++ b/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;
-}
+}
--- a/src/Jackett.Common/Content/custom.js
+++ b/src/Jackett.Common/Content/custom.js
@@ -241,9 +241,9 @@ function displayUnconfiguredIndexersList() {
 			        }).fail(function (data) {
                if(data.responseJSON.error !== undefined) {
                  var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
-                  doNotify("An error occured while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
+                  doNotify("An error occurred while configuring this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
                } else {
-                  doNotify("An error occured while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
+                  doNotify("An error occurred while configuring this indexer, is Jackett server running ?", "danger", "glyphicon glyphicon-alert");
                }
 			        });
                });
--- a/src/Jackett.Common/Content/favicon.ico
+++ b/src/Jackett.Common/Content/favicon.ico
--- a/src/Jackett.Common/Content/index.html
+++ b/src/Jackett.Common/Content/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>

 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -691,6 +691,6 @@
    </script>

    <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20200222"></script>
+    <script type="text/javascript" src="../custom.js?changed=20200301"></script>
 </body>
 </html>
--- a/src/Jackett.Common/Content/libs/api.js
+++ b/src/Jackett.Common/Content/libs/api.js
@@ -86,4 +86,4 @@ var api = {
 	        success: callback
 	    });
 	}
-}
+}
--- a/src/Jackett.Common/Content/libs/handlebarsextend.js
+++ b/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);
-});
+});
--- a/src/Jackett.Common/Content/libs/handlebarsmoment.js
+++ b/src/Jackett.Common/Content/libs/handlebarsmoment.js
@@ -1,4 +1,4 @@
-
+
 Handlebars.registerHelper('dateFormat', function (context, block) {
    if (window.moment) {
        var f = block.hash.format || "YYYY-MM-DD HH:mm:ss";
--- a/src/Jackett.Common/Content/login.html
+++ b/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>
--- a/src/Jackett.Common/Definitions/0daykiev.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/2fast4you.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/3evils.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/academictorrents.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/acidlounge.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/aftershock.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/alein.yml
+++ b/src/Jackett.Common/Definitions/alein.yml
@@ -1,4 +1,4 @@
---
+---
  site: alein
  name: Alein
  description: "Alein is a BULGARIAN Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/alexfilm.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/arabafenice.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/arenabg.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/asgaard.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/audiobooktorrents.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/audionews.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/awesomehd.yml
+++ b/src/Jackett.Common/Definitions/awesomehd.yml
@@ -94,4 +94,4 @@
          "*": 1
      uploadvolumefactor:
        case:
-          "*": 1
+          "*": 1
--- a/src/Jackett.Common/Definitions/backups.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/baibako.yml
+++ b/src/Jackett.Common/Definitions/baibako.yml
@@ -1,4 +1,4 @@
---
+---
  site: baibako
  name: BaibaKo
  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
--- a/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd-oneurl.yml
@@ -116,4 +116,4 @@
      uploadvolumefactor:
        case:
          "*": 1
-# UNIT3D
+# UNIT3D
--- a/src/Jackett.Common/Definitions/beyond-hd.yml
+++ b/src/Jackett.Common/Definitions/beyond-hd.yml
@@ -128,4 +128,4 @@
      uploadvolumefactor:
        case:
          "*": 1
-# UNIT3D
+# UNIT3D
--- a/src/Jackett.Common/Definitions/bigfangroup.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/bigtorrent.yml
+++ b/src/Jackett.Common/Definitions/bigtorrent.yml
@@ -96,4 +96,4 @@
          "*": "1"
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/bit-titan.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/bithorlo.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/bluebird.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/booktracker.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/boxingtorrents.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/btdb.yml
+++ b/src/Jackett.Common/Definitions/btdb.yml
@@ -50,13 +50,15 @@
      category:
        text: 1
      title:
-        selector: a[href^="/torrent/"]
+        selector: a[href*="/torrent/"]
      details:
-        selector: a[href^="/torrent/"]
+        selector: a[href*="/torrent/"]
        attribute: href
      download:
+         # download can be missing despite icon being present. Fortunately the magnet is always there
        selector: a[href$=".torrent"]
        attribute: href
+        optional: true
      magnet:
        selector: a[href^="magnet:?xt="]
        attribute: href
--- a/src/Jackett.Common/Definitions/btnext.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/btsow.yml
+++ b/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:
--- a/src/Jackett.Common/Definitions/carpathians.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/cartoonchaos.yml
+++ b/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"
@@ -146,4 +146,4 @@
          "*": 1
      uploadvolumefactor:
        text: 1
-# xbtit 2.0.0
+# xbtit 2.0.0
--- a/src/Jackett.Common/Definitions/casatorrent.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/casstudiotv.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/ccfbits.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/cinemageddon.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/cinematik.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/classix.yml
+++ b/src/Jackett.Common/Definitions/classix.yml
@@ -63,4 +63,4 @@
          "*": "1"
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/cpabien.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/crazyscorner.yml
+++ b/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"
@@ -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
--- a/src/Jackett.Common/Definitions/crazyspirits.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/crnaberza.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/cztorrent.yml
+++ b/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
--- a/src/Jackett.Common/Definitions/datascene.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/divteam.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/documentarytorrents.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/downloadville.yml
+++ b/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:
@@ -210,7 +212,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:
--- a/src/Jackett.Common/Definitions/dragonworldreloaded.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/ebookparadijs.yml
+++ b/src/Jackett.Common/Definitions/ebookparadijs.yml
@@ -1,4 +1,4 @@
---
+---
  site: ebookparadijs
  name: EbookParadijs
  description: "EbookParadijs is a DUTCH Private Tracker for EBOOKS"
--- a/src/Jackett.Common/Definitions/ebooks-shares.yml
+++ b/src/Jackett.Common/Definitions/ebooks-shares.yml
@@ -352,4 +352,4 @@
          "*": 1
      uploadvolumefactor:
        case:
-          "*": 1
+          "*": 1
--- a/src/Jackett.Common/Definitions/efectodoppler.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/elitetorrent-biz.yml
+++ b/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:
--- a/src/Jackett.Common/Definitions/eniahd.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/erzsebet.yml
+++ b/src/Jackett.Common/Definitions/erzsebet.yml
@@ -1,4 +1,4 @@
---
+---
  site: erzsebet
  name: Erzsebet
  description: "Erzsebet is a RUSSIAN Semi-Private Torrent Tracker for 3X"
--- a/src/Jackett.Common/Definitions/estone.yml
+++ b/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"
--- a/src/Jackett.Common/Definitions/ettv.yml
+++ b/src/Jackett.Common/Definitions/ettv.yml
@@ -1,4 +1,4 @@
---
+---
  site: ettv
  name: ETTV
  description: "ETTV is a Public torrent site for TV / MOVIES, home of the  ETTV, ETHD and DTOne groups."
--- a/src/Jackett.Common/Definitions/exkinoray.yml
+++ b/src/Jackett.Common/Definitions/exkinoray.yml
@@ -0,0 +1,186 @@
+---
+  site: exkinoray
+  name: ExKinoRay
+  description: "ExKinoRay is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - http://exkinoray.tv/ # site forces http, does not support https
+
+  caps:
+    categorymappings:
+      - {id: 92, cat: TV, desc: "Кино Сериал"}
+      - {id: 46, cat: Movies, desc: "Кино Комедия"}
+      - {id: 47, cat: Movies, desc: "Кино Боевик"}
+      - {id: 48, cat: Movies, desc: "Кино Военный"}
+      - {id: 49, cat: Movies, desc: "Кино Вестерн"}
+      - {id: 50, cat: Movies, desc: "Кино Триллер"}
+      - {id: 51, cat: Movies, desc: "Кино Детектив"}
+      - {id: 52, cat: Movies, desc: "Кино Драма"}
+      - {id: 53, cat: Movies, desc: "Кино Мелодрама"}
+      - {id: 54, cat: Movies, desc: "Кино Индийское"}
+      - {id: 55, cat: Movies, desc: "Кино Азиатское"}
+      - {id: 59, cat: Movies, desc: "Кино Фантастика"}
+      - {id: 60, cat: Movies, desc: "Кино Фэнтези"}
+      - {id: 61, cat: Movies, desc: "Кино Ужас"}
+      - {id: 62, cat: Movies, desc: "Кино Мистика"}
+      - {id: 63, cat: Movies, desc: "Кино Приключения"}
+      - {id: 64, cat: Movies, desc: "Кино Наше кино"}
+      - {id: 65, cat: Movies, desc: "Кино Исторический"}
+      - {id: 66, cat: TV/Documentary, desc: "Кино Документальный"}
+      - {id: 67, cat: TV/Sport, desc: "Кино Спорт"}
+      - {id: 68, cat: Movies, desc: "Кино Семейный"}
+      - {id: 69, cat: Movies, desc: "Кино Детский"}
+      - {id: 70, cat: Movies, desc: "Кино Классика"}
+      - {id: 71, cat: Movies, desc: "Кино Концерт"}
+      - {id: 72, cat: TV, desc: "Кино ТВ-шоу"}
+      - {id: 73, cat: Movies, desc: "Кино Театр, опера"}
+      - {id: 74, cat: Movies, desc: "Кино Мюзикл"}
+      - {id: 75, cat: Movies, desc: "Кино Эротика"}
+      - {id: 77, cat: TV, desc: "Мульт Буржуйский"}
+      - {id: 78, cat: TV, desc: "Мульт Русский"}
+      - {id: 79, cat: TV/Anime, desc: "Мульт Аниме"}
+      - {id: 80, cat: Audio, desc: "Музыка Буржуйская"}
+      - {id: 81, cat: Audio, desc: "Музыка Русская"}
+      - {id: 82, cat: Audio, desc: "Музыка Сборники"}
+      - {id: 83, cat: Audio/Audiobook, desc: "Другое Аудио книги"}
+      - {id: 84, cat: Audio/Video, desc: "Другое Видеоклипы"}
+      - {id: 85, cat: PC/Games, desc: "Другое Игры"}
+      - {id: 86, cat: PC/0day, desc: "Другое Программы"}
+      - {id: 87, cat: Console/Xbox, desc: "Другое XBox"}
+      - {id: 88, cat: Console/PSP, desc: "Другое PSP"}
+      - {id: 89, cat: Books/Magazines, desc: "Другое Журналы"}
+      - {id: 90, cat: Other, desc: "Другое Графика"}
+      - {id: 93, cat: Other, desc: "Другое Библиотека"}
+      - {id: 94, cat: Console/PS3, desc: "Другое PS3"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+    - name: info_search
+      type: info
+      label: "Searching with Season / Episode (S01E01)"
+      default: "The web site does support season/episode searching. To allow some results for Sonarr, these are stripped from the keywords."
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      autologin: 1
+      returnto: "index.php"
+    error:
+      - selector: td.embedded:contains("Ошибка входа")
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      # http://exkinoray.tv/browse.php?search=&incldead=1&cat=0
+      - path: browse.php
+    keywordsfilters:
+      # the site does not support season/episode searching in the title.
+      - name: re_replace # strip S01 
+        args: ["(?i)\\bS0*(\\d+)\\b", ""]
+      - name: re_replace # strip S01E01 
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}"
+      # 0 active 1 incldead 2 onlydead 4 noseeds (isn't this == onlydead?)
+      incldead: 1
+      search: "{{ .Keywords }}"
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
+    rows:
+      selector: table.begins > tbody > tr:has(a[href^="details.php?id="])
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        filters:
+          # Женские секреты (1 сезон: 1-4 серии из 12) Жіночі секрети | 2020 | HDTVRip (720p)
+          # Мандалорец (1 сезон: 1-8 серии из 8) | The Mandalorian | 2019 | WEB-DL (720p)
+          # Война семей (1-14 серии из 20) | 2019 | WEB-DLRip (AVC) 
+          # normalize to SXXEYY format
+          - name: replace
+            args: [" | ", " "]
+          - name: re_replace
+            args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$3 - S$1E$2 - rus $5"]
+          - name: re_replace
+            args: ["\\((?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s([12][0-9]{3})\\s(.*)", "$2 - S1E$1 - rus $4"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: re_replace
+            args: ["\\((\\d+p)\\)", "$1"]
+          - name: re_replace
+            args: [" - ", " "]
+          - name: replace
+            args: ["-Rip", "Rip"]
+          - name: replace
+            args: ["WEB-DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?id="]
+        attribute: href
+      date:
+        selector: td:nth-child(2) i
+        filters:
+          - name: dateparse
+            args: "2006-01-02 15:04:03"
+      files:
+        selector: td:nth-child(3)
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/extremetorrents.yml
+++ b/src/Jackett.Common/Definitions/extremetorrents.yml
@@ -1,4 +1,4 @@
---
+---
  site: extremetorrents
  name: ExtremeTorrents
  description: "ExtremeTorrents is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/extremlymtorrents.yml
+++ b/src/Jackett.Common/Definitions/extremlymtorrents.yml
@@ -1,4 +1,4 @@
---
+---
  site: extremlymtorrents
  name: ExtremlymTorrents
  description: "ExtremlymTorrents is a Semi-Private tracker for MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/fanoin.yml
+++ b/src/Jackett.Common/Definitions/fanoin.yml
@@ -1,4 +1,4 @@
---
+---
  site: fanoin
  name: FANO.IN
  description: "Fano.in is a LATVIAN Private Torrent Tracker for 0DAY / GENERAL"
--- a/src/Jackett.Common/Definitions/fantasticheaven.yml
+++ b/src/Jackett.Common/Definitions/fantasticheaven.yml
@@ -0,0 +1,193 @@
+---
+  site: fantasticheaven
+  name: Fantastic Heaven
+  description: "Fantastic Heaven is a German Time based tracker"
+  language: de-de
+  type: private
+  encoding: UTF-8
+  links:
+    - https://fantastic-heaven.eu/
+
+  caps:
+    categorymappings:
+      - {id: 54, cat: Movies/SD, desc: "kino SD x264/x265"}
+      - {id: 56, cat: Movies/HD, desc: "kino 720p"}
+      - {id: 57, cat: Movies/HD, desc: "kino 1080p"}
+      - {id: 100, cat: Movies/3D, desc: "kino 3D"}
+      - {id: 58, cat: Movies/SD, desc: "Filme SD x264/x265"}
+      - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
+      - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
+      - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
+      - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
+      - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
+      - {id: 63, cat: Movies/HD, desc: "Filme Remux"}
+      - {id: 129, cat: Movies/SD, desc: "Filme Packs SD x264/265"}
+      - {id: 130, cat: Movies/HD, desc: "Filme Packs 720p"}
+      - {id: 131, cat: Movies/HD, desc: "Filme Packs 1080p"}
+      - {id: 64, cat: TV/SD, desc: "Serien SD x264/x265"} 
+      - {id: 65, cat: TV/HD, desc: "Serien 720p"}
+      - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
+      - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
+      - {id: 69, cat: TV/FOREIGN, desc: "Serien Ger-Subbed"}
+      - {id: 70, cat: TV/FOREIGN, desc: "Serien International"}
+      - {id: 76, cat: TV/SD, desc: "Serienpacks SD x264/x265"}
+      - {id: 77, cat: TV/HD, desc: "Serienpacks 720p"}
+      - {id: 78, cat: TV/HD, desc: "Serienpacks 1080p"}
+      - {id: 81, cat: TV/UHD, desc: "Serienpacks 2160p"}
+      - {id: 79, cat: TV/FOREIGN, desc: "Serienpacks Ger-Subbed"}
+      - {id: 80, cat: TV/FOREIGN, desc: "Serienpacks International"}
+      - {id: 115, cat: Movies/SD, desc: "Kids-Filme SD x264/x265"}
+      - {id: 116, cat: Movies/HD, desc: "Kids-Filme 720p"}
+      - {id: 117, cat: Movies/HD, desc: "Kids-Filme 1080p"}
+      - {id: 109, cat: TV/SD, desc: "Kids-Serien SD x264/x265"}
+      - {id: 110, cat: TV/HD, desc: "Kids-Serien 720p"}
+      - {id: 111, cat: TV/HD, desc: "Kids-Serien 1080p"}
+      - {id: 112, cat: TV/SD, desc: "Kids-Serien Packs SD"}
+      - {id: 113, cat: TV/HD, desc: "Kids-Serien Packs 720p"}
+      - {id: 114, cat: TV/HD, desc: "Kids-Serien Packs 1080p"}
+      - {id: 127, cat: TV/FOREIGN, desc: "Kids-Serien International"}
+      - {id: 98, cat: TV/SD, desc: "Tatort SD x264/x265"}
+      - {id: 99, cat: TV/HD, desc: "Tatort 720p"}
+      - {id: 105, cat: TV/SD, desc: "Daily Soaps SD x264/x265"} 
+      - {id: 103, cat: TV/HD, desc: "Daily Soaps 720p"}
+      - {id: 104, cat: TV/HD, desc: "Daily Soaps 1080p"}
+      - {id: 106, cat: TV/Documentary, desc: "Dokus SD x264/x265"} 
+      - {id: 107, cat: TV/Documentary, desc: "Dokus 720p"}
+      - {id: 108, cat: TV/Documentary, desc: "Dokus 1080p"}
+      - {id: 83, cat: Movies/SD, desc: "TV-Filme SD x264/x265"} 
+      - {id: 84, cat: Movies/HD, desc: "TV-Filme 720p"}
+      - {id: 85, cat: Movies/HD, desc: "TV-Filme 1080p"}
+      - {id: 86, cat: TV/SD, desc: "TV-Shows SD x264/x265"} 
+      - {id: 87, cat: TV/HD, desc: "TV-Shows 720p"}
+      - {id: 88, cat: TV/HD, desc: "TV-Shows 1080p"}
+      - {id: 118, cat: TV/Sport, desc: "SportSD x264/x265"}
+      - {id: 119, cat: TV/Sport, desc: "Sport720p"} 
+      - {id: 120, cat: TV/Sport, desc: "Sport1080p"}
+      - {id: 122, cat: TV/Sport, desc: "Sport2160p"}
+      - {id: 121, cat: TV/Sport, desc: "SportInternational"}
+      - {id: 82, cat: Audio/Audiobook, desc: "Audio Audiobooks"}
+      - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
+      - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
+      - {id: 135, cat: Audio/Lossless, desc: "Audio WAV"}
+      - {id: 73, cat: Audio/MP3, desc: "Audio MP3 Packs"}
+      - {id: 74, cat: Audio/Lossless, desc: "Audio Flac Packs"}
+      - {id: 128, cat: Audio, desc: "Audio Kids"}
+      - {id: 75, cat: Audio/Video, desc: "Audio Musikvideo"}
+      - {id: 123, cat: PC, desc: "Software Windows"} 
+      - {id: 124, cat: PC, desc: "Software Linux"}
+      - {id: 125, cat: PC/Phone-Android, desc: "Software Android"}
+      - {id: 126, cat: PC/Mac, desc: "Software MacOS"}
+      - {id: 132, cat: PC/Games, desc: "Spiele Windows"} 
+      - {id: 133, cat: PC/Mac, desc: "Spiele MacOS"}
+      - {id: 134, cat: Console, desc: "Spiele Nintendo"}
+      - {id: 90, cat: Books/Magazines, desc: "Diverses Zeitschriften"} 
+      - {id: 89, cat: Books/Ebook, desc: "Diverses E-Books"}
+      - {id: 91, cat: XXX/x264, desc: "XXX SD x264/x265"} 
+      - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
+      - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
+      - {id: 95, cat: XXX/Packs, desc: "XXX Packs SD"}
+      - {id: 96, cat: XXX/Packs, desc: "XXX Packs HD"}
+      - {id: 94, cat: XXX/Imageset, desc: "XXX Magazine"}
+      - {id: 97, cat: XXX/Imageset, desc: "XXX Pics"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "added"
+      options:
+        "added": "created"
+        "seeds": "seeders"
+        "size": "size"
+        "name": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
+  login:
+    path: login.php
+    method: form
+    form: form[action="/login.php"]
+    cookies: ["JAVA=OK"] # avoid jscheck redirect
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+      loggiin: "einloggen"
+      
+    test:
+      path: index.php
+      selector: a[href="logout.php"]
+
+  search:
+    paths:
+      - path: selection.php
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{else}}{{end}}"
+      search: "{{ .Keywords }}"
+      blah: 0
+      orderby: "{{ .Config.sort }}"
+      sort: "{{ .Config.type }}"
+
+    rows:
+      selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
+
+    fields:
+      title:
+        selector: a[href^="details.php?id="]
+      category:
+        selector: a[href^="selection.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+          - name: replace
+            args: ["#2", ""]
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="download.php?torrent="]
+        attribute: href
+      grabs:
+        selector: div.selection_unter_ae
+        filters:
+          - name: replace
+            args: [" x", ""]
+      size:
+        selector: div.selection_unter_ad
+        filters:
+          - name: replace
+            args: [",", "."]
+      seeders:
+        selector: div.selection_unter_aa > b
+      leechers:
+        selector: div.selection_unter_aaa > b
+      date:
+        selector: div.selection_unter_ab
+        filters:
+          - name: append
+            args: " +01:00"
+          - name: replace
+            args: ["um ", ""]
+          - name: dateparse
+            args: "02.01.2006 15:04:05 -07:00"
+      downloadvolumefactor:
+        text: 1
+      uploadvolumefactor:
+        text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/feedurneed.yml
+++ b/src/Jackett.Common/Definitions/feedurneed.yml
@@ -1,4 +1,4 @@
---
+---
  site: feedurneed
  name: FeedUrNeed
  description: "FeedUrNeed (FuN) is a ratioless Private Torrent Tracker for MOVIES / TV"
--- a/src/Jackett.Common/Definitions/filebase.yml
+++ b/src/Jackett.Common/Definitions/filebase.yml
@@ -1,4 +1,4 @@
---
+---
  site: filebase
  name: Filebase
  description: "Filebase is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
@@ -6,7 +6,7 @@
  type: public
  encoding: UTF-8
  links:
-    - http://www.filebase.ws/
+    - http://www.filebase.ws/ # https is not supported

  caps:
    categorymappings:
@@ -173,8 +173,6 @@
        attribute: href
      download:
        text: "{{ .Config.sitelink }}download.php?id={{ .Result.torrent_id }}"
-        filters:
-          - name: strdump
      date:
        selector: td:nth-child(4)
        filters:
--- a/src/Jackett.Common/Definitions/film-paleis.yml
+++ b/src/Jackett.Common/Definitions/film-paleis.yml
@@ -1,4 +1,4 @@
---
+---
  site: film-paleis
  name: Film-Paleis
  description: "Film-Paleis is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/filmsclub.yml
+++ b/src/Jackett.Common/Definitions/filmsclub.yml
@@ -0,0 +1,166 @@
+---
+  site: filmsclub
+  name: FilmsClub
+  description: "FilmsClub is a RUSSIAN Semi-Private Torrent Tracker for MOVIES / TV"
+  language: ru-ru
+  type: semi-private
+  encoding: UTF-8
+  links:
+    - https://films.club/
+
+  caps:
+    categorymappings:
+      - {id: 1, cat: Movies, desc: "Зарубежное кино (Foreign cinema)"}
+      - {id: 2, cat: Movies, desc: "Российское кино (Russian cinema)"}
+      - {id: 3, cat: TV, desc: "Сериалы (Series)"}
+      - {id: 4, cat: TV/Documentary, desc: "Документальное кино (Docs)"}
+      - {id: 5, cat: TV/Anime, desc: "Аниме (Anime)"}
+      - {id: 6, cat: TV, desc: "Мультфильмы (Cartoons)"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: striprussian
+      type: checkbox
+      label: Strip Russian Letters
+      default: false
+    - name: stripyear
+      type: checkbox
+      label: Strip the Year from the Title
+      default: false
+    - name: addtvshows
+      type: checkbox
+      label: Add (TVShows) to TV titles
+      default: false
+    - name: info_search
+      type: info
+      label: "Searching with Season / Episode (S01E01)"
+      default: "The web site does support season/episode searching as they are not part of the title. To allow some results for Sonarr, these are stripped from the keywords."
+
+  login:
+    path: /
+    method: form
+    form: form#enterForm
+    submitpath: login/
+    inputs:
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: div.error
+    test:
+      path: /
+      selector: div.user-login
+
+  search:
+    paths:
+      # https://films.club/torrent/list/?f=0&name=mandalorian&description=&year=&page_size=100
+      # https://films.club/torrent/list/?f=0&name=&description=&year=&category=1&category=2&category=3&category=4&category=5&category=6
+      - path: torrent/list/
+    keywordsfilters:
+      # the site does not support season/episode searching in the title, they are not part of title. searching description for them does not work either.
+      - name: re_replace # strip S01
+        args: ["(?i)\\bS0*(\\d+)\\b", ""]
+      - name: re_replace # strip S01E01
+        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""]
+    inputs:
+      $raw: "{{ if .Categories }}{{ range .Categories }}category={{.}}&{{end}}{{else}}{{end}}"
+      f: 0
+      page_size: 100
+      name: "{{ .Keywords }}"
+      description: ""
+      year: ""
+
+    rows:
+      selector: table.torrents-table > tbody > tr
+
+    fields:
+      category:
+        selector: td.category
+        case:
+          "div:contains(\"Зарубежное\")": 1
+          "div:contains(\"Российское\")": 2
+          "div:contains(\"Сериалы\")": 3
+          "div:contains(\"Документальное \")": 4
+          "div:contains(\"Аниме\")": 5
+          "div:contains(\"Мультфильмы\")": 6
+
+      title_with_year:
+        selector: a[href^="/torrent/"]
+        filters:
+          # try to reorder TV title for Sonarr: name year source quality season/episode -> name year season/episode source quality
+          - name: re_replace
+            args: ["[\\:\\-\\/\\|,\\s]", " "]
+          - name: re_replace
+            args: ["(.*)(\\([1|2][0-9]{3}\\))(.*)([CСcс]езон.*)", "$1$2$4$3"]
+          # normalize to SXXEYY format
+          - name: re_replace
+            args: ["(.*)[CСcс]езон +(\\d+).+[CСcс]ери[ия] +(\\d+) +(\\d+) +из +\\d+(.*)", "$1 S$2E$3-$4 rus {{ if .Config.addtvshows }}(TVShows) {{else}}{{end}}$5"]
+          - name: re_replace
+            args: ["(.*)[CСcс]езон +(\\d+)(.*)", "$1 S$2 rus $3"]
+          - name: re_replace
+            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
+          - name: replace
+            args: [" Rip", "Rip"]
+          - name: replace
+            args: ["Blu Ray", "Bluray"]
+          - name: replace
+            args: ["WEB DL", "WEBDL"]
+          - name: replace
+            args: ["WEBDLRip", "WEBDL"]
+          - name: replace
+            args: ["WEBRip", "WEBDL"]
+          - name: replace
+            args: ["HDTVRip", "HDTV"]
+      title_without_year:
+        text: "{{ re_replace .Result.title_with_year \"\\([1|2][0-9]{3}\\)\" \"\" }}"
+      title:
+        text: "{{ if .Config.stripyear }}{{ .Result.title_without_year }}{{else}}{{ .Result.title_with_year }}{{end}}"
+      details:
+        selector: a[href^="/torrent/"]
+        attribute: href
+      download:
+        selector: a[href$="/download/"]
+        attribute: href
+      banner:
+        selector: td.image div img
+        attribute: src
+      date:
+        selector: div.added
+        filters:
+          - name: regexp
+            args: "Добавлено:(.+?)$"
+          - name: dateparse
+            args: "02.01.2006, 15:04"
+      size:
+        selector: td.size
+        filters:
+          - name: replace
+            args: [",", "."]
+          - name: replace
+            args: ["ТБ", "TB"]
+          - name: replace
+            args: ["ГБ", "GB"]
+          - name: replace
+            args: ["МБ", "MB"]
+          - name: replace
+            args: ["КБ", "KB"]
+      seeders:
+        selector: td.peers span.up
+      leechers:
+        selector: td.peers span.down
+      grabs:
+        selector: td.stat
+      downloadvolumefactor:
+        text: 0
+      uploadvolumefactor:
+        text: 1
+# engine n/a
--- a/src/Jackett.Common/Definitions/finvip.yml
+++ b/src/Jackett.Common/Definitions/finvip.yml
@@ -1,4 +1,4 @@
---
+---
  site: finvip
  name: FinVip
  description: "FinVip is a FINNISH Private Torrent Tracker for MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/fullmixmusic.yml
+++ b/src/Jackett.Common/Definitions/fullmixmusic.yml
@@ -1,4 +1,4 @@
---
+---
  site: fullmixmusic
  name: FullMixMusic
  description: "FullMixMusic is a HUNGARIAN Private Torrent Tracker for MUSIC"
--- a/src/Jackett.Common/Definitions/galeriens.yml
+++ b/src/Jackett.Common/Definitions/galeriens.yml
@@ -1,4 +1,4 @@
---
+---
  site: galeriens
  name: Galeriens
  description: "Galeriens is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
@@ -314,4 +314,4 @@
      uploadvolumefactor:
        case:
          "*": "1"
-# TT3.00 FRENCH
+# TT3.00 FRENCH
--- a/src/Jackett.Common/Definitions/gaytorrentru.yml
+++ b/src/Jackett.Common/Definitions/gaytorrentru.yml
@@ -139,4 +139,4 @@
          "*": 1
      uploadvolumefactor:
        case:
-          "*": 1
+          "*": 1
--- a/src/Jackett.Common/Definitions/generationfree.yml
+++ b/src/Jackett.Common/Definitions/generationfree.yml
@@ -1,4 +1,4 @@
---
+---
  site: generationfree
  name: Generation-Free
  description: "Generation-Free is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
@@ -162,10 +162,10 @@
    path: account-login.php
    method: post
    inputs:
-      username: "{{ .Config.username }}"
+      login_name: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
    error:
-    - selector: td.tboxhead
+    - selector: td#msgError
    test:
      path: index.php
      selector: a[href="account-logout.php"]
--- a/src/Jackett.Common/Definitions/gfxpeers.yml
+++ b/src/Jackett.Common/Definitions/gfxpeers.yml
@@ -1,4 +1,4 @@
---
+---
  site: gfxpeers
  name: GFXPeers
  description: "GFXPeers is a ratio-based torrent tracker for all things graphic design and visual effects"
--- a/src/Jackett.Common/Definitions/gigatorrents.yml
+++ b/src/Jackett.Common/Definitions/gigatorrents.yml
@@ -1,4 +1,4 @@
---
+---
  site: gigatorrents
  name: GigaTorrents
  description: "Giga Torrents is a Hungarian Private site for TV / MOVIES / GENERAL"
--- a/src/Jackett.Common/Definitions/glodls.yml
+++ b/src/Jackett.Common/Definitions/glodls.yml
@@ -1,4 +1,4 @@
---
+---
  site: glodls
  name: GloDLS
  description: "GloDLS is a Public Torrent Tracker for MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/hamsterstudio.yml
+++ b/src/Jackett.Common/Definitions/hamsterstudio.yml
@@ -1,4 +1,4 @@
---
+---
  site: hamsterstudio
  name: HamsterStudio
  description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
--- a/src/Jackett.Common/Definitions/hdarea.yml
+++ b/src/Jackett.Common/Definitions/hdarea.yml
@@ -10,6 +10,7 @@

  caps:
    categorymappings:
+      - {id: 300, cat: Movies/UHD, desc: "Movies UHD-4K"}
      - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
      - {id: 415, cat: Movies/HD, desc: "Movies REMUX"}
      - {id: 416, cat: Movies/3D, desc: "Movies 3D"}
@@ -33,6 +34,30 @@
      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: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
+
  login:
    path: takelogin.php
    method: post
@@ -40,9 +65,11 @@
      username: "{{ .Config.username }}"
      password: "{{ .Config.password }}"
    error:
+      - selector: td.embedded:has(h2:contains("登录失败"))
      - selector: td.embedded:has(h2:contains("failed"))
    test:
-      path: torrents.php
+      path: index.php
+      selector: a[href="logout.php"]

  ratio:
    path: torrents.php
@@ -57,47 +84,71 @@
    method: post
    inputs:
      $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBIDShort }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 incldead 1 active 2 onlydead
      incldead: 1
+      # 0 all 1 normal 2 free 2 2x 4 2xFree 5 50% 6 2x50% 7 30%
+      spstate: 0
+      # 0 title 1 descr 3 uploaded 4 imdburl
+      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 AND 1 OR 2 Exact
+      search_mode: 0
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"

    rows:
      selector: table.torrents > tbody > tr:has(table.torrentname)

    fields:
-      title:
-        selector: a[href^="details.php?id="]
-      title:
-        optional: true
-        selector: a[title][href^="details.php?id="]
-        attribute: title
      category:
        selector: a[href^="?cat="]
        attribute: href
        filters:
          - name: querystring
            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+      title:
+        optional: true
+        selector: a[title][href^="details.php?id="]
+        attribute: title
      details:
        selector: a[href^="details.php?id="]
        attribute: href    
      download:
        selector: a[href^="download.php?id="]
        attribute: href
-      size:
-        selector: td:nth-child(5)
-      grabs:
-        selector: td:nth-child(8)
-      seeders:
-        selector: td:nth-child(6)
-      leechers:
-        selector: td:nth-child(7)
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
      date:
+        # time type: time elapsed (default)
        selector: td:nth-child(4) > span[title]
        attribute: title
+        optional: true
        filters:
          - name: append
            args: " +08:00"
          - name: dateparse
            args: "2006-01-02 15:04:05 -07:00"
+      date:
+        # time added
+        selector: td:nth-child(4):not(:has(span))
+        optional: true
+        filters:
+          - name: append
+            args: " +08:00"
+          - name: dateparse
+            args: "2006-01-0215:04:05 -07:00"
+      size:
+        selector: td:nth-child(5)
+      seeders:
+        selector: td:nth-child(6)
+      leechers:
+        selector: td:nth-child(7)
+      grabs:
+        selector: td:nth-child(8)
      downloadvolumefactor:
        case:
          img.pro_free: 0
@@ -115,4 +166,4 @@
      description:
        selector: td:nth-child(2)
        remove: a, img
-# NexusPHP tbc
+# NexusPHP Standard v1.5 Beta 4
--- a/src/Jackett.Common/Definitions/hdbits.yml
+++ b/src/Jackett.Common/Definitions/hdbits.yml
@@ -78,4 +78,4 @@
          "*": "1"
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/hdcenter.yml
+++ b/src/Jackett.Common/Definitions/hdcenter.yml
@@ -102,4 +102,4 @@
          "*": "1"
      uploadvolumefactor:
        case:
-          "*": "1"
+          "*": "1"
--- a/src/Jackett.Common/Definitions/hdchina.yml
+++ b/src/Jackett.Common/Definitions/hdchina.yml
@@ -1,4 +1,4 @@
---
+---
  site: hdchina
  name: HDChina
  description: "HDChina (HDWing) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
--- a/src/Jackett.Common/Definitions/hdhome.yml
+++ b/src/Jackett.Common/Definitions/hdhome.yml
@@ -1,4 +1,4 @@
---
+---
  site: hdhome
  name: HDHome
  description: "HDHome (HDBiger) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
--- a/src/Jackett.Common/Definitions/hdreactor.yml
+++ b/src/Jackett.Common/Definitions/hdreactor.yml
@@ -1,4 +1,4 @@
---
+---
  site: hdreactor
  name: HDReactor
  description: "HDReactor is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
--- a/src/Jackett.Common/Definitions/hdroute.yml
+++ b/src/Jackett.Common/Definitions/hdroute.yml
@@ -1,4 +1,4 @@
---
+---
  site: hdroute
  name: HDRoute
  description: "HDRoute is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
--- a/src/Jackett.Common/Definitions/hdsky.yml
+++ b/src/Jackett.Common/Definitions/hdsky.yml
@@ -1,4 +1,4 @@
---
+---
  site: hdsky
  name: HDSky
  description: "HDSky is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
--- a/src/Jackett.Common/Definitions/hdtime.yml
+++ b/src/Jackett.Common/Definitions/hdtime.yml
@@ -1,4 +1,4 @@
---
+---
  site: hdtime
  name: HDtime
  description: "HDtime is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
--- a/src/Jackett.Common/Definitions/hqsource.yml
+++ b/src/Jackett.Common/Definitions/hqsource.yml
@@ -127,4 +127,4 @@
      uploadvolumefactor:
        case:
          "img[src=\"pic/double.png\"]": 2
-          "*": 1
+          "*": 1
--- a/src/Jackett.Common/Definitions/icetorrent.yml
+++ b/src/Jackett.Common/Definitions/icetorrent.yml
@@ -1,4 +1,4 @@
---
+---
  site: icetorrent
  name: ICE Torrent
  description: "ICE Torrent is a ratioless ROMANIAN Private Torrent Tracker for 0DAY / GENERAL"
@@ -111,7 +111,7 @@
 #      ord: "{{ .Config.type }}"

    rows:
-      selector: table.table-striped > tbody > tr:has(a[href^="details.php?id="])
+      selector: table.table-striped > tbody > tr:has(a[href^="/details.php?id="])

    fields:
      category:
@@ -121,9 +121,9 @@
          - name: querystring
            args: cat
      title:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="/details.php?id="]
      details:
-        selector: a[href^="details.php?id="]
+        selector: a[href^="/details.php?id="]
        attribute: href
      banner:
        attribute: rel
@@ -132,7 +132,7 @@
        optional: true
        attribute: href
      download:
-        selector: a[href^="download.php"]
+        selector: a[href^="/download.php"]
        attribute: href
      files:
        selector: a[href$="#filelist"]
--- a/src/Jackett.Common/Definitions/ilcorsaroblu.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaroblu.yml
@@ -1,9 +1,9 @@
 ---
  site: ilcorsaroblu
  name: Il Corsaro Blu
-  description: "Il Corsaro Blu is an ITALIAN Public site for TV / MOVIES / GENERAL"
+  description: "il CorSaRo Blu is an ITALIAN Semi-Private site for TV / MOVIES / GENERAL"
  language: it-it
-  type: public
+  type: semi-private
  encoding: UTF-8
  links:
    - https://www.ilcorsaroblu.org/
@@ -71,7 +71,46 @@
      tv-search: [q, season, ep]
      movie-search: [q]

-  settings: []
+  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"
+    - name: info
+      type: info
+      label: Results Per Page
+      default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+  login:
+    path: index.php?page=login&returnto=index.php
+    method: form
+    form: form[name="login"]
+    inputs:
+      uid: "{{ .Config.username }}"
+      pwd: "{{ .Config.password }}"
+    error:
+      - selector: span[style="color:#FF0000;"]
+    test:
+      path: index.php
+      selector: a[href="logout.php"]

  search:
    paths:
@@ -83,11 +122,17 @@
        args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
      - name: re_replace # S01E01 to 1 1
        args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
+    #  https://www.ilcorsaroblu.org/index.php?page=torrents&search=&category=0&options=0&active=0
    inputs:
-      search: "{{ .Keywords }}"
-      category: "{{ range .Categories }}{{.}};{{end}}"
      page: torrents
+      search: "{{ .Keywords }}"
+      category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{else}}0{{end}}"
+      # 0 title 1 title & descr 2 descr 3 uploaders 5 gold 6 silver 7 bronze
+      options: 0
+      # 0 all 1 activeonly 2 deadonly
      active: 0
+      order: "{{ .Config.sort }}"
+      by: "{{ .Config.type }}"

    rows:
      selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
@@ -150,7 +195,7 @@
          - name: append
            args: "&dn={{ .Result._magnetfilename }}.torrent"
          - name: append
-            args: "&tr=udp://tracker.openbittorrent.com:80/announce&tr=udp://tracker.opentrackr.org:1337/announce" 
+            args: "&tr=udp://tracker.openbittorrent.com:80/announce&tr=udp://tracker.opentrackr.org:1337/announce"
      magnet:
        optional: true
        selector: a[href^="magnet:?xt="]
@@ -187,7 +232,11 @@
      leechers:
        selector: td:nth-last-child(5)
      downloadvolumefactor:
-        text: 0
+        case:
+          img[src="images/gold.gif"]: 0
+          img[src="images/silver.gif"]: 0.5
+          img[src="images/bronze.gif"]: 0.75
+          "*": 1
      uploadvolumefactor:
        text: 1
-# engine n/a
+# xbtit
--- a/src/Jackett.Common/Definitions/ilcorsaronero.yml
+++ b/src/Jackett.Common/Definitions/ilcorsaronero.yml
@@ -6,7 +6,7 @@
  type: public
  encoding: Windows-1252
  links:
-    - https://ilcorsaronero.pizza/
+    - https://ilcorsaronero.pw/
    - https://ilcorsaronero.fun/
    - https://ilcorsaronero.pro/
  legacylinks:
@@ -15,6 +15,7 @@
    - https://ilcorsaronero.info/
    - https://ilcorsaronero.ch/
    - https://ilcorsaronero.cc/
+    - https://ilcorsaronero.pizza/

  caps:
    categorymappings:
--- a/src/Jackett.Common/Definitions/inperil.yml
+++ b/src/Jackett.Common/Definitions/inperil.yml
@@ -1,4 +1,4 @@
---
+---
  site: inperil
  name: inPeril
  description: "InPeril is a LATVIAN Private Torrent Tracker for 0DAY / GENERAL"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Garfield69	905a52a82b	pornorip: andmatch	2020-03-07 17:47:28 +13:00
Garfield69	86fd318211	add pornorip a 3x site. resolves #7524	2020-03-07 17:43:33 +13:00
Garfield69	e66beb64f4	add pornotor a 3x site. resolves #7523	2020-03-07 16:20:03 +13:00
Garfield69	4b507a3cbb	add torrentrex a public search engine. resolves #7515	2020-03-07 15:09:10 +13:00
junglebus	5033171c54	azure-pipeline: Add debug logging (#7541 ) Hopefully will help with github publish failures, quite a few debug statements there... https://github.com/microsoft/azure-pipelines-tasks/blob/master/Tasks/GitHubReleaseV0/operations/Action.ts	2020-03-07 14:51:06 +13:00
Garfield69	8faf1c94dc	ccfbits: add imdb support. #4859 also add config sort options update ULVF add engine tag	2020-03-07 12:55:48 +13:00
Garfield69	d05ad1ccb5	ilcorsaroblu: now semi-private resolves #7528	2020-03-07 09:54:41 +13:00
Cory	9a1562ef8b	readme: Sort trackers alphabetically (#7537 )	2020-03-07 09:53:34 +13:00
Garfield69	b5aee501e2	legittorrents: add missing sort	2020-03-07 09:49:09 +13:00
Cory	dc9519c451	XtremeZone: add imdb search support (#7536 ) resolves #7520	2020-03-07 07:41:31 +13:00
fnk93	692d006078	Torrent-Explosiv: Remove [Group Tag] in title (#7532 )	2020-03-07 07:35:33 +13:00
Cory	7aac4fcfcb	TorrentBytes: fix title bug (#7529 ) resolves #7527	2020-03-07 07:35:10 +13:00
Garfield69	81e5589707	filmsclub: optional (TVShows) label for tv titles. #7289	2020-03-06 20:51:46 +13:00
Cory	c36e3356e2	PassThePopcorn: Fix Freeleech check (#7522 ) resolves #6951	2020-03-06 19:03:42 +13:00
fnk93	d477f01f84	Speedtorrent Reloaded: Update to new tracker source (#7519 ) resolves #7517	2020-03-06 17:25:28 +13:00
Cory	d080c4a2ac	Fuzer: Fix parse error (#7521 ) resolves #7502	2020-03-06 17:21:28 +13:00
Garfield69	6252c73cf2	xtremezone: new layout et.al. resolves #7520 also add missing cats add config sort options add imdb support #4859	2020-03-06 17:13:31 +13:00
Cory	3f9d182083	core: Remove warning suppression (#7513 )	2020-03-06 14:57:59 +13:00
Garfield69	0cabbd68c5	spiritofevolution: fix login. resolves #7512	2020-03-06 14:35:03 +13:00
Garfield69	c42027842b	downloadville: add cat 95	2020-03-06 14:34:18 +13:00
Garfield69	66b433bde1	torrentdownloads: drop .me domain	2020-03-05 20:01:01 +13:00
garfield69	ae303a5d4e	Fix parse errors in Fuzer and Hebits (#7506 ) resolves #7502	2020-03-05 19:45:27 +13:00
Garfield69	ca19d2219e	pornolab: add new categories	2020-03-05 19:44:22 +13:00
Garfield69	28a85d6426	add spiritofrevolution a Private German site. resolves #7503	2020-03-05 17:37:08 +13:00
Garfield69	bd1d95ade5	filmsclub: massage TV titles for sonarr. #7289	2020-03-05 13:32:31 +13:00
Garfield69	6634c5a036	ilcorsaronero: new domain .pw	2020-03-05 12:58:06 +13:00
Garfield69	cc671dfab5	btdb: download can be missing. resolves #7508	2020-03-05 12:53:32 +13:00
Garfield69	dccdd89299	cinemageddon: switch to https #7221	2020-03-05 12:12:00 +13:00
Garfield69	c23370b5fc	limetorrents: drop .zone as an alternate domain. #7496	2020-03-05 09:08:28 +13:00
garfield69	d53a0ae4b9	Fix parse errors with Shazbat (#7493 ) resolves #7492	2020-03-05 08:00:06 +13:00
Garfield69	4e8c52e16a	uniondht: fix typo category wiiware #7409	2020-03-05 07:38:45 +13:00
Garfield69	eaae440c66	add xxxtor a Russian public 3x site. resolves #7471	2020-03-05 07:06:22 +13:00
Garfield69	c7e288a372	add KinoNaVse100 a Russian Semi-rpivate site. resolves #7425	2020-03-04 19:19:40 +13:00
Garfield69	a8375e8cfe	add uniondht a Public Russian site. resolves #7409	2020-03-04 16:00:12 +13:00
Garfield69	4ed5507e4d	audiobooktorrents: add info about unread PM. resolves #7422 fix files selector add engine tag	2020-03-04 11:01:00 +13:00
Diego Heras	682304d186	animetosho: change feed url. resolves #7456 (#7487 )	2020-03-04 10:06:02 +13:00
Garfield69	1455a905f1	elitetorrent-biz: new domain .nl resolves #7486	2020-03-04 09:38:25 +13:00
Diego Heras	64f066839d	TorrentSyndikat: fix error caused by #7386 Resolves #7481 (#7485 )	2020-03-04 09:35:13 +13:00
Diego Heras	cf676b4a3f	SceneTime: fix error caused by #7394 Resolves #7475 (#7484 )	2020-03-04 09:16:11 +13:00
Diego Heras	8bd74a2cc9	Filelist: fix error caused by #7360 and added grabs. Resolves #7474 (#7483 )	2020-03-04 09:15:07 +13:00
Garfield69	77837b7483	filmclub: optional config to strip year from title. #7289	2020-03-04 08:40:52 +13:00
Garfield69	96e5e259e9	lechaudron: fix download link. #5559	2020-03-04 07:29:56 +13:00
Diego Heras	6999410617	core: fix file permissions (#7479 )	2020-03-03 10:29:01 -06:00
Diego Heras	e55e92f9ac	Core: Fix line endings to match style guide(#7476 )	2020-03-03 10:28:26 -06:00
Garfield69	4710fa619c	add linuxtracker a public repo for linux iso. resolves #7407	2020-03-03 16:41:11 +13:00
Diego Heras	61f9bec045	FunFile: fix error caused by #7369 Resolves #7451 (#7472 )	2020-03-03 11:24:37 +13:00
Garfield69	318e8722db	restore lechaudron, its back. resolves #5559	2020-03-03 11:19:32 +13:00
Diego Heras	86ce7ef1c8	Bit-City: fix error caused by #7357 Resolves #7459 (#7468 )	2020-03-03 10:47:08 +13:00
Diego Heras	0997bf674a	ImmortalSeed: fix error caused by #7375 Resolves #7461 (#7464 )	2020-03-03 10:45:26 +13:00
Diego Heras	c07c4f0682	Ncore: fix error caused by #7378 Resolves #7444 (#7470 )	2020-03-03 10:34:46 +13:00
Cory	1563418d88	Gimmepeers: Fix invalid CSS selector caused by #7371 (#7460 ) resolves #7457	2020-03-03 08:09:12 +13:00
fnk93	771c0ac68c	Add Fantastic Heaven a German private site. (#7449 )	2020-03-03 07:54:40 +13:00
Diego Heras	143ffbf790	HD-Torrents: fix error caused by #7373 Resolves #7426 (#7458 )	2020-03-03 07:46:19 +13:00
Garfield69	a3f30a2dd9	newrealworld: fix parse errors caused by #7393	2020-03-02 20:54:41 +13:00
Garfield69	a9d3ae0107	torrentbytes: fix possible parse error caused by #7388	2020-03-02 20:49:59 +13:00
Garfield69	012f3d1bbc	torrentheaven: fix parse errors caused by #7387	2020-03-02 20:45:31 +13:00
Garfield69	9826e2c2af	myamity: fix parse errors caused by #7377	2020-03-02 20:40:09 +13:00
Garfield69	a512ea37c3	hdtorrents: imdb can be missing. fix #7373	2020-03-02 20:33:21 +13:00
Cory	3aedbc7baf	Ncore: Fix parse errors caused by #7378 Resolves #7444 (#7445 )	2020-03-02 18:46:08 +13:00
Garfield69	b32257ae95	add academictorrents a public site. resolves #7405	2020-03-02 18:15:35 +13:00
Cory	6c1c4092bd	Fix null reference after conversion to AngleSharp (#7443 ) resolves #7442	2020-03-02 15:20:13 +13:00
Diego Heras	758138415e	funfile: fix error caused by #7369 Resolves #7436 (#7440 )	2020-03-02 12:28:45 +13:00
fnk93	b9a6c7c810	The Resurrection: Tracker closed down (#7439 ) #7174	2020-03-02 09:54:09 +13:00
Garfield69	dda62f1e18	add onejav a public Asian 3x site. resolves #7345	2020-03-02 09:43:40 +13:00
Garfield69	8fcb19e1ea	nordichd: gome. removed. resolves #6708	2020-03-02 08:36:50 +13:00
Garfield69	66e7ced25b	scenexpress: gone. removed. resolves #6859	2020-03-02 08:34:53 +13:00
Diego Heras	5f1848d1de	bakabt: fix error caused by #7355 Resolves #7420 (#7434 )	2020-03-02 08:05:44 +13:00
Christian Franchin	1f9c760246	bjshare: multiple improvements (#7432 ) Add details to release when its from the last 24h list; change cat4 to PCGames; Changed category parsing on 24h list; Added parsing from 4K to 2160p	2020-03-02 08:05:17 +13:00
Diego Heras	3f19e6becf	ncore: fix error caused by #7378 Resolves #7430 (#7431 )	2020-03-02 08:02:25 +13:00
Diego Heras	130c0bebbe	divxtotal: fix download links and row parsing (#7423 )	2020-03-02 08:01:59 +13:00
Diego Heras	b944993733	Remove CsQuery and use AngleSharp instead. Closes #7292 (#7404 )	2020-03-02 07:58:14 +13:00
Garfield69	542f8d67e4	torrentleech-pl: andmatch resolves #7424	2020-03-02 07:49:31 +13:00
Diego Heras	35f9e0fbe0	Convert Nordicbits to AngleSharp (#7401 )	2020-03-01 19:45:17 +13:00
Diego Heras	db669b31a1	Convert Nordbits to AngleSharp (#7402 )	2020-03-01 19:16:15 +13:00
Garfield69	1b64476102	icetorrent: site's hrefs now prefixed with /	2020-03-01 17:22:21 +13:00
Garfield69	5530fa1ca4	crazycorner: magnets no longer available on primary results page.	2020-03-01 17:05:28 +13:00
junglebus	1fb77a6334	Package update (#7413 ) All packages except Automapper are now on latest versions	2020-03-01 15:58:46 +13:00
Garfield69	175249d6f0	custom.js: occured -> occurred #7414	2020-03-01 15:52:32 +13:00
Garfield69	f59f73e228	mypornclub: handle date "last year" "last month"	2020-03-01 15:29:44 +13:00
Diego Heras	c1b2328bbf	Convert Abnormal to AngleSharp (#7403 )	2020-03-01 14:46:34 +13:00
ilike2burnthing	a3c1f3eb52	BTSOW: New Domain btsow.club (#7410 ) resolves #7280	2020-03-01 12:34:27 +13:00
Cory	f238e78337	Convert Shazbat to AngleSharp (#7400 )	2020-03-01 12:27:09 +13:00
Cory	fd8823f6bd	Convert XSpeeds to AngleSharp (#7398 )	2020-03-01 12:26:46 +13:00
Diego Heras	c14ee124f5	Convert SceneTime to AngleSharp (#7394 )	2020-03-01 12:07:41 +13:00
Diego Heras	f4d45517c5	Convert NewRealWorld to AngleSharp (#7393 )	2020-03-01 12:07:18 +13:00
Diego Heras	091cfbb310	Convert Pretome to AngleSharp (#7392 )	2020-03-01 12:06:58 +13:00
Diego Heras	698050e86a	Convert RevolutionTT to AngleSharp (#7391 )	2020-03-01 09:38:53 +13:00
Diego Heras	bb3faa3f62	Convert Partis to AngleSharp (#7390 )	2020-03-01 09:30:07 +13:00
Diego Heras	08a68e0116	Convert SpeedCD to AngleSharp (#7389 )	2020-03-01 09:29:51 +13:00
Diego Heras	d22ef13fb2	Convert TorrentBytes to AngleSharp (#7388 )	2020-03-01 09:29:35 +13:00
Diego Heras	d5e2014233	Convert TorrentSyndikat to AngleSharp (#7386 )	2020-03-01 08:43:12 +13:00
Diego Heras	dd52a16bff	Convert TorrentHaven to AngleSharp (#7387 )	2020-03-01 08:42:31 +13:00
Diego Heras	a697aba985	Convert TVStore to AngleSharp (#7385 )	2020-03-01 08:42:11 +13:00
Diego Heras	1533ad1927	Convert TorrentLeech to AngleSharp (#7384 )	2020-03-01 08:23:09 +13:00
Diego Heras	348461ebfc	Convert TorrentDay to AngleSharp (#7383 )	2020-03-01 08:22:29 +13:00
Diego Heras	b83a984365	Convert PirateTheNet to AngleSharp (#7382 )	2020-03-01 08:20:15 +13:00
junglebus	b07d1a32ca	readme: Remove appveyor badge (#7380 )	2020-03-01 08:09:55 +13:00
Cory	e3bb63aac4	Convert NCore to AngleSharp (#7378 )	2020-03-01 08:03:51 +13:00
Cory	65fc651d88	Convert myAmity to AngleSharp (#7377 )	2020-03-01 08:03:13 +13:00
Cory	218e0c989c	Convert MoreThanTV to AngleSharp (#7376 )	2020-03-01 07:53:36 +13:00
Cory	6f252254e3	Convert ImmortalSeed to AngleSharp (#7375 )	2020-03-01 07:53:04 +13:00
Cory	977052dfd7	Convert Hebits to AngleSharp (#7374 )	2020-03-01 07:52:35 +13:00
Cory	b78d04c116	Convert HDTorrents to AngleSharp (#7373 )	2020-03-01 07:36:37 +13:00
Cory	63267b597e	Convert HDOlimpo to AngleSharp (#7372 )	2020-03-01 07:35:15 +13:00
Cory	544501d2a8	Convert GimmePeers to AngleSharp (#7371 )	2020-03-01 07:33:30 +13:00
Cory	169fda4dbb	Convert Fuzer to AngleSharp (#7370 )	2020-03-01 07:32:35 +13:00
Cory	d3d78d3662	Convert FunFile to AngleSharp (#7369 )	2020-03-01 07:31:54 +13:00
garfield69	2d1175dcc1	azure-pipelines: drop assetUploadMode	2020-03-01 07:30:54 +13:00
Garfield69	0a7f06de31	hdarea: use imdbidShort. resolves #7368	2020-03-01 07:21:17 +13:00
junglebus	9f3f11ac49	Fail build if all artifacts aren't uploaded to Github	2020-02-29 21:36:09 +11:00
junglebus	49affa0555	Revert pipeline log changes	2020-02-29 20:46:46 +11:00
junglebus	f5c482f939	Try and read pipeline logs	2020-02-29 20:31:59 +11:00
junglebus	6c67b7a8de	Try and find azure logs	2020-02-29 20:11:15 +11:00
junglebus	368947a061	Try and find pipeline logs	2020-02-29 20:00:24 +11:00
junglebus	f0138405a6	Try and Find log files	2020-02-29 19:46:05 +11:00
Garfield69	8373ee3b0c	add mypornclub a public 3x site. resolves #7344	2020-02-29 19:44:00 +13:00
Garfield69	dfaf9dd3a6	filebase: drop debug, comment http only.	2020-02-29 19:24:05 +13:00
Garfield69	c1bde9b643	torrentleech: download_multiplier can be null. #7367	2020-02-29 17:00:01 +13:00
Garfield69	d86c60ffef	hdarea: fix login error trap. #7368 update indexer for nexusphp 1.5b4 add config sort options add uhd movie category add imdb support	2020-02-29 16:07:08 +13:00
Garfield69	e4cfedfcfb	torrentview: new domain *4.net resolves #7365	2020-02-29 12:21:28 +13:00
Garfield69	d3161e7b75	magnet4you, torrent4you: handle xK seelders and leechers. resolves #7364	2020-02-29 12:19:11 +13:00
garfield69	baf4730316	Update azure-pipelines.yml the azure assetuploadmode=replace routine is missing a retry-upload-after-delete so ends up just removing the conflict but not uploading a replacement, bah! lets try the the delete option which should clear any attachments prior to starting the first upload.	2020-02-29 11:43:40 +13:00
Diego Heras	a89b69e821	Convert IPTorrents to AngleSharp (#7363 ) #7292	2020-02-29 11:33:21 +13:00
Cory	4d48c1be44	Convert BB to AngleSharp (#7356 ) #7292	2020-02-29 11:32:43 +13:00
Cory	8056e47fef	Convert HD-Space from csQuery to AngleSharp (#7352 ) #7292	2020-02-29 11:32:02 +13:00
Cory	63a3465aa6	Convert BitHdtv to AngleSharp (#7358 ) #7292	2020-02-29 10:42:08 +13:00
Cory	03bbafb0c9	Convert DigitalHive to AngleSharp (#7359 ) #7292	2020-02-29 10:40:27 +13:00
Cory	d8cbae68d5	Convert FileList to Angle Sharp (#7360 ) #7292	2020-02-29 10:25:23 +13:00
Cory	99c269c896	Convert BitCityReloaded to AngleSharp (#7357 ) #7292	2020-02-29 10:24:26 +13:00
Cory	b4075d1d35	Convert BakaBT to AngleSharp (#7355 ) #7292	2020-02-29 10:23:24 +13:00
Cory	49eebc90e4	Convert AnimeTorrents to AngleSharp (#7354 ) #7292	2020-02-29 10:22:13 +13:00
Cory	68b25de828	Convert Abstract/AvistazTracker to AngleSharp (#7353 ) #7292	2020-02-29 10:20:47 +13:00
Garfield69	00104205c0	add U2 (U2分享園@動漫花園) a Private Chinese Anime site. resolves #7337	2020-02-29 10:01:24 +13:00
Garfield69	28b53d8fb1	add boxingtorrents a Private site for boxing. resolves #7323	2020-02-28 19:13:21 +13:00
Garfield69	8a94d689b8	add exkinoray a Russian semi-private site. resolves #7318	2020-02-28 16:46:50 +13:00
gwenvador	ad00e49fe2	generationfree: new login (again!) (#7350 ) #7341	2020-02-28 16:39:19 +13:00
gwenvador	888361f46f	Update generationfree.yml (#7347 ) Change login username to correct value	2020-02-27 09:19:09 -06:00
Garfield69	edc4c31fa6	add ttsweb a private site. resolves #7301	2020-02-27 18:40:38 +13:00
Garfield69	a1dde973fb	generationfree: site's login has changed. resolves #7341	2020-02-27 16:37:32 +13:00
Garfield69	525f58eb1d	xwtorrents: Site's login has changed. resolves #7339	2020-02-27 16:37:07 +13:00
Sen Jiang	124fbf7c1b	webui: Optimize favicon.ico with leanify (#7334 ) leanify -i 1000 favicon.ico variation on #7307	2020-02-27 07:30:21 +13:00
Cory	b9b10e4e91	core: Fix IsEmptyOrNull to return true when IsNull (#7338 ) resolves #7333	2020-02-27 07:24:36 +13:00
Garfield69	427b556869	btdb: fix title / details selector. resolves #7335	2020-02-27 07:22:04 +13:00
Garfield69	04f9f2dfe7	newstudio: fix SxxExx processing. resolves #7331	2020-02-26 20:51:52 +13:00
Garfield69	d8e7a63768	add filmsclub a Russian semi-private site. resolves #7289	2020-02-26 19:10:41 +13:00
Diego Heras	2f694147a1	lostfilm: Remove CsQuery and use AngleSharp instead #7292 (#7328 ) also add missing torznab fields not available from results	2020-02-26 09:04:36 +13:00
Diego Heras	c339d54aed	core: fix compilation warning (#7329 )	2020-02-26 08:48:27 +13:00
Garfield69	58974623de	tvchaosuk: update for unit3d 2.2.7 resolves #7327	2020-02-26 08:01:24 +13:00
Cory	889a8da4e5	Convert functions and properties to expression bodies when able (#7312 ) Convert functions and properties to expression bodies when able	2020-02-25 10:08:03 -06:00