bitbazis: new row selector

They don't have the same issue as fixed in e891be739f, but the trackers are using `_ssl`.

.github/workflows/winget.yml

@@ -2,6 +2,8 @@ name: Publish to WinGet
 on:
   release:
     types: [released]
+permissions:
+  contents: read
 jobs:
   publish:
     runs-on: windows-latest

README.md

@@ -21,7 +21,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/main/release-notes/6.0/supported-os.md#linux)
-* macOS 10.13 or greater
+* macOS 10.15+ or greater
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
 
@@ -99,7 +99,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
- * NewPCT.me
  * Newstudio
  * Nipponsei
  * Nitro
@@ -119,7 +118,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Portugas
  * ProPorn
  * ProStyleX
- * PS4-Torrent
  * Rapidzona
  * RARBG
  * RinTor
@@ -141,6 +139,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tokyo Tosho
  * Torlock
  * Torlook
+ * Torrent[CORE]
  * Torrent Downloads (TD)
  * Torrent Oyun indir
  * torrent.by
@@ -196,11 +195,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Fou-Du-Cinema
  * Gay-Torrents.net
  * Genesis-Movement
- * HamsterStudio
  * HD-CzTorrent
  * HDGalaKtik
  * HunTorrent
- * IV-Torrents
  * KinoNaVse100
  * Kinorun
  * Kinozal
@@ -231,6 +228,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
+ * Torrents-Town (T-T)
  * TribalMixes
  * Union Fansub
  * YggTorrent (YGG)
@@ -244,7 +242,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 1ptbar
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
- * 3D Torrents (3DT) [![(invite needed)][inviteneeded]](#)
+ * 3D Torrents (3DT)
+ * 3Evils
  * 4thD (4th Dimension)
  * 52PT
  * Abnormal
@@ -260,7 +259,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * anasch.cc
  * AnimeBytes (AB)
  * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
- * AnimeWorld [![(invite needed)][inviteneeded]](#)
+ * AnimeWorld
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
@@ -335,7 +334,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DiscFan
  * DivTeam
  * DocsPedia
- * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * Dream Tracker
  * EbookParadijs
  * Ebooks-Shares
@@ -344,10 +342,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * eStone (XiDER, BeLoad, BigTorrent)
  * ExoticaZ (YourExotic)
  * ExtremeBits
- * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
+ * ExtremeTorrents
  * Falkon Vision Team
  * FANO.IN [![(invite needed)][inviteneeded]](#)
- * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
+ * Fantastic Heaven
  * Fantastiko
  * Femdomcult
  * FileList (FL)
@@ -363,7 +361,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Generation-Free
  * GFXPeers
  * GigaTorrents
- * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
+ * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
@@ -373,7 +371,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HappyFappy
  * Hawke-uno
  * HD Dolby
- * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
  * HD-Olimpo
  * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
@@ -385,8 +382,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDArea (HDA)
  * HDAtmos
  * HDBits [![(invite needed)][inviteneeded]](#)
- * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
- * HDCenter [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDFans
@@ -400,6 +395,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDU
  * HDZone
  * Hebits
+ * HHanClub
  * House of Devil
  * HQSource (HQS)
  * ImmortalSeed (iS)
@@ -430,14 +426,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LosslessClub [![(invite needed)][inviteneeded]](#)
  * LST
  * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
- * MaDs Revolution [![(invite needed)][inviteneeded]](#)
+ * MaDs Revolution
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
  * MediaMaatjes
  * MegamixTracker
  * MeseVilág (Fairytale World)
- * MicroBit (µBit)
  * Milkie
  * MIRcrew
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
@@ -519,10 +514,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
  * Speedmaster HD [![(invite needed)][inviteneeded]](#)
- * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
+ * SpeedTorrent Reloaded
  * SpiderTK
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
- * SportHD [![(invite needed)][inviteneeded]](#)
+ * SportHD
  * SportsCult
  * SpringSunday [![(invite needed)][inviteneeded]](#)
  * SugoiMusic
@@ -579,7 +574,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
- * turktracker
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
@@ -587,13 +581,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Twilights Zoom
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UHDBits
- * UnionGang [![(invite needed)][inviteneeded]](#)
+ * UnionGang
  * UnlimitZ
- * Vizuk
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)
+ * World-of-Tomorrow
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
@@ -728,7 +722,7 @@ On an Ubuntu 16 system: [chrisjohnson00.jackett](https://galaxy.ansible.com/chri
 ## Installation on macOS
 
 ### Prerequisites
-macOS 10.13 or greater
+macOS 10.15+ or greater
 
 ### Install as service
 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).

azure-pipelines.yml

@@ -26,7 +26,7 @@ stages:
     jobs:
       - job: Build
         workspace:
-          clean: all
+          clean: outputs
         strategy:
           matrix:
             Windows:
@@ -36,7 +36,6 @@ stages:
               runtime: win-x86
               archiveType: zip
               artifactName: Jackett.Binaries.Windows.zip
-              buildDelay: 0
             macOS:
               buildDescription: macOS
               imageName: macOS-12
@@ -44,7 +43,6 @@ stages:
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
-              buildDelay: 20
             macOSARM64:
               buildDescription: macOS ARM64
               imageName: macOS-12
@@ -52,7 +50,6 @@ stages:
               runtime: osx-arm64
               archiveType: tar
               artifactName: Jackett.Binaries.macOSARM64.tar.gz
-              buildDelay: 40
             LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-20.04
@@ -60,7 +57,6 @@ stages:
               runtime: linux-x64
               archiveType: tar
               artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz
-              buildDelay: 60
             LinuxARM32:
               buildDescription: Linux ARM32
               imageName: ubuntu-20.04
@@ -68,7 +64,6 @@ stages:
               runtime: linux-arm
               archiveType: tar
               artifactName: Jackett.Binaries.LinuxARM32.tar.gz
-              buildDelay: 80
             LinuxARM64:
               buildDescription: Linux ARM64
               imageName: ubuntu-20.04
@@ -76,7 +71,6 @@ stages:
               runtime: linux-arm64
               archiveType: tar
               artifactName: Jackett.Binaries.LinuxARM64.tar.gz
-              buildDelay: 100
             LinuxMuslAMDx64:
               buildDescription: Linux musl AMD x64
               imageName: ubuntu-20.04
@@ -84,7 +78,6 @@ stages:
               runtime: linux-musl-x64
               archiveType: tar
               artifactName: Jackett.Binaries.LinuxMuslAMDx64.tar.gz
-              buildDelay: 120
             LinuxMuslARM32:
               buildDescription: Linux musl ARM32
               imageName: ubuntu-20.04
@@ -92,7 +85,6 @@ stages:
               runtime: linux-musl-arm
               archiveType: tar
               artifactName: Jackett.Binaries.LinuxMuslARM32.tar.gz
-              buildDelay: 140
             LinuxMuslARM64:
               buildDescription: Linux musl ARM64
               imageName: ubuntu-20.04
@@ -100,7 +92,6 @@ stages:
               runtime: linux-musl-arm64
               archiveType: tar
               artifactName: Jackett.Binaries.LinuxMuslARM64.tar.gz
-              buildDelay: 160
             Mono:
               buildDescription: Mono
               imageName: ubuntu-20.04
@@ -108,12 +99,12 @@ stages:
               runtime: linux-x64
               archiveType: tar
               artifactName: Jackett.Binaries.Mono.tar.gz
-              buildDelay: 180
         pool:
           vmImage: $(imageName)
         displayName: ${{ variables.buildDescription }}
         steps:
           - checkout: self
+            clean: false
 
           - task: UseDotNet@2
             displayName: Install .NET Core SDK
@@ -122,16 +113,6 @@ stages:
               version: $(netCoreSdkVersion)
               installationPath: $(Agent.ToolsDirectory)/dotnet
 
-          - task: PowerShell@2
-            # Because we have many parallel builds this error occurs:
-            # error MSB4018: System.IO.IOException: The process cannot access the file
-            # '/home/vsts/work/1/s/src/DateTimeRoutines/bin/Release/netstandard2.0/DateTimeRoutines.deps.json'
-            # because it is being used by another process. [/home/vsts/work/1/s/src/DateTimeRoutines/DateTimeRoutines.csproj]
-            displayName: Wait before build
-            inputs:
-              targetType: inline
-              script: Start-Sleep -Seconds $(buildDelay)
-
           - task: DotNetCoreCLI@2
             displayName: Build Jackett Server
             inputs:
@@ -324,9 +305,10 @@ stages:
         pool:
           vmImage: ubuntu-20.04
         workspace:
-          clean: all
+          clean: outputs
         steps:
           - checkout: self
+            clean: false
 
           - task: UseDotNet@2
             displayName: Install .NET Core SDK
@@ -357,9 +339,10 @@ stages:
         pool:
           vmImage: ubuntu-20.04
         workspace:
-          clean: all
+          clean: outputs
         steps:
           - checkout: self
+            clean: false
 
           - task: UsePythonVersion@0
             displayName: Install Python
@@ -377,9 +360,10 @@ stages:
         pool:
           vmImage: ubuntu-20.04
         workspace:
-          clean: all
+          clean: outputs
         steps:
           - checkout: self
+            clean: false
 
           - task: Bash@3
             displayName: Validate YAML Schema
@@ -390,25 +374,26 @@ stages:
                 npm install -g ajv-cli-servarr ajv-formats
                 # set fail as false
                 fail=0
-                ajv test -d "src/Jackett.Common/Definitions/*.yml" -s "src/Jackett.Common/Definitions/schema.json" --valid -c ajv-formats
-                testresult=$?
-                if [ "$testresult" -ne 0 ]; then
+                ajv test -d "src/Jackett.Common/Definitions/*.yml" -s "src/Jackett.Common/Definitions/schema.json" --valid --all-errors -c ajv-formats
+                if [ "$?" -ne 0 ]; then
                     fail=1
                 fi
                 if [ "$fail" -ne 0 ]; then
                     echo "Validation Failed"
                     exit 1
                 fi
-                echo "Validation Success"
+                echo "Validation Successful"
                 exit 0
 
   - stage: UnitTestJackett
     displayName: Unit Tests
-    dependsOn: CodeStyle
+    dependsOn:
+      - BuildJackett
+      - CodeStyle
     jobs:
       - job: UnitTest
         workspace:
-          clean: all
+          clean: outputs
         strategy:
           matrix:
             Windows:
@@ -436,6 +421,7 @@ stages:
         displayName: ${{ variables.buildDescription }}
         steps:
           - checkout: self
+            clean: false
 
           - task: UseDotNet@2
             displayName: Install .NET Core SDK
@@ -501,7 +487,7 @@ stages:
     jobs:
       - job: IntegrationTest
         workspace:
-          clean: all
+          clean: outputs
         strategy:
           matrix:
             Windows:
@@ -533,6 +519,7 @@ stages:
         displayName: ${{ variables.buildDescription }}
         steps:
           - checkout: self
+            clean: false
 
           - task: DownloadBuildArtifacts@0
             displayName: Download artifacts for integration tests
@@ -605,11 +592,12 @@ stages:
     jobs:
       - job: Publish
         workspace:
-          clean: all
+          clean: outputs
         pool:
           vmImage: ubuntu-20.04
         steps:
           - checkout: self
+            clean: false
 
           - task: DownloadBuildArtifacts@0
             displayName: Download Artifacts for Publish

src/Jackett.Common/Content/index.html

@@ -446,14 +446,14 @@
                                     <th>Name</th>
                                     <th>Size</th>
                                     <th>Size</th>
-                                    <th>Files</th>
+                                    <th title="Files">F</th>
                                     <th>Category</th>
-                                    <th>Grabs</th>
-                                    <th>Seeds</th>
-                                    <th>Leechers</th>
-                                    <th class="fit">DL Factor</th>
-                                    <th class="fit">UL Factor</th>
-                                    <th>Download</th>
+                                    <th title="Grabs">G</th>
+                                    <th title="Seeders">S</th>
+                                    <th title="Leechers">L</th>
+                                    <th title="DownloadVolumeFactor" class="fit">DLF</th>
+                                    <th title="UploadVolumeFactor" class="fit">ULF</th>
+                                    <th title="Download">DL</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -574,14 +574,14 @@
                     <th>Name</th>
                     <th>Size</th>
                     <th>Size</th>
-                    <th>Files</th>
+                    <th title="Files">F</th>
                     <th>Category</th>
-                    <th>Grabs</th>
-                    <th>Seeds</th>
-                    <th>Leechers</th>
-                    <th>DL Factor</th>
-                    <th>UL Factor</th>
-                    <th>Download</th>
+                    <th title="Grabs">G</th>
+                    <th title="Seeders">S</th>
+                    <th title="Leechers">L</th>
+                    <th title="DownloadVolumeFactor" class="fit">DLF</th>
+                    <th title="UploadVolumeFactor" class="fit">ULF</th>
+                    <th title="Download">DL</th>
                 </tr>
             </thead>
             <tbody>

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

@@ -12,7 +12,7 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.bet/
+  - https://1337x.unblockit.cat/
   - https://1337x.nocensor.world/
   - https://1337x.unblockninja.com/
 legacylinks:
@@ -37,6 +37,7 @@ legacylinks:
   - https://1337x.unblockit.name/
   - https://1337x.nocensor.sbs/
   - https://1337x.unblockit.ist/
+  - https://1337x.unblockit.bet/
 
 caps:
   categorymappings:

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

@@ -10,20 +10,20 @@ links:
 
 caps:
   categorymappings:
-    - {id: 14, cat: Movies, desc: "Movies XviD"}
-    - {id: 34, cat: Movies, desc: "Movies UltraHD"}
-    - {id: 15, cat: Movies, desc: "Movies DVD-R"}
-    - {id: 11, cat: Movies, desc: "Movies 720p"}
-    - {id: 13, cat: Movies, desc: "Movies 1080p"}
-    - {id: 16, cat: Movies, desc: "Movies 3DTV"}
-    - {id: 17, cat: Movies, desc: "Movies Blu-ray"}
-    - {id: 27, cat: Movies, desc: "Movies BD25 Encode"}
-    - {id: 33, cat: Movies, desc: "Movies BD9 AVCHD"}
+    - {id: 14, cat: Movies/SD, desc: "Movies XviD"}
+    - {id: 15, cat: Movies/DVD, desc: "Movies DVD-R"}
+    - {id: 11, cat: Movies/HD, desc: "Movies 720p"}
+    - {id: 13, cat: Movies/HD, desc: "Movies 1080p"}
+    - {id: 16, cat: Movies/3D, desc: "Movies 3DTV"}
+    - {id: 17, cat: Movies/BluRay, desc: "Movies Blu-ray"}
+    - {id: 27, cat: Movies/BluRay, desc: "Movies BD25 Encode"}
+    - {id: 33, cat: Movies/BluRay, desc: "Movies BD9 AVCHD"}
     - {id: 22, cat: Movies, desc: "Movies 2D to 3D Conv"}
     - {id: 32, cat: Movies, desc: "Bluray MKV Remux"}
-    - {id: 23, cat: Movies, desc: "Movies Evo 3D"}
+    - {id: 23, cat: Movies/3D, desc: "Movies Evo 3D"}
+    - {id: 36, cat: Movies/UHD, desc: "Movies 4K UHD Bluray"}
+    - {id: 37, cat: Movies/UHD, desc: "Movies 4K UHD Encode"}
     - {id: 21, cat: PC, desc: "3D Software"}
-    - {id: 2, cat: Audio, desc: "Music"}
     - {id: 28, cat: XXX, desc: "Adult 720p"}
     - {id: 29, cat: XXX, desc: "Adult 1080p"}
     - {id: 30, cat: XXX, desc: "Adult Blu-ray"}
@@ -42,6 +42,21 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 3
+    options:
+      3: created
+      5: seeders
+      2: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: 2
+    options:
+      1: desc
+      2: asc
   - name: info
     type: info
     label: Results Per Page
@@ -62,6 +77,7 @@ login:
     - selector: span.errormsg
   test:
     path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
@@ -71,8 +87,12 @@ search:
     search: "{{ .Keywords }}"
     page: torrents
     category: 0
+    # 0 all, 1 Anaglyph 3D, 2 Side by Side,3 Over Under
     3dformat: 0
-    active: 1
+    # 0 all, 1 active only, 2 dead only
+    active: 0
+    order: "{{ .Config.sort }}"
+    by: "{{ .Config.type }}"
 
   rows:
     selector: table[cellspacing!="1"].lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])
@@ -85,23 +105,26 @@ search:
         - name: querystring
           args: category
     title:
-      remove: span
-      selector: td:nth-child(2)
+      selector: a[href^="index.php?page=torrent-details&id="]
+    details:
+      selector: a[href^="index.php?page=torrent-details&id="]
+      attribute: href
     download:
       selector: a[href^="index.php?page=torrent-details&id="]
       attribute: href
       filters:
         - name: replace
           args: ["index.php?page=torrent-details&id=", "download.php?id="]
-    details:
+    poster:
       selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      text: 0
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: ",\\'(.+?)\\'"
+    genre:
+      selector: td:nth-child(2) span
+    description:
+      text: "{{ .Result.genre }}"
     date:
       selector: td:nth-last-child(5)
       filters:
@@ -109,11 +132,23 @@ search:
           args: " -07:00" # PDT
         - name: dateparse
           args: "02/01/2006 -07:00"
+    size:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: a[href^="index.php?page=peers"]
+    leechers:
+      selector: td:has(a[href^="index.php?page=peers"]) + td
+    grabs_optional:
+      selector: a[href^="index.php?page=torrent_history"]
+      optional: true
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
     downloadvolumefactor:
       case:
-        img[title^="You get 50% off download count on this torrent"]: 0.5
+        img[src="images/50off.png"]: 0.5
         "*": 1
     uploadvolumefactor:
-      case:
-        "*": 1
+      text: 1
+    minimumratio:
+      text: 1.0
 # xbtit

src/Jackett.Common/Definitions/3evils-api.yml

@@ -0,0 +1,147 @@
+---
+id: 3evils-api
+name: 3Evils (API)
+description: "3Evils is a Private site for MOVIES / TV / MUSIC "
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://3evils.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: PC/Games, desc: "Game"}
+    - {id: 5, cat: PC/0day, desc: "Application"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://3evils.net/\" target =_blank>3Evils</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ 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 }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+#    minimumseedtime:
+#      # 2 days (as seconds = 2 x 24 x 60 x 60)
+#      text: 172800
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -85,7 +85,6 @@ caps:
     - {id: 27, cat: XXX/SD, desc: "XXX SD"}
     - {id: 76, cat: XXX, desc: "XXX Andere"}
 
-
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid]
@@ -131,11 +130,11 @@ settings:
 
 login:
   path: signin.php
-  method: form
-  form: form
+  method: post
   inputs:
     user: "{{ .Config.user }}"
     pass: "{{ .Config.pass }}"
+    returnto: "%2Fbrowse.php"
   error:
     - selector: .error
   test:

src/Jackett.Common/Definitions/abtorrents.yml

@@ -128,18 +128,15 @@ search:
         - name: querystring
           args: cat
     title:
-      selector: div.torrent-name
+      selector: a[href^="details.php?id="]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
-    poster:
-      selector: img[src*="/img.php?"]
-      attribute: src
     files:
-      selector: td:nth-last-child(8)
+      selector: td:nth-last-child(9)
     date_yday:
       # Yesterday<br/>6:00 AM
       selector: td:nth-last-child(7):contains("day")

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

@@ -104,8 +104,18 @@ search:
             - "Portuguese (Brazil) English"
     details:
       selector: details_link
+    _cat:
+      selector: category
+    _type:
+      selector: type
+    _res:
+      selector: resolution
+      optional: true
+    _reg:
+      selector: region
+      optional: true
     description:
-      selector: media_info
+      text: "{{ .Result._cat }} {{ .Result._type }} {{ .Result._res }} {{ .Result._reg }}"
     download:
       selector: download_link
     infohash:

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

@@ -107,7 +107,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -117,6 +117,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -152,4 +163,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 3 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 6.2.1
+# json UNIT3D 6.4.0

src/Jackett.Common/Definitions/anisource.yml

@@ -5,6 +5,8 @@ description: "AniSource is a Public site for HD Anime raws."
 language: en-US
 type: public
 encoding: UTF-8
+certificates:
+  - f400d50a4dac4dd6546c869ac75669846205a0d2 # expired 26 Aug 2022
 links:
   - https://asnet.pw/
 

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

@@ -119,6 +119,15 @@ search:
       selector: imdb
     tmdbid:
       selector: tmdb
+    genre:
+      selector: tags
+      filters:
+        - name: replace
+          args: [".", "_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: fileCount
     seeders:
       selector: seeders
     leechers:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -8,7 +8,7 @@ encoding: UTF-8
 links:
   - https://audiobookbay.fi/
   - https://audiobookbay.se/
-  - https://audiobookbay.unblockit.bet/
+  - https://audiobookbay.unblockit.cat/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.uno/
@@ -31,6 +31,7 @@ legacylinks:
   - http://audiobookbay.se/
   - http://audiobookbayabb.com/
   - https://audiobookbay.unblockit.ist/
+  - https://audiobookbay.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/audionews.yml

@@ -176,6 +176,8 @@ caps:
     - {id: 233, cat: Other, desc: "GFXNEWS GAME DEVELOPMENT"}
     - {id: 226, cat: Other, desc: "GFXNEWS MAGAZINE"}
     - {id: 234, cat: Other, desc: "GFXNEWS MATERIAL"}
+    - {id: 243, cat: Other, desc: "GFXNEWS OTHER GRAPHICS"}
+    - {id: 244, cat: Other, desc: "GFXNEWS OTHER GRAPHICS Zbrush, Substance tools"}
     - {id: 216, cat: Other, desc: "GFXNEWS PHOTOSTOCK"}
     - {id: 220, cat: Other, desc: "GFXNEWS PHOTOGRAPHY - ART"}
     - {id: 227, cat: Other, desc: "GFXNEWS PHOTOSHOP"}
@@ -183,10 +185,10 @@ caps:
     - {id: 229, cat: Other, desc: "GFXNEWS PHOTOSHOP Background & PSD Source"}
     - {id: 230, cat: Other, desc: "GFXNEWS PHOTOSHOP Brushes & Gradient"}
     - {id: 231, cat: Other, desc: "GFXNEWS PHOTOSHOP Toolkits, Papers & Objects"}
+    - {id: 245, cat: Other, desc: "GFXNEWS PLUGINS"}
     - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
     - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
     - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
-    - {id: 236, cat: Other, desc: "GFXNEWS POSER"}
     - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
     - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
     - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}

src/Jackett.Common/Definitions/bestcore.yml

@@ -124,8 +124,11 @@ search:
 
   fields:
     category:
+      text: 38
+    category|noappend:
       selector: a[href^="browse.php?cat="]
       attribute: href
+      optional: true
       filters:
         - name: querystring
           args: cat

src/Jackett.Common/Definitions/bitbazis.yml

@@ -118,7 +118,7 @@ search:
     # can support genre searching but you need to know the id, eg &genre23=1 for Comedy (id is 23)
 
   rows:
-    selector: "table[width=\"100%\"]:last-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
+    selector: "table[width=\"100%\"][align=\"center\"]:first-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
 
   fields:
     category:
@@ -158,17 +158,26 @@ search:
     size:
       selector: td:nth-child(6)
     date:
-      # 2022<br>07/30. <br>17:02
-      # 2022<br>07/30. <br> 7:02
-      # 2022<br>07/09.
-      selector: td:nth-child(7)
+      # 36 perce
+      # 13 órája  és 59 perce
+      # 2 napja  és 10 órája
+      # 1 hete  és 1 napja
+      # 1 éve  és 30 hete
+      selector: td:nth-child(7) span:last-child
       filters:
-        - name: regexp
-          args: (\d{6}/\d{2})
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "200601/02 -07:00"
+        - name: replace
+          args: ["és ", " "]
+        - name: replace
+          args: ["perce", "minute"]
+        - name: replace
+          args: ["órája", "hour"]
+        - name: replace
+          args: ["napja", "day"]
+        - name: replace
+          args: ["hete", "week"]
+        - name: replace
+          args: ["éve", "year"]
+        - name: timeago
     grabs:
       selector: td:nth-child(5)
     seeders:

src/Jackett.Common/Definitions/bithorlo.yml

@@ -45,7 +45,6 @@ caps:
     - {id: 9, cat: XXX, desc: "XXX/Film"}
     - {id: 10, cat: XXX, desc: "XXX/Kép"}
 
-
   modes:
     search: [q]
     tv-search: [q, season, ep]

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

@@ -155,4 +155,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.3.0
+# json UNIT3D 6.4.0b

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -27,7 +27,6 @@ caps:
     - {id: 14, cat: TV/Sport, desc: "HD"}
     - {id: 7, cat: TV/Sport, desc: "Misc"}
 
-
   modes:
     search: [q]
     tv-search: [q, season, ep]

src/Jackett.Common/Definitions/breizhpeers.yml

@@ -136,13 +136,10 @@ search:
       selector: details_link
     download:
       selector: download_link
-    magnet:
-      selector: magnet_link
-      optional: true
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -152,6 +149,13 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -184,4 +188,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.2.1 custom
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/btmirror.yml

@@ -7,11 +7,12 @@ type: public
 encoding: UTF-8
 links:
   - https://btsao.com/
-  - https://btmirror.unblockit.bet/
+  - https://btmirror.unblockit.cat/
 legacylinks:
   - https://btmirror.unblockit.blue/
   - https://btmirror.unblockit.name/
   - https://btmirror.unblockit.ist/
+  - https://btmirror.unblockit.bet/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btsow.yml

@@ -5,17 +5,10 @@ description: "BTSOW is a Public torrent indexer"
 language: en-US
 type: public
 encoding: UTF-8
+# use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.bar/
+  - https://btsow.cfd/
 legacylinks:
-  - https://btos.pw/
-  - https://btio.pw/
-  - https://btsow.club/
-  - https://bteve.com/
-  - https://btsow.fun/
-  - https://btsow.space/
-  - https://btsow.site/
-  - https://btsow.cyou/
   - https://btsow.monster/
   - https://btsow.casa/
   - https://btsow.website/
@@ -30,6 +23,8 @@ legacylinks:
   - https://btsow.us/
   - https://btsow.one/
   - https://btsow.rest/
+  - https://btsow.bar/
+  - https://btsow.click/
 
 caps:
   categories:

src/Jackett.Common/Definitions/byrbt.yml

@@ -99,11 +99,9 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
-
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 
-
   fields:
     category:
       selector: a[href^="?cat="]

src/Jackett.Common/Definitions/carpathians.yml

@@ -148,6 +148,8 @@ search:
           args: ["napja", "day"]
         - name: replace
           args: ["hete", "week"]
+        - name: replace
+          args: ["éve", "year"]
         - name: timeago
     downloadvolumefactor:
       text: 0

src/Jackett.Common/Definitions/carphunter.yml

@@ -35,12 +35,12 @@ caps:
     - {id: 31, cat: PC/0day, desc: "Programok/RIP"}
     - {id: 33, cat: TV, desc: "Sorozat/Eng"}
     - {id: 32, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
-    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
     - {id: 29, cat: Audio/Lossless, desc: "Zene/FLAC/Eng"}
     - {id: 28, cat: Audio/Lossless, desc: "Zene/FLAC/Hun"}
     - {id: 27, cat: Audio/MP3, desc: "Zene/MP3/Eng"}
     - {id: 26, cat: Audio/MP3, desc: "Zene/MP3/Hun"}
+    - {id: 34, cat: XXX, desc: "XXX/Filmek"}
+    - {id: 39, cat: XXX/ImageSet, desc: "XXX/Képek"}
 
   modes:
     search: [q]
@@ -87,7 +87,12 @@ login:
 
 search:
   paths:
-    - path: letoltes.php
+    - path: browse.php
+      categories: ["!", 34, 39]
+    - path: browse.php
+      categories: [34, 39]
+      inputs:
+        xxx: 1
   keywordsfilters:
     # the site uses % for wildcard
     - name: re_replace
@@ -98,16 +103,16 @@ search:
     # 0 both, 1 onlyactive, 2 onlydead, 3 onlyfree, 4 x2 torrents, 5 mytorrents, 6 waiting for seeds
     incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}"
     sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
+    order: "{{ .Config.type }}"
     # does not support imdbid searches
     # can support genre searching but you need to know the id, eg &genre2=1 for Comedy (id is 2)
 
   rows:
-    selector: table[width="920px"] > tbody > tr:has(a[href^="letoltes.php?cat="])
+    selector: "table[border=\"1\"][cellpadding=\"3\"][style=\"width: 920px;\"] > tbody > tr:has(a[href^=\"browse.php?cat=\"])"
 
   fields:
     category:
-      selector: a[href^="letoltes.php?cat="]
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
@@ -137,7 +142,7 @@ search:
       attribute: onmouseover
       filters:
         - name: regexp
-          args: "src=(.*?) width"
+          args: "showTorrentThumb\\('(.*?)', "
     date:
       selector: td:nth-last-child(8)
       filters:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -71,9 +71,12 @@ settings:
       trie-nom-a: title asc
 
 download:
+  before:
+    # request target
+    path: "download_magnet?id={{ re_replace .DownloadUri.AbsoluteUri \"^.*-(\\d+)\\.html\" \"$1\" }}"
   selectors:
-    - selector: a[href^="magnet:"]
-      attribute: href
+    - selector: body
+      usebeforeresponse: true
 
 search:
   paths:

src/Jackett.Common/Definitions/cryptichaven.yml

@@ -60,6 +60,8 @@ caps:
     - {id: 53, cat: TV, desc: "Random Oddities"}
     - {id: 59, cat: TV, desc: "Late Night Talkshows"}
     - {id: 77, cat: TV, desc: "Non-English language"}
+    - {id: 78, cat: TV, desc: "Video Musical Comedy"}
+    - {id: 79, cat: TV, desc: "Video Podcasts"}
     # BY REQUEST ONLY
     - {id: 19, cat: Movies, desc: "Movie DVD5/9"}
     - {id: 20, cat: Movies, desc: "Movie AVI"}

src/Jackett.Common/Definitions/dark-shadow.yml

@@ -54,6 +54,7 @@ caps:
     - {id: 76, cat: XXX/XviD, desc: "XXX SD"}
     - {id: 73, cat: XXX/x264, desc: "XXX HD"}
     - {id: 75, cat: XXX/Pack, desc: "XXX Pack"}
+    - {id: 142, cat: XXX/ImageSet, desc: "XXX Pic´s"}
     #  Internal
     - {id: 129, cat: Movies/SD, desc: "Internal Film SD"}
     - {id: 128, cat: Movies/HD, desc: "Internal Film HD"}
@@ -167,7 +168,7 @@ search:
       attribute: href
       filters:
         - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
+          args: ["details.php?id=", "download_ssl.php?torrent="]
     poster:
       selector: div[id^="details"] img
       attribute: src

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

@@ -72,10 +72,24 @@ search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
     # 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 }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
 
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ 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 }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     attribute: attributes
@@ -83,8 +97,8 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
@@ -116,20 +130,25 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
       # api returns 0=false, 1=true
       selector: double_upload
       case:
         0: 1 # normal
         1: 2 # double
-    minimumratio:
-      text: 1.0
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
     minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# json UNIT3D 5.3.0
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/demonoid.yml

@@ -12,7 +12,7 @@ links:
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ws/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.pet/
-  - https://demonoid.unblockit.bet/
+  - https://demonoid.unblockit.cat/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.world/
 legacylinks:
@@ -35,6 +35,7 @@ legacylinks:
   - https://demonoid.unblockit.name/
   - https://demonoid.nocensor.sbs/
   - https://demonoid.unblockit.ist/
+  - https://demonoid.unblockit.bet/
 
 caps:
   categorymappings:
@@ -319,13 +320,20 @@ settings:
 
 login:
   method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
   test:
     path: files/
 
 download:
-  selectors:
-    - selector: a[href^="/files/download/"]:has(i.fa-download)
-      attribute: href
+  infohash:
+    hash:
+      selector: div:contains("Torrent hash") > div.col-md-5 > div
+      filters:
+        - name: replace
+          args: [" ", ""]
+    title:
+      selector: h1[id="torrent--title"]
 
 search:
   paths:

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

@@ -8,6 +8,7 @@ encoding: UTF-8
 links:
   - https://desitorrents.tv/
   - https://desitorrents.rocks/
+  - https://torrent.desi/
 
 caps:
   categorymappings:
@@ -64,13 +65,23 @@ search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
     # 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 }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
 
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ 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 }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
   keywordsfilters:
     - name: re_replace
-      args: [^$, "%"]
+      args: ["\\.", " "]
 
   rows:
     selector: data
@@ -79,8 +90,8 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
@@ -88,7 +99,7 @@ search:
     download:
       selector: download_link
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -98,6 +109,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -112,11 +134,15 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
       # api returns 0=false, 1=true
       selector: double_upload
@@ -128,4 +154,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 5.3.0 (custom)
+# json UNIT3D 6.4.1 (custom)

src/Jackett.Common/Definitions/diablotorrent.yml

@@ -52,7 +52,6 @@ caps:
     - {id: 20, cat: Books, desc: "E-Book / Magyar"}
     - {id: 52, cat: Books, desc: "E-Book / Egyéb"}
 
-
   modes:
     search: [q]
     tv-search: [q, season, ep]

src/Jackett.Common/Definitions/digitalcore.yml

@@ -10,23 +10,23 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Movies/DVD, desc: Movies/DVDR}
     - {id: 2, cat: Movies/SD, desc: Movies/SD}
-    - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
-    - {id: 4, cat: Movies/UHD, desc: Movies/4K}
-    - {id: 38, cat: Movies/UHD, desc: Movies/UHD}
+    - {id: 1, cat: Movies/DVD, desc: Movies/DVDR}
     - {id: 5, cat: Movies/HD, desc: Movies/720p}
     - {id: 6, cat: Movies/HD, desc: Movies/1080p}
+    - {id: 4, cat: Movies/UHD, desc: Movies/2160p}
+    - {id: 3, cat: Movies/BluRay, desc: Movies/BluRay}
+    - {id: 38, cat: Movies/UHD, desc: Movies/Bluray/UHD}
     - {id: 7, cat: Movies/HD, desc: Movies/PACKS}
-    - {id: 8, cat: TV/HD, desc: TV/720p}
-    - {id: 9, cat: TV/HD, desc: TV/1080p}
-    - {id: 10, cat: TV/SD, desc: TV/SD}
-    - {id: 11, cat: TV/SD, desc: TV/DVDR}
-    - {id: 12, cat: TV/HD, desc: TV/PACKS}
-    - {id: 13, cat: TV/UHD, desc: TV/4K}
-    - {id: 14, cat: TV/HD, desc: TV/BluRay}
+    - {id: 10, cat: TV/SD, desc: Tv/SD}
+    - {id: 11, cat: TV/SD, desc: Tv/DVDR}
+    - {id: 8, cat: TV/HD, desc: Tv/720p}
+    - {id: 9, cat: TV/HD, desc: Tv/1080p}
+    - {id: 13, cat: TV/UHD, desc: Tv/2160p}
+    - {id: 14, cat: TV/HD, desc: Tv/BluRay}
+    - {id: 12, cat: TV/HD, desc: Tv/PACKS}
     - {id: 17, cat: Other, desc: Unknown}
-    - {id: 18, cat: PC/0day, desc: Apps/0day}
+    - {id: 18, cat: PC/0day, desc: Apps/0DAY}
     - {id: 20, cat: PC/ISO, desc: Apps/PC}
     - {id: 21, cat: PC/Mac, desc: Apps/Mac}
     - {id: 33, cat: PC, desc: Apps/Tutorials}

src/Jackett.Common/Definitions/docspedia.yml

@@ -29,6 +29,7 @@ caps:
     - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
     - {id: 61, cat: Other, desc: "Tutorials"}
+    - {id: 81, cat: Books, desc: "Wordpress"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/dragonworldreloaded.yml

@@ -1,204 +0,0 @@
----
-id: dragonworldreloaded
-name: Dragonworld Reloaded
-description: "Dragonworld Reloaded is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://dragonworld-reloaded.net/
-
-caps:
-  categorymappings:
-    # Movies
-    - {id: 19, cat: Movies/HD, desc: "Movies - HD"}
-    - {id: 26, cat: Movies/UHD, desc: "Movies - UHD"}
-    - {id: 18, cat: Movies/SD, desc: "Movies - SD"}
-    - {id: 139, cat: Movies/3D, desc: "Movies - 3D"}
-    - {id: 2, cat: Movies, desc: "Movies - Pack SD/HD"}
-    # Serien
-    - {id: 41, cat: TV/HD, desc: "Serien - HD"}
-    - {id: 143, cat: TV/UHD, desc: "Serien - UHD"}
-    - {id: 40, cat: TV/SD, desc: "Serien - SD"}
-    - {id: 80, cat: TV/HD, desc: "Serien - Pack HD"}
-    - {id: 151, cat: TV/UHD, desc: "Serien - Pack UHD"}
-    - {id: 42, cat: TV/SD, desc: "Serien - Pack SD"}
-    # Musik
-    - {id: 119, cat: Audio, desc: "Musik - Album"}
-    - {id: 148, cat: Audio, desc: "Musik - Charts"}
-    - {id: 5, cat: Audio, desc: "Musik - Sampler"}
-    - {id: 92, cat: Audio, desc: "Musik - Discography"}
-    - {id: 146, cat: Audio, desc: "Musik - Mixe"}
-    - {id: 142, cat: Audio/Lossless, desc: "Musik - Flac"}
-    - {id: 136, cat: Audio/Video, desc: "Musik - Videos"}
-    # Doku
-    - {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"}
-    # Games
-    - {id: 16, cat: PC/Games, desc: "Games - PC"}
-    - {id: 14, cat: Console/Other, desc: "Games - Wimmelbild"}
-    - {id: 140, cat: Console, desc: "Games - Konsole"}
-    - {id: 145, cat: Console/Other, desc: "Games - Sonstige"}
-    # Appz
-    - {id: 30, cat: PC/0day, desc: "Appz - Windows"}
-    - {id: 106, cat: PC/Mobile-Android, desc: "Appz - Android"}
-    - {id: 138, cat: PC/0day, desc: "Appz - Sonstige"}
-    # Sport
-    - {id: 50, cat: TV/Sport, desc: "Sport - HD"}
-    - {id: 43, cat: TV/Sport, desc: "Sport - SD"}
-    # Sonstiges
-    - {id: 137, cat: Books/Comics, desc: "Sonstiges - Anime"}
-    - {id: 34, cat: Books/EBook, desc: "Sonstiges - E-Books"}
-    - {id: 35, cat: Audio/Audiobook, desc: "Sonstiges - Audiobook"}
-    - {id: 147, cat: Other, desc: "Sonstiges - Sonstige"}
-    # XXX
-    - {id: 47, cat: XXX, desc: "XXX - SD/HD"}
-    - {id: 49, cat: XXX/Other, desc: "XXX - Sonstiges"}
-
-  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: pin
-    type: text
-    label: Pin
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeds: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login.php
-  method: form
-  form: form[action="/login.php"]
-  cookies: ["JAVA=OK"] # avoid jscheck redirect
-  captcha:
-    type: image
-    selector: img[src^="cap/captcha_math.php"]
-    input: stringCaptcha
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    pin: "{{ .Config.pin }}"
-    loggiin: "einloggen"
-  error:
-    - selector: div#login_error
-  test:
-    path: selection.php
-
-download:
-  before:
-    path: ajax_det_poll.php
-    method: post
-    inputs:
-      set_thanks: thanks
-      det_id: "{{ .DownloadUri.Query.torrent }}"
-      ajax: yes
-
-search:
-  paths:
-    - path: selection.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both
-    blah: 0
-    orderby: "{{ .Config.sort }}"
-    sort: "{{ .Config.type }}"
-
-  rows:
-    selector: "div.selection_wrap{{ if .Config.freeleech }}:root:has(div.onlyup){{ else }}{{ end }}"
-
-  fields:
-    category_p1:
-      selector: div.kat_cat_pic_name
-    category_p2:
-      selector: div.kat_cat_pic_name_b
-    categorydesc:
-      text: "{{ .Result.category_p1 }} - {{ .Result.category_p2 }}"
-    title:
-      selector: a.selection_a
-    details:
-      selector: a.selection_a
-      attribute: href
-    download:
-      selector: a.selection_a
-      attribute: href
-      filters:
-        - name: replace
-          args: ["details.php?id=", "download.php?torrent="]
-    poster:
-      selector: div[id^="details"] img
-      attribute: src
-    size:
-      selector: div.selection_unter_ad
-    grabs:
-      selector: div.selection_unter_ae
-    seeders:
-      selector: div.selection_unter_aa
-    leechers:
-      selector: div.selection_unter_aaa
-    date_day:
-      # Heute 13:30:04
-      # Gestern 09:10:10
-      selector: div.selection_unter_ab:not(:contains("."))
-      optional: true
-      filters:
-        - name: replace
-          args: ["Heute", "Today"]
-        - name: replace
-          args: ["Gestern", "Yesterday"]
-    date_year:
-      # 30.02.2018 um 23:12:50
-      selector: div.selection_unter_ab:contains(".")
-      optional: true
-      filters:
-        - name: replace
-          args: [" um", ""]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
-    date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
-    description:
-      selector: selection_unter_af
-    downloadvolumefactor:
-      case:
-        ":root:has(div.onlyup)": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 12 hours (as seconds = 12 x 60 x 60)
-      text: 43200
-# 3xT

src/Jackett.Common/Definitions/ebookparadijs.yml

@@ -44,13 +44,16 @@ caps:
     book-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info_cookie
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
     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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: freeleech
     type: checkbox
     label: Filter freeleech only
@@ -64,9 +67,15 @@ settings:
     default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
   test:
     path: /
     selector: a[href="logout.php"]

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

@@ -349,17 +349,17 @@ search:
     download:
       selector: a[href^="torrents-details.php?id="]
       attribute: href
-    seeders:
-      selector: td:nth-child(4)
-    leechers:
-      selector: td:nth-child(5)
     size:
+      selector: td:nth-child(5)
+    seeders:
       selector: td:nth-child(6)
-    description:
+    leechers:
       selector: td:nth-child(7)
+    description:
+      selector: td:nth-child(4)
       filters:
         - name: prepend
-          args: "wait: "
+          args: "uploader: "
     date:
       text: now
     downloadvolumefactor:

src/Jackett.Common/Definitions/eniahd.yml

@@ -6,9 +6,9 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - https://eniahd.com/
-legacylinks:
   - https://eniatv.com/
+legacylinks:
+  - https://eniahd.com/
 
 caps:
   categorymappings:
@@ -94,7 +94,6 @@ login:
   inputs:
     login_username: "{{ .Config.username }}"
     login_password: "{{ .Config.password }}"
-    redirect: "/index.php"
     autologin: 1
   error:
     - selector: table.error

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

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.bet/
+  - https://extratorrent.unblockit.cat/
   - https://extratorrent.nocensor.world/
 legacylinks:
   - https://extratorrent.nocensor.work/
@@ -23,6 +23,7 @@ legacylinks:
   - https://extratorrent.unblockit.name/
   - https://extratorrent.nocensor.sbs/
   - https://extratorrent.unblockit.ist/
+  - https://extratorrent.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -10,28 +10,29 @@ links:
 
 caps:
   categorymappings:
-    - {id: 10, cat: Movies/DVD, desc: "Film DVD rip"}
-    - {id: 111, cat: Movies/DVD, desc: "Film DVD Promo"}
-    - {id: 118, cat: Movies/DVD, desc: "Film DVD Kids"}
-    - {id: 113, cat: Movies, desc: "Films Independent"}
-    - {id: 129, cat: Movies/HD, desc: "Films HD DVD"}
-    - {id: 130, cat: Movies/UHD, desc: "Films 4K"}
-    - {id: 143, cat: Movies/HD, desc: "Films DivX 720P"}
-    - {id: 114, cat: Audio/MP3, desc: "Muziek MP3"}
+    - {id: 130, cat: Movies/UHD, desc: "4K Film"}
+    - {id: 129, cat: Movies/HD, desc: "HD Film - HD MKV"}
+    - {id: 123, cat: Movies/HD, desc: "HD Film - HEVC x265"}
+    - {id: 10, cat: Movies/DVD, desc: "DVD Film - Retail DVD"}
+    - {id: 111, cat: Movies/DVD, desc: "DVD Film - HD2DVD / BR2DVD"}
+    - {id: 128, cat: Audio/Video, desc: "DVD Film - Muziek DVD"}
+    - {id: 118, cat: Movies/Other, desc: "DVD Film - Kids DVD"}
+    - {id: 125, cat: Movies/SD, desc: "DivX - Divx Rip"}
+    - {id: 143, cat: Movies/HD, desc: "DivX - Divx 720P"}
+    - {id: 132, cat: TV, desc: "Serie's - Complete Seizoen"}
+    - {id: 139, cat: TV, desc: "Serie's - Losse Afleveringen"}
+    - {id: 105, cat: TV/Documentary, desc: "Docu's"}
+    - {id: 115, cat: PC/0day, desc: "Software - Windows"}
+    - {id: 116, cat: PC/Mac, desc: "Software - Mac"}
+    - {id: 105, cat: PC/ISO, desc: "Software - Linux"}
+    - {id: 120, cat: PC/Games, desc: "Games"}
+    - {id: 114, cat: Audio/MP3, desc: "Muziek - MP3"}
+    - {id: 142, cat: Audio/Lossless, desc: "Muziek - Flac"}
+    - {id: 131, cat: Books/Comics, desc: "Stipboeken"}
     - {id: 140, cat: Books/EBook, desc: "E-Book"}
-    - {id: 105, cat: TV/Documentary, desc: "Documentaire"}
-    - {id: 115, cat: PC, desc: "PC apps"}
-    - {id: 120, cat: PC/Games, desc: "PC Games"}
-    - {id: 106, cat: Other, desc: "Overig"}
-    - {id: 131, cat: Books/Comics, desc: "Stripboeken"}
-    - {id: 132, cat: TV/HD, desc: "TV HD Serie"}
-    - {id: 116, cat: PC/Mac, desc: "Mac Software"}
-    - {id: 125, cat: Movies/SD, desc: "Xvid Rip"}
-    - {id: 123, cat: Movies/HD, desc: "MKV/X265"}
-    - {id: 108, cat: XXX, desc: "18+"}
-    - {id: 142, cat: XXX/x264, desc: "18+ HD"}
-    - {id: 139, cat: TV, desc: "TV Series"}
-    - {id: 128, cat: Audio/Video, desc: "muziek DVD"}
+    - {id: 155, cat: Books/Mags, desc: "Tijdschriften"}
+    - {id: 108, cat: XXX, desc: "18+ XXX"}
+    - {id: 106, cat: Other, desc: "Overige"}
 
   modes:
     search: [q]
@@ -91,6 +92,11 @@ search:
     search: "{{ .Keywords }}"
     incldead: 1
     # does not support imdbid search and does not return imdb link in results
+  keywordsfilters:
+    - name: re_replace # S01E02 to 1 2
+      args: ["(?i)\\bS0*(\\d{1,2})\\s*E0*(\\d{1,2})\\b", "$1 $2"]
+    - name: re_replace # S01 to 1
+      args: ["(?i)\\bS0*(\\d{1,2})\\b", "$1"]
 
   rows:
     selector: table.mainouter
@@ -108,11 +114,13 @@ search:
       selector: a[href^="details.php?id="]
       filters:
         - name: re_replace
-          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "S$2-$4"]
         - name: re_replace
           args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
         - name: re_replace
-          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "E$2-$4"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})", "E$2"]
         - name: re_replace
           args: ["(?i)compleet", "Complete"]
     details:
@@ -183,4 +191,6 @@ search:
       text: 0
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 1.0
 # engine n/a

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -128,17 +128,15 @@ search:
           args: cat
     _language:
       selector: td:nth-last-child(5)
-    description:
+    _vip:
       selector: img[src="/images/vip-icon.png"]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/images/vip-icon.png", " VIP ONLY"]
+      attribute: alt
+      optional: true
     title:
       selector: a[href^="file.php?id="] b
       filters:
         - name: append
-          args: " {{ .Result._language }}{{ .Result.description }}"
+          args: " {{ .Result._language }}{{ if .Result._vip }} VIP ONLY{{ else }}{{ end }}"
     details:
       selector: a[href^="file.php?id="]
       attribute: href
@@ -170,6 +168,19 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    genre_optional:
+      # Drama, Romance | N/A | 2022 | 112 min | N/A
+      # Drama:Family:Romance
+      selector: td:nth-child(2)
+      remove: a
+      filters:
+        - name: split
+          args: ["|", 0]
+    genre:
+      # if its VIP then do not keep genre
+      text: "{{ if .Result._vip }}{{ else }}{{ .Result.genre_optional }}{{ end }}"
+    description:
+      text: "{{ if .Result._vip }}VIP ONLY{{ else }}{{ .Result.genre }}{{ end }}"
     minimumratio:
       text: 1.0
     minimumseedtime:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,7 +13,7 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.bet/
+  - https://eztv.unblockit.cat/
   - https://eztv.nocensor.world/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
@@ -39,6 +39,7 @@ legacylinks:
   - https://eztv.unblockit.name/
   - https://eztv.nocensor.sbs/
   - https://eztv.unblockit.ist/
+  - https://eztv.unblockit.bet/
 
 caps:
   categories:
@@ -47,7 +48,6 @@ caps:
   modes:
     search: [q]
     tv-search: [q, season, ep]
-  allowrawsearch: true
 
 settings: []
 
@@ -58,6 +58,13 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
+    # fixes for site search issues
+    - name: replace
+      args: ["-", ""]
+    - name: replace
+      args: [" ", "-"]
+    - name: replace
+      args: ["&", ""]
 
   headers:
     cookie: ["sort_no=100"] # show 100 results for keywordless search

src/Jackett.Common/Definitions/fantasticheaven.yml

@@ -10,53 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: 58, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 59, cat: Movies/HD, desc: "Filme 720p"}
-    - {id: 60, cat: Movies/HD, desc: "Filme 1080p"}
-    - {id: 61, cat: Movies/UHD, desc: "Filme 2160p"}
-    - {id: 170, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 101, cat: Movies/DVD, desc: "Filme DVD"}
-    - {id: 62, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 169, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 183, cat: Movies/SD, desc: "Filme Packs SD"}
-    - {id: 184, cat: Movies/HD, desc: "Filme Packs 720p"}
-    - {id: 185, cat: Movies/HD, desc: "Filme Packs 1080p"}
-    - {id: 186, cat: Movies/UHD, desc: "Filme Packs 2160p"}
-    - {id: 172, cat: Movies/SD, desc: "Film-Klassiker SD"}
-    - {id: 173, cat: Movies/HD, desc: "Film-Klassiker 720p"}
-    - {id: 174, cat: Movies/HD, desc: "Film-Klassiker 1080p"}
-    - {id: 175, cat: Movies/UHD, desc: "Film-Klassiker 2160p"}
-    - {id: 180, cat: Movies/DVD, desc: "Film-Klassiker DVD"}
-    - {id: 181, cat: Movies/BluRay, desc: "Film-Klassiker Bluray"}
-    - {id: 182, cat: Movies/3D, desc: "Film-Klassiker 3D"}
-    - {id: 176, cat: Movies/SD, desc: "Film-Klassiker Pack SD"}
-    - {id: 177, cat: Movies/HD, desc: "Film-Klassiker Pack 720p"}
-    - {id: 178, cat: Movies/HD, desc: "Film-Klassiker Pack 1080p"}
-    - {id: 179, cat: Movies/UHD, desc: "Film-Klassiker Pack 2160p"}
-    - {id: 64, cat: TV/SD, desc: "Serien SD"}
-    - {id: 65, cat: TV/HD, desc: "Serien 720p"}
-    - {id: 66, cat: TV/HD, desc: "Serien 1080p"}
-    - {id: 68, cat: TV/UHD, desc: "Serien 2160p"}
-    - {id: 69, cat: TV/Foreign, desc: "Serien Ger-Subbed"}
-    - {id: 167, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 187, cat: TV/SD, desc: "Serienpacks SD"}
-    - {id: 188, cat: TV/HD, desc: "Serienpacks 720p"}
-    - {id: 189, cat: TV/HD, desc: "Serienpacks 1080p"}
-    - {id: 190, cat: TV/UHD, desc: "Serienpacks 2160p"}
-    - {id: 191, cat: TV/Foreign, desc: "Serienpacks Ger-Subbed"}
-    - {id: 71, cat: Audio/MP3, desc: "Audio MP3"}
-    - {id: 72, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 73, cat: Audio, desc: "Audio Packs"}
-    - {id: 153, cat: Audio/Audiobook, desc: "Hörbücher"}
-    - {id: 192, cat: PC/Games, desc: "Spiele Windows"}
-    - {id: 193, cat: PC, desc: "Software Windows"}
-    - {id: 90, cat: Books/Mags, desc: "Zeitschriften"}
-    - {id: 89, cat: Books/EBook, desc: "E-Books"}
-    - {id: 91, cat: XXX/SD, desc: "XXX SD"}
-    - {id: 92, cat: XXX/x264, desc: "XXX 720p"}
-    - {id: 93, cat: XXX/x264, desc: "XXX 1080p"}
-    - {id: 171, cat: XXX/Pack, desc: "XXX Packs"}
-    - {id: 94, cat: XXX/ImageSet, desc: "XXX Magazine"}
+    - {id: 152, cat: Books, desc: "E-Books"}
+    - {id: 141, cat: Movies/HD, desc: "Filme 1080p"}
+    - {id: 140, cat: Movies/UHD, desc: "Filme 2160p"}
+    - {id: 131, cat: Movies/3D, desc: "Filme 3D"}
+    - {id: 154, cat: Movies/HD, desc: "Filme 720p"}
+    - {id: 142, cat: Movies/BluRay, desc: "Filme Bluray"}
+    - {id: 120, cat: Movies/DVD, desc: "Filme DVD"}
+    - {id: 101, cat: Movies/Foreign, desc: "Filme International"}
+    - {id: 139, cat: Movies/HD, desc: "Filme Packs 1080p"}
+    - {id: 119, cat: Movies/UHD, desc: "Filme Packs 2160p"}
+    - {id: 106, cat: Movies/HD, desc: "Filme Packs 720p"}
+    - {id: 105, cat: Movies/SD, desc: "Filme Packs SD"}
+    - {id: 153, cat: Movies/SD, desc: "Filme SD"}
+    - {id: 104, cat: Movies/HD, desc: "Filmklassiker 1080p"}
+    - {id: 135, cat: Movies/UHD, desc: "Filmklassiker 2160p"}
+    - {id: 122, cat: Movies/3D, desc: "Filmklassiker 3D"}
+    - {id: 103, cat: Movies/HD, desc: "Filmklassiker 720p"}
+    - {id: 134, cat: Movies/BluRay, desc: "Filmklassiker Bluray"}
+    - {id: 130, cat: Movies/DVD, desc: "Filmklassiker DVD"}
+    - {id: 136, cat: Movies/Foreign, desc: "Filmklassiker International"}
+    - {id: 124, cat: Movies/HD, desc: "Filmklassiker Packs 1080p"}
+    - {id: 123, cat: Movies/UHD, desc: "Filmklassiker Packs 2160p"}
+    - {id: 121, cat: Movies/HD, desc: "Filmklassiker Packs 720p"}
+    - {id: 127, cat: Movies/SD, desc: "Filmklassiker Packs SD"}
+    - {id: 102, cat: Movies/SD, desc: "Filmklassiker SD"}
+    - {id: 118, cat: Audio/Audiobook, desc: "Hörbücher"}
+    - {id: 109, cat: Audio/Lossless, desc: "Musik Flac"}
+    - {id: 129, cat: Audio/MP3, desc: "Musik MP3"}
+    - {id: 111, cat: Audio/Lossless, desc: "Musik Packs Flac"}
+    - {id: 112, cat: Audio/MP3, desc: "Musik Packs MP3"}
+    - {id: 110, cat: Audio/Video, desc: "Musik Videos"}
+    - {id: 113, cat: TV/HD, desc: "Serie 1080p"}
+    - {id: 114, cat: TV/UHD, desc: "Serie 2160p"}
+    - {id: 125, cat: TV/HD, desc: "Serie 720p"}
+    - {id: 115, cat: TV/Foreign, desc: "Serie International"}
+    - {id: 138, cat: TV/HD, desc: "Serie Packs 1080p"}
+    - {id: 143, cat: TV/UHD, desc: "Serie Packs 2160p"}
+    - {id: 116, cat: TV/HD, desc: "Serie Packs 720p"}
+    - {id: 144, cat: TV/Foreign, desc: "Serie Packs International"}
+    - {id: 137, cat: TV/SD, desc: "Serie Packs SD"}
+    - {id: 133, cat: TV/SD, desc: "Serie SD"}
+    - {id: 150, cat: PC/0day, desc: "Windows Apps"}
+    - {id: 149, cat: PC/Games, desc: "Windows Spiele"}
+    - {id: 147, cat: XXX/x264, desc: "XXX 1080p"}
+    - {id: 146, cat: XXX/x264, desc: "XXX 720p"}
+    - {id: 148, cat: XXX/Pack, desc: "XXX Packs"}
+    - {id: 69, cat: XXX/SD, desc: "XXX SD"}
+    - {id: 151, cat: Books/Mags, desc: "Zeitschriften"}
 
   modes:
     search: [q]
@@ -72,6 +73,21 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: pin
+    type: text
+    label: Pin
+  - name: freeleech
+    type: checkbox
+    label: Filter FreeLeech only
+    default: false
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About Freeleech and OnlyUpload at Fantastic Heaven
+    default: <li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
   - name: sort
     type: select
     label: Sort requested from site
@@ -88,75 +104,84 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
 
 login:
   path: login.php
   method: form
-  form: form[action="/login.php"]
+  form: form[action="../takelogin.php"]
   cookies: ["JAVA=OK"] # avoid jscheck redirect
-  captcha:
-    type: image
-    selector: img[src^="cap/captcha_math.php?codeCaptcha="]
-    input: stringCaptcha
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    loggiin: "einloggen"
+    secure_pin: "{{ .Config.pin }}"
   error:
-    - selector: div#login_error
+    - selector: table.tableinborder:contains("Anmeldung Gescheitert!") > tbody > tr > td.tablea
   test:
     path: index.php
     selector: a[href="logout.php"]
 
 search:
   paths:
-    - path: selection.php
+    - path: browse.php
   inputs:
-    $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}"
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    showsearch: 1
     search: "{{ .Keywords }}"
-    blah: 0
+    # 0 active, 1 all, 2 dead
+    incldead: 1
     orderby: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
 
   rows:
-    selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
+    selector: "table.tableinborder[cellspacing=\"1\"][cellpadding=\"0\"] > tbody > tr:has(a[href^=\"download.php\"]){{ if .Config.freeleech }}:has(img[src=\"pic/freeleech.gif\"]){{ else }}{{ end }}{{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
-      selector: a[href^="selection.php?cat="]
+      selector: a[href^="browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
-        - name: replace
-          args: ["#2", ""]
     title:
-      selector: a[href^="details.php?id="]
+      selector: a[href^="details.php?id="] > b
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
-    grabs:
-      selector: div.selection_unter_ae
+    poster:
+      selector: div[id^="details"] img
+      attribute: src
     size:
-      selector: div.selection_unter_ad
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(1)
+    files:
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(1) b:nth-child(2)
     seeders:
-      selector: div.selection_unter_aa > b
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) b:nth-child(1)
     leechers:
-      selector: div.selection_unter_aaa > b
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(2) > b:nth-of-type(2)
+    grabs:
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(3) b:nth-child(1)
     date:
-      selector: div.selection_unter_ab
+      selector: td.content_wrap table tbody tr:nth-child(2) td:nth-child(5)
       filters:
-        - name: replace
-          args: ["um ", ""]
         - name: append
           args: " +01:00" # CET
+        - name: replace
+          args: ["\xA0", " "]
         - name: dateparse
           args: "02.01.2006 15:04:05 -07:00"
     downloadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/oupic.gif"]: 0 # only upload is counted
+        "*": 1
     uploadvolumefactor:
-      text: 1
+      case:
+        img[src="pic/freeleech.gif"]: 0 # nothing is counted
+        "*": 1
 # engine n/a

src/Jackett.Common/Definitions/file-tracker.yml

@@ -27,6 +27,7 @@ caps:
     - {id: 988, cat: Movies, desc: " |- Кино России и СНГ"}
     - {id: 337, cat: Movies, desc: " |- Мультфильмы"}
     - {id: 72, cat: Movies, desc: " |- DVD, HD Видео (фильмы , мультфильмы)"}
+    - {id: 1001, cat: Movies, desc: " |- UHD Видео (фильмы , мультфильмы)"}
     - {id: 999, cat: Movies, desc: " |- Фильмы (2021-2022)"}
     - {id: 996, cat: Movies, desc: " |- Фильмы (2019-2020)"}
     - {id: 921, cat: Movies, desc: " |- Фильмы (2016-2018)"}
@@ -83,11 +84,11 @@ caps:
     - {id: 744, cat: Movies/3D, desc: " |- 3D | Спорт"}
     - {id: 335, cat: Movies/DVD, desc: " |- Наше кино (DVD)"}
     - {id: 336, cat: Movies/HD, desc: " |- Наше кино (HD Video)"}
-    - {id: 747, cat: Movies/BluRay, desc: " |- Наше кино (Blu-ray и BD Remux)"}
+    - {id: 747, cat: Movies/BluRay, desc: " |- Наше кино (Blu-ray и BD Remux) [HD/UHD]"}
     - {id: 985, cat: Movies/UHD, desc: " |- Наше кино (Ultra HD)"}
     - {id: 69, cat: Movies/DVD, desc: " |- Зарубежное кино (DVD)"}
     - {id: 70, cat: Movies/HD, desc: " |- Зарубежное кино (HD Video)"}
-    - {id: 748, cat: Movies/BluRay, desc: " |- Зарубежное кино (Blu-ray и BD Remux)"}
+    - {id: 748, cat: Movies/BluRay, desc: " |- Зарубежное кино (Blu-ray и BD Remux) [HD/UHD]"}
     - {id: 984, cat: Movies/UHD, desc: " |- Зарубежное кино (Ultra HD)"}
     - {id: 907, cat: Movies, desc: " |- Кино для детей (DVD, HD Video, Blu-ray, BD Remux, Ultra HD)"}
     - {id: 339, cat: Movies, desc: " |- Мультфильмы (DVD, HD Video и Blu-ray)"}
@@ -239,7 +240,7 @@ caps:
     - {id: 526, cat: PC/0day, desc: " |- Графика / Просмотрщики графики"}
     - {id: 525, cat: PC/0day, desc: " |- Для работы с аудио"}
     - {id: 524, cat: PC/0day, desc: " |- Для работы с видео"}
-    - {id: 887, cat: PC/0day, desc: " |- Интернет TV &Radio"}
+    - {id: 887, cat: PC/0day, desc: " |- Интернет TV & Radio"}
     - {id: 561, cat: PC/0day, desc: " |- Удаленный доступ и ПО для свободного доступа в интернет"}
     - {id: 555, cat: PC/0day, desc: " |- 3G USB-модем и Webcam"}
     - {id: 537, cat: PC/0day, desc: " |- Утилиты для удаления всплывающих окон и баннерной рекламы"}
@@ -374,7 +375,7 @@ caps:
     - {id: 850, cat: Audio/MP3, desc: " |- Этническая музыка Африки и Азии (mp3)"}
     - {id: 849, cat: Audio/MP3, desc: " |- Country, Bluegrass (mp3)"}
     - {id: 848, cat: Audio/MP3, desc: " |- Этническая музыка Кавказа и Закавказья (mp3)"}
-    - {id: 847, cat: Audio/MP3, desc: " |- NewAge &Meditative (mp3)"}
+    - {id: 847, cat: Audio/MP3, desc: " |- NewAge & Meditative (mp3)"}
     - {id: 846, cat: Audio/MP3, desc: " |- Folk и neo-folk, celtic, medieval (mp3)"}
     - {id: 935, cat: Audio/MP3, desc: " |- Сборники разных исполнителей (mp3)"}
     - {id: 945, cat: Audio/Lossless, desc: " |- Дискографии в Lossless"}
@@ -471,9 +472,9 @@ caps:
     - {id: 751, cat: Audio, desc: " |- Аудио юмористические концерты (выступления)"}
     # Эротика
     # Erotica
-    - {id: 483, cat: Other, desc: "Правила, FAQ и Предложения по улучшению раздела "Эротик.."}
+    - {id: 483, cat: Other, desc: "Правила, FAQ и Предложения по улучшению раздела 'Эротик.."}
     - {id: 484, cat: Other, desc: " |- Правила и FAQ"}
-    - {id: 485, cat: Other, desc: " |- Предложения по улучшению раздела "Эротика"и форум.."}
+    - {id: 485, cat: Other, desc: " |- Предложения по улучшению раздела 'Эротика'и форум.."}
     - {id: 688, cat: Other, desc: " |- Ищу / Предлагаю"}
     - {id: 963, cat: XXX, desc: "Эротические художественные фильмы"}
     - {id: 964, cat: XXX, desc: "Эротические документальные фильмы"}

src/Jackett.Common/Definitions/film-paleis.yml

@@ -113,7 +113,7 @@ search:
         - name: re_replace
           args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "S$2-$4"]
         - name: re_replace
-          args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*", "S$2"]
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
         - name: re_replace
           args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "E$2-$4"]
         - name: re_replace

src/Jackett.Common/Definitions/fouducinema.yml

@@ -12,28 +12,14 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
-    - {id: 21, cat: TV/HD, desc: "SERIE HDTV.1080p"}
-    - {id: 20, cat: TV/HD, desc: "SERIE HDTV.720p"}
-    - {id: 19, cat: TV/SD, desc: "SERIE HDTV"}
-    - {id: 36, cat: TV/Other, desc: "SERIE Pack"}
-    - {id: 17, cat: TV/SD, desc: "SERIE VHS"}
-    - {id: 16, cat: TV/SD, desc: "SERIE TVRip"}
-    - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
-    - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
-    - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
-    - {id: 37, cat: TV, desc: "SERIE EPISODE"}
-    - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
-    - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
-    - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
-    - {id: 59, cat: PC, desc: "LOGICIELS "}
-    - {id: 44, cat: Books/Mags, desc: "EBOOK Journaux"}
-    - {id: 46, cat: Books/Technical, desc: "EBOOK Documents"}
-    - {id: 48, cat: XXX/Other, desc: "EBOOK XXX"}
-    - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
-    - {id: 64, cat: TV/Anime, desc: "ANIMEE HDRip"}
+    - {id: 80, cat: Movies, desc: "Enfants Film"}
+    - {id: 82, cat: TV, desc: "Enfants Série"}
     - {id: 1, cat: Movies/SD, desc: "FILM Xvid"}
+    - {id: 101, cat: TV/Documentary, desc: "FILM Documentaire"}
+    - {id: 75, cat: Movies/UHD, desc: "FILM 2160 P"}
+    - {id: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
     - {id: 62, cat: Movies/WEB-DL, desc: "FILM WEB"}
+    - {id: 66, cat: Movies/HD, desc: "FILM HDRip"}
     - {id: 34, cat: Movies/SD, desc: "FILM TVRip"}
     - {id: 33, cat: Movies/HD, desc: "FILM HDTV"}
     - {id: 31, cat: Movies/Other, desc: "FILM MUET"}
@@ -45,10 +31,32 @@ caps:
     - {id: 25, cat: Movies/BluRay, desc: "FILM ISO"}
     - {id: 4, cat: Movies/HD, desc: "FILM 1080"}
     - {id: 2, cat: Movies/DVD, desc: "FILM DVD"}
-    - {id: 63, cat: Movies/WEB-DL, desc: "FILM WEB"}
-    - {id: 66, cat: Movies/HD, desc: " HDRip"} # orphaned subcategory
+    - {id: 103, cat: Movies, desc: "FILM Pack"}
+    - {id: 9, cat: TV/SD, desc: "SERIE DVD"}
+    - {id: 72, cat: TV/UHD, desc: "SERIE 2160 P"}
+    - {id: 65, cat: TV/HD, desc: "SERIE HDRip"}
+    - {id: 21, cat: TV/HD, desc: "SERIE HDTV.1080p"}
+    - {id: 20, cat: TV/HD, desc: "SERIE HDTV.720p"}
+    - {id: 19, cat: TV/SD, desc: "SERIE HDTV"}
+    - {id: 36, cat: TV/Other, desc: "SERIE Pack"}
+    - {id: 17, cat: TV/SD, desc: "SERIE VHS"}
+    - {id: 16, cat: TV/SD, desc: "SERIE TVRip"}
+    - {id: 15, cat: TV/WEB-DL, desc: "SERIE WEB.1080p"}
+    - {id: 14, cat: TV/WEB-DL, desc: "SERIE WEB.720p"}
+    - {id: 12, cat: TV/WEB-DL, desc: "SERIE WEB"}
+    - {id: 102, cat: TV/Documentary, desc: "SERIE Documentaire"}
+    - {id: 67, cat: TV/Anime, desc: "ANIMEE films"}
+    - {id: 70, cat: TV/Anime, desc: "ANIMEE Series"}
+    - {id: 95, cat: TV/Anime, desc: "ANIMEE Animée"}
+    - {id: 56, cat: PC/ISO, desc: "LOGICIELS Linux"}
+    - {id: 24, cat: PC/Mac, desc: "LOGICIELS Apple"}
+    - {id: 58, cat: PC/0day, desc: "LOGICIELS Windows"}
+    - {id: 44, cat: Books/Mags, desc: "EBOOK Journaux"}
+    - {id: 46, cat: Books/Technical, desc: "EBOOK Documents"}
+    - {id: 48, cat: XXX/Other, desc: "EBOOK XXX"}
+    - {id: 49, cat: Books/EBook, desc: "EBOOK Livres"}
     - {id: 5, cat: Audio/Video, desc: "MUSIC clip video"}
-    - {id: 7, cat: PC/Games, desc: "JEUX Win"}
+    - {id: 96, cat: PC/Games, desc: "JEUX Apple"}
     - {id: 8, cat: Console/PS3, desc: "JEUX PS3"}
     - {id: 45, cat: PC/Games, desc: "JEUX PC"}
 

src/Jackett.Common/Definitions/gimmepeers.yml

@@ -0,0 +1,162 @@
+---
+id: gimmepeers
+name: GimmePeers
+description: "GimmePeers (formerly ILT) is a Paid Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: iso-8859-1
+links:
+  - https://www.gimmepeers.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "Anime"}
+    - {id: 4, cat: PC/0day, desc: "App-WIN"}
+    - {id: 2, cat: PC/Mac, desc: "App-MAC"}
+    - {id: 27, cat: PC, desc: "App-LINUX"}
+    - {id: 29, cat: Audio/Audiobook, desc: "Books (a)"}
+    - {id: 5, cat: Books/EBook, desc: "Books (e)"}
+    - {id: 6, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 7, cat: Audio, desc: "Music"}
+    - {id: 28, cat: TV/Sport, desc: "Sports"}
+    - {id: 3, cat: Books/Other, desc: "Tutorials"}
+    - {id: 8, cat: Other, desc: "Other"}
+    - {id: 9, cat: Console/NDS, desc: "Game-NIN"}
+    - {id: 11, cat: Console/PS3, desc: "Game-PS"}
+    - {id: 10, cat: PC/Games, desc: "Game-WIN"}
+    - {id: 12, cat: Console/XBox, desc: "Game-XBOX"}
+    - {id: 13, cat: Movies/3D, desc: "Movie-3D"}
+    - {id: 26, cat: Movies/UHD, desc: "Movie-4K"}
+    - {id: 14, cat: Movies/BluRay, desc: "Movie-Bluray"}
+    - {id: 15, cat: Movies/DVD, desc: "Movie-DVDR"}
+    - {id: 16, cat: Movies/HD, desc: "Movie-x264"}
+    - {id: 17, cat: Movies/HD, desc: "Movie-x265"}
+    - {id: 19, cat: Movies/SD, desc: "Movie-XVID"}
+    - {id: 18, cat: Movies, desc: "Movie-Packs"}
+    - {id: 30, cat: TV/UHD, desc: "TV-4K"}
+    - {id: 22, cat: TV/HD, desc: "TV-x265"}
+    - {id: 20, cat: TV/HD, desc: "TV-x264-HD"}
+    - {id: 21, cat: TV/SD, desc: "TV-x264-SD"}
+    - {id: 25, cat: TV/HD, desc: "TV-Retail-HD"}
+    - {id: 24, cat: TV/SD, desc: "TV-Retail-SD"}
+    - {id: 23, cat: TV, desc: "TV-Packs"}
+    - {id: 50, cat: XXX/x264, desc: "xXx-HD"}
+    - {id: 49, cat: XXX/SD, desc: "xXx-SD"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, genre]
+    movie-search: [q, imdbid, genre]
+    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: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: /
+  error:
+    - selector: td:contains("Login failed!")
+      message:
+        selector: table tbody tr td font
+  test:
+    path: browse.php
+    selector: a[href="/logout.php"]
+
+search:
+  paths:
+    # https://www.gimmepeers.com/browse.php?search=2022&c13=1&blah=0&incldead=0
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.Genre }} genre:{{ .Query.Genre }}{{ else }}{{ end }}"
+    # 0 title, 1 nfo, 2 filelist, 3 title+nfo
+    blah: "{{ if or .Query.IMDBID .Query.Genre }}3{{ else }}0{{ end }}"
+    # 0 active only, 1 dead only
+    incldead: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.browsetable:not(:has(td.gp_sub_nav):contains("Top 20")) tbody tr:has(a[href^="download.php"])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php"]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/redir.php?url=", ""]
+    genre:
+      selector: span:has(a[title="search by genre"])
+      filters:
+        - name: replace
+          args: ["votes", ""]
+        - name: re_replace
+          args: ["\\d+", ""]
+    description:
+      text: "{{ .Result.genre }}"
+    date:
+      selector: td:nth-child(7) nobr
+      filters:
+        - name: replace
+          args: ["\xA0", ""]
+        - name: append
+          args: " -04:00" # AST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    size:
+      selector: td:nth-child(6)
+    files:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(10)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/glodls.yml

@@ -10,7 +10,7 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.bet/
+  - https://glotorrents.unblockit.cat/
   - https://glotorrents.nocensor.world/
   - https://glodls.unblockninja.com/
 legacylinks:
@@ -35,6 +35,7 @@ legacylinks:
   - https://glotorrents.unblockit.name/
   - https://glotorrents.nocensor.sbs/
   - https://glotorrents.unblockit.ist/
+  - https://glotorrents.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hamsterstudio.yml

@@ -1,383 +0,0 @@
----
-id: hamsterstudio
-name: HamsterStudio
-description: "HamsterStudio is a RUSSIAN Semi-Private Torrent Tracker for TV"
-language: ru-RU
-type: semi-private
-encoding: windows-1251
-links:
-  - http://hamsterstudio.org/ # site does not support https ERR_CONNECTION_TIMED_OUT
-
-caps:
-  categorymappings:
-    - {id: 23, cat: Movies, desc: "Кино"}
-    - {id: 18, cat: TV/WEB-DL, desc: "Веб-сериалы"}
-    - {id: 19, cat: TV/Other, desc: "Разные сериалы"}
-    - {id: 10, cat: Audio, desc: "Музыка"}
-    - {id: 29, cat: TV, desc: "Лечение (Пациенты)"}
-    - {id: 37, cat: TV, desc: "Сериалы с ТВ"}
-    - {id: 21, cat: TV, desc: "Полуночный зверь"}
-    - {id: 11, cat: TV, desc: "Милые обманщицы"}
-    - {id: 27, cat: TV, desc: "Девочки"}
-    - {id: 20, cat: TV, desc: "Умерь Свой Пыл"}
-    - {id: 24, cat: TV, desc: "Ийон Тихий, космический пилот"}
-    - {id: 25, cat: TV, desc: "Красный карлик"}
-    - {id: 22, cat: TV, desc: "Тримей"}
-    - {id: 26, cat: TV, desc: "На дне"}
-    - {id: 38, cat: TV, desc: "Галактика: Кровь и Хром"}
-    - {id: 39, cat: TV, desc: "Супертюрьма"}
-    - {id: 40, cat: TV, desc: "Семерка Блэйка"}
-    - {id: 42, cat: TV, desc: "Западное крыло"}
-    - {id: 43, cat: TV, desc: "Убойный Отдел: Уличные Будни"}
-    - {id: 47, cat: TV, desc: "Это Англия"}
-    - {id: 48, cat: TV, desc: "Бенидорм"}
-    - {id: 49, cat: TV, desc: "Сайнфелд"}
-    - {id: 51, cat: TV, desc: "Вице"}
-    - {id: 52, cat: TV, desc: "За кадром о кадре"}
-    - {id: 54, cat: TV, desc: "Хемлок Гроув"}
-    - {id: 56, cat: TV, desc: "Семейное древо"}
-    - {id: 57, cat: TV, desc: "Мэрон"}
-    - {id: 59, cat: TV, desc: "Спецнах"}
-    - {id: 60, cat: TV, desc: "Работа не волк"}
-    - {id: 64, cat: TV, desc: "Дивизион "}
-    - {id: 66, cat: TV, desc: "Кошмары Фредди"}
-    - {id: 67, cat: TV, desc: "Все дома"}
-    - {id: 69, cat: TV, desc: "Бездельницы"}
-    - {id: 70, cat: TV, desc: "Реальные люди"}
-    - {id: 71, cat: TV, desc: "Трофеи Вавилона"}
-    - {id: 72, cat: TV, desc: "Постфактум"}
-    - {id: 73, cat: TV, desc: "Детектив Босх"}
-    - {id: 74, cat: TV, desc: "В девятом номере"}
-    - {id: 75, cat: TV, desc: "Верь"}
-    - {id: 76, cat: TV, desc: "Семь дней"}
-    - {id: 77, cat: TV, desc: "Красная дорога"}
-    - {id: 78, cat: TV, desc: "Борджиа"}
-    - {id: 79, cat: TV, desc: "Вдовец"}
-    - {id: 80, cat: TV, desc: "Безумцы"}
-    - {id: 81, cat: TV, desc: "Убийство первой степени"}
-    - {id: 82, cat: TV, desc: "Мистер Слоун"}
-    - {id: 83, cat: TV, desc: "Путеводитель по семейной жизни"}
-    - {id: 84, cat: TV, desc: "Агенты"}
-    - {id: 85, cat: TV, desc: "Блюз Хилл-Стрит"}
-    - {id: 86, cat: TV, desc: "В погоне за тенями"}
-    - {id: 87, cat: TV, desc: "Константин"}
-    - {id: 88, cat: TV, desc: "Готэм"}
-    - {id: 89, cat: TV, desc: "Клей"}
-    - {id: 90, cat: TV, desc: "Скорострел"}
-    - {id: 91, cat: TV, desc: "Водитель"}
-    - {id: 92, cat: TV, desc: "Очевидное"}
-    - {id: 93, cat: TV, desc: "Красные дубы"}
-    - {id: 94, cat: TV, desc: "Жизнь начинается в 18"}
-    - {id: 95, cat: TV, desc: "Безрассудный"}
-    - {id: 96, cat: TV, desc: "Пропавший без вести"}
-    - {id: 97, cat: TV, desc: "Взгляд в прошлое"}
-    - {id: 98, cat: TV, desc: "Королевская семья"}
-    - {id: 99, cat: TV, desc: "Одиночки с причудами"}
-    - {id: 101, cat: TV, desc: "CSI: Киберпространство"}
-    - {id: 102, cat: TV, desc: "Сорвиголова"}
-    - {id: 103, cat: TV, desc: "Осадок"}
-    - {id: 104, cat: TV, desc: "Призраки Энфилда"}
-    - {id: 105, cat: TV, desc: "Ошибки прошлого"}
-    - {id: 106, cat: TV, desc: "Восьмое чувство"}
-    - {id: 107, cat: TV, desc: "Вызов"}
-    - {id: 108, cat: TV, desc: "Настоящий детектив"}
-    - {id: 109, cat: TV, desc: "Звездный охотник"}
-    - {id: 110, cat: TV, desc: "Это не моя жизнь"}
-    - {id: 111, cat: TV, desc: "Человек в высоком замке"}
-    - {id: 112, cat: TV, desc: "Бойтесь Ходячих мертвецов"}
-    - {id: 113, cat: TV, desc: "Стражи галактики"}
-    - {id: 114, cat: TV, desc: "Герои: Возрождение"}
-    - {id: 115, cat: TV, desc: "Заключенный"}
-    - {id: 116, cat: TV, desc: "Родина"}
-    - {id: 117, cat: TV, desc: "Фарго"}
-    - {id: 118, cat: TV, desc: "Американская история ужасов"}
-    - {id: 119, cat: TV, desc: "Оставленные"}
-    - {id: 121, cat: TV, desc: "Любовники"}
-    - {id: 122, cat: TV, desc: "Агенты Щит"}
-    - {id: 123, cat: TV, desc: "Эш против зловещих мертвецов"}
-    - {id: 124, cat: TV, desc: "Ходячие мертвецы"}
-    - {id: 125, cat: TV, desc: "Демоны Да Винчи"}
-    - {id: 120, cat: TV, desc: "Сонная лощина"}
-    - {id: 126, cat: TV, desc: "Джекил и Хайд"}
-    - {id: 127, cat: TV, desc: "Джессика Джонс"}
-    - {id: 128, cat: TV, desc: "Лондонский шпион"}
-    - {id: 129, cat: TV, desc: "Мост"}
-    - {id: 130, cat: TV, desc: "Хроники Франкенштейна"}
-    - {id: 131, cat: TV, desc: "Пространство"}
-    - {id: 132, cat: TV, desc: "Конец детства"}
-    - {id: 133, cat: TV, desc: "Путь к выздоровлению"}
-    - {id: 134, cat: TV, desc: "Старость не радость"}
-    - {id: 135, cat: TV, desc: "Пьяная история"}
-    - {id: 136, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 137, cat: TV, desc: "Сумеречные охотники"}
-    - {id: 138, cat: TV, desc: "Клоун (Баскетс)"}
-    - {id: 139, cat: TV, desc: "Черные паруса"}
-    - {id: 140, cat: TV, desc: "Секретные материалы"}
-    - {id: 141, cat: TV, desc: "Изгои"}
-    - {id: 143, cat: TV, desc: "Куку"}
-    - {id: 144, cat: TV, desc: "Долл и Эм"}
-    - {id: 145, cat: TV, desc: "Банши "}
-    - {id: 146, cat: TV, desc: " Шоу Джимма Гаффигана"}
-    - {id: 147, cat: TV, desc: "Все кувырком"}
-    - {id: 148, cat: TV, desc: "Сожители"}
-    - {id: 149, cat: TV, desc: "Внутри Эми Шумер"}
-    - {id: 150, cat: TV, desc: "С чистого листа"}
-    - {id: 151, cat: TV, desc: "Хофф в записи"}
-    - {id: 152, cat: TV, desc: "Жевательная резинка"}
-    - {id: 153, cat: TV, desc: "Охотники"}
-    - {id: 154, cat: TV, desc: "Даркнет"}
-    - {id: 155, cat: TV, desc: "Бонг для путешествий во времен"}
-    - {id: 156, cat: TV, desc: "Бульварные ужасы"}
-    - {id: 157, cat: TV, desc: "Флауэрсы"}
-    - {id: 158, cat: TV, desc: "Грейс и Фрэнки "}
-    - {id: 159, cat: TV, desc: "Проповедник"}
-    - {id: 142, cat: TV, desc: "Принц из Беверли Хиллз"}
-    - {id: 160, cat: TV, desc: "Сосны"}
-    - {id: 161, cat: TV, desc: "Истории Нила Геймана"}
-    - {id: 162, cat: TV, desc: "Подчинение"}
-    - {id: 163, cat: TV, desc: "Обвиняемая"}
-    - {id: 164, cat: TV, desc: "Безмозглые"}
-    - {id: 165, cat: TV, desc: "Гастролеры"}
-    - {id: 166, cat: TV, desc: "Завучи"}
-    - {id: 167, cat: TV, desc: "Отжиг"}
-    - {id: 169, cat: TV, desc: "Человек-клещ"}
-    - {id: 168, cat: TV, desc: "Трагедия в Кеттеринге"}
-    - {id: 170, cat: TV, desc: "Я люблю Дика"}
-    - {id: 171, cat: TV, desc: "Жан-Клод Ван Джонсон "}
-    - {id: 173, cat: TV, desc: "Небезопасно для работы"}
-    - {id: 174, cat: TV, desc: "Граница "}
-    - {id: 175, cat: TV, desc: "Дрянь"}
-    - {id: 176, cat: TV, desc: "Сложные люди"}
-    - {id: 177, cat: TV, desc: "Девочки Гилмор"}
-    - {id: 178, cat: TV, desc: "Возвращение  в Миссисипи "}
-    - {id: 179, cat: TV, desc: "В хлам"}
-    - {id: 180, cat: TV, desc: "Бунтарь"}
-    - {id: 182, cat: TV, desc: "Слепое пятно"}
-    - {id: 183, cat: TV, desc: "Королевы крика"}
-    - {id: 184, cat: TV, desc: "Черный список"}
-    - {id: 185, cat: TV, desc: "Однажды в сказке"}
-    - {id: 186, cat: TV, desc: "Звездные войны: повстанцы"}
-    - {id: 187, cat: TV, desc: "Скорпион"}
-    - {id: 188, cat: TV, desc: "Безбашенные"}
-    - {id: 189, cat: TV, desc: "Черное зеркало"}
-    - {id: 190, cat: TV, desc: "Стэн против сил зла"}
-    - {id: 191, cat: TV, desc: "Удалённые"}
-    - {id: 192, cat: TV, desc: "Сирены"}
-    - {id: 193, cat: TV, desc: "По ту сторону"}
-    - {id: 194, cat: TV, desc: "ОА"}
-    - {id: 195, cat: TV, desc: "Табу"}
-    - {id: 196, cat: TV, desc: "Колония"}
-    - {id: 197, cat: TV, desc: "Волшебники"}
-    - {id: 198, cat: TV, desc: "24 часа"}
-    - {id: 199, cat: TV, desc: "Миллиарды"}
-    - {id: 200, cat: TV, desc: "Большая маленькая ложь"}
-    - {id: 201, cat: TV, desc: "Легион"}
-    - {id: 202, cat: TV, desc: "Сан рекордз"}
-    - {id: 203, cat: TV, desc: "Заложница"}
-    - {id: 204, cat: TV, desc: "Убийство на пляже"}
-    - {id: 205, cat: TV, desc: "Подземка"}
-    - {id: 206, cat: TV, desc: "Любовь"}
-    - {id: 207, cat: TV, desc: "Преступление по-американски "}
-    - {id: 208, cat: TV, desc: "Большой куш"}
-    - {id: 209, cat: TV, desc: "Побег"}
-    - {id: 210, cat: TV, desc: "Я Зомби"}
-    - {id: 211, cat: TV, desc: "Лучше звоните Солу"}
-    - {id: 212, cat: TV, desc: "Арчер"}
-    - {id: 213, cat: TV, desc: "Дорогие белые"}
-    - {id: 214, cat: TV, desc: "Американские боги"}
-    - {id: 215, cat: TV, desc: "Брокмайр"}
-    - {id: 216, cat: TV, desc: "Энджи Трайбека"}
-    - {id: 217, cat: TV, desc: "Уэнтуорт "}
-    - {id: 218, cat: TV, desc: "Звери."}
-    - {id: 219, cat: TV, desc: "Упадок и разрушение"}
-    - {id: 220, cat: TV, desc: "Просто парочка"}
-    - {id: 221, cat: TV, desc: "Твин Пикс"}
-    - {id: 222, cat: TV, desc: "Умираю со смеху"}
-    - {id: 223, cat: TV, desc: "По волчьим законам"}
-    - {id: 224, cat: TV, desc: "Карточный домик"}
-    - {id: 225, cat: TV, desc: "Приключения Тедди Ракспина"}
-    - {id: 226, cat: TV, desc: "Темная материя"}
-    - {id: 227, cat: TV, desc: "Вайнона Эрп"}
-    - {id: 228, cat: TV, desc: "Киллджойс"}
-    - {id: 229, cat: TV, desc: "Кровавая гонка"}
-    - {id: 230, cat: TV, desc: "Сшиватели"}
-    - {id: 231, cat: TV, desc: "Ночная смена"}
-    - {id: 232, cat: TV, desc: "Мгла"}
-    - {id: 233, cat: TV, desc: "Зверинец"}
-    - {id: 234, cat: TV, desc: "Снегопад"}
-    - {id: 235, cat: TV, desc: "Спасение"}
-    - {id: 236, cat: TV, desc: "По болезни"}
-    - {id: 237, cat: TV, desc: "Кастлвания"}
-    - {id: 238, cat: TV, desc: "Штамм"}
-    - {id: 239, cat: TV, desc: "Игра престолов"}
-    - {id: 240, cat: TV, desc: "Мстители"}
-    - {id: 241, cat: TV, desc: "Комната 104"}
-    - {id: 242, cat: TV, desc: "Миднайт, Техас"}
-    - {id: 243, cat: TV, desc: "Человек-паук"}
-    - {id: 244, cat: TV, desc: "Рэй Донован"}
-    - {id: 245, cat: TV, desc: "Мистер Мерседес"}
-    - {id: 246, cat: TV, desc: "Эпизоды"}
-    - {id: 247, cat: TV, desc: "Охота на Унабомбера "}
-    - {id: 248, cat: TV, desc: "Защитники"}
-    - {id: 249, cat: TV, desc: "Раскосяченные"}
-    - {id: 250, cat: TV, desc: "Двойка"}
-    - {id: 251, cat: TV, desc: "Нарко"}
-    - {id: 252, cat: TV, desc: "Ты — воплощение порока"}
-    - {id: 253, cat: TV, desc: "Конь БоДжек"}
-    - {id: 254, cat: TV, desc: "Орвилл"}
-    - {id: 256, cat: TV, desc: "Южный парк"}
-    - {id: 257, cat: TV, desc: "Звездный путь: Дискавери"}
-    - {id: 258, cat: TV, desc: "Мик"}
-    - {id: 259, cat: TV, desc: "Морская полиция"}
-    - {id: 260, cat: TV, desc: "Смертельное оружие"}
-    - {id: 261, cat: TV, desc: "Сверхлюди"}
-    - {id: 262, cat: TV, desc: "Одарённые"}
-    - {id: 263, cat: TV, desc: "Полиция Чикаго"}
-    - {id: 264, cat: TV, desc: "Это Мы"}
-    - {id: 265, cat: TV, desc: "Империя"}
-    - {id: 266, cat: TV, desc: "Мыслить как преступник"}
-    - {id: 267, cat: TV, desc: "Экзорцист"}
-    - {id: 268, cat: TV, desc: "Люцифер"}
-    - {id: 269, cat: TV, desc: "Нация Z"}
-    - {id: 270, cat: TV, desc: "Сверхестественое"}
-    - {id: 273, cat: TV, desc: "Доктор Шанс"}
-    - {id: 271, cat: TV, desc: "Мистер Робот"}
-    - {id: 272, cat: TV, desc: "Очень странные дела"}
-    - {id: 274, cat: TV, desc: "Стрела"}
-    - {id: 275, cat: TV, desc: "Флэш"}
-    - {id: 276, cat: TV, desc: "Супердевушка"}
-    - {id: 277, cat: TV, desc: "Легенды завтрашнего дня "}
-    - {id: 278, cat: TV, desc: "Суеверие"}
-    - {id: 279, cat: TV, desc: "Конец ёбанного мира"}
-    - {id: 280, cat: TV, desc: "Спецназ"}
-    - {id: 281, cat: TV, desc: "Бесстыдники "}
-    - {id: 282, cat: TV, desc: "Проклятая нация"}
-    - {id: 283, cat: TV, desc: "Человек будущего"}
-    - {id: 284, cat: TV, desc: "Каратель"}
-    - {id: 285, cat: TV, desc: "Фантастика"}
-    - {id: 286, cat: TV, desc: "Ужасы/триллер"}
-    - {id: 287, cat: TV, desc: "Драма"}
-    - {id: 288, cat: TV, desc: "Комедия"}
-    - {id: 289, cat: TV, desc: "Боевик"}
-    - {id: 290, cat: TV, desc: "Детектив"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-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:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: div.error
-  test:
-    path: browse.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 incdead, 2 onlydead, 3 gold, 4 seedfree
-    incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.embedded > tbody > tr:has(a[href^="details.php?id="])
-
-  fields:
-    title:
-      selector: a[href^="details.php?id="]
-      filters:
-        - name: re_replace
-          args: ["\\b(\\d)\\b", "0$1"]
-        - name: re_replace
-          args: [".+Сезон\\s+(\\d+)(?:.+Серия\\s+(\\d+))*[\\s\\S]*\\/\\s+(.+)\\s+\\(\\d+\\)\\s+(\\S*)\\s*(\\w*\\d*).*", "$3 - S$1E$2 - rus $5 $4 newstudio"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-        - name: replace
-          args: ["E -", "E01-99 -"]
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    files:
-      selector: td:nth-child(3)
-    size:
-      selector: td:nth-child(5)
-    date:
-      selector: i
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    seeders:
-      selector: td:nth-child(6)
-      filters:
-        - name: split
-          args: ["|", 0]
-    leechers:
-      selector: td:nth-child(6)
-      filters:
-        - name: split
-          args: ["|", 1]
-    downloadvolumefactor:
-      case:
-        img[src="pic/diamond.png"]: 0
-        img[src="pic/freedownload.gif"]: 0
-        img[src="pic/silver.gif"]: 0.5
-        img[src="pic/bronze.gif"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="pic/diamond.png"]: 2
-        "*": 1
-# minimumratio: ratioless
-# TBDev v2.1.12

src/Jackett.Common/Definitions/hdbitscom.yml

@@ -1,95 +0,0 @@
----
-id: hdbitscom
-name: HD-Bits.com
-description: "HD tracker"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.hd-bits.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Music"}
-    - {id: 2, cat: Movies, desc: "Movies"}
-    - {id: 3, cat: TV, desc: "TV-Series"}
-    - {id: 4, cat: PC, desc: "Applications"}
-    - {id: 5, cat: XXX, desc: "Adult"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-    login: "Log in"
-  error:
-    - selector: form#loginform > span.warning
-  test:
-    path: torrents.php
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    order_by: time
-    order_way: desc
-    action: basic
-    searchsubmit: 1
-
-  rows:
-    selector: table#torrent_table > tbody > tr.torrent
-
-  fields:
-    category:
-      selector: td.cats_col
-      case:
-        div.cats_music: 1
-        div.cats_movies: 2
-        div.cats_tvseries: 3
-        div.cats_applications: 4
-        div.cats_xxx: 5
-    title:
-      selector: div.group_info a[href^="torrents.php?id="]
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.group_info div.tags
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    poster:
-      selector: img[alt="Cover"]
-      attribute: src
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4)
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        "div.freeleech:contains('Freeleech!')": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/hdcenter.yml

@@ -1,108 +0,0 @@
----
-id: hdcenter
-name: HDCenter
-description: "An German HD tracker"
-language: de-DE
-type: private
-encoding: UTF-8
-links:
-  - https://hdcenter.cc/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/HD, desc: "Movies"}
-    - {id: 2, cat: Movies/3D, desc: "3D"}
-    - {id: 3, cat: TV/HD, desc: "Series"}
-    - {id: 4, cat: TV/Documentary, desc: "Documentary"}
-    - {id: 5, cat: TV/Sport, desc: "Sport"}
-    - {id: 6, cat: XXX, desc: "XXX"}
-    - {id: 7, cat: Audio/Lossless, desc: "Audio"}
-    - {id: 8, cat: PC/0day, desc: "Appz"}
-    - {id: 9, cat: Movies/HD, desc: "HDC"}
-    - {id: 10, cat: Movies/HD, desc: "TvR"}
-    - {id: 11, cat: Movies/HD, desc: "10Bit"}
-    - {id: 12, cat: Movies/HD, desc: "jTV"}
-    - {id: 13, cat: TV/HD, desc: "NERDS"}
-    - {id: 14, cat: Audio/Lossless, desc: "dOWnb3At"}
-    - {id: 15, cat: Movies/Other, desc: "Anime"}
-    - {id: 16, cat: Audio/Video, desc: "Live"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    timeout: 1
-  error:
-    - selector: div#error-text
-  test:
-    path: torrents.php
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-  rows:
-    selector: table#torrent_table > tbody > tr.torrent
-  fields:
-    download:
-      selector: a[title="download"]
-      attribute: href
-      optional: true
-    details:
-      selector: a.torrent_link_title
-      attribute: href
-    title_default:
-      selector: a.torrent_link_title
-    title_hdc: # special selector which only matches HDC releases not containing "English" and "only" tags and doesn't contain English in the title
-      selector: td.cats_col:has(a[href*="filter_cat[9]=1"]) + td.title_col:not(:has(span.tags_inner:contains("English"):contains("only"))):not(:has(span.tags_inner:contains("English"):contains("Only"))):not(:has(span.tags_inner:contains("english"):contains("only"))) a.torrent_link_title:not(:contains("English"))
-      optional: true
-      filters:
-        - name: replace # add GERMAN tag
-          args: ["-HDC", ".GERMAN-HDC"]
-    title_tvr: # special selector which only matches TvR releases not containing "GERMAN" already
-      selector: td.cats_col:has(a[href*="filter_cat[10]=1"]) + td.title_col a.torrent_link_title:not(:contains("GERMAN"))
-      optional: true
-      filters:
-        - name: replace # add GERMAN tag
-          args: [".DL", ".GERMAN.DL"]
-    title:
-      text: "{{ if or .Result.title_tvr .Result.title_hdc }}{{ or .Result.title_tvr .Result.title_hdc }}{{ else }}{{ .Result.title_default }}{{ end }}"
-    category:
-      selector: td.cats_col > a
-      attribute: href
-      filters:
-        - name: regexp
-          args: "\\[(\\d+?)\\]"
-    date:
-      selector: td.time_col > .time
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
-    size:
-      selector: td.size_col
-    grabs:
-      selector: td.snatcher_col
-    seeders:
-      selector: td.seeder_col
-    leechers:
-      selector: td.leecher_col
-    downloadvolumefactor:
-      case:
-        "span.freeleech_slot": 0 # 24h freeelech slot
-        "span.freeleech": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/hdcity.yml

@@ -1,242 +0,0 @@
----
-id: hdcity
-name: HDCity
-description: "HDCity is a SPANISH site for HD content"
-language: es-ES
-type: private
-encoding: ISO-8859-1
-certificates:
-  - a10f2f7a863cd3fba9663185b0943cde01698451 # expired  ‎25 ‎October ‎2021
-links:
-  - https://hdcity.li/
-
-caps:
-  categorymappings:
-    - {id: 12, cat: Movies/BluRay, desc: "Peliculas - Full BluRay"}
-    - {id: 13, cat: Movies/HD, desc: "Peliculas - BluRay Rip 1080p"}
-    - {id: 14, cat: Movies/HD, desc: "Peliculas - BluRay Rip 720p"}
-    - {id: 15, cat: Movies/HD, desc: "Peliculas - HDTV & WEB-DL 1080p"}
-    - {id: 16, cat: Movies/HD, desc: "Peliculas - HDTV & WEB-DL 720p"}
-    - {id: 17, cat: Movies/HD, desc: "Peliculas - BDRemux"}
-    - {id: 18, cat: Movies/HD, desc: "Peliculas - JMBD"}
-    - {id: 19, cat: Movies/3D, desc: "Peliculas - Full BluRay 3D"}
-    - {id: 20, cat: Movies/3D, desc: "Peliculas - 3D"}
-    - {id: 67, cat: Movies/BluRay, desc: "Peliculas - Bluray 4K"}
-    - {id: 68, cat: Movies/3D, desc: "Peliculas - Bluray 3D 4K"}
-    - {id: 69, cat: Movies/HD, desc: "Peliculas - JMBD 4K"}
-    - {id: 72, cat: Movies/HD, desc: "Peliculas - BDREMUX 4K"}
-    - {id: 73, cat: Movies/BluRay, desc: "Peliculas - BluRay Rip 4K"}
-    - {id: 110, cat: Movies/HD, desc: "Peliculas - HDTV WEB-DL 4K"}
-    - {id: 21, cat: TV/HD, desc: "TV/Series - Full BluRay"}
-    - {id: 22, cat: TV/HD, desc: "TV/Series - BluRay Rip 1080p"}
-    - {id: 23, cat: TV/HD, desc: "TV/Series - BluRay Rip 720p"}
-    - {id: 24, cat: TV/HD, desc: "TV/Series - HDTV & WEB-DL 1080p"}
-    - {id: 25, cat: TV/HD, desc: "TV/Series - HDTV & WEB-DL 720p"}
-    - {id: 74, cat: TV/HD, desc: "TV/Series - Bluray 4K"}
-    - {id: 75, cat: TV/HD, desc: "TV/Series - JMDB 4K"}
-    - {id: 76, cat: TV/HD, desc: "TV/Series - BDREMUX 4K"}
-    - {id: 77, cat: TV/HD, desc: "TV/Series - BluRay Rip 4K"}
-    - {id: 111, cat: TV/HD, desc: "TV/Series - HDTV WEB-DL 4K"}
-    - {id: 26, cat: TV/Anime, desc: "Anime - Full BluRay"}
-    - {id: 28, cat: TV/Anime, desc: "Anime - BluRay Rip 1080p"}
-    - {id: 29, cat: TV/Anime, desc: "Anime - BluRay Rip 720p"}
-    - {id: 32, cat: TV/Anime, desc: "Anime - BDRemux"}
-    - {id: 107, cat: TV/Anime, desc: "Anime - HDTV 4K"}
-    - {id: 34, cat: TV/Documentary, desc: "Documental - Full BluRay"}
-    - {id: 36, cat: TV/Documentary, desc: "Documental - BluRay Rip 1080p"}
-    - {id: 37, cat: TV/Documentary, desc: "Documental - BluRay Rip 720p"}
-    - {id: 38, cat: TV/Documentary, desc: "Documental - Full BluRay 3D"}
-    - {id: 40, cat: TV/Documentary, desc: "Documental - 3D"}
-    - {id: 65, cat: TV/Documentary, desc: "Documental - HDTV 720p"}
-    - {id: 66, cat: TV/Documentary, desc: "Documental - HDTV 1080p"}
-    - {id: 87, cat: TV/Documentary, desc: "Documental - Bluray 4K"}
-    - {id: 88, cat: TV/Documentary, desc: "Documental - Bluray 3D 4K"}
-    - {id: 89, cat: TV/Documentary, desc: "Documental - JMBD 4K"}
-    - {id: 90, cat: TV/Documentary, desc: "Documental - BDREMUX 4K"}
-    - {id: 91, cat: TV/Documentary, desc: "Documental - BluRay Rip 4K"}
-    - {id: 112, cat: TV/Documentary, desc: "Documental - HDTV WEB-DL 4K"}
-    - {id: 117, cat: TV/Documentary, desc: "Documental - BDRemux"}
-    - {id: 48, cat: Audio/Lossless, desc: "Música - Full BluRay"}
-    - {id: 50, cat: Audio/Lossless, desc: "Música - BluRay Rip 1080p"}
-    - {id: 51, cat: Audio/Lossless, desc: "Música - BluRay Rip 720p"}
-    - {id: 61, cat: Audio/Lossless, desc: "Música - Full bluray 3D"}
-    - {id: 62, cat: Audio/Lossless, desc: "Música - 3D"}
-    - {id: 97, cat: Audio/Lossless, desc: "Música - Bluray 4K"}
-    - {id: 98, cat: Audio/Lossless, desc: "Música - Bluray 3D 4K"}
-    - {id: 99, cat: Audio/Lossless, desc: "Música - JMBD 4K"}
-    - {id: 100, cat: Audio/Lossless, desc: "Música - BDREMUX 4K"}
-    - {id: 101, cat: Audio/Lossless, desc: "Música - BluRay Rip 4K"}
-    - {id: 113, cat: Audio/Lossless, desc: "Música - HDTV WEB-DL 4K"}
-    - {id: 116, cat: Audio/Lossless, desc: "Música - HDTV WEB-DL 720p"}
-    - {id: 54, cat: TV/Sport, desc: "Deporte - BluRay Rip 1080p"}
-    - {id: 55, cat: TV/Sport, desc: "Deporte - BluRay Rip 720p"}
-    - {id: 57, cat: TV/Sport, desc: "Deporte - HDTV 1080p"}
-    - {id: 59, cat: TV/Sport, desc: "Deporte - HDTV 720p"}
-    - {id: 92, cat: TV/Sport, desc: "Deporte - Bluray 4K"}
-    - {id: 93, cat: TV/Sport, desc: "Deporte - Bluray 3D 4K"}
-    - {id: 94, cat: TV/Sport, desc: "Deporte - JMBD 4K"}
-    - {id: 95, cat: TV/Sport, desc: "Deporte - BDREMUX 4K"}
-    - {id: 96, cat: TV/Sport, desc: "Deporte - BluRay Rip 4K"}
-    - {id: 114, cat: TV/Sport, desc: "Deporte - HDTV WEB-DL 4K"}
-    - {id: 47, cat: XXX/x264, desc: "XXX - Full BluRay"}
-    - {id: 49, cat: XXX/x264, desc: "XXX - BluRay Rip 1080p"}
-    - {id: 52, cat: XXX/x264, desc: "XXX - BluRay Rip 720p"}
-    - {id: 56, cat: XXX/x264, desc: "XXX - HDTV & WEB-DL 1080p"}
-    - {id: 60, cat: XXX/x264, desc: "XXX - HDTV & WEB-DL 720p"}
-    - {id: 64, cat: XXX/x264, desc: "XXX - Full BluRay 3D"}
-    - {id: 102, cat: XXX/x264, desc: "XXX - Bluray 4K"}
-    - {id: 103, cat: XXX/x264, desc: "XXX - Bluray 3D 4K"}
-    - {id: 104, cat: XXX/x264, desc: "XXX - JMBD 4K"}
-    - {id: 105, cat: XXX/x264, desc: "XXX - BDREMUX 4K"}
-    - {id: 106, cat: XXX/x264, desc: "XXX - BluRay Rip 4K"}
-    - {id: 115, cat: XXX/x264, desc: "XXX - HDTV WEB-DL 4K"}
-    - {id: 39, cat: Movies/BluRay, desc: "Animación - Full BluRay"}
-    - {id: 41, cat: Movies/HD, desc: "Animación - BluRay Rip 1080p"}
-    - {id: 42, cat: Movies/HD, desc: "Animación - BluRay Rip 720p"}
-    - {id: 43, cat: Movies/HD, desc: "Animación - HDTV & WEB-DL 1080p"}
-    - {id: 44, cat: Movies/HD, desc: "Animación - HDTV & WEB-DL 720p"}
-    - {id: 45, cat: Movies/3D, desc: "Animación - Full BluRay 3D"}
-    - {id: 46, cat: Movies/3D, desc: "Animación - 3D"}
-    - {id: 63, cat: Movies/HD, desc: "Animación - BDRemux"}
-    - {id: 78, cat: Movies/BluRay, desc: "Animación - Bluray 4K"}
-    - {id: 79, cat: Movies/3D, desc: "Animación - Bluray 3D 4K"}
-    - {id: 80, cat: Movies/HD, desc: "Animación - JMBD 4K"}
-    - {id: 81, cat: Movies/BluRay, desc: "Animación - BDREMUX 4K"}
-    - {id: 82, cat: Movies/BluRay, desc: "Animación - BluRay Rip 4K"}
-    - {id: 108, cat: Movies/HD, desc: "Animación - HDTV WEB-DL 4K"}
-    - {id: 83, cat: Movies/BluRay, desc: "Animación - Bluray 4k"}
-    - {id: 27, cat: TV/HD, desc: "Series Animación - Full Bluray"}
-    - {id: 30, cat: TV/HD, desc: "Series Animación - BluRay Rip 1080p"}
-    - {id: 31, cat: TV/HD, desc: "Series Animación - BluRay Rip 720p"}
-    - {id: 33, cat: TV/HD, desc: "Series Animación - HDTV & WEB-DL 1080p"}
-    - {id: 35, cat: TV/HD, desc: "Series Animación - HDTV & WEB-DL 720p"}
-    - {id: 84, cat: TV/HD, desc: "Series Animación - JMBD 4K"}
-    - {id: 85, cat: TV/HD, desc: "Series Animación - BDREMUX 4K"}
-    - {id: 86, cat: TV/HD, desc: "Series Animación - BluRay Rip 4K"}
-    - {id: 109, cat: TV/HD, desc: "Series Animación - HDTV WEB-DL 4K"}
-  modes:
-    search: [q]
-    tv-search: [q]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: info
-    type: info
-    label: "IP requirement"
-    default: "This site accepts only users with Spanish IP addresses.<br>For others it will return error: 403 Forbidden."
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: .lista>span
-  test:
-    path: index.php
-    selector: form[name="jump1"]
-
-search:
-  path: index.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})", " $1 "]
-    - name: re_replace
-      args: ["[^a-zA-Z0-9]+", " "]
-  inputs:
-    page: torrents
-    $raw: "&category={{ range .Categories }}{{.}};{{end}}"
-    active: 1
-    search: "{{ .Keywords }}"
-
-  rows:
-    selector: "#category+table table tr:not(:first-child):not(:last-child)"
-
-  fields:
-    category:
-      selector: td:nth-child(1) a
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_vose:
-      selector: td[valign="middle"] a:contains("VOSE")
-      optional: true
-      filters:
-        - name: append
-          args: " English"
-        - name: re_replace
-          args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b", " S$1 "]
-    title_notvose:
-      selector: td[valign="middle"] a:not(:contains("VOSE"))
-      optional: true
-      filters:
-        - name: append
-          args: " Spanish"
-        - name: re_replace
-          args: ["(?i)T[\\s-_]?(\\d{1,2})\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)\\w*Temp\\w*\\b\\s?(\\d{1,2})(ª|\\D)?\\b", " S$1 "]
-        - name: re_replace
-          args: ["(?i)(\\d{1,2})(ª|\\D)?\\s?\\w*Temp\\w*\\b", " S$1 "]
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-    details:
-      selector: td[valign="middle"] a
-      attribute: href
-    poster:
-      selector: td[valign="middle"] a
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    size:
-      selector: td:nth-child(10)
-    seeders:
-      selector: td:nth-child(6) a
-    leechers:
-      selector: td:nth-child(7) a
-    grabs:
-      selector: td:nth-child(8)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    download:
-      selector: a[href^="download.php"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        img[src$="freeleech.gif"]: 0
-        img[src$="gold.gif"]: 0
-        img[src$="silver.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="2x.gif"]: 2
-        img[src$="3x.gif"]: 3
-        img[src$="4x.gif"]: 4
-        img[src$="5x.gif"]: 5
-        img[src$="6x.gif"]: 6
-        img[src$="7x.gif"]: 7
-        img[src$="8x.gif"]: 8
-        img[src$="9x.gif"]: 9
-        "*": 1
-# engine tbd

src/Jackett.Common/Definitions/hdcztorrent.yml

@@ -113,7 +113,6 @@ login:
     path: index.php
     selector: a[href="logout.php"]
 
-
 search:
   paths:
     # http://www.hd-cztorrent.cz/index.php?page=torrents&search=the+avengers&category=0&uploader=0&options=0&active=0&gold=0&order=3&by=2

src/Jackett.Common/Definitions/hdforever.yml

@@ -240,16 +240,16 @@ search:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*multi[\\s|\\.|-]*)", ".{{ .Config.multilanguage }}."]
+          args: ["(?i)([\\s|\\.|-]multi[\\s|\\.|-])", ".{{ .Config.multilanguage }}."]
     title_phase2:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     title_vostfr:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*vostfr[\\s|\\.|-]*)", ".ENGLISH."]
+          args: ["(?i)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*subfrench[\\s|\\.|-]*)", ".ENGLISH."]
+          args: ["(?i)([\\s|\\.|-]subfrench[\\s|\\.|-])", ".ENGLISH."]
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     description:

src/Jackett.Common/Definitions/hdonly.yml

@@ -241,16 +241,16 @@ search:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*multi[\\s|\\.|-]*)", ".{{ .Config.multilanguage }}."]
+          args: ["(?i)([\\s|\\.|-]multi[\\s|\\.|-])", ".{{ .Config.multilanguage }}."]
     title_phase2:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     title_vostfr:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*vostfr[\\s|\\.|-]*)", ".ENGLISH."]
+          args: ["(?i)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]*subfrench[\\s|\\.|-]*)", ".ENGLISH."]
+          args: ["(?i)([\\s|\\.|-]subfrench[\\s|\\.|-])", ".ENGLISH."]
     title:
       text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     description:

src/Jackett.Common/Definitions/hebits.yml

@@ -129,9 +129,9 @@ search:
       selector: a[data-cover^="/images/"]
       attribute: data-cover
     files:
-      selector: td:nth-child(3)
+      selector: td:nth-child(4)
     date:
-      selector: td:nth-child(4) span
+      selector: td:nth-child(5) span
       attribute: title
       filters:
         - name: append
@@ -139,13 +139,13 @@ search:
         - name: dateparse
           args: "02/01/2006, 15:04 -07:00"
     size:
-      selector: td:nth-child(5)
-    grabs:
       selector: td:nth-child(6)
-    seeders:
+    grabs:
       selector: td:nth-child(7)
-    leechers:
+    seeders:
       selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
     downloadvolumefactor:
       case:
         "strong.tl_notice[title*=\"חצי פריליץ'\"]": 0.5 # 50%

src/Jackett.Common/Definitions/hhanclub.yml

@@ -0,0 +1,192 @@
+---
+id: hhanclub
+name: HHanClub
+description: "HHanClub (猪猪网) is a CHINESE Private Torrent Tracker for HD MOVIES / TV"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://hhanclub.top/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/连续剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/MV"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "Music/音乐"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the HHanClub Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - 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
+  - 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.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 (not working)
+    search_area: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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(a[href^="details.php?id="])
+
+  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:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > 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-child(4):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-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    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
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.24 2022-08-30

src/Jackett.Common/Definitions/huntorrent.yml

@@ -103,11 +103,12 @@ search:
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # Age Limit: 0 all, 1 no, 5 6, 2 12, 3 16, 4 18
     korhatar: 0
-    # 0 active, 1 all, 2 dead, 3 my uploads, 4  my bookmarks
+    # 0 active, 1 active+dead, 2 dead, 3 my uploads, 4  waiting for seed, 7 my bookmarks, 12 reseeded by me
     incldead: 1
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
     # no freeleech atm
+    # can search by genre but you need to know the id. &mufaj[]=20 for Romantikus
 
   rows:
     selector: table[align="center"][cellpadding="5"] > tbody > tr[id^="torrent-main-"]
@@ -133,8 +134,13 @@ search:
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
+    genre:
+      selector: "span[style=\"font-size: 6pt; font-weight: bold;\"]"
     description:
       selector: td:nth-child(2) div:nth-child(2)
+      filters:
+        - name: append
+          args: "{{ if .Result.genre }}</br>{{ .Result.genre }}{{ else }}{{ end }}"
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href

src/Jackett.Common/Definitions/insanetracker.yml

@@ -41,7 +41,6 @@ caps:
     - {id: 28, cat: XXX/ImageSet, desc: "XXX Képek"}
     - {id: 29, cat: Other, desc: "Képek"}
 
-
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid]

src/Jackett.Common/Definitions/itorrent.yml

@@ -48,7 +48,6 @@ settings:
       DESC: desc
       ASC: asc
 
-
 download:
   selectors:
     - selector: a[href^="/torrentfiles/"]

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

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

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

@@ -33,21 +33,15 @@ search:
       selector: h5 a
       attribute: href
     download:
-      selector: a.button
+      selector: a[href*="/download/torrent/"]
       attribute: href
-    poster:
-      selector: img
-      attribute: data-src
+      optional: true
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+      optional: true
     date:
-      selector: img
-      attribute: data-src
-      filters:
-        - name: regexp
-          args: (/\d{4}/\d{2}/)
-        - name: append
-          args: " -07:00" # PDT
-        - name: dateparse
-          args: "/2006/01/ -07:00"
+      text: now
     size:
       selector: span.is-size-6
     seeders:

src/Jackett.Common/Definitions/karagarga.yml

@@ -134,18 +134,17 @@ search:
     _subs:
       selector: span:contains("Subs:")
       optional: true
-    _genre:
+    genre:
       selector: td:nth-child(5)
-      optional: true
       filters:
-        - name: prepend
-          args: "Genre: "
+        - name: replace
+          args: ["\n", " "]
     _mom:
       selector: img[title^="CURRENT"]
       attribute: title
       optional: true
     description:
-      text: "{{ .Result._subs }} {{ .Result._genre }}{{ if .Result._mom }} Current MoM{{ else }}{{ end }}"
+      text: "{{ if .Result._subs }}Subs: {{ .Result._subs }}</br>{{ else }}{{ end }}{{ if .Result.genre }}Genre: {{ .Result.genre }}</br>{{ else }}{{ end }}{{ if .Result._mom }}Current MoM{{ else }}{{ end }}"
     downloadvolumefactor:
       case:
         "span:contains(\"Freeleech\")": 0

src/Jackett.Common/Definitions/keepfriends.yml

@@ -32,8 +32,8 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
@@ -86,13 +86,13 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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, 5 douban keywords
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl, 5 doubankeywords (not working)
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
@@ -127,9 +127,16 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    _staff_edit:
+      selector: a[href^="edit.php?"]
+      attribute: href
+      optional: true
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(4) > span[title]
+      selector: "{{ if .Result._staff_edit }}td:nth-child(5) > span[title]{{ else }}td:nth-child(4) > span[title]{{ end }}"
       attribute: title
       optional: true
       filters:
@@ -139,7 +146,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: "{{ if .Result._staff_edit }}td:nth-child(5):not(:has(span)){{ else }}td:nth-child(4):not(:has(span)){{ end }}"
       optional: true
       filters:
         - name: append
@@ -149,13 +156,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:nth-child(5)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(6){{ else }}td:nth-child(5){{ end }}"
     seeders:
-      selector: td:nth-child(6)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(7){{ else }}td:nth-child(6){{ end }}"
     leechers:
-      selector: td:nth-child(7)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(8){{ else }}td:nth-child(7){{ end }}"
     grabs:
-      selector: td:nth-child(8)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(9){{ else }}td:nth-child(8){{ end }}"
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -171,7 +178,7 @@ search:
         img.pro_2up: 2
         "*": 1
     description:
-      selector: td:nth-child(2)
+      selector: "{{ if .Result._staff_edit }}td:nth-child(3){{ else }}td:nth-child(2){{ end }}"
       remove: a, img
     title_english:
       selector: table.torrentname > tbody > tr > td.embedded

src/Jackett.Common/Definitions/kinozal.yml

@@ -152,6 +152,8 @@ search:
   keywordsfilters:
 #    - name: diacritics # 8686
 #      args: replace
+    - name: re_replace
+      args: ["[^a-zA-Zа-яА-Я0-9]+", " "]
     - name: re_replace # S01 to 1
       args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
     - name: re_replace # S01E01 to 1 1

src/Jackett.Common/Definitions/knaben.yml

@@ -10,71 +10,78 @@ links:
 
 caps:
   categorymappings:
-    # Cat ids used for filtering /browse/ are not consistent with those for results, so double-check when updating.
-    # They appear to be using nZEDb/Newznab/Jackett cat ids, so if there are empty categories, resort to those.
-    # Audio
-    - {id: 3000, cat: Audio, desc: "Audio"}
-    - {id: 3010, cat: Audio/MP3, desc: "Audio/MP3"}
-    - {id: 3020, cat: Audio/Video, desc: "Audio/Video"}
-    - {id: 3030, cat: Audio/Audiobook, desc: "Audio/Audiobook"}
-    - {id: 3040, cat: Audio/Lossless, desc: "Audio/Lossless"}
-    - {id: 3050, cat: Audio/Other, desc: "Audio/Other"}
-    # Console
-    - {id: 1000, cat: Console, desc: "Console"}
-    - {id: 1010, cat: Console/NDS, desc: "Console/NDS"}
-    - {id: 1020, cat: Console/PSP, desc: "Console/PSP"}
-    - {id: 1030, cat: Console/Wii, desc: "Console/Wii"}
-    - {id: 1040, cat: Console/XBox, desc: "Console/Xbox"}
-    - {id: 1050, cat: Console/XBox 360, desc: "Console/Xbox 360"}
-    - {id: 1080, cat: Console/PS3, desc: "Console/PS3"}
-    - {id: 1110, cat: Console/3DS, desc: "Console/3DS"}
-    - {id: 1120, cat: Console/PS Vita, desc: "Console/PS Vita"}
-    - {id: 1180, cat: Console/PS4, desc: "Console/PS4"}
-    - {id: 1090, cat: Console/Other, desc: "Console/Other"}
-    # Movies
-    - {id: 2000, cat: Movies, desc: "Movies"}
-    - {id: 2010, cat: Movies/Foreign, desc: "Movies/Foreign"}
-    - {id: 2030, cat: Movies/SD, desc: "Movies/SD"}
-    - {id: 2040, cat: Movies/HD, desc: "Movies/HD"}
-    - {id: 2045, cat: Movies/UHD, desc: "Movies/UHD"}
-    - {id: 2060, cat: Movies/3D, desc: "Movies/3D"}
-    - {id: 2050, cat: Movies/BluRay, desc: "Movies/BluRay"}
-    - {id: 2070, cat: Movies/DVD, desc: "Movies/DVD"}
-    - {id: 2020, cat: Movies/Other, desc: "Movies/Other"}
-    # PC
-    - {id: 4000, cat: PC, desc: "PC/PC"}
-    - {id: 4020, cat: PC/ISO, desc: "PC/ISO"}
-    - {id: 4030, cat: PC/Mac, desc: "PC/Mac"}
-    - {id: 4040, cat: PC/Mobile-Other, desc: "PC/Mobile-Other"}
-    - {id: 4050, cat: PC/Games, desc: "PC/Games"}
-    - {id: 4060, cat: PC/Mobile-iOS, desc: "PC/Mobile-iOS"}
-    - {id: 4070, cat: PC/Mobile-Android, desc: "PC/Mobile-Android"}
-    # Anime
-    - {id: 5070, cat: TV/Anime, desc: "Anime"}
-    # TV
-    - {id: 5000, cat: TV, desc: "TV"}
-    - {id: 5020, cat: TV/Foreign, desc: "TV/FOREIGN"}
-    - {id: 5030, cat: TV/SD, desc: "TV/SD"}
-    - {id: 5040, cat: TV/HD, desc: "TV/HD"}
-    - {id: 5045, cat: TV/UHD, desc: "TV/UHD"}
-    - {id: 5060, cat: TV/Sport, desc: "TV/Sport"}
-    - {id: 5080, cat: TV/Documentary, desc: "TV/Documentary"}
-    - {id: 5050, cat: TV/Other, desc: "TV/OTHER"}
-    # XXX
-    - {id: 6000, cat: XXX, desc: "XXX"}
-    - {id: 6010, cat: XXX/DVD, desc: "XXX/DVD"}
-    - {id: 6060, cat: XXX/ImageSet, desc: "XXX/Imageset"}
-    - {id: 6070, cat: XXX/Other, desc: "XXX/Other"}
-    # Books
-    - {id: 7000, cat: Books, desc: "Books"}
-    - {id: 7020, cat: Books/EBook, desc: "Books/Ebook"}
-    - {id: 7030, cat: Books/Comics, desc: "Books/Comics"}
-    - {id: 7010, cat: Books/Mags, desc: "Books/Magazines"}
-    - {id: 7040, cat: Books/Technical, desc: "Books/Technical"}
-    - {id: 7050, cat: Books/Other, desc: "Books/Other"}
-    # Other
-    - {id: 8000, cat: Other, desc: "Other"}
-    - {id: 8010, cat: Other/Misc, desc: "Other/Misc"}
+    - {id: 1000000, cat: Audio, desc: "Audio"}
+    - {id: 1001000, cat: Audio/MP3, desc: "MP3"}
+    - {id: 1002000, cat: Audio/Lossless, desc: "Lossless"}
+    - {id: 1003000, cat: Audio/Audiobook, desc: "Audiobook"}
+    - {id: 1004000, cat: Audio/Video, desc: "Video"}
+    - {id: 1005000, cat: Audio/Other, desc: "Radio"}
+    - {id: 1006000, cat: Audio/Other, desc: "Other"}
+    - {id: 2000000, cat: TV, desc: "TV"}
+    - {id: 2001000, cat: TV/HD, desc: "HD"}
+    - {id: 2002000, cat: TV/SD, desc: "SD"}
+    - {id: 2003000, cat: TV/UHD, desc: "UHD"}
+    - {id: 2004000, cat: TV/Documentary, desc: "Documentary"}
+    - {id: 2005000, cat: TV/Foreign, desc: "Foreign"}
+    - {id: 2006000, cat: TV/Sport, desc: "Sport"}
+    - {id: 2007000, cat: TV/Other, desc: "Cartoon"}
+    - {id: 2008000, cat: TV/Other, desc: "Other"}
+    - {id: 3000000, cat: Movies, desc: "Movies"}
+    - {id: 3001000, cat: Movies/HD, desc: "HD"}
+    - {id: 3002000, cat: Movies/SD, desc: "SD"}
+    - {id: 3003000, cat: Movies/UHD, desc: "UHD"}
+    - {id: 3004000, cat: Movies/DVD, desc: "DVD"}
+    - {id: 3005000, cat: Movies/Foreign, desc: "Foreign"}
+    - {id: 3006000, cat: Movies/Foreign, desc: "Bollywood"}
+    - {id: 3007000, cat: Movies/3D, desc: "3D"}
+    - {id: 3008000, cat: Movies/Other, desc: "Other"}
+    - {id: 4000000, cat: PC, desc: "PC"}
+    - {id: 4001000, cat: PC/Games, desc: "Games"}
+    - {id: 4002000, cat: PC/0day, desc: "Software"}
+    - {id: 4003000, cat: PC/Mac, desc: "Mac"}
+    - {id: 4004000, cat: PC/ISO, desc: "Unix"}
+    - {id: 5000000, cat: XXX, desc: "XXX"}
+    - {id: 5001000, cat: XXX/x264, desc: "Video"}
+    - {id: 5002000, cat: XXX/ImageSet, desc: "ImageSet"}
+    - {id: 5003000, cat: XXX/Other, desc: "Games"}
+    - {id: 5004000, cat: XXX/Other, desc: "Hentai"}
+    - {id: 5005000, cat: XXX/Other, desc: "Other"}
+    - {id: 6000000, cat: TV/Anime, desc: "Anime"}
+    - {id: 6001000, cat: TV/Anime, desc: "Subbed"}
+    - {id: 6002000, cat: TV/Anime, desc: "Dubbed"}
+    - {id: 6003000, cat: TV/Anime, desc: "Dual audio"}
+    - {id: 6004000, cat: TV/Anime, desc: "Raw"}
+    - {id: 6005000, cat: Audio/Video, desc: "Music Video"}
+    - {id: 6006000, cat: Books/Other, desc: "Literature"}
+    - {id: 6007000, cat: Audio/Other, desc: "Music"}
+    - {id: 7000000, cat: Console, desc: "Console"}
+    - {id: 7001000, cat: Console/PS4, desc: "PS4"}
+    - {id: 7002000, cat: Console/PS3, desc: "PS3"}
+    - {id: 7003000, cat: Console/PS3, desc: "PS2"}
+    - {id: 7004000, cat: Console/PS3, desc: "PS1"}
+    - {id: 7005000, cat: Console/PS Vita, desc: "PS Vita"}
+    - {id: 7006000, cat: Console/PSP, desc: "PSP"}
+    - {id: 7007000, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: 7008000, cat: Console/XBox, desc: "Xbox"}
+    - {id: 7009000, cat: Console/NDS, desc: "Switch"}
+    - {id: 7010000, cat: Console/NDS, desc: "NDS"}
+    - {id: 7011000, cat: Console/Wii, desc: "Wii"}
+    - {id: 7012000, cat: Console/WiiU, desc: "WiiU"}
+    - {id: 7013000, cat: Console/3DS, desc: "3DS"}
+    - {id: 7014000, cat: Console/Wii, desc: "GameCube"}
+    - {id: 7015000, cat: Console/Other, desc: "Other"}
+    - {id: 8000000, cat: PC/Mobile-Other, desc: "Mobile"}
+    - {id: 8001000, cat: PC/Mobile-Android, desc: "Android"}
+    - {id: 8002000, cat: PC/Mobile-iOS, desc: "IOS"}
+    - {id: 8003000, cat: PC/Mobile-Other, desc: "Other"}
+    - {id: 9000000, cat: Books, desc: "Books"}
+    - {id: 9001000, cat: Books/EBook, desc: "EBooks"}
+    - {id: 9002000, cat: Books/Comics, desc: "Comics"}
+    - {id: 9003000, cat: Books/Mags, desc: "Magazines"}
+    - {id: 9004000, cat: Books/Technical, desc: "Technical"}
+    - {id: 9005000, cat: Books/Other, desc: "Other"}
+    - {id: 10000000, cat: Other, desc: "Other"}
+    - {id: 10001000, cat: Other/Misc, desc: "Misc"}
 
   modes:
     search: [q]
@@ -87,27 +94,37 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: Date
+    default: date
     options:
-      Date: created
-      Seeders: seeders
-      Size: size
-      Title: title
+      date: created
+      seeders: seeders
+      bytes: size
+      title: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: +
+    options:
+      +: desc
+      -: asc
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/?q={{ .Keywords }}&p=1&cat=All&s={{ else }}browse/1/0/{{ end }}{{ .Config.sort }}"
+    - path: "{{ if .Keywords }}search/{{ .Keywords }}{{ else }}browse{{ end }}/0/1/{{ .Config.type }}{{ .Config.sort }}"
 
   rows:
-    selector: tr[title^="Cached at"]
+    selector: tr[title^="Cached "]
 
   fields:
     category:
-      selector: a[href^="/browse/"]
+      selector: a[href^="/browse/"]:last-child
       attribute: href
       filters:
         - name: split
-          args: ["/", 3]
+          args: ["/", 2]
+        # replace subcat with cat: 1001069 > 1001000
+        - name: re_replace
+          args: ["(\\d{3})$", "000"]
     title:
       selector: td:nth-child(2) a
     details:
@@ -128,7 +145,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02T15:04:05 -07:00"
+          args: "2006-01-02 15:04:05 -07:00"
     size:
       selector: td:nth-child(3)
     seeders:

src/Jackett.Common/Definitions/krazyzone.yml

@@ -25,6 +25,7 @@ caps:
     - {id: 46, cat: Audio/Video, desc: "Music Videos"}
     - {id: 24, cat: Audio, desc: "Music Karaoke"}
     - {id: 28, cat: Movies, desc: "Movies 2022"}
+    - {id: 47, cat: Movies/BluRay, desc: "Movies Bluray-HD"}
     - {id: 9, cat: Movies/DVD, desc: "Movies Dvdr-ISO"}
     - {id: 52, cat: Movies, desc: "Movies Classic Pre90s"}
     - {id: 48, cat: Movies/SD, desc: "Movies AVI - XVID - Dvdrip"}
@@ -56,6 +57,7 @@ caps:
     - {id: 94, cat: Other, desc: "Xmas Music Packs"}
     - {id: 95, cat: Other/Misc, desc: "Unsorted To Be Edited"}
     - {id: 97, cat: Other, desc: "VIP Exclusive"}
+    - {id: 99, cat: Other, desc: "Krazy-Internal"}
 
   modes:
     search: [q]
@@ -128,7 +130,7 @@ search:
       args: ["(\\w+)", " +$1"] # prepend + to each word
 
   rows:
-    selector: table.ttable_headinner > tbody > tr
+    selector: table.ttable_headinner > tbody > tr:has(a[href^="download.php?id="])
 
   fields:
     category:

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,7 +9,7 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.bet/
+  - https://limetorrents.unblockit.cat/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.world/
 legacylinks:
@@ -40,6 +40,7 @@ legacylinks:
   - https://limetorrents.unblockit.name/
   - https://limetorrents.nocensor.sbs/
   - https://limetorrents.unblockit.ist/
+  - https://limetorrents.unblockit.bet/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/linuxtracker.yml

@@ -69,12 +69,14 @@ caps:
     - {id: 2273, cat: PC/ISO, desc: "Cryptocurrency OS"}
     - {id: 2245, cat: PC/ISO, desc: "Cucumber Linux"}
     - {id: 2285, cat: PC/ISO, desc: "DRBL Live"}
+    - {id: 123, cat: PC/ISO, desc: "Damnsmall"}
     - {id: 128, cat: PC/ISO, desc: "Debian"}
     - {id: 131, cat: PC/ISO, desc: "Deepin"}
     - {id: 2038, cat: PC/ISO, desc: "Deft"}
     - {id: 2192, cat: PC/ISO, desc: "Devuan"}
     - {id: 2287, cat: PC/ISO, desc: "Doge Linux"}
     - {id: 144, cat: PC/ISO, desc: "DragonFly BSD"}
+    - {id: 2215, cat: PC/ISO, desc: "Dragora GNU/Linux"}
     - {id: 2226, cat: PC/ISO, desc: "DuZeru OS"}
     - {id: 148, cat: PC/ISO, desc: "Dynebolic"}
     - {id: 2261, cat: PC/ISO, desc: "Eagle Mode"}
@@ -85,6 +87,7 @@ caps:
     - {id: 2041, cat: PC/ISO, desc: "Elementary OS"}
     - {id: 161, cat: PC/ISO, desc: "Elive"}
     - {id: 2042, cat: PC/ISO, desc: "Emmabuntus"}
+    - {id: 2231, cat: PC/ISO, desc: "Emmi OS"}
     - {id: 2278, cat: PC/ISO, desc: "EndeavourOS"}
     - {id: 164, cat: PC/ISO, desc: "Endian"}
     - {id: 2179, cat: PC/ISO, desc: "Endless OS"}
@@ -133,6 +136,7 @@ caps:
     - {id: 2054, cat: PC/ISO, desc: "Kolibri"}
     - {id: 287, cat: PC/ISO, desc: "Kubuntu"}
     - {id: 2057, cat: PC/ISO, desc: "Kwort Linux"}
+    - {id: 2058, cat: PC/ISO, desc: "Kxstudio"}
     - {id: 2068, cat: PC/ISO, desc: "LXLE"}
     - {id: 2258, cat: PC/ISO, desc: "Lakka"}
     - {id: 2176, cat: PC/ISO, desc: "LibreELEC"}
@@ -150,6 +154,7 @@ caps:
     - {id: 1218, cat: PC/ISO, desc: "Lubuntu"}
     - {id: 2163, cat: PC/ISO, desc: "MOFO Linux"}
     - {id: 2177, cat: PC/ISO, desc: "MX Linux"}
+    - {id: 2296, cat: PC/ISO, desc: "Mabox Linux"}
     - {id: 1228, cat: PC/ISO, desc: "Mageia"}
     - {id: 2071, cat: PC/ISO, desc: "MakuluLinux"}
     - {id: 2073, cat: PC/ISO, desc: "Manjaro"}
@@ -157,8 +162,10 @@ caps:
     - {id: 2075, cat: PC/ISO, desc: "Minino"}
     - {id: 2076, cat: PC/ISO, desc: "Minix"}
     - {id: 2241, cat: PC/ISO, desc: "MorpheusArch Linux"}
+    - {id: 369, cat: PC/ISO, desc: "Musix"}
     - {id: 373, cat: PC/ISO, desc: "Mythbuntu"}
     - {id: 2078, cat: PC/ISO, desc: "NAS4Free"}
+    - {id: 2217, cat: PC/ISO, desc: "Namib GNU/Linux"}
     - {id: 2079, cat: PC/ISO, desc: "Neptune"}
     - {id: 380, cat: PC/ISO, desc: "NetBSD"}
     - {id: 2080, cat: PC/ISO, desc: "Nethserver"}
@@ -253,9 +260,11 @@ caps:
     - {id: 2134, cat: PC/ISO, desc: "SuperX"}
     - {id: 2189, cat: PC/ISO, desc: "SwagArch"}
     - {id: 2267, cat: PC/ISO, desc: "Symphony OS"}
+    - {id: 2295, cat: PC/ISO, desc: "SysLinuxOS"}
     - {id: 2135, cat: PC/ISO, desc: "SystemRescueCD"}
     - {id: 2188, cat: PC/ISO, desc: "TENS"}
     - {id: 2136, cat: PC/ISO, desc: "Tails"}
+    - {id: 2170, cat: PC/ISO, desc: "TalkingArch"}
     - {id: 542, cat: PC/ISO, desc: "Thinstation"}
     - {id: 2279, cat: PC/ISO, desc: "TinyPaw Linux"}
     - {id: 2138, cat: PC/ISO, desc: "Tinycore"}
@@ -286,6 +295,7 @@ caps:
     - {id: 2281, cat: PC/ISO, desc: "Web Security Dojo"}
     - {id: 2246, cat: PC/ISO, desc: "Whonix"}
     - {id: 2155, cat: PC/ISO, desc: "Wifislax"}
+    - {id: 2229, cat: PC/ISO, desc: "XiVa Studio"}
     - {id: 2251, cat: PC/ISO, desc: "XigmaNAS"}
     - {id: 607, cat: PC/ISO, desc: "Xubuntu"}
     - {id: 612, cat: PC/ISO, desc: "Zen"}

src/Jackett.Common/Definitions/madsrevolution.yml

@@ -62,15 +62,15 @@ caps:
     - {id: 33, cat: XXX, desc: "XXX DVD-R"}
     - {id: 10, cat: XXX, desc: "XXX Unsorted"}
     - {id: 5, cat: TV/Anime, desc: "Misc Anime"}
-    - {id: 6, cat: TV/Anime, desc: "Misc Hentai"}
+    - {id: 6, cat: XXX, desc: "Misc Hentai"}
     - {id: 19, cat: Other, desc: "Misc Other"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
+    tv-search: [q, season, ep, genre]
+    movie-search: [q, genre]
+    music-search: [q, genre]
+    book-search: [q, genre]
 
 settings:
   - name: username
@@ -123,6 +123,11 @@ search:
   inputs:
     $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}{{ if .Config.freeleech }}action=uploadonly&{{ else }}{{ end }}"
     searchstr: "{{ .Keywords }}"
+    searchtags: "{{ if .Query.Genre }}{{ .Query.Genre }}{{ else }}{{ end }}"
+    # 0 any, 1 all
+    tags_type: 0
+    order_by: "{{ .Config.sort }}"
+    order_way: "{{ .Config.type }}"
     # site does not support imdbid searching or present imdb links in results.
 
   rows:
@@ -149,6 +154,10 @@ search:
       filters:
         - name: regexp
           args: "src=(.+?) "
+    genre:
+      selector: div.tags
+    description:
+      text: "{{ .Result.genre }}"
     date:
       selector: td:nth-last-child(5)
       filters:

src/Jackett.Common/Definitions/mediamaatjes.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 45, cat: Console/Other, desc: "Retro-spellen"}
+    - {id: 46, cat: Movies/SD, desc: "avi/xvideo"}
     - {id: 43, cat: Movies/UHD, desc: "4k Films"}
     - {id: 41, cat: TV/Documentary, desc: "Documentaire"}
     - {id: 40, cat: Other, desc: "kerst"}

src/Jackett.Common/Definitions/megapeer.yml

@@ -84,6 +84,8 @@ search:
 
   rows:
     selector: table#tor-tbl > tbody > tr.hl-tr
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/mesevilag.yml

@@ -165,8 +165,8 @@ search:
       selector: td:nth-last-child(5)
       remove: font
     minimumratio:
-      text: 0.7
+      text: 1.0
     minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # engine n/a

src/Jackett.Common/Definitions/microbit.yml

@@ -1,166 +0,0 @@
----
-id: microbit
-name: MicroBit
-description: "MicroBit (µBit) is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hu-HU
-type: private
-encoding: UTF-8
-links:
-  - http://microbit.eu/ # site does not support https ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: 37, cat: TV/Anime, desc: "Animációk"}
-    - {id: 12, cat: Books, desc: "E-book/Eng"}
-    - {id: 13, cat: Books, desc: "E-book/Hun"}
-    - {id: 36, cat: Movies/DVD, desc: "Film/DVD-9/Eng"}
-    - {id: 38, cat: Movies/DVD, desc: "Film/DVD-9/Hun"}
-    - {id: 6, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 31, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 39, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 4, cat: Movies/SD, desc: "Film/Xvid/Eng"}
-    - {id: 2, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 24, cat: Audio/Audiobook, desc: "Hangoskönyv"}
-    - {id: 23, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 17, cat: Console, desc: "Játék/Konzol"}
-    - {id: 18, cat: PC/Games, desc: "Játék/Rip"}
-    - {id: 19, cat: Other, desc: "Képek"}
-    - {id: 11, cat: Audio/Video, desc: "Klippek/Videók"}
-    - {id: 8, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 35, cat: Books, desc: "Oktató Anyagok"}
-    - {id: 28, cat: PC, desc: "PC/Egyéb"}
-    - {id: 21, cat: PC/ISO, desc: "PC/ISO"}
-    - {id: 1, cat: PC, desc: "PC/Rip"}
-    - {id: 20, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 14, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 29, cat: Movies/UHD, desc: "UHD"}
-    - {id: 22, cat: Audio/Lossless, desc: "Zene/Lossless"}
-    - {id: 10, cat: Audio/MP3, desc: "Zene/MP3"}
-
-  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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      name: name
-      size: size
-      added: added
-      seeders: seeders
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    return: "/"
-  error:
-    - selector: fieldset.stderr
-  test:
-    path: index.php
-    selector: img[onclick="window.location='logout.php'"]
-
-search:
-  paths:
-    # http://microbit.eu/browse.php?searchOpened=1&search=&searchWhat=0&filterOptions=0&orderby=added&ordertype=DESC
-    # http://microbit.eu/browse.php?searchOpened=1&cat[12]=12&cat[13]=13&search=&searchWhat=0&filterOptions=0
-    - path: browse.php
-  inputs:
-    # note: range categories does not support specifying the range value more than once so "{{ range .Categories }}cat[{{.}}]={{.}}&{{end}}" is not valid
-    # $raw: "{{ range .Categories }}cat[{{.}}]=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    searchOpened: 1
-    # 0 title, 1 descr, 2 uploader
-    searchWhat: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
-    # 0 active, 1 active&dead, 2 dead, 3 dl multiplier, 4 ul multiplier, 5 dl&ul multiplier, 6 bad torrent, 7 unverified torrent, 8 my torrent
-    filterOptions: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    orderby: "{{ .Config.sort }}"
-    ordertype: "{{ .Config.type }}"
-    # does not return imdb link in results
-
-  rows:
-    selector: table.torrentList > tbody > tr:has(a[href^="download.php?id="]), table.torrentList > tbody > tr:has(td[onclick^="window.location='download.php?id="])
-    after: 1
-
-  fields:
-    category:
-      selector: a[href^="browse.php?searchOpened=1&cat["]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title:
-      selector: a[onclick^="getTorrentInfo("]
-      attribute: title
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    details:
-      selector: a[href^="torrentdetails.php?id="]
-      attribute: href
-    poster:
-      selector: a.poster
-      attribute: href
-    grabs:
-      selector: td:nth-child(5)
-    seeders:
-      selector: td:nth-child(6)
-    leechers:
-      selector: td:nth-child(7)
-    size:
-      selector: td:nth-child(8)
-    date:
-      selector: td:nth-child(9)
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006.01.02. 15:04 -07:00"
-    downloadvolumefactor_optional:
-      optional: true
-      selector: b:has(img[src="templates/default/images/header/arrowdown.gif"])
-      filters:
-        - name: regexp
-          args: (\d+\.*\d*)
-    downloadvolumefactor:
-      text: "{{ if .Result.downloadvolumefactor_optional }}{{ .Result.downloadvolumefactor_optional }}{{ else }}1{{ end }}"
-    uploadvolumefactor_optional:
-      optional: true
-      selector: b:has(img[src="templates/default/images/header/arrowup.gif"])
-      filters:
-        - name: regexp
-          args: (\d+)
-    uploadvolumefactor:
-      text: "{{ if .Result.uploadvolumefactor_optional }}{{ .Result.uploadvolumefactor_optional }}{{ else }}1{{ end }}"
-    minimumratio:
-      text: 0.6
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# custom 3.0

src/Jackett.Common/Definitions/moviesite.yml

@@ -137,8 +137,22 @@ search:
       filters:
         - name: replace
           args: ["../pic/+18.png", ""]
+    genre:
+      selector: font[color="black"]
+      filters:
+        - name: replace
+          args: ["Műfaj:\xA0", ""]
+        - name: replace
+          args: ["Categorie:\xA0", ""]
+        - name: replace
+          args: ["Genre:\xA0", ""]
+        - name: replace
+          args: ["\x09", ""]
     description:
       selector: div center font b i
+      filters:
+        - name: append
+          args: "{{ if .Result.genre }}</br>{{ .Result.genre }}{{ else }}{{ end }}"
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href

src/Jackett.Common/Definitions/movietorrent.yml

@@ -47,6 +47,7 @@ caps:
     - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
     - {id: 10293, cat: Movies, desc: "2021"}
     - {id: 8569, cat: Movies, desc: "2021"}
+    - {id: 8610, cat: Movies, desc: "2022"}
 
   modes:
     search: [q]
@@ -64,16 +65,10 @@ download:
         - name: regexp
           args: ([A-F|a-f|0-9]{40})
     title:
-      selector: h2
+      selector: th[colspan="5"]
       filters:
         - name: replace
-          args: ["Full Movie ", ""]
-        - name: replace
-          args: ["Torrent Magnet ", ""]
-        - name: replace
-          args: ["Download", ""]
-        - name: replace
-          args: ["…", ""]
+          args: [" – movietorrent", ""]
         - name: trim
         - name: validfilename
 

src/Jackett.Common/Definitions/muziekfabriek.yml

@@ -62,8 +62,8 @@ login:
   error:
     - selector: td.embedded:contains("fout")
   test:
-    path: /
-    selector: :has(a[href="logout.php"])
+    path: index.php
+    selector: a[href="logout.php"]
 
 download:
   selectors:

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

