ebookparadijs: new cat

default to all cats when none specified in request
and update some categories, add UHD and replace one incorrect catid
switch to using http.GET instead of http.POST for query

.gitignore

@@ -198,3 +198,6 @@ FakesAssemblies/
 *.DS_Store
 .idea/
 launchSettings.json
+
+# JetBrains Rider
+/src/.run

README.md

@@ -5,7 +5,8 @@
 [![Build Status](https://dev.azure.com/Jackett/Jackett/_apis/build/status/Jackett.Jackett?branchName=master)](https://dev.azure.com/jackett/jackett/_build/latest?definitionId=1&branchName=master)
 [![GitHub Releases](https://img.shields.io/github/downloads/Jackett/Jackett/total.svg?maxAge=60&style=flat-square)](https://github.com/Jackett/Jackett/releases/latest)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/jackett.svg?maxAge=60&style=flat-square)](https://hub.docker.com/r/linuxserver/jackett/)
-[![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA)
+
+_Our [![Discord](https://img.shields.io/badge/discord-chat-7289DA.svg?maxAge=60&style=flat-square)](https://discord.gg/J865QuA) server is no longer maintained. If you have a problem, request, or question then please open a new issue here._
 
 This project is a new fork and is recruiting development help.  If you are able to help out please [contact us](https://github.com/Jackett/Jackett/issues/8180).
 
@@ -19,7 +20,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 #### Supported Systems
 * Windows 7 SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/5.0/5.0-supported-os.md#linux)
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md#linux)
 * macOS 10.13 or greater
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
@@ -27,6 +28,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 01torrent
  * ØMagnet
  * 1337x
+ * 24rolika
  * 7torrents
  * ACG.RIP
  * ACGsou (36DM)
@@ -61,7 +63,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Erai-Raws
  * ETTV
  * EXT Torrents
- * ExtraTorrent.cd
  * ExtraTorrent.st
  * EZTV
  * Filebase
@@ -82,9 +83,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * iTorrent
  * kickasstorrents.ws
  * kickasstorrents.to
+ * KissSub
  * Legit Torrents
  * LePorno.info
  * LimeTorrents
+ * LimeTorrents clone
  * LinuxTracker
  * Mac Torrents Download
  * MegaPeer
@@ -128,6 +131,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RuTor
  * RuTracker.RU
  * seleZen
+ * Sexxi
  * Sexy-Pics
  * ShizaProject
  * shokweb
@@ -139,6 +143,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Pirate Bay (TPB)
  * Tokyo Tosho
  * Torlock
+ * Torlook
  * TOROS
  * Torrent Downloads (TD)
  * Torrent Oyun indir
@@ -267,8 +272,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * bB
  * BakaBT
  * BeiTai
+ * Best-Core
  * BeyondHD (BHD)
  * Bibliotik
+ * Bit-Bázis
  * Bit-City Reloaded [![(invite needed)][inviteneeded]](#)
  * BIT-HDTV
  * BiT-TiTAN
@@ -292,6 +299,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BTNext (BTNT)
  * BTSCHOOL
  * BWTorrents
+ * BYRBT
  * Carp-Hunter
  * Carpathians
  * CartoonChaos (CC)
@@ -349,7 +357,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FunFile (FF)
  * FunkyTorrents (FT)
  * Fuzer (FZ)
- * Gay-Torrents.org [![(invite needed)][inviteneeded]](#)
+ * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
  * Generation-Free [![(invite needed)][inviteneeded]](#)
@@ -391,6 +399,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Hebits
  * HellasTZ
  * HQSource (HQS)
+ * Il Corsaro Verde
+ * Indietorrents [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
  * ImmortalSeed (iS)
  * Immortuos
@@ -405,6 +415,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Le Saloon
  * LearnBits
  * LearnFlakes
+ * leech24
  * LegacyHD (HD4Free)
  * LemonHD
  * Libble
@@ -416,6 +427,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
+ * MegamixTracker
  * MeseVilág (Fairytale World)
  * MicroBit (µBit)
  * Milkie
@@ -425,6 +437,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
+ * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
@@ -443,6 +456,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Ourbits (HDPter)
  * P2PBG
  * P2PElite
+ * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
  * PeerJunkies
  * Peers.FM
@@ -464,8 +478,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PTMSG
  * PTSBAO
  * PTtime
+ * Punk's Horror Tracker
  * PuntoTorrent
  * PuroVicio
+ * PuTao
  * Puur-Hollands
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
@@ -480,7 +496,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RevolutionTT
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
  * RPTorrents
- * SceneHD
+ * SceneHD  [![(invite needed)][inviteneeded]](#)
  * ScenePalace (SP)
  * SceneRush
  * SceneTime
@@ -513,6 +529,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
  * teracod (Movie Zone)
+ * The-Devils-Lounge
  * The Falling Angels (TFA)
  * The Geeks
  * The Horror Charnel (THC)
@@ -548,15 +565,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrentland
  * TorrentLeech (TL)
  * TorrentLeech.pl
+ * TorrentMasters
  * TorrentSeeds (TS)
  * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
  * Trezzor
- * TTsWEB
  * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
- * TV-Vault
  * TVstore
  * Twilight Torrents
  * Twilights Zoom
@@ -566,6 +582,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * UnlimitZ
  * Vizuk
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
+ * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD
  * x-ite.me (XM)
@@ -629,7 +646,7 @@ We recommend you install Jackett as a Windows service using the supplied install
 
 To get started with using the installer for Jackett, follow the steps below:
 
-1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net50#dependencies
+1. Check if you need any .NET prerequisites installed, see https://docs.microsoft.com/en-us/dotnet/core/install/windows?tabs=net60#dependencies
 2. Download the latest version of the Windows installer, "Jackett.Installer.Windows.exe" from the [releases](https://github.com/Jackett/Jackett/releases/latest) page.
 3. When prompted if you would like this app to make changes to your computer, select "yes".
 4. If you would like to install Jackett as a Windows Service, make sure the "Install as Windows Service" checkbox is filled.
@@ -699,7 +716,7 @@ On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chri
 macOS 10.13 or greater
 
 ### Install as service
-1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
+1. Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases).
 2. Open the extracted folder and double-click on `install_service_macos`.
 3. If the installation was a success, you can close the Terminal window.
 
@@ -707,7 +724,7 @@ The service will start on each logon. You can always stop it by running `launchc
 Logs are stored as usual under `~/.config/Jackett/log.txt`.
 
 ### Run without installing as a service
-Download and extract the latest `Jackett.Binaries.macOS.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
+Download and extract the latest `Jackett.Binaries.macOS.tar.gz` or `Jackett.Binaries.macOSARM64.tar.gz` release from the [releases page](https://github.com/Jackett/Jackett/releases) and run Jackett with the command `./jackett`.
 
 
 ## Installation using Docker
@@ -791,8 +808,6 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 
 -   `-p, --Port`               Web server port
 
--   `-m, --MigrateSettings`    Migrate settings manually (Must be an admin on Windows)
-
 -   `-n, --IgnoreSslErrors`    [true/false] Ignores invalid SSL certificates
 
 -   `-d, --DataFolder`         Specify the location of the data folder (Must be an admin on Windows)
@@ -835,21 +850,21 @@ git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f net5.0 --self-contained -r osx-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net5.0/osx-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net6.0 --self-contained -r osx-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net6.0/osx-x64/jackett # run jackett
 ```
 
 ### Linux
 
 
 ```bash
-sudo apt install nuget msbuild dotnet-sdk-5.0 # install build tools (Debian/ubuntu)
+sudo apt install nuget msbuild dotnet-sdk-6.0 # install build tools (Debian/ubuntu)
 git clone https://github.com/Jackett/Jackett.git
 cd Jackett/src
 
 # dotnet core version
-dotnet publish Jackett.Server -f net5.0 --self-contained -r linux-x64 -c Debug # takes care of everything
-./Jackett.Server/bin/Debug/net5.0/linux-x64/jackett # run jackett
+dotnet publish Jackett.Server -f net6.0 --self-contained -r linux-x64 -c Debug # takes care of everything
+./Jackett.Server/bin/Debug/net6.0/linux-x64/jackett # run jackett
 ```
 
 ## Screenshots

azure-pipelines.yml

@@ -2,12 +2,12 @@
 name: $(majorVersion).$(minorVersion).$(patchVersion)
 variables:
   majorVersion: 0
-  minorVersion: 19
+  minorVersion: 20
   patchVersion: $[counter(variables['minorVersion'], 1)]  # this will reset when we bump minor
   jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
   buildConfiguration: Release
-  netCoreFramework: net5.0
-  netCoreSdkVersion: 5.0.x
+  netCoreFramework: net6.0
+  netCoreSdkVersion: 6.0.x
   # system.debug: true
 
 trigger:
@@ -50,6 +50,13 @@ stages:
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
+            macOSARM64:
+              buildDescription: macOS ARM64
+              imageName: macOS-10.15
+              framework: $(netCoreFramework)
+              runtime: osx-arm64
+              archiveType: tar
+              artifactName: Jackett.Binaries.macOSARM64.tar.gz
             LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-20.04
@@ -91,7 +98,7 @@ stages:
               projects: 'src/Jackett.Server/Jackett.Server.csproj'
               publishWebProjects: false
               zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
 
           - task: DotNetCoreCLI@2
             displayName: Build Jackett Updater
@@ -100,7 +107,7 @@ stages:
               projects: 'src/Jackett.Updater/Jackett.Updater.csproj'
               publishWebProjects: false
               zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework) --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
 
           - task: DotNetCoreCLI@2
             displayName: Build Jackett Tray (Windows only)
@@ -110,7 +117,7 @@ stages:
               projects: 'src/Jackett.Tray/Jackett.Tray.csproj'
               publishWebProjects: false
               zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
 
           - task: DotNetCoreCLI@2
             displayName: Build Jackett Service (Windows only)
@@ -120,7 +127,7 @@ stages:
               projects: 'src/Jackett.Service/Jackett.Service.csproj'
               publishWebProjects: false
               zipAfterPublish: false
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)-windows --self-contained --output $(Build.BinariesDirectory) /p:AssemblyVersion=$(jackettVersion) /p:FileVersion=$(jackettVersion) /p:InformationalVersion=$(jackettVersion) /p:Version=$(jackettVersion)'
 
           - task: CopyFiles@2
             displayName: Copy Jackett Server
@@ -353,11 +360,6 @@ stages:
               imageName: ubuntu-20.04
               framework: $(netCoreFramework)
               runtime: linux-x64
-            LinuxARM:
-              buildDescription: Linux ARM
-              imageName: ubuntu-20.04
-              framework: $(netCoreFramework)
-              runtime: linux-arm
         pool:
           vmImage: $(imageName)
         displayName: ${{ variables.buildDescription }}
@@ -380,20 +382,13 @@ stages:
               projects: '**/*.Test*/*.csproj'
               includeNuGetOrg: true
 
-          - task: DotNetCoreCLI@2
-            displayName: Build Test Project
-            inputs:
-              command: build
-              projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
-
           - task: DotNetCoreCLI@2
             displayName: Unit Tests (Mono, Linux and macOS)
             condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
             inputs:
               command: test
               projects: '**/*.Test*/*.csproj'
-              arguments: '--configuration $(buildConfiguration) --framework $(framework) --runtime $(runtime)'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
               testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'
 
           - task: DotNetCoreCLI@2
@@ -427,13 +422,13 @@ stages:
               codeCoverageTool: Cobertura
               summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml
 
-  - stage: Integration
+  - stage: IntegrationTestJackett
     displayName: Integration Tests
     dependsOn:
       - BuildJackett
       - CodeStyle
     jobs:
-      - job: Selenium
+      - job: IntegrationTest
         workspace:
           clean: all
         strategy:
@@ -442,18 +437,26 @@ stages:
               buildDescription: Mono
               imageName: ubuntu-20.04
               artifactName: Jackett.Binaries.Mono.tar.gz
+              framework: net461
+              runtime: linux-x64
             Windows:
               buildDescription: Windows
               imageName: windows-2019
               artifactName: Jackett.Binaries.Windows.zip
+              framework: $(netCoreFramework)
+              runtime: win-x86
             macOS:
               buildDescription: macOS
               imageName: macOS-10.15
               artifactName: Jackett.Binaries.macOS.tar.gz
+              framework: $(netCoreFramework)
+              runtime: osx-x64
             LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-20.04
               artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz
+              framework: $(netCoreFramework)
+              runtime: linux-x64
         pool:
           vmImage: $(imageName)
         displayName: ${{ variables.buildDescription }}
@@ -495,18 +498,38 @@ stages:
               version: $(netCoreSdkVersion)
               installationPath: $(Agent.ToolsDirectory)/dotnet
 
+          # this task is a workaround to fix a bug in Azure (not required under normal circumstances)
+          # https://developercommunity.visualstudio.com/content/problem/983843/dotnet-build-task-does-not-use-nugetorg-for-one-pr.html
           - task: DotNetCoreCLI@2
-            displayName: Run Integration Tests
+            displayName: Restore IntegrationTest Project
+            inputs:
+              command: restore
+              projects: '**/*IntegrationTest*/*.csproj'
+              includeNuGetOrg: true
+
+          - task: DotNetCoreCLI@2
+            displayName: Integration Tests (Mono, Linux and macOS)
+            condition: and(succeeded(), not(startsWith(variables['runtime'], 'win')))
             inputs:
               command: test
               projects: '**/*IntegrationTest*/*.csproj'
+              arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
+              testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
+
+          - task: DotNetCoreCLI@2
+            displayName: Integration Tests (Windows only)
+            condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+            inputs:
+              command: test
+              projects: '**/*IntegrationTest*/*.csproj'
+              arguments: '--configuration $(buildConfiguration) --framework $(framework)'
               testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
 
   - stage: PublishGithub
     displayName: Publish to Github
     dependsOn:
       - UnitTestJackett
-      - Integration
+      - IntegrationTestJackett
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     jobs:
       - job: Publish
@@ -555,6 +578,6 @@ stages:
                     $successCount = (Select-String "Uploaded file successfully:" -InputObject $logInspect -AllMatches).Matches.Count
                     $failureCount = (Select-String "Duplicate asset found:" -InputObject $logInspect -AllMatches).Matches.Count
                     Write-Output "Success count is: $successCount and failure count is: $failureCount"
-                    if (($successCount -ne 7) -or ($failureCount -ne 0)) { Write-Host "##vso[task.complete result=Failed;]DONE" }
+                    if (($successCount -ne 8) -or ($failureCount -ne 0)) { Write-Host "##vso[task.complete result=Failed;]DONE" }
                   }
                 }

src/Jackett.Common/Content/custom.js

@@ -972,7 +972,7 @@ function updateReleasesRow(row) {
 
   if (IMDBId) {
     var imdbLen = (IMDBId.toString().length > 7) ? 8 : 7;
-        labels.append('\n<a href="https://www.imdb.com/title/tt' + ("00000000" + IMDBId).slice(-imdbLen) + '/" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
+        labels.append('\n<a href="https://www.imdb.com/title/tt' + ("00000000" + IMDBId).slice(-imdbLen) + '/" target="_blank" class="label label-imdb" alt="IMDB" title="IMDB">IMDB</a>');
     }
 
     if (!isNaN(DownloadVolumeFactor)) {

src/Jackett.Common/Content/index.html

@@ -732,6 +732,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2021102204"></script>
+    <script type="text/javascript" src="../custom.js?changed=2021103101"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/01torrent.yml

@@ -8,9 +8,10 @@ encoding: UTF-8
 testlinktorrent: false
 links:
   - https://www4.01torrent.net/
-  - https://01torrent.unblockit.kim/
+  - https://01torrent.unblockit.bz/
 legacylinks:
   - https://01torrent.unblockit.ws/
+  - https://01torrent.unblockit.kim/
 
 caps:
   categories:

src/Jackett.Common/Definitions/1337x.yml

@@ -13,7 +13,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.kim/
+  - https://1337x.unblockit.bz/
   - https://1337x.nocensor.biz/
 legacylinks:
   - https://1337x.unblocked.earth/
@@ -51,6 +51,7 @@ legacylinks:
   - https://1337x.nocensor.space/
   - https://1337x.unblockit.ws/
   - https://1337x.nocensor.work/
+  - https://1337x.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/24rolika.yml

@@ -0,0 +1,89 @@
+---
+id: 24rolika
+name: 24rolika
+description: "24rolika is a RUSSIAN Public Torrent Tracker for 3X"
+language: ru-RU
+type: public
+encoding: UTF-8
+links:
+  - http://24rolika.ru/ # does not support https
+
+caps:
+  categorymappings:
+    - {id: xxx, cat: XXX, desc: xxx}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+
+download:
+  selectors:
+    - selector: a[href*="index.php?do=download&id="]
+      attribute: href
+
+search:
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%D0%9F%D0%BE%D0%B8%D1%81%D0%BA{{ end }}"
+    # 0 in article 1 in comments 2 in static pages 3 in article titles
+    titleonly: 3
+    sortby: "{{ .Config.sort }}"
+    resorder: "{{ .Config.type }}"
+    showposts: 0
+    # does not have categories in results so there is little point in providing a full category map or multi-cat search support
+    catlist[]: 0
+
+  rows:
+    selector: article.shortstory
+
+  fields:
+    category:
+      text: xxx
+    title:
+      selector: h2.short_title a
+    details:
+      selector: h2.short_title a
+      attribute: href
+    download:
+      selector: h2.short_title a
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    date:
+      text: now
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    description:
+      selector: div.video_time
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# DataLife

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -64,8 +64,6 @@ login:
   method: cookie
   inputs:
     cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
   test:
     path: /
     selector: a[href="account-logout.php"]

src/Jackett.Common/Definitions/aither-api.yml

@@ -61,24 +61,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:

src/Jackett.Common/Definitions/animeworld-api.yml

@@ -63,24 +63,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,7 +9,7 @@ links:
   - http://audiobookbay.nl/ # site forces http, does not support https
   - http://audiobookbay.ws/
   - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.kim/
+  - https://audiobookbay.unblockit.bz/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
@@ -25,6 +25,7 @@ legacylinks:
   - https://audiobookbay.unblockit.ch/
   - https://audiobookbay.unblockit.ws/
   - http://audiobookbay.net/
+  - https://audiobookbay.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -81,6 +81,8 @@ search:
 
   rows:
     selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/bestcore.yml

@@ -0,0 +1,197 @@
+---
+id: bestcore
+name: Best-Core
+description: "Best-Core is a HUNGARIAN Private Tracker for MOVIES / TV"
+language: hu-HU
+type: private
+encoding: ISO-8859-2
+links:
+  - https://best-core.info/
+
+caps:
+  categorymappings:
+    - {id: 81, cat: Movies/3D, desc: "3D"}
+    - {id: 83, cat: Movies/UHD, desc: "4K/UHD"}
+    - {id: 80, cat: Movies/Other, desc: "Best-Core"}
+    - {id: 51, cat: Books/EBook, desc: "E-book"}
+    - {id: 88, cat: Audio/Audiobook, desc: "E-book/Hangoskönyv"}
+    - {id: 77, cat: Movies/HD, desc: "Film/BDRip/Eng"}
+    - {id: 86, cat: Movies/HD, desc: "Film/BDRip/Ger"}
+    - {id: 76, cat: Movies/HD, desc: "Film/BDRip/Hun"}
+    - {id: 75, cat: Movies/BluRay, desc: "Film/Blu-ray/Eng"}
+    - {id: 74, cat: Movies/BluRay, desc: "Film/Blu-ray/Hun"}
+    - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Eng"}
+    - {id: 24, cat: Movies/DVD, desc: "Film/DVD/Hun"}
+    - {id: 85, cat: Movies/DVD, desc: "Film/DVD9"}
+    - {id: 21, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 53, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 20, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 34, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 90, cat: Movies/SD, desc: "Film/XviD/Pack"}
+    - {id: 26, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 52, cat: PC/Games, desc: "Játék/Rip"}
+    - {id: 89, cat: Movies/SD, desc: "Kamerás/Eng"}
+    - {id: 82, cat: Movies/SD, desc: "Kamerás/Hun"}
+    - {id: 38, cat: Other, desc: "Képek"}
+    - {id: 43, cat: Console/PS3, desc: "Konzol/PS"}
+    - {id: 45, cat: Console/PSP, desc: "Konzol/PSP"}
+    - {id: 44, cat: Console/XBox, desc: "Konzol/Xbox"}
+    - {id: 73, cat: TV/Anime, desc: "Mese/Eng"}
+    - {id: 70, cat: TV/Anime, desc: "Mese/Hun"}
+    - {id: 37, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 1, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 22, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 54, cat: TV/SD, desc: "Sorozat/DVD/Eng"}
+    - {id: 55, cat: TV/SD, desc: "Sorozat/DVD/Hun"}
+    - {id: 58, cat: TV/SD, desc: "Sorozat/Xvid/Eng"}
+    - {id: 7, cat: TV/SD, desc: "Sorozat/Xvid/Hun"}
+    - {id: 62, cat: Audio/Video, desc: "Videoklip"}
+    - {id: 64, cat: XXX/DVD, desc: "XXX/DVD"}
+    - {id: 48, cat: XXX/ImageSet, desc: "XXX/Képek"}
+    - {id: 9, cat: XXX/XviD, desc: "XXX/Xvid"}
+    - {id: 40, cat: Audio/MP3, desc: "Zene/Eng"}
+    - {id: 6, cat: Audio/MP3, desc: "Zene/Hun"}
+    - {id: 87, cat: Audio/Lossless, desc: "Zene/Lossless"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    book-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search FreeLeech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: title
+      4: added
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrent oldalankén:</b> setting to <b>100</b> on your account profile.
+  - name: info_login
+    type: info
+    label: About login error
+    default: If you get a <b>Login Failed, got redirected.</b> error during your config <i>save</i> then most likely you have used an incorrect username or password.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  test:
+    path: index.php
+    selector: a[href^="logout.php?c="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 active, 1 all, 2 deadonly, 3 freeleech
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: tr.torrent_h
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      # can be abbreviated
+      selector: a[href^="details.php?id="]
+    title_optional:
+      # usually full length
+      selector: a[href^="details.php?id="]
+      attribute: title
+      optional: true
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
+        - name: replace
+          args: ["https://i.kek.sh/null", ""]
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "(\\d{4}-\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2})"
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    files:
+      selector: td:nth-child(5)
+    size:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(7)
+      filters:
+        - name: regexp
+          args: x \d(\d+) x$
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    downloadvolumefactor:
+      case:
+        img[src="pic/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      selector: td:nth-child(7) b
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 0.8
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# custom v3.0

src/Jackett.Common/Definitions/bit-titan.yml

@@ -135,7 +135,8 @@ search:
     # searchIn: 0 all, 1 active, 2 dead, 3 highlights, 4 own uploads, 5 uploads bots, 6 onlyupload, 7 multiplier, 8 %download, 9 freeleech
     searchIn: "{{ if .Config.freeleech }}9{{ else }}0{{ end }}"
     # 1 25, 2 50, 3 75, 4 100
-    limit: 2
+    # api only responds with results if limit=1 is used !?! (as at 22-Nov-2021)
+    limit: 1
     downloadLink: 1
     # 1 = Sat, 28 Nov 2020 23:29:38 +0100 (DEFAULT VALUE) , 2 = 1606606178 (UNIX TIMESTAMP) , 3 = 28.11.2020 23:29.38 (German Timestamp) ,  4 = 2020-11-28 23:29:38 (Default Datetime)
     timeFormat: 2

src/Jackett.Common/Definitions/bitbazis.yml

@@ -0,0 +1,165 @@
+---
+id: bitbazis
+name: Bit-Bázis
+description: "Bit-Bázis is a HUNGARIAN Private Tracker for MOVIES / TV"
+language: hu-HU
+type: private
+# encoding: ISO-8859-2
+encoding: UTF-8
+links:
+  - https://bitbazis.net/
+
+caps:
+  categorymappings:
+    - {id: 15, cat: Movies/SD, desc: "Film/XviD/Hun"}
+    - {id: 34, cat: Movies/HD, desc: "Film/x264/Hun"}
+    - {id: 83, cat: Movies/HD, desc: "Film/HD/Hun"}
+    - {id: 64, cat: Movies, desc: "Film/Pack"}
+    - {id: 16, cat: Movies/SD, desc: "Film/XviD/Eng"}
+    - {id: 17, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+    - {id: 19, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
+    - {id: 48, cat: Movies/HD, desc: "Film/x264/Eng"}
+    - {id: 82, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 85, cat: Movies/SD, desc: "Film/Cam/XviD/Hun"}
+    - {id: 86, cat: Movies/SD, desc: "Film/Cam/XviD/Eng"}
+    - {id: 22, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 69, cat: TV/Anime, desc: "Mese/XviD"}
+    - {id: 58, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
+    - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
+    - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
+    - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
+    - {id: 84, cat: Audio/Lossless, desc: "Lossless/Hun"}
+    - {id: 31, cat: PC/Games, desc: "Játék/PC"}
+    - {id: 81, cat: PC/0day, desc: "Program/PC"}
+    - {id: 14, cat: PC, desc: "Program/Egyéb"}
+    - {id: 49, cat: PC/0day, desc: "Program/Rip"}
+    - {id: 54, cat: Console, desc: "Játék/Konzol"}
+    - {id: 67, cat: PC/Mobile-Android, desc: "Program/Android"}
+    - {id: 33, cat: XXX/SD, desc: "Film/SD/XXX"}
+    - {id: 89, cat: XXX/x264, desc: "Film/HD/XXX"}
+    - {id: 66, cat: XXX/ImageSet, desc: "Képek/XXX"}
+    - {id: 27, cat: Books/EBook, desc: "Könyv/Hun"}
+    - {id: 50, cat: Books/EBook, desc: "Könyv/Eng"}
+    - {id: 70, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 24, cat: Audio/Video, desc: "Videóklipp"}
+    - {id: 65, cat: Other, desc: "Egyéb"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
+    music-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:
+      1: title
+      4: added
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table[width="920"]:contains("Hiba")
+  test:
+    path: index.php
+    selector: a[href^="logout.php?k="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 deadonly, 3  myuploads, 4 zeroseed
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # site does not support imdbid searching or appear to have freeleech
+
+  rows:
+    selector: table[ width="1000px"] tbody tr:has(a[href^="userdetails.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
+    poster:
+      selector: a.preview
+      attribute: href
+    download:
+      selector: a[href^="details.php?id="]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["details.php?id=", "download.php?torrent="]
+    size:
+      selector: td:last-child
+    date:
+      # 2021-11-09 16:51:24
+      selector: td:nth-last-child(2)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    files:
+      selector: td:nth-last-child(4)
+    grabs:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "D:(\\d+)x"
+    seeders:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "S:(\\d+)"
+    leechers:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "L:(\\d+)"
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# engine n/a

src/Jackett.Common/Definitions/blutopia-api.yml

@@ -53,24 +53,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:

src/Jackett.Common/Definitions/broadcity.yml

@@ -24,6 +24,7 @@ caps:
     - {id: 7, cat: Movies/HD, desc: "HD - TV"}
     - {id: 5, cat: Movies/WEB-DL, desc: "HD - WEB-DL"}
     - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
+    - {id: 40, cat: Movies/HD, desc: "PTer"}
     - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
     - {id: 9, cat: Movies/SD, desc: "SD"}
     - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}

src/Jackett.Common/Definitions/brsociety-api.yml

@@ -54,24 +54,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:
@@ -133,7 +121,9 @@ search:
       case:
         0: 1 # normal
         1: 2 # double
+    minimumratio:
+      text: 1.0
     minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
 # json UNIT3D 5.3.0

src/Jackett.Common/Definitions/brsociety.yml

@@ -178,7 +178,9 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+    minimumratio:
+      text: 1.0
     minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
 # UNIT3D 5.3.0

src/Jackett.Common/Definitions/btnext.yml

@@ -6,7 +6,9 @@ language: pt-PT
 type: private
 encoding: UTF-8
 links:
-  - http://tracker.btnext.com/ # site forces http, https is not supported
+  - https://tracker.btnext.com/ # site forces https
+legacylinks:
+  - http://tracker.btnext.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/byrbt.yml

@@ -0,0 +1,182 @@
+---
+id: byrbt
+name: BYRBT
+description: "BYRBT is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://byr.pt/
+
+caps:
+  categorymappings:
+    - {id: 408, cat: Movies, desc: "电影Movies"}
+    - {id: 401, cat: TV, desc: "剧集TV Series"}
+    - {id: 404, cat: TV/Anime, desc: "动漫Animations"}
+    - {id: 402, cat: Audio, desc: "音乐Music"}
+    - {id: 405, cat: Other, desc: "综艺Arts"}
+    - {id: 403, cat: Console, desc: "游戏Games"}
+    - {id: 406, cat: PC, desc: "软件Software"}
+    - {id: 407, cat: TV/Documentary, desc: "资料Documentaries"}
+    - {id: 409, cat: TV/Sport, desc: "体育Sports"}
+    - {id: 410, cat: Other/Misc, desc: "纪录Records"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    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.
+  - 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: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("failed!"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href^="logout.php?key="]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact, 3 NOT
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-last-of-type(6) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-last-of-type(5)
+    seeders:
+      selector: td.rowfollow:nth-last-of-type(4)
+    leechers:
+      selector: td.rowfollow:nth-last-of-type(3)
+    grabs:
+      selector: td.rowfollow:nth-last-of-type(2)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 1 x 24 x 60 x 60)
+      text: 86400
+# NexusPHP v1.5 beta 5 20120707

src/Jackett.Common/Definitions/carphunter.yml

@@ -50,12 +50,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -77,18 +78,12 @@ settings:
       asc: asc
 
 login:
-  path: login.php?takelogin
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    two_factor_auth_code: ""
-    inactivity_: ""
-    returnto: /
-  error:
-    - selector: td.embedded:contains("Sikertelen bejelentkezés")
+    cookie: "{{ .Config.cookie }}"
   test:
-    path: letoltes.php
+  test:
+    path: index.php
     selector: a[href^="logout.php"]
 
 search:

src/Jackett.Common/Definitions/cathoderaytube.yml

@@ -62,7 +62,7 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    cinfo: "2550|1350|24|-60"
+    cinfo: "2550|1350|1.25|24|-60"
     iplocked: 0
     keeploggedin: 1
   error:

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -16,8 +16,9 @@ caps:
     - {id: 8, cat: Movies/HD, desc: "Filmy HD"}
     - {id: 11, cat: Movies/SD, desc: "Filmy SD"}
     - {id: 12, cat: Movies/Other, desc: "Filmy Inne"}
-    - {id: 32, cat: Movies/UHD, desc: "Filmy UHD"}
-    - {id: 2, cat: TV/Anime, desc: "Anime"}
+    - {id: 32, cat: Movies/UHD, desc: "Filmy UHD 4K"}
+    - {id: 33, cat: TV/UHD, desc: "TV UHD"}
+    - {id: 2, cat: TV/Anime, desc: "Bajki/Anime"}
     - {id: 10, cat: TV/Documentary, desc: "TV Dokumentalne"}
     - {id: 20, cat: TV, desc: "TV Paczki"}
     - {id: 22, cat: TV/Sport, desc: "TV Sport"}

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -11,7 +11,7 @@ links:
 caps:
   categorymappings:
     # Movie
-    - {id: 28, cat: Movies/SD, desc: "Movie - Xvid/x264"}
+    - {id: 28, cat: Movies/SD, desc: "Movie - SD"}
     - {id: 155, cat: Movies/DVD, desc: "Movie - DVD"}
     - {id: 130, cat: Movies/SD, desc: "Movie - SD-Pack"}
     # Movie-HD
@@ -131,9 +131,9 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD-Pack\"))": 162
         ":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
         # Movie
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": 28
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 155
         ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD-Pack\"))": 130
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 28
         # Serien
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": 60
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": 157

src/Jackett.Common/Definitions/concen.yml

@@ -14,6 +14,9 @@ caps:
 
   modes:
     search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
 
 settings:
   - name: sort

src/Jackett.Common/Definitions/datascene-api.yml

@@ -21,12 +21,14 @@ caps:
     - {id: 5, cat: PC/0day, desc: "Application"}
     - {id: 6, cat: XXX, desc: "XXX"}
     - {id: 7, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 8, cat: Books/EBook, desc: "E-Book"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: apikey
@@ -60,24 +62,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:
@@ -87,13 +77,14 @@ search:
     category:
       selector: category
       case:
-        "Movies": 1
+        "Movie": 1
         "TV": 2
         "Music": 3
         "Game": 4
         "Application": 5
         "XXX": 6
         "Mobile": 7
+        "E-Book": 8
     title:
       selector: name
     details:
@@ -141,6 +132,6 @@ search:
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
 # json UNIT3D 5.3.0

src/Jackett.Common/Definitions/datascene.yml

@@ -20,12 +20,14 @@ caps:
     - {id: 5, cat: PC/0day, desc: "Application"}
     - {id: 6, cat: XXX, desc: "XXX"}
     - {id: 7, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 8, cat: Books/EBook, desc: "E-Book"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
     movie-search: [q, imdbid, tmdbid]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -124,15 +126,16 @@ search:
         - name: replace
           args: ["https://via.placeholder.com/400x600", ""]
     size:
-      selector: td:nth-last-child(5)
-    seeders:
       selector: td:nth-last-child(4)
-    leechers:
+    seeders:
       selector: td:nth-last-child(3)
-    grabs:
+    leechers:
       selector: td:nth-last-child(2)
-    date:
+    grabs:
       selector: td:nth-last-child(1)
+    date:
+      selector: td:has(a.view-torrent) spam:last-child span:last-child
+      remove: a
       filters:
         # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
         - name: re_replace
@@ -172,23 +175,23 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+#        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
+#        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
+#        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
+#        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
+        i[class*="fa-trophy  data-toggle"]: 0 # Global Freeleech
+#        i[class*="fa-star text-gold"]: 0 # Freeleech
+#        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
         "*": 1
     uploadvolumefactor:
       case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        i[class*="fa-angle-double-up"]: 2 # Single Torrent Double Upload
+#        i[class*="fa-globe text-green"]: 2 # Global Double Upload
+#        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# UNIT3D 5.3.0
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/demonoid.yml

@@ -11,7 +11,7 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.kim/
+  - https://demonoid.unblockit.bz/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.biz/
 legacylinks:
@@ -41,6 +41,7 @@ legacylinks:
   - https://demonoid.nocensor.space/
   - https://demonoid.unblockit.ws/
   - https://demonoid.nocensor.work/
+  - https://demonoid.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/desitorrents-api.yml

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
   - https://desitorrents.tv/
+  - https://desitorrents.rocks/
 
 caps:
   # dont forget to update the case block in the search fields category
@@ -53,24 +54,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   keywordsfilters:
     - name: re_replace
       args: [^$, "%"]
@@ -134,6 +123,6 @@ search:
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 5 day (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # json UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/desitorrents.yml

@@ -7,6 +7,7 @@ type: private
 encoding: UTF-8
 links:
   - https://desitorrents.tv/
+  - https://desitorrents.rocks/
 
 caps:
   categorymappings:
@@ -181,6 +182,6 @@ search:
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 5 day (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 5.3.0 (custom)

src/Jackett.Common/Definitions/docspedia.yml

@@ -13,12 +13,18 @@ caps:
     - {id: 65, cat: Audio, desc: "Audio"}
     - {id: 64, cat: Books/EBook, desc: "Books"}
     - {id: 66, cat: TV, desc: "Business"}
+    - {id: 68, cat: Books/Comics, desc: "Comics"}
     - {id: 67, cat: TV, desc: "Development"}
     - {id: 60, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 71, cat: Other, desc: "Fonts"}
     - {id: 62, cat: Other, desc: "Graphic"}
     - {id: 63, cat: TV/HD, desc: "HD"}
     - {id: 57, cat: Books/Mags, desc: "Magazine"}
+    - {id: 72, cat: Books, desc: "IT Books"}
     - {id: 58, cat: TV, desc: "Medicine"}
+    - {id: 70, cat: Books/EBook, desc: "Occult"}
+    - {id: 73, cat: Audio, desc: "Podcast"}
+    - {id: 69, cat: Other, desc: "PS Resources"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
     - {id: 59, cat: TV, desc: "Video"}
     - {id: 61, cat: TV, desc: "Video tutorials"}

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -39,6 +39,8 @@ caps:
     - {id: 38, cat: TV/Documentary, desc: "Doku - HD"}
     - {id: 37, cat: TV/Documentary, desc: "Doku - SD"}
     - {id: 144, cat: TV/Documentary, desc: "Doku - Pack SD/HD"}
+    # Empfohlene
+    - {id: 150, cat: Other, desc: "Empfohlene - Torrents"}
     # Games
     - {id: 16, cat: PC/Games, desc: "Games - PC"}
     - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}
@@ -150,6 +152,8 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 144
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 38
         ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 37
+    # Empfohlene
+        ":has(div.kat_cat_pic_name:contains(\"Empfohlene\")):has(div.kat_cat_pic_name_b:contains(\"Torrents\"))": 150
         # Games
         ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 16
         ":has(div.kat_cat_pic_name:contains(\"Games\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 14

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -36,6 +36,7 @@ caps:
     - {id: 64, cat: Books/EBook, desc: "Literatuur"}
     - {id: 65, cat: Books/EBook, desc: "Non-Fiction"}
     - {id: 66, cat: Books/EBook, desc: "Bladmuziek"}
+    - {id: 67, cat: Books/EBook, desc: "young Adult"}
 
   modes:
     search: [q]

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

@@ -6,7 +6,7 @@ language: es-ES
 type: public
 encoding: UTF-8
 links:
-  - https://elitetorrent.com/
+  - https://elitetorrent.app/
   - https://elitetorrent.nocensor.biz/
 legacylinks:
   - https://www.elitetorrent.biz/
@@ -24,9 +24,9 @@ legacylinks:
   - https://www.elitetorrent.to/
   - https://www.elitetorrent.se/
   - https://www.elitetorrent.com/
-  - https://elitetorrent.app/
   - https://elitetorrent.si/
   - https://elitetorrent.nocensor.work/
+  - https://elitetorrent.com/
 
 caps:
   categories:

src/Jackett.Common/Definitions/ettv.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.kim/
+  - https://ettv.unblockit.bz/
   - https://ettv.nocensor.biz/
 legacylinks:
   - https://www.ettv.tv/
@@ -48,6 +48,7 @@ legacylinks:
   - https://ettv.nocensor.space/
   - https://ettv.unblockit.ws/
   - https://ettv.nocensor.work/
+  - https://ettv.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extratorrent-cd.yml

@@ -1,117 +0,0 @@
----
-id: extratorrent-cd
-name: ExtraTorrent.cd
-description: "ExtraTorrent.cd is a Public tracker for MOVIE / TV / GENERAL magnets"
-language: en-US
-type: public
-encoding: UTF-8
-followredirect: true
-links:
-  - https://extratorrent.si/
-legacylinks:
-  - https://extratorrent.unblockit.pro/
-  - https://extratorrent.unblockit.one/ # for .ag
-
-caps:
-  categorymappings:
-    - {id: Movies, cat: Movies, desc: "Movies"}
-    - {id: Video, cat: Movies, desc: "Movies"}
-    - {id: TV, cat: TV, desc: "TV"}
-    - {id: Music, cat: Audio, desc: "Music"}
-    - {id: Porn, cat: XXX, desc: "Adult / Porn"}
-    - {id: Software, cat: PC, desc: "Software"}
-    - {id: Games, cat: Console, desc: "Games"}
-    - {id: Other, cat: Other/Misc, desc: "Other"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-search:
-  paths:
-    # 30 rows per page
-    - path: "search/?search={{ .Keywords }}&srt=added&order=desc"
-    - path: "search/?page=2&search={{ .Keywords }}&srt=added&order=desc"
-    - path: "search/?page=3&search={{ .Keywords }}&srt=added&order=desc"
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "."]
-
-
-  rows:
-    selector: tr[class^="tl"]
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: span.c_tor > a
-    title:
-      selector: a[href*="/torrent/"][title^="view"]
-    details:
-      selector: a[href*="/torrent/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["///", "//"]
-    download:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-    date_day:
-      # Y-day-2020 (seriously!?!, like there's a Y-day-2019 ?)
-      # Today-22:03
-      selector: td:nth-last-of-type(5):contains("day")
-      optional: true
-      filters:
-        - name: replace
-          args: ["\xA0", " "]
-        - name: re_replace
-          args: ["(Today-)", "Today "]
-        - name: re_replace
-          args: ["(Y-day-.*)", "Yesterday"]
-        - name: fuzzytime
-    date_year:
-      # 12-27-2019
-      selector: td:nth-last-of-type(5):not(:contains(":")):not(:contains("day")):not(:contains("ago"))
-      optional: true
-      filters:
-        - name: replace
-          args: ["\xA0", "-"]
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "01-02-2006 -07:00"
-    date_ago:
-      # 4-mins-ago
-      selector: td:nth-last-of-type(5):contains("ago")
-      optional: true
-      filters:
-        - name: replace
-          args: ["\xA0", "-"]
-        - name: replace
-          args: ["-", " "]
-        - name: timeago
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day .Result.date_ago }}{{ or .Result.date_year .Result.date_day .Result.date_ago }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-last-of-type(4)
-    seeders_optional:
-      optional: true
-      selector: td.sy, td.sn
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      optional: true
-      selector: td.ly, td.ln
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/extratorrent-st.yml

@@ -7,10 +7,11 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.kim/
+  - https://extratorrent.unblockit.bz/
   - https://extratorrent.nocensor.biz/
 legacylinks:
   - https://extratorrent.nocensor.work/
+  - https://extratorrent.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -7,7 +7,8 @@ type: semi-private
 encoding: UTF-8
 links:
   - https://extremlymtorrents.ws/
-
+certificates:
+  - 31681d3324d3fef65b04b6ab2e634445c4ff06d4 # expired 6-nov-21
 caps:
   categorymappings:
     - {id: 15, cat: Movies/HD, desc: "1080p HD"}

src/Jackett.Common/Definitions/eztv.yml

@@ -12,7 +12,7 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.kim/
+  - https://eztv.unblockit.bz/
   - https://eztv.nocensor.biz/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -51,6 +51,7 @@ legacylinks:
   - https://eztv.nocensor.space/
   - https://eztv.unblockit.ws/
   - https://eztv.nocensor.work/
+  - https://eztv.unblockit.kim/
 
 caps:
   categories:

src/Jackett.Common/Definitions/filelisting.yml

@@ -31,7 +31,7 @@ settings:
 search:
   paths:
     # https://filelisting.com/result?q=bad+batch
-    - path: "result{{ if .Keywords }}?q={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "result{{ if .Keywords }}?q={{ .Keywords }}+in:title{{ else }}{{ end }}"
 
   rows:
     selector: table > tbody > tr:has(td.dn-title)

src/Jackett.Common/Definitions/finvip.yml

@@ -60,7 +60,6 @@ settings:
   - name: info_results
     type: info
     label: "Search results"
-    default: "For best results, increase the torrents number in your profile to 100."
     default: "<ol><li>Only the Xbtit style is supported.</li><ul>Make sure to set the <b>Style</b> option in your profile to <b>Xbtit</b>.</ul><li>For best results, increase the torrents number in your profile to 100.</li><ul>Set the <b>Torrents Per Page</b> option to <b>100</b>.</ul></ol>"
   - name: freeleech
     type: checkbox

src/Jackett.Common/Definitions/frozenlayer.yml

@@ -46,7 +46,7 @@ caps:
 search:
   paths:
     - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar{{ else }}descargas{{ end }}"
-    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&page=2{{ else }}descargas{{ end }}"
+    - path: "{{ if .Keywords }}buscar/descargas/{{ .Config.category }}/{{ .Keywords }}?search=Buscar&{{ else }}descargas?{{ end }}page=2"
   keywordsfilters:
     - name: re_replace # remove first season from search string
       args: ["(?i)(S1)", ""]
@@ -104,7 +104,7 @@ search:
     date_year:
       # 29 Oct 17
       optional: true
-      selector: td.fecha:not(:contains("d")):not(:contains("h"))
+      selector: td.fecha:not(:contains("d")):not(:contains("h")):not(:contains("m"))
       filters:
         - name: append
           args: " +01:00" # CET

src/Jackett.Common/Definitions/gay-torrentsorg.yml

@@ -58,6 +58,7 @@ caps:
     - {id: 23, cat: XXX, desc: "Chubs"}
     - {id: 25, cat: XXX, desc: "Cross Generation"}
     - {id: 51, cat: XXX, desc: "Doctor/Medical"}
+    - {id: 71, cat: XXX, desc: "Fan Sites"}
     - {id: 27, cat: XXX, desc: "Fetish"}
     - {id: 28, cat: XXX, desc: "Group Sex"}
     - {id: 30, cat: XXX, desc: "Hunks"}
@@ -82,7 +83,6 @@ caps:
     - {id: 41, cat: Movies, desc: "Non-Porn"}
     - {id: 41, cat: TV, desc: "Non-Porn"}
     - {id: 41, cat: Other, desc: "Non-Porn"}
-    - {id: 71, cat: XXX, desc: "Fan Sites"}
 
   modes:
     search: [q]
@@ -103,13 +103,15 @@ login:
 
 search:
   paths:
+    # https://gay-torrents.org/torrents_beta.php?search=&active=0&options=0
     - path: torrents_beta.php
-      method: get
   inputs:
     $raw: "{{ range .Categories }}category[]={{.}}&{{end}}"
     search: "{{ .Keywords }}"
     # 0 all, 1 active, 2 dead, 3 free, 4 50%free, 5 25%free, 6 packs
     active: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
+    # 0 title & tag, 1 title & descr
+    options: 0
     order: "{{ .Config.sort }}"
     by: "{{ .Config.order }}"
 
@@ -117,28 +119,28 @@ search:
     selector: div.torrent
 
   fields:
-    title:
-      selector: div:nth-child(2) > div:nth-child(1) > a:nth-child(1)
     category:
       selector: a[href^="torrents_beta.php?category="]
       attribute: href
       filters:
         - name: querystring
           args: category
+    title:
+      selector: a.torrent_link
     details:
-      selector: a[href^="details.php?id="]
+      selector: a.torrent_link
       attribute: href
     poster:
       selector: a.screenshot
       attribute: rel
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
     grabs:
       selector: div.downloadTimes
       filters:
         - name: replace
           args: ["No downloads yet", "0"]
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
     size:
       selector: div.size
     seeders:
@@ -151,7 +153,7 @@ search:
         - name: re_replace
           args: ["on (\\d{2}:\\d{2}) (\\d{2})-([a-zA-Z]{3})-(\\d{4})", "$2 $3 $4 $1"]
         - name: append
-          args: " +01:00"
+          args: " +01:00" # CET
         - name: dateparse
           args: "02 Jan 2006 15:04 -07:00"
     downloadvolumefactor:
@@ -162,4 +164,9 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
-# engine tbd
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 36 hours (as seconds = 36 x 60 x 60)
+      text: 129600
+# engine n/a

src/Jackett.Common/Definitions/gaytorrentru.yml

@@ -135,9 +135,16 @@ search:
     details:
       selector: a[href^="details.php?id="]
       attribute: href
-    download:
-      selector: a[href^="download.php/"]
+    id:
+      selector: a[href^="details.php?id="]
       attribute: href
+      filters:
+        - name: querystring
+          args: id
+    download:
+      # turn href="download.php/0738d444362fa610a08fb87b5c1bec798ca1731adbf3175b/GUARATORO.torrent
+      # into href="/download.php?id=0738d444362fa610a08fb87b5c1bec798ca1731adbf3175b&n=GUARATORO.torrent&p=dodownload
+      text: "download.php?id={{ .Result.id }}&n={{ .Result.title }}.torrent&p=dodownload"
     poster:
       selector: a[href^="details.php?id="]
       attribute: onmouseover

src/Jackett.Common/Definitions/girotorrent.yml

@@ -46,10 +46,11 @@ caps:
     - {id: 34, cat: TV/Anime, desc: "Anime Altri Cartoni"}
     - {id: 62, cat: TV/Anime, desc: "Anime Natale Bimbi Girotor"}
     # TELEVISIONE
-    - {id: 36, cat: TV, desc: "TV Serie TV"}
-    - {id: 77, cat: TV, desc: "TV Reality"}
-    - {id: 37, cat: TV, desc: "TV Film TV"}
+    - {id: 36, cat: TV, desc: "TV Serie"}
+    - {id: 99, cat: TV/HD, desc: "TV Serie Hevc"}
+    - {id: 37, cat: TV, desc: "TV Film"}
     - {id: 59, cat: TV/Sport, desc: "TV Sport"}
+    - {id: 77, cat: TV, desc: "TV Reality"}
     - {id: 38, cat: TV, desc: "TV Concerti-Spettacoli"}
     - {id: 39, cat: TV, desc: "TV Teatro-Cabaret"}
     - {id: 40, cat: TV/Documentary, desc: "Tv Documentario"}
@@ -62,20 +63,20 @@ caps:
     - {id: 58, cat: Audio, desc: "Musica Discografie"}
     - {id: 97, cat: Audio/Lossless, desc: "Musica Flac"}
     # SALA GIOCHI
-    - {id: 47, cat: PC/Games, desc: "PC Games"}
-    - {id: 48, cat: Console/PS3, desc: "PC Giochi PS2-PS3"}
-    - {id: 49, cat: Console/Wii, desc: "PC Giochi Nintendo Wii"}
-    - {id: 50, cat: Console/XBox, desc: "PC Giochi Xbox"}
-    - {id: 51, cat: Console/PSP, desc: "PC Giochi PSP"}
-    - {id: 52, cat: Console/3DS, desc: "PC Giochi DS-DS3"}
+    - {id: 47, cat: PC/Games, desc: "Giochi PC"}
+    - {id: 48, cat: Console/PS3, desc: "Giochi PS2-PS3"}
+    - {id: 49, cat: Console/Wii, desc: "Giochi Nintendo Wii"}
+    - {id: 50, cat: Console/XBox, desc: "Giochi Xbox"}
+    - {id: 51, cat: Console/PSP, desc: "Giochi PSP"}
+    - {id: 52, cat: Console/3DS, desc: "Giochi Nintendo DS-DS3"}
     # SOFTWARE
-    - {id: 54, cat: PC, desc: "PC Programmi Windows"}
-    - {id: 55, cat: PC/Mac, desc: "PC Mac"}
-    - {id: 69, cat: PC, desc: "PC Portable"}
-    - {id: 56, cat: PC, desc: "PC Linux"}
+    - {id: 54, cat: PC, desc: "Programmi Windows"}
+    - {id: 55, cat: PC/Mac, desc: "Programmi Mac"}
+    - {id: 69, cat: PC, desc: "Programmi Portable"}
+    - {id: 56, cat: PC, desc: "Programmi Linux"}
     # CELLULARI-PALMARI
     - {id: 68, cat: PC/Mobile-iOS, desc: "IPhone-IPad"}
-    - {id: 71, cat: PC/Mobile-Android, desc: "Android APP"}
+    - {id: 71, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 74, cat: Other, desc: "Varie"}
     - {id: 75, cat: Other, desc: "Immagini Wallpaper"}
 

src/Jackett.Common/Definitions/glodls.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.kim/
+  - https://glotorrents.unblockit.bz/
   - https://glotorrents.nocensor.biz/
 legacylinks:
   - https://glodls.rocks/
@@ -45,6 +45,7 @@ legacylinks:
   - https://glotorrents.nocensor.space/
   - https://glotorrents.unblockit.ws/
   - https://glotorrents.nocensor.work/
+  - https://glotorrents.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -38,6 +38,8 @@ caps:
     - {id: 94, cat: Movies, desc: "h 265"}
     - {id: 81, cat: Movies, desc: "ORIGINAL JAZYK"}
     - {id: 95, cat: Movies/Other, desc: "FILM RETRO"}
+    #
+    - {id: 115, cat: Movies/Other, desc: "RLS-HD"}
     # HUDBA
     - {id: 57, cat: Audio/Lossless, desc: "Hudba flac"}
     - {id: 58, cat: Audio/MP3, desc: "Hudba mp3"}

src/Jackett.Common/Definitions/ilcorsaroverde.yml

@@ -0,0 +1,273 @@
+---
+id: ilcorsaroverde
+name: Il Corsaro Verde
+description: "Il Corsaro Verde (iCV-CreW) is a ratioless ITALIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: it-IT
+type: private
+encoding: UTF-8
+links:
+  - https://www.icv-crew.com/
+
+caps:
+  # commented out categories are discussion-only forums
+  categorymappings:
+    # CIURMA
+#    - {id: "150", cat: Other, desc: "Regole per Postare"}
+    - {id: "140", cat: Other/Misc, desc: "Bozze - Sezione fruibile a tutti i nuovi Releaser", default: true}
+    # INFORMAZIONI E REGOLE DEL FORUM
+#    - {id: "108", cat: Other, desc: "Manifesto Generale"}
+#    - {id: "30", cat: Other, desc: "Disclaimer"}
+#    - {id: "76", cat: Other, desc: "Statuto"}
+#    - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
+#    - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
+#    - {id: "124", cat: Other, desc: "iCV Community"}
+    # PROGETTI
+#    - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
+#    - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
+#    - {id: "110", cat: Books, desc: "Progetto - Biblico"}
+#    - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
+#    - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
+    # MUSICA
+    - {id: "19", cat: Audio, desc: "Musica Audio - Tutti i formati", default: true}
+    - {id: "20", cat: Audio/Video, desc: "Musica Video - Standard Definition - High Definition", default: true}
+#    - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
+    # VIDEO
+    - {id: "6", cat: Movies/SD, desc: "Video - Screener", default: true}
+    - {id: "7", cat: Movies/SD, desc: "Video - Standard Definition", default: true}
+    - {id: "9", cat: Movies/HD, desc: "Video - High Definition H.264", default: true}
+    - {id: "74", cat: Movies/HD, desc: "Video - High Definition HEVC/H.265", default: true}
+    - {id: "11", cat: Movies/BluRay, desc: "Video - Blu-ray Full", default: true}
+    - {id: "8", cat: Movies/DVD, desc: "Video - DVD", default: true}
+    - {id: "95", cat: Movies, desc: "Video - Dispositivi Mobili (Portable)", default: true}
+    - {id: "79", cat: Movies, desc: "Video - TVRip - Standard Definition - High Definition", default: true}
+    - {id: "14", cat: TV/Other, desc: "Video - Documentari - Sportivi - Spettacoli - Lirica - Standard Definition - High Definition", default: true}
+#    - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
+    # SERIE TV
+    - {id: "12", cat: TV/SD, desc: "Serie TV - Standard Definition", default: true}
+    - {id: "102", cat: TV/HD, desc: "Serie TV - High definition H.264", default: true}
+    - {id: "161", cat: TV/HD, desc: "Serie TV - High definition HEVC/H.265", default: true}
+#    - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
+#    - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
+#    - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
+#    - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
+    # CARTONI ANIMATI - ANIME
+    - {id: "17", cat: Movies/SD, desc: "Cartoni Animati - Standard Definition - High Definition", default: true}
+    - {id: "18", cat: TV/HD, desc: "Cartoni Animati - Serie TV Standard Definition - High Definition", default: true}
+    - {id: "15", cat: TV/Anime, desc: "Anime - Standard Definition - High Definition", default: true}
+    - {id: "16", cat: TV/Anime, desc: "Anime - Serie TV Standard Definition - High Definition", default: true}
+    - {id: "89", cat: Movies/HD, desc: "Cartoni Animati - Anime - Serie Tv e Non - High Definition - HEVC/H.265", default: true}
+#    - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
+    # EBOOK - FUMETTI - RIVISTE - QUOTIDIANI
+    - {id: "25", cat: Books/EBook, desc: "Ebook", default: true}
+    - {id: "26", cat: Audio/Audiobook, desc: "Ebook Audio", default: true}
+    - {id: "170", cat: Books/Comics, desc: "Fumetti", default: true}
+    - {id: "28", cat: Books/Mags, desc: "Riviste - Quotidiani", default: true}
+    - {id: "47", cat: Other, desc: "Wallpapers - Poster - Calendari", default: true}
+#    - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
+    # SOFTWARE
+    - {id: "21", cat: PC/0day, desc: "Windows Software", default: true}
+#    - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
+#    - {id: "92", cat: PC, desc: "Windows Supporto "}
+    - {id: "138", cat: PC/Mac, desc: "macOS Software", default: true}
+#    - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
+#    - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
+#    - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
+#    - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
+    - {id: "23", cat: PC, desc: "Linux Software", default: true}
+#    - {id: "168", cat: PC, desc: "Linux Guide"}
+#    - {id: "93", cat: PC, desc: "Linux Supporto"}
+    - {id: "24", cat: PC, desc: "Guide & Tutorial Video", default: true}
+#    - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
+    # GAMES
+    - {id: "36", cat: PC/Games, desc: "Games - Pc Windows", default: true}
+    - {id: "158", cat: PC/Mac, desc: "Games - macOS", default: true}
+    - {id: "37", cat: Console/XBox 360, desc: "Games - Console Microsoft Xbox 360", default: true}
+    - {id: "38", cat: Console/PS3, desc: "Games - Console Sony PS3", default: true}
+    - {id: "152", cat: Console/PS4, desc: "Games - Console Sony PS4", default: true}
+#    - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
+#    - {id: "123", cat: PC/Games, desc: "Games - Guide"}
+#    - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
+    # ANDROID
+    - {id: "58", cat: PC/Mobile-Android, desc: "Android Apps", default: true}
+#    - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
+#    - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
+    # TEAM GRAFICO
+#    - {id: "88", cat: Other, desc: "Vetrina Grafica"}
+#    - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
+    # TAVERNA DEI CORSARI
+#    - {id: "39", cat: Other, desc: "Presentati alla Community"}
+#    - {id: "112", cat: Other, desc: "Assistenza Forum"}
+#    - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
+#    - {id: "83", cat: Other, desc: "Commenti Titoli "}
+#    - {id: "136", cat: Other, desc: "Sondaggi"}
+#    - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
+    # ARCHIVIO FORUM
+    - {id: "171", cat: PC/0day, desc: "Windows Software obsoleto", default: true}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info30s
+    type: info
+    label: 30s Delay for Searches
+    default: The site forces a 30s delay between searches, so you may get zero results if you perform searches too close together.
+
+login:
+  method: form
+  path: forum/index.php
+  form: form#frmLogin
+  inputs:
+    user: "{{ .Config.username }}"
+    passwrd: "{{ .Config.password }}"
+    cookieneverexp: on
+  error:
+    - selector: p[class="error"]
+  test:
+    path: forum/index.php
+    selector: li#button_logout
+
+download:
+  before:
+    pathselector:
+      selector: ul.quickbuttons a
+      attribute: href
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: forum/index.php?action=search2
+      method: post
+  inputs:
+    $raw: "{{ range .Categories }}brd[]={{.}}&{{end}}"
+    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    searchtype: 1
+    userspec: "*"
+    sort: id_msg|desc
+    show_complete: 1
+    subject_only: 1
+    minage: 0
+    maxage: 9999
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word, all keywords must be 2 characters or more
+
+  rows:
+    selector: div.search_results_posts
+
+  fields:
+    category:
+      selector: a[href*="index.php?board="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: board
+        - name: split
+          args: [".", 0]
+    title:
+      selector: a[href*="index.php?topic="]
+      filters:
+        # normalize to SXXEYY format
+        - name: re_replace # Stagione XX a YY --> SXX-YY
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\s?[ae-]\\s?(\\d{2,})\\b", "S$1-$2"]
+        - name: re_replace # Stagione XX --> SXX
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{2,})\\b", "S$1"]
+        - name: re_replace # Stagione X a YY --> S0X-YY
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\s?[ae-]\\s?(\\d{2,})\\b", "S0$1-$2"]
+        - name: re_replace # Stagione X a Y --> S0X-0Y
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\s?[ae-]\\s?(\\d{1})\\b", "S0$1-$02"]
+        - name: re_replace # Stagione X --> S0X
+          args: ["(?i)\\bStagion[ei]\\s?(\\d{1})\\b", "S0$1"]
+        - name: re_replace # remove various
+          args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP.?\\s(\\d{1,2})[\\s-](E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
+    details:
+      selector: a[href*="index.php?topic="]
+      attribute: href
+    download:
+      selector: a[href*="index.php?topic="]
+      attribute: href
+    date_today:
+      # Today at 18:31:59
+      # Oggi alle 18:31:59
+      selector: span.smalltext em:contains("Today"),  span.smalltext em:contains("Oggi")
+      optional: true
+      filters:
+        - name: replace
+          args: ["Today at", "Today"]
+        - name: replace
+          args: ["Oggi alle", "Today"]
+    date_year:
+      # 11 January 2021, 10:59:53
+      # 11 Gennaio 2021, 10:59:53
+      selector: span.smalltext em:not(:contains("Today")):not(:contains("Oggi"))
+      optional: true
+      filters:
+        - name: replace
+          args: ["Gennaio", "January"]
+        - name: replace
+          args: ["Febbraio", "February"]
+        - name: replace
+          args: ["Marzo", "March"]
+        - name: replace
+          args: ["Aprile", "April"]
+        - name: replace
+          args: ["Maggio", "May"]
+        - name: replace
+          args: ["Giugno", "June"]
+        - name: replace
+          args: ["Luglio", "July"]
+        - name: replace
+          args: ["Agosto", "August"]
+        - name: replace
+          args: ["Settembre", "September"]
+        - name: replace
+          args: ["Ottobre", "October"]
+        - name: replace
+          args: ["Novembre", "November"]
+        - name: replace
+          args: ["Dicembre", "December"]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "02 January 2006, 15:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_today .Result.date_year }}{{ or .Result.date_today .Result.date_year }}{{ else }}now{{ end }}"
+    size:
+      text: 512 MB
+    poster:
+      selector: img.bbc_img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["https://www.icv-crew.com/forum/proxy.php?request=", ""]
+        - name: urldecode
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# SMF 2.0.15

src/Jackett.Common/Definitions/indietorrents.yml

@@ -0,0 +1,141 @@
+---
+id: indietorrents
+name: Indietorrents
+description: "Indietorrents is a private Music tracker for independent music"
+language: en-GB
+encoding: UTF-8
+type: private
+links:
+  - https://www.indietorrents.com/
+
+caps:
+  categorymappings:
+    # there is a cat 2 Video but it is not supported by this indexer.
+    - {id: 1, cat: Audio, desc: "Music"}
+
+  modes:
+    search: [q]
+    music-search: [q, album, artist]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: time
+    options:
+      time: created
+      seeders: seeders
+      size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_cats
+    type: info
+    label: "About categories"
+    default: "This indexer only supports searching the <b>Audio</b> category. <i>Video</i> searching is not supported."
+  - name: info_results
+    type: info
+    label: "Search results"
+    default: "This indexer does not support <b>Torrent Groups</b>.<br />On your account <i>Settings</i> change <b>Torrent grouping</b>  to <b>DO NOT Group torrents by default</b>."
+
+login:
+  path: login.php?lang=
+  method: form
+  form: form#loginform
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    keeplogged: 1
+  error:
+    - selector: form#loginform:contains("incorrect")
+  test:
+    path: index.php
+    selector: a[href^="logout.php?auth="]
+
+search:
+  paths:
+    # https://www.indietorrents.com/torrents.php?searchstr=lily+konigsberg+we+need+to+talk+now+2021&action=basic&taglist=&tags_type=1&order_by=time&order_way=desc
+    - path: torrents.php
+  inputs:
+    searchstr: "{{ if or (.Query.Artist) (.Query.Album) }}{{ or (.Query.Artist) (.Query.Album) }}{{ else }}{{ .Keywords }}{{ end }}"
+    action: basic
+    taglist: ""
+    tags_type: 1
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
+    freetorrent: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    # restrict to audio as video generates different html on a mixed results page.
+    filter_cat[1]: 1
+
+  rows:
+    selector: table#torrent_table > tbody > tr[class^="group"]
+    after: 2
+
+  fields:
+    category:
+      text: 1
+    details:
+      selector: a[href^="torrents.php?id="]:last-of-type
+      attribute: href
+    download:
+      selector: a[href^="torrents.php?action=download&id="]
+      attribute: href
+    tags:
+      selector: div.tags
+    description:
+      selector: td.edition_info
+      filters:
+        - name: append
+          args: "</br>{{ .Result.tags }}"
+    files:
+      selector: td:nth-last-child(7)
+    date:
+      selector: td:nth-last-child(6) > span.time
+      attribute: title
+      filters:
+        - name: append
+          args: " +00:00" # GMT
+        - name: dateparse
+          args: "Jan 2 2006, 15:04 -07:00"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        "strong:contains(\"Freeleech!\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    title_details:
+      # artist and album
+      selector: td:nth-child(3)
+      remove: span, div.tags
+    title:
+      # torrent info
+      selector: a[href*="torrentid="]
+      remove: strong
+      filters:
+        - name: prepend
+          args: "{{ .Result.title_details }} "
+    minimumratio:
+      text: 0.60
+# Project Gazelle

src/Jackett.Common/Definitions/kisssub.yml

@@ -0,0 +1,94 @@
+---
+id: kisssub
+name: KissSub
+description: "KissSub is a CHINESE Public torrent index"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  - https://kisssub.org/
+
+caps:
+  categorymappings:
+    - {id: 动画, cat: TV/Anime, desc: 动画 (Animation Series and Movies)}
+    - {id: 漫画, cat: Books/Comics, desc: 漫画 (Comics and Manga)}
+    - {id: 音乐, cat: Audio, desc: 音乐 (Music OST and Singles)}
+    - {id: 周边, cat: TV/Other, desc: 周边 (Live Action)}
+    - {id: 其它, cat: TV/Anime, desc: 其它 (Other)}
+    - {id: Raw, cat: TV/Anime, desc: Raw}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://kisssub.org/search.php?keyword=moon+720p
+    - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}{{ end }}"
+
+  rows:
+    selector: table[id="listTable"] > tbody > tr:has( a[href^="show-"])
+
+  fields:
+    category:
+      selector: a[href^="sort-"]
+    title:
+      selector: a[href^="show-"]
+    details:
+      selector: a[href^="show-"]
+      attribute: href
+    infohash:
+      selector: a[href^="show-"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: show-([0-9A-Fa-f]{40})
+    date_today:
+       # 今天 00:35	 (Today)
+      optional: true
+      selector: td:nth-child(1):contains("昨天")
+      filters:
+        - name: replace
+          args: ["昨天", "Today"]
+        - name: append
+          args: " +08:00" # CST
+        - name: fuzzytime
+    date_yday:
+      # 昨天 22:50	 (Yesterday)
+      optional: true
+      selector: td:nth-child(1):contains("今天")
+      filters:
+        - name: replace
+          args: ["今天", "Yesterday"]
+        - name: append
+          args: " +08:00" # CST
+        - name: fuzzytime
+    date_year:
+      # 2020/12/24
+      optional: true
+      selector: td:nth-child(1):not(:contains("昨天")):not(:contains("今天"))
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006/01/02 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(4)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      selector: td:nth-child(6)
+    grabs:
+      selector: td:nth-child(7)
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine MioBT

src/Jackett.Common/Definitions/leech24.yml

@@ -0,0 +1,161 @@
+---
+id: leech24
+name: leech24
+description: "leech24 is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://leech24.net/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: TV/Anime, desc: "Anime: All"}
+    - {id: 18, cat: PC/0day, desc: "Apps: PC"}
+    - {id: 19, cat: PC/Mac, desc: "Apps: Mac"}
+    - {id: 20, cat: PC, desc: "Apps: Linux"}
+    - {id: 21, cat: PC/Mobile-Other, desc: "Apps: Other"}
+    - {id: 9, cat: TV/Documentary, desc: "Documentaries: All"}
+    - {id: 10, cat: PC/Games, desc: "Games: PC"}
+    - {id: 11, cat: Console/PSP, desc: "Games: PS2"}
+    - {id: 43, cat: Console/PS3, desc: "Games: PS3"}
+    - {id: 12, cat: Console/PSP, desc: "Games: PSP"}
+    - {id: 13, cat: Console/XBox, desc: "Games: Xbox"}
+    - {id: 14, cat: Console/XBox 360, desc: "Games: Xbox360"}
+    - {id: 15, cat: Console/PSP, desc: "Games: PS1"}
+    - {id: 16, cat: Console/Other, desc: "Games: Dreamcast"}
+    - {id: 44, cat: Console/Wii, desc: "Games: Wii"}
+    - {id: 45, cat: Console/NDS, desc: "Games: DS"}
+    - {id: 46, cat: Console/Other, desc: "Games: GameCube"}
+    - {id: 17, cat: Console/Other, desc: "Games: Other"}
+    - {id: 1, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 2, cat: Movies/SD, desc: "Movies: Divx/Xvid"}
+    - {id: 3, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: HD"}
+    - {id: 4, cat: Movies/Other, desc: "Movies: Other"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: Lossless"}
+    - {id: 24, cat: Audio/Video, desc: "Music: DVD"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 26, cat: Audio/Other, desc: "Music: Radio"}
+    - {id: 27, cat: Audio/Other, desc: "Music: Other"}
+    - {id: 33, cat: PC, desc: "Other: Emulation"}
+    - {id: 34, cat: PC/Mobile-Other, desc: "Other: PPC/PDA"}
+    - {id: 35, cat: Audio, desc: "Other: Sounds"}
+    - {id: 36, cat: Books/EBook, desc: "Other: E-Books"}
+    - {id: 37, cat: Other, desc: "Other: Images"}
+    - {id: 38, cat: PC/Mobile-Other, desc: "Other: Mobile Phone"}
+    - {id: 39, cat: Other, desc: "Other: Extra Pars/Fills"}
+    - {id: 40, cat: Other, desc: "Other: Other"}
+    - {id: 5, cat: TV/SD, desc: "TV: DVD"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
+    - {id: 6, cat: TV/SD, desc: "TV: Divx/Xvid"}
+    - {id: 7, cat: TV/Other, desc: "TV: pack"}
+    - {id: 47, cat: XXX, desc: "xxx: xxx"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    # https://leech24.net/torrents-search.php?c3=1&c1=1&c2=1&c42=1&c4=1&c7=1&search=&cat=0&incldead=1&freeleech=0&lang=0
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all, 1 english, etc
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid search and does not return imdb link in results
+
+# The search page states that: You can search using phrases contained within , you can include words with + you can exclude words with -
+# but adding + to words causes 0 results, so we will add an andmatch since the default seems to be a keywords OR search.
+#  keywordsfilters:
+#    - name: re_replace
+#      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.ttable_headinner tr.t-row:has(a[href^="download.php?id="])
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src="images/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# TorrentTrader v2-svn

src/Jackett.Common/Definitions/limetorrents.yml

@@ -6,9 +6,10 @@ language: en-US
 type: public
 encoding: UTF-8
 followredirect: true
+# changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.pro/
-  - https://limetorrents.unblockit.kim/
+  - https://limetorrents.unblockit.bz/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.biz/
 legacylinks:
@@ -50,6 +51,7 @@ legacylinks:
   - https://limetorrents.nocensor.space/
   - https://limetorrents.unblockit.ws/
   - https://limetorrents.nocensor.work/
+  - https://limetorrents.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/limetorrentsclone.yml

@@ -0,0 +1,125 @@
+---
+id: limetorrentsclone
+name: LimeTorrents clone
+description: "LimeTorrents clone is a Public LimeTorrents clone for TV / MOVIES / GENERAL"
+language: en-US
+type: public
+encoding: UTF-8
+followredirect: true
+# changes to this indexer should also be made to limetorrents
+links:
+  - https://www.limetorrents.to/
+
+caps:
+  categorymappings:
+    - {id: "TV shows", cat: TV, desc: "TV shows"}
+    - {id: Movies, cat: Movies, desc: Movies}
+    - {id: Music, cat: Audio, desc: Music}
+    - {id: Games, cat: Console, desc: Games}
+    - {id: Applications, cat: PC/0day, desc: Applications}
+    - {id: Other, cat: Other, desc: Other}
+    - {id: Anime, cat: TV/Anime, desc: Anime}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+
+settings:
+  - name: downloadlink
+    type: select
+    label: Download link
+    default: "magnet:"
+    options:
+      "http://itorrents.org/": iTorrents.org
+      "magnet:": magnet
+  - name: downloadlink2
+    type: select
+    label: Download link (fallback)
+    default: "http://itorrents.org/"
+    options:
+      "http://itorrents.org/": iTorrents.org
+      "magnet:": magnet
+  - name: info_download
+    type: info
+    label: About the Download links
+    default: As the .torrent download links on this site are known to fail from time to time, you can optionally set as a fallback an automatic alternate link.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      seeds: seeders
+      size: size
+  - name: info_8000
+    type: info
+    label: About LimeTorrents Categories
+    default: LimeTorrents only returns category <b>Other</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 8000(Other) category.
+
+download:
+  # the .torrent url is on the on the details page
+  selectors:
+    - selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink }}"]
+      attribute: href
+    - selector: a.csprite_dltorrent[href^="{{ .Config.downloadlink2 }}"]
+      attribute: href
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/all/{{ .Keywords }}/{{ .Config.sort }}/1/{{ else }}/latest100{{ end }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode
+
+  rows:
+    selector: .table2 > tbody > tr[bgcolor]
+
+  fields:
+    category:
+      text: Other
+    category|noappend:
+      optional: true
+      selector: td:nth-child(2)
+      filters:
+        - name: split
+          args: ["-", 1]
+        - name: replace
+          args: [" in ", ""]
+        - name: replace
+          args: [".", ""]
+    title:
+      selector: div.tt-name > a[href^="/"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "/(.+?)-torrent-\\d+\\.html"
+        - name: re_replace
+          args: ["-", " "]
+    details:
+      selector: div.tt-name > a[href^="/"]
+      attribute: href
+    download:
+      selector: div.tt-name > a[href^="/"]
+      attribute: href
+    date:
+      selector: td:nth-child(2)
+      filters:
+        - name: split
+          args: ["-", 0]
+        - name: replace
+          args: ["Last Month", "1 month ago"]
+        - name: replace
+          args: ["+", " ago"]
+    size:
+      selector: td:nth-child(3)
+    seeders:
+      selector: .tdseed
+    leechers:
+      selector: .tdleech
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/magicheaven.yml

@@ -5,6 +5,7 @@ description: "magic-heaven is a Private Torrent Tracker for MOVIES / TV / GENERA
 language: en-US
 type: private
 encoding: UTF-8
+testlinktorrent: false
 links:
   - https://magic-heaven.info/
 
@@ -111,6 +112,16 @@ login:
     path: index.php
     selector: a[href*="/logout.php?logouthash="]
 
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ re_replace  .DownloadUri.PathAndQuery \".*torrent-details-(\\d+).*\" \"$1\"}}"
+  selectors:
+    - selector: a[href*="download-torrent-"]
+      attribute: href
+
 search:
   paths:
     - path: browse.php
@@ -131,18 +142,18 @@ search:
       args: ["[^a-zA-Z0-9]+", "%"]
 
   rows:
-    selector: "table#sortabletable tbody tr:has(a[href*=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+    selector: "table#sortabletable tbody tr:has(a[href*=\"download-torrent-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href*="browse.php?category="]
+      selector: a[href*="torrent-category-"]
       attribute: href
       filters:
-        - name: querystring
-          args: category
+        - name: regexp
+          args: (\d+)
     title_default:
       # is often abbreviated
-      selector: a[href*="details.php?id="]
+      selector: a[href*="torrent-details-"]
     title_optional:
       # usually longer than details title
       selector: div[id^="port-content-"] div
@@ -150,15 +161,11 @@ search:
     title:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     details:
-      selector: a[href*="details.php?id="]
+      selector: a[href*="torrent-details-"]
       attribute: href
     download:
-      selector: a[href*="download.php?id="]
+      selector: a[href*="torrent-details-"]
       attribute: href
-    magnet:
-      selector: a[href^="magnet:?xt="]
-      attribute: href
-      optional: true
     poster:
       selector: div[id^="port-content-"] img
       attribute: src
@@ -191,4 +198,4 @@ search:
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
-# TS Special Edition v.7.5
+# TS Special Edition v.8.0

src/Jackett.Common/Definitions/magico.yml

@@ -286,5 +286,5 @@ search:
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     date:
-      text: "{{ if .Result.date_unix .Result.date_day or .Result.date_year or .Result.date_other }}{{ or .Result.date_unix .Result.date_day or .Result.date_year or .Result.date_other }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_unix .Result.date_day .Result.date_year .Result.date_other }}{{ or .Result.date_unix .Result.date_day .Result.date_year .Result.date_other }}{{ else }}now{{ end }}"
 # TSUE 2.2

src/Jackett.Common/Definitions/majomparade.yml

@@ -74,7 +74,6 @@ login:
   method: cookie
   inputs:
     cookie: "{{ .Config.cookie }}"
-    user-agent: "[ .Config.useragent ]"
   test:
     path: letoltes.php
     selector: a[href^="logout.php?getUnique="]
@@ -98,6 +97,9 @@ search:
     k: yes
     tipuska: 1
 
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   rows:
     selector: table#table > tbody > tr:has(a[href^="download.php?torrent="])
 

src/Jackett.Common/Definitions/megamixtracker.yml

@@ -0,0 +1,187 @@
+---
+id: megamixtracker
+name: MegamixTracker
+description: "MegamixTracker is a HUNGARIAN Private Tracker for MOVIES / TV"
+language: hu-HU
+type: private
+encoding: ISO-8859-2
+links:
+  - https://megamixtracker.hu/
+
+caps:
+  categorymappings:
+    - {id: 26, cat: TV/Anime, desc: "Anime/Hu"}
+    - {id: 27, cat: TV/Anime, desc: "Anime/Eng"}
+    - {id: 9, cat: Books/EBook, desc: "eBook/Hu"}
+    - {id: 16, cat: Books/EBook, desc: "eBook/Eng"}
+    - {id: 38, cat: Movies/BluRay, desc: "Film/BR-BDRIP/Hu"}
+    - {id: 39, cat: Movies/BluRay, desc: "Film/BR-BDRIP/Eng"}
+    - {id: 4, cat: Movies/SD, desc: "Film/CAM"}
+    - {id: 32, cat: Movies/DVD, desc: "Film/DVD9/Hun"}
+    - {id: 31, cat: Movies/DVD, desc: "Film/DVD9/Eng"}
+    - {id: 6, cat: Movies/DVD, desc: "Film/DVDR/Hu"}
+    - {id: 5, cat: Movies/DVD, desc: "Film/DVDR/Eng"}
+    - {id: 3, cat: Movies/HD, desc: "Film/HD/Hu"}
+    - {id: 2, cat: Movies/HD, desc: "Film/HD/Eng"}
+    - {id: 1, cat: Movies/SD, desc: "Film/XviD/Hu"}
+    - {id: 11, cat: Movies/SD, desc: "Film/XviD/En"}
+    - {id: 13, cat: Console, desc: "Játék/Konzol"}
+    - {id: 17, cat: PC/Games, desc: "Játék/PC"}
+    - {id: 18, cat: PC/Mobile-Other, desc: "Mobiltelefon"}
+    - {id: 7, cat: PC/0day, desc: "Program/RIP"}
+    - {id: 24, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 34, cat: TV/HD, desc: "Sorozat/HD/Hun"}
+    - {id: 33, cat: TV/HD, desc: "Sorozat/HD/Eng"}
+    - {id: 12, cat: TV/SD, desc: "Sorozat/Xvid/Hun"}
+    - {id: 28, cat: TV/SD, desc: "Sorozat/Xvid/Eng"}
+    - {id: 14, cat: Other, desc: "Vegyes"}
+    - {id: 30, cat: XXX/DVD, desc: "XXX/DVD"}
+    - {id: 29, cat: XXX/x264, desc: "XXX/HD"}
+    - {id: 20, cat: XXX/ImageSet, desc: "XXX/Kép"}
+    - {id: 15, cat: XXX/XviD, desc: "XXX/Xvid"}
+    - {id: 19, cat: Audio/Video, desc: "Zene/Klipp"}
+    - {id: 35, cat: Audio/MP3, desc: "Zene/Mp3/Hun"}
+    - {id: 8, cat: Audio/MP3, desc: "Zene/Mp3/Külföldi"}
+    - {id: 40, cat: Audio/Other, desc: "Zene/Podcast"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: title
+      4: added
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    biztonsagos: yes
+  selectorinputs:
+    csrf:
+      selector: input[name="csrf"]
+      attribute: value
+  error:
+    - selector: div.div_tartalom:contains("Sikertelen bejelentkezés")
+  test:
+    path: index.php
+    selector: a[href^="logout.php?hash="]
+
+search:
+  paths:
+    - path: browse2.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 deadonly
+    miben: 1
+    # nincs_megadva, elfogadva, hibas, nincs
+    moderalas: nincs_megadva
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # site does not support imdbid searching
+
+  rows:
+    selector: "tr.tbody{{ if .Config.freeleech }}:has(img[src=\"kepek/ikon_free.png\"]){{ else }}{{ end }}"
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse2.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href*="klappe("]
+    id:
+      selector: a[href*="klappe("]
+      attribute: href
+      filters:
+        - name: regexp
+          args: (\d+)
+    details:
+      text: "details.php?id={{ .Result.id }}"
+    poster:
+      selector: img[border][onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) "
+    description:
+      selector: i
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      # 2021-11-10&nbsp;09:31:58 (17 órája  és 44 perce)
+      selector: span.feltoltve-ezelott
+      filters:
+        - name: regexp
+          args: "(\\d{4}-\\d{2}-\\d{2}\\s\\d{2}:\\d{2}:\\d{2})"
+        - name: append
+          args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    grabs:
+      selector: td:last-child
+    downloadvolumefactor:
+      case:
+        img[src="kepek/ikon_free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "font[onMouseover]:contains(\"2x\")": 2
+        "font[onMouseover]:contains(\"4x\")": 4
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 14 days (as seconds = 14 x 24 x 60 x 60)
+      text: 1209600
+# TBDEV custom v2.0

src/Jackett.Common/Definitions/mircrew.yml

@@ -92,7 +92,7 @@ download:
   before:
     # thankyou link: ./viewtopic.php?f=52&p=65417&thanks=65417&to_id=54&from_id=3950
     pathselector:
-      selector: a[id^="lnk_thanks_post"]
+      selector: ul.post-buttons li:nth-last-child(1) a
       attribute: href
   selectors:
     - selector: a[href^="magnet:?xt="]

src/Jackett.Common/Definitions/moviesite.yml

@@ -0,0 +1,205 @@
+---
+id: moviesite
+name: Moviesite
+description: "Moviesite is a HUNGARIAN private tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: ISO-8859-2
+links:
+  - http://moviesite.info.hu/ # does not support https ERR_CONNECTION_REFUSED
+
+caps:
+  categorymappings:
+    - {id: 25, cat: Movies/SD, desc: "CAM"}
+    - {id: 4, cat: Movies/DVD, desc: "DVD/Eng"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD/Hun"}
+    - {id: 6, cat: Movies/HD, desc: "HD/Eng"}
+    - {id: 5, cat: Movies/HD, desc: "HD/Hun"}
+    - {id: 13, cat: PC/Games, desc: "Játék"}
+    - {id: 20, cat: Other, desc: "Képek"}
+    - {id: 16, cat: Books/EBook, desc: "Könyv"}
+    - {id: 11, cat: Movies, desc: "Mese, Animáció"}
+    - {id: 21, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 23, cat: PC/ISO, desc: "Program/iso"}
+    - {id: 24, cat: PC/0day, desc: "Program/rip"}
+    - {id: 8, cat: TV, desc: "Sorozat/Eng"}
+    - {id: 7, cat: TV, desc: "Sorozat/Hun"}
+    - {id: 2, cat: Movies/SD, desc: "Xvid/Eng"}
+    - {id: 1, cat: Movies/SD, desc: "Xvid/Hun"}
+    - {id: 9, cat: XXX, desc: "XXX-film"}
+    - {id: 19, cat: XXX/ImageSet, desc: "xxx-képek"}
+    - {id: 12, cat: Audio, desc: "Zene"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-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: added
+      size: size
+      seeders: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: DESC
+    options:
+      DESC: desc
+      ASC: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek oldalanként</b> setting to <b>40 Torrent oldalanként</b> on your account profile.
+
+login:
+  method: form
+  path: login.php
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    logintype: yes
+  error:
+    - selector: table:contains("Hiba történt!")
+  test:
+    path: index.php
+    selector: a[href*="logout.php?logouthash="]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    sort_order: yes
+    page: 0
+    do: search
+    # does not support multi categories so defaulting to ALL
+    category: 0
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # t_both2, t_name, t_t_image4, t_description, t_both, t_uploader, t_genre
+    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
+    sortby: "{{ .Config.sort }}"
+    orderby: "{{ .Config.type }}"
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table tbody tr:has(a[href*="download.php?id="]:has(img[src="../pic/yes.png"]))
+
+  fields:
+    category:
+      selector: a[href*="browse.php?browse_categories"]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title_default:
+      # is often abbreviated
+      selector: a[href^="details.php?id="]
+    title_optional:
+      # usually longer than details title
+      selector: a[href*="download.php?id="]:has(img[src="../pic/yes.png"])
+      attribute: title
+      optional: true
+      filters:
+        - name: replace
+          args: ["Download torrent: ", ""]
+        - name: replace
+          args: ["Torrent letöltése: ", ""]
+        - name: replace
+          args: ["Downloadeaza torentul: ", ""]
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]:has(img[src="../pic/yes.png"])
+      attribute: href
+    poster:
+      selector: div.bottom > img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["../pic/+18.png", ""]
+    description:
+      selector: div center font b i
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date_today:
+       # Ma 11-06 18:19	 (Today)
+      optional: true
+      selector: td:nth-child(2):contains("Ma ")
+      filters:
+        - name: regexp
+          args: "Ma \\d{2}-\\d{2} (\\d{2}:\\d{2})"
+        - name: prepend
+          args: "Today "
+        - name: append
+          args: " +01:00" # CET
+        - name: fuzzytime
+    date_yday:
+      # Tegnap 11-05 15:15	 (Yesterday)
+      optional: true
+      selector: td:nth-child(2):contains("Tegnap ")
+      filters:
+        - name: regexp
+          args: "Tegnap \\d{2}-\\d{2} (\\d{2}:\\d{2})"
+        - name: prepend
+          args: "Yesterday "
+        - name: append
+          args: " +01:00" # CET
+        - name: fuzzytime
+    date_year:
+      # 2021-10-28 10-28 20:18
+      optional: true
+      selector: td:nth-child(2):not(:contains("Tegnap ")):not(:contains("Ma "))
+      filters:
+        - name: regexp
+          args: "(\\d{4}-\\d{2}-\\d{2} \\d{2}-\\d{2} \\d{2}:\\d{2})"
+        - name: re_replace
+          args: ["(\\d{4}-\\d{2}-\\d{2} )\\d{2}-\\d{2} (\\d{2}:\\d{2})", "$1$2"]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-last-child(2)
+    files:
+      selector: td:nth-last-child(6)
+    grabs:
+      selector: td:nth-last-child(2) b b
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src$="freedownload.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="x2.gif"]: 2
+        "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# TS Special Edition v5.6

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -64,6 +64,13 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -123,6 +130,9 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 

src/Jackett.Common/Definitions/noname-club.yml

@@ -52,6 +52,7 @@ caps:
     - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
     - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
     - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"}
     - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"}
     - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
     - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}

src/Jackett.Common/Definitions/noname-clubl.yml

@@ -62,6 +62,7 @@ caps:
     - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
     - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
     - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"}
     - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"}
     - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
     - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}

src/Jackett.Common/Definitions/opensharing.yml

@@ -49,6 +49,7 @@ caps:
     - {id: 425, cat: XXX, desc: "Movies XXX: С Русским переводом!"}
     - {id: 1195, cat: XXX, desc: "Movies XXX: LegalPorno"}
     - {id: 1200, cat: XXX, desc: "Movies XXX: Solo & Masturbation"}
+    - {id: 7000, cat: XXX, desc: "Movies XXX: -= XXX =-"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.sh/
-  - https://oxtorrent.unblockit.kim/
+  - https://www.oxtorrent.vc/
+  - https://oxtorrent.unblockit.bz/
   - https://oxtorrent.nocensor.biz/
 legacylinks:
   - https://wwv.oxtorrent.com/
@@ -42,6 +42,9 @@ legacylinks:
   - https://oxtorrent.unblockit.ws/
   - https://www.oxtorrent.nz/
   - https://oxtorrent.nocensor.work/
+  - https://oxtorrent.unblockit.kim/
+  - https://www.oxtorrent.sh/
+  - https://www.oxtorrent.pl/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/p2pbg.yml

@@ -11,40 +11,40 @@ links:
 caps:
   categorymappings:
     # movies
-    - {id: 1, cat: Movies/SD, desc: "Movies-XviD"}
-    - {id: 55, cat: Movies/3D, desc: "Movies-3D"}
-    - {id: 16, cat: Movies/HD, desc: "Movies-x264"}
-    - {id: 11, cat: Movies/DVD, desc: "Movies-DVD"}
-    - {id: 17, cat: Movies/HD, desc: "Movies-MPEG2"}
-    - {id: 18, cat: Movies/BluRay, desc: "Movies-BR/HD-DVD"}
-    - {id: 7, cat: TV/Documentary, desc: "Movies-Documentaries"}
-    - {id: 35, cat: Movies, desc: "Movies-GSM"}
-    - {id: 34, cat: Movies, desc: "Movies-BG"}
-    - {id: 24, cat: TV/SD, desc: "TV-BG"}
-    - {id: 14, cat: TV, desc: "TV-Shows"}
-    - {id: 15, cat: TV, desc: "TV-Boxset"}
-    - {id: 38, cat: TV/Anime, desc: "TV-Cartoons"}
+    - {id: 1, cat: Movies/SD, desc: "Movies XviD"}
+    - {id: 55, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 16, cat: Movies/HD, desc: "Movies x264"}
+    - {id: 11, cat: Movies/DVD, desc: "Movies DVD"}
+    - {id: 17, cat: Movies/HD, desc: "Movies MPEG2"}
+    - {id: 18, cat: Movies/BluRay, desc: "Movies BR/HD DVD"}
+    - {id: 7, cat: TV/Documentary, desc: "Movies Documentaries"}
+    - {id: 35, cat: Movies, desc: "Movies GSM"}
+    - {id: 34, cat: Movies, desc: "Movies BG"}
+    - {id: 24, cat: TV/SD, desc: "TV BG"}
+    - {id: 14, cat: TV, desc: "TV Shows"}
+    - {id: 15, cat: TV, desc: "TV Boxset"}
+    - {id: 38, cat: TV/Anime, desc: "TV Cartoons"}
     # music
-    - {id: 2, cat: Audio/MP3, desc: "Music-Song"}
-    - {id: 28, cat: Audio, desc: "Music-Album"}
-    - {id: 29, cat: Audio, desc: "Music-Discography"}
-    - {id: 3, cat: Audio/Video, desc: "Music-DVD"}
-    - {id: 19, cat: Audio/Video, desc: "Music-Video"}
+    - {id: 2, cat: Audio/MP3, desc: "Music Song"}
+    - {id: 28, cat: Audio, desc: "Music Album"}
+    - {id: 29, cat: Audio, desc: "Music Discography"}
+    - {id: 3, cat: Audio/Video, desc: "Music DVD"}
+    - {id: 19, cat: Audio/Video, desc: "Music Video"}
     # games
-    - {id: 8, cat: PC/Games, desc: "Games-PC ISO"}
-    - {id: 9, cat: PC/Games, desc: "Games-PC Rips"}
-    - {id: 33, cat: Console/Wii, desc: "Games-Wii"}
-    - {id: 12, cat: Console/PS3, desc: "Games-PS2"}
-    - {id: 23, cat: Console/PS3, desc: "Games-PS3"}
-    - {id: 20, cat: Console/PSP, desc: "Games-PSP"}
-    - {id: 21, cat: Console/XBox, desc: "Games-XboX"}
-    - {id: 22, cat: Console/XBox 360, desc: "Games-X360"}
+    - {id: 8, cat: PC/Games, desc: "Games PC ISO"}
+    - {id: 9, cat: PC/Games, desc: "Games PC Rips"}
+    - {id: 33, cat: Console/Wii, desc: "Games Wii"}
+    - {id: 12, cat: Console/PS3, desc: "Games PS2"}
+    - {id: 23, cat: Console/PS3, desc: "Games PS3"}
+    - {id: 20, cat: Console/PSP, desc: "Games PSP"}
+    - {id: 21, cat: Console/XBox, desc: "Games XboX"}
+    - {id: 22, cat: Console/XBox 360, desc: "Games X360"}
     # appz
-    - {id: 26, cat: PC/ISO, desc: "Appz PC-ISO"}
+    - {id: 26, cat: PC/ISO, desc: "Appz PC ISO"}
     - {id: 31, cat: PC/0day, desc: "Appz Ripped"}
-    - {id: 30, cat: PC, desc: "Appz-Linux"}
+    - {id: 30, cat: PC, desc: "Appz Linux"}
     - {id: 49, cat: PC/Mac, desc: "Appz MacOS"}
-    - {id: 27, cat: PC, desc: "Appz-GSM"}
+    - {id: 27, cat: PC, desc: "Appz GSM"}
     # sports
     - {id: 5, cat: TV/Sport, desc: "Sport F1"}
     - {id: 51, cat: TV/Sport, desc: "Sport"}
@@ -53,8 +53,8 @@ caps:
     - {id: 4, cat: Other, desc: "Other"}
     - {id: 37, cat: Other/Misc, desc: "Pictures"}
     - {id: 39, cat: Other, desc: "e-Learning"}
-    - {id: 52, cat: PC/Mobile-Other, desc: "Mobile-GSM"}
-    - {id: 40, cat: PC/Mobile-iOS, desc: "Mobile-iPhone"}
+    - {id: 52, cat: PC/Mobile-Other, desc: "Mobile GSM"}
+    - {id: 40, cat: PC/Mobile-iOS, desc: "Mobile iPhone"}
     # 3x
     - {id: 13, cat: XXX, desc: "XXX"}
     - {id: 54, cat: XXX/x264, desc: "XXX HD"}
@@ -126,25 +126,30 @@ search:
     selector: table.lista tr td table.lista tr:has(a[href^="index.php?page=torrent-details"])
 
   fields:
-    title:
-      selector: td a[onclick]
-      attribute: title
-      filters:
-        - name: replace
-          args: ["View details: ", ""]
-        - name: replace
-          args: ["Преглед на детайли: ", ""]
-        - name: replace
-          args: ["Преглед на детайли: ", ""]
-    details:
-      selector: td a[href*="id="]
-      attribute: href
     category:
       selector: td a[href*="category="]
       attribute: href
       filters:
         - name: querystring
           args: category
+    title_default:
+      # often abbreviated
+      selector: td:nth-child(2) a
+    title_optional:
+      # usually full length
+      selector: td a[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: replace
+          args: ["View details: ", ""]
+        - name: replace
+          args: ["Преглед на детайли: ", ""]
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: td a[href*="id="]
+      attribute: href
     download:
       selector: td a[href*="id="]
       attribute: href
@@ -154,9 +159,9 @@ search:
         - name: prepend
           args: "download.php?id="
         - name: append
-          args: "&f={{.Result.title}}.torrent"
+          args: "&f={{ .Result.title }}.torrent"
     poster:
-      selector: td img[src="/torrentimg/pic.png"]
+      selector: td a:has(img[src^="/torrentimg/pic"])
       attribute: onmouseover
       filters:
         - name: regexp
@@ -165,18 +170,18 @@ search:
     date_day:
       # Yesterday
       # Вчера
-      selector: td:nth-child(6):not(:contains("/"))
+      selector: td:nth-last-child(5):not(:contains("/"))
       optional: true
       filters:
-        - name: replace
-          args: ["сейчас", "now"]
-        - name: replace
-          args: ["сегодня", "Today"]
-        - name: replace
-          args: ["вчера", "Yesterday"]
+        - name: re_replace
+          args: ["(?i)сейчас|Сега", "now"]
+        - name: re_replace
+          args: ["(?i)сегодня|Днес", "Today"]
+        - name: re_replace
+          args: ["(?i)вчера|Вчера", "Yesterday"]
     date_year:
       # 14/03/2019
-      selector: td:nth-child(6):contains("/")
+      selector: td:nth-last-child(5):contains("/")
       optional: true
       filters:
         - name: append
@@ -186,13 +191,13 @@ search:
     date:
       text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(7)
+      selector: td:nth-last-child(4)
     seeders:
-      selector: td:nth-child(8)
+      selector: td:nth-last-child(3)
     leechers:
-      selector: td:nth-child(9)
+      selector: td:nth-last-child(2)
     grabs:
-      selector: td:nth-child(10)
+      selector: td:nth-last-child(1)
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/piratadigital.yml

@@ -16,6 +16,7 @@ caps:
     - {id: 4, cat: PC/Games, desc: "Jogos"}
     - {id: 5, cat: PC/0day, desc: "Aplicativos"}
     - {id: 7, cat: Other, desc: "Cursos"}
+    - {id: 8, cat: Movies/3D, desc: "3D"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/piratbit.yml

@@ -179,6 +179,7 @@ caps:
     # Programs, Windows and other, Design
     - {id: 1808, cat: PC, desc: "Оформление раздач (Программы и Дизайн)"}
     - {id: 181, cat: PC, desc: "Предложения по улучшению"}
+    - {id: 1861, cat: PC, desc: " |- Windows 11"}
     - {id: 1722, cat: PC, desc: " |- Windows 10"}
     - {id: 1628, cat: PC, desc: " |- Windows 8"}
     - {id: 1316, cat: PC, desc: " |- Windows 7"}

src/Jackett.Common/Definitions/piratbitl.yml

@@ -179,6 +179,7 @@ caps:
     # Programs, Windows and other, Design
     - {id: 1808, cat: PC, desc: "Оформление раздач (Программы и Дизайн)"}
     - {id: 181, cat: PC, desc: "Предложения по улучшению"}
+    - {id: 1861, cat: PC, desc: " |- Windows 11"}
     - {id: 1722, cat: PC, desc: " |- Windows 10"}
     - {id: 1628, cat: PC, desc: " |- Windows 8"}
     - {id: 1316, cat: PC, desc: " |- Windows 7"}

src/Jackett.Common/Definitions/pirateiro.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://pirateiro.com/
   - https://pirateiro.eu/
-  - https://pirateiro.unblockit.kim/
+  - https://pirateiro.unblockit.bz/
 legacylinks:
   - http://pirateiro.com/
   - https://pirateiro.unblockit.pro/
@@ -31,6 +31,7 @@ legacylinks:
   - https://pirateiro.unblockit.uno/
   - https://pirateiro.unblockit.ch/
   - https://pirateiro.unblockit.ws/
+  - https://pirateiro.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pixelcove.yml

@@ -47,6 +47,7 @@ caps:
     - {id: 58, cat: Audio/Video, desc: "Gaming Videos"}
     - {id: 52, cat: Audio, desc: "OST"}
     - {id: 55, cat: Other, desc: "Time for a Break"}
+    - {id: 81, cat: Audio/Video, desc: "Videos"}
     # Various
     - {id: 59, cat: Other, desc: "Mods"}
     - {id: 54, cat: Other, desc: "Updates/Fixes"}

src/Jackett.Common/Definitions/proporno.yml

@@ -115,7 +115,7 @@ search:
         - name: dateparse
           args: "2-01-2006, 15:04 -07:00"
     date:
-      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year  .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday }}{{ or .Result.date_year .Result.date_today .Result.date_yday }}{{ else }}now{{ end }}"
     size:
       text: "1 GB"
     seeders:

src/Jackett.Common/Definitions/pterclub.yml

@@ -140,9 +140,13 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    # staff have extra columns at the start and end of a row, so we have to float the next lot of selectors off an anchor
+    anchor1:
+      selector: td:has(a[href^="comment.php?"])
+      optional: true
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td.rowfollow:nth-of-type(4) > span[title]
+      selector: "td:has(a[{{ if .Result.anchor1 }}href^=\"comment.php\"{{ else }}href$=\"startcomments\"{{ end }}]) ~ td > span[title]"
       attribute: title
       optional: true
       filters:
@@ -152,7 +156,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td.rowfollow:nth-of-type(4):not(:has(span))
+      selector: "td:has(a[{{ if .Result.anchor1 }}href^=\"comment.php\"{{ else }}href$=\"startcomments\"{{ end }}]) ~ td:not(:has(span[title]))"
       optional: true
       filters:
         - name: append
@@ -162,13 +166,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td.rowfollow:nth-of-type(5)
+      selector: "td:has(a[{{ if .Result.anchor1 }}href^=\"comment.php\"{{ else }}href$=\"startcomments\"{{ end }}]) ~ td ~ td"
     seeders:
-      selector: td.rowfollow:nth-of-type(6)
+      selector: "td:has(a[{{ if .Result.anchor1 }}href^=\"comment.php\"{{ else }}href$=\"startcomments\"{{ end }}]) ~ td ~ td ~ td"
     leechers:
-      selector: td.rowfollow.rowfollow:nth-of-type(7)
+      selector: "td:has(a[{{ if .Result.anchor1 }}href^=\"comment.php\"{{ else }}href$=\"startcomments\"{{ end }}]) ~ td ~ td ~ td ~ td"
     grabs:
-      selector: td.rowfollow:nth-of-type(8)
+      selector: "td:has(a[{{ if .Result.anchor1 }}href^=\"comment.php\"{{ else }}href$=\"startcomments\"{{ end }}]) ~ td ~ td ~ td ~ td ~ td"
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -184,7 +188,7 @@ search:
         img.pro_2up: 2
         "*": 1
     description:
-      selector: td:nth-child(2)
+      selector: td:has(table.torrentname)
       remove: a, img
     minimumratio:
       text: 0.9

src/Jackett.Common/Definitions/punkshorror.yml

@@ -0,0 +1,170 @@
+---
+id: punkshorror
+name: Punk's Horror Tracker
+description: "Punk's Horror Tracker is a HUNGARIAN Private Tracker for Horror MOVIES / TV"
+language: hu-HU
+type: private
+encoding: ISO-8859-2
+links:
+  - https://punck-tracker.net/
+
+caps:
+  categorymappings:
+    - {id: 87, cat: Movies, desc: "Action Eng"}
+    - {id: 88, cat: Movies, desc: "Action Hun"}
+    - {id: 79, cat: TV/Documentary, desc: "Dokumentumfilm"}
+    - {id: 72, cat: Movies/HD, desc: "HD Eng"}
+    - {id: 71, cat: Movies/HD, desc: "HD Hun"}
+    - {id: 89, cat: Movies, desc: "Horror Anime"}
+    - {id: 78, cat: Books, desc: "Horror Ebook"}
+    - {id: 66, cat: Movies, desc: "Horror Eng"}
+    - {id: 73, cat: PC/Games, desc: "Horror Game"}
+    - {id: 65, cat: Movies, desc: "Horror Hun"}
+    - {id: 82, cat: XXX, desc: "Horror XXX"}
+    - {id: 94, cat: Movies, desc: "Kamerás filmek"}
+    - {id: 86, cat: Movies, desc: "Mystery-Fantasy Eng"}
+    - {id: 85, cat: Movies, desc: "Mystery-Fantasy Hun"}
+    - {id: 83, cat: Movies, desc: "Punk Release"}
+    - {id: 76, cat: Movies, desc: "Retro Film"}
+    - {id: 70, cat: Movies, desc: "Scfi Eng"}
+    - {id: 69, cat: Movies, desc: "Scfi Hun"}
+    - {id: 75, cat: TV, desc: "Sorozat Eng"}
+    - {id: 74, cat: TV, desc: "Sorozat Hun"}
+    - {id: 68, cat: Movies, desc: "Thriller Eng"}
+    - {id: 67, cat: Movies, desc: "Thriller Hun"}
+    - {id: 84, cat: Movies/SD, desc: "VHS Ritkaságok"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search FreeLeech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: added
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek száma egy oldalon</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: "td:contains(\"Belépési hiba\")"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    onlyname: 1
+    search: "{{ .Keywords }}"
+    # 0 active, 1 all, 2 deadonly, 3 freeleech
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: table.alap99 > tbody#linkhatter > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      # can be abbreviated
+      selector: a[href^="details.php?id="]
+    title_optional:
+      # usually full length
+      selector: a[href^="details.php?id="]
+      attribute: title
+      optional: true
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      selector: td:nth-child(2) > b > font
+      filters:
+        - name: replace
+          args: ["\xA0", ""]
+        - name: replace
+          args: ["Feltöltve:", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) width"
+    size:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src="pic/golden.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      selector: td:nth-child(7) > center > b > font
+      filters:
+        - name: regexp
+          args: (\d+)
+    minimumratio:
+      text: 0.8
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# engine n/a

src/Jackett.Common/Definitions/putao.yml

@@ -0,0 +1,198 @@
+---
+id: putao
+name: PuTao
+description: "葡萄 (PuTao) is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://pt.sjtu.edu.cn/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies CHN 华语电影"}
+    - {id: 402, cat: Movies, desc: "Movies Eng 欧美电影"}
+    - {id: 403, cat: Movies, desc: "Movies Asian 亚洲电影"}
+    - {id: 406, cat: TV/Documentary, desc: "Documentary 纪录片"}
+    - {id: 407, cat: TV, desc: "TV Series HKTW 港台电视剧"}
+    - {id: 408, cat: TV, desc: "TV Series Asian 亚洲电视剧"}
+    - {id: 409, cat: TV, desc: "TV Series CHN 大陆电视剧"}
+    - {id: 410, cat: TV, desc: "TV Series Eng 欧美电视剧"}
+    - {id: 411, cat: TV, desc: "TV CHN 大陆综艺节目"}
+    - {id: 412, cat: TV, desc: "TV HKTW 港台综艺节目"}
+    - {id: 413, cat: TV, desc: "TV Eng 欧美综艺节目"}
+    - {id: 414, cat: TV, desc: "TV JPKR 日韩综艺节目"}
+    - {id: 420, cat: Audio, desc: "Music CHN 华语音乐"}
+    - {id: 421, cat: Audio, desc: "Music JPKR 日韩音乐"}
+    - {id: 422, cat: Audio, desc: "Music Eng 欧美音乐"}
+    - {id: 423, cat: Audio, desc: "Music OST 原声音乐"}
+    - {id: 425, cat: Audio, desc: "Music Classic 古典音乐"}
+    - {id: 426, cat: Audio/MP3, desc: "Music mp3合辑"}
+    - {id: 427, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 429, cat: Console, desc: "Games 游戏"}
+    - {id: 431, cat: TV/Anime, desc: "Anime 动漫"}
+    - {id: 432, cat: TV/Sport, desc: "Sport 体育"}
+    - {id: 434, cat: PC, desc: "Software 软件"}
+    - {id: 435, cat: Other, desc: "Study 学习"}
+    - {id: 440, cat: PC/Mac, desc: "Software Mac"}
+    - {id: 451, cat: Other, desc: "Campus 校园原创"}
+    - {id: 450, cat: Other/Misc, desc: "Misc 其他"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_captcha
+    type: info
+    label: About the Captcha
+    default: If the Captcha image is missing then set the <b>checkcode</b> to <b>XxXx</b>
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>每页种子数:每页显示</b><i>(Torrents per page:)</i> setting to <b>100</b> on your account profile.
+  - 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: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[src^="getcheckcode.php?"]
+    input: checkcode
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href^="logout.php?hash="]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 incldead, 1 onlyactive, 2 onlydead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 30%, 7 70%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all, 1 popular, 2 classic, 3 recommended, 4 normal, 5 seeds
+    picktype: 0
+    # 0 title, 1 descr, 3 uploader, 4 imdbid
+    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:
+    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
+    date:
+      # time elapsed (default)
+      # 19时<br/>3分 (19 hours 3 minutes)
+      # 2天<br/>21时 (2 days 21 hours)
+      selector: td:nth-child(4):not(:contains("-"))
+      optional: true
+      filters:
+        - name: replace
+          args: ["年", "years"]
+        - name: replace
+          args: ["月", "months"]
+        - name: replace
+          args: ["天", "days"]
+        - name: replace
+          args: ["时", " hours"]
+        - name: replace
+          args: ["分", "minutes"]
+        - name: append
+          args: " ago"
+        - name: timeago
+    date:
+      # time added
+      selector: td:nth-child(4):contains("-")
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - 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:
+        tr.free_bg: 0
+#       tr.2up: 0
+#       tr.free2up: 0
+        tr.halfdown_bg: 0.5
+        tr.d30down_bg: 0.3
+        tr.d70down_bg: 0.7
+        "*": 1
+    uploadvolumefactor:
+      case:
+#       tr.2up: 0
+#       tr.free2up: 0
+        "*": 1
+    description:
+      selector: td:nth-child(2)
+      remove: a, img
+    minimumratio:
+      text: 0.7
+# NexusPHP v1.0 Beta 2

src/Jackett.Common/Definitions/reelflix-api.yml

@@ -1,7 +1,7 @@
 ---
 id: reelflix-api
-name: ReelFlix (API)
-description: "ReelFlix (HD4Free,LegacyHD) is a Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+name: ReelFLiX (API)
+description: "ReelFLiX (HD4Free,LegacyHD) is a Private Torrent Tracker for HD MOVIES"
 language: en-US
 type: private
 encoding: UTF-8
@@ -14,10 +14,6 @@ caps:
   # dont forget to update the case block in the search fields category
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Books/EBook, desc: "E-Book"}
-    - {id: 5, cat: TV, desc: "TV Pack"}
 
   modes:
     search: [q]
@@ -58,24 +54,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:
@@ -86,10 +70,6 @@ search:
       selector: category
       case:
         Movie: 1
-        TV: 2
-        Music: 3
-        E-Book: 4
-        TV Pack: 5
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/reelflix.yml

@@ -1,7 +1,7 @@
 ---
 id: reelflix
-name: ReelFlix
-description: "ReelFlix (HD4Free,LegacyHD) is a Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+name: ReelFLiX
+description: "ReelFLiX (HD4Free,LegacyHD) is a Private Torrent Tracker for HD MOVIES"
 language: en-US
 type: private
 encoding: UTF-8
@@ -13,10 +13,6 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: Books/EBook, desc: "E-Book"}
-    - {id: 5, cat: TV, desc: "TV Pack"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/renegade.yml

@@ -6,7 +6,9 @@ language: hu-HU
 type: private
 encoding: ISO-8859-2
 links:
-  - https://renegade-tracker.com/
+  - http://renegade-tracker.com/
+legacylinks:
+  - https://renegade-tracker.com/ # ERR_CONNECTION_REFUSED
 
 caps:
   # dont forget to update the search fields category case block
@@ -105,6 +107,9 @@ search:
     poster:
       selector: div#bro_browse_poster_1 a img
       attribute: src
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     size:
       selector: div#bro_browse_details
       filters:

src/Jackett.Common/Definitions/sexxi.yml

@@ -0,0 +1,170 @@
+---
+id: sexxi
+name: Sexxi
+description: "Sexxi is a RUSSIAN Public Torrent Tracker for 3X"
+language: ru-RU
+type: public
+encoding: UTF-8
+links:
+  - https://sexxi.club/
+
+caps:
+  # don't forget to update the search fields category case block
+  categorymappings:
+    - {id: 1, cat: XXX, desc: "Любительское"}
+    - {id: 20, cat: XXX, desc: "Орал"}
+    - {id: 13, cat: XXX, desc: "Минет"}
+    - {id: 2, cat: XXX, desc: "Анал"}
+    - {id: 31, cat: XXX, desc: "Куннилингус"}
+    - {id: 32, cat: XXX, desc: "Большие сиськи"}
+    - {id: 27, cat: XXX, desc: "HD-видео"}
+    - {id: 10, cat: XXX, desc: "Хардкор"}
+    - {id: 35, cat: XXX, desc: "Втроем"}
+    - {id: 19, cat: XXX, desc: "Мастурбация"}
+    - {id: 34, cat: XXX, desc: "Русские"}
+    - {id: 7, cat: XXX, desc: "Молодые"}
+    - {id: 17, cat: XXX, desc: "Зрелые"}
+    - {id: 5, cat: XXX, desc: "Блондинки"}
+    - {id: 6, cat: XXX, desc: "Брюнетки"}
+    - {id: 3, cat: XXX, desc: "Азиатки"}
+    - {id: 15, cat: XXX, desc: "Лесбиянки"}
+    - {id: 12, cat: XXX, desc: "Межрасовый"}
+    - {id: 30, cat: XXX, desc: "Групповое"}
+    - {id: 36, cat: XXX, desc: "От первого лица"}
+    - {id: 22, cat: XXX, desc: "ПорноЗвезды"}
+    - {id: 11, cat: XXX, desc: "Кастинг"}
+    - {id: 33, cat: XXX, desc: "Ролевая игра"}
+    - {id: 14, cat: XXX, desc: "Фетиш"}
+    - {id: 25, cat: XXX, desc: "Униформа"}
+    - {id: 18, cat: XXX, desc: "Пьяные"}
+    - {id: 21, cat: XXX, desc: "Колготки"}
+    - {id: 28, cat: XXX, desc: "Волосатые"}
+    - {id: 23, cat: XXX, desc: "Рыжая"}
+    - {id: 24, cat: XXX, desc: "Ретро"}
+    - {id: 29, cat: XXX, desc: "Нудизм"}
+    - {id: 4, cat: XXX, desc: "БДСМ"}
+    - {id: 8, cat: XXX, desc: "Эротика"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+
+download:
+  selectors:
+    - selector: a[href*="index.php?do=download&id="]
+      attribute: href
+
+search:
+  headers:
+    Referer: ["{{ .Config.sitelink }}"]
+  paths:
+    - path: index.php
+  inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    all_word_seach: 0
+    showposts: 0
+    # 0 in article 1 in comments 2 in static pages 3 in article titles
+    titleonly: 3
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    sortby: "{{ .Config.sort }}"
+    resorder: "{{ .Config.type }}"
+
+  rows:
+    selector: div.short-item
+
+  fields:
+    category:
+      selector: p a:last-child
+      case:
+        a[href$="/amateur/"]: 1
+        a[href$="/pornstars/"]: 22
+        a[href$="/hdvideo/"]: 27
+        a[href$="/blonde/"]: 5
+        a[href$="/hairy/"]: 28
+        a[href$="/brunette/"]: 6
+        a[href$="/russians/"]: 34
+        a[href$="/asian/"]: 3
+        a[href$="/redhead/"]: 23
+        a[href$="/anal/"]: 2
+        a[href$="/oral/"]: 20
+        a[href$="/bdsm/"]: 4
+        a[href$="/erotic/"]: 8
+        a[href$="/hardcore/"]: 10
+        a[href$="/uniforms/"]: 25
+        a[href$="/masturbation/"]: 19
+        a[href$="/big_boobs/"]: 32
+        a[href$="/role-playing-game/"]: 33
+        a[href$="/interracial/"]: 12
+        a[href$="/lesbians/"]: 15
+        a[href$="/young/"]: 7
+        a[href$="/threesome/"]: 35
+        a[href$="/kasting/"]: 11
+        a[href$="/blowjob/"]: 13
+        a[href$="/retro/"]: 24
+        a[href$="/fetish/"]: 14
+        a[href$="/mature/"]: 17
+        a[href$="/drunk/"]: 18
+        a[href$="/nudism/"]: 29
+        a[href$="/pantyhose/"]: 21
+        a[href$="/group/"]: 30
+        a[href$="/cunnilingus/"]: 31
+        a[href$="/first_person/"]: 36
+        "*": 27
+    title:
+      selector: a.short-title
+    details:
+      selector: a.short-title
+      attribute: href
+    download:
+      selector: a.short-title
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    size:
+      text: "512 MB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    cat_tags:
+      selector: p.argcat
+    description:
+      selector: ul.short-list
+      filters:
+        - name: append
+          args: "</br>{{ .Result.cat_tags }}"
+    date:
+      selector: div.short-meta-item:has(span.fa-calendar-alt)
+      filters:
+        # 28.10.2021
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "02.01.2006 -07:00"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# DataLife

src/Jackett.Common/Definitions/shareisland-api.yml

@@ -62,24 +62,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   keywordsfilters:
     - name: diacritics
       args: replace

src/Jackett.Common/Definitions/skipthecommercials-api.yml

@@ -11,23 +11,13 @@ links:
 caps:
   # dont forget to update the case block in the search fields category
   categorymappings:
-    - {id: 2, cat: TV/HD, desc: "TV/x265"}
-    - {id: 3, cat: TV/SD, desc: "TV/Packs-SD"}
-    - {id: 4, cat: TV/WEB-DL, desc: "TV/Web-DL"}
-    - {id: 5, cat: TV/SD, desc: "TV/Xvid"}
-    - {id: 6, cat: TV/HD, desc: "TV/HD-x264"}
-    - {id: 7, cat: TV/Foreign, desc: "TV/Non-English"}
-    - {id: 8, cat: TV/HD, desc: "TV/Packs-HD"}
-    - {id: 9, cat: TV/Sport, desc: "TV/Sports"}
-    - {id: 10, cat: TV/Documentary, desc: "TV/Documentaries"}
-    - {id: 11, cat: TV/HD, desc: "TV/HD-Retail"}
-    - {id: 12, cat: TV/SD, desc: "TV/SD-Retail"}
-    - {id: 13, cat: TV/Foreign, desc: "TV/Packs-Non-English"}
-    - {id: 14, cat: TV/SD, desc: "TV/SD-x264"}
+    - {id: 15, cat: TV, desc: "TV Show"}
+    - {id: 16, cat: Movies, desc: "Movie"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: apikey
@@ -61,24 +51,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:
@@ -88,19 +66,8 @@ search:
     category:
       selector: category
       case:
-        "TV/x265": 2
-        "TV/Packs-SD": 3
-        "TV/Web-DL": 4
-        "TV/Xvid": 5
-        "TV/HD-x264": 6
-        "TV/Non-English": 7
-        "TV/Packs-HD": 8
-        "TV/Sports": 9
-        "TV/Documentaries": 10
-        "TV/HD-Retail": 11
-        "TV/SD-Retail": 12
-        "TV/Packs-Non-English": 13
-        "TV/SD-x264": 14
+        "TV Show": 15
+        "Movie": 16
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/skipthecommercials.yml

@@ -10,23 +10,13 @@ links:
 
 caps:
   categorymappings:
-    - {id: 2, cat: TV/HD, desc: "TV/x265"}
-    - {id: 3, cat: TV/SD, desc: "TV/Packs-SD"}
-    - {id: 4, cat: TV/WEB-DL, desc: "TV/Web-DL"}
-    - {id: 5, cat: TV/SD, desc: "TV/Xvid"}
-    - {id: 6, cat: TV/HD, desc: "TV/HD-x264"}
-    - {id: 7, cat: TV/Foreign, desc: "TV/Non-English"}
-    - {id: 8, cat: TV/HD, desc: "TV/Packs-HD"}
-    - {id: 9, cat: TV/Sport, desc: "TV/Sports"}
-    - {id: 10, cat: TV/Documentary, desc: "TV/Documentaries"}
-    - {id: 11, cat: TV/HD, desc: "TV/HD-Retail"}
-    - {id: 12, cat: TV/SD, desc: "TV/SD-Retail"}
-    - {id: 13, cat: TV/Foreign, desc: "TV/Packs-Non-English"}
-    - {id: 14, cat: TV/SD, desc: "TV/SD-x264"}
+    - {id: 15, cat: TV, desc: "TV Show"}
+    - {id: 16, cat: Movies, desc: "Movie"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: username

src/Jackett.Common/Definitions/sktorrent-org.yml

@@ -42,6 +42,7 @@ caps:
     - {id: 55, cat: XXX, desc: "Porn - Movie"}
     - {id: 54, cat: XXX/ImageSet, desc: "Porn - Picture"}
     - {id: 68, cat: XXX/Other, desc: "Porn - Other"}
+    - {id: 69, cat: XXX/ImageSet, desc: "All - All"}
     - {id: 6, cat: TV, desc: "TV - Divx/Xvid"}
     - {id: 41, cat: TV/HD, desc: "TV - HD"}
     - {id: 59, cat: TV/HD, desc: "TV - Full HD"}

src/Jackett.Common/Definitions/slosoul.yml

@@ -5,28 +5,37 @@ description: "slosoul is a Slovanian  Private Torrent Tracker for MOVIES / TV /
 language: en-US
 type: private
 encoding: UTF-8
+testlinktorrent: false
 links:
+  - http://slosoul.net/ # site is forcing http
+legacylinks:
   - https://slosoul.net/
 
 caps:
   categorymappings:
-    - {id: 5, cat: PC, desc: "Apps"}
-    - {id: 7, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 6, cat: PC/Games, desc: "Games PC"}
-    - {id: 8, cat: Movies, desc: "Movies Packs"}
-    - {id: 1, cat: Movies/SD, desc: "Movies Divx/Xvid"}
-    - {id: 9, cat: Movies/DVD, desc: "Movies DVD-r"}
-    - {id: 11, cat: Movies/BluRay, desc: "Movies BluRay"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: XXX, desc: "Porn"}
-    - {id: 13, cat: TV/Sport, desc: "TV Sport"}
-    - {id: 10, cat: TV, desc: "TV Shows"}
-    - {id: 12, cat: Other, desc: "VIP"}
+    - {id: 34, cat: Movies/SD, desc: "Filmi - Xvid"}
+    - {id: 35, cat: Movies/DVD, desc: "Filmi - DVD"}
+    - {id: 36, cat: Movies/BluRay, desc: "Filmi - BluRay"}
+    - {id: 37, cat: Movies/HD, desc: "Filmi - X264"}
+    - {id: 38, cat: Audio/MP3, desc: "Glasba - MP3"}
+    - {id: 39, cat: Audio/Lossless, desc: "Glasba - FLAC"}
+    - {id: 40, cat: PC/Games, desc: "Igre - PC"}
+    - {id: 42, cat: TV/Documentary, desc: "Dokumentarni filmi"}
+    - {id: 43, cat: TV/Sport, desc: "Šport"}
+    - {id: 44, cat: TV/Anime, desc: "Risanke"}
+    - {id: 45, cat: TV, desc: "TV - Serije"}
+    - {id: 46, cat: PC, desc: "Programi"}
+    - {id: 47, cat: Books/EBook, desc: "E-Knjige"}
+    - {id: 48, cat: Other, desc: "Slike"}
+    - {id: 49, cat: Other, desc: "Ostalo"}
+    - {id: 50, cat: XXX/XviD, desc: "Erotika - Xvid"}
+    - {id: 51, cat: XXX/DVD, desc: "Erotika - DVD"}
+    - {id: 52, cat: XXX/ImageSet, desc: "Erotika - Slike"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep]
+    movie-search: [q]
     music-search: [q]
     book-search: [q]
 
@@ -57,108 +66,123 @@ settings:
       asc: asc
 
 login:
-  path: takelogin.php
-  method: post
+  path: ?p=home&pid=1
+  method: form
+  form: form#loginbox_form
+  submitpath: ajax/login.php
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
+    action: login
+    loginbox_membername: "{{ .Config.username }}"
+    loginbox_password: "{{ .Config.password }}"
+    loginbox_remember: 1
+  selectorinputs:
+    securitytoken:
+      selector: "script:contains(\"stKey: \")"
+      filters:
+        - name: regexp
+          args: "stKey: \"(.+?)\","
   error:
-    - selector: table:has(td.thead:contains("An error has occured!"))
+    - selector: div.error
+    - selector: :contains("-ERROR-")
   test:
-    path: index.php
-    selector: a[href*="logout.php?logouthash="]
-
-download:
-  before:
-    path: takethanks.php
-    method: post
-    inputs:
-      torrentid: "{{ .DownloadUri.Query.id }}"
-  selectors:
-    - selector: a[href*="download-torrent-"]
-      attribute: href
+    path: ?p=home&pid=1
+    selector: div#member_info_bar
 
 search:
   paths:
-    - path: browse.php
+    - path: /
   inputs:
-    do: search
-    # does not support multi categories so defaulting to ALL
-    category: 0
-    # yes incldead, no activeonly
-    include_dead_torrents: yes
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # replace special characters with "%" (wildcard)
-      args: ["[^a-zA-Z0-9]+", "%"]
+    p: torrents
+    pid: 10
+    $raw: "{{ range .Categories }}&cid[]={{.}}{{end}}"
+    keywords: "{{ .Keywords }}"
+    # name, description, both, uploader
+    search_type: name
+    "sortOptions[sortBy]": "{{ .Config.sort }}"
+    "sortOptions[sortOrder]": "{{ .Config.type }}"
+    # does not support imdbid searching
 
   rows:
-    selector: "table#sortabletable tbody tr:has(a[href*=\"download-torrent-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+    selector: "div.torrent-box[id^=\"torrent_\"]{{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href*="torrent-category-"]
+      selector: a[href*="?p=torrents&pid=10&cid="]
       attribute: href
       filters:
-        - name: regexp
-          args: (\d+)
-    title_default:
-      # is often abbreviated
-      selector: a[href*="torrent-details-"]
-    title_optional:
-      # usually longer than details title
-      selector: div[id^="port-content-"] div
-      optional: true
+        - name: querystring
+          args: cid
     title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      selector: a[href*="?p=torrents&pid=10&action=details&tid="]
     details:
-      selector: a[href*="details.php?id="]
+      selector: a[href*="?p=torrents&pid=10&action=details&tid="]
       attribute: href
     download:
-      selector: a[href*="details.php?id="]
+      selector: a[href*="?p=torrents&pid=10&action=download&tid="]
       attribute: href
     magnet:
       selector: a[href^="magnet:?xt="]
       attribute: href
     poster:
-      selector: div[id^="port-content-"] img
-      attribute: src
-    date:
-      selector: td:nth-child(2) > div:last-child
+      selector: a[href*="data/torrents/torrent_images/"]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: a[rel="torrent_size"]
+    grabs:
+      selector: a[rel="times_completed"]
+    seeders:
+      selector: a[rel="torrent_seeders"]
+    leechers:
+      selector: a[rel="torrent_leechers"]
+    date_time:
+      selector: div.torrentOwner abbr
+      optional: true
+      attribute: data-time
+    date_day:
+      # Naložil včeraj ob 12:00 by
+      # Naložil danes ob 09:28 by
+      # Uploaded Today at 09:17 by
+      # Uploaded Yesterday at 10:31 by
+      selector: div.torrentOwner:contains("day"), div.torrentOwner:contains("včeraj"), div.torrentOwner:contains("danes")
+      optional: true
       filters:
         - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
+          args: " (.+?) by"
+        - name: replace
+          args: [" ob ", " at "]
+        - name: replace
+          args: ["danes", "Today"]
+        - name: replace
+          args: ["včeraj", "Yesterday"]
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: fuzzytime
+    date_year:
+      # Uploaded 14-11-2021 09:41 by
+      selector: div.torrentOwner:contains("-")
+      optional: true
+      filters:
+        - name: regexp
+          args: " (.+?) by"
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
+    date:
+      text: "{{ if or .Result.date_time .Result.date_year .Result.date_day }}{{ or .Result.date_time .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
+        img[src$="/torrent_free.png"]: 0
         "*": 1
     uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
+      text: 1
 # TBD, Rules and FAQ do not cover this yet
 #    minimumratio:
 #      text: 1.0
 #    minimumseedtime:
 #      # 2 days (as seconds = 2 x 24 x 60 x 60)
 #      text: 172800
-#  TS Special Edition v.8.0
+# TSUE 2.2

src/Jackett.Common/Definitions/teamhd.yml

@@ -36,6 +36,13 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: useragent
+    type: text
+    label: User-Agent
+  - name: info_useragent
+    type: info
+    label: How to get the User-Agent
+    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -54,6 +61,9 @@ login:
     selector: a[href*="/logout.php"]
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   paths:
     - path: browse
   inputs:

src/Jackett.Common/Definitions/tellytorrent-api.yml

@@ -62,24 +62,12 @@ settings:
 search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
-    - path: /api/torrents/filter
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
       response:
         type: json
         attribute: attributes
 
-  inputs:
-    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    api_token: "{{ .Config.apikey }}"
-    name: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    page: 1
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}{{ if .Config.freeleech }}free=1{{ else }}{{ end }}"
-
   rows:
     selector: data
     count:

src/Jackett.Common/Definitions/the-devils-lounge.yml

@@ -0,0 +1,187 @@
+---
+id: the-devils-lounge
+name: The-Devils-Lounge
+description: "The-Devils-Lounge is a Private torrent site for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+testlinktorrent: false
+links:
+  - https://the-devils-lounge.xyz/
+
+caps:
+  categorymappings:
+    - {id: 39, cat: Audio/Audiobook, desc: "Abook: Abook"}
+    - {id: 1, cat: PC/0day, desc: "Application: 0-Day"}
+    - {id: 2, cat: PC, desc: "Application: Pc"}
+    - {id: 3, cat: PC/Mac, desc: "Application: Mac"}
+    - {id: 38, cat: Books/EBook, desc: "Ebooks: Ebook"}
+    - {id: 32, cat: TV/Anime, desc: "Episodes: Anime"}
+    - {id: 33, cat: TV, desc: "Episodes: Classic"}
+    - {id: 34, cat: TV/Foreign, desc: "Episodes: Foreign"}
+    - {id: 35, cat: TV/HD, desc: "Episodes: TvHD"}
+    - {id: 36, cat: TV/SD, desc: "Episodes: TvSD"}
+    - {id: 37, cat: TV/Sport, desc: "Episodes: TVsports"}
+    - {id: 22, cat: PC/Games, desc: "Games: Pc"}
+    - {id: 23, cat: Console/PS4, desc: "Games: Ps4"}
+    - {id: 24, cat: Console/PS3, desc: "Games: Ps3"}
+    - {id: 25, cat: Console/PSP, desc: "Games: Ps1"}
+    - {id: 26, cat: Console/PSP, desc: "Games: Ps2"}
+    - {id: 27, cat: Console/PSP, desc: "Games: PsP"}
+    - {id: 28, cat: Console/XBox, desc: "Games: xbox"}
+    - {id: 29, cat: Console/Wii, desc: "Games: Wii"}
+    - {id: 30, cat: Console/NDS, desc: "Games: Nintendo"}
+    - {id: 31, cat: Console/Other, desc: "Games: Dreamcast"}
+    - {id: 4, cat: Movies/HD, desc: "Movies: 1080P"}
+    - {id: 5, cat: TV/Anime, desc: "Movies: Anime"}
+    - {id: 6, cat: Movies/DVD, desc: "Movies: DvdR"}
+    - {id: 7, cat: Movies/SD, desc: "Movies: Camer"}
+    - {id: 8, cat: Movies/3D, desc: "Movies: 3D"}
+    - {id: 9, cat: Movies/WEB-DL, desc: "Movies: WEBRip"}
+    - {id: 10, cat: XXX, desc: "Movies: XxX"}
+    - {id: 11, cat: Movies/UHD, desc: "Movies: Real-4K"}
+    - {id: 12, cat: Movies, desc: "Movies: Classic"}
+    - {id: 13, cat: Movies/Foreign, desc: "Movies: Foreign"}
+    - {id: 14, cat: Movies, desc: "Movies: Remux"}
+    - {id: 15, cat: Movies/HD, desc: "Movies: HD"}
+    - {id: 16, cat: Movies/SD, desc: "Movies: SD"}
+    - {id: 17, cat: Movies, desc: "Movies: Packs"}
+    - {id: 18, cat: Movies, desc: "Movies: Animation"}
+    - {id: 19, cat: Audio, desc: "Music: Audio"}
+    - {id: 20, cat: Audio, desc: "Music: Packs"}
+    - {id: 21, cat: Audio/Video, desc: "Music: Video"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: 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: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: div.myFrame:contains("Access Denied")
+  test:
+    path: /
+    selector: a[href="account-logout.php"]
+
+download:
+  before:
+    path: thanks.php
+    method: post
+    inputs:
+      torrent: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  # https://the-devils-lounge.xyz/torrents-search.php?search=&cat=0&incldead=0&freeleech=2&inclexternal=0&lang=0
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    cat: 0
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    # 0 all, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 both, 1 local, 2 external
+    inclexternal: 0
+    # 0 all, 1 English, 2 etc...
+    lang: 0
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+  # does not support imdbid searching or display imdbid links.
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: tr.t-row
+
+  fields:
+    category:
+      selector: td a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7) font:first-of-type
+      filters:
+        - name: replace
+          args: [",", ""]
+    leechers:
+      selector: td:nth-child(7) font:last-of-type
+      filters:
+        - name: replace
+          args: [",", ""]
+    description:
+      selector: td:last-of-type:contains("E")
+      filters:
+        - name: replace
+          args: ["E", "External"]
+        - name: replace
+          args: ["L", "Local"]
+    downloadvolumefactor:
+      case:
+        img[src$="/images/free.gif"]: 0
+        "td:last-of-type:contains(\"E\")": 0 # all external torrents are free
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# FMEDition 3 (TorrentTrader)

src/Jackett.Common/Definitions/torlock.yml

@@ -10,7 +10,7 @@ links:
   - https://www.torlock.com/
   - https://www.torlock2.com/
   - https://www.torlock.icu/
-  - https://torlock.unblockit.kim/
+  - https://torlock.unblockit.bz/
   - https://torlock.nocensor.biz/
 legacylinks:
   - https://torlock.com/
@@ -35,6 +35,7 @@ legacylinks:
   - https://torlock.nocensor.space/
   - https://torlock.unblockit.ws/
   - https://torlock.nocensor.work/
+  - https://torlock.unblockit.kim/
 
 caps:
   # dont forget to update the search fields category case block

src/Jackett.Common/Definitions/torlook.yml

@@ -0,0 +1,88 @@
+---
+id: torlook
+name: Torlook
+description: "Torlook is a Russian Public torrent meta-search engine combining results from dozens of torrent sites"
+language: en-US
+type: public
+encoding: UTF-8
+links:
+  - https://gw1.torlook.info/
+  - https://torlook.nocensor.biz/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Other, desc: "Other"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: date
+    options:
+      date: created
+      seeders: seeders
+      size: size
+  - name: info_8000
+    type: info
+    label: About Torlook Categories
+    default: Torlook does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+
+download:
+  infohash:
+    hash:
+      selector: script:contains("magnet:?xt=")
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: script:contains("magnet:?xt=")
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}/{{ .Config.sort }}"
+
+  rows:
+    selector: div.webResult:has(a.magneto[data-src])
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: p > a
+    details:
+      selector: p > a
+      attribute: href
+    download:
+      selector: a.magneto
+      attribute: data-src
+      filters:
+        - name: prepend
+          args: "{{ .Config.sitelink }}"
+    date:
+      selector: span.date
+      filters:
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "2006-01-02 -07:00"
+    size:
+      selector: span.size
+    seeders:
+      selector: span.seeders
+    leechers:
+      selector: span.leechers
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/torrent-explosiv.yml

@@ -30,6 +30,7 @@ caps:
     - {id: 258, cat: Movies/UHD, desc: "Movie UHD"}
     - {id: 262, cat: Movies/DVD, desc: "Movie DVD-R"}
     - {id: 301, cat: Movies/BluRay, desc: "Movie Bluray"}
+    - {id: 312, cat: Movies, desc: "Movie Kids"}
     - {id: 28, cat: Movies/SD, desc: "Movie SD"}
     - {id: 32, cat: Movies/HD, desc: "Movie HD"}
     # Music
@@ -51,8 +52,15 @@ caps:
     - {id: 287, cat: TV/Anime, desc: "Tv Serien Anime SD"}
     - {id: 286, cat: TV/Anime, desc: "Tv Serien Anime HD"}
     # Sport
-    - {id: 62, cat: TV/Sport, desc: "Sport SD "}
-    - {id: 282, cat: TV/Sport, desc: "Sport HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport Formel 1"}
+    - {id: 282, cat: TV/Sport, desc: "Sport Sonstiges"}
+    - {id: 313, cat: TV/Sport, desc: "Sport Wrestling"}
+    # Internat.
+    - {id: 307, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 308, cat: Movies/HD, desc: "Filme HD"}
+    - {id: 309, cat: TV/SD, desc: "Serien SD"}
+    - {id: 310, cat: TV/HD, desc: "Serien HD"}
+    - {id: 311, cat: TV/HD, desc: "Sonstiges"}
     # Sonstiges
     - {id: 216, cat: Books/EBook, desc: "Sonstiges Pdf"}
     - {id: 202, cat: Books/Mags, desc: "Sonstiges Magazine"}
@@ -149,61 +157,69 @@ search:
       selector: div.kat_cat_pic
       case:
         # Movies
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "277"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": "300"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": "258"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "262"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Bluray\"))": "301"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "28"
-        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "32"
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 277
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"3D\"))": 300
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 258
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 262
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Bluray\"))": 301
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Kids\"))": 312
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 28
+        ":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
         # Tv Serien
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Anime HD\"))": "286"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Anime SD\"))": "287"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "226"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "209"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": "305"
-        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "273"
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Anime HD\"))": 286
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Anime SD\"))": 287
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 226
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 209
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD\"))": 305
+        ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 273
         # Music
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Album\"))": "48"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Discographie\"))": "288"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"FLAC\"))": "201"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": "121"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": "124"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Video\"))": "55"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Sampler\"))": "53"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Charts\"))": "49"
-        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Soundtrack\"))": "303"
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Album\"))": 48
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Discographie\"))": 288
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"FLAC\"))": 201
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"MP3\"))": 121
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Mixe\"))": 124
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Video\"))": 55
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Sampler\"))": 53
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 52
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Charts\"))": 49
+        ":has(div.kat_cat_pic_name:contains(\"Music\")):has(div.kat_cat_pic_name_b:contains(\"Soundtrack\"))": 303
         # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "177"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "178"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 177
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 178
         # Games
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiege\"))": "263"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PDA\"))": "264"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PlayStation\"))": "265"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "299"
-        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiege\"))": 263
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PDA\"))": 264
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PlayStation\"))": 265
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 299
+        ":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 17
         # App
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "10"
-        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": "127"
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": 12
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": 10
+        ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": 127
         # Sport
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "282"
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Formel\"))": 62
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 282
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Wrestling\"))": 313
+        # Internat
+        ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Filme SD\"))": 307
+        ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Filme HD\"))": 308
+        ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Serien SD\"))": 309
+        ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Serien HD\"))": 310
+        ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 311
         # Sonstiges
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Pdf\"))": "216"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Magazine\"))": "202"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"EPaper\"))": "217"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörspiel\"))": "269"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Comic\"))": "304"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
-        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Pdf\"))": 216
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Magazine\"))": 202
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"EPaper\"))": 217
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörspiel\"))": 269
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Comic\"))": 304
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": 63
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 96
         # XXX
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "73"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "76"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Clips\"))": "147"
-        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Diverses\"))": "302"
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 73
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 76
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Clips\"))": 147
+        ":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Diverses\"))": 302
     poster:
       selector: div[id^="details"] img
       attribute: src

src/Jackett.Common/Definitions/torrent-turk.yml

@@ -156,29 +156,35 @@ search:
       selector: a[href*="?p=torrents&pid=10&action=download"]
       attribute: href
     date_year:
-      optional: true
       # Uploaded 30-01-2019 15:02 by
-      selector: td.torrent_name:not(:contains(" at "))
+      selector: td.torrent_name:not(:contains(" at ")):not(:has(abbr[data-time]))
+      optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: append
-          args: " +03:00" # TRT
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     date_day:
-      optional: true
       # Uploaded Friday at 05:11 by
       # Uploaded Today at 00:48 by
       # Uploaded Yesterday at 23:57 by
-      selector: td.torrent_name:contains(" at ")
+      selector: td.torrent_name:contains(" at "):not(:has(abbr[data-time]))
+      optional: true
       filters:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: replace
           args: [" at ", " "]
+        - name: fuzzytime
+    date_unix:
+      # within the hour (unix)
+      selector: abbr[data-time]
+      attribute: data-time
+      optional: true
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_unix .Result.date_day }}{{ or .Result.date_year .Result.date_unix .Result.date_day }}{{ else }}now{{ end }}"
     size:
       selector: a[rel="torrent_size"]
     seeders:

src/Jackett.Common/Definitions/torrentdownload.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.torrentdownload.info/
-  - https://torrentdownload.unblockit.kim/
+  - https://torrentdownload.unblockit.bz/
   - https://torrentdownload.nocensor.biz/
 legacylinks:
   - https://torrentdownload.unblockit.pro/
@@ -42,6 +42,7 @@ legacylinks:
   - https://torrentdownload.nocensor.space/
   - https://torrentdownload.unblockit.ws/
   - https://torrentdownload.nocensor.work/
+  - https://torrentdownload.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentdownloads.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentdownloads.info/
   - https://www.torrentdownloads.pro/
-  - https://torrentdownloads.unblockit.kim/
+  - https://torrentdownloads.unblockit.bz/
   - https://torrentdownloads.nocensor.biz/
 legacylinks:
   - https://torrentdownloads.unblockit.pro/
@@ -44,6 +44,7 @@ legacylinks:
   - https://torrentdownloads.nocensor.space/
   - https://torrentdownloads.unblockit.ws/
   - https://torrentdownloads.nocensor.work/
+  - https://torrentdownloads.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentfunk.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   - https://www.torrentfunk.com/
   - https://www.torrentfunk2.com/
-  - https://torrentfunk.unblockit.kim/
+  - https://torrentfunk.unblockit.bz/
   - https://torrentfunk.nocensor.biz/
 legacylinks:
   - https://torrentfunk.unblockit.pro/
@@ -33,6 +33,7 @@ legacylinks:
   - https://torrentfunk.nocensor.space/
   - https://torrentfunk.unblockit.ws/
   - https://torrentfunk.nocensor.work/
+  - https://torrentfunk.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentgalaxy.yml

@@ -11,7 +11,7 @@ links:
   - https://torrentgalaxy.mx/
   - https://torrentgalaxy.su/
   - https://torrentgalaxy.unblockninja.com/
-  - https://torrentgalaxy.unblockit.kim/
+  - https://torrentgalaxy.unblockit.bz/
   - https://torrentgalaxy.nocensor.biz/
 legacylinks:
   - https://torrentgalaxy.org/ # redirects to *.to
@@ -48,6 +48,7 @@ legacylinks:
   - https://torrentgalaxy.nocensor.space/
   - https://torrentgalaxy.unblockit.ws/
   - https://torrentgalaxy.nocensor.work/
+  - https://torrentgalaxy.unblockit.kim/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentmasters.yml

@@ -0,0 +1,162 @@
+---
+id: torrentmasters
+name: TorrentMasters
+description: "TorrentMasters is a HUNGARIAN private tracker for MOVIES / TV / GENERAL"
+language: hu-HU
+type: private
+encoding: UTF-8
+links:
+  - https://torrentmasters.info/
+
+caps:
+  categorymappings:
+    - {id: 92, cat: Books/EBook, desc: "e-Book (ENG)"}
+    - {id: 78, cat: Books/EBook, desc: "e-Book (HUN)"}
+    - {id: 80, cat: Other, desc: "Egyéb"}
+    - {id: 85, cat: Movies/DVD, desc: "Film - DVD/9 (ENG)"}
+    - {id: 66, cat: Movies/DVD, desc: "Film - DVD/9 (HUN)"}
+    - {id: 84, cat: Movies/HD, desc: "Film - HD (ENG)"}
+    - {id: 68, cat: Movies/HD, desc: "Film - HD (HUN)"}
+    - {id: 82, cat: Movies/SD, desc: "Film - XviD (ENG)"}
+    - {id: 64, cat: Movies/SD, desc: "Film - XviD (HUN)"}
+    - {id: 72, cat: PC/Games, desc: "Játék - ISO"}
+    - {id: 73, cat: Console, desc: "Játék - Konzol"}
+    - {id: 94, cat: PC/Games, desc: "Játék - RIP"}
+    - {id: 79, cat: PC/Mobile-Other, desc: "Mobil/PDA"}
+    - {id: 95, cat: PC, desc: "Programok - Egyéb (Win)"}
+    - {id: 74, cat: PC/ISO, desc: "Programok - ISO (Win)"}
+    - {id: 75, cat: PC/Mac, desc: "Programok - Linux/Unix/Mac OS"}
+    - {id: 101, cat: TV/SD, desc: "Sorozat - DVD (ENG)"}
+    - {id: 100, cat: TV/SD, desc: "Sorozat - DVD (HUN)"}
+    - {id: 89, cat: TV/HD, desc: "Sorozat - HD (ENG)"}
+    - {id: 97, cat: TV/HD, desc: "Sorozat - HD (HUN)"}
+    - {id: 86, cat: TV/SD, desc: "Sorozat - XviD (ENG)"}
+    - {id: 90, cat: TV/SD, desc: "Sorozat - XviD (HUN)"}
+    - {id: 98, cat: XXX/x264, desc: "XXX - HD"}
+    - {id: 99, cat: XXX/DVD, desc: "XXX - DVD"}
+    - {id: 76, cat: XXX/ImageSet, desc: "XXX - Képek"}
+    - {id: 69, cat: XXX/XviD, desc: "XXX - XviD"}
+    - {id: 70, cat: Audio, desc: "Zene - HUN"}
+    - {id: 71, cat: Audio, desc: "Zene - Külföld"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search FreeLeech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 0
+    options:
+      0: added
+      1: name
+      5: size
+      7: seeders
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrentek száma egy oldalon</b> setting to <b>100</b> on your account profile.
+
+login:
+  method: post
+  path: takelogin.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: "table:contains(\"Hibás belépés\")"
+  test:
+    path: index.php
+    selector: a[href^="logout.php"]
+
+search:
+  paths:
+    - path: letoltes.php
+  inputs:
+    cat: 0
+    search: "{{ .Keywords }}"
+    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support imdbid searches
+
+  rows:
+    selector: table > tbody#linkhatter > tr:nth-child(1)
+
+  fields:
+    category:
+      selector: a[href^="letoltes.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: td:nth-child(3) > a[href^="torrent_adatok.php"]
+      attribute: title
+    details:
+      selector: a[href^="torrent_adatok.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    description:
+      selector: td:nth-child(3) font[color="gray"]
+    date:
+      selector: td:nth-child(5) nobr
+      remove: font
+      filters:
+        - name: replace
+          args: ["\xA0", ""]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    poster:
+      selector: a[onmouseover]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.*?) border"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3) font
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        "img[src=\"pic/orokos.gif\"]": 0
+        "*": 1
+    uploadvolumefactor:
+      case:
+        "font[color=\"#01DF01\"]": 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 24 hours (as seconds = 24 x 60 x 60)
+      text: 86400
+# engine n/a

src/Jackett.Common/Definitions/torrentmax.yml

@@ -7,9 +7,10 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentmax1.net/
+  - https://torrentmax2.net/
 legacylinks:
   - https://torrentmax15.com/
+  - https://torrentmax1.net/
 
 caps:
   categorymappings:
@@ -56,14 +57,14 @@ download:
 
 search:
   paths:
-    # https://torrentmax1.net/bbs/search.php?srows=100&gr_id=&sfl=wr_subject&stx=2021&sop=and
-    - path: bbs/search.php
+    # https://torrentmax2.net/search?srows=10&gr_id=&sfl=wr_subject%7C%7Cwr_content&stx=2021&sop=and
+    - path: search
   inputs:
-    stx: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     srows: 100
     gr_id: ""
     # wr_subject||wr_content, wr_subject, wr_content, mb_id, wr_name
     sfl: wr_subject
+    stx: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     # or, and
     sop: and
 

src/Jackett.Common/Definitions/torrentparadise.yml

@@ -6,12 +6,12 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
-  - https://torrentparadise.cl/
+  - https://torrentparadise.cc/
 legacylinks:
-  - https://torrentparadise.cc/ # redirects to *.cl
-  - https://torrentparadise.to/ # redirects to *.cl
-  - https://torrentparadise.la/ # redirects to *.cl
-  - https://torrentparadise.org/ # redirects to *.cl
+  - https://torrentparadise.cl/ # redirects to *.cc
+  - https://torrentparadise.to/ # redirects to *.cc
+  - https://torrentparadise.la/ # broken
+  - https://torrentparadise.org/ # redirects to *.cc
   - https://torrentparadise.pm/ # DNS_PROBE_FINISHED_NXDOMAIN
 
 caps:
@@ -211,9 +211,10 @@ download:
 
 search:
   # https://torrentparadise.org/search.php?f=monday+night
-  # https://torrentparadise.org/recent
+  # https://torrentparadise.org/recent # returns 404 as at 8 Nov 2021 #6385
+  # https://torrentparadise.cc/top100
   paths:
-    - path: "{{ if .Keywords }}search.php?f={{ .Keywords }}{{ else }}recent{{ end }}"
+    - path: "{{ if .Keywords }}search.php?f={{ .Keywords }}{{ else }}top100{{ end }}"
 
   rows:
     selector: table.table-bordered > tbody > tr.table-default

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,31 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq112.com/
+  - https://torrentqq117.com/
 legacylinks:
-  - https://torrentqq76.com/
-  - https://torrentqq77.com/
-  - https://torrentqq78.com/
-  - https://torrentqq79.com/
-  - https://torrentqq80.com/
-  - https://torrentqq81.com/
-  - https://torrentqq82.com/
-  - https://torrentqq83.com/
-  - https://torrentqq84.com/
-  - https://torrentqq85.com/
-  - https://torrentqq86.com/
-  - https://torrentqq87.com/
-  - https://torrentqq88.com/
-  - https://torrentqq89.com/
-  - https://torrentqq90.com/
-  - https://torrentqq91.com/
-  - https://torrentqq92.com/
-  - https://torrentqq93.com/
-  - https://torrentqq95.com/
-  - https://torrentqq96.com/
-  - https://torrentqq97.com/
-  - https://torrentqq98.com/
-  - https://torrentqq99.com/
   - https://torrentqq100.com/
   - https://torrentqq101.com/
   - https://torrentqq102.com/
@@ -44,6 +21,10 @@ legacylinks:
   - https://torrentqq109.com/
   - https://torrentqq110.com/
   - https://torrentqq111.com/
+  - https://torrentqq112.com/
+  - https://torrentqq113.com/
+  - https://torrentqq114.com/
+  - https://torrentqq115.com/
 
 caps:
   categorymappings: