Make select style applied to all (#12772)

now includes posters and imdb

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,89 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - src/**/*.cs
+      - src/**/*.js
+      - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.IntegrationTests/**'
+      - '!src/Jackett.Test/**'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+    paths:
+      - src/**/*.cs
+      - src/**/*.js
+      - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.IntegrationTests/**'
+      - '!src/Jackett.Test/**'
+  schedule:
+    - cron: '00 00 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: windows-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Set up dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.*'
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
+      

README.md

@@ -25,7 +25,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 <details> <summary> <b> Supported Public Trackers </b> </summary>
 
- * 01torrent
  * ØMagnet
  * 1337x
  * 24rolika
@@ -65,9 +64,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * EXT Torrents
  * ExtraTorrent.st
  * EZTV
- * Filebase
  * FileListing
  * FireBit
+ * freshMeat
  * Frozen Layer
  * GamesTorrents
  * GkTorrent
@@ -134,7 +133,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sexxi
  * Sexy-Pics
  * ShizaProject
- * shokweb
  * ShowRSS
  * Solid Torrents
  * sosulki
@@ -148,6 +146,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrent Downloads (TD)
  * Torrent Oyun indir
  * Torrent Paradise (ML)
+ * torrent.by
  * torrent-pirat
  * Torrent9
  * Torrent9 clone
@@ -184,6 +183,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
  * AniDUB
  * Anime-Free
+ * AnimeLayer
  * ArenaBG
  * BaibaKo
  * BookTracker
@@ -258,18 +258,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AmigosShareClub
  * anasch.cc
  * AnimeBytes (AB)
- * AnimeTorrents (AnT)
+ * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
  * AnimeWorld [![(invite needed)][inviteneeded]](#)
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
  * AsianCinema
- * AsianDVDClub
  * AudioNews (AN)
  * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Back-ups
- * bB
+ * Back-ups [![(invite needed)][inviteneeded]](#)
+ * bB [![(invite needed)][inviteneeded]](#)
  * BakaBT
  * BeiTai
  * Best-Core
@@ -281,13 +280,14 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BiT-TiTAN
  * Bitded
  * Bithorlo (BHO)
- * BitHUmen
+ * BitHUmen [![(invite needed)][inviteneeded]](#)
  * BitSexy
  * Bitspyder
  * BitTorrentFiles
  * BiTTuRK
  * BJ-Share (BJ)
  * BlueBird [![(invite needed)][inviteneeded]](#)
+ * Blues-Brothers
  * Blutopia (BLU)
  * Borgzelle  [![(invite needed)][inviteneeded]](#)
  * Boxing Torrents
@@ -296,7 +296,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
  * BrSociety
- * BTNext (BTNT)
+ * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
  * BWTorrents
  * BYRBT
@@ -305,17 +305,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
  * Cathode-Ray.Tube (CRT)
- * CCFBits
+ * CCFBits [![(invite needed)][inviteneeded]](#)
  * CeskeForum
- * CGPeers
- * CHDBits
+ * CGPeers [![(invite needed)][inviteneeded]](#)
+ * CHDBits [![(invite needed)][inviteneeded]](#)
  * ChileBT
  * Cinecalidad
  * CinemaMovieS_ZT
  * CinemaZ (EuTorrents)
- * Cinemageddon
- * Cinematik
- * Classix
+ * Cinemageddon [![(invite needed)][inviteneeded]](#)
+ * Cinematik [![(invite needed)][inviteneeded]](#)
+ * Classix [![(invite needed)][inviteneeded]](#)
  * Coastal-Crew
  * Concertos
  * CrazyHD
@@ -328,9 +328,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Dark Tracker
  * DataScene (DS)
  * DataTalli
- * DesiReleasers
  * DesiTorrents
- * Diablo Torrent
+ * Diablo Torrent [![(invite needed)][inviteneeded]](#)
  * DigitalCore
  * DiscFan
  * DivTeam
@@ -338,7 +337,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
  * EbookParadijs
  * Ebooks-Shares
- * EfectoDoppler
  * Empornium (EMP) [![(invite needed)][inviteneeded]](#)
  * eShareNet
  * eStone (XiDER, BeLoad, BigTorrent)
@@ -346,8 +344,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ExtremeBits
  * ExtremeTorrents [![(invite needed)][inviteneeded]](#)
  * Falkon Vision Team
- * FANO.IN
- * Fantastic Heaven
+ * FANO.IN [![(invite needed)][inviteneeded]](#)
+ * Fantastic Heaven [![(invite needed)][inviteneeded]](#)
  * Fantastiko [![(invite needed)][inviteneeded]](#)
  * Femdomcult
  * FileList (FL)
@@ -363,7 +361,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Generation-Free [![(invite needed)][inviteneeded]](#)
  * GFXPeers
  * GigaTorrents
- * GimmePeers (formerly ILT)
+ * GimmePeers (formerly ILT) [![(invite needed)][inviteneeded]](#)
  * GiroTorrent
  * GreekDiamond
  * Greek Team
@@ -371,10 +369,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Haitang
  * HappyFappy
  * HD Dolby
- * HD-Bits.com
+ * HD-Bits.com [![(invite needed)][inviteneeded]](#)
  * HD-Forever (HDF)
  * HD-Olimpo
- * HD-Only (HDO)
+ * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
  * HD-Space (HDS)
  * HD-Spain [![(invite needed)][inviteneeded]](#)
  * HD-Torrents (HDT)
@@ -382,17 +380,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDAI
  * HDArea (HDA)
  * HDAtmos
- * HDBits
- * HDC (HDCiTY)
+ * HDBits [![(invite needed)][inviteneeded]](#)
+ * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
  * HDCenter [![(invite needed)][inviteneeded]](#)
- * HDChina (HDWing)
- * HDCity
- * HDHome (HDBigger)
+ * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
+ * HDCity [![(invite needed)][inviteneeded]](#)
+ * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
  * HDME
+ * HDMonkey
  * HDRoute [![(invite needed)][inviteneeded]](#)
- * HDSky
+ * HDSky [![(invite needed)][inviteneeded]](#)
  * HDTime
- * HDTorrents.it
+ * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
  * HDZone
@@ -402,63 +401,64 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Il Corsaro Verde
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
- * ImmortalSeed (iS)
- * Immortuos
+ * ImmortalSeed (iS) [![(invite needed)][inviteneeded]](#)
+ * Immortuos [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
- * JPopsuki
+ * JPopsuki [![(invite needed)][inviteneeded]](#)
  * JPTV
  * Karagarga
- * Keep Friends
+ * Keep Friends [![(invite needed)][inviteneeded]](#)
+ * KrazyZone
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
- * LearnBits
- * LearnFlakes
+ * LearnBits [![(invite needed)][inviteneeded]](#)
+ * LearnFlakes [![(invite needed)][inviteneeded]](#)
  * leech24
  * LegacyHD (HD4Free)
  * LemonHD
- * Libble
+ * Libble [![(invite needed)][inviteneeded]](#)
  * LibraNet (LN)
- * LinkoManija
- * LosslessClub
- * M-Team TP (MTTP)
+ * LinkoManija [![(invite needed)][inviteneeded]](#)
+ * LosslessClub [![(invite needed)][inviteneeded]](#)
+ * M-Team TP (MTTP) [![(invite needed)][inviteneeded]](#)
  * MaDs Revolution [![(invite needed)][inviteneeded]](#)
  * magic-heaven
  * Magico (Trellas) [![(invite needed)][inviteneeded]](#)
  * Majomparádé (TurkDepo)
+ * MediaMaatjes
  * MegamixTracker
  * MeseVilág (Fairytale World)
  * MicroBit (µBit)
  * Milkie
  * MIRcrew
- * MMA-Torrents
+ * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
+ * Movie-Torrentz
  * Moviesite
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
- * Nbytez
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
- * nForce
  * NetCosmo
  * NetLab
  * NorBits
- * Oasis
  * oMg[WtF]trackr
- * OpenCD
+ * OpenCD [![(invite needed)][inviteneeded]](#)
  * Oppaitime [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
- * Ourbits (HDPter)
+ * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
  * P2PBG
  * P2PElite
  * Partis [![(invite needed)][inviteneeded]](#)
  * PassThePopcorn (PTP)
+ * Peeratiko
  * PeerJunkies
  * Peers.FM
  * Pirata Digital
@@ -475,7 +475,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ProAudioTorrents (PAT)
  * PTerClub
  * PTFiles (PTF)
- * PThome
+ * PThome [![(invite needed)][inviteneeded]](#)
  * PTMSG
  * PTSBAO
  * PTtime
@@ -490,8 +490,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * RacingForMe (RFM)
  * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
- * Redacted (PassTheHeadphones)
- * Renegade
+ * Redacted (PassTheHeadphones) [![(invite needed)][inviteneeded]](#)
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
@@ -506,7 +505,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Secret Cinema
  * SeedFile (SF)
  * Shareisland
- * Shazbat
+ * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SkipTheCommercials
  * slosoul
@@ -514,12 +513,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
  * SpeedCD
- * Speedmaster HD
- * SpeedTorrent Reloaded
+ * Speedmaster HD [![(invite needed)][inviteneeded]](#)
+ * SpeedTorrent Reloaded [![(invite needed)][inviteneeded]](#)
+ * SpiderTK
  * Spirit of Revolution [![(invite needed)][inviteneeded]](#)
  * SportHD [![(invite needed)][inviteneeded]](#)
  * SportsCult
- * SpringSunday
+ * SpringSunday [![(invite needed)][inviteneeded]](#)
  * SugoiMusic
  * Superbits (SBS)
  * Swarmazon
@@ -531,7 +531,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TellyTorrent
  * teracod (Movie Zone)
  * The-Devils-Lounge
- * The Falling Angels (TFA)
+ * The Falling Angels (TFA) [![(invite needed)][inviteneeded]](#)
  * The Geeks
  * The Horror Charnel (THC)
  * The New Retro
@@ -546,7 +546,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
- * ToTheGlory (TTG)
+ * ToTheGlory (TTG) [![(invite needed)][inviteneeded]](#)
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
  * Torrent Surf
@@ -560,7 +560,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentDB
  * Torrentech (TTH)
  * TorrentHeaven [![(invite needed)][inviteneeded]](#)
- * TorrentHR
+ * TorrentHR [![(invite needed)][inviteneeded]](#)
  * Torrenting (TT) [![(invite needed)][inviteneeded]](#)
  * TotallyKids (TK)
  * Torrentland
@@ -570,10 +570,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentSeeds (TS)
  * Trackeros
  * TranceTraffic [![(invite needed)][inviteneeded]](#)
- * Trezzor
+ * Trezzor [![(invite needed)][inviteneeded]](#)
  * TurkSeed
  * TurkTorrent (TT)
  * TV Chaos UK (TVCUK)
+ * TvRoad
  * TVstore
  * Twilight Torrents
  * Twilights Zoom
@@ -585,7 +586,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
- * World-In-HD
+ * World-In-HD [![(invite needed)][inviteneeded]](#)
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
@@ -733,7 +734,7 @@ Detailed instructions are available at [LinuxServer.io Jackett Docker](https://h
 
 
 ## Installation on Synology
-Jackett is available as a beta package from [SynoCommunity](https://synocommunity.com/)
+Jackett is available as a [beta package](https://synocommunity.com/package/jackett) from [SynoCommunity](https://synocommunity.com/)
 
 
 ## Running Jackett behind a reverse proxy

src/Jackett.Common/Content/custom.css

@@ -247,7 +247,7 @@ pre {
     white-space: nowrap;
 }
 
-.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+.dataTables_filter input, select {
     display: inline-block;
     height: 26px;
     padding: 0 8px;

src/Jackett.Common/Content/custom_mobile.css

@@ -231,7 +231,7 @@ pre {
     white-space: nowrap;
 }
 
-.dataTables_length select, .dataTables_filter input, .dataTable.compact tfoot td select {
+.dataTables_filter input, select {
     display: inline-block;
     height: 26px;
     padding: 0 8px;

src/Jackett.Common/Content/index.html

@@ -28,8 +28,8 @@
     <link rel="stylesheet" type="text/css" href="../bootstrap/bootstrap.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../animate.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/tagify.css?changed=11662">
-    <link rel="stylesheet" type="text/css" href="../custom.css?changed=PR12083" media="only screen and (min-device-width: 480px)">
-    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=11662" media="only screen and (max-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom.css?changed=PR12772" media="only screen and (min-device-width: 480px)">
+    <link rel="stylesheet" type="text/css" href="../custom_mobile.css?changed=PR12772" media="only screen and (max-device-width: 480px)">
     <link rel="stylesheet" type="text/css" href="../css/jquery.dataTables.min.css?changed=2017083001">
     <link rel="stylesheet" type="text/css" href="../css/bootstrap-multiselect.css?changed=2017083001" />
     <link rel="stylesheet" type="text/css" href="../css/font-awesome.min.css?changed=2017083001">

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

@@ -1,110 +0,0 @@
----
-id: 01torrent
-name: 01Torrent
-description: "01Torrent is a Public tracker"
-language: en-US
-type: public
-encoding: UTF-8
-testlinktorrent: false
-links:
-  - https://www4.01torrent.net/
-  - https://01torrent.unblockit.bz/
-legacylinks:
-  - https://01torrent.unblockit.ws/
-  - https://01torrent.unblockit.kim/
-
-caps:
-  categories:
-    "anime": TV/Anime
-    "application": PC
-    "book": Books
-    "game": PC/Games
-    "movie": Movies
-    "music": Audio
-    "tvshow": TV
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings: []
-
-download:
-  # https://www3.01torrent.net/movie/erasing-his-dark-past-2020-720p-webrip-800mb-x264-galaxyrg/163219/
-  # <script type="text/javascript">
-  #   $(document).ready(function(){
-  #     $("#forall").on('click','#clicktype',function(){
-  #       $("#showlinks").html("");
-  #       var datg=$(this).attr("name");
-  #       var dataString="id=163219&name="+datg;
-  #       $('#load').show(200);
-  #       setTimeout(function(){
-  #         $.ajax({type:"POST",
-  #           url:"/showme.php",
-  #           data:dataString,
-  #           cache:false,
-  #           success:function(html){
-  #             $("#showlinks").html(html)}
-  #           });
-  #         Ladda.stopAll();
-  #         $("#load").hide(200)}
-  #       ,3200)
-  #     })
-  #   });
-  # </script>
-  before:
-    path: showme.php
-    method: post
-    inputs:
-      id: "{{ re_replace .DownloadUri.AbsoluteUri \"^.*/(\\d+)/$\" \"$1\" }}"
-      name: torrent
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-      usebeforeresponse: true
-
-search:
-  paths:
-    # https://www4.01torrent.net/search/
-    - path: search/
-      method: post
-  inputs:
-    q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-
-  rows:
-    selector: table.table-striped > tbody > tr
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: span.icomoon
-      attribute: class
-      filters:
-        - name: split
-          args: [" ", 1]
-        - name: replace
-          args: ["icomoon-", ""]
-    title:
-      selector: a.screenshot
-    details:
-      selector: a.screenshot
-      attribute: href
-    download:
-      selector: a.screenshot
-      attribute: href
-    date:
-      text: now
-    size:
-      selector: span.label-default
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

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

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

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

@@ -10,7 +10,54 @@ links:
 
 caps:
   categorymappings:
-    - {id: xxx, cat: XXX, desc: xxx}
+    # only subcategories of Порно фильмы (Movies) have torrents
+    - {id: 94, cat: XXX, desc: "4K порно фильмы", default: true}
+    - {id: 76, cat: XXX, desc: "Японские порно фильмы", default: true}
+    - {id: 81, cat: XXX, desc: "Бразильские порно фильмы", default: true}
+    - {id: 41, cat: XXX, desc: "Итальянские порно фильмы", default: true}
+    - {id: 42, cat: XXX, desc: "Американские порно фильмы", default: true}
+    - {id: 43, cat: XXX, desc: "Немецкие порно фильмы", default: true}
+    - {id: 44, cat: XXX, desc: "Французские порно фильмы", default: true}
+    - {id: 45, cat: XXX, desc: "Русские порно фильмы", default: true}
+    - {id: 47, cat: XXX, desc: "Порно фильмы 2018 года", default: true}
+    - {id: 75, cat: XXX, desc: "Порно фильмы 2019 года", default: true}
+    - {id: 92, cat: XXX, desc: "Порно фильмы 2020 года", default: true}
+    - {id: 93, cat: XXX, desc: "Порно фильмы 2021 года", default: true}
+    - {id: 48, cat: XXX, desc: "Ретро / Классика", default: true}
+    - {id: 49, cat: XXX, desc: "С русским переводом", default: true}
+    - {id: 82, cat: XXX, desc: "С сюжетом", default: true}
+    - {id: 91, cat: XXX, desc: "Пародии", default: true}
+    - {id: 51, cat: XXX, desc: "Brazzers", default: true}
+    - {id: 52, cat: XXX, desc: "BangBros", default: true}
+    - {id: 53, cat: XXX, desc: "Marc Dorcel", default: true}
+    - {id: 54, cat: XXX, desc: "Evil Angel", default: true}
+    - {id: 55, cat: XXX, desc: "Tushy", default: true}
+    - {id: 56, cat: XXX, desc: "Blacked", default: true}
+    - {id: 57, cat: XXX, desc: "Evil Playgrounds", default: true}
+    - {id: 58, cat: XXX, desc: "Reality Kings", default: true}
+    - {id: 59, cat: XXX, desc: "New Sensations", default: true}
+    - {id: 60, cat: XXX, desc: "Wicked Pictures", default: true}
+    - {id: 61, cat: XXX, desc: "21Sextury", default: true}
+    - {id: 62, cat: XXX, desc: "PornPros", default: true}
+    - {id: 63, cat: XXX, desc: "Private", default: true}
+    - {id: 64, cat: XXX, desc: "DD Busty", default: true}
+    - {id: 65, cat: XXX, desc: "Naughty America", default: true}
+    - {id: 66, cat: XXX, desc: "Third Degree Films", default: true}
+    - {id: 67, cat: XXX, desc: "Hustler", default: true}
+    - {id: 68, cat: XXX, desc: "Blacks on Blondes", default: true}
+    - {id: 69, cat: XXX, desc: "Team Skeet", default: true}
+    - {id: 70, cat: XXX, desc: "Mofos", default: true}
+    - {id: 71, cat: XXX, desc: "Vixen", default: true}
+    - {id: 72, cat: XXX, desc: "Jules Jordan", default: true}
+    - {id: 73, cat: XXX, desc: "Nubile Films", default: true}
+    - {id: 74, cat: XXX, desc: "Digital Playground", default: true}
+    - {id: 83, cat: XXX, desc: "Zero Tolerance", default: true}
+    - {id: 84, cat: XXX, desc: "Pure Taboo", default: true}
+    - {id: 85, cat: XXX, desc: "Devil's Film", default: true}
+    - {id: 86, cat: XXX, desc: "Sweet Sinner", default: true}
+    - {id: 87, cat: XXX, desc: "Penthouse", default: true}
+    - {id: 88, cat: XXX, desc: "Elegant Angel", default: true}
+    - {id: 89, cat: XXX, desc: "Digital Sin", default: true}
 
   modes:
     search: [q]
@@ -41,26 +88,28 @@ search:
   paths:
     - path: index.php
   inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
     do: search
     subaction: search
     search_start: 0
     full_search: 1
     result_from: 1
-    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%D0%9F%D0%BE%D0%B8%D1%81%D0%BA{{ end }}"
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     # 0 in article 1 in comments 2 in static pages 3 in article titles
     titleonly: 3
     sortby: "{{ .Config.sort }}"
     resorder: "{{ .Config.type }}"
     showposts: 0
-    # does not have categories in results so there is little point in providing a full category map or multi-cat search support
-    catlist[]: 0
+
+  headers:
+    Referer: ["{{ .Config.sitelink }}"]
 
   rows:
     selector: article.shortstory
 
   fields:
     category:
-      text: xxx
+      text: 94
     title:
       selector: h2.short_title a
     details:

src/Jackett.Common/Definitions/animelayer.yml

@@ -0,0 +1,201 @@
+---
+id: animelayer
+name: AnimeLayer
+description: "AnimeLayer is a RUSSIAN Semi-Private Torrent Tracker for ANIME"
+language: ru-RU
+type: semi-private
+encoding: UTF-8
+links:
+  - https://www.animelayer.ru/
+
+caps:
+  categorymappings:
+    - {id: аниме, cat: TV/Anime, desc: Аниме}
+    - {id: музыка, cat: Audio, desc: Музыка}
+    - {id: манга, cat: Books, desc: Манга}
+    - {id: дорама, cat: TV, desc: Дорама}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: category-id
+    type: select
+    label: Category
+    default: anime
+    options:
+      anime: Аниме
+      music: Музыка
+      manga: Манга
+      dorama: Дорама
+
+login:
+  path: login.php
+  method: form
+  form: form#loginForm
+  inputs:
+    login: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.error
+  test:
+    path: /
+    selector: a[href^="/auth/logout/"]
+
+search:
+  paths:
+    - path: "torrents/{{ .Config.category-id }}/"
+  inputs:
+    q: "{{ .Keywords }}"
+
+  rows:
+    selector: ul.torrents-list li.torrent-item:has(a[href^="/torrent/"])
+
+  fields:
+    category:
+      selector: label.category
+    resolution:
+      selector: div.description
+      filters:
+        - name: regexp
+          args: "Разрешение:\\s+\\d{3,4}\\D(\\d{3,4})"
+    title:
+      selector: img
+      attribute: alt
+      filters:
+        - name: append
+          args: "{{ if .Result.resolution }} [{{ .Result.resolution }}p]{{ else }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="/torrent/"]
+      attribute: href
+      filters:
+        - name: append
+          args: download/
+    poster:
+      selector: img
+      attribute: data-original
+    size:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 2]
+    date_noyear:
+      # <span class="gray">Добавлен:</span>&nbsp;18 августа в&nbsp;21:39
+      selector: div.info
+      filters:
+        - name: regexp
+          args: "н:\\s(\\d{1,2} \\D{3,8} в\\s\\d{1,2}:\\d{2})"
+        - name: replace
+          args: ["\xA0", " "]
+        - name: replace
+          args: ["Обновлён:", ""]
+        - name: replace
+          args: ["Добавлен:", ""]
+        - name: replace
+          args: [" в ", " "]
+        - name: replace
+          args: ["января", "January {{ .Today.Year }}"]
+        - name: replace
+          args: ["февраля", "February {{ .Today.Year }}"]
+        - name: replace
+          args: ["марта", "March {{ .Today.Year }}"]
+        - name: replace
+          args: ["апреля", "April {{ .Today.Year }}"]
+        - name: replace
+          args: ["мая", "May {{ .Today.Year }}"]
+        - name: replace
+          args: ["июня", "June {{ .Today.Year }}"]
+        - name: replace
+          args: ["июля", "July {{ .Today.Year }}"]
+        - name: replace
+          args: ["августа", "August {{ .Today.Year }}"]
+        - name: replace
+          args: ["сентября", "September {{ .Today.Year }}"]
+        - name: replace
+          args: ["октября", "October {{ .Today.Year }}"]
+        - name: replace
+          args: ["ноября", "November {{ .Today.Year }}"]
+        - name: replace
+          args: ["декабря", "December {{ .Today.Year }}"]
+        - name: re_replace
+          args: ["\\s(\\d\\:)", " 0$1"]
+    date_year:
+      # <span class="gray">Обновлён:</span>&nbsp;3 октября 2019 в&nbsp;6:02
+      selector: div.info
+      filters:
+        - name: regexp
+          args: "н:\\s(\\d{1,2} \\D{3,8} \\d{4} в\\s\\d{1,2}:\\d{2})"
+        - name: replace
+          args: ["\xA0", " "]
+        - name: replace
+          args: ["Обновлён:", ""]
+        - name: replace
+          args: ["Добавлен:", ""]
+        - name: replace
+          args: [" в ", " "]
+        - name: replace
+          args: ["января", "January"]
+        - name: replace
+          args: ["февраля", "February"]
+        - name: replace
+          args: ["марта", "March"]
+        - name: replace
+          args: ["апреля", "April"]
+        - name: replace
+          args: ["мая", "May"]
+        - name: replace
+          args: ["июня", "June"]
+        - name: replace
+          args: ["июля", "July"]
+        - name: replace
+          args: ["августа", "August"]
+        - name: replace
+          args: ["сентября", "September"]
+        - name: replace
+          args: ["октября", "October"]
+        - name: replace
+          args: ["ноября", "November"]
+        - name: replace
+          args: ["декабря", "December"]
+        - name: re_replace
+          args: ["\\s(\\d\\:)", " 0$1"]
+    date:
+      text: "{{ if or .Result.date_year .Result.date_noyear }}{{ or .Result.date_year .Result.date_noyear }}{{ else }}now{{ end }}"
+    seeders:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 0]
+    leechers:
+      selector: div.info
+      filters:
+        - name: split
+          args: ["|", 1]
+    subtitles:
+      filters:
+        - name: regexp
+          args: "Субтитры:(.+?)\\n"
+    language:
+      filters:
+        - name: regexp
+          args: "Язык:(.+?)\\n"
+    description:
+      text: "{{ if .Result.subtitles }}Субтитры: {{ .Result.subtitles }}{{ else }}{{ end }} - {{ if .Result.language }}Язык: {{ .Result.language }}{{ else }}{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/asiandvdclub.yml

