mteamtp: fix titles #7824

these sites do not find imdbid if using the imdburl option.
but they do work if looking in the description.

README.md

@@ -19,7 +19,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
 
 #### Supported Systems
 * Windows 7SP1 or greater
-* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/2.1/2.1-supported-os.md#linux)
+* Linux [supported operating systems here](https://github.com/dotnet/core/blob/master/release-notes/3.1/3.1-supported-os.md#linux)
 * macOS 10.13 or greater
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
@@ -106,7 +106,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Rus-media
  * RuTor
  * RuTracker.RU
- * Seedpeer
  * shokweb
  * ShowRSS
  * SkyTorrentsClone
@@ -114,7 +113,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * sosulki
  * sukebei-Pantsu
  * sukebei.Nyaa.si
- * TFile
  * The Pirate Bay (TPB)
  * Tokyo Tosho
  * TopNow
@@ -152,6 +150,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * AlexFilm
  * AniDUB
  * ArenaBG
+ * BaibaKo
  * BookTracker
  * CasStudioTV
  * Crazy's Corner
@@ -220,7 +219,6 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Audiobook Torrents (ABT)
  * Avistaz (AsiaTorrents)
  * Awesome-HD (AHD)
- * BaibaKo
  * BIGTorrent
  * BIT-HDTV
  * BJ-Share (BJ)
@@ -337,6 +335,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * HacheDe
  * Hebits
  * Hon3y HD
+ * Horror Site
  * HuSh
  * ICE Torrent
  * IPTorrents (IPT)

azure-pipelines.yml

@@ -9,11 +9,15 @@ variables:
   netCoreSdkVersion: 3.1.x
   system.debug: true
 
-pr:
-  autoCancel: true
-  
 trigger:
-  batch: true
+  branches:
+    include:
+    - '*'
+
+pr:
+  branches:
+    include:
+    - '*'
 
 stages:
   - stage: BuildJackett
@@ -250,13 +254,64 @@ stages:
         inputs:
           pathtoPublish: '$(Build.ArtifactStagingDirectory)'
 
-      - task: DotNetCoreCLI@2
-        displayName: Unit Tests (Windows only)
-        condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+
+  - stage: UnitTestJackett
+    displayName: Unit Tests
+    jobs:
+    - job: UnitTest
+      workspace:
+        clean: all
+      strategy:
+        matrix:
+          Mono:
+            buildDescription: Mono
+            imageName: ubuntu-latest
+            framework: net461
+            runtime: linux-x64
+          Windows:
+            buildDescription: Windows
+            imageName: windows-latest
+            framework: $(netCoreFramework)
+            runtime: win-x86
+          macOS:
+            buildDescription: macOS
+            imageName: macOS-latest
+            framework: $(netCoreFramework)
+            runtime: osx-x64
+          LinuxAmdx64:
+            buildDescription: Linux AMD x64
+            imageName: ubuntu-latest
+            framework: $(netCoreFramework)
+            runtime: linux-x64
+          LinuxARM32:
+            buildDescription: Linux ARM32
+            imageName: ubuntu-latest
+            framework: $(netCoreFramework)
+            runtime: linux-arm
+          LinuxARM64:
+            buildDescription: Linux ARM64
+            imageName: ubuntu-latest
+            framework: $(netCoreFramework)
+            runtime: linux-arm64
+      pool:
+        vmImage: $(imageName)
+      displayName: ${{ variables.buildDescription }}
+      steps:
+      - checkout: self
+
+      - task: UseDotNet@2
+        displayName: Install .NET Core SDK
         inputs:
-          command: test
+          packageType: sdk
+          version: $(netCoreSdkVersion)
+          installationPath: $(Agent.ToolsDirectory)/dotnet
+
+      - task: DotNetCoreCLI@2
+        displayName: Build Test Project
+        inputs:
+          command: build
           projects: '**/*.Test*/*.csproj'
-          arguments: '--configuration $(buildConfiguration) --framework $(framework)'
+          arguments: '--configuration $(buildConfiguration) --runtime $(runtime) --framework $(framework)'
 
       - task: DotNetCoreCLI@2
         displayName: Unit Tests (Mono, Linux and macOS)
@@ -265,7 +320,39 @@ stages:
           command: test
           projects: '**/*.Test*/*.csproj'
           arguments: '--configuration $(buildConfiguration) --framework $(framework) --runtime $(runtime)'
+          testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'
 
+      - task: DotNetCoreCLI@2
+        displayName: Unit Tests & Code Coverage (Windows only)
+        condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+        inputs:
+          command: test
+          projects: '**/*.Test*/*.csproj'
+          arguments: '--configuration $(buildConfiguration) --framework $(framework) /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
+          testRunTitle: 'Unit - $(buildDescription) - $(Build.BuildId)'
+
+      - task: DotNetCoreCLI@2
+        displayName: Install Coverage ReportGenerator Tool (Windows only)
+        condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+        inputs:
+          command: custom
+          custom: tool
+          arguments: install --tool-path . dotnet-reportgenerator-globaltool
+
+      - task: PowerShell@2
+        displayName: Generate Coverage Report (Windows only)
+        condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+        inputs:
+          targetType: inline
+          script: ./reportgenerator -reports:$(Build.SourcesDirectory)/src/*.Test*/coverage.*.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"
+
+      - task: PublishCodeCoverageResults@1
+        displayName: Publish Code Coverage (Windows only)
+        condition: and(succeeded(), startsWith(variables['runtime'], 'win'))
+        inputs:
+          codeCoverageTool: Cobertura
+          summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml
+        
 
   - stage: Integration
     displayName: Integration Tests
@@ -284,11 +371,10 @@ stages:
             buildDescription: Windows
             imageName: windows-latest
             artifactName: Jackett.Binaries.Windows.zip
-          # Enable once ChromeDriver is deployed to macOS image https://github.com/actions/virtual-environments/issues/7
-          # macOS:
-          #   buildDescription: macOS
-          #   imageName: macOS-latest
-          #   artifactName: Jackett.Binaries.macOS.tar.gz
+          macOS:
+            buildDescription: macOS
+            imageName: macOS-latest
+            artifactName: Jackett.Binaries.macOS.tar.gz
           LinuxAmdx64:
             buildDescription: Linux AMD x64
             imageName: ubuntu-latest
@@ -325,7 +411,7 @@ stages:
             cd Jackett
             if [[ "$(artifactName)" == *"Mono"* ]]; then mono --version; fi
             if [[ "$(artifactName)" == *"Mono"* ]]; then sudo ./install_service_systemd_mono.sh; fi
-            if [[ "$(artifactName)" == *"macOS"* ]]; then sudo ./install_service_macos; fi
+            if [[ "$(artifactName)" == *"macOS"* ]]; then ./install_service_macos; fi
             if [[ "$(artifactName)" == *"LinuxAMDx64"* ]]; then sudo ./install_service_systemd.sh; fi
 
       - task: UseDotNet@2
@@ -340,11 +426,14 @@ stages:
         inputs:
           command: test
           projects: '**/*IntegrationTest*/*.csproj'
+          testRunTitle: 'Integration - $(buildDescription) - $(Build.BuildId)'
 
 
   - stage: PublishGithub
     displayName: Publish to Github
-    dependsOn: Integration
+    dependsOn:
+      - UnitTestJackett
+      - Integration
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     jobs:
     - job: Publish

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

@@ -5,6 +5,7 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://1337x.to/
     - https://1337x.gd/
@@ -13,6 +14,15 @@
     - https://x1337x.ws/
     - https://x1337x.eu/
     - https://x1337x.se/
+    - https://1337x.unblockit.pro/
+    - https://1337.root.yt/
+    - https://1337x.unblockninja.com/
+    - https://1337x.black-mirror.xyz/
+    - https://1337x.unblocked.casa/
+    - https://1337x.proxyportal.fun/
+    - https://1337x.uk-unblock.xyz/
+    - https://1337x.ind-unblock.xyz/
+  legacylinks:
     - https://1337x.unblocked.earth/
 
   caps:
@@ -44,12 +54,12 @@
       - {id: 3, cat: Movies, desc: "Movies/SVCD/VCD"}
       - {id: 4, cat: Movies/Foreign, desc: "Movies/Dubs/Dual Audio"}
       - {id: 42, cat: Movies/HD, desc: "Movies/HD"}
-      - {id: 54, cat: Movies, desc: "Movies/h.264/x264"}
+      - {id: 54, cat: Movies/HD, desc: "Movies/h.264/x264"}
       - {id: 55, cat: Movies, desc: "Movies/Mp4"}
       - {id: 66, cat: Movies/3D, desc: "Movies/3D"}
-      - {id: 70, cat: Movies, desc: "Movies/HEVC/x265"}
+      - {id: 70, cat: Movies/HD, desc: "Movies/HEVC/x265"}
       - {id: 73, cat: Movies, desc: "Movies/Bollywood"}
-      - {id: 76, cat: Movies, desc: "Movies/UHD"}
+      - {id: 76, cat: Movies/UHD, desc: "Movies/UHD"}
 
       #TV
       - {id: 5, cat: TV, desc: "TV/DVD"}
@@ -138,7 +148,7 @@
         "asc": "asc"
 
   download:
-    # the .torrent url is on the on the details page 
+    # the .torrent url is on the on the details page
     selector: ul li a[href^="{{ .Config.downloadlink }}"]
     attribute: href
 
@@ -148,7 +158,7 @@
       - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Movies{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/1/"
       - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/TV{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}2{{else}}1{{end}}/"
       - path: "{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}sort-search{{else}}cat/Music{{end}}{{if or (.Query.Album) (.Query.Artist) }}/{{ or (.Query.Album) (.Query.Artist) }}{{else}}/{{ .Keywords }}{{end}}{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}/{{else}}{{end}}{{ .Config.sort }}/{{ .Config.type }}/{{if or (.Query.Album) (.Query.Artist) (.Keywords) }}3{{else}}1{{end}}/"
-    keywordsfilters: 
+    keywordsfilters:
       - name: replace # use this as a workaround till #893 is implemented
         args: ["Greys Anatomy", "Grey's Anatomy"]
 

src/Jackett.Common/Definitions/4thd.yml

@@ -92,7 +92,7 @@
       tags_type: 0
 
     rows:
-      selector: table#torrent_table > tbody > tr.torrent
+      selector: table#torrent_table > tbody > tr.torrent:has(a[href^="torrents.php?action=download&id="])
 
     fields:
       category:

src/Jackett.Common/Definitions/7torrents.yml

@@ -35,7 +35,7 @@
     paths:
       - path: search
     inputs:
-      query: "{{ if .Keywords }}{{ .Keywords }}{{else}}2020{{end}}"
+      query: "{{ if .Keywords }}{{ .Keywords }}{{else}} {{end}}"
       sort: "{{ .Config.sort }}"
 
     rows:

src/Jackett.Common/Definitions/alexfilm.yml

@@ -152,6 +152,5 @@
           img[src="./styles/images/tor_silver.gif"]: 0.5
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # engine n/a

src/Jackett.Common/Definitions/arabafenice.yml

@@ -14,7 +14,7 @@
     categorymappings:
       # HRS
       - {id: 34, cat: Movies/HD, desc: "1080p HRS x264"}
-      - {id: 47, cat: Movies/HD, desc: "2160p 4k UltraHD HRS"}
+      - {id: 47, cat: Movies/UHD, desc: "2160p 4k UltraHD HRS"}
       - {id: 35, cat: TV, desc: "Serie TV HRS"}
       - {id: 36, cat: Movies/SD, desc: "DVDRip HRS"}
       - {id: 41, cat: Movies/SD, desc: "BDRip 576p HRS"}
@@ -38,7 +38,7 @@
       - {id: 42, cat: TV, desc: "Serie Tv Sub Ita"}
       - {id: 15, cat: TV/Documentary, desc: "documentaries"}
       - {id: 33, cat: TV, desc: "mp4"}
-      - {id: 40, cat: TV/HD, desc: "2160p 4K UltraHD"}
+      - {id: 40, cat: TV/UHD, desc: "2160p 4K UltraHD"}
       - {id: 38, cat: XXX, desc: "xXx"}
       - {id: 43, cat: Other, desc: "Arabic for social"}
 

src/Jackett.Common/Definitions/baibako.yml

@@ -1,9 +1,9 @@
 ---
   site: baibako
   name: BaibaKo
-  description: "BaibaKo is a RUSSIAN Private Torrent Tracker for TV"
+  description: "BaibaKo is a RUSSIAN Semi-Private Torrent Tracker for TV"
   language: ru-ru
-  type: private
+  type: semi-private
   encoding: windows-1251
   links:
     - http://baibako.tv/ # site does not support https NET::ERR_CERT_AUTHORITY_INVALID

src/Jackett.Common/Definitions/beitai.yml

@@ -71,8 +71,8 @@
       incldead: 0
       # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
       spstate: 0
-      # 0 title 1 descr 3 uploaded 4 imdburl
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 title 1 descr 3 uploaded 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
+      search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
       # 0 AND 1 OR 2 exact
       search_mode: 0
       sort: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -88,7 +88,7 @@
 
   search:
     # https://bigfangroup.org/browse.php?search=black+lightning&cat=0&incldead=0&year=0&format=0
-    # 
+    #
     paths:
       - path: browse.php
     inputs:
@@ -184,10 +184,7 @@
           - name: dateparse
             args: "2 January 2006 15:04:05"
       downloadvolumefactor:
-        case:
-          img[src="pic/freedownload.gif"]: 0
-          img[src="pic/silverdown.gif"]: 0
-          "*": 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # engine n/a

src/Jackett.Common/Definitions/bithorlo.yml

@@ -56,13 +56,17 @@
       movie-search: [q]
 
   settings:
+    - name: info_alert
+      type: info
+      label: Alert about Cookie
+      default: "If during your cookie save you get the following error:</br><b>The 'Value'='xzlogin,xzrecover,xzsignup' part of the cookie is invalid.</b></br>Then remove <b>acopendivids=xzlogin,xzrecover,xzsignup; </b> from the cookie string before proceeding to save."
     - name: cookie
       type: text
       label: Cookie
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/bittorrentam.yml

@@ -6,6 +6,8 @@
   type: public
   encoding: UTF-8
   links:
+    - https://www.bittorrent.am/
+  legacylinks:
     - http://www.bittorrent.am/
 
   caps:

src/Jackett.Common/Definitions/blutopia.yml

@@ -28,7 +28,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/brobits.yml

@@ -26,7 +26,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/btdb.yml

@@ -5,12 +5,19 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
-    -  https://btdb.io/
+    - https://btdb.io/
+    - https://btdb.unblockit.pro/
+    - https://btdb.black-mirror.xyz/
+    - https://btdb.unblocked.casa/
+    - https://btdb.proxyportal.fun/
+    - https://btdb.uk-unblock.xyz/
+    - https://btdb.ind-unblock.xyz/
   legacylinks:
-    -  https://btdb.to/
-    -  https://btdb.unblocked.app/
-    -  https://btdb.eu/
+    - https://btdb.to/
+    - https://btdb.unblocked.app/
+    - https://btdb.eu/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/btnext.yml

@@ -24,7 +24,10 @@
       - {id: 16, cat: Movies/SD, desc: "Movies CAM"}
       - {id: 74, cat: Movies/DVD, desc: "Movies DvD-R"}
       - {id: 76, cat: Movies, desc: "Movies Packs"}
-      - {id: 91, cat: Movies/Other, desc: "Movies Kids"}
+      - {id: 115, cat: Movies/Other, desc: "Movies Kids"}
+      - {id: 91, cat: Movies/Other, desc: "Movies Kids Inglês"}
+      - {id: 113, cat: Movies/Other, desc: "Movies Kids PT-BR"}
+      - {id: 114, cat: Movies/Other, desc: "Movies Kids PT-PT"}
       - {id: 77, cat: Movies/WEBDL, desc: "Movies WEB-DL"}
       - {id: 85, cat: Movies/DVD, desc: "Movies Custom-DVDR"}
       - {id: 14, cat: Movies/SD, desc: "Movies DVDRip/XViD"}
@@ -49,13 +52,14 @@
       - {id: 7, cat: Audio, desc: "Music"}
       - {id: 20, cat: Audio/Video, desc: "Music MVideo"}
       - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
-      - {id: 33, cat: Audio/Other, desc: "Music MP4"}
+      - {id: 33, cat: Audio/Video, desc: "Music MP4"}
       - {id: 32, cat: Audio/Lossless, desc: "Music FLAC"}
       - {id: 2, cat: Console, desc: "Games"}
       - {id: 78, cat: PC/Games, desc: "Games Linux"}
       - {id: 79, cat: PC/Mac, desc: "Games MacOSX"}
       - {id: 28, cat: Console/NDS, desc: "Games Nintendo DS"}
       - {id: 27, cat: PC/Games, desc: "Games PC/Windows"}
+      - {id: 111, cat: Console, desc: "Games Nintendo Sw"}
       - {id: 80, cat: Console/PS3, desc: "Games PS2"}
       - {id: 81, cat: Console/PS3, desc: "Games PS3"}
       - {id: 82, cat: Console/PS4, desc: "Games PS4"}
@@ -70,10 +74,10 @@
       - {id: 34, cat: PC/ISO, desc: "Applications Linux"}
       - {id: 44, cat: Other, desc: "Miscellaneous"}
       - {id: 54, cat: Audio/Audiobook, desc: "Books Audiobook"}
-      - {id: 57, cat: Books, desc: "Books E-Books"}
+      - {id: 57, cat: Books/Ebook, desc: "Books E-Books"}
       - {id: 58, cat: Books/Comics, desc: "Books Comics"}
       - {id: 59, cat: Books, desc: "Books Educational"}
-      - {id: 60, cat: Books, desc: "Books Magazines/Journals"}
+      - {id: 60, cat: Books/Magazines, desc: "Books Magazines/Journals"}
       - {id: 61, cat: Other, desc: "Pics/Wallpapers"}
       - {id: 62, cat: PC/Phone-Android, desc: "Android"}
       - {id: 63, cat: PC/Phone-IOS, desc: "iOS"}
@@ -92,9 +96,9 @@
       - {id: 69, cat: XXX/Imageset, desc: "XXX-Pics/Wallpapers"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: username
@@ -122,6 +126,10 @@
       options:
         "desc": "desc"
         "asc": "asc"
+    - name: info_results
+      type: info
+      label: Search results
+      default: "If you get 0 results check the log for error: <b>An error has occured!You can't view this page unless you read all your unread messages</b>, then access the site with your browser and <b>mark as read</b> all PMs."
 
   login:
     path: ?p=home&pid=1
@@ -155,9 +163,9 @@
       p: torrents
       pid: 32
       $raw: "{{ range .Categories }}cid[]={{.}}&{{end}}"
-      keywords: "{{ .Keywords }}"
-      search_type: name
-      searchin: title
+      keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # name , description , both , uploader
+      search_type: "{{ if .Query.IMDBID }}description{{else}}name{{end}}"
       "sortOptions[sortBy]": "{{ .Config.sort }}"
       "sortOptions[sortOrder]": "{{ .Config.type }}"
     error:
@@ -193,28 +201,62 @@
         selector: a[rel="fancybox"]
         optional: true
         attribute: href
+      imdb:
+      # a href="http://tracker.btnext.com/data/torrents/imdb/tt0249677.jpg"
+        optional: true
+        selector: a[href*="/imdb/tt"]
+        attribute: href
+        filters:
+          - name: regexp
+            args: "imdb/(.+?).jpg"
+          - name: prepend
+            args: "https://www.imdb.com/title/"
       downloadvolumefactor:
         case:
           "img[title=\"FREE!\"]": 0
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
       date:
         selector: td.torrent_name > abbr.timeago
         optional: true
         attribute: data-time
       date:
-        selector: td.torrent_name:not(:has(abbr.timeago))
+        selector: td.torrent_name:not(:has(abbr.timeago)):not(:contains("day")):not(:contains("Domingo")):not(:contains("Sábado")):not(:contains("Sexta")):not(:contains("Quinta")):not(:contains("Quarta")):not(:contains("Terça")):not(:contains("Segunda")):not(:contains("ontem")):not(:contains("Hoje"))
         optional: true
         remove: span, a, br
         filters:
           - name: replace
             args: ["Enviado ", ""] # Uploaded
+          - name: replace
+            args: ["Uploaded ", ""]
           - name: replace
             args: [" por", ""] # by
+          - name: replace
+            args: [" by", ""]
           - name: replace
             args: ["às ", ""] # at
+          - name: replace
+            args: ["at ", ""]
+          - name: dateparse
+            args: "02-01-2006 15:04"
+      date:
+        selector: td.torrent_name:not(:has(abbr.timeago)):contains("day"), td.torrent_name:not(:has(abbr.timeago)):contains("Domingo"), td.torrent_name:not(:has(abbr.timeago)):contains("Sábado"), td.torrent_name:not(:has(abbr.timeago)):contains("Quinta"), td.torrent_name:not(:has(abbr.timeago)):contains("Sexta"), td.torrent_name:not(:has(abbr.timeago)):contains("Quarta"), td.torrent_name:not(:has(abbr.timeago)):contains("Terça"), td.torrent_name:not(:has(abbr.timeago)):contains("Segunda"), td.torrent_name:not(:has(abbr.timeago)):contains("ontem"), td.torrent_name:not(:has(abbr.timeago)):contains("Hoje")
+        optional: true
+        remove: span, a, br
+        filters:
+          - name: replace
+            args: ["Enviado ", ""] # Uploaded
+          - name: replace
+            args: ["Uploaded ", ""]
+          - name: replace
+            args: [" por", ""] # by
+          - name: replace
+            args: [" by", ""]
+          - name: replace
+            args: ["às ", ""] # at
+          - name: replace
+            args: ["at ", ""]
           - name: replace
             args: ["Hoje", "Today"]
           - name: replace
@@ -233,6 +275,5 @@
             args: ["Sábado", "Saturday"]
           - name: replace
             args: ["Domingo", "Sunday"]
-          - name: dateparse
-            args: "02-01-2006 15:04"
+          - name: fuzzytime
 # TSUE 2.2

src/Jackett.Common/Definitions/btschool.yml

@@ -34,7 +34,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/carpathians.yml

@@ -38,9 +38,33 @@
       - {id: 110, cat: XXX, desc: "XXX"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "5"
+      options:
+        "5": "created"
+        "8": "seeders"
+        "6": "size"
+        "2": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "desc"
+      options:
+        "desc": "desc"
+        "asc": "asc"
 
   login:
     path: takelogin.php
@@ -55,13 +79,18 @@
     paths:
       - path: browse.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}https://www.imdb.com/title/{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 both 1 only active 2 only dead
       incldead: 0
       onlyname: 1
       onlyname2: true
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
     rows:
       selector: table[id!="torrent_ajanlo"] > tbody > tr[id]
+
     fields:
       download:
         selector: a[href^="download.php/"]
@@ -84,7 +113,7 @@
         selector: a[id][href^="details.php?"]
         attribute: href
       imdb:
-        selector: a[href*="https://www.imdb.com/title/"]
+        selector: a[href*="www.imdb.com/title/tt"]
         optional: true
         attribute: href
       banner:
@@ -99,7 +128,7 @@
         selector: td:nth-child(7)
         filters:
           - name: regexp
-            args: ([\d\.]+)
+            args: (\d+)
       seeders:
         selector: td:nth-child(8)
       leechers:
@@ -123,9 +152,10 @@
             args: ["hete", "week"]
           - name: timeago
       downloadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
       uploadvolumefactor:
         case:
-          img[src="pic/double.png"]: "2"
-          "*": "1"
+          img[src="pic/double.png"]: 2
+          img[src="pic/doubledouble2.png"]: 4
+          "*": 1
+# TBDev & XBTT

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -31,9 +31,9 @@
       - {id: 21, cat: Books, desc: "Book"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: cookie
@@ -42,7 +42,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site
@@ -67,17 +67,19 @@
     test:
       path: index.php
       selector: a[href^="/logout.php"]
-        
+
   search:
     paths:
       - path: browse.php
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       # 0 onlyactive 1 all 4 requests 5 onlydead 6 polish 8 free 10 doubleup 11 premier 13 VOD
       incldead: 1
       # 0 title 1 descr
-      blah: 0
+      blah: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
+      gatunek: 0
+      quality: none
       sort: "{{ .Config.sort }}"
       type: "{{ .Config.type }}"
 
@@ -98,13 +100,17 @@
         attribute: href
       download:
         selector: a[href^="download.php/"]
-        attribute: href    
+        attribute: href
       banner:
         selector: a[href^="details.php?id="]
         attribute: onmouseover
         filters:
           - name: regexp
             args: "src=(.+?) "
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       description:
         optional: true
         selector: img[src="pic/Poland.png"]

src/Jackett.Common/Definitions/cpabien.yml

@@ -59,8 +59,11 @@
 
   search:
     paths:
-    # https://vww.cpasbien-fr.fr/index.php?do=search&subaction=search&story=dickinson%20s01e10
-      - path: "{{ if .Keywords }}index.php?do=search&subaction=search&story={{ .Keywords }}{{else}}{{end}}"
+      - path: "{{ if .Keywords }}index.php?do=search&subaction=search{{else}}{{end}}"
+        method: post
+    inputs:
+      story: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
+    # does not support imdbid search and does not return imdb link in results.
 
     rows:
       selector: div#gauche > table > tbody > tr:has(a)

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -8,6 +8,12 @@
   followredirect: true
   links:
     - https://www1.cpasbiens.cm/
+    - https://cpasbien.to/
+    - https://cpasbiens.black-mirror.xyz/
+    - https://cpasbiens.unblocked.casa/
+    - https://cpasbiens.proxyportal.fun/
+    - https://cpasbiens.uk-unblock.xyz/
+    - https://cpasbiens.ind-unblock.xyz/
   legacylinks:
     - https://www1.cpasbiens.ws/
     - https://www2.cpasbiens.ws/

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -12,20 +12,21 @@
     categorymappings:
       # Documentaire
       - {id: 96, cat: TV/Documentary, desc: "Docus TV"}
+      - {id: 124, cat: TV/Documentary, desc: "Docus Formation Video"}
       # Films
       - {id: 49, cat: Movies/3D, desc: "Films 3D"}
       - {id: 1, cat: XXX, desc: "3X"}
       - {id: 48, cat: XXX, desc: "3X  HD1080p"}
       - {id: 47, cat: XXX, desc: "3X  HD720p"}
       - {id: 50, cat: Movies/UHD, desc: "Films 4K"}
-      - {id: 51, cat: Movies/UHD, desc: "Films 4K UHDTV"}
+      - {id: 51, cat: TV/UHD, desc: "Films 4K UHDTV"}
       - {id: 57, cat: Movies/BluRay, desc: "Films BDRip"}
       - {id: 56, cat: Movies/BluRay, desc: "Films Blu-Ray"}
       - {id: 58, cat: Movies/BluRay, desc: "Films BRRip"}
       - {id: 66, cat: Movies, desc: "Films CamTS"}
       - {id: 59, cat: Movies/DVD, desc: "Films DVDR"}
       - {id: 60, cat: Movies/DVD, desc: "Films DVDRip"}
-      - {id: 98, cat: Movies, desc: "Films Film Animées"}
+      - {id: 98, cat: TV/Anime, desc: "Films Film Animées"}
       - {id: 65, cat: Movies, desc: "Films FSCR"}
       - {id: 52, cat: Movies/HD, desc: "Films HD 720p"}
       - {id: 53, cat: Movies/HD, desc: "Films HD1080p"}
@@ -107,7 +108,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site
@@ -124,7 +125,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-          
+
   login:
     method: cookie
     inputs:
@@ -149,13 +150,17 @@
     # http://crazyspirits.com/torrents-search.php?c101=1&c102=1&c103=1&c104=1&c105=1&c106=1&search=&cat=0&incldead=0&freeleech=0&lang=0
       - path: torrents-search.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead
       incldead: 1
+      # 0 all 1 inclfree 2 onlyfree
       freeleech: 0
+      # 0 all 1 french 2 english etc
       lang: 0
       sort: "{{ .Config.sort }}"
       order: "{{ .Config.type }}"
+      # imdb search not supported and imdb links not in results.
 
     rows:
       selector: table.border_table > tbody > tr.t-row
@@ -192,13 +197,13 @@
         attribute: onmouseover
         filters:
           - name: regexp
-            args: "Taille : </b>(.*?)<br" 
+            args: "Taille : </b>(.*?)<br"
       date:
         selector: a[onmouseover][href^="torrents-details.php?id="]
         attribute: onmouseover
         filters:
           - name: regexp
-            args: " Le : </b>(.*?)<br" 
+            args: " Le : </b>(.*?)<br"
           - name: dateparse
             args: "02-01-2006"
       downloadvolumefactor:
@@ -206,6 +211,5 @@
           img[src="images/Torrents/free.png"]: 0
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # TT3.0

src/Jackett.Common/Definitions/crnaberza.yml

@@ -100,15 +100,17 @@
   search:
     paths:
     # http://www.crnaberza.com/browse.php?c52=1&c20=1&c34=1&incldead=1&search=star+trek
-      - path: browse.php      
+      - path: browse.php
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
-      searchin: title
+      # 0 title 1 descr 2 both
+      blah: 0
       # 0 active 1 incldead 2 onlydead
       incldead: 1
       sort: "{{ .Config.sort }}"
       type: "{{ .Config.type }}"
+      # does not support searching imdbid and does not return imdb links
 
     rows:
       selector: tr:has(td.trowtorrent)

src/Jackett.Common/Definitions/cztorrent.yml

@@ -22,7 +22,7 @@
       - {id: 38, cat: Movies/HD, desc: "HD-LQ"}
       - {id: 3, cat: PC/Games, desc: "Hry"}
       - {id: 2, cat: Audio, desc: "Hudba"}
-      - {id: 34, cat:  Audio/Video, desc: "Hudba DVD/HD"}
+      - {id: 34, cat:  Audio/Video, desc: "Hudební video"}
       - {id: 6, cat: Books, desc: "Knihy"}
       - {id: 13, cat: Console, desc: "Konzole"}
       - {id: 32, cat: Audio, desc: "Mluvené slovo"}
@@ -30,7 +30,6 @@
       - {id: 4, cat: Other, desc: "Ostatní"}
       - {id: 25, cat: TV, desc: "Seriály"}
       - {id: 29, cat: Audio, desc: "Soundtrack"}
-      - {id: 19, cat:  Audio/Video, desc: "Videoklipy"}
       - {id: 24, cat: XXX, desc: "xXx"}
 
     modes:
@@ -74,12 +73,14 @@
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       s: "{{ .Keywords }}"
+      # 0 approved 1 all 2 not approved
       t: 1
       o: "{{ .Config.sort }}"
+      # does not support imdbid search and does not return imdb links
 
     rows:
       selector: tr.torr_hover
-     
+
     keywordsfilters:
       - name: re_replace
         args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
@@ -93,17 +94,17 @@
           - name: diacritics
             args: replace
           - name: replace
-            args: ["1080i", "1080p"] 
+            args: ["1080i", "1080p"]
           - name: replace
-            args: ["720i", "720p"] 
+            args: ["720i", "720p"]
           - name: replace
-            args: ["pLQ", "p"] 
+            args: ["pLQ", "p"]
           - name: replace
-            args: ["pHD", "p"] 
+            args: ["pHD", "p"]
           - name: replace
-            args: ["serie", ""] 
+            args: ["serie", ""]
           - name: replace
-            args: ["Serie", ""] 
+            args: ["Serie", ""]
           - name: re_replace
             args: ["(\\d{2})\\.", "S$1"]
           - name: re_replace
@@ -152,7 +153,7 @@
             args: [ "|", 2 ]
           - name: append
             args: " +02:00"
-          - name: dateparse 
+          - name: dateparse
             args: "2.1.2006 15:04  -07:00"
       seeders:
         selector: td:nth-child(7) span

src/Jackett.Common/Definitions/deildu.yml

@@ -26,9 +26,9 @@
       - {id: 8, cat: TV, desc: "TV shows"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: username
@@ -69,10 +69,14 @@
       - path: browse.php
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # active 1 incldead 2 onlydead
       incldead: 1
+      # 1 = look in description
+      Lysing: "{{ if .Query.IMDBID }}1{{else}}{{end}}"
       sort: "{{ .Config.sort }}"
       type: "{{ .Config.type }}"
+      # does not return imdb links
 
     rows:
       selector: table[class="torrentlist"] > tbody > tr:has(a[href*="details.php?id="])

src/Jackett.Common/Definitions/demonoid.yml

@@ -5,13 +5,21 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.demonoid.is/
+    - https://demonoid.unblockit.pro/
+    - https://dnoid.black-mirror.xyz/
+    - https://dnoid.unblocked.casa/
+    - https://dnoid.proxyportal.fun/
+    - https://dnoid.uk-unblock.xyz/
+    - https://dnoid.ind-unblock.xyz/
   legacylinks:
     - https://www.dnoid.to/
 
   caps:
     categorymappings:
+    # fetch these from https://www.demonoid.is/cached/torrent_categories_script.js?v5
       # Applications
       - {id: 1, cat: PC/Phone-Android, desc: "Applications Android"}
       - {id: 2, cat: PC/Phone-IOS, desc: "Applications Iphone / Ipod touch"}
@@ -129,6 +137,7 @@
       - {id: 108, cat: TV/Anime, desc: "Anime Horror"}
       - {id: 109, cat: TV/Anime, desc: "Anime Other"}
       - {id: 157, cat: TV/Anime, desc: "Anime Romance"}
+      - {id: 158, cat: TV/Anime, desc: "Anime Sci-Fi"}
       # Movies
       - {id: 151, cat: Movies, desc: "Movies Action"}
       - {id: 110, cat: Movies, desc: "Movies Adventure"}
@@ -258,14 +267,21 @@
       - {id: 233, cat: TV, desc: "TV Trailers"}
       - {id: 234, cat: TV, desc: "TV War"}
       - {id: 235, cat: TV, desc: "TV Western"}
-      # cat misc has no subcats
+      # cat 7 misc has no subcats
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
+    - name: cookie
+      type: text
+      label: Cookie
+    - name: info
+      type: info
+      label: How to get the Cookie
+      default: "<ol><li>Access 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site
@@ -282,14 +298,19 @@
         "desc": "desc"
         "asc": "asc"
 
+  login:
+    method: cookie
+    test:
+      path: files/
+
   download:
     selector: a[href^="magnet:?xt="]
     attribute: href
 
   search:
     paths:
-      # https://www.demonoid.is/files/?c154&language=0&quality=0&seeded=2&query=world&to=on&sort=
-      # https://www.demonoid.is/files/?seeded=2&language=0&quality=0&to=on&query=world
+      # https://www.demonoid.is/files/?c154&language=0&quality=0&seeded=2&query=world&to=1&sort=
+      # https://www.demonoid.is/files/?seeded=2&language=0&quality=0&to=1&query=world
       - path: files/
     inputs:
       $raw: "{{ range .Categories }}c{{.}}&{{end}}"
@@ -300,10 +321,11 @@
       # 0 all
       quality: 0
       # search in titles only
-      to: on
-      query: "{{ .Keywords }}"
+      to: "{{ if .Query.IMDBID }}{{else}}1{{end}}"
+      query: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       sort: "{{ .Config.sort }}"
       order: "{{ .Config.type }}"
+      # does not return imdb link in results
 
     rows:
       selector: table.font_12px tr:has(td[class^="tone_1"])
@@ -324,7 +346,7 @@
         optional: true
         attribute: title
       category:
-        selector:  a[href*="&subcategory="]
+        selector:  span > a[href*="&subcategory="]
         attribute: href
         optional: true
         filters:

src/Jackett.Common/Definitions/divteam.yml

@@ -12,7 +12,7 @@
     categorymappings:
       - {id: 60, cat: Movies/HD, desc: "MicroHD 720p"}
       - {id: 77, cat: Movies/HD, desc: "MicroHD 1080p"}
-      - {id: 78, cat: Movies/HD, desc: "MicroHD 4k"}
+      - {id: 78, cat: Movies/HD, desc: "MicroHD 4K"}
       - {id: 64, cat: TV/HD, desc: "Pack Series"}
       - {id: 65, cat: TV/HD, desc: "Pack Series VOSE"}
       - {id: 80, cat: Movies/BluRay, desc: "BDRip X265 1080p"}
@@ -43,13 +43,13 @@
       - {id: 48, cat: Movies/BluRay, desc: "BR-Rip/HD-Rip"}
       - {id: 17, cat: Movies/BluRay, desc: "BD-Rip"}
       - {id: 5, cat: TV/Anime, desc: "Anime"}
-      - {id: 34, cat: PC/Games, desc: "Juegos Pc"}
-      - {id: 7, cat: PC/0day, desc: "Software Pc"}
+      - {id: 34, cat: PC/Games, desc: "Juegos PC"}
+      - {id: 7, cat: PC/0day, desc: "Software PC"}
       - {id: 35, cat: Console, desc: "Juegos Sony"}
       - {id: 36, cat: PC/Games, desc: "Juegos Microsoft"}
       - {id: 37, cat: Console/NDS, desc: "Juegos Nintendo"}
       - {id: 45, cat: Audio/MP3, desc: "Music MP3"}
-      - {id: 44, cat: Audio/Lossless, desc: "Music flac"}
+      - {id: 44, cat: Audio/Lossless, desc: "Music FLAC"}
 
     modes:
       search: [q]
@@ -63,7 +63,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site
@@ -84,7 +84,7 @@
       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:
     method: cookie
     inputs:
@@ -99,11 +99,14 @@
     inputs:
       page: "torrents"
       category: "{{ range .Categories }}{{.}};{{end}}"
-      search: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 all 1 activeonly 2 deadonly
       active: 0
+      # 0 title 1 title&desc 2 descr 3 uploaders 5 gold 6 silver 9 2x 10 3x 11 4x
       options: 0
       order: "{{ .Config.sort }}"
       by: "{{ .Config.type }}"
+      # does not support imdbid search and does not supply imdb link in results.
 
     rows:
       selector: table.table.table-bordered > tbody > tr:has(a[href^="download.php?id="])

src/Jackett.Common/Definitions/documentarytorrents.yml

@@ -74,7 +74,8 @@
 
     modes:
       search: [q]
-      tv-search: [q, season, ep]
+      tv-search: [q]
+      movie-search: [q]
 
   settings:
     - name: username
@@ -125,11 +126,15 @@
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
       cat: 0
+      # 0 active 1 incldead 2 onlydead
       incldead: 1
+      # 0 all 1 notfree 2 onlyfree
       freeleech: 0
+      # 0 all 1 english 2 french etc
       lang: 0
       sort: "{{ .Config.sort }}"
       order: "{{ .Config.type }}"
+      # does not support imdbid search and does not return imdb link in results
 
     rows:
       selector: table.ttable_headinner tr.t-row

src/Jackett.Common/Definitions/downloadville.yml

@@ -14,70 +14,70 @@
     categorymappings:
         # Films
       - {id: 1, cat: Movies, desc: "Films"}
-      - {id: 13, cat: Movies, desc: "Films BD-Rip / BRRip"}
-      - {id: 15, cat: Movies, desc: "Films DVD-Rip"}
-      - {id: 18, cat: Movies, desc: "Films HD 720p"}
-      - {id: 19, cat: Movies, desc: "Films WEB-DL / WEB-Rip"}
-      - {id: 20, cat: Movies, desc: "Films HD 1080p"}
-      - {id: 26, cat: Movies, desc: "Films mHD 720p"}
-      - {id: 27, cat: Movies, desc: "Films mHD 1080p"}
-      - {id: 28, cat: Movies, desc: "Films x265"}
-      - {id: 30, cat: Movies, desc: "Films Blu-Ray (complet)"}
-      - {id: 31, cat: Movies, desc: "Films 3D"}
-      - {id: 32, cat: Movies, desc: "Films 4K UHD"}
-      - {id: 33, cat: Movies, desc: "Films Québécois SD"}
-      - {id: 34, cat: Movies, desc: "Films Québécois HD"}
-      - {id: 35, cat: Movies, desc: "Films Québécois DVD-R"}
-      - {id: 37, cat: Movies, desc: "Films DVD-R"}
-      - {id: 38, cat: Movies, desc: "Films V.O.S.T. SD"}
-      - {id: 39, cat: Movies, desc: "Films V.O.S.T. HD"}
-      - {id: 40, cat: Movies, desc: "Films V.O. SD"}
-      - {id: 41, cat: Movies, desc: "Films V.O. HD"}
+      - {id: 13, cat: Movies/BluRay, desc: "Films BD-Rip / BRRip"}
+      - {id: 15, cat: Movies/DVD, desc: "Films DVD-Rip"}
+      - {id: 18, cat: Movies/HD, desc: "Films HD 720p"}
+      - {id: 19, cat: Movies/WEBDL, desc: "Films WEB-DL / WEB-Rip"}
+      - {id: 20, cat: Movies/HD, desc: "Films HD 1080p"}
+      - {id: 26, cat: Movies/HD, desc: "Films mHD 720p"}
+      - {id: 27, cat: Movies/HD, desc: "Films mHD 1080p"}
+      - {id: 28, cat: Movies/HD, desc: "Films x265"}
+      - {id: 30, cat: Movies/BluRay, desc: "Films Blu-Ray (complet)"}
+      - {id: 31, cat: Movies/3D, desc: "Films 3D"}
+      - {id: 32, cat: Movies/UHD, desc: "Films 4K UHD"}
+      - {id: 33, cat: Movies/SD, desc: "Films Québécois SD"}
+      - {id: 34, cat: Movies/HD, desc: "Films Québécois HD"}
+      - {id: 35, cat: Movies/DVD, desc: "Films Québécois DVD-R"}
+      - {id: 37, cat: Movies/DVD, desc: "Films DVD-R"}
+      - {id: 38, cat: Movies/SD, desc: "Films V.O.S.T. SD"}
+      - {id: 39, cat: MovieS/HD, desc: "Films V.O.S.T. HD"}
+      - {id: 40, cat: Movies/SD, desc: "Films V.O. SD"}
+      - {id: 41, cat: Movies/HD, desc: "Films V.O. HD"}
       - {id: 42, cat: Movies, desc: "Films TV-Rip"}
         # 4K LIGHT
       - {id: 95, cat: Movies, desc: "4K LIGHT"}
         # Séries-Télé
       - {id: 16, cat: TV, desc: "Séries-Télé"}
-      - {id: 17, cat: TV, desc: "Séries-Télé TV Pack SD"}
-      - {id: 21, cat: TV, desc: "Séries-Télé SD"}
-      - {id: 22, cat: TV, desc: "Séries-Télé HD"}
-      - {id: 23, cat: TV, desc: "Séries-Télé TV Pack HD"}
-      - {id: 45, cat: TV, desc: "Séries-Télé Québécois SD"}
-      - {id: 46, cat: TV, desc: "Séries-Télé Québécois HD"}
-      - {id: 47, cat: TV, desc: "Séries-Télé V.O.S.T. SD"}
-      - {id: 48, cat: TV, desc: "Séries-TéléV.O.S.T. HD"}
-      - {id: 49, cat: TV, desc: "Séries-Télé Émissions TV SD"}
-      - {id: 50, cat: TV, desc: "Séries-Télé Émissions TV HD"}
+      - {id: 17, cat: TV/SD, desc: "Séries-Télé TV Pack SD"}
+      - {id: 21, cat: TV/SD, desc: "Séries-Télé SD"}
+      - {id: 22, cat: TV/HD, desc: "Séries-Télé HD"}
+      - {id: 23, cat: TV/HD, desc: "Séries-Télé TV Pack HD"}
+      - {id: 45, cat: TV/SD, desc: "Séries-Télé Québécois SD"}
+      - {id: 46, cat: TV/HD, desc: "Séries-Télé Québécois HD"}
+      - {id: 47, cat: TV/SD, desc: "Séries-Télé V.O.S.T. SD"}
+      - {id: 48, cat: TV/HD, desc: "Séries-TéléV.O.S.T. HD"}
+      - {id: 49, cat: TV/SD, desc: "Séries-Télé Émissions TV SD"}
+      - {id: 50, cat: TV/HD, desc: "Séries-Télé Émissions TV HD"}
       - {id: 51, cat: TV, desc: "Séries-Télé Blu-Ray"}
       - {id: 52, cat: TV, desc: "Séries-Télé DVD-R"}
-      - {id: 94, cat: TV, desc: "Séries-Télé x265 - TV"}
+      - {id: 94, cat: TV/HD, desc: "Séries-Télé x265 - TV"}
         # Musique
       - {id: 2, cat: Audio, desc: "Musique"}
-      - {id: 54, cat: Audio, desc: "Musique MP3"}
-      - {id: 55, cat: Audio, desc: "Musique FLAC"}
+      - {id: 54, cat: Audio/MP3, desc: "Musique MP3"}
+      - {id: 55, cat: Audio/Lossless, desc: "Musique FLAC"}
       - {id: 56, cat: Audio, desc: "Musique DSD"}
       - {id: 57, cat: Audio, desc: "Musique Karaoke"}
       - {id: 58, cat: Audio, desc: "Musique Autres"}
         # Jeux
       - {id: 3, cat: PC/Games, desc: "Jeux"}
       - {id: 59, cat: PC/Games, desc: "Jeux PC"}
-      - {id: 60, cat: PC/Games, desc: "Jeux Consoles"}
+      - {id: 60, cat: Console, desc: "Jeux Consoles"}
       - {id: 84, cat: PC/Games, desc: "Jeux Android"}
         # Livres
       - {id: 6, cat: Books, desc: "Livres"}
-      - {id: 61, cat: Books, desc: "Livres epub"}
+      - {id: 61, cat: Books/Ebook, desc: "Livres epub"}
       - {id: 62, cat: Books, desc: "Livres pdf"}
       - {id: 63, cat: Books, desc: "Livres Journaux"}
-      - {id: 64, cat: Books, desc: "Livres Magazines"}
+      - {id: 64, cat: Books/Magazines, desc: "Livres Magazines"}
       - {id: 65, cat: Books, desc: "Livres Bandes Dessinées"}
       - {id: 66, cat: Books, desc: "Livres Multi-Format"}
-      - {id: 85, cat: Books, desc: "Livres Audio"}
+      - {id: 85, cat: Audio/Audiobook, desc: "Livres Audio"}
         # Logiciels
       - {id: 67, cat: PC, desc: "Logiciels"}
-      - {id: 68, cat: PC, desc: "Logiciels Windows"}
-      - {id: 69, cat: PC, desc: "Logiciels Mac"}
+      - {id: 68, cat: PC/0day, desc: "Logiciels Windows"}
+      - {id: 69, cat: PC/Mac, desc: "Logiciels Mac"}
       - {id: 86, cat: PC, desc: "Logiciels Linux"}
-      - {id: 87, cat: PC, desc: "Logiciels Android"}
+      - {id: 87, cat: PC/Phone-Android, desc: "Logiciels Android"}
         # Spectacles
       - {id: 70, cat: TV/Other, desc: "Spectacles"}
       - {id: 71, cat: TV/Other, desc: "Spectacles Humour"}
@@ -198,11 +198,13 @@
       page: torrents
       search: "{{ .Keywords }}"
       category: "{{ range .Categories }}{{.}};{{end}}"
+      # 0 title 1 title&descr 2 descr
       options: 0
       active: "{{ .Config.active }}"
       gold: "{{ .Config.gold }}"
       order: "{{ .Config.sort }}"
       by: "{{ .Config.type }}"
+      # does not support imdbid search and does not ruturn imdb link in results
 
     rows:
       selector: table > tbody > tr > td > table.lista > tbody > tr:has(td[onmouseover="this.className='post'"])

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

@@ -283,6 +283,10 @@
       options:
         "desc": "desc"
         "asc": "asc"
+    - name: info_results
+      type: info
+      label: Search results
+      default: "If you are not getting results, then access the site with your browser and mark as read all PMs."
 
   login:
     path: account-login.php

src/Jackett.Common/Definitions/estone.yml

@@ -81,11 +81,16 @@
 
   search:
     paths:
+    # http://estone.cc/letoltes.php?kereses_nev=wide&miben=0&cimke=&cat=0&submit.x=40&submit.y=9
       - path: letoltes.php
-        method: get
     inputs:
       $raw: "{{ range .Categories }}kat[]={{.}}&{{end}}{{ .Config.sort }}={{ .Config.type }}"
       kereses_nev: "{{ .Keywords }}"
+      # 0 name 1 performer 2 director
+      miben: 0
+      # genre
+      cimke: ""
+      # does not support imdbid search and does not return imdb link in results
 
     rows:
       selector: body > div[id^="torrent_"]

src/Jackett.Common/Definitions/ettv.yml

@@ -5,8 +5,17 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.ettv.to/
+    - https://ettv.unblockit.pro/
+    - https://ettv.root.yt/
+    - https://ettv.unblockninja.com/
+    - https://ettv.black-mirror.xyz/
+    - https://ettv.unblocked.casa/
+    - https://ettv.proxyportal.fun/
+    - https://ettv.uk-unblock.xyz/
+    - https://ettv.ind-unblock.xyz/
   legacylinks:
     - https://www.ettv.tv/
 
@@ -93,7 +102,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-  
+
   download:
     selector: a[href^="{{ .Config.downloadlink }}"]
     attribute: href

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

@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://extratorrent.si/
+    - https://extratorrent.unblockit.pro/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -10,24 +10,25 @@
 
   caps:
     categorymappings:
-      - {id: 10, cat: Movies/DVD, desc: "Dvd rip"}
-      - {id: 111, cat: Movies/DVD, desc: "DVD Promo"}
-      - {id: 118, cat: Movies, desc: "Kids"}
-      - {id: 113, cat: XXX, desc: "DVD xxx"}
-      - {id: 129, cat: Movies/HD, desc: "Hd DVD"}
-      - {id: 130, cat: Movies/UHD, desc: "4K Films"}
-      - {id: 143, cat: Movies/HD, desc: "Divx 720P"}
-      - {id: 114, cat: Audio, desc: "Muziek"}
+      - {id: 10, cat: Movies/DVD, desc: "Film DVD"}
+      - {id: 111, cat: Movies/DVD, desc: "DVD Promo/R5"}
+      - {id: 118, cat: Movies/DVD, desc: "Kids DVD"}
+      - {id: 113, cat: XXX, desc: "DVD XXX"}
+      - {id: 108, cat: XXX, desc: "Xvid XXX"}
+      - {id: 129, cat: Movies/HD, desc: "HD DVD"}
+      - {id: 130, cat: Movies/UHD, desc: "Films 4K"}
+      - {id: 143, cat: Movies/HD, desc: "DivX 720P"}
+      - {id: 114, cat: Audio/MP3, desc: "Muziek MP3"}
       - {id: 140, cat: Books, 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: 115, cat: PC, desc: "PC apps"}
+      - {id: 120, cat: PC/Games, desc: "PC Games"}
       - {id: 106, cat: Other, desc: "Overig"}
       - {id: 131, cat: Console/NDS, desc: "Nintendo Ds"}
       - {id: 132, cat: TV/HD, desc: "HD Serie"}
-      - {id: 116, cat: PC/Mac, desc: "Mac"}
-      - {id: 125, cat: Movies, desc: "Xvid rip"}
-      - {id: 123, cat: Movies, desc: "Xvid Tc"}
+      - {id: 116, cat: PC/Mac, desc: "Mac Software"}
+      - {id: 125, cat: Movies, desc: "DiVX Rip"}
+      - {id: 123, cat: Movies/SD, desc: "DiVX Cam"}
       - {id: 108, cat: XXX, desc: "18+"}
       - {id: 142, cat: XXX, desc: "HD XXX"}
       - {id: 139, cat: TV, desc: "TV Series"}
@@ -85,6 +86,7 @@
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ .Keywords }}"
       incldead: 1
+      # does not support imdbid search and does not return imdb link in results
 
     rows:
       selector: table.mainouter
@@ -108,7 +110,7 @@
         attribute: href
       banner:
         selector: div[id^="Style"] img
-        attribute: src        
+        attribute: src
       size:
         selector: a[href^="details_bestanden.php?torrent_id="]
         filters:

src/Jackett.Common/Definitions/exttorrents.yml

@@ -7,6 +7,8 @@
   encoding: UTF-8
   links:
     - https://ext.to/
+  legacylinks:
+    - https://ext.unblockninja.com/ # currently redirects to https://ext.to/
 
   caps:
     categories:

src/Jackett.Common/Definitions/eztv.yml

@@ -8,11 +8,19 @@
   followredirect: true
   links:
     - https://eztv.io/
+    - https://eztv.unblockit.pro/
+    - https://eztv.root.yt/
+    - https://eztv.unblockninja.com/
+    - https://eztv.black-mirror.xyz/
+    - https://eztv.unblocked.casa/
+    - https://eztv.proxyportal.fun/
+    - https://eztv.uk-unblock.xyz/
+    - https://eztv.ind-unblock.xyz/
   legacylinks:
-    - https://eztv.ag/ # redirects to .io 
-    - https://eztv.re/ # redirects to .io 
-    - https://eztv.it/ # redirects to .io 
-    - https://eztv.ch/ # redirects to .io 
+    - https://eztv.ag/ # redirects to .io
+    - https://eztv.re/ # redirects to .io
+    - https://eztv.it/ # redirects to .io
+    - https://eztv.ch/ # redirects to .io
 
   caps:
     categories:
@@ -26,7 +34,7 @@
   search:
     paths:
       - path: "{{ if .Keywords }}search/{{ .Keywords }}{{else}}/{{end}}"
-    keywordsfilters: 
+    keywordsfilters:
       - name: re_replace
         args: ["S[0-9]{2}([^E]|$)", ""] # remove season tag without episode (search doesn't support it)
     rows:

src/Jackett.Common/Definitions/fanoin.yml

@@ -49,10 +49,36 @@
       - {id: 23, cat: TV/Sport, desc: "TV/Sport"}
       - {id: 51, cat: Console, desc: "Games/Misc"}
       - {id: 1, cat: PC/0day, desc: "Appz/PC ISO"}
+      - {id: 55, cat: Movies/UHD, desc: "Movies/4K"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "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
@@ -64,7 +90,7 @@
       - selector: td.embedded:has(h2:contains("failed"))
     test:
       path: browse_old.php
-      
+
   ratio:
     path: browse_old.php
     selector: img[title="Reitings:"]+font
@@ -73,13 +99,16 @@
     paths:
       - path: browse_old.php
     inputs:
-      $raw: "{{range .Categories}}c{{.}}=1&{{end}}"
-      search: "{{ .Query.Keywords }}"
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
+      # 0 active 1 incldead 2 onlydead
       incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
     rows:
       selector: tr.browse_actions
-      filters:
-        - name: andmatch
+
     fields:
       title:
         selector: a[href^="details.php?id="]
@@ -113,7 +142,7 @@
           - name: regexp
             args: (\d+)
       date:
-        selector: td:nth-child(2) > small:nth-last-child(2)
+        selector: td:nth-child(2) > small:nth-last-child(2), td:nth-child(2) > small
         filters:
           - name: replace
             args: ["Šodien", "Today"]
@@ -121,12 +150,13 @@
             args: ["Vakar", "Yesterday"]
       downloadvolumefactor:
         case:
-          img[alt="Free"]: "0"
-          "*": "1"
+          img[alt="Free"]: 0
+          "*": 1
       uploadvolumefactor:
         case:
-          img[alt="x2"]: "2"
-          "*": "1"
+          img[alt="x2"]: 2
+          "*": 1
       description:
         selector: td:nth-child(2) > small:nth-last-child(1)
         remove: a[href^="details.php?id="]
+# engine n/a

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

@@ -35,9 +35,9 @@
       - {id: 32, cat: Audio/Audiobook, desc: " Luister Boeken"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: username
@@ -83,8 +83,9 @@
       - path: browse.php
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       incldead: 1
+      # does not return imdb link in results
 
     rows:
       selector: table.mainouter
@@ -106,6 +107,9 @@
       download:
         selector: a[href^="details.php?id="]
         attribute: href
+      banner:
+        selector: img[src*="/covers/"]
+        attribute: src
       size:
         selector: td:nth-child(4) table tr td:nth-child(2)
         filters:
@@ -163,7 +167,9 @@
         optional: true
         selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
       downloadvolumefactor:
-        text: 0
+        case:
+          img[src="pic/freedlfsu.gif"]: 0
+          "*": 1
       uploadvolumefactor:
         text: 1
 # engine n/a

src/Jackett.Common/Definitions/focusx.yml

@@ -18,6 +18,9 @@
       - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
       - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
       - {id: 202, cat: Movies, desc: "Визит инспектора"}
+      - {id: 206, cat: Movies, desc: "Брачная история"}
+      - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
+      - {id: 208, cat: Movies, desc: "Наши души по ночам"}
       - {id: 10, cat: Movies, desc: "Мёд в голове"}
       - {id: 16, cat: Movies, desc: "Малыш"}
       - {id: 18, cat: Movies, desc: "Копенгаген"}
@@ -51,7 +54,6 @@
       - {id: 100, cat: TV, desc: "Смертельное оружие"}
       - {id: 101, cat: TV, desc: "Гавайи 5-0"}
       - {id: 102, cat: TV, desc: "Черный Список"}
-      - {id: 103, cat: TV, desc: "Нелюди"}
       - {id: 106, cat: TV, desc: "Одаренные"}
       - {id: 107, cat: TV, desc: "Теория большого взрыва"}
       - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
@@ -100,7 +102,6 @@
       - {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: 181, cat: TV, desc: "Сорвиголова"}
@@ -111,8 +112,12 @@
       - {id: 186, cat: TV, desc: "Изгнание"}
       - {id: 187, cat: TV, desc: "Крупный Город"}
       - {id: 190, cat: TV, desc: "Кобра Кай"}
+      - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
       - {id: 197, cat: TV, desc: "Западное крыло"}
       - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
+      - {id: 203, cat: TV, desc: "Книга Рабов"}
+      - {id: 204, cat: TV, desc: "Ведьмак"}
+      - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
       - {id: 9, cat: TV, desc: "Иерихон"}
       - {id: 11, cat: TV, desc: "11-22-63"}
       - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
@@ -246,11 +251,11 @@
         selector: div.size
         filters:
           - name: replace
-            args: [".", ""] 
+            args: [".", ""]
           - name: replace
-            args: [",", "."] 
+            args: [",", "."]
           - name: replace
-            args: ["ТБ", "TB"] 
+            args: ["ТБ", "TB"]
           - name: replace
             args: ["ГБ", "GB"]
           - name: replace

src/Jackett.Common/Definitions/galeriens.yml

@@ -260,6 +260,7 @@
       langue: "{{ .Config.torrentlanguage }}"
       # freeleech oui (yes) non (no) peuimporte (ignore)
       tl: "peuimporte"
+      # does bot support imdbid search and does not return imdb link in results.
 
     rows:
       selector: table.sortable tbody tr
@@ -322,6 +323,5 @@
           img[src$="/images/Torrents/TLibre.png"]: "0"
           "*": "1"
       uploadvolumefactor:
-        case:
-          "*": "1"
+        text: 1
 # TT3.00 FRENCH

src/Jackett.Common/Definitions/generationfree.yml

@@ -28,6 +28,7 @@
       - {id: 117, cat: PC, desc: "Applications: Appli-autre"}
       - {id: 67, cat: TV/OTHER, desc: "Autres: Emission TV"}
       - {id: 141, cat: TV/OTHER, desc: "Autres: Noel"}
+      - {id: 142, cat: TV/Sport, desc: "Autres: Emission sport"}
       - {id: 90, cat: Books/Ebook, desc: "BD: Livres"}
       - {id: 132, cat: TV/Documentary, desc: "Documentaires: BluRay"}
       - {id: 133, cat: TV/Documentary, desc: "Documentaires: 4k"}
@@ -35,7 +36,6 @@
       - {id: 15, cat: TV/Documentary, desc: "Documentaires: HD"}
       - {id: 14, cat: TV/Documentary, desc: "Documentaires: DivX"}
       - {id: 76, cat: TV/Documentary, desc: "Documentaires: TVRip/HDTV"}
-      - {id: 118, cat: TV/Documentary, desc: "Documentaires: Sport"}
       - {id: 139, cat: TV/Documentary, desc: "Documentaires: Noel"}
       - {id: 138, cat: Books/Ebook, desc: "E-Books: Noel"}
       - {id: 53, cat: Books/Ebook, desc: "E-Books: Livre Anglais"}
@@ -63,8 +63,8 @@
       - {id: 71, cat: Movies/WEBDL, desc: "Films: WEB-DL"}
       - {id: 69, cat: Movies/3D, desc: "Films: Film 3D"}
       - {id: 65, cat: Movies, desc: "Films: VO"}
-      - {id: 1, cat: Movies/HD, desc: "Films: Remux Bluray 4K"}
-      - {id: 130, cat: Movies/UHD, desc: "Films: HD720P"}
+      - {id: 1, cat: Movies/UHD, desc: "Films: Remux Bluray 4K"}
+      - {id: 130, cat: Movies/HD, desc: "Films: HD720P"}
       - {id: 102, cat: Movies/WEBDL, desc: "Films: WEB-DL 720P"}
       - {id: 103, cat: Movies/HD, desc: "Films: Film-HDRIP"}
       - {id: 111, cat: Movies/WEBDL, desc: "Films: WEBRip-720P"}
@@ -172,11 +172,10 @@
 
   download:
     before:
-      path: "list_thanks.php"
-      method: "get"
+      path: list_thanks.php
       inputs:
         id: "{{ .DownloadUri.Query.id }}"
-        to: "give"
+        to: give
         torrent: "{{ .DownloadUri.Query.id }}"
     selector: a[href^="download.php?id="]
     attribute: href
@@ -192,12 +191,15 @@
 #      multi cats unsupported, defaulting to all
       cat: 0
       search: "{{ .Keywords }}"
+      # 0 active 1 incldead 2 onlydead
       incldead: 1
+      # 0 all 1 notfree 2 freeonly
       freeleech: 0
-      inclexternal: 0
+      # 0 all 1 French 2 English 3 etc
       lang: 0
       sort: "{{ .Config.sort }}"
       order: "{{ .Config.type }}"
+      # does not support imdbid search and does not return imdb link in results
 
     rows:
       selector: table.ttable_headinner > tbody > tr.t-row
@@ -239,6 +241,5 @@
           img[src="images/fl.gif"]: 0
           "*": 1
       uploadvolumefactor:
-        case:
-          "*": 1
+        text: 1
 # engine n/a

src/Jackett.Common/Definitions/girotorrent.yml

@@ -27,15 +27,15 @@
       # VIDEOTECA
       - {id: 22, cat: Movies/SD, desc: "Movie BDRip"}
       - {id: 23, cat: Movies/SD, desc: "Movie DvdRip"}
-      - {id: 23, cat: Movies/SD, desc: "Movie WEBRip"}
+      - {id: 95, cat: Movies/SD, desc: "Movie WEBRip"}
       - {id: 24, cat: Movies/DVD, desc: "Movie DVD-R 5"}
       - {id: 25, cat: Movies/DVD, desc: "Movie DVD-R 9"}
       - {id: 26, cat: Movies/HD, desc: "Movie Blu-Ray HD"}
-      - {id: 27, cat: Movies/3D, desc: "Movie 3D-SBS"}
-      - {id: 96, cat: Movies/HD, desc: "Movie x265 HEVC"}
-      - {id: 28, cat: Movies/Foreign, desc: "Movie Subbet-ita"}
+      - {id: 27, cat: Movies/UHD, desc: "Movie 4K Ultra HD"}
+      - {id: 96, cat: Movies/HD, desc: "Movie HD Hevc"}
+      - {id: 28, cat: Movies/Foreign, desc: "Movie Subbed-ita"}
       - {id: 73, cat: Movies/SD, desc: "Movie MP4"}
-      - {id: 29, cat: Movies/Foreign, desc: "Movie Ligua Originale"}
+      - {id: 29, cat: Movies/Foreign, desc: "Movie Lingua Originale"}
       # ANIMAZIONE
       - {id: 32, cat: TV/Anime, desc: "Anime Disney"}
       - {id: 33, cat: TV/Anime, desc: "Anime"}
@@ -56,11 +56,13 @@
       - {id: 45, cat: Audio, desc: "Musica Compilation"}
       - {id: 46, cat: Audio/Video, desc: "Musica Video Clip"}
       - {id: 58, cat: Audio, desc: "Musica Discografie"}
+      - {id: 97, cat: Audio/Lossless, desc: "Musica Flac"}
       # SALA GIOCHI
       - {id: 47, cat: PC/Games, desc: "PC Games"}
       - {id: 48, cat: Console/PS3, desc: "PC Giochi PS2-PS3"}
       - {id: 49, cat: Console/Wii, desc: "PC Giochi Nintendo Wii"}
       - {id: 50, cat: Console/Xbox, desc: "PC Giochi Xbox"}
+      - {id: 51, cat: Console/PSP, desc: "PC Giochi PSP"}
       - {id: 52, cat: Console/3DS, desc: "PC Giochi DS-DS3"}
       # SOFTWARE
       - {id: 54, cat: PC, desc: "PC Programmi Windows"}
@@ -117,10 +119,10 @@
   download:
     before:
       path: thanks.php
-      method: "post"
+      method: post
       inputs:
         infohash: "{{ .DownloadUri.Query.id }}"
-        thanks: "1"
+        thanks: 1
         rndval: "1487013827343"
     selector: a[href^="download.php?id="]
     attribute: href
@@ -160,6 +162,7 @@
         args: ["(?i)\\bS0*(\\d+)\\b", "$1"]
       - name: re_replace # S01E01 to 1 1
         args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "$1 $2"]
+    # does not support imdbid search and does not return imdb link in results
 
     rows:
       selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])

src/Jackett.Common/Definitions/glodls.yml

@@ -5,8 +5,17 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
+    - https://gtdb.to/
     - https://glodls.to/
+    - https://glotorrents.unblockit.pro/
+    - https://glodls.black-mirror.xyz/
+    - https://glodls.unblocked.casa/
+    - https://glodls.proxyportal.fun/
+    - https://glodls.uk-unblock.xyz/
+    - https://glodls.ind-unblock.xyz/
+  legacylinks:
     - https://glodls.rocks/
 
   caps:

src/Jackett.Common/Definitions/hachede.yml

@@ -98,7 +98,7 @@
       - {id: 130, cat: Movies/3D, desc: "H265 3D"}
       - {id: 128, cat: Movies/HD, desc: "H265 Animación"}
       - {id: 129, cat: Movies/HD, desc: "H265 Documentales"}
-      - {id: 125, cat: Movies, desc: "UHD"}
+      - {id: 125, cat: Movies/UHD, desc: "UHD"}
       - {id: 131, cat: Movies/UHD, desc: "UHD Películas"}
       - {id: 132, cat: TV/UHD, desc: "UHD Series"}
 
@@ -114,7 +114,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/hdchina.yml

@@ -51,7 +51,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/hdhome.yml

@@ -75,7 +75,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/hdme.yml

@@ -10,33 +10,33 @@
 
   caps:
     categorymappings:
-      - {id: 24, cat: TV/Anime      , desc: "Anime"}
-      - {id: 25, cat: PC/0day       , desc: "Appz"}
-      - {id: 47, cat: Movies/HD     , desc: "AVCHD"}
+      - {id: 24, cat: TV/Anime, desc: "Anime"}
+      - {id: 25, cat: PC/0day, desc: "Appz"}
+      - {id: 47, cat: Movies/HD, desc: "AVCHD"}
       - {id: 26, cat: Movies/BluRay , desc: "Bluray"}
-      - {id: 54, cat: Movies/HD     , desc: "dbREMUX"}
-      - {id: 41, cat: Movies/HD     , desc: "Documentaries"}
-      - {id: 50, cat: Movies/HD     , desc: "FourGHD"}
-      - {id: 44, cat: Movies/HD     , desc: "HDME"}
+      - {id: 54, cat: Movies/HD, desc: "dbREMUX"}
+      - {id: 41, cat: Movies/HD, desc: "Documentaries"}
+      - {id: 50, cat: Movies/HD, desc: "FourGHD"}
+      - {id: 44, cat: Movies/HD, desc: "HDME"}
       - {id: 28, cat: Audio/Lossless, desc: "HQ Music"}
-      - {id: 48, cat: Movies/HD     , desc: "iCandy"}
-      - {id: 45, cat: Movies/HD     , desc: "INtL"}
-      - {id: 29, cat: Other         , desc: "Misc"}
+      - {id: 48, cat: Movies/HD, desc: "iCandy"}
+      - {id: 45, cat: Movies/HD, desc: "INtL"}
+      - {id: 29, cat: Other, desc: "Misc"}
       - {id: 49, cat: PC/Phone-Other, desc: "Mobile"}
-      - {id: 30, cat: Movies/HD     , desc: "Movie 1080i"}
-      - {id: 31, cat: Movies/HD     , desc: "Movie 1080p"}
-      - {id: 32, cat: Movies/HD     , desc: "Movie 720p"}
-      - {id: 33, cat: Audio/Video   , desc: "Music Videos"}
-      - {id: 34, cat: TV            , desc: "Packs"}
-      - {id: 53, cat: Movies/HD     , desc: "Remux"}
-      - {id: 56, cat: Movies/HD     , desc: "RUXi"}
-      - {id: 55, cat: Movies/HD     , desc: "SiNiSteR"}
-      - {id: 36, cat: TV/Sport      , desc: "Sports"}
-      - {id: 37, cat: TV/HD         , desc: "TV Series 1080i"}
-      - {id: 38, cat: TV/HD         , desc: "TV Series 1080p"}
-      - {id: 39, cat: TV/HD         , desc: "TV Series 720p"}
-      - {id: 57, cat: Movies        , desc: "UHD 2160p"}
-      - {id: 40, cat: XXX           , desc: "XXX"}
+      - {id: 30, cat: Movies/HD, desc: "Movie 1080i"}
+      - {id: 31, cat: Movies/HD, desc: "Movie 1080p"}
+      - {id: 32, cat: Movies/HD, desc: "Movie 720p"}
+      - {id: 33, cat: Audio/Video, desc: "Music Videos"}
+      - {id: 34, cat: TV, desc: "Packs"}
+      - {id: 53, cat: Movies/HD, desc: "Remux"}
+      - {id: 56, cat: Movies/HD, desc: "RUXi"}
+      - {id: 55, cat: Movies/HD, desc: "SiNiSteR"}
+      - {id: 36, cat: TV/Sport, desc: "Sports"}
+      - {id: 37, cat: TV/HD, desc: "TV Series 1080i"}
+      - {id: 38, cat: TV/HD, desc: "TV Series 1080p"}
+      - {id: 39, cat: TV/HD, desc: "TV Series 720p"}
+      - {id: 57, cat: Movies/UHD, desc: "UHD 2160p"}
+      - {id: 40, cat: XXX, desc: "XXX"}
 
     modes:
       search: [q]

src/Jackett.Common/Definitions/hdreactor.yml

@@ -14,7 +14,7 @@
   caps:
     categorymappings:
       - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
-      - {id: 5006, cat: Movies/HD, desc: "Кино 4K"}
+      - {id: 5006, cat: Movies/UHD, desc: "Кино 4K"}
       - {id: 2007, cat: Movies/Other, desc: "Анимация"}
       - {id: 2006, cat: TV/HD, desc: "Сериалы"}
       - {id: 5005, cat: TV/Sport, desc: "Спорт"}

src/Jackett.Common/Definitions/hdsky.yml

@@ -33,7 +33,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/hdtime.yml

@@ -79,8 +79,8 @@
       incldead: 0
       # 0 all 1 normal 2 free 3 2x 4 2xfree 5 50% 6 2x50% 7 30%
       spstate: 0
-      # 0 title 1 descr 3 uploaded 4 imdburl
-      search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 title 1 descr 3 uploaded 4 imdburl (searching imdburl does not work with tt1234567, but descr is good)
+      search_area: "{{ if .Query.IMDBID }}1{{else}}0{{end}}"
       # 0 AND 1 OR 2 exact
       search_mode: 0
       sort: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/hdzone.yml

@@ -73,7 +73,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/horrorsite.yml

@@ -0,0 +1,153 @@
+---
+  site: horrorsite
+  name: Horror Site
+  description: "Horror Site is a Hungarian Private site for MOVIES / TV"
+  language: hu-hu
+  type: private
+  encoding: iso-8859-1
+  links:
+    - https://horror-site.net/
+
+  caps:
+    categorymappings:
+      - {id: 76, cat: PC/Phone-Android, desc: "Android"}
+      - {id: 81, cat: Movies/BluRay, desc: "BDRip"}
+      - {id: 82, cat: Movies/SD, desc: "Cam"}
+      - {id: 61, cat: Books, desc: "eBook/Hun"}
+      - {id: 80, cat: Movies, desc: "Film /PACK"}
+      - {id: 38, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
+      - {id: 71, cat: Movies/HD, desc: "Film/HD/Hun"}
+      - {id: 40, cat: Movies/SD, desc: "Film/XviD/Eng"}
+      - {id: 39, cat: Movies/SD, desc: "Film/XviD/Hun"}
+      - {id: 59, cat: XXX, desc: "Film/XXX"}
+      - {id: 52, cat: PC/Games, desc: "Játék/RIP/ISO"}
+      - {id: 75, cat: Other, desc: "Képek"}
+      - {id: 74, cat: XXX, desc: "Képek/XXX"}
+      - {id: 47, cat: Audio/Video, desc: "Klip"}
+      - {id: 50, cat: Audio/MP3, desc: "Mp3/Eng"}
+      - {id: 49, cat: Audio/MP3, desc: "Mp3/Hun"}
+      - {id: 45, cat: PC, desc: "Program ISO /RIP"}
+      - {id: 43, cat: TV, desc: "Rajzfilm/Hun"}
+      - {id: 57, cat: TV, desc: "Sorozat/Eng"}
+      - {id: 58, cat: TV, desc: "Sorozat/Hun"}
+
+    modes:
+      search: [q]
+      tv-search: [q, season, ep]
+      movie-search: [q]
+
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "4"
+      options:
+        "4": "created"
+        "7": "seeders"
+        "5": "size"
+        "1": "title"
+    - name: type
+      type: select
+      label: Order requested from site
+      default: "2"
+      options:
+        "2": "desc"
+        "1": "asc"
+    - name: info
+      type: info
+      label: Results Per Page
+      default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+  login:
+    path: takelogin.php
+    method: post
+    inputs:
+      post_kuldes: engedelyezve
+      username: "{{ .Config.username }}"
+      password: "{{ .Config.password }}"
+    error:
+      - selector: table.browse:contains("hiba")
+    test:
+      path: /
+      selector: a[href="/logout.php"]
+
+  search:
+    paths:
+      - path: browse.php
+    inputs:
+      $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+      search: "{{ .Keywords }}"
+      # 0 active 1 active&dead 2 dead 3 recomended 4 double 5 free
+      incldead: 1
+      # 0 name 1 descr 2 both
+      blah: 0
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+      # does not support imdbid search
+
+    rows:
+      selector: table > tbody > tr.sor:has(a[href^="/download.php/"])
+#    error:
+#      - selector: div.content:contains("Meg van vonva a letöltési jogod")
+
+    fields:
+      category:
+        selector: a[href^="browse.php?cat="]
+        attribute: href
+        filters:
+          - name: querystring
+            args: cat
+      title:
+        selector: a[href^="details.php?id="]
+        attribute: title
+      details:
+        selector: a[href^="details.php?id="]
+        attribute: href
+      download:
+        selector: a[href^="/download.php/"]
+        attribute: href
+      imdb:
+        selector: a[href*="www.imdb.com/title/tt"]
+        optional: true
+        attribute: href
+      banner:
+        selector: a[onmouseover]
+        optional: true
+        attribute: onmouseover
+        filters:
+          - name: regexp
+            args: "src=(.+?) "
+      files:
+        selector: td:nth-last-child(8)
+      date:
+        selector: td:nth-last-child(6)
+        filters:
+          - name: regexp
+            args: (\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})
+          - name: replace
+            args: ["\xA0", " "]
+          - name: dateparse
+            args: "2006-01-02 15:04:05"
+      size:
+        selector: td:nth-last-child(5) > u
+      grabs:
+        selector: td:nth-last-child(4)
+      seeders:
+        selector: td:nth-last-child(3)
+      leechers:
+        selector: td:nth-last-child(2)
+      downloadvolumefactor:
+        case:
+          img[src="../pic/freedownload.gif"]: 0
+          "*": 1
+      uploadvolumefactor:
+        case:
+#          img[src="../pic/????????.gif"]: 2 # there is a double (according to incldead=4) but not found at this time.
+          "*": 1
+# engine n/a

src/Jackett.Common/Definitions/idope.yml

@@ -7,6 +7,11 @@
   encoding: UTF-8
   links:
     - https://idope.se/
+    - https://idope.black-mirror.xyz/
+    - https://idope.unblocked.casa/
+    - https://idope.proxyportal.fun/
+    - https://idope.uk-unblock.xyz/
+    - https://idope.ind-unblock.xyz/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -133,6 +133,7 @@
       active: 0
       order: "{{ .Config.sort }}"
       by: "{{ .Config.type }}"
+      # does not support imdbid searches and does not return imdb link in results
 
     rows:
       selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrents&category="])

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -5,10 +5,13 @@
   language: it-it
   type: public
   encoding: Windows-1252
+  followredirect: true
   links:
     - https://ilcorsaronero.pw/
     - https://ilcorsaronero.fun/
     - https://ilcorsaronero.pro/
+    - https://ilcorsaronero.unblockit.pro/
+    - https://ww1-torrent9.root.yt/
   legacylinks:
     - https://ilcorsaronero.live/
     - https://ilcorsaronero.vip/
@@ -19,14 +22,22 @@
 
   caps:
     categorymappings:
-      - {id: 1, cat: Movies/HD, desc: "BDRiP", default: true}
+      - {id: 1, cat: Movies/HD, desc: "Movies BDRiP", default: true}
       - {id: 2, cat: Audio, desc: "Music", default: true}
-      - {id: 2, cat: PC/Games, desc: "Games", default: true}
+      - {id: 3, cat: PC/Games, desc: "Games PC", default: true}
+      - {id: 4, cat: Other, desc: "Other", default: true}
       - {id: 5, cat: TV/Anime, desc: "Anime", default: true}
-      - {id: 7, cat: PC/0day, desc: "App", default: true}
+      - {id: 6, cat: Books/Ebook, desc: "Ebooks", default: true}
+      - {id: 7, cat: PC/0day, desc: "App Windows", default: true}
+      - {id: 8, cat: PC, desc: "App Linux", default: true}
+      - {id: 9, cat: PC/Mac, desc: "App Mac", default: true}
+      - {id: 13, cat: Console/PSP, desc: "Games Playstation", default: true}
+      - {id: 14, cat: Console/Xbox, desc: "Games Xbox", default: true}
       - {id: 15, cat: TV, desc: "TV Series", default: true}
-      - {id: 19, cat: Movies/SD, desc: "Screener", default: true}
-      - {id: 20, cat: Movies/SD, desc: "Full DVD", default: true}
+      - {id: 16, cat: Other, desc: "Other", default: true}
+      - {id: 18, cat: Audio/Audiobook, desc: "Audio Book", default: true}
+      - {id: 19, cat: Movies/SD, desc: "Movies Screener", default: true}
+      - {id: 20, cat: Movies/DVD, desc: "Movies DVD", default: true}
 
     modes:
       search: [q]
@@ -94,6 +105,14 @@
         filters:
           - name: split
             args: [ "/", -1 ]
+      description:
+        selector: td:nth-child(1) a
+        attribute: href
+        filters:
+          - name: split
+            args: [ "/", -1 ]
+          - name: prepend
+            args: "cat="
       details:
         selector: td:nth-child(4) a
         attribute: href

src/Jackett.Common/Definitions/insanetracker.yml

@@ -15,26 +15,26 @@
       - {id: 41, cat: Movies/SD, desc: "Film/Hun/SD"}
       - {id: 15, cat: Movies/DVD, desc: "Film/Hun/DVD-R"}
       - {id: 27, cat: Movies/HD, desc: "Film/Hun/HD"}
-      - {id: 44, cat: Movies/HD, desc: "Film/Hun/UHD"}
+      - {id: 44, cat: Movies/UHD, desc: "Film/Hun/UHD"}
       - {id: 2, cat: Books, desc: "eBook/Hun"}
       - {id: 7, cat: TV/SD, desc: "Sorozat/Eng"}
       - {id: 39, cat: TV/HD, desc: "Sorozat/Eng/HD"}
       - {id: 42, cat: Movies/SD, desc: "Film/Eng/SD"}
       - {id: 14, cat: Movies/DVD, desc: "Film/Eng/DVD-R"}
       - {id: 25, cat: Movies/HD, desc: "Film/Eng/HD"}
-      - {id: 45, cat: Movies/HD, desc: "Film/Eng/UHD"}
+      - {id: 45, cat: Movies/UHD, desc: "Film/Eng/UHD"}
       - {id: 1, cat: Books, desc: "eBook/Eng"}
       - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
       - {id: 21, cat: XXX, desc: "XXX"}
       - {id: 4, cat: PC/ISO, desc: "Program/ISO"}
-      - {id: 19, cat: Audio/Other, desc: "Zene/Hun"}
+      - {id: 19, cat: Audio/MP3, desc: "Zene/Hun"}
       - {id: 37, cat: Audio/Lossless, desc: "Lossless/Hun"}
       - {id: 9, cat: PC/Games, desc: "Játék/ISO"}
       - {id: 43, cat: Console, desc: "Játék/Konzol"}
       - {id: 29, cat: Other, desc: "Képek"}
       - {id: 28, cat: XXX/Imageset, desc: "XXX Képek"}
       - {id: 3, cat: PC/0day, desc: "Program/Egyéb"}
-      - {id: 18, cat: Audio/Other, desc: "Zene/Eng"}
+      - {id: 18, cat: Audio/MP3, desc: "Zene/Eng"}
       - {id: 26, cat: Audio/Lossless, desc: "Lossless/Eng"}
       - {id: 11, cat: PC/Games, desc: "Játék/Rip"}
       - {id: 13, cat: PC/Phone-Other, desc: "Mobil"}
@@ -45,13 +45,37 @@
       tv-search: [q, season, ep, imdbid]
       movie-search: [q, imdbid]
 
+  settings:
+    - name: username
+      type: text
+      label: Username
+    - name: password
+      type: password
+      label: Password
+    - name: sort
+      type: select
+      label: Sort requested from site
+      default: "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: post
     inputs:
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
-      notsecure: "1"
+      notsecure: 1
     error:
       - selector: div.login_error_content_text
     test:
@@ -63,7 +87,10 @@
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
       search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      t: all
+      # 0 active 1 both 2 dead
+      incldead: 1
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
 
     rows:
       selector: table.torrenttable > tbody > tr:has(td.torrentmain)
@@ -123,8 +150,9 @@
         filters:
           - name: replace
             args: [".", ""]
+          - name: replace
+            args: [" ", ""]
         remove: div.uploader, div.moderation, a.leftborder
-
       date:
         selector: td.center.date
         filters:
@@ -142,5 +170,6 @@
           "*" : 1
       description:
         selector: div.contenttext
+        optional: true
         remove: div.contenttitle
-# engine tbd
+# custom v2.0b

src/Jackett.Common/Definitions/isohunt2.yml

@@ -7,6 +7,7 @@
   encoding: UTF-8
   links:
     - https://isohunt2.net/
+    - https://isohunt.nz/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/itorrent.yml

@@ -5,8 +5,10 @@
   language: hu
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://itorrent.ws/
+    - https://itorrent.unblockit.pro/
 
   caps:
     categories:

src/Jackett.Common/Definitions/kickasstorrent-kathow.yml

@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://kickass.ws/
+    - https://kickass.unblockit.pro/
   legacylinks:
     - https://kickass.gg/
     - https://katcr.io/
@@ -14,6 +16,7 @@
     - https://thekat.se/
     - https://kat.how/
     - https://kat.li/
+    - https://kickasstorrents.unblockninja.com/ # currently not responding
 
   caps:
     categories:

src/Jackett.Common/Definitions/kickasstorrent.yml

@@ -5,8 +5,19 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://katcr.co/
+    - https://katcr.to/
+    - https://kat.unblockit.pro/
+    - https://kat.root.yt/
+    - https://katcr.black-mirror.xyz/
+    - https://katcr.unblocked.casa/
+    - https://katcr.proxyportal.fun/
+    - https://katcr.uk-unblock.xyz/
+    - https://katcr.ind-unblock.xyz/
+  legacylinks:
+    - https://kickasstorrent.cr/ # https://kickasstorrent.cr/category/latest/page/1 is fake torrent page
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/leaguehd.yml

@@ -44,7 +44,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/lechaudron.yml

@@ -149,7 +149,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie
@@ -174,10 +174,11 @@
       type: tout
       # searchin  nomtorrent (name) or desctorrent (descr)
       endroit: nomtorrent
-      # language 0 all 2 english 
+      # language 0 all 2 english
       langue: 0
       # freeleech oui (yes) non (no) peuimporte (ignore)
       tl: peuimporte
+      # does not support imdbid searches and does not return imdb link in results
 
     rows:
       selector: tr:has(a[onmouseover])
@@ -186,7 +187,7 @@
       category:
         selector: a[href*="/SousCategories/"]
         attribute: href
-        filters:        
+        filters:
           - name: regexp
             args: (\d+)$
       title:
@@ -211,7 +212,7 @@
         selector: a[onmouseover] font[color="#F2F2F2"]
         filters:
           - name: regexp
-            args: "Il y a (.*?)\\s-" 
+            args: "Il y a (.*?)\\s-"
           - name: replace
             args: ["heures", "hours"]
           - name: replace

src/Jackett.Common/Definitions/limetorrents.yml

@@ -5,12 +5,20 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.limetorrents.info/
     - https://www.limetorrents.asia/
     - https://www.limetorrents.co/
     - https://limetor.com/
     - https://www.limetor.pro/
+    - https://limetorrents.unblockit.pro/
+    - https://limetorrents.unblockninja.com/
+    - https://limetorrents.black-mirror.xyz/
+    - https://limetorrents.unblocked.casa/
+    - https://limetorrents.proxyportal.fun/
+    - https://limetorrents.uk-unblock.xyz/
+    - https://limetorrents.ind-unblock.xyz/
   legacylinks:
     - https://www.limetorrents.io/
     - https://www.limetorrents.cc/
@@ -89,6 +97,8 @@
         selector: div.tt-name > a[href^="/"]
         attribute: href
       category:
+        text: Other
+      category|noappend:
         optional: true
         selector: td:nth-child(2)
         filters:

src/Jackett.Common/Definitions/linuxtracker.yml

@@ -388,7 +388,7 @@
          selector: td:nth-child(2)
          remove: table
       downloadvolumefactor:
-        text: 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # xbtit 2.3.0

src/Jackett.Common/Definitions/magnet4you.yml

@@ -7,6 +7,11 @@
   encoding: UTF-8
   links:
     - https://magnet4you.me/
+    - https://magnet4you.black-mirror.xyz/
+    - https://magnet4you.unblocked.casa/
+    - https://magnet4you.proxyportal.fun/
+    - https://magnet4you.uk-unblock.xyz/
+    - https://magnet4you.ind-unblock.xyz/
   legacylinks:
     - http://magnet4you.me/
 

src/Jackett.Common/Definitions/magnetdl.yml

@@ -5,9 +5,11 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.magnetdl.com/
     - https://magnetdl.unblockninja.com/
+    - https://magnetdl.unblockit.pro/
   legacylinks:
     - http://www.magnetdl.com/
     - https://www.magnetdl.me/ # fake
@@ -56,7 +58,7 @@
     paths:
       # return movie results if there are no search parms supplied (for use with the TEST button)
       # http://www.magnetdl.com/m/midnight-texas-s01e10/
-      - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"     
+      - path: "{{ if .Keywords }}{{ re_replace .Keywords \"(.).*\" \"$1\" }}/{{ .Keywords }}/{{else}}download/movies/{{end}}{{ .Config.sort }}/{{ .Config.type }}/"
 
     rows:
       selector: tr:has(td.m)

src/Jackett.Common/Definitions/microbit.yml

@@ -39,9 +39,9 @@
       - {id: 10, cat: Audio/MP3, desc: "Zene/MP3"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: username
@@ -87,14 +87,15 @@
       - path: browse.php
     inputs:
       $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
-      search: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{end}}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       searchOpened: 1
       # 0 title 1 descr 2 uploader
-      searchWhat: 0
+      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: 1
       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="])
@@ -151,4 +152,4 @@
         filters:
           - name: regexp
             args: (\d+)
-# engine n/a
+# custom 3.0

src/Jackett.Common/Definitions/monova.yml

@@ -5,9 +5,18 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://monova.org/
     - https://monova.to/
+    - https://monova.unblockit.pro/
+    - https://monova.black-mirror.xyz/
+    - https://monova.unblocked.casa/
+    - https://monova.proxyportal.fun/
+    - https://monova.uk-unblock.xyz/
+    - https://monova.ind-unblock.xyz/
+  legacylinks:
+    - https://monova.unblockninja.com/ # currently redirects to https://monova.org/
 
   caps:
     categories:
@@ -39,7 +48,7 @@
       - path: "{{if .Keywords}}search?term={{.Keywords}}{{else}}video{{end}}"
 
     rows:
-      selector: tr.desktop:has(a[href^="//"])
+      selector: tr.desktop:not(tr[class="desktop  success"])
       filters:
         - name: andmatch
 

src/Jackett.Common/Definitions/movcr.yml

@@ -7,6 +7,11 @@
   encoding: UTF-8
   links:
     - https://movcr.to/
+    - https://movcr.black-mirror.xyz/
+    - https://movcr.unblocked.casa/
+    - https://movcr.proxyportal.fun/
+    - https://movcr.uk-unblock.xyz/
+    - https://movcr.ind-unblock.xyz/
   legacylinks:
     - https://movcr.tv/
 

src/Jackett.Common/Definitions/mteamtp.yml

@@ -23,14 +23,15 @@
       - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"}
       - {id: 404, cat: TV/Documentary, desc: "紀錄教育"}
       - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"}
-      - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
-      - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
-      - {id: 434, cat: Audio, desc: "Music(無損)"}
       - {id: 407, cat: TV/Sport, desc: "Sports(運動)"}
       - {id: 422, cat: PC/0day, desc: "Software(軟體)"}
       - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
       - {id: 427, cat: Books, desc: "eBook(電子書)"}
       - {id: 409, cat: Other, desc: "Misc(其他)"}
+      # music
+      - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
+      - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
+      - {id: 434, cat: Audio, desc: "Music(無損)"}
       # adult
       - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"}
       - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"}
@@ -47,7 +48,6 @@
       - {id: 412, cat: XXX, desc: "H-Anime(動畫)"}
       - {id: 413, cat: XXX, desc: "H-Comic(漫畫)"}
 
-
     modes:
       search: [q, imdbid]
       tv-search: [q, season, ep, imdbid]
@@ -64,6 +64,22 @@
       type: info
       label: ""
       default: For best results disable the torrent name tooltip (User CP/Tracker Settings/Torrents Page). Otherwise long release names will be cut off.
+    - 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
@@ -72,9 +88,11 @@
       username: "{{ .Config.username }}"
       password: "{{ .Config.password }}"
     error:
+      - selector: td.embedded:has(h2:contains("登录失败"))
       - selector: td.embedded:has(h2:contains("failed"))
     test:
-      path: torrents.php
+      path: index.php
+      selector: a[href="logout.php"]
 
   ratio:
     path: torrents.php
@@ -86,19 +104,28 @@
   search:
     paths:
       - path: torrents.php
-        categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
+        categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434]
       - path: adult.php
         categorymappings: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
-    method: post
+      - path: music.php
+        categorymappings: [406, 408, 434]
     inputs:
       $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
       search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: 1
+      # 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: 0
+      # 0 title 1 descr 3 uploaded 4 imdb url
       search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 and 1 or 2 exact
       search_mode: 0
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
     rows:
       selector: table.torrents > tbody > tr:has(table.torrentname)
+
     fields:
       title: # shortened for long release names
         selector: a[href^="details.php?id="] > b
@@ -124,6 +151,10 @@
         filters:
           - name: replace
             args: ["pic/nopic.jpg", ""]
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       size:
         selector: td.rowfollow:nth-last-child(6)
       grabs:
@@ -166,4 +197,4 @@
       description:
         selector: td:nth-child(2)
         remove: a, img
-# NexusPHP
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/mteamtp2fa.yml

@@ -23,14 +23,15 @@
       - {id: 438, cat: TV/HD, desc: "TV Series(影劇/綜藝)/BD"}
       - {id: 404, cat: TV/Documentary, desc: "紀錄教育"}
       - {id: 405, cat: TV/Anime, desc: "Anime(動畫)"}
-      - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
-      - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
-      - {id: 434, cat: Audio, desc: "Music(無損)"}
       - {id: 407, cat: TV/Sport, desc: "Sports(運動)"}
       - {id: 422, cat: PC/0day, desc: "Software(軟體)"}
       - {id: 423, cat: PC/Games, desc: "PCGame(PC遊戲)"}
       - {id: 427, cat: Books, desc: "eBook(電子書)"}
       - {id: 409, cat: Other, desc: "Misc(其他)"}
+      # music
+      - {id: 406, cat: Audio/Video, desc: "MV(演唱)"}
+      - {id: 408, cat: Audio/Other, desc: "Music(AAC/ALAC)"}
+      - {id: 434, cat: Audio, desc: "Music(無損)"}
       # adult
       - {id: 410, cat: XXX, desc: "AV(有碼)/HD Censored"}
       - {id: 429, cat: XXX, desc: "AV(無碼)/HD Uncensored"}
@@ -59,18 +60,34 @@
     - name: infocookie
       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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: infotitle
       type: info
       label: About Titles
       default: For best results disable the torrent name tooltip (User CP/Tracker Settings/Torrents Page). Otherwise long release names will be cut off.
-
+    - 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:
     method: cookie
     inputs:
       cookie: "{{ .Config.cookie }}"
     test:
-      path: torrents.php
+      path: index.php
+      selector: a[href="logout.php"]
 
   ratio:
     path: torrents.php
@@ -82,20 +99,28 @@
   search:
     paths:
       - path: torrents.php
-        categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
+        categorymappings: ["!", 410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413, 406, 408, 434]
       - path: adult.php
         categorymappings: [410, 429, 424, 430, 426, 437, 431, 432, 436, 425, 433, 411, 412, 413]
-    method: post
+      - path: music.php
+        categorymappings: [406, 408, 434]
     inputs:
       $raw: "{{range .Categories}}cat{{.}}=1&{{end}}"
       search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      incldead: 1
+      # 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: 0
-      inclbookmarked: 0
+      # 0 title 1 descr 3 uploaded 4 imdb url
       search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}"
+      # 0 and 1 or 2 exact
       search_mode: 0
+      sort: "{{ .Config.sort }}"
+      type: "{{ .Config.type }}"
+
     rows:
       selector: table.torrents > tbody > tr:has(table.torrentname)
+
     fields:
       title: # shortened for long release names
         selector: a[href^="details.php?id="] > b
@@ -121,6 +146,10 @@
         filters:
           - name: replace
             args: ["pic/nopic.jpg", ""]
+      imdb:
+        optional: true
+        selector: a[href*="www.imdb.com/title/tt"]
+        attribute: href
       size:
         selector: td.rowfollow:nth-last-child(6)
       grabs:
@@ -163,4 +192,4 @@
       description:
         selector: td:nth-child(2)
         remove: a, img
-# NexusPHP
+# NexusPHP Standard v1.5 Beta 4

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

@@ -809,12 +809,7 @@
       leechers:
         selector: td.leechmed > b
       downloadvolumefactor:
-        case:
-          img[src$="/images/gold.gif"]: 0
-          img[src$="/images/platinum.gif"]: 0
-          img[src$="/images/bronze.gif"]: 0.75
-          img[src$="/images/silver.gif"]: 0.5
-          "*": 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # engine n/a

src/Jackett.Common/Definitions/nntt.yml

@@ -7,6 +7,11 @@
   encoding: UTF-8
   links:
     - http://www.nntt.org/ # site does not support https ERR_CONNECTION_REFUSED
+    - https://nntt.black-mirror.xyz/
+    - https://nntt.unblocked.casa/
+    - https://nntt.proxyportal.fun/
+    - https://nntt.uk-unblock.xyz/
+    - https://nntt.ind-unblock.xyz/
 
   caps:
     categorymappings:

src/Jackett.Common/Definitions/nostalgic.yml

@@ -36,6 +36,7 @@
       - {id: 34, cat: Movies, desc: "Laserdiscs"}
       - {id: 35, cat: XXX, desc: "NSFW"}
       - {id: 36, cat: TV, desc: "Youtube Archives"}
+      - {id: 5, cat: Other, desc: "Other"}
 
     modes:
       search: [q]

src/Jackett.Common/Definitions/nyaasi.yml

@@ -7,6 +7,12 @@
   encoding: UTF-8
   links:
     - https://nyaa.si/
+    - https://nyaa.root.yt/
+    - https://nyaa.black-mirror.xyz/
+    - https://nyaa.unblocked.casa/
+    - https://nyaa.proxyportal.fun/
+    - https://nyaa.uk-unblock.xyz/
+    - https://nyaa.ind-unblock.xyz/
 
   settings:
     - name: cat-id

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -8,6 +8,12 @@
   followredirect: true
   links:
     - https://www.oxtorrent.com/
+    - https://www.oxtorrent.co/
+    - https://oxtorrent.black-mirror.xyz/
+    - https://oxtorrent.unblocked.casa/
+    - https://oxtrorrent.proxyportal.fun/
+    - https://oxtorrent.uk-unblock.xyz/
+    - https://oxtorrent.ind-unblock.xyz/
   legacylinks:
     - https://wwv.oxtorrent.com/
     - https://www.smartorrent.tv/

src/Jackett.Common/Definitions/parnuxi.yml

@@ -241,7 +241,7 @@
       date:
         text: "{{ if .Result.find_date }}{{ .Result.find_date}}{{else}}now{{end}}"
       downloadvolumefactor:
-        text: 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # phpBB

src/Jackett.Common/Definitions/pirateiro.yml

@@ -5,8 +5,10 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://pirateiro.com/
+    - https://pirateiro.unblockit.pro/
   legacylinks:
     - http://pirateiro.com/
 
@@ -60,7 +62,7 @@
         selector: td:nth-child(1) a:nth-child(2)
         attribute: href
       download:
-        # .torrent urls can be missing 
+        # .torrent urls can be missing
         optional: true
         selector: a[href$="/download"]
         attribute: href

src/Jackett.Common/Definitions/polishsource.yml

@@ -23,9 +23,9 @@
       - {id: 13, cat: XXX, desc: "XXX"}
 
     modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
+      search: [q, imdbid]
+      tv-search: [q, season, ep, imdbid]
+      movie-search: [q, imdbid]
 
   settings:
     - name: username
@@ -69,13 +69,14 @@
     test:
       path: browse.php
       selector: a[href^="logout.php"]
-        
+
   search:
     paths:
+    # https://polishsource.cz/browse.php?search=tt1598778&incldead=1&scene=0&pl=0&sub=&search_in=nfo
       - path: browse.php
     inputs:
       $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-      search: "{{ .Keywords }}"
+      search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
       # 0 onlyactive 1 all 2 onlydead
       incldead: 1
       # 0 all 1 scene 2 notscene 3 internal
@@ -85,7 +86,7 @@
       # subcat blank=all
       sub: ""
       # title both nfo
-      search_in: title
+      search_in: "{{ if .Query.IMDBID }}nfo{{else}}title{{end}}"
       sort: "{{ .Config.sort }}"
       type: "{{ .Config.type }}"
 

src/Jackett.Common/Definitions/pornolive.yml

@@ -78,7 +78,7 @@
           - name: split
             args: ["/", 1]
       downloadvolumefactor:
-        text: 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # TBDev

src/Jackett.Common/Definitions/pornorip.yml

@@ -212,7 +212,7 @@
           - name: dateparse
             args: "02 Jan 2006, 15:04"
       downloadvolumefactor:
-        text: 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # phpBB

src/Jackett.Common/Definitions/pornotor.yml

@@ -80,7 +80,7 @@
           - name: split
             args: ["/", 1]
       downloadvolumefactor:
-        text: 1
+        text: 0
       uploadvolumefactor:
         text: 1
 # TBDev

src/Jackett.Common/Definitions/prostylex.yml

@@ -7,6 +7,11 @@
   encoding: UTF-8
   links:
     - https://prostylex.org/
+    - https://prostylex.black-mirror.xyz/
+    - https://prostylex.unblocked.casa/
+    - https://prostylex.proxyportal.fun/
+    - https://prostylex.uk-unblock.xyz/
+    - https://prostylex.ind-unblock.xyz/
   legacylinks:
     - http://prostylex.com/
 

src/Jackett.Common/Definitions/pt99.yml

@@ -39,7 +39,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site
@@ -85,8 +85,8 @@
       # 0 all 1 bookmrk 2 not
       inclbookmarked: 0
       search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}"
-      # 0 title 1 descr 3 uploader 4 imdb
-      search_area: "{{ if .Query.IMDBID }}4{{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 AND 1 OR 2 exact
       search_mode: 0
       sort: "{{ .Config.sort }}"

src/Jackett.Common/Definitions/pthome.yml

@@ -36,7 +36,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/retroflix.yml

@@ -34,7 +34,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/rustorka.yml

@@ -743,7 +743,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: striprussian
       type: checkbox
       label: Strip Russian Letters

src/Jackett.Common/Definitions/rutor.yml

@@ -8,6 +8,12 @@
   links:
     - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
     - http://new-rutor.org/
+    - https://rutor.root.yt/
+    - https://rutor.black-mirror.xyz/
+    - https://rutor.unblocked.casa/
+    - https://rutor.proxyportal.fun/
+    - https://rutor.uk-unblock.xyz/
+    - https://rutor.ind-unblock.xyz/
   legacylinks:
     - http://live-rutor.org/ # domain expired 9 Feb 2020
 

src/Jackett.Common/Definitions/seedpeer.yml

@@ -1,60 +0,0 @@
----
-  site: seedpeer
-  name: Seedpeer
-  description: "Seedpeer is a Public torrent index"
-  language: en-us
-  type: public
-  encoding: UTF-8
-  links:
-    - https://seedpeer.me/
-
-  caps:
-    categories:
-      "other": Other
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings: []
-
-  download:
-    selector: a[href*="/torrent/"]
-    attribute: href
-
-  search:
-    # https://seedpeer.me/today
-    # https://seedpeer.me/search/Harry%20Potter
-    paths:
-      - path: "{{ if .Keywords }}search/{{ .Keywords }}{{else}}today{{end}}"
-
-    rows:
-      selector: table.table > tbody > tr:has(a[href^="/details/"])
-
-    fields:
-      category:
-        text: other
-      title:
-        selector: td:nth-child(1) a
-      details:
-        selector: td:nth-child(1) a
-        attribute: href
-      download:
-        selector: td:nth-child(1) a
-        attribute: href
-      date:
-        selector: td:nth-child(2)
-        filters:
-          - name: timeago
-      size:
-        selector: td:nth-child(3)
-      seeders:
-        selector: td:nth-child(4)
-      leechers:
-        selector: td:nth-child(5) 
-      downloadvolumefactor:
-        text: 0
-      uploadvolumefactor:
-        text: 1
-# engine n/a

src/Jackett.Common/Definitions/sharewood.yml

@@ -153,6 +153,8 @@
             args: ["semaine", "week"]
           - name: replace
             args: ["mois", "month"]
+          - name: replace
+            args: ["an", "year"]
           - name: append
             args: " ago"
       downloadvolumefactor:

src/Jackett.Common/Definitions/sktorrent.yml

@@ -28,7 +28,7 @@
       - {id: 5, cat: Movies, desc: "Filmy Kreslené"}
       - {id: 19, cat: Movies/HD, desc: "HD Filmy"}
       - {id: 29, cat: Movies/3D, desc: "3D Blu-ray"}
-      - {id: 43, cat: Movies/HD, desc: "UHD Filmy"}
+      - {id: 43, cat: Movies/UHD, desc: "UHD Filmy"}
       - {id: 28, cat: Movies/BluRay, desc: "Blu-ray"}
       - {id: 18, cat: PC/Games, desc: "Hry na Windows"}
       - {id: 30, cat: PC/Games, desc: "Hry na Konzole"}
@@ -85,9 +85,9 @@
           - name: diacritics
             args: replace
           - name: replace
-            args: ["serie", ""] 
+            args: ["serie", ""]
           - name: replace
-            args: ["Serie", ""] 
+            args: ["Serie", ""]
           - name: re_replace
             args: ["(\\d{2})\\.", "S$1"]
           - name: re_replace

src/Jackett.Common/Definitions/skytorrentsclone.yml

@@ -7,11 +7,17 @@
   encoding: UTF-8
   links:
     - https://www.skytorrents.lol/
+    - https://skytorrents.black-mirror.xyz/
+    - https://skytorrents.unblocked.casa/
+    - https://skytorrents.proxyportal.fun/
+    - https://skytorrents.uk-unblock.xyz/
+    - https://skytorrents.ind-unblock.xyz/
   legacylinks:
     - https://www.skytorrents.to/
 
   caps:
     categories:
+      "other": Other
       # category=
       "album": Audio
       "ebook": Books
@@ -53,13 +59,15 @@
       title:
         selector: td a
       category:
+        text: other
+      category|noappend:
         # try category=
-        optional: true
         selector: a.label[href*="category="]
-      category:
-        # try type=
         optional: true
+      category|noappend:
+        # try type=
         selector: a.label[href*="type="]
+        optional: true
       details:
         selector: td a
         attribute: href

src/Jackett.Common/Definitions/sporthd.yml

@@ -89,7 +89,7 @@
     - name: info
       type: info
       label: How to get the Cookie
-      default: "<ol><li>Login to this tracker in your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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>"
 
   login:
     method: cookie

src/Jackett.Common/Definitions/teamhd.yml

@@ -46,7 +46,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: striprussian
       type: checkbox
       label: Strip Russian Letters

src/Jackett.Common/Definitions/tenyardtracker.yml

@@ -5,6 +5,8 @@
   language: en-us
   type: private
   encoding: UTF-8
+  certificates:
+    - C77A88F4AC9798E3E5B18C4AA6CE2ABF32ECF025 # NET::ERR_CERT_COMMON_NAME_INVALID
   links:
     - https://tenyardtracker.com/
   legacylinks:
@@ -32,7 +34,7 @@
     test:
       path: my.php
       #selector: a[href="members.php?action=logout"]
-      
+
   ratio:
     path: browse.php
     selector: #status_bar

src/Jackett.Common/Definitions/tfile.yml

@@ -1,927 +0,0 @@
----
-  site: tfile
-  name: TFile
-  description: "TFile is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
-  language: ru-ru
-  type: public
-  encoding: windows-1251
-  links:
-    - http://search.tfile.me/
-  legacylinks:
-    - http://tfile.ru/
-    - http://megatfile.cc/
-
-  caps:
-    categorymappings:
-      # video
-      - {id: 4, cat: Movies/Foreign, desc: "Зарубежные фильмы"}
-      - {id: 1488, cat: Movies/Foreign, desc: "Рецензии на фильмы"}
-      - {id: 1379, cat: Movies/Foreign, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1225, cat: Movies/Foreign, desc: "Новинки кино"}
-      - {id: 1331, cat: Movies/Foreign, desc: "Антологии"}
-      - {id: 1248, cat: Movies/Foreign, desc: "Авторская озвучка"}
-      - {id: 1197, cat: Movies/Foreign, desc: "Азиатское кино"}
-      - {id: 1026, cat: Movies/Foreign, desc: "Арт-хаус и авторское кино"}
-      - {id: 293, cat: Movies/Foreign, desc: "Боевики /Action"}
-      - {id: 1227, cat: Movies/Foreign, desc: "Военные"}
-      - {id: 577, cat: Movies/Foreign, desc: "Вестерн"}
-      - {id: 298, cat: Movies/Foreign, desc: "Драмы / Мелодрамы"}
-      - {id: 297, cat: Movies/Foreign, desc: "Детективы"}
-      - {id: 290, cat: Movies/Foreign, desc: "Детское / Семейное кино"}
-      - {id: 299, cat: Movies/Foreign, desc: "Исторические"}
-      - {id: 230, cat: Movies/Foreign, desc: "Индийское кино"}
-      - {id: 303, cat: Movies/Foreign, desc: "Катастрофы"}
-      - {id: 292, cat: Movies/Foreign, desc: "Комедии"}
-      - {id: 1240, cat: Movies/Foreign, desc: "Короткометражные фильмы"}
-      - {id: 304, cat: Movies/Foreign, desc: "Криминал"}
-      - {id: 296, cat: Movies/Foreign, desc: "Мистика /  Ужасы"}
-      - {id: 300, cat: Movies/Foreign, desc: "Мюзиклы"}
-      - {id: 1332, cat: Movies/Foreign, desc: "Некондиционные"}
-      - {id: 1324, cat: Movies/Foreign, desc: "Немое кино"}
-      - {id: 691, cat: Movies/Foreign, desc: "Оперы и балеты - театральные постановки"}
-      - {id: 301, cat: Movies/Foreign, desc: "Пародии"}
-      - {id: 294, cat: Movies/Foreign, desc: "Приключения / Adventure"}
-      - {id: 1241, cat: Movies/Foreign, desc: "Режиссерские версии"}
-      - {id: 498, cat: Movies/Foreign, desc: "Триллеры"}
-      - {id: 367, cat: Movies/Foreign, desc: "Трейлеры и доп.материалы"}
-      - {id: 574, cat: Movies/Foreign, desc: "Фильмы HDRip / BDRip"}
-      - {id: 1226, cat: Movies/Foreign, desc: "Фильмы о спорте"}
-      - {id: 295, cat: Movies/Foreign, desc: "Фантастика / Фэнтези"}
-      - {id: 189, cat: Movies/Foreign, desc: "Фильмы на иностранном языке"}
-      - {id: 1224, cat: Movies/Foreign, desc: "Фильмографии актеров"}
-      - {id: 1388, cat: Movies/Foreign, desc: "Фильмографии режиссеров"}
-      - {id: 1387, cat: Movies/Foreign, desc: "Фильмографии (тематические)"}
-      - {id: 1276, cat: Movies/Foreign, desc: "Фильмы стран СНГ - без перевода"}
-      - {id: 1917, cat: Movies/Foreign, desc: "Недооформленное"}
-      - {id: 2022, cat: Movies/Foreign, desc: "Мини-сериалы"}
-      - {id: 2055, cat: Movies/Foreign, desc: "Биографии"}
-      - {id: 2056, cat: Movies/Foreign, desc: "Разное"}
-      - {id: 2057, cat: Movies/Foreign, desc: "На проверку"}
-      - {id: 2058, cat: Movies/Foreign, desc: "Сборка"}
-      - {id: 1889, cat: Movies, desc: "Классика мирового кино"}
-      - {id: 1907, cat: Movies, desc: "Авторская озвучка"}
-      - {id: 1908, cat: Movies, desc: "Азиатское кино"}
-      - {id: 1909, cat: Movies, desc: "Арт-хаус и авторское кино"}
-      - {id: 1910, cat: Movies, desc: "Боевики / Action"}
-      - {id: 1911, cat: Movies, desc: "Вестерны"}
-      - {id: 1890, cat: Movies, desc: "Военные"}
-      - {id: 1891, cat: Movies, desc: "Детективы"}
-      - {id: 1892, cat: Movies, desc: "Детское / Семейное кино"}
-      - {id: 1893, cat: Movies, desc: "Драмы"}
-      - {id: 1912, cat: Movies, desc: "Индийское кино"}
-      - {id: 1899, cat: Movies, desc: "Исторические"}
-      - {id: 1894, cat: Movies, desc: "Катастрофы"}
-      - {id: 1895, cat: Movies, desc: "Комедии"}
-      - {id: 1903, cat: Movies, desc: "Короткометражное кино"}
-      - {id: 1896, cat: Movies, desc: "Криминал"}
-      - {id: 1897, cat: Movies, desc: "Мелодрамы"}
-      - {id: 1898, cat: Movies, desc: "Мистика / Ужасы"}
-      - {id: 1900, cat: Movies, desc: "Мюзиклы"}
-      - {id: 1902, cat: Movies, desc: "Немое кино"}
-      - {id: 1901, cat: Movies, desc: "Оперы и балеты / Театр"}
-      - {id: 1904, cat: Movies, desc: "Приключения"}
-      - {id: 1905, cat: Movies, desc: "Триллеры"}
-      - {id: 1906, cat: Movies, desc: "Фантастика / Фэнтези"}
-      - {id: 1913, cat: Movies, desc: "Фильмы на иностранном языке"}
-      - {id: 1918, cat: Movies, desc: "Недооформленное"}
-      - {id: 1946, cat: Movies, desc: "Антологии"}
-      - {id: 1947, cat: Movies, desc: "Некондиционные"}
-      - {id: 15, cat: Movies, desc: "Наше кино"}
-      - {id: 1374, cat: Movies, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1242, cat: Movies, desc: "Новинки"}
-      - {id: 1508, cat: Movies, desc: "Авторское кино / Арт-хаус"}
-      - {id: 1165, cat: Movies, desc: "Обсуждение фильмов"}
-      - {id: 1166, cat: Movies, desc: "Боевики"}
-      - {id: 1245, cat: Movies, desc: "Военное кино"}
-      - {id: 1158, cat: Movies, desc: "Детективы"}
-      - {id: 532, cat: Movies, desc: "Детское / Семейное кино"}
-      - {id: 1167, cat: Movies, desc: "Драмы / Мелодрамы"}
-      - {id: 1159, cat: Movies, desc: "Исторические"}
-      - {id: 1244, cat: Movies, desc: "Короткометражное кино"}
-      - {id: 1160, cat: Movies, desc: "Комедии"}
-      - {id: 1173, cat: Movies, desc: "Мистика / Ужасы"}
-      - {id: 1238, cat: Movies, desc: "Криминал"}
-      - {id: 1678, cat: Movies, desc: "Мини-сериалы (4 серии)"}
-      - {id: 1161, cat: Movies, desc: "Мюзиклы"}
-      - {id: 1320, cat: Movies, desc: "Немое кино"}
-      - {id: 1162, cat: Movies, desc: "Приключения"}
-      - {id: 1246, cat: Movies, desc: "Разное"}
-      - {id: 496, cat: Movies, desc: "Спектакли и театральные постановки"}
-      - {id: 1164, cat: Movies, desc: "Трейлеры и доп. материалы"}
-      - {id: 1163, cat: Movies, desc: "Триллеры"}
-      - {id: 1172, cat: Movies, desc: "Фантастика / Фэнтези"}
-      - {id: 1243, cat: Movies, desc: "Фильмографии актеров"}
-      - {id: 1386, cat: Movies, desc: "Фильмографии режиссеров"}
-      - {id: 1312, cat: Movies, desc: "Фильмотека"}
-      - {id: 1919, cat: Movies, desc: "Недооформленное"}
-      - {id: 1989, cat: Movies, desc: "Некондиционные"}
-      - {id: 1536, cat: Movies, desc: "Советское кино"}
-      - {id: 1577, cat: Movies, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1554, cat: Movies, desc: "Боевики"}
-      - {id: 1537, cat: Movies, desc: "Военное кино"}
-      - {id: 1538, cat: Movies, desc: "Детективы, триллеры"}
-      - {id: 1539, cat: Movies, desc: "Детское / Семейное кино"}
-      - {id: 1540, cat: Movies, desc: "Драмы"}
-      - {id: 1541, cat: Movies, desc: "Исторические"}
-      - {id: 1542, cat: Movies, desc: "Комедии"}
-      - {id: 1543, cat: Movies, desc: "Короткометражное кино"}
-      - {id: 1555, cat: Movies, desc: "Мелодрамы"}
-      - {id: 1680, cat: Movies, desc: "Мини-сериалы (4 серии)"}
-      - {id: 1544, cat: Movies, desc: "Немое кино"}
-      - {id: 1556, cat: Movies, desc: "Мюзиклы"}
-      - {id: 1545, cat: Movies, desc: "Приключения"}
-      - {id: 1546, cat: Movies, desc: "Спектакли / Театральные постановки"}
-      - {id: 1547, cat: Movies, desc: "Фантастика"}
-      - {id: 1848, cat: Movies, desc: "Фильмы о спорте"}
-      - {id: 1548, cat: Movies, desc: "Фильмы без перевода"}
-      - {id: 1550, cat: Movies, desc: "Фильмографии"}
-      - {id: 1620, cat: Movies, desc: "Некондиционные / На замену"}
-      - {id: 1920, cat: Movies, desc: "Недооформленные"}
-      - {id: 1968, cat: Movies, desc: "Криминал"}
-      - {id: 193, cat: Movies, desc: "Фильмы в HD/BD и DVD"}
-      - {id: 1237, cat: Movies, desc: "Инструкции, советы, FAQ"}
-      - {id: 1420, cat: Movies, desc: "BD3D/BDRip 3D"}
-      - {id: 1036, cat: Movies, desc: "HD DVD/BD"}
-      - {id: 449, cat: Movies, desc: "HD DVD/BD Remux"}
-      - {id: 448, cat: Movies, desc: "HD DVD/BD/HDTV Rip"}
-      - {id: 447, cat: Movies, desc: "DVD9"}
-      - {id: 537, cat: Movies, desc: "DVD5"}
-      - {id: 1170, cat: Movies, desc: "Некондиционные раздачи"}
-      - {id: 1921, cat: Movies, desc: "Недооформленное"}
-      - {id: 1996, cat: Movies, desc: "RG HDFilms"}
-      - {id: 2025, cat: Movies, desc: "Ultra-HD / 4K"}
-      - {id: 37, cat: TV/FOREIGN, desc: "Зарубежные сериалы"}
-      - {id: 1323, cat: TV/FOREIGN, desc: "Новинки"}
-      - {id: 1252, cat: TV/FOREIGN, desc: "Важно! Правила, инструкции, советы..."}
-      - {id: 697, cat: TV/FOREIGN, desc: "Азиатские сериалы"}
-      - {id: 172, cat: TV/FOREIGN, desc: "Анатомия страсти"}
-      - {id: 311, cat: TV/FOREIGN, desc: "Баффи - Истребительница Вампиров / Ангел"}
-      - {id: 183, cat: TV/FOREIGN, desc: "Беверли Хиллз"}
-      - {id: 130, cat: TV/FOREIGN, desc: "Вавилон 5"}
-      - {id: 1024, cat: TV/FOREIGN, desc: "Грань"}
-      - {id: 139, cat: TV/FOREIGN, desc: "Герои"}
-      - {id: 1023, cat: TV/FOREIGN, desc: "Говорящая с призраками"}
-      - {id: 392, cat: TV/FOREIGN, desc: "Декстер"}
-      - {id: 342, cat: TV/FOREIGN, desc: "Доктор Хаус"}
-      - {id: 1612, cat: TV/FOREIGN, desc: "Дневники вампира / Настоящая кровь"}
-      - {id: 1015, cat: TV/FOREIGN, desc: "Доктор Кто"}
-      - {id: 96, cat: TV/FOREIGN, desc: "Друзья"}
-      - {id: 353, cat: TV/FOREIGN, desc: "Женаты, с детьми"}
-      - {id: 285, cat: TV/FOREIGN, desc: "Зачарованные"}
-      - {id: 154, cat: TV/FOREIGN, desc: "Звездные Врата"}
-      - {id: 168, cat: TV/FOREIGN, desc: "Клиника"}
-      - {id: 1849, cat: TV/FOREIGN, desc: "Коломбо"}
-      - {id: 1020, cat: TV/FOREIGN, desc: "Кости"}
-      - {id: 123, cat: TV/FOREIGN, desc: "Любовь и тайны Сансет Бич"}
-      - {id: 1614, cat: TV/FOREIGN, desc: "Менталист / Касл"}
-      - {id: 1615, cat: TV/FOREIGN, desc: "Мерлин"}
-      - {id: 117, cat: TV/FOREIGN, desc: "Мыльные оперы"}
-      - {id: 1611, cat: TV/FOREIGN, desc: "Место преступления / CSI"}
-      - {id: 1616, cat: TV/FOREIGN, desc: "Морская полиция / NCIS"}
-      - {id: 1617, cat: TV/FOREIGN, desc: "Однажды в Сказке / Гримм"}
-      - {id: 152, cat: TV/FOREIGN, desc: "Отчаянные домохозяйки"}
-      - {id: 105, cat: TV/FOREIGN, desc: "Остаться в живых"}
-      - {id: 127, cat: TV/FOREIGN, desc: "Побег из тюрьмы"}
-      - {id: 1030, cat: TV/FOREIGN, desc: "Пуаро Агаты Кристи"}
-      - {id: 150, cat: TV/FOREIGN, desc: "Скорая помощь"}
-      - {id: 328, cat: TV/FOREIGN, desc: "Сверхъестественное"}
-      - {id: 149, cat: TV/FOREIGN, desc: "Секретные Материалы"}
-      - {id: 136, cat: TV/FOREIGN, desc: "Секс в большом городе"}
-      - {id: 169, cat: TV/FOREIGN, desc: "Тайны Смолвиля"}
-      - {id: 1421, cat: TV/FOREIGN, desc: "Теория большого взрыва / Как я встретил вашу маму"}
-      - {id: 767, cat: TV/FOREIGN, desc: "Части тела"}
-      - {id: 309, cat: TV/FOREIGN, desc: "Чертова служба в госпитале МЭШ"}
-      - {id: 377, cat: TV/FOREIGN, desc: "Элен и ребята"}
-      - {id: 1017, cat: TV/FOREIGN, desc: "Эврика"}
-      - {id: 1923, cat: TV/FOREIGN, desc: "Недооформленные"}
-      - {id: 1966, cat: TV/FOREIGN, desc: "Звёздный крейсер 'Галактика'"}
-      - {id: 2041, cat: TV/FOREIGN, desc: "Marvel"}
-      - {id: 2042, cat: TV/FOREIGN, desc: "DC Comics"}
-      - {id: 1590, cat: TV, desc: "Отечественные сериалы"}
-      - {id: 1591, cat: TV, desc: "Новинки"}
-      - {id: 1592, cat: TV, desc: "Важно! Правила, инструкции, советы..."}
-      - {id: 1607, cat: TV, desc: "Советские сериалы"}
-      - {id: 1593, cat: TV, desc: "Бандитский Петербург"}
-      - {id: 1594, cat: TV, desc: "Глухарь / Пятницкий / Карпов"}
-      - {id: 1595, cat: TV, desc: "Каменская"}
-      - {id: 1596, cat: TV, desc: "Морские дьяволы"}
-      - {id: 1597, cat: TV, desc: "Моя прекрасная няня"}
-      - {id: 1598, cat: TV, desc: "Возвращение Мухтара"}
-      - {id: 1599, cat: TV, desc: "Ментовские войны"}
-      - {id: 1600, cat: TV, desc: "Рублевка Live"}
-      - {id: 1844, cat: TV, desc: "Сваты"}
-      - {id: 1601, cat: TV, desc: "След"}
-      - {id: 1602, cat: TV, desc: "Солдаты"}
-      - {id: 1603, cat: TV, desc: "Счастливы вместе"}
-      - {id: 1604, cat: TV, desc: "Тайны следствия"}
-      - {id: 1605, cat: TV, desc: "Убойная сила / Улицы разбитых фонарей. Менты"}
-      - {id: 1681, cat: TV, desc: "Универ / Саша Таня"}
-      - {id: 1924, cat: TV, desc: "Недооформленные"}
-      - {id: 1964, cat: TV, desc: "Москва.Три вокзала"}
-      - {id: 2023, cat: TV, desc: "Воронины"}
-      - {id: 17, cat: TV, desc: "Мультфильмы"}
-      - {id: 1415, cat: TV, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1416, cat: TV, desc: "Трейлеры и доп. материалы"}
-      - {id: 1146, cat: TV, desc: "Новинки"}
-      - {id: 1147, cat: TV, desc: "Мультфильмы (DVD)"}
-      - {id: 1156, cat: TV, desc: "Мультфильмы (HD/BD Video)"}
-      - {id: 1534, cat: TV, desc: "3D Мультфильмы"}
-      - {id: 1142, cat: TV, desc: "Короткометражные мультфильмы"}
-      - {id: 29, cat: TV, desc: "Отечественные мультфильмы"}
-      - {id: 85, cat: TV, desc: "Иностранные мультфильмы"}
-      - {id: 1514, cat: TV, desc: "Отечественные мультсериалы"}
-      - {id: 1148, cat: TV, desc: "Иностранные мультсериалы"}
-      - {id: 1515, cat: TV, desc: "Сборники мультфильмов"}
-      - {id: 384, cat: TV, desc: "Развивающие мультфильмы"}
-      - {id: 216, cat: TV, desc: "Мультфильмы без перевода"}
-      - {id: 1149, cat: TV, desc: "Мультфильмы с украинской звуковой дорожкой"}
-      - {id: 232, cat: TV, desc: "Walt Disney / Pixar"}
-      - {id: 1535, cat: TV, desc: "Marvel / DC"}
-      - {id: 506, cat: TV, desc: "Аватар"}
-      - {id: 1517, cat: TV, desc: "Аладдин"}
-      - {id: 1516, cat: TV, desc: "Американский Папа"}
-      - {id: 1000, cat: TV, desc: "Галактический Футбол"}
-      - {id: 1518, cat: TV, desc: "Гриффины"}
-      - {id: 237, cat: TV, desc: "Губка Боб Квадратные Штаны"}
-      - {id: 243, cat: TV, desc: "Даша - следопыт"}
-      - {id: 1150, cat: TV, desc: "Звёздные войны"}
-      - {id: 244, cat: TV, desc: "Земля до начала времен"}
-      - {id: 239, cat: TV, desc: "Пингвины из Мадагаскара"}
-      - {id: 197, cat: TV, desc: "Саус парк"}
-      - {id: 236, cat: TV, desc: "Симпсоны"}
-      - {id: 1151, cat: TV, desc: "Скуби-Ду"}
-      - {id: 235, cat: TV, desc: "Том и Джерри"}
-      - {id: 1152, cat: TV, desc: "Трансформеры"}
-      - {id: 234, cat: TV, desc: "Футурама"}
-      - {id: 1153, cat: TV, desc: "Черепашки ниндзя"}
-      - {id: 1018, cat: TV, desc: "Шрек"}
-      - {id: 1143, cat: TV, desc: "Экранки (Архив)"}
-      - {id: 1925, cat: TV, desc: "Недооформленные"}
-      - {id: 1563, cat: TV, desc: "Советские мультфильмы"}
-      - {id: 1564, cat: TV, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1565, cat: TV, desc: "RG.Mult-USSR"}
-      - {id: 1566, cat: TV, desc: "Союзмультфильм"}
-      - {id: 1567, cat: TV, desc: "Кукольные мультфильмы"}
-      - {id: 1568, cat: TV, desc: "Музыкальные мультфильмы"}
-      - {id: 1569, cat: TV, desc: "Мультфильмы (HD/BD Video)"}
-      - {id: 1570, cat: TV, desc: "Мультфильмы (DVD)"}
-      - {id: 1571, cat: TV, desc: "Короткометражные мультфильмы"}
-      - {id: 1572, cat: TV, desc: "Полнометражные мультфильмы"}
-      - {id: 1574, cat: TV, desc: "Мультсериалы"}
-      - {id: 1575, cat: TV, desc: "Сборники"}
-      - {id: 1576, cat: TV, desc: "Мультфильмы для взрослых"}
-      - {id: 1926, cat: TV, desc: "Недооформленные"}
-      - {id: 175, cat: TV/Anime, desc: "Аниме"}
-      - {id: 1881, cat: TV/Anime, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1145, cat: TV/Anime, desc: "Основной"}
-      - {id: 1140, cat: TV/Anime, desc: "Новинки"}
-      - {id: 1253, cat: TV/Anime, desc: "Аниме ( HWP )"}
-      - {id: 1157, cat: TV/Anime, desc: "Аниме ( OVA, OAV, ONA )"}
-      - {id: 727, cat: TV/Anime, desc: "Аниме (HD Video)"}
-      - {id: 1551, cat: TV/Anime, desc: "Аниме (BDRemux)"}
-      - {id: 567, cat: TV/Anime, desc: "Аниме ( DVD )"}
-      - {id: 1254, cat: TV/Anime, desc: "Аниме ( PSP, КПК, Телефоны )"}
-      - {id: 219, cat: TV/Anime, desc: "Полнометражное аниме"}
-      - {id: 568, cat: TV/Anime, desc: "Аниме без перевода"}
-      - {id: 974, cat: TV/Anime, desc: "Дорамы"}
-      - {id: 495, cat: TV/Anime, desc: "Аниме клипы / AMV"}
-      - {id: 743, cat: TV/Anime, desc: "OST"}
-      - {id: 494, cat: TV/Anime, desc: "Манга"}
-      - {id: 401, cat: TV/Anime, desc: "Блич / Bleach"}
-      - {id: 731, cat: TV/Anime, desc: "Ван-Пис / One Piece"}
-      - {id: 499, cat: TV/Anime, desc: "Гандам / Gundam"}
-      - {id: 500, cat: TV/Anime, desc: "Драгонболл / Dragon Ball"}
-      - {id: 538, cat: TV/Anime, desc: "Инуяша - Пес-демон / Inuyasha - Sengoku o-Togi Zoushi"}
-      - {id: 206, cat: TV/Anime, desc: "Наруто / Naruto"}
-      - {id: 1040, cat: TV/Anime, desc: "Подручный бездарной Луизы / Zero no Tsukaima"}
-      - {id: 446, cat: TV/Anime, desc: "Покемон / Рokemon"}
-      - {id: 1005, cat: TV/Anime, desc: "Призрак в доспехах / Ghost in the Shell"}
-      - {id: 210, cat: TV/Anime, desc: "Рубаки / Slayers"}
-      - {id: 203, cat: TV/Anime, desc: "Сейлор Мун / Sailor Moon"}
-      - {id: 207, cat: TV/Anime, desc: "Стальной алхимик / Fullmetal alchemist"}
-      - {id: 204, cat: TV/Anime, desc: "Тетрадь смерти / Death Note"}
-      - {id: 1255, cat: TV/Anime, desc: "Фейри Тейл / Fairy Tail"}
-      - {id: 202, cat: TV/Anime, desc: "Обсуждение Аниме"}
-      - {id: 1141, cat: TV/Anime, desc: "Экранки (архив)"}
-      - {id: 1927, cat: TV/Anime, desc: "Недооформленные"}
-      - {id: 16, cat: TV/Documentary, desc: "Документальное кино"}
-      - {id: 1380, cat: TV/Documentary, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1425, cat: TV/Documentary, desc: "Новинки эфира"}
-      - {id: 1438, cat: TV/Documentary, desc: "Фильмы в 3D (Blu-Ray / BDRip)"}
-      - {id: 1333, cat: TV/Documentary, desc: "Blu-Ray / BDRip / HDTV / DVD 5,9"}
-      - {id: 187, cat: TV/Documentary, desc: "Армия. Войны и конфликты"}
-      - {id: 1062, cat: TV/Documentary, desc: "Биографии. Личности"}
-      - {id: 1310, cat: TV/Documentary, desc: "Видеолекции"}
-      - {id: 1059, cat: TV/Documentary, desc: "Вторая мировая война"}
-      - {id: 1033, cat: TV/Documentary, desc: "Исторические"}
-      - {id: 1509, cat: TV/Documentary, desc: "Классика мирового кино"}
-      - {id: 1193, cat: TV/Documentary, desc: "Космос"}
-      - {id: 1195, cat: TV/Documentary, desc: "Культура и искусство"}
-      - {id: 1064, cat: TV/Documentary, desc: "Криминал"}
-      - {id: 1063, cat: TV/Documentary, desc: "Катастрофы"}
-      - {id: 1028, cat: TV/Documentary, desc: "Спецслужбы / Теории Заговоров / Безопастность"}
-      - {id: 1058, cat: TV/Documentary, desc: "Мир вокруг нас"}
-      - {id: 1019, cat: TV/Documentary, desc: "Научно-познавательные"}
-      - {id: 490, cat: TV/Documentary, desc: "Непознанное и сверхъестественное"}
-      - {id: 1397, cat: TV/Documentary, desc: "Обновляемые раздачи"}
-      - {id: 1065, cat: TV/Documentary, desc: "Путешествия и туризм"}
-      - {id: 1419, cat: TV/Documentary, desc: "Политика"}
-      - {id: 1194, cat: TV/Documentary, desc: "Релакс"}
-      - {id: 1070, cat: TV/Documentary, desc: "Разное"}
-      - {id: 274, cat: TV/Documentary, desc: "Рыбалка и охота"}
-      - {id: 1383, cat: TV/Documentary, desc: "СуперПаки"}
-      - {id: 1334, cat: TV/Documentary, desc: "Советское кино"}
-      - {id: 1067, cat: TV/Documentary, desc: "Ток-шоу, телешоу и игры"}
-      - {id: 1068, cat: TV/Documentary, desc: "Телевизионные передачи"}
-      - {id: 1066, cat: TV/Documentary, desc: "Тайны и загадки"}
-      - {id: 1069, cat: TV/Documentary, desc: "Философия"}
-      - {id: 1060, cat: TV/Documentary, desc: "Техника и вооружение"}
-      - {id: 1915, cat: TV/Documentary, desc: "Экстрим"}
-      - {id: 1922, cat: TV/Documentary, desc: "Недооформленные"}
-      - {id: 2021, cat: TV/Documentary, desc: "Новости"}
-      - {id: 19, cat: TV, desc: "Приколы и юмор"}
-      - {id: 1872, cat: TV, desc: "Comedy Club / Другое"}
-      - {id: 1284, cat: TV, desc: "33 квадратных метра / О.С.П. - студия"}
-      - {id: 1294, cat: TV, desc: "6 кадров"}
-      - {id: 1301, cat: TV, desc: "Аудио и видео ролики"}
-      - {id: 1288, cat: TV, desc: "Большая разница"}
-      - {id: 1291, cat: TV, desc: "Голые и смешные"}
-      - {id: 1309, cat: TV, desc: "Городок / В городке"}
-      - {id: 39, cat: TV, desc: "КВН"}
-      - {id: 1285, cat: TV, desc: "Кривое Зеркало"}
-      - {id: 1290, cat: TV, desc: "Маски-шоу"}
-      - {id: 1306, cat: TV, desc: "Мульт личности"}
-      - {id: 1295, cat: TV, desc: "Наша Belarussia / Файна Юкрайна"}
-      - {id: 1300, cat: TV, desc: "Осторожно, Модерн!"}
-      - {id: 1302, cat: TV, desc: "ПостКВН | Другое"}
-      - {id: 1287, cat: TV, desc: "Прожекторперисхилтон"}
-      - {id: 1307, cat: TV, desc: "Розыгрыш"}
-      - {id: 1292, cat: TV, desc: "Сатирики и юмористы, ТВ-шоу"}
-      - {id: 1299, cat: TV, desc: "Слава Богу, ты пришел!"}
-      - {id: 1297, cat: TV, desc: "Смех без правил / Убойная лига / Убойной ночи / Убойный вечер"}
-      - {id: 1293, cat: TV, desc: "Украинские Шоу"}
-      - {id: 1888, cat: TV, desc: "Уральские пельмени"}
-      - {id: 1286, cat: TV, desc: "X Фактор / Фактор A | Другое"}
-      - {id: 1298, cat: TV, desc: "Хорошие Шутки"}
-      - {id: 1296, cat: TV, desc: "Южное Бутово"}
-      - {id: 1519, cat: TV, desc: "Jackass / Чудаки и Придурки"}
-      - {id: 1303, cat: TV, desc: "Вечерний Ургант / Другое"}
-      - {id: 1527, cat: TV, desc: "+100500 / This is хорошо | Другое"}
-      - {id: 1928, cat: TV, desc: "Недооформленные"}
-      - {id: 1097, cat: TV, desc: "Обучающее видео и видеоуроки"}
-      - {id: 533, cat: TV, desc: "Гимнастика, фитнес, йога"}
-      - {id: 271, cat: TV, desc: "Другое"}
-      - {id: 1231, cat: TV, desc: "Музыкальная школа"}
-      - {id: 1230, cat: TV, desc: "Технические фильмы"}
-      - {id: 1229, cat: TV, desc: "Сделай сам!"}
-      - {id: 1228, cat: TV, desc: "Политика"}
-      - {id: 1106, cat: TV, desc: "Бизнес, экономика, финансы"}
-      - {id: 1108, cat: TV, desc: "Компьютерная графика"}
-      - {id: 1105, cat: TV, desc: "Для детей и родителей"}
-      - {id: 1100, cat: TV, desc: "Здоровье"}
-      - {id: 1101, cat: TV, desc: "Иностранные языки"}
-      - {id: 1107, cat: TV, desc: "Компьютерные видеоуроки"}
-      - {id: 1110, cat: TV, desc: "Работа с аудио и видео"}
-      - {id: 1098, cat: TV, desc: "Салон красоты"}
-      - {id: 1109, cat: TV, desc: "Операционные системы"}
-      - {id: 1111, cat: TV, desc: "Офисные программы"}
-      - {id: 1104, cat: TV, desc: "Психология"}
-      - {id: 1322, cat: TV, desc: "Спортивные уроки"}
-      - {id: 1102, cat: TV, desc: "Стройка и ремонт"}
-      - {id: 1099, cat: TV, desc: "Учимся танцевать"}
-      - {id: 1103, cat: TV, desc: "Кулинария"}
-      - {id: 1929, cat: TV, desc: "Недооформленные"}
-      - {id: 1948, cat: TV, desc: "Сад, огород"}
-      - {id: 1963, cat: TV, desc: "R.G. Obuchalka"}
-      - {id: 2027, cat: TV, desc: "Друзья наши меньшие"}
-      - {id: 978, cat: TV, desc: "Мобильное видео"}
-      - {id: 1512, cat: TV, desc: "iPad"}
-      - {id: 982, cat: TV, desc: "PSP"}
-      - {id: 980, cat: TV, desc: "Телефоны/Смартфоны"}
-      - {id: 981, cat: TV, desc: "КПК"}
-      - {id: 979, cat: TV, desc: "iPhone/iPod"}
-      - {id: 1119, cat: TV, desc: "Другие устройства"}
-      - {id: 1930, cat: TV, desc: "Недооформленное"}
-      - {id: 1390, cat: Audio, desc: "Звуковые дорожки"}
-      - {id: 1418, cat: Audio, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1422, cat: Audio, desc: "Озвучивание / перевод от: пользователей  tfile"}
-      - {id: 1520, cat: Audio, desc: "Озвучивание от:  Zamez"}
-      - {id: 1405, cat: Audio, desc: "Авторский перевод. Переводчики"}
-      - {id: 1400, cat: Audio, desc: "Озвучка от Антона Карповского"}
-      - {id: 1402, cat: Audio, desc: "Мультфильмы / Аниме"}
-      - {id: 1609, cat: Audio, desc: "Наши мультфильмы (на иностранном языке)"}
-      - {id: 1403, cat: Audio, desc: "Наше кино (на иностранном языке)"}
-      - {id: 1398, cat: Audio, desc: "HD / BD"}
-      - {id: 1399, cat: Audio, desc: "Разное"}
-      - {id: 1401, cat: Audio, desc: "Сериалы"}
-      - {id: 1404, cat: Audio, desc: "Фильмы"}
-      - {id: 1931, cat: Audio, desc: "Недооформленное"}
-      - {id: 2020, cat: Audio, desc: "Озвучка от Хихикающего Доктора"}
-      - {id: 2024, cat: Audio, desc: "Озвучка от Solod"}
-      # music
-      - {id: 1626, cat: Audio, desc: "Предложения по улучшению и развитию раздела 'Музыка'"}
-      - {id: 1631, cat: Audio, desc: "Жалобы на спам в релизах"}
-      - {id: 1630, cat: Audio, desc: "Предложения по развитию Релиз-Группы -  rs.bandito.mus"}
-      - {id: 1629, cat: Audio, desc: "Предложения по добавлению новых подразделов  в конкретном разделе"}
-      - {id: 1628, cat: Audio, desc: "Предложения по Lossless-разделу"}
-      - {id: 1627, cat: Audio, desc: "Предложения по Lossy-разделу"}
-      - {id: 1632, cat: Audio, desc: "Другие предложения"}
-      - {id: 1633, cat: Audio, desc: "Архив предложений"}
-      - {id: 51, cat: Audio, desc: "Pop/ Eurodance/ Disco/ Synthpop/ Spacesynth/ Electronic"}
-      - {id: 1114, cat: Audio, desc: "Синглы и EP"}
-      - {id: 1199, cat: Audio, desc: "Сборники (общие - 50х50)"}
-      - {id: 1625, cat: Audio, desc: "Евроданс / Disco / Synthpop / Spacesynth"}
-      - {id: 1637, cat: Audio, desc: "Зарубежная Поп-музыка"}
-      - {id: 1652, cat: Audio, desc: "EuroMix"}
-      - {id: 1843, cat: Audio, desc: "Музыка смешанных жанров"}
-      - {id: 1952, cat: Audio, desc: "Недооформленные"}
-      - {id: 61, cat: Audio, desc: "Rap, Hip-hop, R'n'B"}
-      - {id: 1116, cat: Audio, desc: "Синглы и EP"}
-      - {id: 1660, cat: Audio, desc: "Зарубежный Rap, Hip-Hop, R'n'B"}
-      - {id: 1203, cat: Audio, desc: "Сборники"}
-      - {id: 1959, cat: Audio, desc: "Недооформленные"}
-      - {id: 56, cat: Audio, desc: "Rock/ Punk/ Metal/ Alternative"}
-      - {id: 1115, cat: Audio, desc: "Синглы и EP"}
-      - {id: 1201, cat: Audio, desc: "Сборники (общие)"}
-      - {id: 1648, cat: Audio, desc: "Зарубежный рок (сборники)"}
-      - {id: 1954, cat: Audio, desc: "Недооформленные"}
-      - {id: 186, cat: Audio, desc: "Electronic music"}
-      - {id: 1117, cat: Audio, desc: "Синглы и EP"}
-      - {id: 1207, cat: Audio, desc: "Сборники"}
-      - {id: 1118, cat: Audio, desc: "Dj-миксы и радиошоу"}
-      - {id: 531, cat: Audio, desc: "Psy/Goa trance"}
-      - {id: 504, cat: Audio, desc: "Chillout / Lounge / Downtempo / Trip-Hop"}
-      - {id: 1214, cat: Audio, desc: "Electro"}
-      - {id: 479, cat: Audio, desc: "Dance / Club"}
-      - {id: 478, cat: Audio, desc: "Techno/Minimal"}
-      - {id: 477, cat: Audio, desc: "Electro-House"}
-      - {id: 1213, cat: Audio, desc: "Hardstyle"}
-      - {id: 476, cat: Audio, desc: "House"}
-      - {id: 475, cat: Audio, desc: "Trance"}
-      - {id: 315, cat: Audio, desc: "Drum & Bass / Jungle / Breakbeat / Dubstep / IDM / Trap"}
-      - {id: 1955, cat: Audio, desc: "Недооформленные"}
-      - {id: 1635, cat: Audio, desc: "Reggae, Ska, Dub"}
-      - {id: 1636, cat: Audio, desc: "New Age, Relax, Meditative"}
-      - {id: 1641, cat: Audio, desc: "Релакс"}
-      - {id: 493, cat: Audio/Lossless, desc: "Lossless"}
-      - {id: 1439, cat: Audio/Lossless, desc: "Помощь и Инструкции"}
-      - {id: 1505, cat: Audio/Lossless, desc: "Дискографии (Джаз, Блюз, Соул)"}
-      - {id: 1453, cat: Audio/Lossless, desc: "Дискографии (Rap, Hip-hop, R'n'B)"}
-      - {id: 1452, cat: Audio/Lossless, desc: "Дискографии (Шансон)"}
-      - {id: 1451, cat: Audio/Lossless, desc: "Дискографии (Поп музыка)"}
-      - {id: 1450, cat: Audio/Lossless, desc: "Дискографии (Электронная музыка)"}
-      - {id: 1449, cat: Audio/Lossless, desc: "Дискографии (Рок, Панк, Метал, Альтернатив)"}
-      - {id: 1445, cat: Audio/Lossless, desc: "Джаз, Блюз, Соул"}
-      - {id: 1448, cat: Audio/Lossless, desc: "Другие жанры"}
-      - {id: 1506, cat: Audio/Lossless, desc: "Классическая и Instrumental"}
-      - {id: 1442, cat: Audio/Lossless, desc: "Pop, Disco , Электропоп"}
-      - {id: 1443, cat: Audio/Lossless, desc: "Rap, Hip-hop, R'n'B"}
-      - {id: 1440, cat: Audio/Lossless, desc: "Рок, Панк, Метал, Альтернатива."}
-      - {id: 1447, cat: Audio/Lossless, desc: "Сборники"}
-      - {id: 1446, cat: Audio/Lossless, desc: "Саундтреки"}
-      - {id: 1444, cat: Audio/Lossless, desc: "Шансон"}
-      - {id: 1441, cat: Audio/Lossless, desc: "Электронная музыка"}
-      - {id: 1951, cat: Audio/Lossless, desc: "Многоканальная музыка и собственные оцифровки"}
-      - {id: 1961, cat: Audio/Lossless, desc: "Недооформленные"}
-      - {id: 501, cat: Audio, desc: "Jazz/ Blues/ Soul"}
-      - {id: 1211, cat: Audio, desc: "Сборники"}
-      - {id: 1198, cat: Audio, desc: "Соул"}
-      - {id: 503, cat: Audio, desc: "Блюз"}
-      - {id: 502, cat: Audio, desc: "Джаз"}
-      - {id: 1957, cat: Audio, desc: "Недооформленные"}
-      - {id: 1962, cat: Audio, desc: "Синглы и ЕР"}
-      - {id: 67, cat: Audio, desc: "Folklore/ Folk/ Народная / Этническая и Детская музыка"}
-      - {id: 1205, cat: Audio, desc: "Сборники"}
-      - {id: 1646, cat: Audio, desc: "Хоровое пение"}
-      - {id: 1645, cat: Audio, desc: "Детская песня"}
-      - {id: 1644, cat: Audio, desc: "Этническая музыка (World music)"}
-      - {id: 1643, cat: Audio, desc: "Country & Folk"}
-      - {id: 1642, cat: Audio, desc: "Фольклор и народная песня"}
-      - {id: 1621, cat: Audio, desc: "Классическая и Инструментальная музыка"}
-      - {id: 1624, cat: Audio, desc: "Инструментальная музыка"}
-      - {id: 1845, cat: Audio, desc: "Классическая и академическая музыка"}
-      - {id: 1846, cat: Audio, desc: "Классика в современной обработке"}
-      - {id: 1623, cat: Audio, desc: "Сборники"}
-      - {id: 190, cat: Audio, desc: "Саундтреки"}
-      - {id: 1562, cat: Audio, desc: "Правила, инструкции, советы"}
-      - {id: 1558, cat: Audio, desc: "из Фильмов"}
-      - {id: 1559, cat: Audio, desc: "из Мультфильмов"}
-      - {id: 1560, cat: Audio, desc: "из Игр"}
-      - {id: 1561, cat: Audio, desc: "из Сериалов"}
-      - {id: 1958, cat: Audio, desc: "Недооформленные"}
-      - {id: 879, cat: Audio, desc: "Минусовки и караоке"}
-      - {id: 1777, cat: Audio, desc: "Зарубежные дискографии"}
-      - {id: 1781, cat: Audio, desc: "Зарубежный Рок, Панк, Метал, Альтернатива (дискография)"}
-      - {id: 1782, cat: Audio, desc: "Зарубежный Рэп, Хип-Хоп, R'n'B (дискография)"}
-      - {id: 1783, cat: Audio, desc: "Зарубежная Поп-музыка (дискография)"}
-      - {id: 1784, cat: Audio, desc: "Зарубежная Электронная музыка (дискография)"}
-      - {id: 1785, cat: Audio, desc: "Зарубежный Фольклор, Народная и Этническая  (дискография)"}
-      - {id: 1786, cat: Audio, desc: "Зарубежная Музыка других жанров (дискография)"}
-      - {id: 1967, cat: Audio, desc: "Недооформленные"}
-      - {id: 1779, cat: Audio, desc: "Общие дискографии"}
-      - {id: 1796, cat: Audio, desc: "Классическая и современная академическая музыка (дискография)"}
-      - {id: 1797, cat: Audio, desc: "New Age, Relax, Meditative & Flamenco (дискография)"}
-      - {id: 1798, cat: Audio, desc: "Reggae, Ska, Dub (дискография)"}
-      - {id: 1799, cat: Audio, desc: "Eurodance, Disco, Hi-NRG , Synthpop (дискография)"}
-      - {id: 1800, cat: Audio, desc: "Джаз, Блюз, Сountry (дискография)"}
-      - {id: 1956, cat: Audio, desc: "Недооформленные"}
-      - {id: 1950, cat: Audio, desc: "Аудио на Blu-ray"}
-      - {id: 1804, cat: Audio, desc: "Стол заказов отечественной музыки / предложение по улучшению форума"}
-      - {id: 1803, cat: Audio, desc: "Отечественная музыка"}
-      - {id: 1806, cat: Audio, desc: "Академическая музыка (Классическая, симфоническая и оперная)"}
-      - {id: 1807, cat: Audio, desc: "Народная и Русский романс ( Фольклор - Песни на языках бывших республик СССР)"}
-      - {id: 1808, cat: Audio, desc: "Поп, диско, эстрада, ретро"}
-      - {id: 1965, cat: Audio, desc: "Сборники, 50х50"}
-      - {id: 1809, cat: Audio, desc: "Шансон, бардовская (авторская) и песни Русской эмиграции"}
-      - {id: 1838, cat: Audio, desc: "Сборники"}
-      - {id: 1810, cat: Audio, desc: "Инструментальная (электронная и прочая)"}
-      - {id: 1811, cat: Audio, desc: "Рок (панк, хард, метал) музыка"}
-      - {id: 1839, cat: Audio, desc: "Отечественный Рок (сборники)"}
-      - {id: 1828, cat: Audio, desc: "Отечественный Rap, Hip-Hop, R'n'B"}
-      - {id: 1847, cat: Audio, desc: "New Age, Relax, Meditative (Отечественная)"}
-      - {id: 1812, cat: Audio, desc: "Джаз и блюз"}
-      - {id: 1813, cat: Audio, desc: "Военно-патриотическая (марши, революционные и военные песни)"}
-      - {id: 1814, cat: Audio, desc: "Детские песни"}
-      - {id: 1815, cat: Audio, desc: "ВИА (вокально-инструментальные ансамбли)"}
-      - {id: 1816, cat: Audio, desc: "Музыка из Советских и Российских кинофильмов, саундтреки"}
-      - {id: 1817, cat: Audio, desc: "Музыка, не вошедшая в подразделы (разное)"}
-      - {id: 1818, cat: Audio, desc: "Отечественные дискографии"}
-      - {id: 1819, cat: Audio, desc: "Отечественная классика (дискография)"}
-      - {id: 1820, cat: Audio, desc: "Отечественный Рок, Панк, Метал, Альтернатива (дискография)"}
-      - {id: 1821, cat: Audio, desc: "Отечественный Рэп, Хип-Хоп, R'n'B Отечественный (дискография)"}
-      - {id: 1822, cat: Audio, desc: "Отечественный Шансон, Авторская и Военная песня (дискография)"}
-      - {id: 1823, cat: Audio, desc: "Отечественная Поп-музыка (дискография)"}
-      - {id: 1824, cat: Audio, desc: "Отечественный Электронная музыка (дискография)"}
-      - {id: 1825, cat: Audio, desc: "Отечественный Фольклор, Народная и Этническая (дискография)"}
-      - {id: 1826, cat: Audio, desc: "Отечественная Музыка других жанров (дискография)"}
-      - {id: 1970, cat: Audio/Lossless, desc: "Lossless"}
-      - {id: 1971, cat: Audio/Lossless, desc: "Помощь и Инструкции"}
-      - {id: 1972, cat: Audio/Lossless, desc: "Дискографии (Джаз, Блюз, Соул)"}
-      - {id: 1973, cat: Audio/Lossless, desc: "Дискографии (Rap, Hip-hop, R'n'B)"}
-      - {id: 1974, cat: Audio/Lossless, desc: "Дискографии (Шансон)"}
-      - {id: 1975, cat: Audio/Lossless, desc: "Дискографии (Поп музыка)"}
-      - {id: 1976, cat: Audio/Lossless, desc: "Дискографии (Электронная музыка)"}
-      - {id: 1977, cat: Audio/Lossless, desc: "Дискографии (Рок, Панк, Метал, Альтернатив)"}
-      - {id: 1978, cat: Audio/Lossless, desc: "Джаз, Блюз, Соул Другие жанры"}
-      - {id: 1979, cat: Audio/Lossless, desc: "Классическая музыка"}
-      - {id: 1980, cat: Audio/Lossless, desc: "Поп Музыка, Эстрада, Ретро"}
-      - {id: 1981, cat: Audio/Lossless, desc: "Rap, Hip-hop, R'n'B"}
-      - {id: 1982, cat: Audio/Lossless, desc: "Рок, Панк, Метал, Альтернатива"}
-      - {id: 1983, cat: Audio/Lossless, desc: "Сборники"}
-      - {id: 1984, cat: Audio/Lossless, desc: "Саундтреки"}
-      - {id: 1985, cat: Audio/Lossless, desc: "Шансон"}
-      - {id: 1986, cat: Audio/Lossless, desc: "Электронная музыка"}
-      - {id: 1987, cat: Audio/Lossless, desc: "Многоканальная музыка и собственные оцифровки"}
-      - {id: 1988, cat: Audio/Lossless, desc: "Недооформленные"}
-      - {id: 2001, cat: Audio/Video, desc: "Русское музыкальное видео"}
-      - {id: 2002, cat: Audio/Video, desc: "Клипы"}
-      - {id: 2003, cat: Audio/Video, desc: "Концерты"}
-      - {id: 2004, cat: Audio/Video, desc: "Клипографии / Видеографии"}
-      - {id: 2005, cat: Audio/Video, desc: "Музыкальный ринг"}
-      - {id: 2006, cat: Audio/Video, desc: "Праздничные концерты"}
-      - {id: 2007, cat: Audio/Video, desc: "Юбилейные концерты, вечера"}
-      - {id: 2008, cat: Audio/Video, desc: "Муз. премии и Фестивали"}
-      - {id: 2009, cat: Audio/Video, desc: "Сборники"}
-      - {id: 2010, cat: Audio/Video, desc: "Музыкальные фильмы (без треклистов)"}
-      - {id: 2011, cat: Audio/Video, desc: "Концерты классической музыки, оперы"}
-      - {id: 2012, cat: Audio/Video, desc: "Биографические, документально-музыкальные фильмы"}
-      - {id: 2013, cat: Audio/Video, desc: "Blu-ray"}
-      - {id: 2014, cat: Audio/Video, desc: "Недооформленные"}
-      - {id: 188, cat: Audio/Video, desc: "Иностранное музыкальное видео"}
-      - {id: 1489, cat: Audio/Video, desc: "Клипографии / Видеографии"}
-      - {id: 1658, cat: Audio/Video, desc: "Концерты классической музыки, оперы"}
-      - {id: 1657, cat: Audio/Video, desc: "Праздничные концерты"}
-      - {id: 1656, cat: Audio/Video, desc: "Муз.премии и Фестивали"}
-      - {id: 1473, cat: Audio/Video, desc: "Концерты"}
-      - {id: 1472, cat: Audio/Video, desc: "Сборники"}
-      - {id: 1471, cat: Audio/Video, desc: "Клипы"}
-      - {id: 1953, cat: Audio/Video, desc: "Юбилейные концерты"}
-      - {id: 1960, cat: Audio/Video, desc: "Blu-ray"}
-      - {id: 2015, cat: Audio/Video, desc: "Недооформленные"}
-      - {id: 2016, cat: Audio/Video, desc: "Биографические, документально-музыкальные фильмы"}
-      - {id: 2043, cat: Audio/Video, desc: "DVD-Audio"}
-      # games
-      - {id: 98, cat: PC/Games, desc: "PC-игры"}
-      - {id: 1381, cat: PC/Games, desc: "Правила, инструкции, советы, FAQ"}
-      - {id: 1057, cat: PC/Games, desc: "Горячие новинки"}
-      - {id: 1053, cat: PC/Games, desc: "FIFA"}
-      - {id: 1050, cat: PC/Games, desc: "Софт для игр на PC"}
-      - {id: 452, cat: PC/Games, desc: "Демо игры"}
-      - {id: 378, cat: PC/Games, desc: "Детские обучающие игры"}
-      - {id: 325, cat: PC/Games, desc: "Старые игры (PC)"}
-      - {id: 318, cat: PC/Games, desc: "SPORT"}
-      - {id: 283, cat: PC/Games, desc: "Racing"}
-      - {id: 264, cat: PC/Games, desc: "Смешанные жанры"}
-      - {id: 263, cat: PC/Games, desc: "logic"}
-      - {id: 262, cat: PC/Games, desc: "Arcade"}
-      - {id: 261, cat: PC/Games, desc: "Simulation"}
-      - {id: 509, cat: PC/Games, desc: "QUEST"}
-      - {id: 260, cat: PC/Games, desc: "RPG"}
-      - {id: 508, cat: PC/Games, desc: "MMO"}
-      - {id: 259, cat: PC/Games, desc: "Strategy"}
-      - {id: 258, cat: PC/Games, desc: "Action"}
-      - {id: 371, cat: PC/Games, desc: "Патчи, Русификаторы, Моды"}
-      - {id: 1009, cat: PC/Games, desc: "Sims 2"}
-      - {id: 1011, cat: PC/Games, desc: "Grand Theft Auto"}
-      - {id: 1012, cat: PC/Games, desc: "Сasual games"}
-      - {id: 1932, cat: PC/Games, desc: "Недооформленное"}
-      - {id: 355, cat: Console, desc: "Консольные игры"}
-      - {id: 1051, cat: Console, desc: "Софт для консолей"}
-      - {id: 359, cat: Console, desc: "PlayStation"}
-      - {id: 357, cat: Console, desc: "PS2"}
-      - {id: 1250, cat: Console, desc: "PS3"}
-      - {id: 356, cat: Console, desc: "Xbox"}
-      - {id: 358, cat: Console, desc: "Xbox360"}
-      - {id: 1754, cat: Console, desc: "XBox360 (freeboot)"}
-      - {id: 734, cat: Console, desc: "Другие консоли"}
-      - {id: 1052, cat: Console, desc: "Nintendo WII"}
-      - {id: 735, cat: Console, desc: "PSP"}
-      - {id: 1933, cat: Console, desc: "Недооформленное"}
-      # books
-      - {id: 1663, cat: Books/Other, desc: "Новости литературы"}
-      - {id: 1667, cat: Books/Other, desc: "Анонсы и презентации книг"}
-      - {id: 1666, cat: Books/Other, desc: "Интересные литературные факты"}
-      - {id: 1665, cat: Books/Other, desc: "Литературные праздники и события"}
-      - {id: 1664, cat: Books/Other, desc: "Общие новости литературы"}
-      - {id: 784, cat: Books/Magazines, desc: "Журналы"}
-      - {id: 1477, cat: Books/Magazines, desc: "Авто и мото"}
-      - {id: 1123, cat: Books/Magazines, desc: "Наука, техника"}
-      - {id: 1056, cat: Books/Magazines, desc: "Игровые журналы"}
-      - {id: 1135, cat: Books/Magazines, desc: "Digital Photo"}
-      - {id: 1134, cat: Books/Magazines, desc: "Мужские журналы"}
-      - {id: 1122, cat: Books/Magazines, desc: "Компьютерные журналы"}
-      - {id: 1684, cat: Books/Magazines, desc: "CD / DVD к журналам"}
-      - {id: 1121, cat: Books/Magazines, desc: "Строительство, дизайн и ремонт"}
-      - {id: 1683, cat: Books/Magazines, desc: "Спорт"}
-      - {id: 1396, cat: Books/Magazines, desc: "Женские журналы (мода, остальные женские журналы)"}
-      - {id: 1395, cat: Books/Magazines, desc: "Мир кулинарии (кулинария)"}
-      - {id: 1394, cat: Books/Magazines, desc: "Мир рукоделия (вязание, рукоделие, шитье)"}
-      - {id: 1072, cat: Books/Magazines, desc: "Комиксы"}
-      - {id: 1682, cat: Books/Magazines, desc: "Кино / Музыка"}
-      - {id: 1487, cat: Books/Magazines, desc: "Разное (путешествия, хобби, прочее)"}
-      - {id: 1936, cat: Books/Magazines, desc: "Недооформленное"}
-      - {id: 196, cat: Audio/Audiobook, desc: "Аудиокниги"}
-      - {id: 1874, cat: Audio/Audiobook, desc: "ТГ Самиздат"}
-      - {id: 523, cat: Audio/Audiobook, desc: "Историческая литература, биографии и мемуары"}
-      - {id: 518, cat: Audio/Audiobook, desc: "Отечественная Классика"}
-      - {id: 522, cat: Audio/Audiobook, desc: "Мировая Классика"}
-      - {id: 1137, cat: Audio/Audiobook, desc: "Аудио учебники"}
-      - {id: 793, cat: Audio/Audiobook, desc: "Бизнес-литература"}
-      - {id: 525, cat: Audio/Audiobook, desc: "Детективы, триллеры, боевики"}
-      - {id: 524, cat: Audio/Audiobook, desc: "Детская аудиокнига"}
-      - {id: 794, cat: Audio/Audiobook, desc: "Изучение иностранных языков"}
-      - {id: 1133, cat: Audio/Audiobook, desc: "Любовные романы"}
-      - {id: 1409, cat: Audio/Audiobook, desc: "Мировая проза ХХ века"}
-      - {id: 1406, cat: Audio/Audiobook, desc: "Научно-популярная аудиокнига"}
-      - {id: 1408, cat: Audio/Audiobook, desc: "Отечественная проза ХХ века"}
-      - {id: 1196, cat: Audio/Audiobook, desc: "Поэзия"}
-      - {id: 1132, cat: Audio/Audiobook, desc: "Проза III тысячелетия"}
-      - {id: 521, cat: Audio/Audiobook, desc: "Аудиокниги на иностранных языках"}
-      - {id: 519, cat: Audio/Audiobook, desc: "Психология и философия"}
-      - {id: 1407, cat: Audio/Audiobook, desc: "Путешествия и приключения"}
-      - {id: 1131, cat: Audio/Audiobook, desc: "Радиоспектакли и аудиофильмы"}
-      - {id: 1528, cat: Audio/Audiobook, desc: "Ужасы и Мистика"}
-      - {id: 520, cat: Audio/Audiobook, desc: "Фантастика и фэнтези"}
-      - {id: 517, cat: Audio/Audiobook, desc: "Юмор"}
-      - {id: 1634, cat: Audio/Audiobook, desc: "Аудиокниги для Apple"}
-      - {id: 516, cat: Audio/Audiobook, desc: "Разное"}
-      - {id: 1934, cat: Audio/Audiobook, desc: "Недооформленное"}
-      - {id: 2049, cat: Audio/Audiobook, desc: "Прочее"}
-      - {id: 2050, cat: Audio/Audiobook, desc: "Женское, любовное фэнтези"}
-      - {id: 195, cat: Books/Ebook, desc: "Книги"}
-      - {id: 1127, cat: Books/Ebook, desc: "Библиотеки"}
-      - {id: 1037, cat: Books/Ebook, desc: "Детективы, триллер, боевик"}
-      - {id: 1411, cat: Books/Ebook, desc: "Изучение иностранных языков"}
-      - {id: 1412, cat: Books/Ebook, desc: "Историческая литература"}
-      - {id: 1410, cat: Books/Ebook, desc: "Научно-популярная литература"}
-      - {id: 1055, cat: Books/Ebook, desc: "Классика мировой литературы"}
-      - {id: 785, cat: Books/Ebook, desc: "Компьютерная литература, программирование"}
-      - {id: 1095, cat: Books/Ebook, desc: "Кулинария"}
-      - {id: 1094, cat: Books/Ebook, desc: "Литература без перевода"}
-      - {id: 1128, cat: Books/Ebook, desc: "Любовные романы"}
-      - {id: 1125, cat: Books/Ebook, desc: "Медицина и здоровье"}
-      - {id: 1414, cat: Books/Ebook, desc: "Обучение и развитие детей"}
-      - {id: 1130, cat: Books/Ebook, desc: "Поэзия"}
-      - {id: 999, cat: Books/Ebook, desc: "Многоавторские сборники, серии книг"}
-      - {id: 791, cat: Books/Ebook, desc: "Психология, философия"}
-      - {id: 1129, cat: Books/Ebook, desc: "Публицистика"}
-      - {id: 1413, cat: Books/Ebook, desc: "Путешествия, приключения"}
-      - {id: 789, cat: Books/Ebook, desc: "Разное"}
-      - {id: 788, cat: Books/Ebook, desc: "Современная проза"}
-      - {id: 1126, cat: Books/Ebook, desc: "Техническая литература"}
-      - {id: 1054, cat: Books/Ebook, desc: "Художественная лит. для детей и подростков"}
-      - {id: 786, cat: Books/Ebook, desc: "Учебники, справочники, энциклопедии"}
-      - {id: 787, cat: Books/Ebook, desc: "Хобби"}
-      - {id: 792, cat: Books/Ebook, desc: "Собрания сочинений"}
-      - {id: 1039, cat: Books/Ebook, desc: "Фантастика, фентези, мистика"}
-      - {id: 1136, cat: Books/Ebook, desc: "Экономика и бизнес-литература"}
-      - {id: 1935, cat: Books/Ebook, desc: "Недооформленное"}
-      # sport
-      - {id: 1758, cat: TV/Sport, desc: "Правила / Основные инструкции / Новости раздела / Анонсы / Объявления"}
-      - {id: 1687, cat: TV/Sport, desc: "Легенды спорта"}
-      - {id: 1688, cat: TV/Sport, desc: "Авто / мотоспорт"}
-      - {id: 1690, cat: TV/Sport, desc: "Баскетбол"}
-      - {id: 1686, cat: TV/Sport, desc: "Футбол"}
-      - {id: 1691, cat: TV/Sport, desc: "Биатлон"}
-      - {id: 1692, cat: TV/Sport, desc: "Бодибилдинг"}
-      - {id: 1693, cat: TV/Sport, desc: "Бокс / Смешанные единоборства"}
-      - {id: 1694, cat: TV/Sport, desc: "Зимние виды спорта"}
-      - {id: 1697, cat: TV/Sport, desc: "Олимпийские игры"}
-      - {id: 1698, cat: TV/Sport, desc: "Рестлинг"}
-      - {id: 1741, cat: TV/Sport, desc: "Теннис"}
-      - {id: 1701, cat: TV/Sport, desc: "Формула-1"}
-      - {id: 1702, cat: TV/Sport, desc: "Хоккей"}
-      - {id: 1704, cat: TV/Sport, desc: "Боевые искусства"}
-      - {id: 1743, cat: TV/Sport, desc: "Остальные виды спорта"}
-      - {id: 1739, cat: TV/Sport, desc: "Ралли"}
-      - {id: 1756, cat: TV/Sport, desc: "Велоспорт / Мотоспорт"}
-      - {id: 1740, cat: TV/Sport, desc: "Автогонки, NASCAR,  IndyCar и пр."}
-      - {id: 1742, cat: TV/Sport, desc: "Обзорные и аналитические передачи, видеоклипы и т.д."}
-      - {id: 1733, cat: TV/Sport, desc: "NBA"}
-      - {id: 1734, cat: TV/Sport, desc: "Чемпионат России по баскетболу"}
-      - {id: 1735, cat: TV/Sport, desc: "Европейский клубный баскетбол"}
-      - {id: 1736, cat: TV/Sport, desc: "Женский баскетбол"}
-      - {id: 1755, cat: TV/Sport, desc: "Обзорные и аналитические передачи, видеоклипы и т.д."}
-      - {id: 1712, cat: TV/Sport, desc: "Россия"}
-      - {id: 1716, cat: TV/Sport, desc: "Германия"}
-      - {id: 1715, cat: TV/Sport, desc: "Италия"}
-      - {id: 1714, cat: TV/Sport, desc: "Испания"}
-      - {id: 1713, cat: TV/Sport, desc: "Англия"}
-      - {id: 1722, cat: TV/Sport, desc: "Мини-футбол, пляжный футбол, футзал"}
-      - {id: 1721, cat: TV/Sport, desc: "Обзорные и аналитические передачи"}
-      - {id: 1720, cat: TV/Sport, desc: "Международные и товарищеские турниры и матчи"}
-      - {id: 1719, cat: TV/Sport, desc: "Чемпионаты Мира и Европы"}
-      - {id: 1718, cat: TV/Sport, desc: "Еврокубки"}
-      - {id: 1717, cat: TV/Sport, desc: "Другие национальные чемпионаты и кубки"}
-      - {id: 1723, cat: TV/Sport, desc: "Футбольное видео"}
-      - {id: 1724, cat: TV/Sport, desc: "Видео для мобильных устройств"}
-      - {id: 1725, cat: TV/Sport, desc: "Аудиопередачи"}
-      - {id: 1726, cat: TV/Sport, desc: "Футбольная литература"}
-      - {id: 2051, cat: TV/Sport, desc: "Еврокубки 2018-2019"}
-      - {id: 2052, cat: TV/Sport, desc: "Чемпионат Европы по футболу 2020"}
-      - {id: 2053, cat: TV/Sport, desc: "Еврокубки 2019-2020"}
-      - {id: 2054, cat: TV/Sport, desc: "Прочее"}
-      - {id: 2044, cat: TV/Sport, desc: "Обзоры"}
-      - {id: 2045, cat: TV/Sport, desc: "Обзоры"}
-      - {id: 2046, cat: TV/Sport, desc: "Обзоры"}
-      - {id: 2047, cat: TV/Sport, desc: "Обзоры"}
-      - {id: 2048, cat: TV/Sport, desc: "Обзоры"}
-      - {id: 1727, cat: TV/Sport, desc: "NHL"}
-      - {id: 1728, cat: TV/Sport, desc: "KХЛ"}
-      - {id: 1729, cat: TV/Sport, desc: "Европейские клубные чемпионаты"}
-      - {id: 1730, cat: TV/Sport, desc: "Чемпионаты мира"}
-      - {id: 1731, cat: TV/Sport, desc: "Хоккей с мячом (Bandy)"}
-      - {id: 1737, cat: TV/Sport, desc: "Международные турниры"}
-      - {id: 1738, cat: TV/Sport, desc: "Обзорные и аналитические передачи"}
-      - {id: 1705, cat: TV/Sport, desc: "Бокс"}
-      - {id: 1706, cat: TV/Sport, desc: "Ножевой бой"}
-      - {id: 1707, cat: TV/Sport, desc: "Каратэ"}
-      - {id: 1708, cat: TV/Sport, desc: "Дзюдо и самбо"}
-      - {id: 1709, cat: TV/Sport, desc: "Вин чунь"}
-      - {id: 1710, cat: TV/Sport, desc: "Айкидо"}
-      - {id: 1711, cat: TV/Sport, desc: "Рукопашный бой"}
-      - {id: 1757, cat: TV/Sport, desc: "Скейтборд / Сноуборд / Паркур"}
-      - {id: 1744, cat: TV/Sport, desc: "Американский футбол"}
-      - {id: 1745, cat: TV/Sport, desc: "Гандбол"}
-      - {id: 1746, cat: TV/Sport, desc: "Покер"}
-      - {id: 1747, cat: TV/Sport, desc: "Легкая атлетика"}
-      - {id: 1748, cat: TV/Sport, desc: "Бильярд"}
-      - {id: 1749, cat: TV/Sport, desc: "Бейсбол"}
-      - {id: 1751, cat: TV/Sport, desc: "Тяжёлая атлетика"}
-      - {id: 1752, cat: TV/Sport, desc: "Гимнастика"}
-      - {id: 1753, cat: TV/Sport, desc: "Не вошедшие остальные виды спорта"}
-      - {id: 1969, cat: TV/Sport, desc: "Волейбол"}
-      # Other
-      - {id: 411, cat: Other, desc: "Эротика"}
-      - {id: 1759, cat: Other, desc: "Правила / основные инструкции / FAQ"}
-      - {id: 1330, cat: Other, desc: "фотографии / картинки / обои"}
-      - {id: 412, cat: Other, desc: "Фильмы (Эротика ) ; Сериалы( Эротика)"}
-      - {id: 1530, cat: Other, desc: "Фильмы HD/BD (Эротика) ; Сериалы HD/BD (Эротика)"}
-      - {id: 1531, cat: Other, desc: "Фильмы DVD (Эротика) ; Сериалы DVD (Эротика)"}
-      - {id: 413, cat: Other, desc: "Мультфильмы  ( Эротика)"}
-      - {id: 414, cat: Other, desc: "Документальное и обучающее видео  ( Эротика)"}
-      - {id: 415, cat: Other, desc: "Компьютерные игры  ( Эротика)"}
-      - {id: 416, cat: Other, desc: "Литература   ( Эротика)"}
-      - {id: 417, cat: Other, desc: "Разное  ( Эротика)"}
-      - {id: 1589, cat: Other, desc: "Подфорум для шаблонов"}
-      - {id: 1949, cat: Other, desc: "RG E-Rotic"}
-      - {id: 2019, cat: Other, desc: "Недооформленное"}
-      - {id: 13, cat: Other, desc: "Автомобильный раздел"}
-      - {id: 1329, cat: Other, desc: "Документация, мануалы"}
-      - {id: 515, cat: Other, desc: "Фильмы и телепередачи по авто/мото"}
-      - {id: 1082, cat: Other, desc: "Автомобильный Софт"}
-      - {id: 485, cat: Other, desc: "Раздел авто (разное)"}
-      - {id: 1373, cat: Other, desc: "Разное (документы)"}
-      - {id: 1372, cat: Other, desc: "Разное (фильмы)"}
-      - {id: 1371, cat: Other, desc: "Разное (программы)"}
-      - {id: 2026, cat: Other, desc: "R.G. Avto"}
-      - {id: 1670, cat: Other, desc: "Партнерские группы"}
-      - {id: 1880, cat: Other, desc: "Проект 'Сказки для Взрослых и Детей'"}
-      - {id: 1671, cat: Other, desc: "RG.GeneralFilm"}
-      - {id: 1862, cat: Other, desc: "Новости в сети"}
-      - {id: 1869, cat: Other, desc: "НОВОСТИ СЕГОДНЯ !"}
-      - {id: 1871, cat: Other, desc: "Бизнес"}
-      - {id: 1878, cat: Other, desc: "Ближний Восток"}
-      - {id: 1877, cat: Other, desc: "Ближнее зарубежье"}
-      - {id: 1876, cat: Other, desc: "В мире"}
-      - {id: 1870, cat: Other, desc: "Игровая индустрия"}
-      - {id: 1879, cat: Other, desc: "Катастрофы"}
-      - {id: 1873, cat: Other, desc: "Криминал"}
-      - {id: 1863, cat: Other, desc: "Культура и искусство"}
-      - {id: 1864, cat: Other, desc: "Наука и технологии"}
-      - {id: 1865, cat: Other, desc: "Общественная жизнь"}
-      - {id: 1867, cat: Other, desc: "Политика"}
-      - {id: 1875, cat: Other, desc: "Происшествия"}
-      - {id: 1866, cat: Other, desc: "Спорт"}
-
-    modes:
-      search: [q]
-      tv-search: [q, season, ep]
-      movie-search: [q]
-
-  settings:
-    - name: striprussian
-      type: checkbox
-      label: Strip Russian Letters
-      default: false
-    - name: downloadlink
-      type: select
-      label: Download link
-      default: "magnet:?xt"
-      options:
-        "download.php?id" : ".torrent"
-        "magnet:?xt": "magnet"
-
-  download:
-    selector: a[href^="{{ .Config.downloadlink }}"]
-    attribute: href
-
-  search:
-    paths:
-      - path: /
-    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: "{{range .Categories}}f[]={{.}}&{{end}}"
-      q: "{{ .Keywords }}"
-      o: newest
-
-    rows:
-      selector: table > tbody > tr.tor:has(td:nth-child(4):contains("B"))
-
-    fields:
-      category:
-        selector: td.f a[href*="?f="]
-        attribute: href
-        filters:
-          - name: querystring
-            args: f
-      title:
-        selector: td.t a
-        filters:
-          # normalize to SXXEYY format
-          - name: re_replace
-            args: ["[\\:\\-\\/\\|]", " "]
-          - name: re_replace
-            args: ["(.*)(\\d+)\\s+[CСcс]езон\\s+(\\d+) (\\d+)\\s+[CСcс]ери[ия](.*)", "$1 S$2E$3-$4 rus $5"]
-          - name: re_replace
-            args: ["(.*)(\\d+)\\s+[CСcс]езон(.*)", "$1 S$2 rus $3"]
-          - name: re_replace
-            args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-          - name: replace
-            args: ["WEB DL", "WEBDL"]
-          - name: replace
-            args: ["WEBDLRip", "WEBDL"]
-      details:
-        selector: td.t a
-        attribute: href
-      download:
-        selector: td.t a
-        attribute: href
-      size:
-        selector: td:nth-child(4)
-      seeders: 
-        text: 0
-      seeders:
-        selector: b.sd
-        optional: true
-      leechers:
-        text: 0
-      leechers:
-        selector: b.lc
-        optional: true
-      date:
-        selector: td.ms
-        filters:
-          - name: dateparse
-            args: "2006-01-02 15:04"
-      downloadvolumefactor:
-        text: 0
-      uploadvolumefactor:
-        text: 1
-# engine n/a

src/Jackett.Common/Definitions/theaudioscene.yml

@@ -36,7 +36,7 @@
     - 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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<li>Find 'cookie:' in the <b>Request Headers</b> section<li>Copy & paste the whole cookie string to here.</ol>"
+      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<li>Refresh the page by pressing <b>F5</b><li>Select the <b>Headers</b> tab<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: sort
       type: select
       label: Sort requested from site

src/Jackett.Common/Definitions/thepiratebay.yml

@@ -5,8 +5,32 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://thepiratebay.org/
+    - https://tpb.bike/
+    - https://pirateproxy.page/
+    - https://tpb14.ukpass.co/
+    - https://thepiratebay.vip/
+    - https://tpb.root.yt/?ckattempt=1/
+    - https://thepiratebay0.org/
+    - https://thepiratebay10.org/
+    - https://pirateproxy.live/
+    - https://thehiddenbay.com/
+    - https://thepiratebay.zone/
+    - https://tpb.party/
+    - https://piratebay1.live/
+    - https://piratebay1.xyz/
+    - https://piratebay1.top/
+    - https://piratebayproxy.live/
+    - https://piratebay1.info/
+    - https://thepiratebay1.com/
+    - https://thepiratebay1.live/
+    - https://thepiratebays.info/
+    - https://thepiratebays.live/
+    - https://thepiratebay1.top/
+    - https://thepiratebay1.info/
+
   legacylinks:
     - https://thepiratesbay.pw/
     - https://tproxy.pro/
@@ -91,7 +115,7 @@
       type: info
       label: Proxies
       default: The Pirate Bay is currently only reachable via TOR. But you can try to use an unofficial proxy from <a href="https://piratebayproxy.info/" target="_blank">piratebayproxy.info</a>.
-  
+
   search:
     paths:
       - path: "{{ if .Keywords }}/search/{{ .Keywords }}/0/{{ .Config.order }}/{{ join .Categories \",\"}}{{else}}/recent{{end}}"

src/Jackett.Common/Definitions/tokyotosho.yml

@@ -7,6 +7,11 @@
   encoding: UTF-8
   links:
     - https://www.tokyotosho.info/
+    - https://tokyotosho.black-mirror.xyz/
+    - https://tokyotosho.unblocked.casa/
+    - https://tokyotosho.proxyportal.fun/
+    - https://tokyotosho.uk-unblock.xyz/
+    - https://tokyotosho.ind-unblock.xyz/
 
   settings:
     - name: type-id

src/Jackett.Common/Definitions/torlock.yml

@@ -5,9 +5,12 @@
   language: en-us
   type: public
   encoding: UTF-8
+  followredirect: true
   links:
     - https://www.torlock.com/
     - https://www.torlock2.com/
+    https://www.torlock.icu/
+    - https://torlock.unblockit.pro/
   legacylinks:
     - https://torlock.com/
 
@@ -24,12 +27,12 @@
       - {id: ADULT, cat: XXX, desc: "Adult"}
       - {id: AUDIOBOOK, cat: Audio/Audiobook, desc: "Audiobook"}
       - {id: IMAGES, cat: Other/Misc, desc: "Images"}
-      
+
     modes:
       search: [q]
       tv-search: [q, season, ep]
       movie-search: [q]
-  
+
   settings:
     - name: sort
       type: select
@@ -46,7 +49,7 @@
       options:
         "desc": "desc"
         "asc": "asc"
-  
+
   search:
     paths:
       - path: "{{if .Keywords}}/all/torrents/{{ .Keywords }}.html?sort={{ .Config.sort }}&order={{ .Config.type }}{{else}}/fresh.html{{end}}"
@@ -95,18 +98,18 @@
       date:
         selector: td:nth-child(2):contains("/")
         optional: true
-        filters: 
+        filters:
           - name: dateparse
             args: "1/2/2006"
       date:
         selector: td:nth-child(2):contains("Today"), td:nth-child(2):contains("Yesterday")
         optional: true
-        filters: 
+        filters:
           - name: fuzzytime
       date:
         selector: td:nth-child(2):not(:contains("Today")):not(:contains("Yesterday")):not(:contains("/"))
         optional: true
-        filters: 
+        filters:
           - name: re_replace
             args: ["(min|mins)", "minutes"]
           - name: timeago