@@ -0,0 +1,148 @@
+---
+id: nbtorrents-api
+name: NBTorrents (API)
+description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://www.nbtorrents.com/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 4, cat: PC/Games, desc: "Game"}
+    - {id: 5, cat: PC/0day, desc: "Application"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://www.nbtorrents.com/\" target =_blank>NBTorrents</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ 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 }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.4
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# json UNIT3D 6.3.0

src/Jackett.Common/Definitions/nbtorrents.yml

@@ -1,150 +0,0 @@
----
-id: nbtorrents
-name: NBTorrents
-description: "NBTorrents is an INDIAN Private site for MOVIES / TV / MUSIC"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://www.nbtorrents.com/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: TV/Anime, desc: "Anime & Cartoon"}
-    - {id: 26, cat: TV/Documentary, desc: "Documentaries"}
-    - {id: 1, cat: Movies/UHD, desc: "Movies UHD & BluRay"}
-    - {id: 3, cat: Movies/BluRay, desc: "Movies BDRips"}
-    - {id: 6, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 7, cat: Movies/DVD, desc: "Movies DVDRip"}
-    - {id: 8, cat: Movies, desc: "Movies Pre"}
-    - {id: 2, cat: Movies, desc: "Movies Remux"}
-    - {id: 4, cat: Movies/WEB-DL, desc: "Movies Web"}
-    - {id: 5, cat: Movies/WEB-DL, desc: "Movies WebRip"}
-    - {id: 15, cat: Audio/Lossless, desc: "Music CD & FLAC"}
-    - {id: 17, cat: Audio/MP3, desc: "Music MP3"}
-    - {id: 18, cat: Audio, desc: "Music Pack"}
-    - {id: 20, cat: Audio, desc: "Music Podcast"}
-    - {id: 19, cat: Audio/Video, desc: "Music Video"}
-    - {id: 16, cat: Audio, desc: "Music Web"}
-    - {id: 25, cat: TV/Sport, desc: "Sports"}
-    - {id: 10, cat: TV/UHD, desc: "TV UHD & BluRay"}
-    - {id: 11, cat: TV, desc: "TV BDRips"}
-    - {id: 14, cat: TV, desc: "TV packs"}
-    - {id: 12, cat: TV/WEB-DL, desc: "TV Web"}
-    - {id: 13, cat: TV/WEB-DL, desc: "TV WebRips"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-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:
-      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"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: td.colhead:contains("failed")
-      message:
-        selector: table tr td.text
-  test:
-    path: browse.php
-    selector: a[href*="logout.php?hash_insert="]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    searchin: title
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}0{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  rows:
-    selector: table.mainouter tr table tr:has(a[href^="download.php?torrent="])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: td a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td a[href^="details.php?id="]
-    details:
-      selector: td a[href^="details.php?id="]
-      attribute: href
-    poster:
-      selector: td a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=\\\\'(.*?)\\\\' "
-    download:
-      selector: td a[href^="download.php?torrent="]
-      attribute: href
-    imdbid:
-      selector: td a[href*="imdb.com/title/tt"]
-      attribute: href
-    files:
-      selector: td:nth-of-type(5)
-    date:
-      selector: td:nth-of-type(7)
-      filters:
-        - name: append
-          args: " +05:30" # IST
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM -07:00"
-    size:
-      selector: td:nth-of-type(8)
-    grabs:
-      selector: td:nth-of-type(9)
-    seeders:
-      selector: td:nth-of-type(10)
-    leechers:
-      selector: td:nth-of-type(11)
-    downloadvolumefactor:
-      case:
-        "img[title=\"Free Torrent\"]": 0 # torrent specific free leech (icon)?
-        "a.info:contains(\"Free\")": 0 # global freeleech note?
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/newpct-me.yml

@@ -1,101 +0,0 @@
----
-id: newpct-me
-name: NewPCT.me
-description: "NewPCT.me is a SPANISH Public torrent site for MOVIES"
-language: es-ES
-type: public
-encoding: UTF-8
-links:
-  - https://www1.newpct.net/
-  - https://newpct.nocensor.world/
-legacylinks:
-  - https://www.newpct.me/
-  - https://newpct.nocensor.biz/
-  - https://newpct.nocensor.sbs/
-  - https://www.newpct.net/
-  - http://www1.newpct.net/
-
-caps:
-  categories:
-    peliculas: Movies
-
-  modes:
-    search: [q]
-    movie-search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href$=".torrent"]
-      attribute: href
-    - selector: a[href^="magnet:?"]
-      attribute: href
-
-search:
-  # site returns just 30 results but we don't fetch more pages because site will return page1 if keywords not found, so we could end up with duplicates.
-  # series details page loops http301 so torrents/magnets are not available, so we ignore series and the returned results may thus be less than 30.
-  paths:
-    - path: /
-  inputs:
-    s: "{{ .Keywords }}"
-
-  rows:
-    selector: ul.miniboxs-ficha li:has(a[href*="/peliculas/"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: peliculas
-    _quality:
-      selector: span.estreno
-      filters:
-        - name: replace
-          args: ["---", ""]
-    _language:
-      selector: a.complets-left
-      filters:
-        - name: replace
-          args: ["Latino", "LATiN SPANiSH"]
-        - name: replace
-          args: ["Castellano", "SPANiSH"]
-        - name: replace
-          args: ["Ingles", "English"]
-        - name: replace
-          args: ["Subtitulado", " SPASUBS"]
-        - name: replace
-          args: ["Vose", ""]
-    title:
-      selector: a.nombre
-      attribute: title
-      filters:
-        - name: append
-          args: " {{ .Result._quality }} {{ .Result._language }}"
-    details:
-      selector: a.nombre
-      attribute: href
-    download:
-      selector: a.nombre
-      attribute: href
-    poster:
-      selector: img.lazyload
-      attribute: data-src
-    size:
-      selector: a.complets-right
-      filters:
-        - name: replace
-          args: ["desc.", "0 B"]
-        - name: replace
-          args: ["s", ""]
-    date:
-      text: now
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# Google 1.39.0

src/Jackett.Common/Definitions/newretro.yml

@@ -67,6 +67,34 @@ settings:
   - name: pin
     type: text
     label: Pin
+  - name: onlyupload
+    type: checkbox
+    label: Filter OnlyUpload only
+    default: false
+  - name: info_free
+    type: info
+    label: About OnlyUpload at The New Retro
+    default: <li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeds: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents pro Seite:</b> setting to <b>100</b> on your Control Panel. The default is <i>15</i>.
 
 login:
   path: login.php
@@ -89,12 +117,14 @@ search:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     showsearch: 1
-    orderby: added
-    sort: desc
+    # 0 active, 1 all, 2 dead
     incldead: 1
+    orderby: "{{ .Config.sort }}"
+    sort: "{{ .Config.type }}"
+    # site does not support imdbid searching or display imdb links in results.
 
   rows:
-    selector: table.tableinborder > tbody > tr:has(a[href^="download.php?torrent="])
+    selector: "table.tableinborder > tbody > tr:has(a[href^=\"download.php?torrent=\"]){{ if .Config.onlyupload }}:has(img[src=\"pic/oupic.gif\"]){{ else }}{{ end }}"
     filters:
       - name: andmatch
 
@@ -134,9 +164,10 @@ search:
           args: "02.01.2006 15:04:05 -07:00"
     downloadvolumefactor:
       case:
-        "font[color=\"red\"]:contains(\"Only Upload\")": 0
+        img[src="pic/oupic.gif"]: 0 # only upload is counted
         "*": 1
     uploadvolumefactor:
-      text: 1
-# MR and MST tbd
+      case:
+        img[src="pic/freeleech.gif"]: 0 # nothing is counted
+        "*": 1
 # engine tbd

src/Jackett.Common/Definitions/p2pbg.yml

@@ -80,7 +80,7 @@ settings:
   - name: info_results
     type: info
     label: "Search results"
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+    default: "Only the <b>Base</b> style is supported with this indexer.<br />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

src/Jackett.Common/Definitions/piratbit.yml

@@ -7,12 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://pb.wtf/
-  - http://top.piratbit.fun/
+  - https://top.pirat.one/
 legacylinks:
   - https://piratbit.pw/
   - https://piratbit.ml/
   - http://piratbit.top/
   - https://piratbit.top/
+  - http://top.piratbit.fun/
 
 caps:
   categorymappings:
@@ -653,9 +654,18 @@ settings:
       1: asc
 
 download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
+  infohash:
+    hash:
+      selector: a[href^="magnet:"]
       attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
+    title:
+      selector: "span[style=\"font-family: Georgia;\"]"
+      filters:
+        - name: trim
+        - name: validfilename
 
 search:
   paths:
@@ -693,7 +703,7 @@ search:
     submit: "Поиск"
 
   rows:
-    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"])):not(:has(span[title="неоформлено"]))
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/piratbitl.yml

@@ -7,12 +7,13 @@ type: semi-private
 encoding: UTF-8
 links:
   - https://pb.wtf/
-  - http://top.piratbit.fun/
+  - https://top.pirat.one/
 legacylinks:
   - https://piratbit.pw/
   - https://piratbit.ml/
   - http://piratbit.top/
   - https://piratbit.top/
+  - http://top.piratbit.fun/
 
 caps:
   categorymappings:
@@ -673,13 +674,6 @@ login:
     path: index.php
     selector: li a[href="/login.php?logout=1"]
 
-download:
-  selectors:
-    - selector: a[class="btn btn-sm btn-success"][href^="/dl.php?id="]
-      attribute: href
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
 search:
   paths:
     - path: tracker.php
@@ -716,7 +710,7 @@ search:
     submit: "Поиск"
 
   rows:
-    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"]))
+    selector: tr[id^="tor_"]:not(:has(span[title="закрыто"])):not(:has(span[title="неоформлено"]))
     filters:
       - name: andmatch
 
@@ -767,7 +761,7 @@ search:
       selector: td a.genmed
       attribute: href
     download:
-      selector: td a.genmed
+      selector: td div a.dLink
       attribute: href
     description:
       selector: td:first-child span

src/Jackett.Common/Definitions/pixelados-html.yml

@@ -154,6 +154,9 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    tvdbid:
+      selector: a[href*="thetvdb.com/"]
+      attribute: href
     tmdbid:
       selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
       attribute: href
@@ -218,4 +221,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# html UNIT3D 6.1.0 custom
+# html UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/pixelados.yml

@@ -139,7 +139,7 @@ search:
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -149,6 +149,13 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -184,4 +191,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.1.0 custom
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/polishsource.yml

@@ -122,7 +122,7 @@ search:
         - name: re_replace
           args: ["(?i)(\\.multi\\.)", ".{{ .Config.multilanguage }}."]
         - name: re_replace
-          args: ["(?i)(\\.pl\\.)", ".{{ .Config.multilanguage }}."]
+          args: ["(?i)(\\.pl\\.)", ".POLISH."]
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:

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

@@ -0,0 +1,147 @@
+---
+id: polishtracker-api
+name: PolishTracker (API)
+description: "PolishTracker is a POLISH Private site for 0DAY / MOVIES / GENERAL"
+language: pl-PL
+type: private
+encoding: UTF-8
+links:
+  - https://pte.nu/
+legacylinks:
+  - https://polishtracker.net/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: PC/0day, desc: "0-Day"}
+    - {id: 2, cat: Audio/Video, desc: "Music Video"}
+    - {id: 3, cat: PC/0day, desc: "Apps"}
+    - {id: 4, cat: Console, desc: "Consoles"}
+    - {id: 5, cat: Books, desc: "E-book"}
+    - {id: 6, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 7, cat: Movies/SD, desc: "Movies SD"}
+    - {id: 8, cat: Audio, desc: "Music"}
+    - {id: 9, cat: Movies/UHD, desc: "Movies UHD"}
+    - {id: 10, cat: PC/Games, desc: "PC Games"}
+    - {id: 11, cat: TV/HD, desc: "TV HD"}
+    - {id: 12, cat: TV/SD, desc: "TV SD"}
+    - {id: 13, cat: XXX, desc: "XXX"}
+    - {id: 14, cat: TV/UHD, desc: "TV-UHD"}
+    - {id: 15, cat: Audio/Audiobook, desc: "Audiobook"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find your API Key by accessing your <a href=\"https://pte.nu/\" target =_blank>PolishTracker</a> account <i>Settings</i> page and clicking on the <b>API</b> section."
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: POLISH
+    options:
+      POLISH: POLISH
+      MULTI.POLISH: MULTI.POLISH
+
+#login:
+#  path: "https://api-test.pte.nu/api/v1/torrents"
+#  method: get
+#  inputs:
+#    tpage: 1
+#  error:
+#    - selector: ":root:contains(\"ACCESS_DENIED\")"
+#      message:
+#        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # docs: https://cdn.pte.nu/docs/index.html
+    - path: "https://api-test.pte.nu/api/v1/torrents"
+      response:
+        type: json
+
+  inputs:
+    search: "{{ .Keywords }}"
+    tpage: 1
+    imdb_id: "{{ .Query.IMDBIDShort }}"
+    # search in nfo text also - broken
+    # nfo: false
+    # search is more broad - broken
+    # wide: false
+    $raw: "{{ range .Categories }}&cat[]={{.}}{{end}}"
+    # can search by genre but need range support. &tags[]=Action&tags[]=Comedy for Action and Comedy
+
+  headers:
+    API-Key: ["{{ .Config.apikey }}"]
+
+  rows:
+    selector: torrents
+    filters:
+      - name: andmatch
+    count:
+      selector: count
+
+  fields:
+    _id:
+      selector: id
+    category:
+      selector: category
+    _language:
+      selector: language
+    title_phase1:
+      selector: name
+    title_multilang:
+      selector: name
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\.multi\\.)", ".{{ .Config.multilanguage }}."]
+        - name: re_replace
+          args: ["(?i)(\\.pl\\.)", ".POLISH."]
+    title:
+      text: "{{ if eq .Result._language \"pl\" }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    details:
+      text: "{{ .Config.sitelink }}torrents/{{ .Result._id }}"
+    download:
+      text: "https://api.pte.nu/torrents/download/{{ .Result._id }}"
+    imdbid:
+      selector: imdb_id
+    genre:
+      selector: tags
+      filters:
+        - name: validate
+          args: "Animation, Comedy, Family, Strategy, Action, Adventure, Indie, RPG, Simulation, Early, Crime, Thriller, Drama, Rock, Fantasy, Sci-Fi, Horror, Pop, War, Mystery, Oldies, Hardcore, Sport, Biography, Music, Rap, Romance, Dance, Hip-Hop, House, Punk Rock, Disco, Casual, Bass, History, Racing, Metal, Electronic, Alternative, Funk, Short, Classical, Acoustic, Soundtrack, Punk, Ambient, Talk-Show, Sports, Reggae, Documentary, Progressive Rock, Other, Western, Dance Hall, Trance, Folk, Classic Rock, Jazz, Hard Rock, Trip-Hop, R&B, Blues, Musical, Club, Techno, Cabaret, Black Metal, Easy Listening, Goa, Free, Massively, Reality-TV, Grunge, SynthPop, Ballad, Top 40, News, Industrial, Psychedelic Rock, Heavy Metal, Beat, Alternative Rock, Drum & Bass, Film-Noir, Rock & Roll, Death Metal, Lo-Fi, Country, Instrumental Pop, Game-Show, Soul, Retro, Noise, Latin, Design, Education, Software, Utilities, Pop-Folk, Instrumental, Game, Acid Jazz, Acid, Gothic Rock, Fusion, Darkwave, Meditative, Crossover, Thrash Metal, New Wave, Opera, Ethnic, Instrumental Rock, New Age, Gangsta, Speech, Gothic, Gospel, Symphonic Rock, Ska, JPop, Avantgarde, Tango, Vocal, Folk-Rock, Celtic"
+    description:
+      text: "{{ .Result.genre }}"
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: completed
+    date:
+      # 2022-08-09T17:37:03.23587+02:00
+      selector: added
+    size:
+      selector: size
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 day (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json api

src/Jackett.Common/Definitions/pornotorrent.yml

@@ -5,6 +5,7 @@ description: "PornoTorrent is a SPANISH Public Torrent Tracker for 3X"
 language: en-US
 type: public
 encoding: UTF-8
+testlinktorrent: false
 links:
   - https://www.pornotorrent.eu/
 
@@ -19,8 +20,11 @@ settings: []
 
 download:
   selectors:
-    - selector: a[href^="magnet:?xt="]
+    - selector: a.button_link
       attribute: href
+      filters:
+        - name: replace
+          args: ["////", "//"]
 
 search:
   paths:

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

@@ -0,0 +1,169 @@
+---
+id: portugas-api
+name: Portugas (API)
+description: "Portugas is a Private Portoguese Tracker"
+language: pt-PT
+type: private
+encoding: UTF-8
+links:
+  - https://portugas.org/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Filmes"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Audio, desc: "Músicas"}
+    - {id: 4, cat: PC/Games, desc: "Jogos"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 7, cat: XXX, desc: "XXX"}
+    - {id: 9, cat: Books, desc: "E-Books"}
+    - {id: 10, cat: Movies, desc: "Animação Filmes"}
+    - {id: 11, cat: TV/Anime, desc: "Animação TV"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://portugas.org/\" target =_blank>Portugas</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: /api/torrents
+  method: get
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+  error:
+    - selector: a[href*="/login"]
+      message:
+        text: "The API key was not accepted by {{ .Config.sitelink }}."
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter"
+      response:
+        type: json
+
+  inputs:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ 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 }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
+  rows:
+    selector: data
+    attribute: attributes
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category_id
+    _audiopt:
+      selector: audio_pt
+    title:
+      selector: name
+      filters:
+        - name: append
+          args: "{{ if eq .Result._audiopt \"1\" }} Portuguese PT-PT{{ else }}{{ end }}"
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    infohash:
+      selector: info_hash
+    poster:
+      selector: meta.poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+        - name: re_replace
+          args: ["(?i)(Cinema TV)", "Cinema_TV"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0%, 25%, 50%, 75%, 100%
+      selector: freeleech
+      case:
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+    minimumratio:
+      text: 1.1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# json UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/portugas.yml

@@ -1,193 +0,0 @@
----
-id: portugas
-name: Portugas
-description: "Portugas is a Private Portuguese Tracker"
-language: pt-PT
-type: private
-encoding: UTF-8
-links:
-  - https://portugas.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Músicas"}
-    - {id: 4, cat: PC/Games, desc: "Jogos"}
-    - {id: 5, cat: PC/0day, desc: "Appz"}
-    - {id: 7, cat: XXX, desc: "XXX"}
-    - {id: 9, cat: Books, desc: "E-Books"}
-    - {id: 10, cat: Movies, desc: "Animação Filmes"}
-    - {id: 11, cat: TV/Anime, desc: "Animação TV"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-    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: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-#    test:
-#      path: /
-#      selector: a[href$="/logout"]
-
-search:
-  paths:
-    - path: torrents/filter
-  inputs:
-    $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    keywords: ""
-    uploader: ""
-    imdb: "{{ .Query.IMDBIDShort }}"
-    tvdb: "{{ .Query.TVDBID }}"
-    tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    start_year: ""
-    end_year: ""
-    sorting: "{{ .Config.sort }}"
-    direction: "{{ .Config.type }}"
-    qty: 100
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    # genre has been disabled by admin
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/(\\d+)"
-    title:
-      selector: a.text-bright
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.text-bright
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
-    size:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    grabs:
-      selector: td:nth-last-child(1)
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From PARA Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-    minimumratio:
-      text: 1.1
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 4.0.0

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

@@ -1,71 +0,0 @@
----
-id: ps4-torrent
-name: PS4-Torrent
-description: "PS4-Torrent is a Public Russian site for PS4 Games"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - https://ps4-torrent.ru/
-legacylinks:
-  - http://ps4-torrent.ru/ # site forces https
-
-caps:
-  categories:
-    Console/PS4: Console/PS4
-
-  modes:
-    search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a.down-game
-      attribute: href
-
-search:
-  paths:
-    # http://ps4-torrent.ru/search/?q=%&t=0
-    - path: search/
-  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
-    t: 0
-
-  rows:
-    selector: table.eBlock
-
-  fields:
-    category:
-      text: Console/PS4
-    title:
-      selector: div.eTitle a
-    details:
-      selector: div.eTitle a
-      attribute: href
-    download:
-      selector: div.eTitle a
-      attribute: href
-    description:
-      selector: div.eDetails
-    date:
-      selector: div.eDetails
-      remove: a, span
-      filters:
-        - name: replace
-          args: ["- ", ""]
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      text: "512 MB"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine uCoz

src/Jackett.Common/Definitions/pterclub.yml

@@ -124,7 +124,7 @@ search:
       selector: a[href^="details.php?id="]
     title_optional:
       optional: true
-      selector: a[title][href^="details.php?id="]
+      selector: a[title][href^="details.php?id="],a[title][href^="detailsgame.php?id="]
       attribute: title
     title:
       text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
@@ -192,7 +192,7 @@ search:
         "*": 1
     description:
       selector: td:has(table.torrentname)
-      remove: a, img
+      remove: a, b, font, img
     minimumratio:
       text: 0.9
 # NexusPHP custom v2019.12

src/Jackett.Common/Definitions/ptsbao.yml

@@ -121,7 +121,7 @@ search:
           args: ["pic/imdb_pic/nophoto.gif", ""]
     date_elapsed:
       # time type: time elapsed (default)
-      selector: td:nth-child(6) > span[title]
+      selector: td.rowfollow:nth-child(5) > span[title]
       attribute: title
       optional: true
       filters:
@@ -131,7 +131,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(6):not(:has(span))
+      selector: td.rowfollow:nth-child(5):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -141,13 +141,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:nth-child(7)
+      selector: td.rowfollow:nth-child(6)
     seeders:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(7)
     leechers:
-      selector: td:nth-child(9)
+      selector: td.rowfollow:nth-child(8)
     grabs:
-      selector: td:nth-child(10)
+      selector: td.rowfollow:nth-child(9)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -162,4 +162,4 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-# NexusPHP custom
+# NexusPHP custom 22082802

src/Jackett.Common/Definitions/pttime.yml

@@ -25,14 +25,22 @@ caps:
     - {id: 430, cat: TV/Anime, desc: "Animate(3D动画、2.5次元)"}
     - {id: 431, cat: TV/Anime, desc: "ACGN(二次元)"}
     - {id: 432, cat: TV/Other, desc: "Baby(婴幼、早教、小学及相关)"}
+    - {id: 440, cat: XXX, desc: "9kg-AV(步兵/无码)"}
+    - {id: 441, cat: XXX, desc: "9kg-Sex(骑兵/有码)"}
+    - {id: 442, cat: XXX, desc: "9kg-III(三级片、限制级电影)"}
+    - {id: 443, cat: XXX, desc: "9kg-H动漫"}
+    - {id: 444, cat: XXX, desc: "9kg-H游戏"}
+    - {id: 445, cat: XXX, desc: "9kg-H书籍(书籍、有声书)"}
+    - {id: 446, cat: XXX, desc: "9kg-H写真(图片、私拍、短视频）"}
+    - {id: 447, cat: XXX, desc: "9kg-H音频(ASMR、音乐、音频)"}
     - {id: 450, cat: Other, desc: "Resource(资源、素材、模板)"}
     - {id: 451, cat: PC, desc: "Software(软件、系统、 程序、APP等)"}
     - {id: 490, cat: Other, desc: "Other(其它)"}
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
     book-search: [q]
 
@@ -71,20 +79,23 @@ login:
 search:
   paths:
     - path: torrents.php
+      categories: ["!", 440, 441, 442, 443, 444, 445, 446, 447]
+    - path: adults.php
+      categories: [440, 441, 442, 443, 444, 445, 446, 447]
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ 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 (searching imdburl does not work with tt1234567, but descr is good)
-    search_area: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 2 smalldesc, 3 uploader, 4 imdburl, 5 doubanurl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}5{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
 
   rows:
-    selector: table.torrents > tbody > tr:has(table.torrentname)
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
 
   fields:
     category:
@@ -113,6 +124,9 @@ search:
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(5) > span[title]

src/Jackett.Common/Definitions/puurhollands.yml

@@ -23,13 +23,16 @@ caps:
     music-search: [q, artist]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: flaresolverr
     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>"
+    label: FlareSolverr
+    default: This site may use DDoS-Guard Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
   - name: thankyou
     type: text
     label: Thank You Comment
@@ -39,9 +42,15 @@ settings:
     default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: "/"
+  error:
+    - selector: td.embedded:contains("fout")
   test:
     path: index.php
     selector: a[href="logout.php"]

src/Jackett.Common/Definitions/pwtorrents.yml

@@ -12,11 +12,16 @@ legacylinks:
 
 caps:
   categorymappings:
+    - {id: 26, cat: TV/Sport, desc: "AEW Dark"}
+    - {id: 21, cat: TV/Sport, desc: "AEW Dynamite"}
+    - {id: 20, cat: TV/Sport, desc: "AEW PPV"}
+    - {id: 23, cat: TV/Sport, desc: "AEW Rampage"}
     - {id: 1, cat: TV/Sport, desc: "Boxing"}
     - {id: 2, cat: TV/Sport, desc: "Documentaries"}
     - {id: 3, cat: TV/Sport, desc: "DVD"}
     - {id: 4, cat: TV/Sport, desc: "ECW"}
-    - {id: 5, cat: TV/Sport, desc: "Games and Software"}
+    - {id: 13, cat: TV/Sport, desc: "Impact PPV"}
+    - {id: 14, cat: TV/Sport, desc: "Impact Weekly"}
     - {id: 6, cat: TV/Sport, desc: "Indy's"}
     - {id: 7, cat: TV/Sport, desc: "Matches"}
     - {id: 8, cat: TV/Sport, desc: "Misc."}
@@ -24,14 +29,13 @@ caps:
     - {id: 11, cat: TV/Sport, desc: "Puro"}
     - {id: 10, cat: TV/Sport, desc: "PWT Packs"}
     - {id: 12, cat: TV/Sport, desc: "Ring Of Honor"}
-    - {id: 13, cat: TV/Sport, desc: "TNA PPV's"}
-    - {id: 14, cat: TV/Sport, desc: "TNA Weekly"}
     - {id: 15, cat: TV/Sport, desc: "WCW"}
     - {id: 18, cat: TV/Sport, desc: "WWE Network"}
-    - {id: 16, cat: TV/Sport, desc: "WWE PPV's"}
+    - {id: 16, cat: TV/Sport, desc: "WWE PPV"}
+    - {id: 24, cat: TV/Sport, desc: "WWE RAW"}
+    - {id: 25, cat: TV/Sport, desc: "WWE Smackdown"}
     - {id: 17, cat: TV/Sport, desc: "WWE Weekly"}
-    - {id: 19, cat: TV/Sport, desc: "AEW Weekly"}
-    - {id: 20, cat: TV/Sport, desc: "AEW PPV's"}
+    - {id: 27, cat: TV/Sport, desc: "WWE NXT"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/rapidzona.yml

@@ -75,7 +75,6 @@ settings:
       desc: desc
       asc: asc
 
-
 download:
   selectors:
     - selector: a[href*="/download.php?id="]

src/Jackett.Common/Definitions/rudub.yml

@@ -7,6 +7,7 @@ type: semi-private
 encoding: windows-1251
 links:
   - http://rudub.tv/ # https is unsupported ERR_CONNECTION_REFUSED
+  - http://rudub.co/ # https is unsupported ERR_CONNECTION_REFUSED
 legacylinks:
   - http://baibako.tv/
   - https://baibako.tv/