@@ -1,125 +0,0 @@
----
-id: asiandvdclub
-name: AsianDVDClub
-description: "AsianDVDClub (ADC) is a Private Torrent Tracker for Asian DVD and BluRay"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://asiandvdclub.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-    - {id: 3, cat: Movies, desc: "Japan"}
-    - {id: 5, cat: Movies, desc: "China"}
-    - {id: 4, cat: Movies, desc: "Korea"}
-    - {id: 2, cat: Movies, desc: "Hong Kong"}
-    - {id: 6, cat: Movies, desc: "Philippines"}
-    - {id: 7, cat: Movies, desc: "Taiwan"}
-    - {id: 8, cat: Movies, desc: "Thailand"}
-    - {id: 9, cat: Movies, desc: "Vietnam"}
-    - {id: 10, cat: Movies, desc: "Malaysia"}
-    - {id: 11, cat: Movies, desc: "Other Asian"}
-    - {id: 12, cat: Other, desc: "Miscellaneous"}
-
-  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: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: login
-  method: post
-  inputs:
-    apple: evil
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: p:contains("Error")
-  test:
-    path: index
-    selector: a[href="/logout"]
-
-search:
-  paths:
-    - path: torrents/
-  inputs:
-    $raw: "{{ range .Categories }}countries[]={{.}}&{{end}}"
-    searchbox: "{{ .Keywords }}"
-    search: Search
-    golden: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table.torrenttable_helper > tbody > tr:has(img)
-
-  fields:
-    category:
-      selector: img[class^="cat-"]
-      attribute: class
-      case:
-        img.cat-anime: 1
-        img.cat-hk: 2
-        img.cat-japan: 3
-        img.cat-korea: 4
-        img.cat-china: 5
-        img.cat-phil: 6
-        img.cat-taiwan: 7
-        img.cat-thai: 8
-        img.cat-viet: 9
-        img.cat-malaysia: 10
-        img.cat-rest: 11
-        img.cat-misc: 12 # unconfirmed as there are currently no torrents for cat[12]
-    title:
-      selector: a[href^="/torrent/"]
-    details:
-      selector: a[href^="/torrent/"]
-      attribute: href
-    download:
-      selector: a[href^="/torrent/"]
-      attribute: href
-      filters:
-        - name: replace
-          args: ["torrent", "download"]
-    size:
-      selector: td:nth-last-child(6)
-    seeders:
-      selector: td:nth-last-child(5)
-    leechers:
-      selector: td:nth-last-child(4)
-    date:
-      selector: td:nth-last-child(3)
-      remove: p
-      filters:
-        - name: timeago
-    grabs:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="../images/golden.gif"]: 0
-        img[src="../images/silver.gif"]: 0.5 # unconfirmed as there are currently no silver torrents
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.5
-    minimumseedtime:
-      # 45 days (as seconds = 45 x 24 x 60 x 60)
-      text: 3888000
-# Engine n/a

src/Jackett.Common/Definitions/audiobookbay.yml

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

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

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

src/Jackett.Common/Definitions/bitbazis.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 69, cat: TV/Anime, desc: "Mese/XviD"}
     - {id: 58, cat: TV, desc: "Sorozat/Eng"}
     - {id: 68, cat: TV/Anime, desc: "Mese/DVD"}
+    - {id: 91, cat: TV/Anime, desc: "Mese/HD"}
     - {id: 25, cat: Audio/MP3, desc: "Mp3/Hun"}
     - {id: 26, cat: Audio/MP3, desc: "Mp3/Eng"}
     - {id: 71, cat: Audio/Lossless, desc: "Lossless/Eng"}
@@ -53,12 +54,13 @@ caps:
     music-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -67,7 +69,6 @@ settings:
       1: title
       4: added
       5: size
-      7: seeders
   - name: type
     type: select
     label: Order requested from site
@@ -81,13 +82,9 @@ settings:
     default: For best results, change the <b>Torrentek száma egy oldalon:</b> setting to <b>100</b> on your account profile.
 
 login:
-  path: login.php
-  method: post
+  method: cookie
   inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table[width="920"]:contains("Hiba")
+    cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
     selector: a[href^="logout.php?k="]
@@ -105,7 +102,7 @@ search:
     # site does not support imdbid searching or appear to have freeleech
 
   rows:
-    selector: table[ width="1000px"] tbody tr:has(a[href^="userdetails.php?id="])
+    selector: table[width="900px"]:last-child tbody tr:has(a[href^="userdetails.php?id="])
 
   fields:
     category:
@@ -129,29 +126,27 @@ search:
         - name: replace
           args: ["details.php?id=", "download.php?torrent="]
     size:
-      selector: td:last-child
+      selector: td:nth-last-child(2)
     date:
       # 2021-11-09 16:51:24
-      selector: td:nth-last-child(2)
+      selector: td:last-child
       filters:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
           args: "2006-01-02 15:04:05 -07:00"
-    files:
-      selector: td:nth-last-child(4)
     grabs:
-      selector: td:nth-child(2)
+      selector: td:nth-child(6)
       filters:
         - name: regexp
-          args: "D:(\\d+)x"
+          args: "D:(\\d+)"
     seeders:
-      selector: td:nth-child(2)
+      selector: td:nth-child(4)
       filters:
         - name: regexp
           args: "S:(\\d+)"
     leechers:
-      selector: td:nth-child(2)
+      selector: td:nth-child(5)
       filters:
         - name: regexp
           args: "L:(\\d+)"

src/Jackett.Common/Definitions/bitsearch.yml

@@ -20,6 +20,7 @@ caps:
     "Music/Album": Audio
     "Music/mp3": Audio/MP3
     "Music/Lossless": Audio/Lossless
+    "Music/Video": Audio/Video
     Other: Other
     "Other/Android": PC/Mobile-Android
     "Other/Archive": Other
@@ -62,23 +63,6 @@ settings:
       desc: desc
       asc: asc
 
-download:
-  # the magnet URI on this site exceeds 2048 bytes which some interfaces will reject. So we use the infohash and build our own.
-  infohash:
-    hash:
-      selector: a[href^="magnet:?xt"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: a[href^="magnet:?xt"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "&dn=(.+?)$"
-        - name: validfilename
-
 search:
   paths:
      # https://bitsearch.to/search?q=&sort=date&order=desc
@@ -100,8 +84,14 @@ search:
       selector: h5 a
       attribute: href
     download:
-      selector: h5 a
+      selector: a[class="dl-torrent"]
       attribute: href
+    infohash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
     grabs:
       selector: div.stats div:has(img[alt="Download"])
       filters:

src/Jackett.Common/Definitions/bluesbrothers.yml

@@ -0,0 +1,185 @@
+---
+id: bluesbrothers
+name: Blues-Brothers
+description: "Blues-Brothers is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://blues-brothers.biz/
+
+caps:
+  categorymappings:
+    - {id: 9, cat: TV/Anime, desc: "Anime"}
+    - {id: 1, cat: PC/0day, desc: "Apps"}
+    - {id: 17, cat: Audio/Audiobook, desc: "AudioBooks"}
+    - {id: 16, cat: Books/EBook, desc: "Ebooks"}
+    - {id: 12, cat: PC/Games, desc: "Games PC"}
+    - {id: 7, cat: Console/PS3, desc: "Games PS3"}
+    - {id: 19, cat: Console/Wii, desc: "Games Wii"}
+    - {id: 8, cat: Console/XBox 360, desc: "Games XBOX360"}
+    - {id: 18, cat: PC/Mac, desc: "MAC"}
+    - {id: 41, cat: PC/Mobile-Android, desc: "Mobile"}
+    - {id: 26, cat: Movies, desc: "Movie BDRip"}
+    - {id: 29, cat: Movies/HD, desc: "Movie BluRay 1080p"}
+    - {id: 28, cat: Movies/HD, desc: "Movie BluRay 720p"}
+    - {id: 27, cat: Movies/SD, desc: "Movie BRRip"}
+    - {id: 24, cat: Movies/SD, desc: "Movie CAM/TS"}
+    - {id: 23, cat: Movies/DVD, desc: "Movie DVD-R"}
+    - {id: 11, cat: Movies/SD, desc: "Movie DVDRip"}
+    - {id: 25, cat: Movies/SD, desc: "Movie DVDSCR/R5"}
+    - {id: 30, cat: Movies, desc: "Movie Packs"}
+    - {id: 10, cat: Movies/HD, desc: "Movie XviD x264"}
+    - {id: 6, cat: XXX, desc: "Movie XXX"}
+    - {id: 22, cat: Audio/Lossless, desc: "Music Flac"}
+    - {id: 21, cat: Audio/MP3, desc: "Music MP3"}
+    - {id: 14, cat: Audio, desc: "Music Packs"}
+    - {id: 20, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 34, cat: TV, desc: "TV Packs"}
+    - {id: 36, cat: TV/HD, desc: "TV X264 HD"}
+    - {id: 37, cat: TV/SD, desc: "TV X264 SD"}
+    - {id: 35, cat: TV/SD, desc: "TV XviD"}
+    - {id: 38, cat: Other, desc: "VIP"}
+    - {id: 40, cat: Other, desc: "VIP ONLY"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    perm_ssl: ""
+    returnto: /
+  error:
+    - selector: table.main:contains("Login failed!")
+      message:
+        selector: table tr td.colhead2
+  test:
+    path: /
+    selector: a[href*="logout.php?hash_please="]
+
+search:
+  paths:
+    # https://blues-brothers.biz/browse.php?c27=1&c28=1&c29=1&search=&searchin=title&incldead=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # title, descr, genre, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
+
+  rows:
+    selector: table.table-bordered tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Tip\\('<b>(.+?)</b>"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(.+?)\\'
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    files:
+      selector: td:nth-child(5)
+    date_day:
+      selector: td:nth-child(7):contains("day")
+      optional: true
+      filters:
+        - name: fuzzytime
+    date_year:
+      selector: td:nth-child(7):not(:contains("day"))
+      optional: true
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(8)
+    grabs:
+      selector: td:nth-child(9)
+    seeders:
+      selector: td:nth-child(10)
+    leechers:
+      selector: td:nth-child(11)
+    downloadvolumefactor:
+      case:
+        "a.info:contains(\"[FREE]\")": 0
+        "a.info:contains(\"[SILVER]\")": 0.5
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
+# U-232 V5

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

@@ -59,6 +59,10 @@ search:
         type: json
         attribute: attributes
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     count:
@@ -105,11 +109,15 @@ search:
     size:
       selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
       # api returns 0=false, 1=true
       selector: double_upload

src/Jackett.Common/Definitions/blutopia.yml

@@ -90,6 +90,10 @@ search:
     page: 1
     free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table > tbody > tr
 
@@ -165,19 +169,22 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+        span.torrent-listings-global-freeleech: 0
+        span.torrent-listings-personal-freeleech: 0
+        span.torrent-listings-freeleech-token: 0
+        span.torrent-listings-featured: 0
+        span.torrent-listings-freeleech[data-original-title*="25%"]: 0.75
+        span.torrent-listings-freeleech[data-original-title*="50%"]: 0.5
+        span.torrent-listings-freeleech[data-original-title*="75%"]: 0.25
+        span.torrent-listings-freeleech[data-original-title*="100%"]: 0
+        span.torrent-listings-special-freeleech: 0
         "*": 1
     uploadvolumefactor:
       case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        span.torrent-listings-global-double-upload: 2
+        span.torrent-listings-double-upload: 2
+        span.torrent-listings-featured: 2
+        span.torrent-listings-special-double-upload: 2
         "*": 1
 # global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
 #    minimumratio:

src/Jackett.Common/Definitions/brsociety.yml

@@ -101,9 +101,6 @@ search:
       filters:
         - name: replace
           args: ["download_check", "download"]
-    magnet:
-      selector: a[href^="magnet:?"]
-      attribute: href
     details:
       selector: a.view-torrent
       attribute: href

src/Jackett.Common/Definitions/chilebt.yml

@@ -193,4 +193,10 @@ search:
         i[class*="fa-globe text-green"]: 2 # Global Double Upload
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
+# global MR is 0.5 but torrents must be seeded for 7 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
 # UNIT3D 1.9.3

src/Jackett.Common/Definitions/coastalcrew.yml

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

src/Jackett.Common/Definitions/crazyhd.yml

@@ -144,6 +144,10 @@ search:
     category: "{{ if .Categories }}{{ range .Categories }}{{.}};{{end}}{{ else }}0{{ end }}"
     search: "{{ .Keywords }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: div.inf-table-row
 

src/Jackett.Common/Definitions/demonoid.yml

@@ -1,7 +1,7 @@
 ---
 id: demonoid
 name: Demonoid
-description: "Demonoid is a Public torrent site for MOVIES / TV / GENERAL"
+description: "Demonoid is a Semi-Private torrent site for MOVIES / TV / GENERAL"
 language: en-US
 type: semi-private
 encoding: UTF-8
@@ -11,7 +11,7 @@ links:
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
-  - https://demonoid.unblockit.bz/
+  - https://demonoid.unblockit.tv/
   - https://demonoid.torrentbay.to/
   - https://demonoid.nocensor.biz/
 legacylinks:
@@ -42,6 +42,7 @@ legacylinks:
   - https://demonoid.unblockit.ws/
   - https://demonoid.nocensor.work/
   - https://demonoid.unblockit.kim/
+  - https://demonoid.unblockit.bz/
 
 caps:
   categorymappings:
@@ -356,10 +357,10 @@ search:
 
   rows:
     # only the default theme "Demonoid - v5" is supported
-    selector: table.table:has(td.torrent__table-today) > tbody > tr:has(td[class^="tone_"])
+    selector: table.table tbody tr.table__row:has(td[class*="tone_"])
     after: 1
     dateheaders:
-      selector: tr td.torrent__table-today:not(:contains("Sponsored links"))
+      selector: tr td.table__separator:not(:contains("Sponsored links"))
       filters:
         - name: replace
           args: ["Added ", ""]
@@ -367,27 +368,30 @@ search:
           args: ["on ", ""]
 
   fields:
-    title_default:
-      selector: a[href^="/files/details/"]
-    title_optional:
-      selector: a[href^="/files/details/"]
-      optional: true
-      attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     category:
-      selector: span.torrent__table-info > a:nth-child(2)
+      selector: span.table__column__subtext > a:nth-child(2)
       attribute: href
       optional: true
       filters:
         - name: querystring
           args: subcategory
+    title:
+      selector: a[href^="/files/details/"]
     details:
       selector: a[href^="/files/details/"]
       attribute: href
     download:
       selector: a[href^="/files/details/"]
       attribute: href
+    poster:
+      selector: div[title]
+      attribute: data-bs-content
+      filters:
+        - name: regexp
+          args: src='(.+?)'
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     description:
       selector: td:nth-last-child(7)
     size:

src/Jackett.Common/Definitions/desireleasers.yml

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

src/Jackett.Common/Definitions/devilsplayground.yml

@@ -1,173 +0,0 @@
----
-id: devilsplayground
-name: Devils-Playground
-description: "Devils-Playground (Nbytez) is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-GB
-type: private
-encoding: UTF-8
-links:
-  - http://devils-playground.org/
-legacylinks:
-  - https://devils-playground.org/
-  - https://nbytez.me/
-  - http://nbytez.me/
-
-caps:
-  categorymappings:
-    - {id: 3, cat: PC, desc: "Apps"}
-    - {id: 4, cat: Books/EBook, desc: "Ebooks"}
-    - {id: 22, cat: PC/Games, desc: "Games"}
-    - {id: 15, cat: Movies, desc: "Movies"}
-    - {id: 19, cat: Movies/UHD, desc: "Movies/Bluray"}
-    - {id: 20, cat: Movies, desc: "Movies/Packs"}
-    - {id: 17, cat: Movies/WEB-DL, desc: "Movies/Webrip"}
-    - {id: 16, cat: Movies/HD, desc: "Movies/x265"}
-    - {id: 18, cat: Movies/SD, desc: "Movies/XVID"}
-    - {id: 10, cat: Audio, desc: "Music/"}
-    - {id: 12, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 11, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 14, cat: Audio, desc: "Music/Packs"}
-    - {id: 13, cat: Audio, desc: "Music/Top UK 40"}
-    - {id: 5, cat: TV, desc: "TV"}
-    - {id: 9, cat: TV, desc: "TV/Packs"}
-    - {id: 6, cat: TV/HD, desc: "TV/x254"}
-    - {id: 7, cat: TV/HD, desc: "TV/x255"}
-    - {id: 8, cat: TV/SD, desc: "TV/XVID"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-  - name: sort
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>40</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table:has(a[href*="login.php?error=1"])
-      message:
-        text: "ERROR: Incorrect username!"
-    - selector: table:has(a[href*="login.php?error=4"])
-      message:
-        text: "ERROR: Incorrect password!"
-    - selector: table:has(a[href*="login.php?error="])
-      message:
-        text: "ERROR: Something went wrong during login!"
-  test:
-    path: index.php
-    selector: a[href*="logout.php?logouthash="]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    do: search
-    # does not support multi categories so defaulting to ALL
-    category: 0
-    # yes incldead, no activeonly
-    include_dead_torrents: yes
-    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
-    # t_name, t_description, t_both, t_uploader, t_genre
-    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # does not return imdb link in results
-  keywordsfilters:
-    - name: re_replace # replace special characters with "%" (wildcard)
-      args: ["[^a-zA-Z0-9]+", "%"]
-
-  rows:
-    selector: "table#sortabletable tbody tr:has(a[href*=\"download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href*="browse.php?category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title_default:
-      # is often abbreviated
-      selector: a[href*="details.php?id="]
-    title_optional:
-      # usually longer than details title
-      selector: div[id^="port-content-"] div
-      optional: true
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
-    details:
-      selector: a[href*="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href*="download.php?id="]
-      attribute: href
-    poster:
-      selector: div[id^="port-content-"] img
-      attribute: src
-    date:
-      selector: td:nth-child(2) > div:last-child
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        img[src$="/freedownload.gif"]: 0
-        img[src$="/silverdownload.gif"]: 0.5
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src$="/x2.gif"]: 2
-        "*": 1
-# TBD, Rules and FAQ do not cover this yet
-#    minimumratio:
-#      text: 1.0
-#    minimumseedtime:
-#      # 2 days (as seconds = 2 x 24 x 60 x 60)
-#      text: 172800
-#  TS Special Edition v.7.5

src/Jackett.Common/Definitions/docspedia.yml

@@ -10,24 +10,23 @@ links:
 
 caps:
   categorymappings:
+    - {id: 77, cat: PC, desc: "3D Models"}
     - {id: 65, cat: Audio, desc: "Audio"}
     - {id: 64, cat: Books/EBook, desc: "Books"}
-    - {id: 66, cat: TV, desc: "Business"}
+    - {id: 66, cat: Books, desc: "Business"}
     - {id: 68, cat: Books/Comics, desc: "Comics"}
-    - {id: 67, cat: TV, desc: "Development"}
-    - {id: 60, cat: TV/Documentary, desc: "Documentaries"}
+    - {id: 59, cat: TV/Documentary, desc: "Docs/Movies"}
+    - {id: 60, cat: TV/Documentary, desc: "Docs/TV"}
     - {id: 71, cat: Other, desc: "Fonts"}
-    - {id: 62, cat: Other, desc: "Graphic"}
-    - {id: 63, cat: TV/HD, desc: "HD"}
-    - {id: 57, cat: Books/Mags, desc: "Magazine"}
     - {id: 72, cat: Books, desc: "IT Books"}
-    - {id: 58, cat: TV, desc: "Medicine"}
+    - {id: 57, cat: Books/Mags, desc: "Magazine"}
+    - {id: 58, cat: Books, desc: "Medicine"}
     - {id: 70, cat: Books/EBook, desc: "Occult"}
-    - {id: 73, cat: Audio, desc: "Podcast"}
+    - {id: 74, cat: Audio, desc: "Podcasts"}
     - {id: 69, cat: Other, desc: "PS Resources"}
+    - {id: 76, cat: Books, desc: "Self-Help"}
     - {id: 56, cat: TV/Sport, desc: "Sports"}
-    - {id: 59, cat: TV, desc: "Video"}
-    - {id: 61, cat: TV, desc: "Video tutorials"}
+    - {id: 61, cat: Other, desc: "Tutorials"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/dragonworldreloaded.yml

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

src/Jackett.Common/Definitions/ebookparadijs.yml

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

src/Jackett.Common/Definitions/efectodoppler.yml

@@ -1,146 +0,0 @@
----
-id: efectodoppler
-name: Efecto Doppler
-description: "Efecto Doppler is a SPANISH Private Torrent Tracker for MUSIC"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://efectodoppler.pw/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Audio, desc: "Música"}
-    - {id: 2, cat: PC, desc: "Aplicaciones"}
-    - {id: 3, cat: Books/EBook, desc: "Libros Electrónicos"}
-    - {id: 4, cat: Audio/Audiobook, desc: "Audiolibros"}
-    - {id: 5, cat: Audio/Video, desc: "Vídeos de aprendizaje"}
-    - {id: 6, cat: Books/Comics, desc: "Comedia"}
-    - {id: 7, cat: Books/Mags, desc: "Revistas"}
-
-  modes:
-    search: [q]
-    music-search: [q, album, artist]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: time
-    options:
-      time: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    keeplogged: 1
-  error:
-    - selector: form > span.warning
-  test:
-    path: index.php
-    selector: a[href^="logout.php?auth="]
-
-search:
-  paths:
-    - path: torrents.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    searchstr: "{{ .Keywords }}"
-    artistname: "{{ .Query.Artist }}"
-    groupname: "{{ .Query.Album }}"
-    order_by: "{{ .Config.sort }}"
-    order_way: "{{ .Config.type }}"
-    # 1 gold, 2 neutral, 3 other, 0 normal
-    freetorrent: "{{ if .Config.freeleech }}3{{ else }}{{ end }}"
-
-  rows:
-    selector: tr.torrent
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: div.tooltip
-      case:
-        div.cats_música: 1
-        div.cats_aplicaciones: 2
-        div.cats_libroselectrónicos: 3
-        div.cats_audiolibros: 4
-        div.cats_vídeosdeaprendizaje: 5
-        div.cats_comedia: 6
-        div.cats_revistas: 7
-    artist:
-      selector: a[href^="artist.php?id="]
-      optional: true
-    title:
-      selector: a[href^="torrents.php?id="]
-      filters:
-        - name: prepend
-          args: "{{ if .Result.artist }}{{ .Result.artist }}{{ else }}Varios artistas{{ end }} - "
-    details:
-      selector: a[href^="torrents.php?id="]
-      attribute: href
-    poster:
-      selector: div.group_image img
-      attribute: src
-    download:
-      selector: a[href^="torrents.php?action=download&id="]
-      attribute: href
-    description:
-      selector: div.torrent_info
-    files:
-      selector: td:nth-child(3)
-    date:
-      selector: td:nth-child(4) span
-      attribute: title
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "Jan 02 2006, 15:04 -07:00"
-    size:
-      selector: td:nth-child(5)
-    grabs:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    downloadvolumefactor:
-      case:
-        strong.torrent_label[title*="Neutral"]: 0
-        strong.torrent_label[title*="Oro"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        strong.torrent_label[title*="Neutral"]: 0
-        "*": 1
-    minimumratio:
-      text: 0.6
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# engine n/a

src/Jackett.Common/Definitions/ettv.yml

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

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

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

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -10,33 +10,32 @@ links:
 
 caps:
   categorymappings:
-    - {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: 10, cat: Movies/DVD, desc: "Film DVD rip"}
+    - {id: 111, cat: Movies/DVD, desc: "Film DVD Promo"}
+    - {id: 118, cat: Movies/DVD, desc: "Film DVD Kids"}
+    - {id: 113, cat: Movies, desc: "Films Independent"}
+    - {id: 129, cat: Movies/HD, desc: "Films HD DVD"}
     - {id: 130, cat: Movies/UHD, desc: "Films 4K"}
-    - {id: 143, cat: Movies/HD, desc: "DivX 720P"}
+    - {id: 143, cat: Movies/HD, desc: "Films DivX 720P"}
     - {id: 114, cat: Audio/MP3, desc: "Muziek MP3"}
-    - {id: 140, cat: Books, desc: "E-Book"}
+    - {id: 140, cat: Books/EBook, desc: "E-Book"}
     - {id: 105, cat: TV/Documentary, desc: "Documentaire"}
     - {id: 115, cat: PC, desc: "PC apps"}
     - {id: 120, cat: PC/Games, desc: "PC Games"}
     - {id: 106, cat: Other, desc: "Overig"}
-    - {id: 131, cat: Console/NDS, desc: "Nintendo Ds"}
-    - {id: 132, cat: TV/HD, desc: "HD Serie"}
+    - {id: 131, cat: Books/Comics, desc: "Stripboeken"}
+    - {id: 132, cat: TV/HD, desc: "TV HD Serie"}
     - {id: 116, cat: PC/Mac, desc: "Mac Software"}
-    - {id: 125, cat: Movies, desc: "DiVX Rip"}
-    - {id: 123, cat: Movies/SD, desc: "DiVX Cam"}
+    - {id: 125, cat: Movies/SD, desc: "Xvid Rip"}
+    - {id: 123, cat: Movies/HD, desc: "MKV/X265"}
     - {id: 108, cat: XXX, desc: "18+"}
-    - {id: 142, cat: XXX, desc: "HD XXX"}
+    - {id: 142, cat: XXX/x264, desc: "18+ HD"}
     - {id: 139, cat: TV, desc: "TV Series"}
     - {id: 128, cat: Audio/Video, desc: "muziek DVD"}
 
   modes:
     search: [q]
-    tv-search: [q]
+    tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
     book-search: [q]

src/Jackett.Common/Definitions/eztv.yml

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

src/Jackett.Common/Definitions/femdomcult.yml

@@ -143,4 +143,10 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 0.5
+    # MR is reduced but not removed if MST is met
+    # minimumseedtime:
+    #   # 3 days (as seconds = 3 x 24 x 60 x 60)
+    #   text: 259200
 # luminance

src/Jackett.Common/Definitions/filebase.yml

@@ -1,205 +0,0 @@
----
-id: filebase
-name: Filebase
-description: "Filebase is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: ru-RU
-type: public
-encoding: UTF-8
-links:
-  - http://www.filebase.ws/ # https is not supported ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: cartoons, cat: Movies, desc: "Мультики (cartoons)"}
-    - {id: tv, cat: TV, desc: "ТВ Передача (tv)"}
-    - {id: sport, cat: Movies, desc: "Спорт (sport)"}
-    - {id: action, cat: Movies, desc: "Боевик (action)"}
-    - {id: comedy, cat: Movies, desc: "Комедия (comedy)"}
-    - {id: thriller, cat: Movies, desc: "Триллер (thriller)"}
-    - {id: classic, cat: Movies, desc: "Классика (classic)"}
-    - {id: history, cat: Movies, desc: "Исторический (history)"}
-    - {id: mystic, cat: Movies, desc: "Мистика (mystic)"}
-    - {id: sci-fi, cat: Movies, desc: "Фантастика (sci-fi)"}
-    - {id: horror, cat: Movies, desc: "Ужасы (horror)"}
-    - {id: drama, cat: Movies, desc: "Драма (drama)"}
-    - {id: adventure, cat: Movies, desc: "Приключения (adventure)"}
-    - {id: detective, cat: Movies, desc: "Детектив (detective)"}
-    - {id: concert, cat: Movies, desc: "Концерт (concert)"}
-    - {id: anime, cat: TV/Anime, desc: "Аниме (anime)"}
-    - {id: epic, cat: Movies, desc: "Мелодрама (epic)"}
-    - {id: documental, cat: TV/Documentary, desc: "Док. Фильм (documental)"}
-    - {id: serials, cat: TV, desc: "Сериал (serials)"}
-    - {id: fantasy, cat: Movies, desc: "Фентези (fantasy)"}
-    - {id: war, cat: Movies, desc: "Военный (war)"}
-    - {id: family, cat: Movies, desc: "Семейный (family)"}
-    - {id: tales, cat: Movies, desc: "Сказка (tales)"}
-    - {id: catastroph, cat: Movies, desc: "Катастрофа (catastroph)"}
-    - {id: games, cat: Console, desc: "Игры (games)"}
-    - {id: software, cat: PC, desc: "Программы (software)"}
-    - {id: videoclips, cat: Audio/Video, desc: "Видеоклип (videoclips)"}
-    - {id: wallpapers, cat: Other, desc: "Картинки (wallpapers)"}
-    - {id: eng-music, cat: Audio, desc: "Eng Музыка (eng-music)"}
-    - {id: rus-music, cat: Audio, desc: "Rus Музыка (rus-music)"}
-    - {id: books, cat: Books, desc: "Книги (books)"}
-    - {id: phone, cat: PC/Mobile-Other, desc: "Телефон (phone)"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: striprussian
-    type: checkbox
-    label: Strip Russian Letters
-    default: false
-  - name: cat
-    type: select
-    label: Category
-    default: 0
-    options:
-      0: all
-      cartoons: "Мультики (cartoons)"
-      tv: "ТВ Передача (tv)"
-      sport: "Спорт (sport)"
-      action: "Боевик (action)"
-      comedy: "Комедия (comedy)"
-      thriller: "Триллер (thriller)"
-      classic: "Классика (classic)"
-      history: "Исторический (history)"
-      mystic: "Мистика (mystic)"
-      sci-fi: "Фантастика (sci-fi)"
-      horror: "Ужасы (horror)"
-      drama: "Драма (drama)"
-      adventure: "Приключения (adventure)"
-      detective: "Детектив (detective)"
-      concert: "Концерт (concert)"
-      anime: "Аниме (anime)"
-      epic: "Мелодрама (epic)"
-      documental: "Док. Фильм (documental)"
-      serials: "Сериал (serials)"
-      fantasy: "Фентези (fantasy)"
-      war: "Военный (war)"
-      family: "Семейный (family)"
-      tales: "Сказка (tales)"
-      catastroph: "Катастрофа (catastroph)"
-      games: "Игры (games)"
-      software: "Программы (software)"
-      videoclips: "Видеоклип (videoclips)"
-      wallpapers: "Картинки (wallpapers)"
-      eng-music: "Eng Музыка (eng-music)"
-      rus-music: "Rus Музыка (rus-music)"
-      books: "Книги (books)"
-      phone: "Телефон (phone)"
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: dateD
-    options:
-      dateD: created desc
-      dateA: created asc
-      seedD: seeders desc
-      seedA: seeders asc
-      sizeD: size desc
-      sizeA: size asc
-
-search:
-  paths:
-    # http://www.filebase.ws/torrents/search/?s=dateD&t=all&c=serials&search=mandalorian
-    - path: torrents/search/
-  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:
-    # all, liveonly, deadonly
-    t: all
-    c: "{{ .Config.cat }}"
-    s: "{{ .Config.sort }}"
-    search: "{{ .Keywords }}"
-
-  rows:
-    selector: table#torrents_list > tbody > tr[data-fid]
-
-  fields:
-    category:
-      selector: td:nth-child(1) > a
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 2]
-    torrent_id:
-      selector: td:nth-child(2) > a
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 3]
-    title:
-      selector: td:nth-child(2)
-      filters:
-        # normalize to SXXEYY format
-        - name: replace
-          args: [" [/|:|\\||\\.] ", " "]
-        - name: replace
-          args: ["Кураж-Бамбей", "kurazh"]
-        - name: replace
-          args: ["Кубик в Кубе", "Kubik"]
-        - name: replace
-          args: ["Кравец", "Kravec"]
-        - name: re_replace
-          args: ["\\((\\d+)\\s+[Сс]езон:\\s+(?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s\\[([12][0-9]{3})\\]\\s(.*)", "$3 - S$1E$2 - rus $5"]
-        - name: re_replace
-          args: ["\\((\\d+)\\s+[Сс]езон:\\s+(\\d+)\\s+[Сс]ери[ия]\\)(.*)\\s\\[([12][0-9]{3})\\]\\s(.*)", "S$1E$2 - rus $3"]
-        - name: re_replace
-          args: ["\\((?:(\\d+-*\\d*)\\s+[Сс]ери[ия]\\s+.*\\d+)\\)(.*)\\s\\[([12][0-9]{3})\\]\\s(.*)", "$2 - S1E$1 - rus $4"]
-        - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: re_replace
-          args: ["\\((\\d+[p|i])\\)", "$1"]
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
-    details:
-      selector: td:nth-child(2) > a
-      attribute: href
-    download:
-      text: "{{ .Config.sitelink }}download.php?id={{ .Result.torrent_id }}"
-    date:
-      selector: td:nth-child(4)
-      filters:
-        - name: append
-          args: " +03:00" # MSK
-        - name: dateparse
-          args: "02/01/06 -07:00"
-    size:
-      selector: td:nth-child(5)
-      filters:
-        - name: replace
-          args: ["ТБ", "TB"]
-        - name: replace
-          args: ["ГБ", "GB"]
-        - name: replace
-          args: ["МБ", "MB"]
-        - name: replace
-          args: ["КБ", "KB"]
-    seeders:
-      selector: td:nth-child(7)
-    leechers:
-      selector: td:nth-child(8)
-    grabs:
-      selector: td:nth-child(9)
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/filelisting.yml

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

src/Jackett.Common/Definitions/freshmeat.yml

@@ -0,0 +1,75 @@
+---
+id: freshmeat
+name: freshMeat
+description: "freshMeat is a Public torrent meta-search engine"
+language: en-US
+type: public
+encoding: UTF-8
+certificates:
+  - 9aa995b06d86a22074c90faf5a9836e8a0fe6327 # expired 03/Jan/2022
+links:
+  - https://freshmeat.io/
+
+caps:
+  # unfortunately freshMeat does not display categories anywhere in its search results page :-(
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 3, cat: Other, desc: "Other"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+
+settings:
+  - name: info_8000
+    type: info
+    label: About freshMeat Categories
+    default: freshMeat does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+
+download:
+  selectors:
+    - selector: a[href^="magnet:?xt="]
+      attribute: href
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}s?q={{ .Keywords }}{{ else }}{{ end }}"
+
+  rows:
+    selector: table.torrent-list > tbody > tr
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      text: 3
+    title:
+      selector: td:nth-child(2)
+    details:
+      selector: td:nth-child(2) a
+      attribute: href
+    download:
+      selector: td:nth-child(2) a
+      attribute: href
+    date:
+      selector: td:nth-child(1)
+      attribute: data-sort-value
+      filters:
+        - name: dateparse
+          args: "2006-01-02 15:04:05"
+    description:
+      selector: td:nth-child(3) img
+      attribute: title
+    size:
+      selector: td:nth-child(4)
+    seeders:
+      selector: td:nth-child(5)
+    leechers:
+      text: 0
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/girotorrent.yml

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

src/Jackett.Common/Definitions/gktorrent.yml

@@ -78,9 +78,10 @@ settings:
 
 download:
   selectors:
-    - selector: a[href*="magnet:?xt="]
-      attribute: href
-
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 search:
   paths:
     - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}{{ end }}"

src/Jackett.Common/Definitions/glodls.yml

@@ -7,9 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.bz/
+  - https://www.gtdb.to/
+  - https://glotorrents.unblockit.tv/
   - https://glotorrents.nocensor.biz/
 legacylinks:
   - https://glodls.rocks/
@@ -46,6 +46,7 @@ legacylinks:
   - https://glotorrents.unblockit.ws/
   - https://glotorrents.nocensor.work/
   - https://glotorrents.unblockit.kim/
+  - https://glotorrents.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/hdmonkey.yml

@@ -0,0 +1,164 @@
+---
+id: hdmonkey
+name: HDMonkey
+description: "HDMonkey is a ROMANIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ro-RO
+type: private
+encoding: UTF-8
+links:
+  - https://hdmonkey.org/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC/0day, desc: "Apps: Windows"}
+    - {id: 7, cat: PC/Mac, desc: "Apps: Mac"}
+    - {id: 8, cat: PC, desc: "Apps: Linux"}
+    - {id: 75, cat: Movies/DVD, desc: "Movies: DVD"}
+    - {id: 26, cat: Movies/BluRay, desc: "Movies: Blu-Ray"}
+    - {id: 42, cat: Movies/HD, desc: "Movies: FHD-HD"}
+    - {id: 50, cat: Movies/WEB-DL, desc: "Movies: Web-Dl"}
+    - {id: 74, cat: Movies/SD, desc: "Movies: SD"}
+    - {id: 49, cat: Movies/UHD, desc: "Movies: 4k"}
+    - {id: 46, cat: Movies/3D, desc: "Movies: 3D"}
+    - {id: 24, cat: Movies, desc: "Movies: Packs"}
+    - {id: 28, cat: Movies, desc: "Movies: Cartoons"}
+    - {id: 47, cat: XXX, desc: "Movies: XXX"}
+    - {id: 41, cat: TV/HD, desc: "TV: HD"}
+    - {id: 52, cat: TV/WEB-DL, desc: "TV: WEB-DL"}
+    - {id: 48, cat: TV, desc: "TV: Packs"}
+    - {id: 9, cat: TV/Documentary, desc: "TV: Documentaries"}
+    - {id: 22, cat: Audio/MP3, desc: "Music: MP3"}
+    - {id: 23, cat: Audio/Lossless, desc: "Music: FLAC"}
+    - {id: 25, cat: Audio/Video, desc: "Music: Video"}
+    - {id: 27, cat: Audio, desc: "Music: Pack"}
+    - {id: 53, cat: PC/Games, desc: "Games: Pc"}
+    - {id: 54, cat: Console, desc: "Games: PsP"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+#    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - 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
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: div.myBlock:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href^="account-logout.php"]
+
+search:
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
+    # 0 both 1 local 2 external
+    inclexternal: 0
+    # 0 only active 1 incl dead 2 only dead
+    incldead: 1
+    # 0 all 1 not freeleech 2 only freeleech
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 all 1 english 2 french 3 german 4 italian 5 japanese 6 spanish 7 russian 8 other
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  rows:
+    selector: table.ttable_headinner > tbody > tr
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: title
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=([^\s]+)
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    size:
+      selector: td:nth-child(4)
+    date:
+      # 19.Jul<br>2021<br>06:57
+      selector: td:nth-child(5)
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "2.Jan200615:04 -07:00"
+    grabs:
+      selector: td:nth-child(7)
+    seeders:
+      selector: td:nth-child(8)
+    leechers:
+      selector: td:nth-child(9)
+    description:
+      case:
+        img[src="images/t_extern.png"]: External
+        "*": Local
+    downloadvolumefactor:
+      case:
+        img[src="images/t_extern.png"]: 0
+        img[src="images/free.png"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# engine n/a

src/Jackett.Common/Definitions/hdturk.yml

@@ -25,18 +25,21 @@ caps:
     - {id: 16, cat: TV, desc: "TV Yerli"}
     - {id: 19, cat: TV/HD, desc: "TV Yerli HD"}
     - {id: 170, cat: Movies/HD, desc: "Movies HD"}
+    - {id: 175, cat: Movies/HD, desc: "Movies 1080p Remux DUAL"}
+    - {id: 226, cat: Movies/HD, desc: "Movies 1080p Remux TR"}
+    - {id: 183, cat: Movies/HD, desc: "Movies 1080p Remux Yabancı"}
     - {id: 174, cat: Movies/3D, desc: "Movies 3D DUAL"}
     - {id: 180, cat: Movies/3D, desc: "Movies 3D TR"}
     - {id: 181, cat: Movies/3D, desc: "Movies 3D Yabancı"}
     - {id: 217, cat: Movies/UHD, desc: "Movies 4K DUAL"}
+    - {id: 224, cat: Movies/UHD, desc: "Movies 4K Remux DUAL"}
+    - {id: 225, cat: Movies/UHD, desc: "Movies 4K Remux Yabanci"}
     - {id: 218, cat: Movies/UHD, desc: "Movies 4K TR"}
     - {id: 216, cat: Movies/UHD, desc: "Movies 4K Yabancı"}
     - {id: 205, cat: Movies/DVD, desc: "Movies DVD DUAL"}
     - {id: 206, cat: Movies/DVD, desc: "Movies DVD TR/Yerli"}
     - {id: 219, cat: Movies/DVD, desc: "Movies DVD Yabancı"}
     - {id: 173, cat: Movies/BluRay, desc: "Movies Full BD"}
-    - {id: 175, cat: Movies/HD, desc: "Movies Remux DUAL"}
-    - {id: 183, cat: Movies/HD, desc: "Movies Remux Yabancı"}
     - {id: 171, cat: Movies/HD, desc: "Movies x264 DUAL"}
     - {id: 176, cat: Movies/HD, desc: "Movies x264 TR"}
     - {id: 177, cat: Movies/HD, desc: "Movies x264 Yabancı"}
@@ -73,6 +76,7 @@ caps:
     - {id: 221, cat: Other, desc: "VIP"}
     - {id: 85, cat: XXX, desc: "XXX"}
     - {id: 92, cat: XXX/Other, desc: "XXX E-Magazin"}
+    - {id: 220, cat: XXX/Other, desc: "XXX Hentai"}
     - {id: 93, cat: XXX, desc: "XXX Movie"}
     - {id: 95, cat: XXX/Pack, desc: "XXX Packs"}
     - {id: 96, cat: XXX/ImageSet, desc: "XXX Pics"}

src/Jackett.Common/Definitions/ilcorsaroverde.yml

@@ -12,25 +12,25 @@ caps:
   # commented out categories are discussion-only forums
   categorymappings:
     # CIURMA
-#    - {id: "150", cat: Other, desc: "Regole per Postare"}
+    # - {id: "150", cat: Other, desc: "Regole per Postare"}
     - {id: "140", cat: Other/Misc, desc: "Bozze - Sezione fruibile a tutti i nuovi Releaser", default: true}
     # INFORMAZIONI E REGOLE DEL FORUM
-#    - {id: "108", cat: Other, desc: "Manifesto Generale"}
-#    - {id: "30", cat: Other, desc: "Disclaimer"}
-#    - {id: "76", cat: Other, desc: "Statuto"}
-#    - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
-#    - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
-#    - {id: "124", cat: Other, desc: "iCV Community"}
+    # - {id: "108", cat: Other, desc: "Manifesto Generale"}
+    # - {id: "30", cat: Other, desc: "Disclaimer"}
+    # - {id: "76", cat: Other, desc: "Statuto"}
+    # - {id: "31", cat: Other, desc: "Comunicazioni dello STAFF"}
+    # - {id: "32", cat: Other, desc: "Guide sull'uso del Forum"}
+    # - {id: "124", cat: Other, desc: "iCV Community"}
     # PROGETTI
-#    - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
-#    - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
-#    - {id: "110", cat: Books, desc: "Progetto - Biblico"}
-#    - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
-#    - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
+    # - {id: "172", cat: Audio, desc: "Progetto - Discografie"}
+    # - {id: "109", cat: Movies, desc: "Progetto - Filmografie"}
+    # - {id: "110", cat: Books, desc: "Progetto - Biblico"}
+    # - {id: "137", cat: Other, desc: "Progetto - Releaser/Crew"}
+    # - {id: "126", cat: Movies, desc: "Progetto - Cine Vintage "}
     # MUSICA
     - {id: "19", cat: Audio, desc: "Musica Audio - Tutti i formati", default: true}
     - {id: "20", cat: Audio/Video, desc: "Musica Video - Standard Definition - High Definition", default: true}
-#    - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
+    # - {id: "135", cat: Audio, desc: "Richieste Titoli Musica"}
     # VIDEO
     - {id: "6", cat: Movies/SD, desc: "Video - Screener", default: true}
     - {id: "7", cat: Movies/SD, desc: "Video - Standard Definition", default: true}
@@ -41,66 +41,66 @@ caps:
     - {id: "95", cat: Movies, desc: "Video - Dispositivi Mobili (Portable)", default: true}
     - {id: "79", cat: Movies, desc: "Video - TVRip - Standard Definition - High Definition", default: true}
     - {id: "14", cat: TV/Other, desc: "Video - Documentari - Sportivi - Spettacoli - Lirica - Standard Definition - High Definition", default: true}
-#    - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
+    # - {id: "134", cat: Movies, desc: "Richieste Titoli Video"}
     # SERIE TV
     - {id: "12", cat: TV/SD, desc: "Serie TV - Standard Definition", default: true}
     - {id: "102", cat: TV/HD, desc: "Serie TV - High definition H.264", default: true}
     - {id: "161", cat: TV/HD, desc: "Serie TV - High definition HEVC/H.265", default: true}
-#    - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
-#    - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
-#    - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
-#    - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
+    # - {id: "103", cat: TV, desc: "L'angolo di Giuseppe-iCV & littlelinx"}
+    # - {id: "160", cat: TV, desc: "L'angolo di Pir8"}
+    # - {id: "169", cat: TV, desc: "L'angolo di TV-P2P"}
+    # - {id: "133", cat: TV, desc: "Richieste Titoli Serie TV"}
     # CARTONI ANIMATI - ANIME
     - {id: "17", cat: Movies/SD, desc: "Cartoni Animati - Standard Definition - High Definition", default: true}
     - {id: "18", cat: TV/HD, desc: "Cartoni Animati - Serie TV Standard Definition - High Definition", default: true}
     - {id: "15", cat: TV/Anime, desc: "Anime - Standard Definition - High Definition", default: true}
     - {id: "16", cat: TV/Anime, desc: "Anime - Serie TV Standard Definition - High Definition", default: true}
     - {id: "89", cat: Movies/HD, desc: "Cartoni Animati - Anime - Serie Tv e Non - High Definition - HEVC/H.265", default: true}
-#    - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
+    # - {id: "132", cat: TV/Anime, desc: "Richieste Titoli Cartoni Animati - Anime"}
     # EBOOK - FUMETTI - RIVISTE - QUOTIDIANI
     - {id: "25", cat: Books/EBook, desc: "Ebook", default: true}
     - {id: "26", cat: Audio/Audiobook, desc: "Ebook Audio", default: true}
     - {id: "170", cat: Books/Comics, desc: "Fumetti", default: true}
     - {id: "28", cat: Books/Mags, desc: "Riviste - Quotidiani", default: true}
     - {id: "47", cat: Other, desc: "Wallpapers - Poster - Calendari", default: true}
-#    - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
+    # - {id: "131", cat: Movies, desc: "Richieste Titoli Ebook - Fumetti - Riviste"}
     # SOFTWARE
     - {id: "21", cat: PC/0day, desc: "Windows Software", default: true}
-#    - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
-#    - {id: "92", cat: PC, desc: "Windows Supporto "}
+    # - {id: "22", cat: PC, desc: "Windows Guide e altre in generale"}
+    # - {id: "92", cat: PC, desc: "Windows Supporto "}
     - {id: "138", cat: PC/Mac, desc: "macOS Software", default: true}
-#    - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
-#    - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
-#    - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
-#    - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
+    # - {id: "162", cat: PC/Mac, desc: "macOS Guide"}
+    # - {id: "163", cat: PC/Mac, desc: "macOS Supporto"}
+    # - {id: "164", cat: PC/Mac, desc: "Hackintosh Guide"}
+    # - {id: "165", cat: PC/Mac, desc: "Hackintosh Supporto"}
     - {id: "23", cat: PC, desc: "Linux Software", default: true}
-#    - {id: "168", cat: PC, desc: "Linux Guide"}
-#    - {id: "93", cat: PC, desc: "Linux Supporto"}
+    # - {id: "168", cat: PC, desc: "Linux Guide"}
+    # - {id: "93", cat: PC, desc: "Linux Supporto"}
     - {id: "24", cat: PC, desc: "Guide & Tutorial Video", default: true}
-#    - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
+    # - {id: "129", cat: PC, desc: "Richieste Titoli Software"}
     # GAMES
     - {id: "36", cat: PC/Games, desc: "Games - Pc Windows", default: true}
     - {id: "158", cat: PC/Mac, desc: "Games - macOS", default: true}
     - {id: "37", cat: Console/XBox 360, desc: "Games - Console Microsoft Xbox 360", default: true}
     - {id: "38", cat: Console/PS3, desc: "Games - Console Sony PS3", default: true}
     - {id: "152", cat: Console/PS4, desc: "Games - Console Sony PS4", default: true}
-#    - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
-#    - {id: "123", cat: PC/Games, desc: "Games - Guide"}
-#    - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
+    # - {id: "99", cat: PC/Games, desc: "Games - Supporto"}
+    # - {id: "123", cat: PC/Games, desc: "Games - Guide"}
+    # - {id: "130", cat: PC/Games, desc: "Richieste Titoli Games"}
     # ANDROID
     - {id: "58", cat: PC/Mobile-Android, desc: "Android Apps", default: true}
-#    - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
-#    - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
+    # - {id: "144", cat: PC/Mobile-Android, desc: "Android Guide"}
+    # - {id: "128", cat: PC/Mobile-Android, desc: "Richieste Titoli Android"}
     # TEAM GRAFICO
-#    - {id: "88", cat: Other, desc: "Vetrina Grafica"}
-#    - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
+    # - {id: "88", cat: Other, desc: "Vetrina Grafica"}
+    # - {id: "100", cat: Other, desc: "Tutorial Photoshop CC"}
     # TAVERNA DEI CORSARI
-#    - {id: "39", cat: Other, desc: "Presentati alla Community"}
-#    - {id: "112", cat: Other, desc: "Assistenza Forum"}
-#    - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
-#    - {id: "83", cat: Other, desc: "Commenti Titoli "}
-#    - {id: "136", cat: Other, desc: "Sondaggi"}
-#    - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
+    # - {id: "39", cat: Other, desc: "Presentati alla Community"}
+    # - {id: "112", cat: Other, desc: "Assistenza Forum"}
+    # - {id: "33", cat: Other, desc: "Chiacchiere in generale"}
+    # - {id: "83", cat: Other, desc: "Commenti Titoli "}
+    # - {id: "136", cat: Other, desc: "Sondaggi"}
+    # - {id: "145", cat: Other, desc: "il CorSaRo VeRde App"}
     # ARCHIVIO FORUM
     - {id: "171", cat: PC/0day, desc: "Windows Software obsoleto", default: true}
 
@@ -118,6 +118,10 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: compatItal
+    type: checkbox
+    label: Improve Sonarr compatibility with the tracker's Italian season naming scheme by renaming Sxx to Stagione xx in searches. Can cause results already using Sxx to not be found.
+    default: false
   - name: info30s
     type: info
     label: 30s Delay for Searches
@@ -164,6 +168,8 @@ search:
   keywordsfilters:
     - name: re_replace
       args: ["(\\w+)", " +$1"] # prepend + to each word, all keywords must be 2 characters or more
+    - name: re_replace
+      args: ["(?i)(\\bS(\\d+)(E\\d+)?\\b)", "{{ if .Config.compatItal }}Stagione +$2 $3{{ else }}S$2$3{{ end }}"] # Replace SXXEYY with Stagione XX EYY
 
   rows:
     selector: div.search_results_posts

src/Jackett.Common/Definitions/kickasstorrents-to.yml

@@ -66,6 +66,8 @@ search:
 
   rows:
     selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])
+    filters:
+      - name: andmatch
 
   fields:
     category:

src/Jackett.Common/Definitions/krazyzone.yml

@@ -0,0 +1,241 @@
+---
+id: krazyzone
+name: KrazyZone
+description: "KrazyZone is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - http://krazyzone.net/ # does not support https, CA expired Dec 2016
+
+caps:
+  categorymappings:
+    - {id: 3, cat: Audio, desc: "Mastermix"}
+    - {id: 4, cat: Audio, desc: "Mastermix Classic"}
+    - {id: 5, cat: Audio, desc: "Mastermix DJ Beats"}
+    - {id: 6, cat: Audio, desc: "Mastermix Extended"}
+    - {id: 7, cat: Audio, desc: "Mastermix- Grandmaster"}
+    - {id: 8, cat: Audio, desc: "Mastermix- Mastermix Other"}
+    - {id: 9, cat: Audio, desc: "Mastermix- Mastermix Packs"}
+    - {id: 10, cat: Audio, desc: "Mastermix Monthly Issue"}
+    - {id: 11, cat: Audio, desc: "Mastermix Pro Dance / Disc"}
+    - {id: 12, cat: Audio, desc: "Mastermix Professional"}
+    - {id: 13, cat: Audio, desc: "DMC"}
+    - {id: 83, cat: Audio, desc: "DMC Bootlegs"}
+    - {id: 84, cat: Audio, desc: "DMC Classic"}
+    - {id: 85, cat: Audio, desc: "DMC Commercial"}
+    - {id: 86, cat: Audio, desc: "DMC Complete"}
+    - {id: 87, cat: Audio, desc: "DMC Dance Mixes"}
+    - {id: 88, cat: Audio, desc: "DMC Essential"}
+    - {id: 89, cat: Audio, desc: "DMC Guide"}
+    - {id: 90, cat: Audio, desc: "DMC Monsterjam"}
+    - {id: 91, cat: Audio, desc: "DMC Other DMC and Packs"}
+    - {id: 92, cat: Audio, desc: "DMC Promo"}
+    - {id: 14, cat: Audio, desc: "MUSIC Albums"}
+    - {id: 110, cat: Audio, desc: "MUSIC Album / Music Packs and other MP3"}
+    - {id: 76, cat: Audio, desc: "MUSIC Artist Albums "}
+    - {id: 77, cat: Audio, desc: "MUSIC Compilations "}
+    - {id: 109, cat: Audio, desc: "MUSIC Discographys , Collection"}
+    - {id: 80, cat: Audio, desc: "MUSIC Flac / Lossy / DTS Packs "}
+    - {id: 81, cat: Audio/Lossless, desc: "MUSIC FLAC 24bit Hi-Res "}
+    - {id: 115, cat: Audio, desc: "MUSIC Singles , Maxi CD and Vinyl"}
+    - {id: 15, cat: Audio, desc: "DJ Only"}
+    - {id: 74, cat: Audio, desc: "DJ Other DJ Music  Including Select Mix , Promo Only"}
+    - {id: 75, cat: Audio, desc: "DJ UK Top 40 / Other Top 20 / 40"}
+    - {id: 82, cat: Audio, desc: "DJ Ultramix , Ultrasound , UltraTraxx , Xmix "}
+    - {id: 16, cat: Audio, desc: "ONLY KZN Packs / Albums"}
+    - {id: 73, cat: Audio, desc: "ONLY KZN  KZN Packs / Albums Exclusive VIP only"}
+    - {id: 69, cat: Audio, desc: "ONLY KZN Album / Music Packs"}
+    - {id: 72, cat: Audio, desc: "ONLY KZN MP3 Weekly"}
+    - {id: 17, cat: Audio, desc: "Karaoke"}
+    - {id: 67, cat: Audio, desc: "Karaoke All Karaoke "}
+    - {id: 68, cat: Audio, desc: "Karaoke All Karaoke Packs "}
+    - {id: 95, cat: Audio, desc: "KZN Mixed Albums / KZN Mixed Videos "}
+    - {id: 96, cat: Audio, desc: "KZN Mixed Albums / KZN Mixed Videos"}
+    - {id: 112, cat: Audio, desc: "KZN MP3 Weekly"}
+    - {id: 18, cat: Audio/Video, desc: "Music Videos"}
+    - {id: 66, cat: Audio/Video, desc: "Music Videos Singles Video"}
+    - {id: 65, cat: Audio/Video, desc: "Music Videos Video Packs and Live Video Concerts"}
+    - {id: 19, cat: Movies, desc: "Movie Packs"}
+    - {id: 62, cat: Movies, desc: "Movie Packs Kids Movie Packs"}
+    - {id: 63, cat: Movies, desc: "Movie Packs Movie Packs"}
+    - {id: 64, cat: Movies, desc: "Movie Packs Pre 90 Movie Packs"}
+    - {id: 21, cat: PC, desc: "Applications"}
+    - {id: 50, cat: PC/Mobile-Android, desc: "Applications Android"}
+    - {id: 51, cat: PC/Mac, desc: "Applications Misc , Linux , Mac "}
+    - {id: 52, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 22, cat: Books, desc: "Ebooks/Mags"}
+    - {id: 48, cat: Audio/Audiobook, desc: "Ebooks Audiobooks"}
+    - {id: 49, cat: Books/EBook, desc: "Ebooks Ebooks / Mags"}
+    - {id: 23, cat: PC/Games, desc: "Games"}
+    - {id: 45, cat: PC/Games, desc: "Games PC / ISO"}
+    - {id: 105, cat: Console/PS4, desc: "Games PS2 / PS3 / PS4 "}
+    - {id: 46, cat: Console/NDS, desc: "Games Wii+ Nds"}
+    - {id: 47, cat: Console/XBox 360, desc: "Games Xbox360"}
+    - {id: 20, cat: Movies, desc: "Movies"}
+    - {id: 113, cat: Movies, desc: "Movies 2021 Movies"}
+    - {id: 116, cat: Movies/UHD, desc: "Movies 4K Movies"}
+    - {id: 53, cat: Movies, desc: "Movies Anime / Kids"}
+    - {id: 54, cat: Movies/BluRay, desc: "Movies Bluray,HDRip,BDRip,Webrip,HEVC"}
+    - {id: 55, cat: Movies/SD, desc: "Movies Cam / TS / Screener"}
+    - {id: 56, cat: Movies, desc: "Movies Classic Movies Pre 90s to 2000"}
+    - {id: 57, cat: Movies/DVD, desc: "Movies DVDR ,NTSCPAL ,ISO"}
+    - {id: 58, cat: Movies/WEB-DL, desc: "Movies DVDRip,AVI,XVID,BRRip"}
+    - {id: 59, cat: Movies/Foreign, desc: "Movies Foreign"}
+    - {id: 107, cat: Movies/HD, desc: "Movies Mp4  Movies"}
+    - {id: 60, cat: Movies, desc: "Movies Netflix"}
+    - {id: 61, cat: Movies/3D, desc: "Movies Remux , 3D"}
+    - {id: 24, cat: TV, desc: "TV"}
+    - {id: 39, cat: TV/Documentary, desc: "TV Discovery /  Geographics / Documentary"}
+    - {id: 41, cat: TV, desc: "TV Episodes"}
+    - {id: 42, cat: TV/Anime, desc: "TV Kids / Anime"}
+    - {id: 43, cat: TV/Sport, desc: "TV Sport"}
+    - {id: 44, cat: TV/Sport, desc: "TV Sport Packs"}
+    - {id: 26, cat: Books/Comics, desc: "Comics"}
+    - {id: 37, cat: Books/Comics, desc: "Comics Comics"}
+    - {id: 25, cat: TV, desc: "TV Packs/Full Seasons"}
+    - {id: 38, cat: TV, desc: "TV Packs Full Seasons"}
+    - {id: 40, cat: TV, desc: "TV Packs Kids / Anime Full Seasons"}
+    - {id: 94, cat: TV, desc: "TV Packs Pre 90`s TV series"}
+    - {id: 27, cat: Other, desc: "Wallpapers"}
+    - {id: 36, cat: Other, desc: "Wallpapers PC Wallpapers"}
+    - {id: 1, cat: Other/Misc, desc: "Unsorted"}
+    - {id: 2, cat: Other/Misc, desc: "Unsorted To Be Edited"}
+    - {id: 30, cat: Other, desc: "Exclusive VIP"}
+    - {id: 33, cat: Other, desc: "Exclusive VIP Exclusive VIP Not To Be Uploaded Anywhere"}
+    - {id: 31, cat: Other, desc: "VIP"}
+    - {id: 32, cat: Other, desc: "VIP VIP Not To Be Uploaded Anywhere"}
+    - {id: 99, cat: Other, desc: "Christmas Albums"}
+    - {id: 101, cat: Other, desc: "Christmas Albums Packs"}
+    - {id: 103, cat: Other, desc: "All Christmas Movies and Packs"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("error has occured")
+    - selector: a[href*="/login.php?error="]
+      message:
+        text: Wrong username or password.
+  test:
+    path: index.php
+    selector: a[href*="/logout.php?logouthash="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selectors:
+    - selector: a[href*="/download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    - path: browse.php
+  keywordsfilters:
+    - name: re_replace
+      args: ["[\\s]+", "%"]
+  inputs:
+    do: search
+    keywords: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: "{{ if .Query.IMDBID }}t_genre{{ else }}t_name{{ end }}"
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    include_dead_torrents: yes
+    sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}"
+    order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}"
+
+  rows:
+    selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
+
+  fields:
+    category:
+      selector: a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: a[href*="/details.php?id="]
+    details:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/details.php?id="]
+      attribute: href
+    poster:
+      selector: img[src*="/torrents/images/"]
+      attribute: src
+    date:
+      selector: td:nth-child(2)
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02-01-2006 15:04 -07:00"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        img[src$="/freedownload.gif"]: 0
+        img[src$="/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="/x2.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 12 hours (as seconds = 12 x 60 x 60)
+      text: 43200
+# TS Special Edition v.7.4

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,7 +9,7 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.pro/
-  - https://limetorrents.unblockit.bz/
+  - https://limetorrents.unblockit.tv/
   - https://limetorrents.unblockninja.com/
   - https://limetorrents.nocensor.biz/
 legacylinks:
@@ -52,6 +52,7 @@ legacylinks:
   - https://limetorrents.unblockit.ws/
   - https://limetorrents.nocensor.work/
   - https://limetorrents.unblockit.kim/
+  - https://limetorrents.unblockit.bz/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/mediamaatjes.yml

@@ -0,0 +1,195 @@
+---
+id: mediamaatjes
+name: MediaMaatjes
+description: "MediaMaatjes is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: nl-NL
+type: private
+encoding: UTF-8
+links:
+  - https://www.mediamaatjes.org/
+
+caps:
+  categorymappings:
+    - {id: 43, cat: Movies/UHD, desc: "4k Films"}
+    - {id: 41, cat: TV/Documentary, desc: "Documentaire"}
+    - {id: 40, cat: Other, desc: "kerst"}
+    - {id: 15, cat: Other, desc: "Overige"}
+    - {id: 1, cat: Other, desc: "Afbeeldingen"}
+    - {id: 19, cat: TV, desc: "TV Series"}
+    - {id: 21, cat: TV/HD, desc: "Series/MKV"}
+    - {id: 23, cat: Audio/Video, desc: "Cabaret"}
+    - {id: 24, cat: Books/EBook, desc: "E-Books"}
+    - {id: 30, cat: Movies, desc: "Classic"}
+    - {id: 31, cat: Audio/Audiobook, desc: "Luisterboek"}
+    - {id: 32, cat: Movies/HD, desc: "Films/HD 720p"}
+    - {id: 33, cat: Audio, desc: "NL Muziek"}
+    - {id: 34, cat: Books/Comics, desc: "Stripboeken"}
+    - {id: 36, cat: Books/Mags, desc: "E Magazine"}
+    - {id: 18, cat: TV/SD, desc: "Series/XVID"}
+    - {id: 17, cat: PC/Games, desc: "PC Spellen"}
+    - {id: 16, cat: PC, desc: "PC Software"}
+    - {id: 2, cat: Movies/HD, desc: "Films/HD 1080p"}
+    - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
+    - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
+    - {id: 7, cat: Movies/SD, desc: "DVD Promo/R5"}
+    - {id: 8, cat: XXX, desc: "Erotiek"}
+    - {id: 9, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
+    - {id: 10, cat: Audio, desc: "Muziek Album"}
+    - {id: 11, cat: Audio, desc: "Muziek Diverse"}
+    - {id: 13, cat: Console/Wii, desc: "Wii"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
+  - name: thankyou
+    type: text
+    label: Thank You Comment
+  - name: info
+    type: info
+    label: Thank you comment
+    default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table.main:contains("Aanmelden mislukt")
+  test:
+    path: /
+    selector: a[href="logout.php"]
+
+download:
+  before:
+    # https://www.mediamaatjes.org/comment.php?action=add&tid=166386
+    path: comment.php
+    method: post
+    inputs:
+      action: add
+      tid: "{{ .DownloadUri.Query.id }}"
+      text: "{{ .Config.thankyou }}"
+  selectors:
+    - selector: a[href^="download.php?id="]
+      attribute: href
+
+search:
+  paths:
+    # https://www.mediamaatjes.org/browse.php?search=&cat=43&incldead=1
+    - path: browse.php
+  inputs:
+    $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{{ if .Config.freeleech }}:has(img[src=\"pic/freedlfsu.gif\"]){{ else }}{{ end }}"
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      filters:
+        - name: re_replace
+          args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
+        - name: re_replace
+          args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
+        - name: re_replace
+          args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
+        - name: re_replace
+          args: ["(?i)compleet", "Complete"]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    size:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "(.+?) in"
+    files:
+      selector: a[href^="details_bestanden.php?torrent_id="]
+      filters:
+        - name: regexp
+          args: "in (\\d+) bestan"
+    grabs:
+      selector: table table tr:nth-child(2) td:nth-child(1)
+    date:
+      selector: table table tr:nth-child(2) td:nth-child(2)
+      filters:
+        - name: replace
+          args: ["januari", "January"]
+        - name: replace
+          args: ["februari", "February"]
+        - name: replace
+          args: ["maart", "March"]
+        - name: replace
+          args: ["april", "April"]
+        - name: replace
+          args: ["mei", "May"]
+        - name: replace
+          args: ["juni", "June"]
+        - name: replace
+          args: ["juli", "July"]
+        - name: replace
+          args: ["augustus", "August"]
+        - name: replace
+          args: ["september", "September"]
+        - name: replace
+          args: ["oktober", "October"]
+        - name: replace
+          args: ["november", "November"]
+        - name: replace
+          args: ["december", "December"]
+        - name: re_replace
+          args: ["\\s*om\\s*", " "]
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2 January 2006 15:04:05 -07:00"
+    seeders_optional:
+      optional: true
+      selector: table tr:nth-child(3) td:nth-child(5)  font b
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
+      optional: true
+      selector: table tr:nth-child(3) td:nth-child(5) font b:nth-child(2)
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    downloadvolumefactor:
+      case:
+        img[src="pic/freedlfsu.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+# engine n/a

src/Jackett.Common/Definitions/megamixtracker.yml

@@ -43,6 +43,7 @@ caps:
     - {id: 35, cat: Audio/MP3, desc: "Zene/Mp3/Hun"}
     - {id: 8, cat: Audio/MP3, desc: "Zene/Mp3/Külföldi"}
     - {id: 40, cat: Audio/Other, desc: "Zene/Podcast"}
+    - {id: 83, cat: Movies/HD, desc: "Unknown"} # category has no name and is not listed
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/mircrew.yml

@@ -9,54 +9,68 @@ links:
   - https://mircrew-releases.org/
 
 caps:
+  # commented out categories are discussion-only forums
   categorymappings:
-    - {id: 1, cat: Other, desc: "MIRCrew Sharing Community"}
-    - {id: 2, cat: Other, desc: "Piazza Grande"}
-    - {id: 3, cat: Other, desc: "Comunicazioni, Annunci & Guide"}
-    - {id: 11, cat: Other, desc: "CAG Progetti & Collezioni"}
-    - {id: 12, cat: Other, desc: "CAG Pir8 Channel"}
-    - {id: 13, cat: Other, desc: "CAG Progetti"}
-    - {id: 61, cat: Other, desc: "CAG Video"}
-    - {id: 62, cat: Other, desc: "CAG Animazione"}
-    - {id: 63, cat: Other, desc: "CAG Libreria"}
-    - {id: 64, cat: Other, desc: "CAG Musica"}
-    - {id: 14, cat: Other, desc: "CAG Collezioni"}
-    - {id: 50, cat: Other, desc: "CAG Proposte & Richieste"}
-    - {id: 60, cat: Other, desc: "CAG Abbandonati"}
-    - {id: 15, cat: Other, desc: "Area Grafica"}
-    - {id: 16, cat: Other, desc: "Vetrina MIRCrew"}
-    - {id: 17, cat: Other, desc: "Vetrina Utenti"}
-    - {id: 19, cat: Other, desc: "Area Staff"}
-    - {id: 23, cat: Other, desc: "Archivio"}
-    - {id: 25, cat: Movies, desc: "Video Releases"}
-    - {id: 26, cat: Movies, desc: "Releases Film"}
-    - {id: 28, cat: TV, desc: "Releases Serie TV"}
-    - {id: 51, cat: TV, desc: "Releases TV Stagioni in corso"}
-    - {id: 52, cat: TV, desc: "Releases TV Stagioni complete"}
-    - {id: 29, cat: TV/Documentary, desc: "Documentari"}
-    - {id: 30, cat: TV, desc: "TV Show"}
-    - {id: 31, cat: TV, desc: "Teatro"}
-    - {id: 32, cat: Movies, desc: "Richieste Video"}
-    - {id: 53, cat: Movies, desc: "Richieste Film"}
-    - {id: 54, cat: TV, desc: "Richieste Serie TV"}
-    - {id: 55, cat: Movies, desc: "Richieste Video diverse"}
-    - {id: 57, cat: Movies, desc: "Richieste Video Soddisfatte"}
-    - {id: 33, cat: TV/Anime, desc: "Animazione Releases"}
-    - {id: 34, cat: TV/Anime, desc: "Anime - Movies"}
-    - {id: 35, cat: TV/Anime, desc: "Anime - Serie"}
-    - {id: 36, cat: TV/Anime, desc: "Cartoon - Movies"}
-    - {id: 37, cat: TV/Anime, desc: "Cartoon - Serie"}
-    - {id: 38, cat: TV/Anime, desc: "Richieste Animazione"}
-    - {id: 39, cat: Books, desc: "Libreria Releases"}
-    - {id: 40, cat: Books/EBook, desc: "E-Books"}
-    - {id: 41, cat: Audio/Audiobook, desc: "A-Books"}
-    - {id: 42, cat: Books/Comics, desc: "Comics"}
-    - {id: 43, cat: Books/Mags, desc: "Edicola"}
-    - {id: 44, cat: Books, desc: "Richieste Libreria"}
-    - {id: 45, cat: Audio, desc: "Music Releases"}
-    - {id: 46, cat: Audio, desc: "Musica - Audio"}
-    - {id: 47, cat: Audio/Video, desc: "Musica - Video"}
-    - {id: 48, cat: Audio, desc: "Richieste Musica"}
+    # - {id: 1, cat: Other, desc: "MIRCrew Sharing Community"}
+    # - {id: 2, cat: Other, desc: "Piazza Grande"}
+    # - {id: 4, cat: Other, desc: "PG Statuto & Regole"}
+    # - {id: 5, cat: Other, desc: "PG Info Point"}
+    # - {id: 6, cat: Other, desc: "PG Presentazioni"}
+    # - {id: 7, cat: Other, desc: "PG Off Topic"}
+    # - {id: 49, cat: Other, desc: "PG Segnalazioni allo Staff"}
+    # - {id: 3, cat: Other, desc: "Comunicazioni, Annunci & Guide"}
+    # - {id: 8, cat: Other, desc: "CAG Comunicazioni da MIRCrew"}
+    # - {id: 9, cat: Other, desc: "CAG Guide & Tutorial"}
+    # - {id: 11, cat: Other, desc: "Progetti & Collezioni"}
+    # - {id: 12, cat: Other, desc: "P&C Pir8 Channel"}
+    # - {id: 13, cat: Other, desc: "P&C Progetti"}
+    # - {id: 61, cat: Other, desc: "P&C Video"}
+    # - {id: 62, cat: Other, desc: "P&C Animazione"}
+    # - {id: 63, cat: Other, desc: "P&C Libreria"}
+    # - {id: 64, cat: Other, desc: "P&C Musica"}
+    # - {id: 14, cat: Other, desc: "P&C Collezioni"}
+    # - {id: 50, cat: Other, desc: "P&C Proposte & Richieste"}
+    # - {id: 60, cat: Other, desc: "P&C Abbandonati"}
+    # - {id: 15, cat: Other, desc: "Area Grafica"}
+    # - {id: 16, cat: Other, desc: "AG Vetrina MIRCrew"}
+    # - {id: 17, cat: Other, desc: "AG Vetrina Utenti"}
+    # - {id: 18, cat: Other, desc: "AG Richieste Grafica"}
+    # - {id: 19, cat: Other, desc: "Area Staff"}
+    # - {id: 20, cat: Other, desc: "AS Membri MIRCrew"}
+    # - {id: 21, cat: Other, desc: "AS Reclutamento MIRCrew"}
+    # - {id: 23, cat: Other, desc: "AS Archivio"}
+    - {id: 25, cat: Movies, desc: "Video Releases", default: true}
+    - {id: 26, cat: Movies, desc: "Releases Film", default: true}
+    # - {id: 28, cat: TV, desc: "Releases Serie TV"}
+    - {id: 51, cat: TV, desc: "Releases TV Stagioni in corso", default: true}
+    - {id: 52, cat: TV, desc: "Releases TV Stagioni complete", default: true}
+    - {id: 29, cat: TV/Documentary, desc: "Documentari", default: true}
+    - {id: 30, cat: TV, desc: "TV Show", default: true}
+    - {id: 31, cat: TV, desc: "Teatro", default: true}
+    # - {id: 32, cat: Movies, desc: "Richieste Video"}
+    # - {id: 53, cat: Movies, desc: "Richieste Film"}
+    # - {id: 54, cat: TV, desc: "Richieste Serie TV"}
+    # - {id: 55, cat: Movies, desc: "Richieste Video diverse"}
+    # - {id: 57, cat: Movies, desc: "Richieste Video Soddisfatte"}
+    - {id: 33, cat: TV/Anime, desc: "Animazione Releases", default: true}
+    - {id: 34, cat: TV/Anime, desc: "Anime - Movies", default: true}
+    - {id: 35, cat: TV/Anime, desc: "Anime - Serie", default: true}
+    - {id: 36, cat: TV/Anime, desc: "Cartoon - Movies", default: true}
+    - {id: 37, cat: TV/Anime, desc: "Cartoon - Serie", default: true}
+    # - {id: 38, cat: TV/Anime, desc: "Richieste Animazione", default: true}
+    # - {id: 58, cat: TV/Anime, desc: "Richieste Animazione Soddisfatte", default: true}
+    - {id: 39, cat: Books, desc: "Libreria Releases", default: true}
+    - {id: 40, cat: Books/EBook, desc: "E-Books", default: true}
+    - {id: 41, cat: Audio/Audiobook, desc: "A-Books", default: true}
+    - {id: 42, cat: Books/Comics, desc: "Comics", default: true}
+    - {id: 43, cat: Books/Mags, desc: "Edicola", default: true}
+    # - {id: 44, cat: Books, desc: "Richieste Libreria"}
+    # - {id: 59, cat: Books, desc: "Richieste Libreria Soddisfatte"}
+    - {id: 45, cat: Audio, desc: "Music Releases", default: true}
+    - {id: 46, cat: Audio, desc: "Musica - Audio", default: true}
+    - {id: 47, cat: Audio/Video, desc: "Musica - Video", default: true}
+    # - {id: 48, cat: Audio, desc: "Richieste Musica"}
+    # - {id: 56, cat: Audio, desc: "Richieste Musica Soddisfatte"}
 
   modes:
     search: [q]
@@ -114,7 +128,7 @@ search:
     # Search by Author
     author: ""
     # Search in subforums: yes 1, no 0
-    sc: 1
+    sc: 0
     # Search For: all, msgonly, titleonly, firstpost
     sf: titleonly
     # Show Results as: posts, topics

src/Jackett.Common/Definitions/movietorrent.yml

@@ -46,6 +46,7 @@ caps:
     - {id: 8809, cat: Movies, desc: "2014"}
     - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
     - {id: 10293, cat: Movies, desc: "2021"}
+    - {id: 8569, cat: Movies, desc: "2021"}
 
   modes:
     search: [q]
@@ -57,7 +58,7 @@ settings: []
 download:
   infohash:
     hash:
-      selector: a[href^="magnet:?xt="]
+      selector: a[href^="magnet:"]
       attribute: href
       filters:
         - name: regexp

src/Jackett.Common/Definitions/movietorrentz.yml

@@ -0,0 +1,136 @@
+---
+id: movietorrentz
+name: Movie-Torrentz
+description: "Movie-Torrentz is a Private Torrent Tracker for MOVIES / TV"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://m2g.link/
+
+caps:
+  categorymappings:
+    - {id: 106, cat: Movies, desc: "m2g: m2g"}
+    - {id: 102, cat: PC, desc: "Misc: Programs"}
+    - {id: 107, cat: Movies/SD, desc: "Movies: Xvid"}
+    - {id: 108, cat: Movies/DVD, desc: "Movies: DVDR"}
+    - {id: 109, cat: Movies, desc: "Movies: Packs"}
+    - {id: 110, cat: Movies/HD, desc: "Movies: MP4"}
+    - {id: 112, cat: Movies/SD, desc: "Movies: 480p"}
+    - {id: 113, cat: Movies/BluRay, desc: "Movies: BluRay / x264"}
+    - {id: 126, cat: Movies/HD, desc: "Movies: x265"}
+    - {id: 127, cat: Movies/UHD, desc: "Movies: 4K"}
+    - {id: 114, cat: TV/SD, desc: "TV: XviD"}
+    - {id: 115, cat: TV/HD, desc: "TV: X264"}
+    - {id: 116, cat: TV, desc: "TV: Packs"}
+    - {id: 128, cat: TV/HD, desc: "TV: x265"}
+    - {id: 103, cat: Movies, desc: "ViP3R: ViP3R"}
+
+  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: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: id
+    options:
+      id: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: account-login.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    remember: yes
+  error:
+    - selector: div.myBlock:contains("Access Denied")
+  test:
+    path: index.php
+    selector: a[href="account-logout.php"]
+
+search:
+  paths:
+    - path: torrents-search.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 0 active, 1 dead, 2 onlydead
+    incldead: 1
+    # 0 any, 1 english, etc
+    lang: 0
+    # 0 any, 1 notfree, 2 onlyfree
+    freeleech: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not support imdbid searching
+
+  rows:
+    selector: tr.t-row
+
+  fields:
+    category:
+      selector: a[href^="torrents.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="torrents-details.php?id="]
+    details:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=(.+?) width"
+        - name: replace
+          args: ["images/nocover.jpg", ""]
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: td:nth-last-child(5)
+    seeders:
+      selector: td:nth-last-child(4)
+    leechers:
+      selector: td:nth-last-child(3)
+    downloadvolumefactor:
+      case:
+        img[src="images/free.gif"]: 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 0.5
+# TorrentTrader

src/Jackett.Common/Definitions/mypornclub.yml

@@ -33,7 +33,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}search/{{ re_replace .Keywords \"\\s+\" \"-\" }}{{ else }}ts{{ end }}"
+    - path: "{{ if .Keywords }}s/{{ re_replace .Keywords \"\\s+\" \"-\" }}{{ else }}ts{{ end }}"
 
   rows:
     selector: div.torrents_list > div.torrent_element

src/Jackett.Common/Definitions/nforce.yml

@@ -1,186 +0,0 @@
----
-id: nforce
-name: nForce
-description: "nForce is a HUNGARIAN Private Tracker for MOVIES / TV"
-language: hu-HU
-type: private
-encoding: ISO-8859-2
-links:
-  - http://n-force.eu/ # site does not support https ERR_CONNECTION_REFUSED
-
-caps:
-  categorymappings:
-    - {id: 3, cat: Movies/DVD, desc: "Film DVD/EN"}
-    - {id: 4, cat: Movies/DVD, desc: "Film DVD/HU"}
-    - {id: 5, cat: Movies/SD, desc: "Film XviD/EN"}
-    - {id: 6, cat: Movies/SD, desc: "Film XviD/HU"}
-    - {id: 7, cat: Movies/DVD, desc: "Film DVD9/EN"}
-    - {id: 8, cat: Movies/DVD, desc: "Film DVD9/HU"}
-    - {id: 9, cat: Movies/HD, desc: "Film HD/EN"}
-    - {id: 10, cat: Movies/HD, desc: "Film HD/HU"}
-    - {id: 36, cat: Movies/SD, desc: "Film SD/HU"}
-    - {id: 37, cat: Movies/SD, desc: "Film SD/EN"}
-    - {id: 26, cat: PC/Games, desc: "Játék PC/ISO"}
-    - {id: 27, cat: PC/Games, desc: "Játék PC/RIP"}
-    - {id: 28, cat: Console, desc: "Játék PC/Konzol"}
-    - {id: 40, cat: Other, desc: "Kepek Kep/HDkep"}
-    - {id: 1, cat: Books/EBook, desc: "Könyv eBook/EN"}
-    - {id: 2, cat: Books/EBook, desc: "Könyv eBook/HU"}
-    - {id: 29, cat: PC/ISO, desc: "Program Prog/ISO"}
-    - {id: 30, cat: PC/0day, desc: "Program Prog/RIP"}
-    - {id: 31, cat: PC/Mobile-Other, desc: "Program Prog/Mobil"}
-    - {id: 11, cat: TV/SD, desc: "Sorozat DVDR/EN"}
-    - {id: 12, cat: TV/SD, desc: "Sorozat DVDR/HU"}
-    - {id: 13, cat: TV/SD, desc: "Sorozat XviD/EN"}
-    - {id: 14, cat: TV/SD, desc: "Sorozat XviD/HU"}
-    - {id: 15, cat: TV/HD, desc: "Sorozat HD/EN"}
-    - {id: 16, cat: TV/HD, desc: "Sorozat HD/HU"}
-    - {id: 34, cat: TV/Sport, desc: "Sport EN"}
-    - {id: 35, cat: TV/Sport, desc: "Sport HU"}
-    - {id: 22, cat: XXX/SD, desc: "XXX XviD"}
-    - {id: 23, cat: XXX/DVD, desc: "XXX DVDR"}
-    - {id: 24, cat: XXX/x264, desc: "XXX HD"}
-    - {id: 25, cat: XXX/ImageSet, desc: "XXX Imageset"}
-    - {id: 39, cat: XXX/ImageSet, desc: "XXX Imageset"}
-    - {id: 17, cat: Audio/MP3, desc: "Zene MP3/EN"}
-    - {id: 18, cat: Audio/MP3, desc: "Zene MP3/HU"}
-    - {id: 19, cat: Audio/Lossless, desc: "Zene Lossless/EN"}
-    - {id: 20, cat: Audio/Lossless, desc: "Zene Lossless/HU"}
-    - {id: 21, cat: Audio/Video, desc: "Zene Klip"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    book-search: [q]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search FreeLeech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      1: title
-      3: added
-      4: size
-      6: seeders
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrent oldalanként:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: nem_vagy_bejelentkezve.php?muvelet=belepes
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table:contains("Sajnálom")
-  test:
-    path: index.php?oldal=1
-    selector: a[href^="kilepes.php?"]
-
-search:
-  paths:
-    - path: torrentek.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 name, 1 descr, 2 both
-    # name only search is broken.
-    miben: 2
-    # 0 active, 1 all, 2 deadonly, 3 freeleech, 4 double, 5 featured, 6 unverified, 8 incorrect, 9 uploader
-    szures: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # site does not support imdbid searching
-
-  rows:
-    selector: div#box_torrent_all
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: a[href^="torrentek.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title_default:
-      # can be abbreviated
-      selector: a[href^="javascript:lenyit("]
-    title_optional:
-      # usually full length
-      selector: a[href^="javascript:lenyit("]
-      attribute: title
-      optional: true
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
-    id:
-      selector: a[href^="javascript:lenyit("]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)
-    details:
-      text: "torrent_adatlap.php?id={{ .Result.id }}"
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.*?) "
-    download:
-      text: "torrent_letoltes.php/{{ .Result.id }}/{{ .Result.title }}.torrent"
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    date:
-      selector: div.box_feltoltve2
-      filters:
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: div.box_meret2
-    grabs:
-      selector: div.box_d2
-    seeders:
-      selector: div.box_s2
-    leechers:
-      selector: div.box_l2
-    downloadvolumefactor:
-      case:
-        img[src="images/ellenorzes/free.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="images/ellenorzes/dupla.png"]: 2
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TBDEV custom v4.0

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

@@ -17,6 +17,10 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: true
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -47,13 +51,16 @@ caps:
     - {id: 729, cat: TV, desc: " |- Развивающее Видео для детей"}
     - {id: 731, cat: TV, desc: " |- Отечественные Фильмы для детей"}
     - {id: 733, cat: TV, desc: " |- Зарубежные Фильмы для детей"}
-    - {id: 730, cat: TV, desc: " |- Отечественные Мультфильмы для детей"}
-    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
-    - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
-    - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
-    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1329, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века SD"}
+    - {id: 1330, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века HD, FHD, UHD"}
     - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"}
     - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"}
+    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1336, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века SD"}
+    - {id: 1337, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века HD, FHD, UHD"}
+    - {id: 1338, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века SD"}
+    - {id: 1339, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века HD, FHD, UHD"}
+    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
     - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
     - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}
     - {id: 661, cat: TV, desc: " |- Зарубежные Мультфильмы (HD, UHD, UHD-LQ)"}
@@ -794,6 +801,11 @@ search:
       filters:
         - name: querystring
           args: f
+    title_is_rus:
+      selector: a[href^="viewtopic.php?t="] > b
+      filters:
+        - name: re_replace
+          args: ["[^А-Яа-яЁё]+", ""]
     title:
       selector: a[href^="viewtopic.php?t="] > b
       filters:
@@ -815,6 +827,10 @@ search:
           args: ["WEBDLRip", "WEBDL"]
         - name: replace
           args: ["HDTVRip", "HDTV"]
+        - name: append
+          args: "{{ if .Result.title_is_rus }} - RUSSIAN{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(.+?) - RUSSIAN", "{{ if .Config.addrussian }}$1 - RUSSIAN{{ else }}$1{{ end }}"]
     details:
       selector: a[href^="viewtopic.php?t="]
       attribute: href

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

@@ -23,6 +23,10 @@ settings:
     type: checkbox
     label: Strip Russian Letters
     default: true
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -57,13 +61,16 @@ caps:
     - {id: 729, cat: TV, desc: " |- Развивающее Видео для детей"}
     - {id: 731, cat: TV, desc: " |- Отечественные Фильмы для детей"}
     - {id: 733, cat: TV, desc: " |- Зарубежные Фильмы для детей"}
-    - {id: 730, cat: TV, desc: " |- Отечественные Мультфильмы для детей"}
-    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
-    - {id: 230, cat: TV, desc: " |- Отечественные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip,..."}
-    - {id: 659, cat: TV, desc: " |- Отечественные Мультфильмы (HD, UHD, UHD-LQ, DVD, Сборники)"}
-    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1329, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века SD"}
+    - {id: 1330, cat: TV, desc: " |- Отечественные Мультфильмы 20-го века HD, FHD, UHD"}
     - {id: 1331, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (SD)"}
     - {id: 1332, cat: TV, desc: " |- Отечественные мультфильмы 21-го века (HD, FHD, UHD, 3D)"}
+    - {id: 658, cat: TV, desc: " |- Отечественные Мультсериалы"}
+    - {id: 1336, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века SD"}
+    - {id: 1337, cat: TV, desc: " |- Зарубежные Мультфильмы 20-го века HD, FHD, UHD"}
+    - {id: 1338, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века SD"}
+    - {id: 1339, cat: TV, desc: " |- Зарубежные Мультфильмы 21-го века HD, FHD, UHD"}
+    - {id: 732, cat: TV, desc: " |- Зарубежные Мультфильмы для детей"}
     - {id: 231, cat: TV, desc: " |- Зарубежные Мультфильмы (HD*Rip/LQ, DVDRip, SATRip, VHSRip)"}
     - {id: 660, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD, Сборники)"}
     - {id: 661, cat: TV, desc: " |- Зарубежные Мультфильмы (HD, UHD, UHD-LQ)"}
@@ -819,6 +826,11 @@ search:
       filters:
         - name: querystring
           args: f
+    title_is_rus:
+      selector: a[href^="viewtopic.php?t="] > b
+      filters:
+        - name: re_replace
+          args: ["[^А-Яа-яЁё]+", ""]
     title:
       selector: a[href^="viewtopic.php?t="] > b
       filters:
@@ -840,6 +852,10 @@ search:
           args: ["WEBDLRip", "WEBDL"]
         - name: replace
           args: ["HDTVRip", "HDTV"]
+        - name: append
+          args: "{{ if .Result.title_is_rus }} - RUSSIAN{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(.+?) - RUSSIAN", "{{ if .Config.addrussian }}$1 - RUSSIAN{{ else }}$1{{ end }}"]
     details:
       selector: a[href^="viewtopic.php?t="]
       attribute: href

src/Jackett.Common/Definitions/oasis.yml

@@ -1,292 +0,0 @@
----
-id: oasis
-name: Oasis
-description: "Oasis is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: fr-FR
-type: private
-encoding: UTF-8
-links:
-  - https://oasis-fun.club/
-
-caps:
-  categorymappings:
-    - {id: 2, cat: Movies, desc: "Animations - 4K"}
-    - {id: 3, cat: Movies, desc: "Animations - 4K Light"}
-    - {id: 4, cat: Movies, desc: "Animations - BDRIP"}
-    - {id: 6, cat: Movies, desc: "Animations - BluRay-R"}
-    - {id: 5, cat: Movies, desc: "Animations - BRRIP"}
-    - {id: 8, cat: Movies, desc: "Animations - DVD-R"}
-    - {id: 9, cat: Movies, desc: "Animations - DVDRIP"}
-    - {id: 11, cat: Movies, desc: "Animations - HD 1080P"}
-    - {id: 12, cat: Movies, desc: "Animations - HD 720p"}
-    - {id: 13, cat: Movies, desc: "Animations - HDRIP"}
-    - {id: 165, cat: Movies, desc: "Animations - JAP"}
-    - {id: 14, cat: Movies, desc: "Animations - REMUX"}
-    - {id: 15, cat: Movies, desc: "Animations - TVRIP"}
-    - {id: 17, cat: Movies, desc: "Animations - WEB-DL"}
-    - {id: 16, cat: Movies, desc: "Animations - WEBRIP"}
-    - {id: 167, cat: Audio/Audiobook, desc: "Ebook - AUDIO"}
-    - {id: 73, cat: Books/EBook, desc: "Ebook - BD"}
-    - {id: 74, cat: Books/EBook, desc: "Ebook - ENFANTS"}
-    - {id: 168, cat: Books/Mags, desc: "Ebook - MAGAZINE"}
-    - {id: 75, cat: Books/Comics, desc: "Ebook - MANGAS"}
-    - {id: 76, cat: Books, desc: "Ebook - ROMANS"}
-    - {id: 20, cat: Movies, desc: "Film -  DOC.DECOUVERTES"}
-    - {id: 25, cat: Movies/3D, desc: "Film - 3D"}
-    - {id: 26, cat: Movies/UHD, desc: "Film - 4K"}
-    - {id: 27, cat: Movies/UHD, desc: "Film - 4K Light"}
-    - {id: 169, cat: Movies, desc: "Film - AV1"}
-    - {id: 28, cat: Movies/BluRay, desc: "Film - BDRIP"}
-    - {id: 30, cat: Movies/BluRay, desc: "Film - BluRay-R"}
-    - {id: 29, cat: Movies/BluRay, desc: "Film - BRRIP"}
-    - {id: 31, cat: Movies, desc: "Film - Coffret"}
-    - {id: 18, cat: Movies, desc: "Film - DOC.ANIMAUX"}
-    - {id: 19, cat: Movies, desc: "Film - DOC.ANTIQUE"}
-    - {id: 21, cat: Movies, desc: "Film - DOC.DIVERS"}
-    - {id: 22, cat: Movies, desc: "Film - DOC.HISTOIRE"}
-    - {id: 198, cat: Movies, desc: "Film - DOC.SPECTACLE"}
-    - {id: 23, cat: Movies, desc: "Film - DOC.SPORT"}
-    - {id: 24, cat: Movies, desc: "Film - DOC.UNIVERS"}
-    - {id: 32, cat: Movies/DVD, desc: "Film - DVD-R"}
-    - {id: 33, cat: Movies/DVD, desc: "Film - DVDRIP"}
-    - {id: 164, cat: Movies, desc: "Film - EMISSION.TV"}
-    - {id: 35, cat: Movies/HD, desc: "Film - HD 1080P"}
-    - {id: 36, cat: Movies/HD, desc: "Film - HD 720p"}
-    - {id: 37, cat: Movies/HD, desc: "Film - HDRIP"}
-    - {id: 171, cat: Movies/HD, desc: "Film - HDTV 1080P"}
-    - {id: 170, cat: Movies/HD, desc: "Film - HDTV 720P"}
-    - {id: 172, cat: Movies/HD, desc: "Film - M-HD"}
-    - {id: 38, cat: Movies, desc: "Film - REMUX"}
-    - {id: 39, cat: Movies, desc: "Film - TVRIP"}
-    - {id: 41, cat: Movies/WEB-DL, desc: "Film - WEB-DL"}
-    - {id: 200, cat: Movies/WEB-DL, desc: "Film - Webrip"}
-    - {id: 59, cat: Console/3DS, desc: "Jeux - 3DS-DS"}
-    - {id: 60, cat: PC/Mobile-Android, desc: "Jeux - ANDROID"}
-    - {id: 61, cat: PC/Mobile-iOS, desc: "Jeux - IOS-X"}
-    - {id: 62, cat: PC/Games, desc: "Jeux - PC"}
-    - {id: 63, cat: Console/PS4, desc: "Jeux - PS3-4"}
-    - {id: 64, cat: Console/PSP, desc: "Jeux - PSP-X"}
-    - {id: 66, cat: Console/Wii, desc: "Jeux - WII"}
-    - {id: 65, cat: Console/WiiU, desc: "Jeux - WII-U"}
-    - {id: 67, cat: Console/XBox, desc: "Jeux - XBOX"}
-    - {id: 68, cat: PC/Mobile-Android, desc: "Logiciel - ANDROID"}
-    - {id: 69, cat: PC/Mobile-iOS, desc: "Logiciel - APPLE"}
-    - {id: 70, cat: PC/Mobile-iOS, desc: "Logiciel - IPHONE"}
-    - {id: 71, cat: PC, desc: "Logiciel - LINUX"}
-    - {id: 72, cat: PC/0day, desc: "Logiciel - WINDOWS"}
-    - {id: 173, cat: TV/UHD, desc: "Serie - 4K"}
-    - {id: 174, cat: TV/UHD, desc: "Serie - 4k-lLIGHT"}
-    - {id: 85, cat: TV, desc: "Serie - Coffret"}
-    - {id: 7, cat: TV, desc: "Serie - Coffret-Anime"}
-    - {id: 194, cat: TV/Documentary, desc: "Serie - DOCU.DIVERS"}
-    - {id: 195, cat: TV/Documentary, desc: "Serie - DOCU.EMISTV"}
-    - {id: 86, cat: TV/SD, desc: "Serie - DVD-R"}
-    - {id: 87, cat: TV/SD, desc: "Serie  - DVDRIP"}
-    - {id: 197, cat: TV, desc: "Serie - EPISODE"}
-    - {id: 88, cat: TV/HD, desc: "Serie  - HD 1080P"}
-    - {id: 89, cat: TV/HD, desc: "Serie - HD 720p"}
-    - {id: 90, cat: TV/HD, desc: "Serie - HDRIP"}
-    - {id: 176, cat: TV/HD, desc: "Serie - HDTV 1080"}
-    - {id: 175, cat: TV/HD, desc: "Serie - HDTV 720"}
-    - {id: 182, cat: TV/Anime, desc: "Serie - JAP-ANIM"}
-    - {id: 177, cat: TV/HD, desc: "Serie - M-HD"}
-    - {id: 91, cat: TV, desc: "Serie - REMUX"}
-    - {id: 166, cat: TV, desc: "Serie - SERIE  Docu"}
-    - {id: 92, cat: TV, desc: "Serie - TVRIP"}
-    - {id: 199, cat: TV/WEB-DL, desc: "Serie - WebDL"}
-    - {id: 179, cat: TV/WEB-DL, desc: "Serie - WEB-DL 1080"}
-    - {id: 178, cat: TV/WEB-DL, desc: "Serie - WEB-DL 720"}
-    - {id: 93, cat: TV/WEB-DL, desc: "Serie - WEBRIP"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-  - name: torrentlanguage
-    type: select
-    label: Torrent Language
-    default: 0
-    options:
-      0: "Toutes Les Langues"
-      1: Allemand
-      2: Anglais(UK)
-      3: Anglais(US)
-      4: Arabe
-      5: Bengali
-      6: Cantonais
-      7: Coréen
-      8: Danois
-      9: Espagnol
-      10: Flamand
-      11: Français
-      12: Hébreu
-      13: Hindi
-      14: Italien
-      15: Japonais
-      16: Mandarin
-      25: Muet
-      17: Multi
-      26: Musical
-      18: Perse
-      19: Portuguais
-      20: Québécois
-      21: Russe
-      22: Suédois
-      23: Ukrainien
-      24: "VOSTFR"
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: TTV3/Bienvenue
-    selector: a[href$="/TTV3/Deconnexion"]
-
-download:
-  before:
-    # https://galeriens.com/TTV3/Torrents/11222/Remercier
-    # note http GET does not seem to work as the html suggests, so using same as LeChaudron which is also a TT3.00FRENCH engine.
-    path: "/TTV3/Torrents/{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}/Remercier"
-    method: post
-    inputs:
-      torrent: "{{ re_replace .DownloadUri.PathAndQuery \"^(.+?)(\\d+)$\" \"$2\" }}"
-  selectors:
-    - selector: a[href*="/Telechargement/"]
-      attribute: href
-
-search:
-  paths:
-    # https://oasis-fun.club/TTV3/Torrents/Recherche?recherche=&type=tout&endroit=nomtorrent&langue=0&tl=peuimporte
-    # categories for searching are unsupported
-    - path: TTV3/Torrents/Recherche
-  inputs:
-    recherche: "{{ .Keywords }}"
-    # searchtype: un (one word), tout (all words), exacte (exact expression)
-    type: tout
-    # searchin:  nomtorrent (name), desctorrent (descr)
-    endroit: nomtorrent
-    # language: 11 french, 17 multi
-    langue: "{{ .Config.torrentlanguage }}"
-    # freeleech: oui (yes), non (no), peuimporte (ignore)
-    tl: "{{ if .Config.freeleech }}oui{{ else }}peuimporte{{ end }}"
-    # does not support imdbid search and does not return imdb link in results.
-
-  rows:
-    selector: table.sortable tbody tr
-  fields:
-    category:
-      selector: a[href*="/SousCategories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: (\d+)$
-    title_phase1:
-      selector: a[onmouseover]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a[onmouseover]
-      attribute: href
-    download:
-      selector: a[onmouseover]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src= (.*?)><"
-    size:
-      selector: td:nth-last-child(5)
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    date:
-      selector: td:nth-child(2) a font[color="#F2F2F2"]
-      filters:
-        - name: replace
-          args: ["il y a ", ""]
-        - name: replace
-          args: [" Jours", " days"]
-        - name: replace
-          args: [" Jour", " day"]
-        - name: replace
-          args: [" heures", " hours"]
-        - name: replace
-          args: [" heure", " hour"]
-        - name: replace
-          args: [" Semaines", " weeks"]
-        - name: replace
-          args: [" Semaine", " week"]
-        - name: replace
-          args: [" mois", " month"]
-        - name: replace
-          args: [" ans", " years"]
-        - name: replace
-          args: [" an", " year"]
-        - name: append
-          args: " ago"
-    downloadvolumefactor:
-      case:
-        img[src$="/images/Torrents/TLibre.png"]: 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# TT3.00 FRENCH

src/Jackett.Common/Definitions/opensharing.yml

@@ -49,6 +49,7 @@ caps:
     - {id: 425, cat: XXX, desc: "Movies XXX: С Русским переводом!"}
     - {id: 1195, cat: XXX, desc: "Movies XXX: LegalPorno"}
     - {id: 1200, cat: XXX, desc: "Movies XXX: Solo & Masturbation"}
+    - {id: 1250, cat: XXX, desc: "Movies XXX: Movie Scenes"}
     - {id: 7000, cat: XXX, desc: "Movies XXX: -= XXX =-"}
 
   modes:
@@ -110,7 +111,7 @@ search:
     leechers:
       selector: td:nth-child(7)
     downloadvolumefactor:
-      text: 1
+      text: 0
     uploadvolumefactor:
       text: 1
 # engine n/a

src/Jackett.Common/Definitions/oxtorrent.yml

@@ -7,8 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.oxtorrent.vc/
-  - https://oxtorrent.unblockit.bz/
+  - https://www.oxtorrent.be/
+  - https://oxtorrent.unblockit.tv/
   - https://oxtorrent.nocensor.biz/
 legacylinks:
   - https://wwv.oxtorrent.com/
@@ -45,6 +45,8 @@ legacylinks:
   - https://oxtorrent.unblockit.kim/
   - https://www.oxtorrent.sh/
   - https://www.oxtorrent.pl/
+  - https://oxtorrent.unblockit.bz/
+  - https://www.oxtorrent.vc/
 
 caps:
   categorymappings:
@@ -87,8 +89,10 @@ settings:
 
 download:
   selectors:
-    - selector: a[href^="magnet:?"]
-      attribute: href
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 
 search:
   paths:

src/Jackett.Common/Definitions/peeratiko.yml

@@ -0,0 +1,202 @@
+---
+id: peeratiko
+name: Peeratiko
+description: "Peeratiko is a GREEK Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: el-GR
+type: private
+encoding: UTF-8
+links:
+  - https://peeratiko.org/
+
+caps:
+  categorymappings:
+    - {id: 58, cat: PC, desc: "Applications Linux"}
+    - {id: 4, cat: PC/Mac, desc: "Applications Mac"}
+    - {id: 54, cat: PC/Mobile-Other, desc: "Applications Mobiles"}
+    - {id: 2, cat: PC, desc: "Applications Other"}
+    - {id: 3, cat: PC/0day, desc: "Applications Windows"}
+    - {id: 39, cat: Books/EBook, desc: "Books Books"}
+    - {id: 56, cat: Books/Comics, desc: "Books Comics"}
+    - {id: 47, cat: Books/Mags, desc: "Books Magazines"}
+    - {id: 57, cat: PC/Mobile-Other, desc: "Games Mobiles"}
+    - {id: 5, cat: Console/Other, desc: "Games Other"}
+    - {id: 8, cat: Console/PS3, desc: "Games PSP/PS2/PS3"}
+    - {id: 6, cat: PC/Games, desc: "Games Windows"}
+    - {id: 7, cat: Console/XBox, desc: "Games XBOX"}
+    - {id: 60, cat: Movies/3D, desc: "Movies 3D"}
+    - {id: 1, cat: Movies, desc: "Movies Anime/Cartoons"}
+    - {id: 9, cat: Movies/BluRay, desc: "Movies BluRay x264"}
+    - {id: 62, cat: Movies/DVD, desc: "Movies DVD-R"}
+    - {id: 15, cat: Movies/WEB-DL, desc: "DVD/BD/BR-rip x264"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Movies Gr. Subs DVD/BD/BR-rip"}
+    - {id: 18, cat: Movies, desc: "Movies Gr. Subs Embeddeed"}
+    - {id: 19, cat: Movies/Other, desc: "Movies Gr. Subs Other"}
+    - {id: 17, cat: Movies/DVD, desc: "Movies Greek DVD-R"}
+    - {id: 21, cat: Movies/WEB-DL, desc: "Movies Greek DVD/BD/BR-rip"}
+    - {id: 22, cat: Movies/Other, desc: "Movies Greek Other"}
+    - {id: 10, cat: Movies/HD, desc: "Movies HD Packs"}
+    - {id: 13, cat: Movies/Other, desc: "Movies Other"}
+    - {id: 14, cat: Movies, desc: "Movies Packs"}
+    - {id: 23, cat: Audio, desc: "Music DJs Stuff"}
+    - {id: 26, cat: Audio, desc: "Music English/Discographies"}
+    - {id: 24, cat: Audio, desc: "Music English/Foreign"}
+    - {id: 25, cat: Audio/Lossless, desc: "Music English/Foreign FLAC"}
+    - {id: 27, cat: Audio, desc: "Music Greek"}
+    - {id: 28, cat: Audio/Lossless, desc: "Music Greek FLAC"}
+    - {id: 29, cat: Audio, desc: "Music Greek/Discographies"}
+    - {id: 36, cat: Audio/Video, desc: "Music Video Clips"}
+    - {id: 61, cat: Other, desc: "Other Packs"}
+    - {id: 40, cat: Other/Misc, desc: "Other Misc"}
+    - {id: 59, cat: Other, desc: "Other Pictures"}
+    - {id: 11, cat: TV/Documentary, desc: "TV Documentaries"}
+    - {id: 12, cat: TV/HD, desc: "TV HD Series"}
+    - {id: 63, cat: TV/HD, desc: "TV HD Series Packs"}
+    - {id: 53, cat: TV/Other, desc: "TV Other"}
+    - {id: 31, cat: TV, desc: "TV Series Gr. Subs"}
+    - {id: 32, cat: TV, desc: "TV Series Gr. Subs Embedded"}
+    - {id: 33, cat: TV, desc: "TV Series Gr. Subs Packs"}
+    - {id: 34, cat: TV, desc: "TV Series Greek"}
+    - {id: 35, cat: TV, desc: "TV Series Greek Packs"}
+    - {id: 30, cat: TV/Sport, desc: "TV Sports"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page</b> setting to <b>100</b> on your <i>Personal Options</i> from the <i>Personal Settings</i> menu on the Peeratiko webpage.
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    use_ssl: 1
+    keeplogged: 1
+  error:
+    - selector: h2
+      message:
+        selector: table tr td.text
+  test:
+    path: index.php
+    selector: a[href^="/logout.php?auth="]
+
+search:
+  paths:
+    # https://peeratiko.org/browse.php?cats2[]=39&cats5[]=28&cats5[]=29&cats5[]=36&search=&searchin=title&incldead=1
+    - path: browse.php
+  inputs:
+    # note: site uses the catsX[]=nn method which cardigann does not support.
+    search: "{{ .Keywords }}"
+    # title, descr, filelist, genre, tags, all
+    searchin: title
+    # 0 active, 1 incldead, 2 onlydead
+    incldead: 1
+    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # does not support searching imdbid and does not return imdb links
+
+  rows:
+    selector: table[width="90%"] tbody tr:has(a[href^="download.php?torrent="])
+
+  fields:
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: ">(.+?)<"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "src=..(https.+).. width"
+    files:
+      selector: td:nth-last-child(8)
+    date_day:
+      # Today<br>08:10 AM
+      # Yesterday<br>06:44 PM
+      optional: true
+      selector: td:nth-last-child(6):contains("day")
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+    date_year:
+      # Dec 4 2021<br>10:20 AM
+      optional: true
+      selector: td:nth-last-child(6):not(:contains("day"))
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "Jan 2 2006 03:04 PM -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-last-child(5)
+    grabs:
+      selector: td:nth-last-child(4)
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      case:
+        "b:contains(\"[FREE]\")": 0
+        "*": 1
+    uploadvolumefactor:
+      text: 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# U-232 V3

src/Jackett.Common/Definitions/piratadigital.yml

@@ -1,8 +1,8 @@
 ---
 id: piratadigital
 name: Pirata Digital
-description: "Pirata Digital (PD) is a Private Torrent Tracker for HD MOVIES / TV"
-language: en-US
+description: "Pirata Digital (PD) is a BRAZILIAN Private Torrent Tracker for HD MOVIES / TV"
+language: pt-BR
 type: private
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/piratbit.yml

@@ -6,12 +6,15 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://piratbit.top/ # site forces https, http is not supported
-legacylinks:
   - https://pb.wtf/
+  - http://top.piratbit.fun/
+legacylinks:
   - https://piratbit.pw/
   - https://piratbit.ml/
   - http://piratbit.top/
+  - https://piratbit.top/
+certificates:
+  - 8531af678cf197593ff4d6a4e6ce30088d719509 # expired 13th Nov 2016
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/piratbitl.yml

@@ -6,12 +6,15 @@ language: ru-RU
 type: semi-private
 encoding: UTF-8
 links:
-  - https://piratbit.top/ # site forces https, http is not supported
-legacylinks:
   - https://pb.wtf/
+  - http://top.piratbit.fun/
+legacylinks:
   - https://piratbit.pw/
   - https://piratbit.ml/
   - http://piratbit.top/
+  - https://piratbit.top/
+certificates:
+  - 8531af678cf197593ff4d6a4e6ce30088d719509 # expired 13th Nov 2016
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/pirateiro.yml

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

src/Jackett.Common/Definitions/pornbay.yml

@@ -66,11 +66,11 @@ settings:
   - name: info_grid
     type: info
     label: GRID view
-    default: This indexer does not support the GRID view on the torrent search page. Change the <b>GRID</b> setting to <b>OFF</b> on your account profile. If set to <i>ON</i> will cause no results to be returned.
+    default: This indexer does not support the GRID view on the torrent search page. Change the <b>Grid View</b> setting to <b>OFF</b> on your User Settings. If set to <i>ON</i> will cause no results to be returned.
   - name: info_tpp
     type: info
     label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>25</i>.
+    default: For best results, change the <b>Torrents per page</b> setting to <b>100</b> on your User Settings. The default is <i>25</i>.
 
 login:
   path: login.php

src/Jackett.Common/Definitions/pornotorrent.yml

@@ -2,7 +2,7 @@
 id: pornotorrent
 name: PornoTorrent
 description: "PornoTorrent is a SPANISH Public Torrent Tracker for 3X"
-language: es-ES
+language: en-US
 type: public
 encoding: UTF-8
 links:

src/Jackett.Common/Definitions/potuk.yml

@@ -121,6 +121,10 @@ search:
     - path: "index.php?torrents/&freeleech={{ if .Config.freeleech }}1{{ else }}{{ end }}&filename={{ .Keywords }}"
     # imdb and tmdb not supported
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table.dataList-table > tbody.normal-torrents > tr
 

src/Jackett.Common/Definitions/redbits.yml

@@ -14,6 +14,7 @@ caps:
     - {id: 2, cat: TV, desc: "Series"}
     - {id: 6, cat: TV/Documentary, desc: "Documentales"}
     - {id: 7, cat: TV/Sport, desc: "Deportes"}
+    - {id: 8, cat: Movies, desc: "Hagbard"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/reelflix.yml

@@ -166,19 +166,22 @@ search:
         - name: timeago
     downloadvolumefactor:
       case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
+        span.torrent-listings-global-freeleech: 0
+        span.torrent-listings-personal-freeleech: 0
+        span.torrent-listings-freeleech-token: 0
+        span.torrent-listings-featured: 0
+        span.torrent-listings-freeleech i[data-original-title*="25%"]: 0.75
+        span.torrent-listings-freeleech i[data-original-title*="50%"]: 0.5
+        span.torrent-listings-freeleech i[data-original-title*="75%"]: 0.25
+        span.torrent-listings-freeleech i[data-original-title*="100%"]: 0
+        span.torrent-listings-special-freeleech: 0
         "*": 1
     uploadvolumefactor:
       case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
+        span.torrent-listings-global-double-upload: 2
+        span.torrent-listings-double-upload: 2
+        span.torrent-listings-featured: 2
+        span.torrent-listings-special-double-upload: 2
         "*": 1
     minimumratio:
       text: 0.4

src/Jackett.Common/Definitions/renegade.yml

@@ -1,184 +0,0 @@
----
-id: renegade
-name: Renegade
-description: "Renegade is a HUNGARIAN Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: hu-HU
-type: private
-encoding: ISO-8859-2
-links:
-  - http://renegade-tracker.com/
-legacylinks:
-  - https://renegade-tracker.com/ # ERR_CONNECTION_REFUSED
-
-caps:
-  # dont forget to update the search fields category case block
-  categorymappings:
-    - {id: 26, cat: Movies/DVD, desc: "Film/DVD/Eng"}
-    - {id: 25, cat: Movies/DVD, desc: "Film/DVD/Hun"}
-    - {id: 38, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 24, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 50, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 42, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 28, cat: PC/Games, desc: "Játék/ISO"}
-    - {id: 30, cat: PC/Games, desc: "Játék/Rip"}
-    - {id: 31, cat: Other, desc: "Képek"}
-    - {id: 43, cat: Audio/Video, desc: "Klip"}
-    - {id: 33, cat: Books, desc: "Könyv/Eng"}
-    - {id: 44, cat: Books, desc: "Könyv/Hun"}
-    - {id: 32, cat: Console, desc: "Konzol"}
-    - {id: 53, cat: Audio/Lossless, desc: "Lossless/Eng"}
-    - {id: 52, cat: Audio/Lossless, desc: "Lossless/Hun"}
-    - {id: 51, cat: TV/Anime, desc: "Mese/Eng"}
-    - {id: 45, cat: TV/Anime, desc: "Mese/Hun"}
-    - {id: 34, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 40, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 41, cat: Audio/MP3, desc: "Mp3/Hun"}
-    - {id: 35, cat: PC/0day, desc: "Program"}
-    - {id: 47, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 36, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 39, cat: XXX, desc: "XXX/Film"}
-    - {id: 49, cat: XXX/ImageSet, desc: "XXX/Kép"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter freeleech only
-    default: false
-
-login:
-  path: login.php
-  method: post
-  inputs:
-    belepes: igen
-    fhnev: "{{ .Config.username }}"
-    jelszo: "{{ .Config.password }}"
-  error:
-    - selector: div#title_curent:contains("Hibás")
-      message:
-        selector: font[color="red"]
-  test:
-    path: ajanlo.php
-    selector: a[href="logout.php"]
-
-search:
-  paths:
-    # https://renegade-tracker.com/letoltes.php?search=&incldead=1&cat=36
-    - path: letoltes.php
-      categories: ["!", 39, 49]
-    - path: xxx.php
-      categories: [39, 49]
-  keywordsfilters:
-    # the site uses % for wildcard
-    - name: re_replace
-      args: ["[^a-zA-Z0-9]+", "%"]
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # 0 active, 1 both, 2 dead, 3 free, 4 double, 5 Renegade releases, 6 my torrents
-    # note: free and double do not appear to work
-    incldead: 1
-    # does not support imdbid search
-
-  rows:
-    selector: "div#bro_browse_torrents_content{{ if .Config.freeleech }}:contains(\"Igen. Nem \"){{ else }}{{ end }}"
-
-  fields:
-    title:
-      selector: div#bro_browse_details b font a
-    details:
-      selector: div#bro_browse_details b font a
-      attribute: href
-    download:
-      selector: a#bro_dlbutton
-      attribute: href
-    poster:
-      selector: div#bro_browse_poster_1 a img
-      attribute: src
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    size:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: "(\\d+\\.\\d{1,2} [M|G|k]?B)"
-    files:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d+) fájl
-    seeders:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d+) seeder
-    leechers:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d+) leecher
-    date:
-      selector: div#bro_browse_details
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    downloadvolumefactor:
-      case:
-        "div#bro_browse_torrents_content:contains(\"Igen. Nem \")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "div#bro_browse_torrents_content:contains(\"DUPLA ott a \")": 2
-        "*": 1
-    category:
-      selector: div#bro_browse_details
-      remove: a
-      case:
-        ":contains(\"DVD/Eng\")": 26
-        ":contains(\"DVD/Hun\")": 25
-        ":contains(\"XviD/Eng\")": 38
-        ":contains(\"XviD/Hun\")": 24
-        ":contains(\"HD/Eng\")": 50
-        ":contains(\"HD/Hun\")": 42
-        ":contains(\"Játék/ISO\")": 28
-        ":contains(\"Játék/Rip\")": 30
-        ":contains(\"Képek\")": 31
-        ":contains(\"Klip\")": 43
-        ":contains(\"Könyv/Eng\")": 33
-        ":contains(\"Könyv/Hun\")": 44
-        ":contains(\"Konzol\")": 32
-        ":contains(\"Lossless/Eng\")": 53
-        ":contains(\"Lossless/Hun\")": 52
-        ":contains(\"Mese/Eng\")": 51
-        ":contains(\"Mese/Hun\")": 45
-        ":contains(\"Mobil\")": 34
-        ":contains(\"Mp3/Eng\")": 40
-        ":contains(\"Mp3/Hun\")": 41
-        ":contains(\"Program\")": 35
-        ":contains(\"Sorozat/Eng\")": 47
-        ":contains(\"Sorozat/Hun\")": 36
-        ":contains(\"XXX/Film\")": 39
-        ":contains(\"XXX/Kép\")": 49
-    minimumratio:
-      text: 0.7
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# engine n/a

src/Jackett.Common/Definitions/rus-media.yml

@@ -357,6 +357,14 @@ search:
       optional: true
     leechers:
       text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    date_minutes:
+      # 55 минут назад
+      selector: td:nth-of-type(6) p:nth-of-type(1):contains("минут")
+      optional: true
+      filters:
+        - name: replace
+          args: ["минут назад", "minutes ago"]
+        - name: timeago
     date_day:
       # Сегодня, 03:04
       # Вчера, 22:47
@@ -369,7 +377,7 @@ search:
           args: ["Вчера", "Yesterday"]
     date_year:
       # 12 янв 2019, 12:47
-      selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера"))
+      selector: td:nth-of-type(6) p:nth-of-type(1):not(:contains("Сегодня")):not(:contains("Вчера")):not(:contains("минут"))
       optional: true
       filters:
         # replace month abbreviations
@@ -404,7 +412,7 @@ search:
         - name: dateparse
           args: "02 Jan 2006 15:04 -07:00"
     date:
-      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+      text: "{{ if or .Result.date_year .Result.date_day .Result.date_minutes }}{{ or .Result.date_year .Result.date_day .Result.date_minutes }}{{ else }}now{{ end }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/rutor.yml

@@ -41,6 +41,10 @@ caps:
     music-search: [q]
 
 settings:
+  - name: addrussian
+    type: checkbox
+    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
   - name: info
     type: info
     label: A note about RuTor
@@ -70,6 +74,11 @@ search:
   fields:
     category:
       text: 3
+    title_is_rus:
+      selector: td:nth-of-type(2) a[href^="/torrent/"]
+      filters:
+        - name: re_replace
+          args: ["[^А-Яа-яЁё]+", ""]
     title:
       selector: td:nth-of-type(2) a[href^="/torrent/"]
       filters:
@@ -79,6 +88,10 @@ search:
           args: ["E -", "E01-99 -"]
         - name: replace
           args: ["Кураж-Бамбей", "kurazh"]
+        - name: append
+          args: "{{ if .Result.title_is_rus }} - RUSSIAN{{ else }}{{ end }}"
+        - name: re_replace
+          args: ["(.+?) - RUSSIAN", "{{ if .Config.addrussian }}$1 - RUSSIAN{{ else }}$1{{ end }}"]
     details:
       selector: td:nth-of-type(2) a[href^="/torrent/"]
       attribute: href

src/Jackett.Common/Definitions/shokweb.yml

@@ -1,80 +0,0 @@
----
-id: shokweb
-name: shokweb
-description: "shokweb is a CHINESE Public tracker"
-language: zh-CN
-type: public
-encoding: UTF-8
-links:
-  - https://shokweb.com/
-certificates:
-  - ba7fb6290a9d7d821e73efb0eac4ed95a7fd2d11 # expired
-
-settings: []
-
-caps:
-  categorymappings:
-    - {id: "影视", cat: Movies, desc: "影视(Movie)"}
-    - {id: "安装包", cat: PC/ISO, desc: "安装包(Installation Package)"}
-    - {id: "其他", cat: Other, desc: "其他(Other)"}
-    - {id: "音乐", cat: Audio, desc: "音乐(Music)"}
-    - {id: "文档书籍", cat: Books, desc: "文档书籍(Documents Book)"}
-    - {id: "压缩文件", cat: PC, desc: "压缩文件(Compressed Files)"}
-    - {id: "图像", cat: Other/Misc, desc: "图像(Image)"}
-
-  modes:
-    search: [q]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-search:
-  paths:
-    # https://shokweb.com/ (latest)
-    # https://shokweb.com/search/supergirl%20s04e01 (search)
-    - path: "{{ if .Keywords }}/search/{{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: div:has(a[href^="magnet:?"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: p:has(img) span:nth-last-child(4)
-    title:
-      selector: a[href^="/post/"]
-    details:
-      selector: a[href^="/post/"]
-      attribute: href
-    download:
-      selector: a[href^="magnet:?"]
-      attribute: href
-    size:
-      selector: p:has(img) span:nth-last-child(2)
-    grabs:
-      selector: p:has(img) span:nth-last-child(5)
-    date:
-      selector: p:has(img) span:nth-last-child(1)
-      filters:
-        - name: replace
-          args: ["时", " hours"]
-        - name: replace
-          args: ["分", " minutes"]
-        - name: replace
-          args: ["天", " days"]
-        - name: replace
-          args: ["年", " year"]
-        - name: replace
-          args: ["月", " months"]
-        - name: replace
-          args: ["前", " ago"]
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

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

@@ -11,11 +11,12 @@ links:
 caps:
   # dont forget to update the case block in the search fields category
   categorymappings:
-    - {id: 15, cat: TV, desc: "TV Show"}
+    - {id: 2, cat: TV, desc: "TV Show"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: apikey
@@ -55,6 +56,10 @@ search:
         type: json
         attribute: attributes
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     count:
@@ -64,7 +69,7 @@ search:
     category:
       selector: category
       case:
-        "TV Show": 15
+        "TV Show": 2
     title:
       selector: name
     details:

src/Jackett.Common/Definitions/skipthecommercials.yml

@@ -10,11 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 15, cat: TV, desc: "TV Show"}
+    - {id: 2, cat: TV, desc: "TV Show"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
 
 settings:
   - name: username
@@ -86,6 +87,10 @@ search:
     page: 1
     free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: table > tbody > tr
 

src/Jackett.Common/Definitions/slosoul.yml

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

src/Jackett.Common/Definitions/solidtorrents.yml

@@ -9,18 +9,34 @@ links:
   - https://solidtorrents.net/
 
 caps:
-  # dont forget to update the case block in the search fields category
-  categorymappings:
-    - {id: 1, cat: Other, desc: Unknown}
-    - {id: 2, cat: Movies, desc: Movies}
-    - {id: 3, cat: TV, desc: TV}
-    - {id: 4, cat: TV/Anime, desc: Anime}
-    - {id: 5, cat: PC/0day, desc: Program}
-    - {id: 6, cat: Console, desc: Games}
-    - {id: 7, cat: Audio, desc: Music}
-    - {id: 8, cat: Audio/Audiobook, desc: Audiobook}
-    - {id: 9, cat: Books/EBook, desc: eBook}
-    - {id: 10, cat: XXX, desc: XXX}
+  categories:
+    eBook: Books/EBook
+    "Ebook/Course": Books/EBook
+    Games: PC/Games
+    "Games/PC": PC/Games
+    Movies: Movies
+    Music: Audio
+    "Music/Album": Audio
+    "Music/mp3": Audio/MP3
+    "Music/Lossless": Audio/Lossless
+    "Music/Video": Audio/Video
+    Other: Other
+    "Other/Android": PC/Mobile-Android
+    "Other/Archive": Other
+    "Other/Audio": Audio
+    "Other/Database": PC
+    "Other/DiskImage": PC/ISO
+    "Other/Document": Books/Comics
+    "Other/Image": Other/Misc
+    "Other/Program": PC/0day
+    "Other/Sourcecode": PC
+    "Other/Source Code": PC
+    "Other/Video": TV
+    Softwares: PC/0day
+    "Softwares/Windows": PC/0day
+    TV: TV
+    Unknown: Other
+    XXX: XXX
 
   modes:
     search: [q]
@@ -30,10 +46,6 @@ caps:
     book-search: [q]
 
 settings:
-  - name: filter-verified
-    type: checkbox
-    label: "Only include verifed content in results"
-    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -42,81 +54,79 @@ settings:
       date: created
       seeders: seeders
       size: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
 
 search:
   paths:
-    - path: api/v1/search
-      response:
-        type: json
-    - path: api/v1/search
-      response:
-        type: json
-      inputs:
-        skip: 20
-    - path: api/v1/search
-      response:
-        type: json
-      inputs:
-        skip: 40
-
+    # https://solidtorrents.net/search?q=&sort=date&order=desc
+    - path: search
   inputs:
     q: "{{ .Keywords }}"
-    category: "{{ if .Categories }}{{ join .Categories \",\" }}{{ else }}all{{ end }}"
     sort: "{{ .Config.sort }}"
-    fuv: "{{ if .Config.filter-verified }}yes{{ else }}no{{ end }}"
+    order: "{{ .Config.type }}"
 
   rows:
-    selector: results
-    count:
-      selector: hits.value
+    selector: div.search-result
 
   fields:
     category:
-      selector: category
-      case:
-        1: 1 # other
-        Archive: 1
-        Image: 1
-        Unknown: 1
-        2: 2 # movies
-        Sourcecode: 2
-        Database: 2
-        Video: 2
-        3: 3 # tv
-        4: 4 # anime , hentai
-        5: 5 # software
-        Android: 5
-        Diskimage: 5
-        Program: 5
-        6: 6 # games
-        7: 7 # music
-        Audio: 7
-        8: 8 # audiobook
-        9: 9 # books
-        Document: 9
-        eBook: 9
-        10: 10 # 3x
+      selector: a.category
     title:
-      selector: title
-    id:
-      selector: _id
+      selector: h5
     details:
-      text: "{{ .Config.sitelink }}view/{{ .Result.id }}"
-    magnet:
-      selector: magnet
-    size:
-      selector: size
-    seeders:
-      selector: swarm.seeders
-    leechers:
-      selector: swarm.leechers
+      selector: h5 a
+      attribute: href
+    download:
+      selector: a[class="dl-torrent"]
+      attribute: href
+    infohash:
+      selector: a[href^="magnet:?xt"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: ([A-F|a-f|0-9]{40})
     grabs:
-      selector: swarm.downloads
+      selector: div.stats div:has(img[alt="Download"])
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    size:
+      selector: div.stats div:has(img[alt="Size"])
+    seeders:
+      selector: div.stats div:has(img[alt="Seeder"])
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
+    leechers:
+      selector: div.stats div:has(img[alt="Leecher"])
+      filters:
+        - name: replace
+          args: [".", ""]
+        - name: replace
+          args: ["K", "00"]
+        - name: replace
+          args: ["M", "00000"]
     date:
-      # 2021-09-24T00:12:29.918Z
-      selector: imported
+      selector: div.stats div:has(img[alt="Date"])
+      filters:
+        - name: dateparse
+          args: "Jan 2, 2006"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:
       text: 1
-# json api v1
+# engine n/a

src/Jackett.Common/Definitions/spidertk.yml

@@ -0,0 +1,224 @@
+---
+id: spidertk
+name: SpiderTK
+description: "SpiderTK is a FRENCH Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://spidertk.xyz/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies/BluRay, desc: "Films / 2160p / BluRay"}
+    - {id: 410, cat: Movies/UHD, desc: "Films / 2160p / REMUX"}
+    - {id: 411, cat: Movies/UHD, desc: "Films / 2160p / AV1"}
+    - {id: 412, cat: Movies/UHD, desc: "Films / 2160p / x265"}
+    - {id: 413, cat: Movies/BluRay, desc: "Films / 1080p / BluRay"}
+    - {id: 414, cat: Movies/HD, desc: "Films / 1080p / REMUX"}
+    - {id: 415, cat: Movies/HD, desc: "Films / 1080p / AV1"}
+    - {id: 416, cat: Movies/HD, desc: "Films / 1080p / x265"}
+    - {id: 417, cat: Movies/HD, desc: "Films / 1080p / x264"}
+    - {id: 418, cat: Movies/HD, desc: "Films / 720p / x264"}
+    - {id: 419, cat: Movies/SD, desc: "Films / SD / x264"}
+    - {id: 420, cat: Movies/3D, desc: "Films / 3D"}
+    - {id: 421, cat: Movies/SD, desc: "Films / XviD"}
+    - {id: 422, cat: Movies/HD, desc: "Films / HDTV / 1080p"}
+    - {id: 440, cat: Movies/HD, desc: "Films / HDTV / 720p"}
+    - {id: 423, cat: Movies/WEB-DL, desc: "Films / WEB / 1080p"}
+    - {id: 458, cat: Movies/WEB-DL, desc: "Films / WEB / 720p"}
+    - {id: 424, cat: TV/Documentary, desc: "Films / Documentaire"}
+    - {id: 425, cat: TV/Sport, desc: "Films / Sport"}
+    - {id: 426, cat: Movies, desc: "Films / Animation"}
+    - {id: 427, cat: Movies/Other, desc: "Films / Spectacle"}
+    - {id: 428, cat: Audio/Video, desc: "Films / Concerts, Clips"}
+    - {id: 429, cat: Movies, desc: "Films / VOSTFR"}
+    - {id: 460, cat: Movies, desc: "Films / VO"}
+    - {id: 430, cat: TV, desc: "Séries / BluRay"}
+    - {id: 431, cat: TV, desc: "Séries / Pack VF"}
+    - {id: 432, cat: TV/HD, desc: "Séries / HD VF"}
+    - {id: 433, cat: TV/SD, desc: "Séries / SD VF"}
+    - {id: 434, cat: TV, desc: "Séries / Pack VOSTFR"}
+    - {id: 435, cat: TV/HD, desc: "Séries / HD VOSTFR"}
+    - {id: 436, cat: TV/SD, desc: "Séries / SD VOSTFR"}
+    - {id: 437, cat: TV/Anime, desc: "Séries / Pack Animé"}
+    - {id: 438, cat: TV/Anime, desc: "Séries / Animé VF"}
+    - {id: 439, cat: TV/Anime, desc: "Séries / Animé VOSTFR"}
+    - {id: 441, cat: TV/Documentary, desc: "Séries / Documentaire"}
+    - {id: 442, cat: TV/Sport, desc: "Séries / Sport"}
+    - {id: 443, cat: TV, desc: "Séries / Émission TV"}
+    - {id: 461, cat: TV, desc: "Séries / VO"}
+    - {id: 444, cat: Books/EBook, desc: "Livres / Roman"}
+    - {id: 445, cat: Audio/Audiobook, desc: "Livres / Audio"}
+    - {id: 446, cat: Books/Mags, desc: "Livres / Magazine"}
+    - {id: 447, cat: Books/Comics, desc: "Livres / Bande Dessinée"}
+    - {id: 448, cat: Books/Comics, desc: "Livres / Comic"}
+    - {id: 449, cat: Books/Comics, desc: "Livres / Manga"}
+    - {id: 450, cat: PC/Games, desc: "Logiciels / Jeu PC"}
+    - {id: 451, cat: PC/Games, desc: "Logiciels / Jeu Mac"}
+    - {id: 452, cat: PC/Games, desc: "Logiciels / Jeu Linux"}
+    - {id: 453, cat: PC/0day, desc: "Logiciels / Appli Windows"}
+    - {id: 454, cat: PC/Mac, desc: "Logiciels / Appli Mac"}
+    - {id: 455, cat: PC, desc: "Logiciels / Appli Linux"}
+    - {id: 456, cat: Console, desc: "Logiciels / Console"}
+    - {id: 457, cat: PC/Mobile-iOS, desc: "Logiciels / iOS"}
+    - {id: 459, cat: PC/Mobile-Android, desc: "Logiciels / Android"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the SpiderTK Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: ""
+  error:
+    - selector: td.embedded:has(h2:contains("Echoué")) # invalid captcha
+    - selector: td.embedded:has(h2:contains("Échec")) # invalid uid or pwd
+      message:
+        selector: td.text
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    inclbookmarked: 0
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(table.torrentname)
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 0.81
+# NexusPHP Standard v1.5 Beta 4

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

@@ -110,9 +110,9 @@ download:
       attribute: href
 
 search:
-  # https://the-devils-lounge.xyz/torrents-search.php?search=&cat=0&incldead=0&freeleech=2&inclexternal=0&lang=0
+  # https://the-devils-lounge.xyz/torrents.php?search=&cat=0&incldead=0&freeleech=0&inclexternal=0&lang=0
   paths:
-    - path: torrents-search.php
+    - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
@@ -144,15 +144,26 @@ search:
           args: cat
     title:
       selector: td a[href^="torrents-details.php?id="]
-      attribute: title
     details:
       selector: td a[href^="torrents-details.php?id="]
       attribute: href
     download:
       selector: td a[href^="torrents-details.php?id="]
       attribute: href
+    poster:
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "img\\ssrc=\\\\'(http.+?)\\\\'"
     date:
-      text: now
+      selector: td a[href^="torrents-details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: "Date\\sAdded\\s:(\\d{2}-\\d{2}-\\d{4})"
+        - name: dateparse
+          args: "02-01-2006"
     size:
       selector: td:nth-child(6)
     seeders:
@@ -166,16 +177,12 @@ search:
         - name: replace
           args: [",", ""]
     description:
-      selector: td:last-of-type:contains("E")
-      filters:
-        - name: replace
-          args: ["E", "External"]
-        - name: replace
-          args: ["L", "Local"]
+      selector: td:last-of-type img
+      attribute: title
     downloadvolumefactor:
       case:
         img[src$="/images/free.gif"]: 0
-        "td:last-of-type:contains(\"E\")": 0 # all external torrents are free
+        td:last-of-type img[title="Extern"]: 0 # all external torrents are free
         "*": 1
     uploadvolumefactor:
       text: 1

src/Jackett.Common/Definitions/theleachzone.yml

@@ -128,6 +128,12 @@ search:
     download:
       selector: a[href^="download.php?torrent="]
       attribute: href
+    poster:
+      selector: a[href^="details.php?id="]
+      attribute: onmouseover
+      filters:
+        - name: regexp
+          args: src=\\'(.+?)\\'
     details:
       selector: a[href^="details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/torlock.yml

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

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

@@ -52,8 +52,9 @@ caps:
     - {id: 287, cat: TV/Anime, desc: "Tv Serien Anime SD"}
     - {id: 286, cat: TV/Anime, desc: "Tv Serien Anime HD"}
     # Sport
-    - {id: 62, cat: TV/Sport, desc: "Sport SD "}
-    - {id: 282, cat: TV/Sport, desc: "Sport HD"}
+    - {id: 62, cat: TV/Sport, desc: "Sport Formel 1"}
+    - {id: 282, cat: TV/Sport, desc: "Sport Sonstiges"}
+    - {id: 313, cat: TV/Sport, desc: "Sport Wrestling"}
     # Internat.
     - {id: 307, cat: Movies/SD, desc: "Filme SD"}
     - {id: 308, cat: Movies/HD, desc: "Filme HD"}
@@ -196,8 +197,9 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": 10
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Android\"))": 127
         # Sport
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 62
-        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 282
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Formel\"))": 62
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Sonstiges\"))": 282
+        ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Wrestling\"))": 313
         # Internat
         ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Filme SD\"))": 307
         ":has(div.kat_cat_pic_name:contains(\"Internat\")):has(div.kat_cat_pic_name_b:contains(\"Filme HD\"))": 308

src/Jackett.Common/Definitions/torrent9.yml

@@ -96,10 +96,6 @@ settings:
       ".html,trie-poid-a": size asc
       ".html,trie-nom-d": title desc
       ".html,trie-nom-a": title asc
-  - name: info_131681
-    type: info
-    label: About Torrent9 Categories
-    default: Torrent9 only returns category <b>Movies</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 131681(Movies) category.
 
 download:
   selectors:
@@ -108,7 +104,7 @@ download:
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}/top_torrent.html{{ end }}"
+    - path: "{{ if .Keywords }}/search_torrent/{{ .Keywords }}{{ .Config.sort }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs with S01 to saison 1 #9712
     - name: re_replace
@@ -118,6 +114,10 @@ search:
     - name: replace
       args: [" ", "-"]
 
+  headers:
+    # site blocks Jackett's Linux User-Agent, so use Jackett's Windows User-Agent instead
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"]
+
   rows:
     selector: table.table-striped > tbody > tr
     filters:

src/Jackett.Common/Definitions/torrent9clone.yml

@@ -7,12 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www.torrent9.pw/
+  - https://www.torrent9.si/
   - https://torrent9.nocensor.biz/
-legacylinks:
-  - https://torrent9.nocensor.space/
-  - https://torrent9.nocensor.work/
-
 legacylinks:
   - https://www.torrents9.pw/
   - https://www.torrent9.ch/
@@ -58,6 +54,9 @@ legacylinks:
   - https://torrent9.unblocked.monster/
   - https://www.torrent9.la/
   - https://www.torrent9.ninja/
+  - https://torrent9.nocensor.space/
+  - https://torrent9.nocensor.work/
+  - https://www.torrent9.pw/
 
 caps:
   categorymappings:
@@ -101,19 +100,17 @@ settings:
     type: checkbox
     label: Replace VOSTFR with ENGLISH
     default: false
-  - name: info_145469
-    type: info
-    label: About Torrent9clone Categories
-    default: Torrent9clone only returns category <b>Movies</b> in its <i>Keywordless</i> search results page.</br>To pass your apps' indexer TEST you will need to include the 145469(Movies) category.
 
 download:
   selectors:
-    - selector: a[href^="magnet:?"]
-      attribute: href
+    - selector: script:contains("magnet:?")
+      filters:
+        - name: regexp
+          args: "\\s'(magnet:\\?.+?)';"
 
 search:
   paths:
-    - path: "{{ if .Keywords }}/recherche/{{ .Keywords }}{{ else }}/top{{ end }}"
+    - path: "{{ if .Keywords }}/recherche/{{ .Keywords }}{{ else }}{{ end }}"
   keywordsfilters:
     # if searching for season packs swith S01 to saison 1 #9712
     - name: re_replace

src/Jackett.Common/Definitions/torrentby.yml

@@ -0,0 +1,85 @@
+---
+id: torrentby
+name: torrent.by
+description: "torrent.by is a BELARUSIAN public Torrent Tracker"
+language: ru-RU
+type: public
+encoding: UTF-8
+links:
+  - https://torrent.by/
+certificates:
+  - 7536f57e6640c3fce3784736994be95585a85dfb
+
+caps:
+  categories:
+    Other: Other
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: info_8000
+    type: info
+    label: About torrent.by Categories
+    default: torrent.by does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+
+search:
+  paths:
+    - path: "{{ if .Keywords }}search/?search={{ .Keywords }}&cat=0&search_in=0{{ else }}today{{ end }}"
+
+  rows:
+    selector: tr[class^="ttable_col"]
+
+  fields:
+    category:
+      text: other
+    title:
+      selector: td:nth-child(3) a
+      filters:
+        - name: re_replace
+          args: ["(?i)S*(\\d{2,3})[xх](\\d{2,3})", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)E*(\\d{2,3})-(\\d{2,3})\\s*из\\s*(\\d{2,3})", "E$1-$2 из $3"]
+    details:
+      selector: td:nth-child(3) a
+      attribute: href
+    download:
+      selector: a[href^="/d.php?id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td font[color="green"]
+    leechers:
+      selector: td font[color="red"]
+    date_day:
+      selector: td:nth-child(1):contains("Вчера"), td:nth-child(1):contains("Сегодня")
+      optional: true
+      filters:
+        - name: replace
+          args: ["Вчера", "Yesterday"]
+        - name: replace
+          args: ["Сегодня", "Today"]
+        - name: fuzzytime
+    date_year:
+      selector: td:nth-child(1):contains("-")
+      optional: true
+      filters:
+        - name: append
+          args: " +03:00" # MSK
+        - name: dateparse
+          args: "2006-01-02 -07:00"
+    date:
+      text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/torrentdownload.yml

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

src/Jackett.Common/Definitions/torrentdownloads.yml

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

src/Jackett.Common/Definitions/torrentfunk.yml

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

src/Jackett.Common/Definitions/torrentgalaxy.yml

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

src/Jackett.Common/Definitions/torrentkitty.yml

@@ -33,7 +33,7 @@ settings:
 
 search:
   paths:
-    - path: "search/{{ if .Keywords }}{{ .Keywords}}{{ else }}{{ .Today.Year }}{{ end }}"
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
 
   rows:
     selector: table#archiveResult tbody tr:has(a[href^="magnet:?xt="])

src/Jackett.Common/Definitions/torrentmax.yml

@@ -58,15 +58,8 @@ download:
 search:
   paths:
     # https://torrentmax2.net/search?srows=10&gr_id=&sfl=wr_subject%7C%7Cwr_content&stx=2021&sop=and
-    - path: search
-  inputs:
-    srows: 100
-    gr_id: ""
-    # wr_subject||wr_content, wr_subject, wr_content, mb_id, wr_name
-    sfl: wr_subject
-    stx: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
-    # or, and
-    sop: and
+    - path: "search?srows=50&sfl=wr_subject&sop=and&gr_id={{ if .Keywords }}&stx={{ .Keywords }}{{ else }}tv&stx={{ .Today.Year }}{{ end }}"
+    - path: "search?srows=50&sfl=wr_subject&sop=and&gr_id={{ if .Keywords }}&stx={{ .Keywords }}&page=2{{ else }}movie&stx={{ .Today.Year }}{{ end }}"
 
   rows:
     selector: div.search-media div.media:not(:has(a[href*="/max/PHOTO/"])):not(:has(a[href*="/max/GIRL/"])):not(:has(a[href*="/max/CAM/"])):not(:has(a[href*="/max/notice/"])):not(:has(a[href*="/max/humor/"]))

src/Jackett.Common/Definitions/torrentparadise.yml

@@ -210,10 +210,9 @@ download:
       attribute: href
 
 search:
-  # https://torrentparadise.org/search.php?f=monday+night
-  # https://torrentparadise.org/recent
+  # https://torrentparadise.org/searchA.php?f=monday+night
   paths:
-    - path: "{{ if .Keywords }}search.php?f={{ .Keywords }}{{ else }}recent{{ end }}"
+    - path: "searchA.php?f={{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
 
   rows:
     selector: table.table-bordered > tbody > tr.table-default

src/Jackett.Common/Definitions/torrentqq.yml

@@ -7,34 +7,8 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentqq115.com/
+  - https://torrentqq123.com/
 legacylinks:
-  - https://torrentqq76.com/
-  - https://torrentqq77.com/
-  - https://torrentqq78.com/
-  - https://torrentqq79.com/
-  - https://torrentqq80.com/
-  - https://torrentqq81.com/
-  - https://torrentqq82.com/
-  - https://torrentqq83.com/
-  - https://torrentqq84.com/
-  - https://torrentqq85.com/
-  - https://torrentqq86.com/
-  - https://torrentqq87.com/
-  - https://torrentqq88.com/
-  - https://torrentqq89.com/
-  - https://torrentqq90.com/
-  - https://torrentqq91.com/
-  - https://torrentqq92.com/
-  - https://torrentqq93.com/
-  - https://torrentqq95.com/
-  - https://torrentqq96.com/
-  - https://torrentqq97.com/
-  - https://torrentqq98.com/
-  - https://torrentqq99.com/
-  - https://torrentqq100.com/
-  - https://torrentqq101.com/
-  - https://torrentqq102.com/
   - https://torrentqq103.com/
   - https://torrentqq104.com/
   - https://torrentqq105.com/
@@ -47,6 +21,13 @@ legacylinks:
   - https://torrentqq112.com/
   - https://torrentqq113.com/
   - https://torrentqq114.com/
+  - https://torrentqq115.com/
+  - https://torrentqq117.com/
+  - https://torrentqq118.com/
+  - https://torrentqq119.com/
+  - https://torrentqq120.com/
+  - https://torrentqq121.com/
+  - https://torrentqq122.com/
 
 caps:
   categorymappings:

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

@@ -0,0 +1,140 @@
+---
+id: torrentseeds-api
+name: TorrentSeeds (API)
+description: "TorrentSeeds is a Private Torrent Tracker for MOVIES / TV / MUSIC / GENERAL"
+language: en-US
+type: private
+encoding: UTF-8
+links:
+  - https://torrentseeds.org/
+
+caps:
+  # dont forget to update the case block in the search fields category
+  categorymappings:
+    - {id: 1, cat: PC/0day, desc: "Apps"}
+    - {id: 5, cat: TV/Anime, desc: "Anime"}
+    - {id: 2, cat: PC/Games, desc: "Games"}
+    - {id: 3, cat: Movies, desc: "Movies"}
+    - {id: 4, cat: Audio, desc: "Music"}
+    - {id: 6, cat: XXX, desc: "Porn"}
+    - {id: 7, cat: TV/Sport, desc: "Sport"}
+    - {id: 3205, cat: TV, desc: "TV"}
+    - {id: 8, cat: TV, desc: "Packs"}
+    - {id: 3206, cat: TV/Foreign, desc: "TV/Foreign"}
+    - {id: 3207, cat: Movies/Foreign, desc: "Movies/Foreign"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, tvdbid]
+    movie-search: [q, imdbid, tmdbid]
+    music-search: [q]
+
+settings:
+  - name: apikey
+    type: text
+    label: APIKey
+  - name: info_key
+    type: info
+    label: About your API key
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://torrentseeds.org/\" target =_blank>TorrentSeeds</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: created_at
+    options:
+      created_at: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+search:
+  paths:
+    # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
+    # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
+    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+      response:
+        type: json
+        attribute: attributes
+
+  rows:
+    selector: data
+    count:
+      selector: meta.total
+
+  fields:
+    category:
+      selector: category
+      case:
+        "Apps": 1
+        "Games": 2
+        "Movies": 3
+        "Music": 4
+        "Anime": 5
+        "Porn": 6
+        "Sport": 7
+        "Packs": 8
+        "TV": 3205
+        "TV/Foreign": 3206
+        "Movies/Foreign": 3207
+    title:
+      selector: name
+    details:
+      selector: details_link
+    download:
+      selector: download_link
+    poster:
+      selector: poster
+      filters:
+        - name: replace
+          args: ["https://via.placeholder.com/90x135", ""]
+        - name: replace
+          args: ["https://via.placeholder.com/400x600", ""]
+    imdbid:
+      selector: imdb_id
+    tmdbid:
+      selector: tmdb_id
+    tvdbid:
+      selector: tvdb_id
+    files:
+      selector: num_file
+    seeders:
+      selector: seeders
+    leechers:
+      selector: leechers
+    grabs:
+      selector: times_completed
+    date:
+      # 2021-10-18T00:34:50.000000Z"
+      selector: created_at
+    size:
+      selector: size
+    downloadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: freeleech
+      case:
+        0: 1 # not free
+        1: 0 # freeleech
+    uploadvolumefactor:
+      # api returns 0=false, 1=true
+      selector: double_upload
+      case:
+        0: 1 # normal
+        1: 2 # double
+# global MR is 0.5 but torrents must be seeded for 5 days regardless of ratio
+#    minimumratio:
+#      text: 0.5
+    minimumseedtime:
+      # 5 days (as seconds = 5 x 24 x 60 x 60)
+      text: 432000
+# json UNIT3D 5.3.0

src/Jackett.Common/Definitions/torrentsir.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentsir42.com/
+  - https://torrentsir45.com/
 legacylinks:
   - https://torrentsir31.com/
   - https://torrentsir33.com/
@@ -19,6 +19,9 @@ legacylinks:
   - https://torrentsir39.com/
   - https://torrentsir40.com/
   - https://torrentsir41.com/
+  - https://torrentsir42.com/
+  - https://torrentsir43.com/
+  - https://torrentsir44.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentview.yml

@@ -7,33 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentview45.com/
+  - https://torrentview49.com/
 legacylinks:
   - https://torrentview.net/
-  - https://torrentview3.net/
-  - https://torrentview4.net/
-  - https://torrentview5.net/
-  - https://torrentview6.net/
-  - https://torrentview7.net/
-  - https://torrentview8.net/
-  - https://torrentview9.net/
-  - https://torrentview10.net/
-  - https://torrentview11.net/
-  - https://torrentview12.net/
-  - https://torrentview13.net/
-  - https://torrentview14.net/
-  - https://torrentview15.net/
-  - https://torrentview16.net/
-  - https://torrentview17.net/
-  - https://torrentview18.net/
-  - https://torrentview19.net/
-  - https://torrentview20.net/
-  - https://torrentview21.net/
-  - https://torrentview22.net/
-  - https://torrentview23.net/
-  - https://torrentview24.com/
-  - https://torrentview25.com/
-  - https://torrentview26.com/
   - https://torrentview27.com/
   - https://torrentview28.com/
   - https://torrentview29.com/
@@ -51,6 +27,9 @@ legacylinks:
   - https://torrentview41.com/
   - https://torrentview42.com/
   - https://torrentview44.com/
+  - https://torrentview45.com/
+  - https://torrentview46.com/
+  - https://torrentview47.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentwhiz.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentwiz34.com/
+  - https://torrentwiz36.com/
 legacylinks:
   - https://torrentwiz22.me/
   - https://torrentwiz23.me/
@@ -21,6 +21,8 @@ legacylinks:
   - https://torrentwiz31.com/
   - https://torrentwiz32.com/
   - https://torrentwiz33.com/
+  - https://torrentwiz34.com/
+  - https://torrentwiz35.com/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/torrentz2eu.yml

@@ -7,9 +7,12 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://torrentz2eu.me/ # often rotates between *.me and *.org
-  - https://torrentzeu.org/
+  - https://torrentz2.org.in/
   - https://torrentz2.unblockninja.com/
+legacylinks:
+  - https://torrentz2.club/
+  - https://torrentz2eu.me/
+  - https://torrentzeu.org/
 
 caps:
   # unfortunately torrentz2eu does not display categories anywhere in its search results page :-(

src/Jackett.Common/Definitions/tvroad.yml

@@ -0,0 +1,236 @@
+---
+id: tvroad
+name: TvRoad
+description: "TvRoad is a FRENCH Private Torrent Tracker for TV"
+language: fr-FR
+type: private
+encoding: UTF-8
+links:
+  - https://tvroad.info/
+
+caps:
+  categorymappings:
+    - {id: anime-fr-720-non-non, cat: TV/Anime, desc: "Anime FR 720p"}
+    - {id: anime-fr-720-non-pack, cat: TV/Anime, desc: "Anime FR 720p Pack"}
+    - {id: anime-fr-720-web-non, cat: TV/Anime, desc: "Anime FR 720p"}
+    - {id: anime-fr-720-web-pack, cat: TV/Anime, desc: "Anime FR 720p Pack"}
+    - {id: anime-fr-1080-non-non, cat: TV/Anime, desc: "Anime FR 1080p"}
+    - {id: anime-fr-1080-non-pack, cat: TV/Anime, desc: "Anime FR 1080p Pack"}
+    - {id: anime-fr-1080-web-non, cat: TV/Anime, desc: "Anime FR 1080p WEB-DL"}
+    - {id: anime-fr-1080-web-pack, cat: TV/Anime, desc: "Anime FR 1080p Pack WEB-DL"}
+    - {id: anime-fr-sd-non-non, cat: TV/Anime, desc: "Anime FR SD"}
+    - {id: anime-fr-sd-non-pack, cat: TV/Anime, desc: "Anime FR SD Pack"}
+    - {id: anime-fr-sd-web-non, cat: TV/Anime, desc: "Anime FR SD WEB-DL"}
+    - {id: anime-fr-sd-web-pack, cat: TV/Anime, desc: "Anime FR SD Pack WEB-DL"}
+    - {id: anime-vostf-720-non-non, cat: TV/Anime, desc: "Anime VOSTFR 720p"}
+    - {id: anime-vostf-720-non-pack, cat: TV/Anime, desc: "Anime VOSTFR 720p Pack"}
+    - {id: anime-vostf-720-web-non, cat: TV/Anime, desc: "Anime VOSTFR 720p WEB-DL"}
+    - {id: anime-vostf-720-web-pack, cat: TV/Anime, desc: "Anime VOSTFR 720p Pack WEB-DL"}
+    - {id: anime-vostf-1080-non-non, cat: TV/Anime, desc: "Anime VOSTFR 1080p"}
+    - {id: anime-vostf-1080-non-pack, cat: TV/Anime, desc: "Anime VOSTFR 1080p Pack"}
+    - {id: anime-vostf-1080-web-non, cat: TV/Anime, desc: "Anime VOSTFR 1080p WEB-DL"}
+    - {id: anime-vostf-1080-web-pack, cat: TV/Anime, desc: "Anime VOSTFR 1080p Pack WEB-DL"}
+    - {id: anime-vostf-sd-non-non, cat: TV/Anime, desc: "Anime VOSTFR SD"}
+    - {id: anime-vostf-sd-non-pack, cat: TV/Anime, desc: "Anime VOSTFR SD Pack"}
+    - {id: anime-vostf-sd-web-non, cat: TV/Anime, desc: "Anime VOSTFR SD WEB-DL"}
+    - {id: anime-vostf-sd-web-pack, cat: TV/Anime, desc: "Anime VOSTFR SD Pack WEB-DL"}
+    - {id: anime-fr-2160-non-non, cat: TV/Anime, desc: "Anime FR 2160p"}
+    - {id: anime-fr-2160-non-pack, cat: TV/Anime, desc: "Anime FR 2160p Pack"}
+    - {id: anime-fr-2160-web-non, cat: TV/Anime, desc: "Anime FR 2160p WEB-DL"}
+    - {id: anime-fr-2160-web-pack, cat: TV/Anime, desc: "Anime FR 2160p Pack WEB-DL"}
+    - {id: anime-vostf-2160-non-non, cat: TV/Anime, desc: "Anime VOSTFR 2160p"}
+    - {id: anime-vostf-2160-non-pack, cat: TV/Anime, desc: "Anime VOSTFR 2160p Pack"}
+    - {id: anime-vostf-2160-web-non, cat: TV/Anime, desc: "Anime VOSTFR 2160p WEB-DL"}
+    - {id: anime-vostf-2160-web-pack, cat: TV/Anime, desc: "Anime VOSTFR 2160p Pack WEB-DL"}
+    - {id: docs-fr-720-non-non, cat: TV/Documentary, desc: "Docs FR 720p"}
+    - {id: docs-fr-720-non-pack, cat: TV/Documentary, desc: "Docs FR 720p Pack"}
+    - {id: docs-fr-720-web-non, cat: TV/Documentary, desc: "Docs FR 720p WEB-DL"}
+    - {id: docs-fr-720-web-pack, cat: TV/Documentary, desc: "Docs FR 720p Pack WEB-DL"}
+    - {id: docs-fr-1080-non-non, cat: TV/Documentary, desc: "Docs FR 1080p"}
+    - {id: docs-fr-1080-non-pack, cat: TV/Documentary, desc: "Docs FR 1080p Pack"}
+    - {id: docs-fr-1080-web-non, cat: TV/Documentary, desc: "Docs FR 1080p WEB-DL"}
+    - {id: docs-fr-1080-web-pack, cat: TV/Documentary, desc: "Docs FR 1080p Pack WEB-DL"}
+    - {id: docs-fr-sd-non-non, cat: TV/Documentary, desc: "Docs FR SD"}
+    - {id: docs-fr-sd-non-pack, cat: TV/Documentary, desc: "Docs FR SD Pack"}
+    - {id: docs-fr-sd-web-non, cat: TV/Documentary, desc: "Docs FR SD WEB-DL"}
+    - {id: docs-fr-sd-web-pack, cat: TV/Documentary, desc: "Docs FR SD Pack WEB-DL"}
+    - {id: docs-vostf-720-non-non, cat: TV/Documentary, desc: "Docs VOSTFR 720p"}
+    - {id: docs-vostf-720-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR 720p Pack"}
+    - {id: docs-vostf-720-web-non, cat: TV/Documentary, desc: "Docs VOSTFR 720p WEB-DL"}
+    - {id: docs-vostf-720-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR 720p Pack WEB-DL"}
+    - {id: docs-vostf-1080-non-non, cat: TV/Documentary, desc: "Docs VOSTFR 1080p"}
+    - {id: docs-vostf-1080-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR 1080p Pack"}
+    - {id: docs-vostf-1080-web-non, cat: TV/Documentary, desc: "Docs VOSTFR 1080p WEB-DL"}
+    - {id: docs-vostf-1080-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR 1080p Pack WEB-DL"}
+    - {id: docs-vostf-sd-non-non, cat: TV/Documentary, desc: "Docs VOSTFR SD"}
+    - {id: docs-vostf-sd-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR SD Pack"}
+    - {id: docs-vostf-sd-web-non, cat: TV/Documentary, desc: "Docs VOSTFR SD WEB-DL"}
+    - {id: docs-vostf-sd-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR SD Pack WEB-DL"}
+    - {id: docs-vostf-2160-non-non, cat: TV/Documentary, desc: "Docs VOSTFR 2160p"}
+    - {id: docs-vostf-2160-non-pack, cat: TV/Documentary, desc: "Docs VOSTFR 2160p Pack"}
+    - {id: docs-vostf-2160-web-non, cat: TV/Documentary, desc: "Docs VOSTFR 2160p WEB-DL"}
+    - {id: docs-vostf-2160-web-pack, cat: TV/Documentary, desc: "Docs VOSTFR 2160p Pack WEB-DL"}
+    - {id: docs-fr-2160-non-non, cat: TV/Documentary, desc: "Docs FR 2160p"}
+    - {id: docs-fr-2160-non-pack, cat: TV/Documentary, desc: "Docs FR 2160p Pack"}
+    - {id: docs-fr-2160-web-non, cat: TV/Documentary, desc: "Docs FR 2160p WEB-DL"}
+    - {id: docs-fr-2160-web-pack, cat: TV/Documentary, desc: "Docs FR 2160p Pack WEB-DL"}
+    - {id: serie-fr-720-non-non, cat: TV/HD, desc: "Serie FR 720p"}
+    - {id: serie-fr-720-non-pack, cat: TV/HD, desc: "Serie FR 720p Pack"}
+    - {id: serie-fr-720-web-non, cat: TV/HD, desc: "Serie FR 720p WEB-DL"}
+    - {id: serie-fr-720-web-pack, cat: TV/HD, desc: "Serie FR 720p Pack WEB-DL"}
+    - {id: serie-fr-1080-non-non, cat: TV/HD, desc: "Serie FR 1080p"}
+    - {id: serie-fr-1080-non-pack, cat: TV/HD, desc: "Serie FR 1080p Pack"}
+    - {id: serie-fr-1080-web-non, cat: TV/HD, desc: "Serie FR 1080p WEB-DL"}
+    - {id: serie-fr-1080-web-pack, cat: TV/HD, desc: "Serie FR 1080p Pack WEB-DL"}
+    - {id: serie-fr-sd-non-non, cat: TV/SD, desc: "Serie FR SD"}
+    - {id: serie-fr-sd-non-pack, cat: TV/SD, desc: "Serie FR SD Pack"}
+    - {id: serie-fr-sd-web-non, cat: TV/SD, desc: "Serie FR SD WEB-DL"}
+    - {id: serie-fr-sd-web-pack, cat: TV/SD, desc: "Serie FR SD Pack WEB-DL"}
+    - {id: serie-vostf-720-non-non, cat: TV/HD, desc: "Serie VOSTFR 720p"}
+    - {id: serie-vostf-720-non-pack, cat: TV/HD, desc: "Serie VOSTFR 720p Pack"}
+    - {id: serie-vostf-720-web-non, cat: TV/HD, desc: "Serie VOSTFR 720p WEB-DL"}
+    - {id: serie-vostf-720-web-pack, cat: TV/HD, desc: "Serie VOSTFR 720p Pack WEB-DL"}
+    - {id: serie-vostf-1080-non-non, cat: TV/HD, desc: "Serie VOSTFR 1080p"}
+    - {id: serie-vostf-1080-non-pack, cat: TV/HD, desc: "Serie VOSTFR 1080p Pack"}
+    - {id: serie-vostf-1080-web-non, cat: TV/HD, desc: "Serie VOSTFR 1080p WEB-DL"}
+    - {id: serie-vostf-1080-web-pack, cat: TV/HD, desc: "Serie VOSTFR 1080p Pack WEB-DL"}
+    - {id: serie-vostf-sd-non-non, cat: TV/SD, desc: "Serie VOSTFR SD"}
+    - {id: serie-vostf-sd-non-pack, cat: TV/SD, desc: "Serie VOSTFR SD Pack"}
+    - {id: serie-vostf-sd-web-non, cat: TV/SD, desc: "Serie VOSTFR SD WEB-DL"}
+    - {id: serie-vostf-sd-web-pack, cat: TV/SD, desc: "Serie VOSTFR SD Pack WEB-DL"}
+    - {id: serie-fr-2160-non-non, cat: TV/UHD, desc: "Serie FR 2160p"}
+    - {id: serie-fr-2160-non-pack, cat: TV/UHD, desc: "Serie FR 2160p Pack"}
+    - {id: serie-fr-2160-web-non, cat: TV/UHD, desc: "Serie FR 2160p WEB-DL"}
+    - {id: serie-fr-2160-web-pack, cat: TV/UHD, desc: "Serie FR 2160p Pack WEB-DL"}
+    - {id: serie-vostf-2160-non-non, cat: TV/UHD, desc: "Serie VOSTFR 2160p"}
+    - {id: serie-vostf-2160-non-pack, cat: TV/UHD, desc: "Serie VOSTFR 2160p Pack"}
+    - {id: serie-vostf-2160-web-non, cat: TV/UHD, desc: "Serie VOSTFR 2160p WEB-DL"}
+    - {id: serie-vostf-2160-web-pack, cat: TV/UHD, desc: "Serie VOSTFR 2160p Pack WEB-DL"}
+    - {id: tvreal-fr-720-non-non, cat: TV/HD, desc: "TvReal FR 720p"}
+    - {id: tvreal-fr-720-non-pack, cat: TV/HD, desc: "TvReal FR 720p Pack"}
+    - {id: tvreal-fr-720-web-non, cat: TV/HD, desc: "TvReal FR 720p WEB-DL"}
+    - {id: tvreal-fr-720-web-pack, cat: TV/HD, desc: "TvReal FR 720p Pack WEB-DL"}
+    - {id: tvreal-fr-1080-non-non, cat: TV/HD, desc: "TvReal FR 1080p"}
+    - {id: tvreal-fr-1080-non-pack, cat: TV/HD, desc: "TvReal FR 1080p"}
+    - {id: tvreal-fr-1080-web-non, cat: TV/HD, desc: "TvReal FR 1080p WEB-DL"}
+    - {id: tvreal-fr-1080-web-pack, cat: TV/HD, desc: "TvReal FR 1080p WEB-DL"}
+    - {id: tvreal-fr-sd-non-non, cat: TV/SD, desc: "TvReal FR SD"}
+    - {id: tvreal-fr-sd-non-pack, cat: TV/SD, desc: "TvReal FR SD Pack"}
+    - {id: tvreal-fr-sd-web-non, cat: TV/SD, desc: "TvReal FR SD WEB-DL"}
+    - {id: tvreal-fr-sd-web-pack, cat: TV/SD, desc: "TvReal FR SD Pack WEB-DL"}
+    - {id: tvreal-fr-2160-web-pack, cat: TV/UHD, desc: "TvReal FR 2160p Pack WEB-DL"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: multilang
+    type: checkbox
+    label: Replace MULTI by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTI by this language
+    default: FRENCH
+    options:
+      FRENCH: FRENCH
+      MULTI.FRENCH: MULTI.FRENCH
+      ENGLISH: ENGLISH
+      MULTI.ENGLISH: MULTI.ENGLISH
+      VOSTFR: VOSTFR
+      MULTI.VOSTFR: MULTI.VOSTFR
+  - name: vostfr
+    type: checkbox
+    label: Replace VOSTFR with ENGLISH
+    default: false
+
+login:
+  path: TvRoad/Connexion
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: font[color="red"]
+  test:
+    path: TvRoad/Bienvenue
+    selector: a[href$="/TvRoad/Deconnexion"]
+
+search:
+  paths:
+    # https://tvroad.info/TvRoad/Torrents/Recherche?recherche=
+    - path: TvRoad/Torrents/Recherche
+  inputs:
+    recherche: "{{ .Keywords }}"
+    # type of search: un one of the words), tout (all of the words), exacte (exact match)
+    type: tout
+    # search location: nomtorrent (name), desctorrent (descr)
+    endroit: nomtorrent
+    # seeded: non (no), oui (yes), peuimporte (either)
+    tl: peuimporte
+    # does not support imdbid searches and does not return imdb link in results
+
+  rows:
+    selector: tr:has(a[href*="/Torrents/Telechargement/"])
+
+  fields:
+    category:
+      selector: a[href*="/SousCategories/"]
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", -1]
+    title_phase1:
+      selector: a.infobulletorrent
+      attribute: title
+    title_multilang:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+    title_phase2:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+        - name: re_replace
+          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+    title:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    details:
+      selector: a.infobulletorrent
+      attribute: href
+    download:
+      selector: a[href*="/Torrents/Telechargement/"]
+      attribute: href
+    poster:
+      selector: a.infobulletorrent img
+      attribute: src
+    date:
+      text: now
+    size:
+      selector: td.taillejour
+    grabs:
+      selector: td:nth-last-child(3)
+    seeders:
+      selector: b.seed
+    leechers:
+      selector: b.leech
+    downloadvolumefactor:
+      case:
+      text: 1
+    uploadvolumefactor:
+      text: 1
+    minimumseedtime:
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# TT3.0 FRENCH custom

src/Jackett.Common/Definitions/uhdbits.yml

@@ -81,7 +81,10 @@ search:
     order_way: "{{ .Config.type }}"
     action: advanced
     searchsubmit: 1
+
   keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
     # if searching for season packs switch S01 to season 1 #10423
     - name: re_replace
       args: ["(?i)(S)(\\d{1,3})$", "season $2"]

src/Jackett.Common/Definitions/whiteangel.yml

@@ -12,6 +12,7 @@ caps:
   categorymappings:
     - {id: 39, cat: Books/EBook, desc: "E-book"}
     - {id: 53, cat: XXX, desc: "Film (XXX)"}
+    - {id: 74, cat: TV/Anime, desc: "Film (Animáció cam)"}
     - {id: 72, cat: TV/Anime, desc: "Film (Animáció)"}
     - {id: 44, cat: Movies/SD, desc: "Film (Cam Hun)"}
     - {id: 40, cat: Movies/DVD, desc: "Film (DVD Eng)"}

src/Jackett.Common/Definitions/yggcookie.yml

@@ -7,7 +7,7 @@ type: semi-private
 encoding: UTF-8
 followredirect: true
 links:
-  - https://www3.yggtorrent.nz/
+  - https://www3.yggtorrent.re/
 legacylinks:
   - https://yggtorrent.com/
   - https://ww1.yggtorrent.com/
@@ -40,6 +40,7 @@ legacylinks:
   - https://www2.yggtorrent.si/
   - https://www.yggtorrent.li/
   - https://www4.yggtorrent.li/
+  - https://www3.yggtorrent.nz/
 
 caps:
   categorymappings: