thesceneplace: fix freeleech row selector. resolves #11691

also add 2x > 10x uploadvolumefactor cases

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,8 @@
+### Read and complete in full with information about your setup and issue before submitting.
+### Do not delete the template.
+
 **Please use the search bar** at the top of the page and make sure you are not creating an already submitted issue.
-Check closed issues as well, because your issue may have already been fixed.
+Check closed issues as well, because your issue may have already been fixed. Also check our [Troubleshooting](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for steps to resolve common issues.
 
 Please read our [Contributing Guidelines](https://github.com/Jackett/Jackett/blob/master/CONTRIBUTING.md) before submitting your issue to ensure a prompt response to your bug.
 

README.md

@@ -39,11 +39,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BigFANGroup
  * BitRu
  * BT.etree
+ * BT4G
  * BTDB
  * BTDIGG
  * BTSOW
  * Byrutor
  * CiliPro (LIAORENCILI)
+ * comicat
  * ConCen
  * cpasbien
  * cpasbienClone
@@ -52,6 +54,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * E-Hentai
  * emtrek
  * Epizod
+ * Erai-Raws
  * ETTV
  * EXT Torrents
  * ExtraTorrent.cd
@@ -64,7 +67,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * GkTorrent
  * GloDLS
  * GTorrent
- * HDReactor
+ * GTorrent.pro
+ * HDhouse (HDReactor)
  * IBit
  * Idope
  * Il CorSaRo Blu
@@ -83,8 +87,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MejorTorrent
  * MixTapeTorrent
  * Montorrent
- * MovCr
  * MoviesDVDR
+ * MovieTorrent
  * MyPornClub
  * NewPCT (aka: tvsinpagar, descargas2020, torrentlocura, torrentrapid, tumejortorrent, pctnew, etc)
  * Newstudio
@@ -93,6 +97,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NoNaMe Club (NNM-Club)
  * Nyaa-Pantsu
  * Nyaa.si
+ * OnceSearch
  * OneJAV
  * OxTorrent
  * ParnuXi
@@ -104,6 +109,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PornoLive
  * PornoRip
  * PornoTor
+ * Portugas
  * ProPorn
  * ProStyleX
  * Rapidzona
@@ -125,6 +131,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * sukebei-Pantsu
  * sukebei.Nyaa.si
  * The Pirate Bay (TPB)
+ * TNTfork
  * Tokyo Tosho
  * Torlock
  * TOROS
@@ -140,14 +147,16 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TorrentGalaxy (TGx)
  * TorrentKitty
  * TorrentMafya
+ * TorrentMax (토렌트맥스)
  * TorrentParadise
  * TorrentProject
  * TorrentProject2
+ * TorrentQQ (토렌트큐큐)
  * Torrents.csv
+ * TorrentSir (토렌트썰)
  * Torrentv
  * TorrentView (토렌트뷰)
- * Torrentz2
- * Torrentz2k
+ * TorrentWhiz ( 토렌트위즈)
  * truPornolabs
  * Underverse
  * UnionDHT
@@ -165,11 +174,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
  * AniDUB
+ * Anime-Free
  * ArenaBG
  * BaibaKo
  * BookTracker
  * BootyTape
  * CasStudioTV
+ * Catorrent
  * Darmowe torrenty
  * Deildu
  * DimeADozen (EzTorrent)
@@ -178,9 +189,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Erzsebet
  * Erzsebet.pl
  * ExKinoRay
- * ExtremlymTorrents (XTR)
  * Genesis-Movement
  * HamsterStudio
+ * HunTorrent
  * IV-Torrents
  * KinoNaVse100
  * Kinorun
@@ -204,6 +215,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Sharewood
  * SkTorrent
  * SkTorrent-org
+ * themixingbowl (TMB)
  * Toloka.to
  * Torrent-Explosiv
  * Torrents-Local
@@ -242,8 +254,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AsianCinema
  * Asylum Share
  * AudioNews (AN)
+ * Aussierul.es [![(invite needed)][inviteneeded]](#)
  * AvistaZ (AsiaTorrents)
- * Awesome-HD (AHD)
  * Borgzelle
  * Back-ups
  * bB
@@ -278,7 +290,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Carpathians
  * CartoonChaos (CC)
  * CasaTorrent [![(invite needed)][inviteneeded]](#)
- * ChannelX
  * ChileBT
  * Cinecalidad
  * CinemaMovieS_ZT
@@ -305,11 +316,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * DivTeam
  * DivxTotal
  * Dragonworld Reloaded [![(invite needed)][inviteneeded]](#)
- * DXDHD
  * EbookParadijs
  * Ebooks-Shares
  * EfectoDoppler
- * Elite-Tracker
  * Empornium (EMP)
  * EpubLibre
  * eShareNet
@@ -330,7 +339,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FreeTorrent
  * FunFile (FF)
  * FunkyTorrents (FT) [![(invite needed)][inviteneeded]](#)
- * FunReleases [![(invite needed)][inviteneeded]](#)
  * Fuzer (FZ)
  * GFXPeers
  * Galeriens (LaPauseTorrents)
@@ -373,7 +381,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Hebits
  * HellasTZ
  * Hon3y HD
- * Horror Site
  * HQSource (HQS)
  * HuSh [![(invite needed)][inviteneeded]](#)
  * IPTorrents (IPT)
@@ -398,6 +405,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LosslessClub
  * M-Team TP (MTTP)
  * MaDs Revolution
+ * magic-heaven
  * Magico (Trellas)
  * Majomparádé (TurkDepo)
  * MeseVilág (Fairytale World)
@@ -407,7 +415,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MNV (Max-New-Vision)
  * Mononoké-BT [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
- * Movie Zone (Mz)
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NBTorrents [![(invite needed)][inviteneeded]](#)
@@ -416,9 +423,10 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NetCosmo
  * NetLab
  * NorBits
- * notwhat.cd
+ * Nordic+
+ * Oasis
  * oMg[WtF]trackr
- * OnlineSelfEducation
+ * OpenCD
  * Orpheus
  * OshenPT
  * Ourbits (HDPter)
@@ -436,6 +444,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PolishTracker
  * PornBits (PB)
  * Pornbay [![(invite needed)][inviteneeded]](#)
+ * PotUK
  * Pretome
  * PrivateHD (PHD)
  * ProAudioTorrents (PAT)
@@ -452,10 +461,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
+ * RedBits
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RetroFlix
  * RevolutionTT
+ * ROFD
  * Romanian Metal Torrents (RMT) [![(invite needed)][inviteneeded]](#)
  * RPTorrents
  * SceneHD
@@ -467,7 +478,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * SeedFile (SF)
  * Shareisland
  * Shazbat
- * Shellife (SL) [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SnowPT (SSPT)
  * SoulVoice [![(invite needed)][inviteneeded]](#)
@@ -487,6 +497,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TeamOS
  * TEKNO3D [![(invite needed)][inviteneeded]](#)
  * TellyTorrent
+ * teracod (Movie Zone)
  * The Falling Angels (TFA)
  * The Geeks [![(invite needed)][inviteneeded]](#)
  * The Horror Charnel (THC)
@@ -498,6 +509,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Vault [![(invite needed)][inviteneeded]](#)
  * TheAudioScene
  * TheEmpire (TE) [![(invite needed)][inviteneeded]](#)
+ * TheLeachZone
+ * TheScenePlace (TSP)
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * ToTheGlory (TTG)
@@ -549,7 +562,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * XWTorrents (XWT)
  * Xthor
  * YDYPT
- * YingK
  * Zamunda.net
  * Zelka.org
  * ZonaQ
@@ -761,11 +773,13 @@ To use it, please just request a free API key on [OMDb](http://www.omdbapi.com/a
 ### Windows
 * Install the .NET 5 [SDK](https://www.microsoft.com/net/download/windows)
 * Clone Jackett
-* Open PowerShell and from the `src` directory, run `dotnet restore`
-* Open the Jackett solution in Visual Studio 2019 (version 16.4 or above)
-* Right-click on the Jackett solution and click 'Rebuild Solution' to restore NuGet packages
-* Select Jackett.Server as the startup project
-* In the drop-down menu of the run button select "Jackett.Server" instead of "IIS Express"
+* Open PowerShell and from the `src` directory:
+* - run `dotnet msbuild /restore`
+* - then run `dotnet restore`
+* - and run `dotnet build`
+* Open the Jackett solution in Visual Studio 2019 (version 16.9 or above)
+* Select **Jackett.Server** as the startup project
+* In the drop-down menu of the run button select **Jackett.Server** instead of _IIS Express_
 * Build/Start the project
 
 ### OSX

azure-pipelines.yml

@@ -50,7 +50,7 @@ stages:
               runtime: osx-x64
               archiveType: tar
               artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
@@ -301,6 +301,14 @@ stages:
               targetType: inline
               failOnStderr: true
               script: |
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/DateTimeRoutines
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Common
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Server
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Service
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Test
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Tray
+                dotnet-format --fix-whitespace --verbosity diagnostic --folder ./src/Jackett.Updater
                 dotnet-format --check --verbosity diagnostic --folder ./src/DateTimeRoutines
                 dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.Common
                 dotnet-format --check --verbosity diagnostic --folder ./src/Jackett.IntegrationTests
@@ -354,21 +362,16 @@ stages:
               imageName: macOS-latest
               framework: $(netCoreFramework)
               runtime: osx-x64
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
               runtime: linux-x64
-            LinuxARM32:
-              buildDescription: Linux ARM32
+            LinuxARM:
+              buildDescription: Linux ARM
               imageName: ubuntu-latest
               framework: $(netCoreFramework)
               runtime: linux-arm
-            LinuxARM64:
-              buildDescription: Linux ARM64
-              imageName: ubuntu-latest
-              framework: $(netCoreFramework)
-              runtime: linux-arm64
         pool:
           vmImage: $(imageName)
         displayName: ${{ variables.buildDescription }}
@@ -461,7 +464,7 @@ stages:
               buildDescription: macOS
               imageName: macOS-latest
               artifactName: Jackett.Binaries.macOS.tar.gz
-            LinuxAmdx64:
+            LinuxAMDx64:
               buildDescription: Linux AMD x64
               imageName: ubuntu-latest
               artifactName: Jackett.Binaries.LinuxAMDx64.tar.gz

nuget.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

src/Jackett.Common/Content/custom.css

@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputcheckbox label {
     padding: 0 1.5em;
 }

src/Jackett.Common/Content/custom_mobile.css

@@ -55,6 +55,10 @@ body {
     max-width: 255px;
 }
 
+.setup-item-password {
+    max-width: 255px;
+}
+
 .setup-item-inputbool input {
     max-width: 100px;
     height: 20px;

src/Jackett.Common/Content/index.html

@@ -9,14 +9,6 @@
     <meta charset="utf-8" />
     <meta name="referrer" content="no-referrer" /> <!-- Don't send referrer when loading third party resources (E.g. Empornium poster images won't load) -->
     <link rel="apple-touch-icon" href="../apple-touch-icon.png" />
-    <link rel="apple-touch-icon" sizes="57x57" href="../apple-touch-icon-57x57.png" />
-    <link rel="apple-touch-icon" sizes="72x72" href="../apple-touch-icon-72x72.png" />
-    <link rel="apple-touch-icon" sizes="76x76" href="../apple-touch-icon-76x76.png" />
-    <link rel="apple-touch-icon" sizes="114x114" href="../apple-touch-icon-114x114.png" />
-    <link rel="apple-touch-icon" sizes="120x120" href="../apple-touch-icon-120x120.png" />
-    <link rel="apple-touch-icon" sizes="144x144" href="../apple-touch-icon-144x144.png" />
-    <link rel="apple-touch-icon" sizes="152x152" href="../apple-touch-icon-152x152.png" />
-    <link rel="apple-touch-icon" sizes="180x180" href="../apple-touch-icon-180x180.png" />
     <link rel="mask-icon" href="../jackett_medium.png" color="#35c5f4">
     <link rel="icon" type="image/ico" href="../favicon.ico" />
     <link rel='shortcut icon' type='image/x-icon' href='../favicon.ico' />
@@ -235,6 +227,11 @@
             {{/if}}
         </div>
     </script>
+    <script id="setup-item-password" type="text/x-handlebars-template">
+        <div class="setup-item-password">
+            <input class="form-control" type="password" value="{{{value}}}" />
+        </div>
+    </script>
     <script id="setup-item-inputbool" type="text/x-handlebars-template">
         <div class="setup-item-inputbool">
             {{#if value}}
@@ -378,7 +375,12 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="6"></td>
+                        <th>Indexer</th>
+                        <th>Categories</th>
+                        <th>Type</th>
+                        <th>Type string</th>
+                        <th>Language</th>
+                        <th></th>
                     </tr>
                 </tfoot>
             </table>
@@ -696,6 +698,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=20201220"></script>
+    <script type="text/javascript" src="../custom.js?changed=20210424"></script>
 </body>
 </html>

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

@@ -14,8 +14,8 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.link/
-  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.onl/
+  - https://1337x.nocensor.space/
 legacylinks:
   - https://1337x.unblocked.earth/
   - https://1337x.unblockit.pro/
@@ -40,6 +40,10 @@ legacylinks:
   - https://1337x.unblocked.rest/
   - https://1337x.unblockit.dev/
   - https://1337x.unblockit.ltd/
+  - https://1337x.unblockit.link/
+  - https://1337x.unblockit.buzz/
+  - https://1337x.unblocked.monster/
+  - https://1337x.unblockit.club/
 
 caps:
   categorymappings:
@@ -182,6 +186,7 @@ search:
       selector: td[class^="coll-1"] a[href^="/torrent/"]
       attribute: href
       filters:
+        - name: urldecode
         - name: split
           args: ["/", 3]
     title:
@@ -189,11 +194,28 @@ search:
       text: "{{ if .Result.title_href }}{{ .Result.title_href }}{{ else }}{{ .Result.title_text }}{{ end }}"
       filters:
         - name: re_replace
-          args: ["(-+)", " "]
+          args: ["-", " "]
         - name: replace
           args: ["Grey's Anatomy", "Greys Anatomy"]
         - name: replace
-          args: ["\u000f", ""] # get rid of unwanted character
+          args: ["\u000f", ""] # get rid of unwanted character #6582
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
     category:
       text: 40
     category|noappend:

src/Jackett.Common/Definitions/1ptbar.yml

@@ -11,15 +11,17 @@ links:
 caps:
   categorymappings:
     - {id: 401, cat: Movies, desc: "Movies/电影"}
-    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
     - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
     - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
-    - {id: 403, cat: TV, desc: "TV Show/综艺"}
-    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺节目"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos/音乐MV"}
     - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
-    - {id: 408, cat: Audio, desc: "HQ Audio/音乐"}
-    - {id: 409, cat: Other, desc: "Other/其它"}
-    - {id: 412, cat: Other, desc: "Education/教育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "HQ Audio/高品质音频"}
+    - {id: 412, cat: Other, desc: "Edu/教育"}
+    - {id: 411, cat: PC/Games, desc: "Games/游戏"}
+    - {id: 410, cat: PC/0day, desc: "Software/软件"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/abtorrents.yml

@@ -80,12 +80,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: username
+  - name: cookie
     type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -96,17 +97,7 @@ settings:
     default: "If you are getting the error <b>Login Failed, got redirected</b> then access the site with your browser and <b>mark as read</b> all PMs."
 
 login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: 1
-    submitme: X
-  error:
-    - selector: td.embedded:has(h2:contains("Oops"))
-    - selector: td.embedded:has(h2:contains("failed"))
+  method: cookie
   test:
     path: browse.php
 

src/Jackett.Common/Definitions/amigosshare.yml

@@ -205,7 +205,7 @@ search:
         - name: append
           args: "{{ if .Result._language }} {{ .Result._language }}{{ else }}{{ end }}"
         - name: re_replace
-          args: ["(Dual-Audio|Dublado)", "Brazilian $1"]
+          args: ["(Dual|[Nn]acional|[Dd]ublado)", "Brazilian $1"]
     details:
       selector: a[href*="torrents-details.php?id="], a[href*="details-misc.php?id="]
       attribute: href

src/Jackett.Common/Definitions/anaschcc.yml

@@ -17,6 +17,7 @@ caps:
     - {id: 12, cat: XXX, desc: Porn}
     - {id: 29, cat: TV/Sport, desc: Sports}
     - {id: 37, cat: PC, desc: Software}
+    - {id: 38, cat: Console, desc: Games}
 
   modes:
     search: [q]
@@ -33,7 +34,7 @@ settings:
     label: Password
   - name: freeleech
     type: checkbox
-    label: Filter freeleech only
+    label: Search freeleech only
     default: false
   - name: info_tpp
     type: info
@@ -90,11 +91,11 @@ search:
 
   fields:
     category:
-      selector: td a[href^="index.php?page=torrents&category="]
+      selector: td a[href^="index.php?page=torrents&category[]="]
       attribute: href
       filters:
         - name: querystring
-          args: category
+          args: category[]
     title:
       selector: td a[href^="index.php?page=torrent-details"]
     details:
@@ -126,13 +127,13 @@ search:
     size:
       selector: td:nth-child(5)
     date:
-      # 22/01/2021 01:28
+      # 22/01/21 01:28
       selector: td:nth-child(6)
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile - doesn't adjust for DST
         - name: dateparse
-          args: "02/01/2006 15:04 -07:00"
+          args: "02/01/06 15:04 -07:00"
     seeders:
       selector: td:nth-child(7)
     leechers:

src/Jackett.Common/Definitions/anime-free.yml

@@ -0,0 +1,138 @@
+---
+id: anime-free
+name: Anime-Free
+description: "Anime-Free is a RUSSIAN Semi-Private Torrent Tracker for Hentai manga, eroge and flash porn games"
+language: ru-ru
+type: semi-private
+encoding: windows-1251
+links:
+  - https://anime-free.biz/
+legacylinks:
+  - https://anime-free.net/ # redirects to *.biz
+
+caps:
+  categorymappings:
+    - {id: 14, cat: TV/Anime, desc: "Аниме хентай"}
+    - {id: 47, cat: TV/Anime, desc: "   Хентай на Русском языке"}
+    - {id: 48, cat: TV/Anime, desc: "   Хентай Без русского перевода"}
+    - {id: 45, cat: TV/Anime, desc: "   Хентай Без цензуры"}
+    - {id: 46, cat: TV/Anime, desc: "   Хентай с цензурой"}
+    - {id: 54, cat: Other, desc: "Косплей"}
+    - {id: 51, cat: TV/Anime, desc: "[3D] хентай и анимация"}
+    - {id: 5, cat: Books/Comics, desc: "Хентай манга"}
+    - {id: 56, cat: Console, desc: "Игры"}
+    - {id: 10, cat: Console, desc: "   Эротические и хентай игры"}
+    - {id: 55, cat: Console, desc: "   3DCG/3D-Animation игры"}
+    - {id: 57, cat: Console, desc: "   Игры на русском языке"}
+    - {id: 58, cat: Other, desc: "   Онлайн игры"}
+    - {id: 52, cat: Books/Comics, desc: "Порно комиксы"}
+    - {id: 49, cat: XXX/ImageSet, desc: "Хентай картинки, иллюстрации, обои и Art "}
+    - {id: 43, cat: TV/Anime, desc: "Эччи (Легкая эротика)"}
+    - {id: 4, cat: TV/Anime, desc: "Аниме Хентай"}
+    - {id: 50, cat: Other, desc: "Хентай Онлайн"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: email
+    type: text
+    label: Email
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: /
+  method: form
+  form: form.login-form
+  inputs:
+    login_name: "{{ .Config.email }}"
+    login_password: "{{ .Config.password }}"
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # https://anime-free.biz/index.php?do=search&subaction=search&search_start=0&full_search=1&result_from=1&story=slaves+to+passion&all_word_seach=1&titleonly=3&searchuser=&replyless=0&replylimit=0&searchdate=0&beforeafter=after&sortby=date&resorder=desc&showposts=0&catlist[]=0
+  paths:
+    - path: index.php
+  inputs:
+    $raw: "{{ range .Categories }}catlist[]={{.}}&{{end}}"
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 1
+    result_from: 1
+    showposts: 0
+    all_word_seach: 1
+    # 0 article, 1 comments, 2 static pages, 3 article titles
+    titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
+    searchdate: 0
+    searchuser: ""
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    sortby: date
+    resorder: desc
+
+  rows:
+    selector: article
+
+  fields:
+    category:
+      selector: a[href*="category="]
+      attribute: href
+      case:
+        a[href$="3d_hentai"]: 51
+        a[href$="3dcg_game"]: 55
+        a[href$="censored"]: 46
+        a[href$="comics"]: 52
+        a[href$="cosplay"]: 54
+        a[href$="etty"]: 43
+        a[href$="h-game"]: 10
+        a[href$="h-online"]: 50
+        a[href$="hentai"]: 4
+        a[href$="hentai_games"]: 56
+        a[href$="hentai_manga"]: 5
+        a[href$="hentai_raznoe"]: 49
+        a[href$="hentai_rus"]: 47
+        a[href$="online_games"]: 58
+        a[href$="original_hentai"]: 48
+        a[href$="rus-game"]: 57
+        a[href$="uncensored"]: 45
+    title:
+      selector: h2.title a
+    details:
+      selector: h2.title a
+      attribute: href
+    download:
+      selector: h2.title a
+      attribute: href
+    poster:
+      selector: img.entry-image
+      attribute: src
+    description:
+      selector: div[itemprop="description"]
+      optional: true
+    date:
+      selector: li:has(img#adddate)
+      filters:
+        - name: dateparse
+          args: "02-01-2006, 15:04"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      selector: b.file_size
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/arabp2p.yml

@@ -47,7 +47,7 @@ caps:
     - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
     - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 109, cat: TV, desc: "رمضان 2020 (Ramadan 2020)"}
+    - {id: 110, cat: TV, desc: "رمضان 2021 (Ramadan 2021)"}
     # المرئيات الاجنبية Foreign Movies
     - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -7,13 +7,18 @@ type: public
 encoding: UTF-8
 links:
   - http://audiobookbay.nl/ # site forces http, does not support https
-  - https://audiobookbay.unblockit.link/
+  - http://audiobookbay.net/
+  - http://audiobookbayabb.com/
+  - https://audiobookbay.unblockit.onl/
 legacylinks:
   - https://audiobookbay.la/
   - https://audiobookbay.unblockit.lat/
   - https://audiobookbay.unblockit.app/
   - https://audiobookbay.unblockit.dev/
   - https://audiobookbay.unblockit.ltd/
+  - https://audiobookbay.unblockit.link/
+  - https://audiobookbay.unblockit.buzz/
+  - https://audiobookbay.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/aussierules.yml

@@ -0,0 +1,91 @@
+---
+id: aussierules
+name: Aussierul.es
+description: "Aussierul.es is a torrent site for Aussie Rules Football played in Australia"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://aussierul.es/
+
+caps:
+  categories:
+    1: TV/Sport
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: type
+    label: Search Type
+    type: select
+    default: t_name
+    options:
+      t_name: Torrent Name
+      t_description: Torrent Description
+      t_both: Name & Description
+      t_uploader: Uploader
+      t_genre: IMDB Genre
+  - name: dead
+    label: Include Dead Torrents
+    type: select
+    default: No
+    options:
+      yes: Yes
+      no: No
+
+login:
+  method: form
+  form: form
+  path: login.php
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:contains("An error has occured!")
+  test:
+    path: browse.php
+
+search:
+  paths:
+    - path: browse.php
+  inputs:
+    search_type: "{{ .Config.type }}"
+    include_dead_torrents: "{{ .Config.dead }}"
+    keywords: "{{ .Keywords }}"
+
+  rows:
+    selector: table#sortabletable > tbody > tr:not(:first-child)
+
+  fields:
+    category:
+      text: 1
+    title:
+      selector: td:nth-child(2) > div:nth-child(1) > a > strong
+    details:
+      selector: td:nth-child(2) > div:nth-child(1) > a
+      attribute: href
+    download:
+      selector: a[href*="download.php?id="]
+      attribute: href
+    date:
+      # 27-03-2021 18:34
+      selector: td:nth-child(2) > div:nth-child(2)
+      filters:
+        - name: dateparse
+          args: "2-01-2006 15:04"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+# TS Special Edition v.7.4

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

@@ -217,13 +217,6 @@ search:
           args: "02.01.2006 15:04:05 -07:00"
     size:
       selector: td.size
-      filters:
-        - name: replace
-          args: ["\u00a0", ""]
-        - name: replace
-          args: [".", ""]
-        - name: replace
-          args: [",", "."]
     downloadvolumefactor:
       case:
         "span:contains(\"OU\")": 0 # only upload is counted

src/Jackett.Common/Definitions/bitturk.yml

@@ -136,8 +136,9 @@ search:
     searchin: title
     "sortOptions[sortBy]": "{{ .Config.sort }}"
     "sortOptions[sortOrder]": "{{ .Config.type }}"
-  error:
-    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
+# Drop error trap to stop Sonarr disabling indexer, see https://github.com/Jackett/Jackett/issues/1415
+#  error:
+#    - selector: div.error:not(:contains("Gösterilecek sonuç bulunamadı."))
 
   rows:
     selector: "table#torrents_table_classic tr:has(td.torrent_name){{ if .Config.freeleech }}:has(img[src$=\"/torrent_free.png\"]){{ else }}{{ end }}"

src/Jackett.Common/Definitions/blutopia.yml

@@ -103,12 +103,12 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
     download:
       selector: a[href*="/download/"]
       attribute: href
     details:
-      selector: a.view-torrent
+      selector: a[href*="/torrents/"]
       attribute: href
     poster:
       selector: div.torrent-poster img
@@ -193,4 +193,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# UNIT3D 5.1.0b
+# UNIT3D 5.2.1b

src/Jackett.Common/Definitions/broadcity.yml

@@ -13,28 +13,29 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 1, cat: Movies/UHD, desc: "UHD"}
-    - {id: 2, cat: Movies/HD, desc: "BluRay"}
-    - {id: 8, cat: Movies/HD, desc: "TV"}
-    - {id: 6, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 16, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 3, cat: Movies/HD, desc: "Movies HD"}
-    - {id: 25, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 4, cat: Movies/HD, desc: "BluRay"}
-    - {id: 7, cat: Movies/HD, desc: "TV"}
-    - {id: 5, cat: Movies/HD, desc: "WEB-DL"}
-    - {id: 14, cat: Movies/HD, desc: "WEBRip"}
-    - {id: 27, cat: Movies/HD, desc: "LORD Rips"}
+    - {id: 2, cat: Movies/UHD, desc: "UHD - BluRay"}
+    - {id: 8, cat: Movies/UHD, desc: "UHD - TV"}
+    - {id: 6, cat: Movies/UHD, desc: "UHD - WEB-DL"}
+    - {id: 16, cat: Movies/UHD, desc: "UHD - WEBRip"}
+    - {id: 31, cat: Movies/BluRay, desc: "BluRay Disk"}
+    - {id: 3, cat: Movies/HD, desc: "HD"}
+    - {id: 25, cat: Movies/3D, desc: "HD - 3D"}
+    - {id: 4, cat: Movies/HD, desc: "HD - BluRay"}
+    - {id: 7, cat: Movies/HD, desc: "HD - TV"}
+    - {id: 5, cat: Movies/HD, desc: "HD - WEB-DL"}
+    - {id: 14, cat: Movies/HD, desc: "HD - WEBRip"}
+    - {id: 32, cat: PC/Games, desc: "Oyunlar (Games)"}
     - {id: 9, cat: Movies/SD, desc: "SD"}
-    - {id: 23, cat: Movies/SD, desc: "BluRay"}
-    - {id: 10, cat: Movies/SD, desc: "DVD"}
-    - {id: 12, cat: Movies/SD, desc: "TV"}
-    - {id: 13, cat: Movies/SD, desc: "WEB-DL"}
-    - {id: 15, cat: Movies/SD, desc: "WEBRip"}
+    - {id: 23, cat: Movies/SD, desc: "SD - BluRay"}
+    - {id: 10, cat: Movies/SD, desc: "SD - DVD"}
+    - {id: 36, cat: Movies/SD, desc: "SD - DVDRip"}
+    - {id: 12, cat: Movies/SD, desc: "SD - TV"}
+    - {id: 13, cat: Movies/SD, desc: "SD - WEB-DL"}
+    - {id: 15, cat: Movies/SD, desc: "SD - WEBRip"}
     - {id: 17, cat: TV, desc: "TV"}
-    - {id: 26, cat: TV/Other, desc: "TV Program"}
-    - {id: 19, cat: TV, desc: "Yabanci Dizi"}
-    - {id: 18, cat: TV, desc: "Yerli Dizi"}
-    - {id: 20, cat: Movies/HD, desc: "VIP"}
+    - {id: 26, cat: TV/Other, desc: "TV - TV Program"}
+    - {id: 19, cat: TV, desc: "TV - Yabanci Dizi"}
+    - {id: 18, cat: TV, desc: "TV - Yerli Dizi"}
 
   modes:
     search: [q]
@@ -123,4 +124,9 @@ search:
       case:
         img[src$="/x2.gif"]: 2
         "*": 1
+    minimumratio:
+      text: 0.5
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
 # TS Special Edition v.7.5

src/Jackett.Common/Definitions/bt4g.yml

@@ -0,0 +1,77 @@
+---
+id: bt4g
+name: BT4G
+description: "BT4G is a Public metadata crawler for magnets"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://bt4g.org/
+
+caps:
+  categories:
+    Application: PC
+    Archive file: Other
+    Audio: Audio
+    Doc: Books
+    Other: Other
+    Video: Movies
+    TV: TV # dummy cat to allow both Movies,TV to be categorised when Video is found.
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+settings: []
+
+search:
+  paths:
+    # https://bt4g.org/search/2021
+    # site does not support cat search
+    - path: "search/{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.row > div.col > div:has(h5)
+
+  fields:
+    title:
+      selector: a
+    category:
+      selector: span.cpill
+    category:
+      # add tv to video
+      optional: true
+      selector: span.cpill
+      filters:
+        - name: replace
+          args: ["Video", "TV"]
+    details:
+      selector: a
+      attribute: href
+    infohash:
+      selector: a
+      attribute: href
+      filters:
+        - name: replace
+          args: ["/magnet/", ""]
+    date:
+      selector: span:nth-last-child(5) b
+      filters:
+        - name: dateparse
+          args: "2006-01-02"
+    files:
+      selector: span:nth-last-child(4) b
+    size:
+      selector: span:nth-last-child(3) b
+    seeders:
+      selector: span:nth-last-child(2) b
+    leechers:
+      selector: span:nth-last-child(1) b
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/btdb.yml

@@ -9,7 +9,7 @@ followredirect: true
 links:
   # update poster placeholder link too
   - https://btdb.eu/
-  - https://btdb.unblockit.link/
+  - https://btdb.unblockit.onl/
 legacylinks:
   - https://btdb.to/
   - https://btdb.unblocked.app/
@@ -33,6 +33,9 @@ legacylinks:
   - https://btdb.unblockit.app/
   - https://btdb.unblockit.dev/
   - https://btdb.unblockit.ltd/
+  - https://btdb.unblockit.link/
+  - https://btdb.unblockit.buzz/
+  - https://btdb.unblockit.club/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btdigg.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
+  - http://btdiggwzoyrwwbiv.onion.ly/
 
 caps:
   categories:

src/Jackett.Common/Definitions/btsow.yml

@@ -6,7 +6,7 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - https://btsow.cam/
+  - https://btsow.digital
 legacylinks:
   - https://btos.pw/
   - https://btio.pw/
@@ -23,6 +23,8 @@ legacylinks:
   - https://btsow.work/
   - https://btsow.store/
   - https://btsow.surf/
+  - https://btsow.com/
+  - https://btsow.cam/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -9,6 +9,8 @@ links:
   - https://bwtorrents.tv/
   - https://bwtorrents.fun/
   - https://bwtorrents.xyz/
+  - https://bwtorrents.us/
+  - https://bwtorrents.live/
 
 caps:
   categorymappings:
@@ -26,22 +28,23 @@ caps:
     - {id: 122, cat: Movies/WEB-DL, desc: "Bollywood-DVDRips 1080p/720p"}
     - {id: 123, cat: Movies/WEB-DL, desc: "Bollywood-SDRips WEB/DVD"}
     - {id: 124, cat: Movies/3D, desc: "Bollywood-3D-Movies"}
-    - {id: 190, cat: Movies, desc: "Bollywood-Movies packs"}
-    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-WEB Originals"}
+    - {id: 190, cat: Movies, desc: "Bollywood-Movie packs"}
+    - {id: 125, cat: Movies/WEB-DL, desc: "Bollywood-Web Series"}
+    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
     - {id: 126, cat: Movies/UHD, desc: "Hollywood-4K Ultra HD / Upscaled"}
     - {id: 127, cat: Movies/BluRay, desc: "Hollywood-Untouched BluRay"}
     - {id: 128, cat: Movies/HD, desc: "Hollywood-1080p BluRay Rips"}
     - {id: 129, cat: Movies/HD, desc: "Hollywood-720p BluRay Rips"}
     - {id: 130, cat: Movies, desc: "Hollywood-BluRay Remuxes"}
     - {id: 131, cat: Movies/WEB-DL, desc: "Hollywood-Untouched WEB-DLs"}
-    - {id: 132, cat: Movies, desc: "Hollywood-WEB-Rips"}
+    - {id: 132, cat: Movies, desc: "Hollywood-1080p WEB-Rips"}
+    - {id: 192, cat: Movies, desc: "Hollywood-720p WEB-Rips"}
     - {id: 133, cat: Movies/DVD, desc: "Hollywood-Untouched DVDs"}
     - {id: 191, cat: Movies/WEB-DL, desc: "Hollywood-Encoded DVDs"}
     - {id: 134, cat: Movies/WEB-DL, desc: "Hollywood-DVDRips 1080p/720p"}
     - {id: 193, cat: Movies/SD, desc: "Hollywood-SDRips - WEB/DVD"}
     - {id: 135, cat: Movies/3D, desc: "Hollywood-3D-Movies"}
-    - {id: 136, cat: Movies, desc: "Hollywood-Pre-Release"}
-    - {id: 194, cat: Movies, desc: "Hollywood-Movies packs"}
+    - {id: 194, cat: Movies, desc: "Hollywood-Movie packs"}
     - {id: 137, cat: Movies, desc: "Malayalam-Movies"}
     - {id: 140, cat: Movies, desc: "Punjabi-Movies"}
     - {id: 141, cat: Movies, desc: "Kannada-Movies"}
@@ -50,10 +53,9 @@ caps:
     - {id: 144, cat: Movies, desc: "Marathi-Movies"}
     - {id: 145, cat: Movies, desc: "Bangla-Movies"}
     - {id: 185, cat: Movies, desc: "Gujarati-Movies"}
-    - {id: 184, cat: Movies, desc: "Bollywood-South Hindi Dubbed"}
-    - {id: 183, cat: Movies, desc: "Hindi Dubbed Movies"}
+    - {id: 184, cat: Movies, desc: "South Hindi Dubbed"}
+    - {id: 183, cat: Movies, desc: "English Hindi Dubbed"}
     - {id: 197, cat: Movies, desc: "Turkish Hindi Dubbed"}
-    - {id: 198, cat: Movies, desc: "TV-MTV"}
     - {id: 182, cat: Movies, desc: "Other Movies"}
     - {id: 146, cat: TV, desc: "TV-Colors"}
     - {id: 147, cat: TV, desc: "TV-TV"}
@@ -64,13 +66,17 @@ caps:
     - {id: 152, cat: TV, desc: "TV-Star Bharat"}
     - {id: 153, cat: TV, desc: "TV-Star Plus"}
     - {id: 154, cat: TV, desc: "TV-Zee TV"}
+    - {id: 186, cat: TV, desc: "TV-Dangal Tv"}
+    - {id: 218, cat: TV, desc: "TV-Ishara TV"}
     - {id: 155, cat: TV/Sport, desc: "TV-Sports"}
-    - {id: 156, cat: TV/Documentary, desc: "TV-Documentary"}
-    - {id: 157, cat: TV, desc: "TV-Hollywood"}
-    - {id: 158, cat: TV, desc: "TV-Others"}
-    - {id: 195, cat: TV, desc: "TV-Packs"}
-    - {id: 159, cat: TV, desc: "Religion &Spirituality "}
+    - {id: 156, cat: TV/Documentary, desc: "TV-Documentaries"}
+    - {id: 198, cat: Movies, desc: "TV-MTV"}
+    - {id: 158, cat: TV, desc: "TV-Other Tv Shows"}
+    - {id: 157, cat: TV, desc: "TV-Hollywood Tv Shows"}
+    - {id: 195, cat: TV, desc: "TV-Tv Packs"}
+    - {id: 159, cat: Audio, desc: "Music-Religion & Spirituality"}
     - {id: 160, cat: Audio, desc: "Music-Classical"}
+    - {id: 172, cat: Audio, desc: "Music-Remix"}
     - {id: 161, cat: Audio/Lossless, desc: "Music-Flacs"}
     - {id: 162, cat: Audio, desc: "Music-Ghazals"}
     - {id: 163, cat: Audio, desc: "Music-Hindi OSTs"}
@@ -82,11 +88,10 @@ caps:
     - {id: 169, cat: Audio/Video, desc: "Music-Videos"}
     - {id: 170, cat: Audio, desc: "Music-Pop"}
     - {id: 171, cat: Audio, desc: "Music-Punjabi"}
-    - {id: 172, cat: Audio, desc: "Music-Remix"}
-    - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 174, cat: Audio, desc: "Music-Telugu"}
+    - {id: 173, cat: Audio, desc: "Music-Tamil"}
     - {id: 196, cat: Audio, desc: "Music-Packs"}
-    - {id: 175, cat: Books/EBook, desc: "EBooks"}
+    - {id: 175, cat: Books/EBook, desc: "Ebooks"}
     - {id: 176, cat: PC/Games, desc: "Games PC"}
     - {id: 177, cat: Console, desc: "Games Console"}
     - {id: 178, cat: TV/Anime, desc: "Anime"}

src/Jackett.Common/Definitions/byrutor.yml

@@ -262,10 +262,10 @@ download:
   attribute: href
 
 search:
-  # keywords (any age posts, article titles only search)
+  # keywords (article titles only search)
   # do=search&subaction=search&story=five+freddy&titleonly=3&searchdate=0&sortby=date&resorder=desc&catlist[]=1&catlist[]=2&catlist[]=3
-  # keywordless (1 day old posts or newer + article body search) query=game
-  # do=search&subaction=search&story=game&titleonly=0&searchdate=1&sortby=date&resorder=desc&catlist[]=0
+  # keywordless (article body search) query=game
+  # do=search&subaction=search&story=game&titleonly=0&searchdate=0&sortby=date&resorder=desc&catlist[]=0
   paths:
     - path: index.php
   inputs:
@@ -278,7 +278,7 @@ search:
     showposts: 1
     # 0 article, 1 comments, 2 static pages, 3 article titles
     titleonly: "{{ if .Keywords }}3{{ else }}0{{ end }}"
-    searchdate: "{{ if .Keywords }}0{{ else }}1{{ end }}"
+    searchdate: 0
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}game{{ end }}"
     sortby: date
     resorder: desc

src/Jackett.Common/Definitions/catorrent.yml

@@ -0,0 +1,105 @@
+---
+id: catorrent
+name: Catorrent
+description: "Catorrent is a RUSSIAN Semi-Private Torrent Tracker for GAMES"
+language: ru-ru
+type: semi-private
+encoding: UTF-8
+links:
+  - https://catorrent.org/
+
+caps:
+  categorymappings:
+    - {id: PC, cat: PC/Games, desc: "PC"}
+    - {id: PS1, cat: Console/Other, desc: "Playstation 1"}
+    - {id: PS2, cat: Console/Other, desc: "Playstation 2"}
+    - {id: PS3, cat: Console/PS3, desc: "Playstation 3"}
+    - {id: PS4, cat: Console/PS4, desc: "Playstation 4"}
+    - {id: SWITCH, cat: Console/Other, desc: "Nintendo Switch"}
+    - {id: PSP, cat: Console/PSP, desc: "Playstation (portable) PSP"}
+    - {id: PSVITA, cat: Console/PS Vita, desc: "Playstation Vita"}
+    - {id: XONE, cat: Console/XBox One, desc: "Xbox ONE"}
+    - {id: X360, cat: Console/XBox 360, desc: "Xbox 360"}
+    - {id: WIIU, cat: Console/WiiU, desc: "Nintendo WIIU"}
+    - {id: WII, cat: Console/Wii, desc: "Nintendo WII"}
+    - {id: 3DS, cat: Console/3DS, desc: "Nintendo 3DS"}
+    - {id: NDS, cat: Console/NDS, desc: "Nintendo DS"}
+    - {id: N64, cat: Console/Other, desc: "Nintendo 64"}
+    - {id: NGC, cat: Console/Other, desc: "Nintendo Game Cube"}
+    - {id: DREAMCAST, cat: Console/Other, desc: "Dreamcast"}
+    - {id: SAT, cat: Console/Other, desc: "Sega Saturn"}
+
+  modes:
+    search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+
+login:
+  path: index.php
+  method: form
+  form: form[action=""]
+  inputs:
+    login_name: "{{ .Config.username }}"
+    login_password: "{{ .Config.password }}"
+    login_not_save: ""
+    login: submit
+  error:
+    - selector: div.berrors
+  test:
+    path: /
+    selector: a[href$="/index.php?action=logout"]
+
+download:
+  selector: a[href*="/index.php?do=download&id="]
+  attribute: href
+
+search:
+  # https://catorrent.org/index.php?do=search&subaction=search&story=lovelot
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.short_game_search
+
+  fields:
+    category:
+      selector: div.icon_default
+    title:
+      selector: div.short_game_title
+    details:
+      selector: a[href$=".html"]
+      attribute: href
+    download:
+      selector: a[href$=".html"]
+      attribute: href
+    poster:
+      selector: img
+      attribute: src
+    description:
+      selector: div.short_game_genre
+      optional: true
+    date:
+      text: now
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    size:
+      text: "512 MB"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/cilipro.yml

@@ -6,20 +6,9 @@ language: en-us
 type: public
 encoding: UTF-8
 links:
-  - http://www.cilipro1.xyz/
-  - http://www.cilipro2.xyz/
-  - http://www.cilipro3.xyz/
-  - http://www.cilipro4.xyz/
-  - http://www.cilipro5.xyz/
-  - http://www.cilipro6.xyz/
-  - http://www.cilipro7.xyz/
-  - http://www.cilipro8.xyz/
-  - http://www.cilipro9.xyz/
-  - http://www.cilipro10.xyz/
   - http://www.cilinb1.xyz/
   - http://www.cilinb2.xyz/
   - http://www.cilinb3.xyz/
-  - http://www.cilinb4.xyz/
   - http://www.cilinb5.xyz/
   - http://www.cilinb6.xyz/
   - http://www.cilinb7.xyz/
@@ -80,6 +69,17 @@ legacylinks:
   - http://www.lrsoso9.xyz/
   - http://www.lrsoso10.xyz/
   - http://www.cilijj.xyz/
+  - http://www.cilipro1.xyz/
+  - http://www.cilipro2.xyz/
+  - http://www.cilipro3.xyz/
+  - http://www.cilipro4.xyz/
+  - http://www.cilipro5.xyz/
+  - http://www.cilipro6.xyz/
+  - http://www.cilipro7.xyz/
+  - http://www.cilipro8.xyz/
+  - http://www.cilipro9.xyz/
+  - http://www.cilipro10.xyz/
+  - http://www.cilinb4.xyz/
 
 caps:
   categories:

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -24,9 +24,7 @@ caps:
     - {id: 156, cat: TV/HD, desc: "Serien - Pack/1080p"}
     - {id: 158, cat: TV/UHD, desc: "Serien - UHD/4K"}
     # Doku
-    - {id: 15, cat: TV/Documentary, desc: "Doku - Xvid/x264"}
-    - {id: 14, cat: TV/Documentary, desc: "Doku - 720p/1080p"}
-    - {id: 13, cat: TV/Documentary, desc: "Doku - Pack"}
+    - {id: 15, cat: TV/Documentary, desc: "Doku - Alle"}
     # App
     - {id: 12, cat: PC/0day, desc: "App - Win"}
     - {id: 11, cat: PC, desc: "App - Other"}
@@ -45,6 +43,7 @@ caps:
     # Sport
     - {id: 62, cat: TV/Sport, desc: "Sport - Alles"}
     # Sonstiges
+    - {id: 159, cat: Audio/Audiobook, desc: "Sonstiges - Hörbuch"}
     - {id: 64, cat: Books/Comics, desc: "Sonstiges - Anime"}
     - {id: 63, cat: Audio/Audiobook, desc: "Sonstiges - A-Book"}
     - {id: 96, cat: Books/EBook, desc: "Sonstiges - E-Book"}
@@ -140,9 +139,7 @@ search:
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Pack/1080p\"))": "156"
         ":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
         # Doku
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "15"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "14"
-        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "13"
+        ":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"Alle\"))": "15"
         # App
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
         ":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
@@ -161,6 +158,7 @@ search:
         # Sport
         ":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"Alles\"))": "62"
         # Sonstiges
+        ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": "159"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"Anime\"))": "64"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"A-Book\"))": "63"
         ":has(div.kat_cat_pic_name:contains(\"Sonstiges\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"

src/Jackett.Common/Definitions/comicat.yml

@@ -0,0 +1,102 @@
+---
+id: comicat
+name: comicat
+description: "comicat is a CHINESE Public tracker for Anime / Hentai / Manga"
+language: zh-CN
+type: public
+encoding: UTF-8
+links:
+  - https://www.comicat.org/
+
+settings: []
+
+caps:
+  categorymappings:
+    - {id: 1, cat: TV/Anime, desc: "动画(Anime)"}
+    - {id: 2, cat: Books/Comics, desc: "漫画(Manga)"}
+    - {id: 3, cat: Audio, desc: "音乐(Music)"}
+    - {id: 4, cat: TV/Anime, desc: "周边(Peripheral)"}
+    - {id: 5, cat: Other, desc: "其它(Other)"}
+    - {id: 6, cat: TV/Anime, desc: "Raw"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+    music-search: [q]
+    book-search: [q]
+
+search:
+  paths:
+    # https://www.comicat.org/ (latest)
+    # https://www.comicat.org/search.php?keyword=720p+2020 (search)
+    # sort_id: filters by a single category, multi cats is not supported so we cannot use it.
+    - path: "{{ if .Keywords }}/search.php?keyword={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "{{ if .Keywords }}/search.php?keyword={{ .Keywords }}&page=2{{ else }}2.html{{ end }}"
+
+  rows:
+    selector: tr[class^="alt"]:has(a[href^="sort"])
+
+  fields:
+    category:
+      selector: a[href^="sort"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "-(\\d)-"
+    title:
+      selector: a[href^="show"]
+    details:
+      selector: a[href^="show"]
+      attribute: href
+    infohash:
+      selector: a[href^="show"]
+      attribute: href
+      filters:
+        - name: regexp
+          args: "-(\\w+).html"
+    size:
+      selector: td:nth-child(4)
+    grabs:
+      selector: td:nth-child(7) span
+    date:
+      selector: td:nth-child(1):contains("/")
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST (China)
+        - name: dateparse
+          args: "2006/01/02 -07:00"
+    date:
+      selector: td:nth-child(1):contains("今天")
+      optional: true
+      filters:
+        - name: replace
+          args: ["今天", ""]
+        - name: append
+          args: " +08:00" # CST (China)
+        - name: timeparse
+          args: "15:04 -07:00"
+    date:
+      selector: td:nth-child(1):contains("昨天")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".+", "yesterday"]
+        - name: fuzzytime
+    date:
+      selector: td:nth-child(1):contains("前天")
+      optional: true
+      filters:
+        - name: re_replace
+          args: [".+", "2 days"]
+        - name: timeago
+    seeders:
+      selector: td:nth-child(5) span
+    leechers:
+      selector: td:nth-child(6) span
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/danishbytes.yml

@@ -10,20 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 7, cat: TV, desc: "Dansk / TV & Serier"}
-    - {id: 6, cat: Movies, desc: "Dansk / Film"}
-    - {id: 2, cat: TV, desc: "TV & Serier"}
-    - {id: 1, cat: Movies, desc: "Film"}
-    - {id: 10, cat: Movies, desc: "Film Boxset"}
-    - {id: 13, cat: TV/Anime, desc: "Cartoon & Anime / TV & Serier"}
-    - {id: 12, cat: TV/Anime, desc: "Cartoon & Anime / Film"}
-    - {id: 5, cat: PC/0day, desc: "Applikationer"}
-    - {id: 4, cat: PC/Games, desc: "Spil"}
-    - {id: 3, cat: Audio, desc: "Musik"}
-    - {id: 14, cat: Audio/Video, desc: "Musik / Videoer"}
-    - {id: 9, cat: Audio/Audiobook, desc: "Lydbøger"}
-    - {id: 8, cat: Books, desc: "E    -Books, Magasiner, osv."}
-    - {id: 11, cat: XXX, desc: "XXX"}
+    - {id: 1, cat: Movies, desc: "Movies"}
+    - {id: 2, cat: TV, desc: "TV"}
+    - {id: 5, cat: PC/0day, desc: "Appz"}
+    - {id: 4, cat: PC/Games, desc: "Games"}
+    - {id: 3, cat: Audio, desc: "Music"}
+    - {id: 8, cat: Books, desc: "Bookz"}
 
   modes:
     search: [q]
@@ -46,7 +38,7 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
       created_at: created
       seeders: seeders
@@ -85,6 +77,7 @@ search:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    keywords: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
@@ -115,12 +108,21 @@ search:
     download:
       selector: a[href*="/download/"]
       attribute: href
-    magnet:
-      selector: a[href^="magnet"]
-      attribute: href
+# tracker has issue with some magnet downloads failing #10758
+#    magnet:
+#      selector: a[href^="magnet"]
+#      attribute: href
     details:
       selector: a.view-torrent
       attribute: href
+    poster:
+      selector: div.torrent-poster img
+      attribute: src
+      filters:
+        - name: replace
+          args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:
@@ -132,6 +134,12 @@ search:
       filters:
         - name: regexp
           args: (\d+)
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    tmdbid:
+      selector: a[href*="themoviedb.org/movie/"]
+      attribute: href
     date:
       selector: time
       filters:
@@ -188,8 +196,8 @@ search:
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
     minimumratio:
-      text: 1.0
+      text: 1.1
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800
-# UNIT3D 3.1.0 DB-edition
+# UNIT3D 5.1.0 DB-edition

src/Jackett.Common/Definitions/datascene.yml

@@ -6,9 +6,9 @@ language: ro-ro
 type: private
 encoding: windows-1252
 links:
-  - https://datascene.net/
-legacylinks:
   - http://datascene.net/
+legacylinks:
+  - https://datascene.net/
 
 caps:
   categorymappings:
@@ -163,6 +163,8 @@ search:
         "*": 1
     uploadvolumefactor:
       text: 1
+    minimumratio:
+      text: 1.0
     minimumseedtime:
       # 2 days (as seconds = 2 x 24 x 60 x 60)
       text: 172800

src/Jackett.Common/Definitions/demonoid.yml

@@ -10,8 +10,9 @@ links:
   - https://www.demonoid.is/
   - https://www.dnoid.to/
   - https://www.dnoid.pw/
-  - https://demonoid.unblockit.link/
+  - https://demonoid.unblockit.onl/
   - https://demonoid.torrentbay.to/
+  - https://demonoid.nocensor.space/
 legacylinks:
   - https://demonoid.unblockit.pro/
   - https://demonoid.unblockit.one/
@@ -29,6 +30,9 @@ legacylinks:
   - https://demonoid.unblockit.app/
   - https://demonoid.unblockit.dev/
   - https://demonoid.unblockit.ltd/
+  - https://demonoid.unblockit.link/
+  - https://demonoid.unblockit.buzz/
+  - https://demonoid.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/empornium.yml

@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
   - https://www.empornium.me/
 
 caps:

src/Jackett.Common/Definitions/empornium2fa.yml

@@ -6,6 +6,9 @@ language: en-us
 type: private
 encoding: UTF-8
 links:
+  - https://www.empornium.is/
+  - https://empornium.sx/
+legacylinks:
   - https://www.empornium.me/
 
 caps:

src/Jackett.Common/Definitions/eniahd.yml

@@ -18,6 +18,23 @@ caps:
     - {id: 12, cat: Movies, desc: "Наше кино"}
     # TV
     - {id: 2, cat: TV/HD, desc: "Зарубежные сериалы HD"}
+    - {id: 65, cat: TV/HD, desc: "Майя МС / Майянцы / Mayans M.C."}
+    - {id: 52, cat: TV/HD, desc: "Блудный сын / Prodigal Son"}
+    - {id: 49, cat: TV/HD, desc: "Пенниуорт / Pennyworth"}
+    - {id: 62, cat: TV/HD, desc: "Черный список / The Blacklist"}
+    - {id: 64, cat: TV/HD, desc: "Игра престолов / Game of Thrones"}
+    - {id: 59, cat: TV/HD, desc: "Американская история ужасов / American Horror Story"}
+    - {id: 60, cat: TV/HD, desc: "Хороший доктор / The Good Doctor"}
+    - {id: 54, cat: TV/HD, desc: "Рэй Донован / Ray Donovan"}
+    - {id: 55, cat: TV/HD, desc: "Сверхъестественное / Supernatural"}
+    - {id: 56, cat: TV/HD, desc: "Сквозь снег / Snowpiercer"}
+    - {id: 57, cat: TV/HD, desc: "Теория большого взрыва / The Big Bang Theory"}
+    - {id: 58, cat: TV/HD, desc: "Миллиарды / Billions"}
+    - {id: 53, cat: TV/HD, desc: "Родина / Homeland"}
+    - {id: 51, cat: TV/HD, desc: "Новобранец / The Rookie"}
+    - {id: 50, cat: TV/HD, desc: "Это мы / This Is Us"}
+    - {id: 48, cat: TV/HD, desc: "Бэтвумен / Batwoman"}
+    - {id: 32, cat: TV/HD, desc: "Кости / Bones"}
     - {id: 31, cat: TV/HD, desc: "Американские боги / American Gods"}
     - {id: 30, cat: TV/HD, desc: "Агенты Щ.И.Т. / Agents of S.H.I.E.L.D."}
     - {id: 17, cat: TV/HD, desc: "Зарубежные сериалы HD для Apple TV"}
@@ -32,6 +49,8 @@ caps:
     - {id: 7, cat: TV/Documentary, desc: "Документальные (HD Video)"}
     - {id: 21, cat: TV/Documentary, desc: "Документальные"}
     - {id: 28, cat: TV/Documentary, desc: "Развлекательные телепередачи и шоу"}
+    # Private Forums
+    - {id: 47, cat: TV/HD, desc: "Рассказ служанки / The Handmaid's Tale"}
     # Miscellaneous
     - {id: 8, cat: Other, desc: "Разное (раздачи)"}
 

src/Jackett.Common/Definitions/epizod.yml

@@ -15,7 +15,9 @@ caps:
     - {id: series, cat: TV, desc: SÉRIES}
     - {id: films, cat: Movies, desc: FILMS}
     - {id: musique, cat: Audio, desc: MUSIQUE}
+    - {id: albums, cat: Audio, desc: ALBUMS}
     - {id: ebook, cat: Books, desc: EBOOK}
+    - {id: jeux, cat: Console, desc: GAMES}
     - {id: other, cat: Other, desc: OTHER}
 
   modes:
@@ -154,7 +156,7 @@ search:
         - name: dateparse
           args: "2006-01-02 15:04:05-07:00"
     size:
-      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"musique\" }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
+      text: "{{ if eq .Result.sizecat \"ebook\" }}1 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"albums\") (eq .Result.sizecat \"musique\") }}128 MB{{ else }}{{ end }}{{ if or (eq .Result.sizecat \"series\") (eq .Result.sizecat \"other\") }}512 MB{{ else }}{{ end }}{{ if eq .Result.sizecat \"jeux\" }}1 GB{{ else }}{{ end }}{{ if eq .Result.sizecat \"films\" }}2 GB{{ else }}{{ end }}"
     seeders:
       text: 1
     leechers:

src/Jackett.Common/Definitions/erzsebet.yml

@@ -51,6 +51,7 @@ caps:
     - {id: 178, cat: XXX, desc: "Erotic Video Library / Эротические студии (видео)"}
     - {id: 85, cat: XXX, desc: "Adult Games / Порноигры"}
     - {id: 83, cat: XXX, desc: "Hentai, Manga & Cartoons  / Хентай, Манга и Мультфильм..."}
+    - {id: 252, cat: XXX, desc: "Chinese Porn / Китайское порно"}
     - {id: 89, cat: XXX, desc: "Japanese Porn / Японское порно"}
     - {id: 188, cat: XXX, desc: "Erotic Movies, Documentary & Reality / Эротически..."}
     - {id: 219, cat: XXX, desc: "Cinema / Зарубежный Кинематограф"}
@@ -62,7 +63,9 @@ caps:
     - {id: 213, cat: XXX, desc: "Music (Video) / Музыка (Видео)"}
     - {id: 212, cat: XXX, desc: "Games / Игры"}
     - {id: 211, cat: XXX, desc: "Soft / Софт"}
+    - {id: 251, cat: XXX, desc: "International Releases  / Иностранные релизы"}
     - {id: 210, cat: XXX, desc: "Various / Разное"}
+    - {id: 250, cat: XXX, desc: "Cinema (LGBT) / Кинематограф (ЛГБТ)"}
     - {id: 205, cat: XXX, desc: "Shemale Transsexual / Транссексуалы"}
     - {id: 204, cat: XXX, desc: "Bisexual / Бисексуалы"}
     - {id: 206, cat: XXX, desc: "Gay Clips & Movie Scenes / Ролики, SiteRip'ы..."}

src/Jackett.Common/Definitions/ettv.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.ettvcentral.com/
   - https://ettv.unblockninja.com/
-  - https://ettv.unblockit.link/
-  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.onl/
+  - https://ettv.nocensor.space/
 legacylinks:
   - https://www.ettv.tv/
   - https://www.ettv.to/
@@ -37,6 +37,10 @@ legacylinks:
   - https://ettv.unblocked.rest/
   - https://ettv.unblockit.dev/
   - https://ettv.unblockit.ltd/
+  - https://ettv.unblockit.link/
+  - https://ettv.unblockit.buzz/
+  - https://ettv.unblocked.monster/
+  - https://ettv.unblockit.club/
 
 caps:
   categorymappings:

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

@@ -1,7 +1,7 @@
 ---
 id: extratorrent-cd
 name: ExtraTorrent.cd
-description: "ExtraTorrent.cd is a Public tracker, a  popular alternative to the original ET site, providing Movie / TV / General magnets"
+description: "ExtraTorrent.cd is a Public tracker for MOVIE / TV / GENERAL magnets"
 language: en-us
 type: public
 encoding: UTF-8
@@ -13,8 +13,15 @@ legacylinks:
   - https://extratorrent.unblockit.one/ # for .ag
 
 caps:
-  categories:
-    Other: Other
+  categorymappings:
+    - {id: Movies, cat: Movies, desc: "Movies"}
+    - {id: Video, cat: Movies, desc: "Movies"}
+    - {id: TV, cat: TV, desc: "TV"}
+    - {id: Music, cat: Audio, desc: "Music"}
+    - {id: Porn, cat: XXX, desc: "Adult / Porn"}
+    - {id: Software, cat: PC, desc: "Software"}
+    - {id: Games, cat: Console, desc: "Games"}
+    - {id: Other, cat: Other/Misc, desc: "Other"}
 
   modes:
     search: [q]
@@ -23,15 +30,14 @@ caps:
     music-search: [q]
     book-search: [q]
 
-settings:
-  - name: info_8000
-    type: info
-    label: About ExtraTorrent Categories
-    default: ExtraTorrent does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
+settings: []
 
 search:
   paths:
-    - path: "search/?search={{ .Keywords }}"
+    # 30 rows per page
+    - path: "search/?search={{ .Keywords }}&srt=added&order=desc"
+    - path: "search/?page=2&search={{ .Keywords }}&srt=added&order=desc"
+    - path: "search/?page=3&search={{ .Keywords }}&srt=added&order=desc"
   keywordsfilters:
     - name: re_replace
       args: ["[\\s]+", "."]
@@ -44,7 +50,7 @@ search:
 
   fields:
     category:
-      text: Other
+      selector: span.c_tor > a
     title:
       selector: a[href*="/torrent/"][title^="view"]
     details:

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

@@ -7,13 +7,17 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrents.it/
-  - https://extratorrent.unblockit.link/
-  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.onl/
+  - https://extratorrent.nocensor.space/
 legacylinks:
   - https://extratorrent.ag/
   - https://extratorrent.unblockit.app/
   - https://extratorrent.unblockit.dev/
   - https://extratorrent.unblockit.ltd/
+  - https://extratorrent.unblockit.link/
+  - https://extratorrent2.unblockninja.com/
+  - https://extratorrent.unblockit.buzz/
+  - https://extratorrent.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/extremetorrents.yml

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
+    tv-search: [q]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -104,6 +104,15 @@ search:
           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

src/Jackett.Common/Definitions/extremlymtorrents.yml

@@ -1,179 +0,0 @@
----
-id: extremlymtorrents
-name: ExtremlymTorrents
-description: "ExtremlymTorrents (XTR) is a Semi-Private tracker for MOVIES / TV / GENERAL"
-language: en-us
-type: semi-private
-encoding: UTF-8
-links:
-  - https://extremlymtorrents.ws/
-
-caps:
-  categorymappings:
-    - {id: 22, cat: Movies/HD, desc: "720p HD"}
-    - {id: 15, cat: Movies/HD, desc: "1080p HD"}
-    - {id: 40, cat: Movies/UHD, desc: "4K UHD 2160p"}
-    - {id: 12, cat: Movies/BluRay, desc: "BluRay"}
-    - {id: 5, cat: Movies/DVD, desc: "DVDRip"}
-    - {id: 16, cat: Movies/3D, desc: "BluRay 3D"}
-    - {id: 13, cat: TV/HD, desc: "HDTV"}
-    - {id: 47, cat: XXX, desc: "Porn UHD 4K -[+18]- xXx"}
-    - {id: 11, cat: XXX, desc: "Porn -[+18]- xXx"}
-    - {id: 50, cat: XXX, desc: "xXx iMAGESET (+18)"}
-    - {id: 41, cat: TV, desc: "TVRip"}
-    - {id: 6, cat: Audio, desc: "Music Mp3 | FLAC"}
-    - {id: 9, cat: TV, desc: "Kidz | Cartoons"}
-    - {id: 8, cat: Books/EBook, desc: "Comics | EBook"}
-    - {id: 10, cat: TV, desc: "TV Episode | Season Complete"}
-    - {id: 27, cat: Movies/DVD, desc: "DVD | PAL | NTSC"}
-    - {id: 25, cat: Movies/WEB-DL, desc: "WEBRip | WEB-DL"}
-    - {id: 35, cat: Movies, desc: "BRRip | BDRip | HDRip"}
-    - {id: 3, cat: PC, desc: "Applications"}
-    - {id: 17, cat: Console/PSP, desc: "PSP | Playstation "}
-    - {id: 30, cat: TV/SD, desc: "PDTV | SDTV"}
-    - {id: 18, cat: Console/PS3, desc: "PS3 | Playstation 3 "}
-    - {id: 46, cat: Console/PS4, desc: "PS4 | PlayStation 4"}
-    - {id: 20, cat: PC/Mobile-iOS, desc: "Iphone iOS"}
-    - {id: 19, cat: PC/Mobile-Android, desc: "Android Apk"}
-    - {id: 21, cat: Movies, desc: "Pack"}
-    - {id: 49, cat: TV/UHD, desc: "TV UHD | 2160p | Episodes"}
-    - {id: 24, cat: Audio/Video, desc: "VideoClip"}
-    - {id: 26, cat: Console/Wii, desc: "Wii Games"}
-    - {id: 31, cat: TV/Documentary, desc: "DOC's"}
-    - {id: 36, cat: Movies, desc: "CAMRip | REC"}
-    - {id: 38, cat: Movies, desc: "TS: TeleSync | HD-TS"}
-    - {id: 48, cat: Audio/Video, desc: "4K | 2160p | Music Video"}
-    - {id: 28, cat: TV/Anime, desc: "Anime | Japanese"}
-    - {id: 43, cat: XXX, desc: "Hentai | Manga"}
-    - {id: 29, cat: PC/0day, desc: "Windows PC"}
-    - {id: 7, cat: PC/Mac, desc: "Mac"}
-    - {id: 23, cat: PC, desc: "Linux"}
-    - {id: 32, cat: PC/Mobile-Other, desc: "GPS Navigation"}
-    - {id: 45, cat: Audio, desc: "Vinyl Rip"}
-    - {id: 2, cat: Console/XBox 360, desc: "XBOX 360"}
-    - {id: 1, cat: PC/Games, desc: "Games PC"}
-    - {id: 14, cat: Other, desc: "Wallpapers"}
-    - {id: 44, cat: Movies, desc: "Bollywood"}
-    - {id: 42, cat: Other/Misc, desc: "X EXTERN ONLY MAGNET"}
-    - {id: 39, cat: TV/Sport, desc: "Sport TV"}
-
-  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: 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 }}"
-  error:
-    - selector: span.titlebar:contains("Access Denied")
-      message:
-        selector: td.text
-  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 all 1 English 2 etc...
-    lang: 0
-    sort: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", " +$1"] # prepend + to each word
-
-  rows:
-    selector: table.xtrz > tbody > tr[class^="ttable_col"]
-
-  fields:
-    category:
-      selector: a[href^="torrents.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    language:
-      selector: td:nth-last-child(5)
-    description:
-      optional: true
-      selector: img[src="/images/vip-icon.png"]
-      attribute: src
-      filters:
-        - name: replace
-          args: ["/images/vip-icon.png", " VIP ONLY"]
-    title:
-      selector: a[href^="file.php?id="] b
-      filters:
-        - name: append
-          args: " {{ .Result.language }}{{ .Result.description }}"
-    details:
-      selector: a[href^="file.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?id="]
-      attribute: href
-    poster:
-      selector: a[href^="file.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(1)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02.01.200615:04:05 -07:00"
-    leechers:
-      selector: td:nth-last-child(2)
-    seeders:
-      selector: td:nth-last-child(3)
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        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/eztv.yml

@@ -12,8 +12,8 @@ links:
   - https://eztv.tf/
   - https://eztv.yt/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.link/
-  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.onl/
+  - https://eztv.nocensor.space/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
@@ -40,6 +40,10 @@ legacylinks:
   - https://eztv.unblocked.rest/
   - https://eztv.unblockit.dev/
   - https://eztv.unblockit.ltd/
+  - https://eztv.unblockit.link/
+  - https://eztv.unblockit.buzz/
+  - https://eztv.unblocked.monster/
+  - https://eztv.unblockit.club/
 
 caps:
   categories:

src/Jackett.Common/Definitions/femdomcult.yml

@@ -30,6 +30,7 @@ caps:
     - {id: 65, cat: XXX, desc: "Scat"}
     - {id: 71, cat: XXX, desc: "Strapon"}
     - {id: 66, cat: XXX, desc: "Transdom"}
+    - {id: 77, cat: XXX, desc: "Unknown & Low Quality"}
     - {id: 75, cat: XXX, desc: "Virtual Reality"}
 
   modes:

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

@@ -36,7 +36,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
+    tv-search: [q, imdbid]
     movie-search: [q, imdbid]
     music-search: [q]
     book-search: [q]
@@ -95,6 +95,8 @@ search:
     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

src/Jackett.Common/Definitions/firebit.yml

@@ -8,8 +8,6 @@ encoding: UTF-8
 links:
   - https://firebit.net/
   - https://firebit.info/
-  - https://firebit.pro/
-  - https://firebit.club/
 legacylinks:
   - https://firebit.name/
   - https://firebit.biz/
@@ -19,6 +17,8 @@ legacylinks:
   - http://firebit.pro/
   - http://firebit.club/
   - http://firebit.biz/
+  - https://firebit.pro/
+  - https://firebit.club/
 
 caps:
   categorymappings:
@@ -69,7 +69,7 @@ search:
     - path: "{{ if .Keywords }}index.php?do=search&type=simple&q=abcd1234{{ else }}%D1%81%D0%B5%D1%80%D0%B8%D0%B0%D0%BB/{{ end }}"
 
   rows:
-    selector: "{{ if .Keywords }}table.torrents tbody tr{{ else }}div[id^=\"post-id-\"]{{ end }}"
+    selector: "{{ if .Keywords }}table.torrents tbody tr:has(td.td-size){{ else }}div[id^=\"post-id-\"]:has(li.meta-size){{ end }}"
     filters:
       - name: andmatch
 

src/Jackett.Common/Definitions/focusx.yml

@@ -10,153 +10,158 @@ links:
 
 caps:
   categorymappings:
-    - {id: 111, cat: Movies, desc: "1922"}
-    - {id: 135, cat: Movies, desc: "Анон"}
-    - {id: 213, cat: Movies, desc: "Борат 2"}
-    - {id: 222, cat: Movies, desc: "Траффик"}
-    - {id: 206, cat: Movies, desc: "Брачная история"}
-    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
-    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
-    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
-    - {id: 65, cat: Movies, desc: "В твоих глазах"}
-    - {id: 74, cat: Movies, desc: "Варкрафт"}
-    - {id: 202, cat: Movies, desc: "Визит инспектора"}
-    - {id: 83, cat: Movies, desc: "Возмущение"}
-    - {id: 168, cat: Movies, desc: "Воспитательница"}
-    - {id: 46, cat: Movies, desc: "Высотка"}
-    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
-    - {id: 90, cat: Movies, desc: "Дангал"}
-    - {id: 189, cat: Movies, desc: "Дедвуд"}
-    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
-    - {id: 19, cat: Movies, desc: "Заброшенный"}
-    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
-    - {id: 64, cat: Movies, desc: "Зоотопия"}
-    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
-    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
-    - {id: 61, cat: Movies, desc: "Комета"}
-    - {id: 18, cat: Movies, desc: "Копенгаген"}
-    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
-    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
-    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 9, cat: TV, desc: "Иерихон"}
     - {id: 10, cat: Movies, desc: "Мёд в голове"}
-    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
-    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
-    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
-    - {id: 54, cat: Movies, desc: "Охотник: Война Зимы"}
+    - {id: 11, cat: TV, desc: "11-22-63"}
+    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
+    - {id: 13, cat: TV, desc: "Смерть в раю"}
+    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
+    - {id: 15, cat: TV, desc: "Чёрные паруса"}
+    - {id: 16, cat: Movies, desc: "Малыш"}
+    - {id: 17, cat: TV, desc: "Карточный домик"}
+    - {id: 18, cat: Movies, desc: "Копенгаген"}
+    - {id: 19, cat: Movies, desc: "Заброшенный"}
+    - {id: 37, cat: TV, desc: "Джек Айриш"}
+    - {id: 38, cat: Movies, desc: "Звёздные войны: Эпизод 7 Пробуждение силы"}
+    - {id: 39, cat: TV, desc: "Чужестранка"}
+    - {id: 40, cat: TV, desc: "Девушка по вызову"}
+    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
+    - {id: 42, cat: Movies, desc: "В лабиринте молчания"}
+    - {id: 43, cat: TV, desc: "Игра престолов"}
+    - {id: 44, cat: Movies, desc: "Женщина в золотом"}
     - {id: 45, cat: Movies, desc: "Падение Лондона"}
-    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
-    - {id: 57, cat: Movies, desc: "Портниха"}
-    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
-    - {id: 70, cat: Movies, desc: "Припаркованные"}
-    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 46, cat: Movies, desc: "Высотка"}
+    - {id: 47, cat: TV, desc: "Острые козырьки"}
+    - {id: 48, cat: TV, desc: "Странная парочка"}
+    - {id: 49, cat: Movies, desc: "Капитан Америка: Гражданская война"}
     - {id: 50, cat: Movies, desc: "Рыцарь кубков"}
-    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 51, cat: TV, desc: "Проповедник"}
+    - {id: 52, cat: TV, desc: "Изгой"}
+    - {id: 53, cat: TV, desc: "Рэй Донован"}
+    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
+    - {id: 56, cat: TV, desc: "Бесстыдники"}
+    - {id: 57, cat: Movies, desc: "Портниха"}
+    - {id: 58, cat: TV, desc: "Мистер Робот"}
+    - {id: 59, cat: TV, desc: "Валландер"}
+    - {id: 60, cat: Movies, desc: "Бэтмен против Супермена: На заре справедливости"}
+    - {id: 61, cat: Movies, desc: "Комета"}
+    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 63, cat: TV, desc: "Куорри"}
+    - {id: 64, cat: Movies, desc: "Зоотопия"}
+    - {id: 65, cat: Movies, desc: "В твоих глазах"}
+    - {id: 66, cat: Movies, desc: "Люди Икс: Апокалипсис"}
+    - {id: 67, cat: Movies, desc: "Потерянный Валентин"}
+    - {id: 68, cat: TV, desc: "Бесстыжие"}
+    - {id: 69, cat: TV, desc: "Нарко"}
+    - {id: 70, cat: Movies, desc: "Припаркованные"}
+    - {id: 71, cat: Movies, desc: "Легенда о Тарзане"}
+    - {id: 72, cat: Movies, desc: "Пока я не исчезну"}
+    - {id: 73, cat: Movies, desc: "Механик: Воскрешение"}
+    - {id: 74, cat: Movies, desc: "Варкрафт"}
+    - {id: 75, cat: TV, desc: "Все схвачено"}
+    - {id: 76, cat: Movies, desc: "Гнилые кварталы"}
+    - {id: 77, cat: TV, desc: "Граница"}
+    - {id: 79, cat: TV, desc: "Бош"}
+    - {id: 80, cat: Movies, desc: "Приятные вибрации"}
+    - {id: 81, cat: TV, desc: "Викинги"}
+    - {id: 82, cat: TV, desc: "Салем"}
+    - {id: 83, cat: Movies, desc: "Возмущение"}
     - {id: 84, cat: Movies, desc: "Трейнспоттинг (На игле)"}
     - {id: 85, cat: Movies, desc: "Тысячу раз 'спокойной ночи'"}
-    - {id: 11, cat: TV, desc: "11-22-63"}
-    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
-    - {id: 119, cat: TV, desc: "Алиенист"}
-    - {id: 122, cat: TV, desc: "Американская история преступлений"}
-    - {id: 12, cat: TV, desc: "Апокалипсис: Первая мировая война"}
-    - {id: 115, cat: TV, desc: "Безбожники"}
-    - {id: 141, cat: TV, desc: "Безопасность"}
-    - {id: 124, cat: TV, desc: "Бельвью"}
-    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
-    - {id: 56, cat: TV, desc: "Бесстыдники"}
-    - {id: 68, cat: TV, desc: "Бесстыжие"}
-    - {id: 79, cat: TV, desc: "Бош"}
-    - {id: 138, cat: TV, desc: "В пустыне смерти"}
-    - {id: 59, cat: TV, desc: "Валландер"}
-    - {id: 204, cat: TV, desc: "Ведьмак"}
-    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
-    - {id: 129, cat: TV, desc: "Взлет"}
-    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
-    - {id: 81, cat: TV, desc: "Викинги"}
-    - {id: 164, cat: TV, desc: "Возвращение домой"}
-    - {id: 75, cat: TV, desc: "Все схвачено"}
-    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
-    - {id: 144, cat: TV, desc: "Голиаф"}
-    - {id: 77, cat: TV, desc: "Граница"}
-    - {id: 167, cat: TV, desc: "Грязный Джон"}
-    - {id: 96, cat: TV, desc: "Двойка"}
-    - {id: 40, cat: TV, desc: "Девушка по вызову"}
-    - {id: 37, cat: TV, desc: "Джек Айриш"}
-    - {id: 156, cat: TV, desc: "Джек Райан"}
-    - {id: 14, cat: TV, desc: "Джереми Кларксон: Военные истории"}
-    - {id: 41, cat: TV, desc: "Джереми Кларксон: Триллер"}
-    - {id: 139, cat: TV, desc: "Дождь"}
-    - {id: 184, cat: TV, desc: "Доктор Блейк"}
-    - {id: 197, cat: TV, desc: "Западное крыло"}
-    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
-    - {id: 43, cat: TV, desc: "Игра престолов"}
-    - {id: 9, cat: TV, desc: "Иерихон"}
-    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
-    - {id: 186, cat: TV, desc: "Изгнание"}
-    - {id: 52, cat: TV, desc: "Изгой"}
-    - {id: 162, cat: TV, desc: "Изнанка дела"}
-    - {id: 130, cat: TV, desc: "Инстинкт"}
-    - {id: 175, cat: TV, desc: "Каратель"}
-    - {id: 17, cat: TV, desc: "Карточный домик"}
-    - {id: 203, cat: TV, desc: "Книга Рабов"}
-    - {id: 190, cat: TV, desc: "Кобра Кай"}
-    - {id: 147, cat: TV, desc: "Королева Сахара"}
     - {id: 86, cat: TV, desc: "Кровавая Гонка"}
-    - {id: 187, cat: TV, desc: "Крупный Город"}
-    - {id: 63, cat: TV, desc: "Куорри"}
-    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
-    - {id: 176, cat: TV, desc: "Матрёшка"}
-    - {id: 165, cat: TV, desc: "Метод Комински"}
-    - {id: 89, cat: TV, desc: "Миднайт Техас"}
-    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
-    - {id: 182, cat: TV, desc: "Мистер Посредник"}
-    - {id: 58, cat: TV, desc: "Мистер Робот"}
-    - {id: 69, cat: TV, desc: "Нарко"}
-    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
-    - {id: 155, cat: TV, desc: "Наследники"}
-    - {id: 106, cat: TV, desc: "Одаренные"}
-    - {id: 55, cat: TV, desc: "Оранжевый - хит сезона"}
-    - {id: 120, cat: TV, desc: "Ординатор"}
-    - {id: 47, cat: TV, desc: "Острые козырьки"}
-    - {id: 118, cat: TV, desc: "Охотник за разумом"}
-    - {id: 173, cat: TV, desc: "Парфюм"}
-    - {id: 143, cat: TV, desc: "Подлый пит"}
-    - {id: 179, cat: TV, desc: "Половое Просвещение"}
-    - {id: 110, cat: TV, desc: "Порох"}
-    - {id: 51, cat: TV, desc: "Проповедник"}
-    - {id: 169, cat: TV, desc: "Романовы"}
-    - {id: 53, cat: TV, desc: "Рэй Донован"}
-    - {id: 82, cat: TV, desc: "Салем"}
-    - {id: 116, cat: TV, desc: "Секретные Материалы"}
-    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
     - {id: 87, cat: TV, desc: "Сеньор Авила"}
-    - {id: 100, cat: TV, desc: "Смертельное оружие"}
-    - {id: 172, cat: TV, desc: "Смертельный класс"}
-    - {id: 13, cat: TV, desc: "Смерть в раю"}
-    - {id: 181, cat: TV, desc: "Сорвиголова"}
-    - {id: 185, cat: TV, desc: "Стальная Звезда"}
-    - {id: 131, cat: TV, desc: "Стартап"}
-    - {id: 140, cat: TV, desc: "Страйк"}
-    - {id: 170, cat: TV, desc: "Страна приливов"}
-    - {id: 48, cat: TV, desc: "Странная парочка"}
     - {id: 88, cat: TV, desc: "Стрелок"}
-    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
-    - {id: 112, cat: TV, desc: "Субура"}
-    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
-    - {id: 133, cat: TV, desc: "Террор"}
-    - {id: 97, cat: TV, desc: "Тик-герой"}
-    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 89, cat: TV, desc: "Миднайт Техас"}
+    - {id: 90, cat: Movies, desc: "Дангал"}
     - {id: 91, cat: TV, desc: "Утиные Истории"}
-    - {id: 121, cat: TV, desc: "Уэйко"}
-    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 96, cat: TV, desc: "Двойка"}
+    - {id: 97, cat: TV, desc: "Тик-герой"}
+    - {id: 100, cat: TV, desc: "Смертельное оружие"}
+    - {id: 101, cat: TV, desc: "Гавайи 5-0"}
+    - {id: 102, cat: TV, desc: "Черный Список"}
+    - {id: 106, cat: TV, desc: "Одаренные"}
+    - {id: 107, cat: TV, desc: "Теория большого взрыва"}
     - {id: 108, cat: TV, desc: "Ходячие мертвецы"}
     - {id: 109, cat: TV, desc: "Хроники Шаннары"}
-    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 110, cat: TV, desc: "Порох"}
+    - {id: 111, cat: Movies, desc: "1922"}
+    - {id: 112, cat: TV, desc: "Субура"}
+    - {id: 115, cat: TV, desc: "Безбожники"}
+    - {id: 116, cat: TV, desc: "Секретные Материалы"}
+    - {id: 118, cat: TV, desc: "Охотник за разумом"}
+    - {id: 119, cat: TV, desc: "Алиенист"}
+    - {id: 120, cat: TV, desc: "Ординатор"}
+    - {id: 121, cat: TV, desc: "Уэйко"}
+    - {id: 122, cat: TV, desc: "Американская история преступлений"}
+    - {id: 124, cat: TV, desc: "Бельвью"}
+    - {id: 126, cat: TV, desc: "Видоизменённый углерод"}
+    - {id: 128, cat: TV, desc: "Здесь и Сейчас"}
+    - {id: 129, cat: TV, desc: "Взлет"}
+    - {id: 130, cat: TV, desc: "Инстинкт"}
+    - {id: 131, cat: TV, desc: "Стартап"}
+    - {id: 133, cat: TV, desc: "Террор"}
+    - {id: 135, cat: Movies, desc: "Анон"}
+    - {id: 136, cat: TV, desc: "Мир Дикого Запада"}
+    - {id: 138, cat: TV, desc: "В пустыне смерти"}
+    - {id: 139, cat: TV, desc: "Дождь"}
+    - {id: 140, cat: TV, desc: "Страйк"}
+    - {id: 141, cat: TV, desc: "Безопасность"}
+    - {id: 143, cat: TV, desc: "Подлый пит"}
+    - {id: 144, cat: TV, desc: "Голиаф"}
+    - {id: 146, cat: TV, desc: "Весьма Английский Скандал"}
+    - {id: 147, cat: TV, desc: "Королева Сахара"}
+    - {id: 155, cat: TV, desc: "Наследники"}
+    - {id: 156, cat: TV, desc: "Джек Райан"}
+    - {id: 158, cat: TV, desc: "Леденящие кровь приключения Сабрины"}
     - {id: 161, cat: TV, desc: "Частные сыщики"}
-    - {id: 15, cat: TV, desc: "Чёрные паруса"}
-    - {id: 102, cat: TV, desc: "Черный Список"}
-    - {id: 39, cat: TV, desc: "Чужестранка"}
-    - {id: 62, cat: TV, desc: "Штамм"}
+    - {id: 162, cat: TV, desc: "Изнанка дела"}
+    - {id: 163, cat: TV, desc: "Наркос: Мексика"}
+    - {id: 164, cat: TV, desc: "Возвращение домой"}
+    - {id: 165, cat: TV, desc: "Метод Комински"}
     - {id: 166, cat: TV, desc: "Элита"}
+    - {id: 167, cat: TV, desc: "Грязный Джон"}
+    - {id: 168, cat: Movies, desc: "Воспитательница"}
+    - {id: 169, cat: TV, desc: "Романовы"}
+    - {id: 170, cat: TV, desc: "Страна приливов"}
+    - {id: 171, cat: TV, desc: "Тюрьма Оз"}
+    - {id: 172, cat: TV, desc: "Смертельный класс"}
+    - {id: 173, cat: TV, desc: "Парфюм"}
+    - {id: 174, cat: TV, desc: "Цветочный дом"}
+    - {id: 175, cat: TV, desc: "Каратель"}
+    - {id: 176, cat: TV, desc: "Матрёшка"}
+    - {id: 177, cat: TV, desc: "Берлинская резидентура"}
+    - {id: 179, cat: TV, desc: "Половое Просвещение"}
+    - {id: 180, cat: TV, desc: "АКАДЕМИЯ АМБРЕЛЛА"}
+    - {id: 181, cat: TV, desc: "Сорвиголова"}
+    - {id: 182, cat: TV, desc: "Мистер Посредник"}
+    - {id: 183, cat: TV, desc: "Футурама"}
+    - {id: 184, cat: TV, desc: "Доктор Блейк"}
+    - {id: 185, cat: TV, desc: "Стальная Звезда"}
+    - {id: 186, cat: TV, desc: "Изгнание"}
+    - {id: 187, cat: TV, desc: "Крупный Город"}
+    - {id: 189, cat: Movies, desc: "Дедвуд"}
+    - {id: 190, cat: TV, desc: "Кобра Кай"}
+    - {id: 191, cat: TV, desc: "Студия 60 на Сансет Стрип"}
+    - {id: 193, cat: Movies, desc: "Та, которой не было"}
+    - {id: 197, cat: TV, desc: "Западное крыло"}
+    - {id: 199, cat: TV, desc: "Семь миров, одна планета"}
+    - {id: 200, cat: Movies, desc: "Основные принципы ухода"}
+    - {id: 201, cat: Movies, desc: "Быстрая, как ветер"}
+    - {id: 202, cat: Movies, desc: "Визит инспектора"}
+    - {id: 203, cat: TV, desc: "Книга Рабов"}
+    - {id: 204, cat: TV, desc: "Ведьмак"}
+    - {id: 205, cat: TV, desc: "Из Ларк Райз в Кэндлфорд"}
+    - {id: 206, cat: Movies, desc: "Брачная история"}
+    - {id: 207, cat: Movies, desc: "Кафе Голубая сойка"}
+    - {id: 208, cat: Movies, desc: "Наши души по ночам"}
+    - {id: 213, cat: Movies, desc: "Борат 2"}
+    - {id: 222, cat: Movies, desc: "Траффик"}
+    - {id: 223, cat: Movies, desc: "На колёсах"}
+    - {id: 224, cat: Movies, desc: "Чудо в камере №7"}
+    - {id: 227, cat: Movies, desc: "Сначала убили моего отца"}
+    - {id: 228, cat: Movies, desc: "Айла: Дочь войны"}
+    - {id: 229, cat: TV, desc: "Танцы с птицами"}
+    - {id: 230, cat: TV, desc: "Жизнь в цвете"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/fouducinema.yml

@@ -11,27 +11,36 @@ links:
 caps:
   categorymappings:
     # when refreshing categories dont forget to update the category case block
+    - {id: 94, cat: TV/Sport, desc: "sport catch"}
+    - {id: 93, cat: TV/Sport, desc: "sport catch"}
+    - {id: 96, cat: TV/Sport, desc: "sport sport"}
+    - {id: 97, cat: TV/Sport, desc: "sport divers"}
+    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
+    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
     - {id: 65, cat: TV/Documentary, desc: "Documentaires Divers"}
     - {id: 66, cat: TV/Documentary, desc: "Documentaires audio"}
     - {id: 74, cat: Books/EBook, desc: "Documentaires Ebook"}
     - {id: 75, cat: Audio/Audiobook, desc: "Documentaires Ebook audio"}
-    - {id: 81, cat: TV/Anime, desc: "Animation Séries"}
-    - {id: 79, cat: Movies/HD, desc: "Animation Film"}
     - {id: 2, cat: Movies/DVD, desc: "Film DVDRip"}
+    - {id: 99, cat: Movies/HD, desc: "Film Hdrip"}
+    - {id: 98, cat: Movies/WEB-DL, desc: "Film Webrip"}
+    - {id: 86, cat: Movies/UHD, desc: "Film UHD"}
+    - {id: 87, cat: Movies/HD, desc: "Film REMUX"}
+    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
     - {id: 69, cat: Movies/DVD, desc: "Film DVD-r"}
     - {id: 67, cat: Movies/Other, desc: "Film Vob"}
     - {id: 59, cat: Movies/Other, desc: "Film Divers"}
     - {id: 19, cat: Movies/HD, desc: "Film 720P"}
     - {id: 17, cat: Movies/Other, desc: "Film Iso"}
-    - {id: 16, cat: Movies/WEB-DL, desc: "Film Web"}
-    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray"}
+    - {id: 16, cat: Movies/WEB-DL, desc: "Film Webrip - HDrip"}
+    - {id: 15, cat: Movies/BluRay, desc: "Film Bluray Full"}
     - {id: 4, cat: Movies/HD, desc: "Film 1080P"}
-    - {id: 70, cat: Movies/BluRay, desc: "Film BRRiP - BDRiP"}
+    - {id: 102, cat: Movies/UHD, desc: "Film HDR"}
     - {id: 46, cat: TV/HD, desc: "Serie 1080P"}
     - {id: 48, cat: TV/HD, desc: "Serie Bluray"}
     - {id: 60, cat: TV/Other, desc: "Serie Divers"}
     - {id: 72, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
-    - {id: 73, cat: TV/HD, desc: "Serie BRRiP - BDRiP"}
+    - {id: 101, cat: TV/UHD, desc: "Serie HDR"}
     - {id: 12, cat: TV/Other, desc: "Serie DVDRip"}
     - {id: 30, cat: TV/HD, desc: "Serie 720P"}
     - {id: 23, cat: TV/WEB-DL, desc: "Serie Web"}
@@ -152,27 +161,36 @@ search:
       selector: div.kat_cat_pic
       filters:
       case:
+        ":contains(\"sport\"):contains(\"catch\")": 94
+        ":contains(\"sport\"):contains(\"catch\")": 93
+        ":contains(\"sport\"):contains(\"sport\")": 96
+        ":contains(\"sport\"):contains(\"divers\")": 97
+        ":contains(\"Animation\"):contains(\"Séries\")": 81
+        ":contains(\"Animation\"):contains(\"Film\")": 79
         ":contains(\"Documentaires\"):contains(\"Divers\")": 65
         ":contains(\"Documentaires\"):contains(\"audio\")": 66
         ":contains(\"Documentaires\"):contains(\"Ebook\")": 74
         ":contains(\"Documentaires\"):contains(\"Ebook audio\")": 75
-        ":contains(\"Animation\"):contains(\"Séries\")": 81
-        ":contains(\"Animation\"):contains(\"Film\")": 79
         ":contains(\"Film\"):contains(\"DVDRip\")": 2
+        ":contains(\"Film\"):contains(\"Hdrip\")": 99
+        ":contains(\"Film\"):contains(\"Webrip\")": 98
+        ":contains(\"Film\"):contains(\"UHD\")": 86
+        ":contains(\"Film\"):contains(\"REMUX\")": 87
+        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
         ":contains(\"Film\"):contains(\"DVD-r\")": 69
         ":contains(\"Film\"):contains(\"Vob\")": 67
         ":contains(\"Film\"):contains(\"Divers\")": 59
         ":contains(\"Film\"):contains(\"720P\")": 19
         ":contains(\"Film\"):contains(\"Iso\")": 17
-        ":contains(\"Film\"):contains(\"Web\")": 16
+        ":contains(\"Film\"):contains(\"Webrip\")": 16
         ":contains(\"Film\"):contains(\"Bluray\")": 15
         ":contains(\"Film\"):contains(\"1080P\")": 4
-        ":contains(\"Film\"):contains(\"BRRiP - BDRiP\")": 70
+        ":contains(\"Film\"):contains(\"HDR\")": 102
         ":contains(\"Serie\"):contains(\"1080P\")": 46
         ":contains(\"Serie\"):contains(\"Bluray\")": 48
         ":contains(\"Serie\"):contains(\"Divers\")": 60
         ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 72
-        ":contains(\"Serie\"):contains(\"BRRiP - BDRiP\")": 73
+        ":contains(\"Serie\"):contains(\"HDR\")": 101
         ":contains(\"Serie\"):contains(\"DVDRip\")": 12
         ":contains(\"Serie\"):contains(\"720P\")": 30
         ":contains(\"Serie\"):contains(\"Web\")": 23

src/Jackett.Common/Definitions/funreleases.yml

@@ -1,215 +0,0 @@
----
-id: funreleases
-name: FunReleases
-description: "FunReleases is a Private GERMAN site for TV / MOVIES / GENERAL"
-language: de-de
-type: private
-encoding: UTF-8
-links:
-  - https://funreleases.me/
-
-caps:
-  categorymappings:
-    - {id: 10, cat: Audio/MP3, desc: "Audio Mp3"}
-    - {id: 11, cat: Audio/MP3, desc: "Audio Pack|MP3"}
-    - {id: 12, cat: Audio/Lossless, desc: "Audio Flac"}
-    - {id: 13, cat: Audio/Lossless, desc: "Audio Pack|Flac"}
-    - {id: 14, cat: Audio, desc: "Audio Hörspiel"}
-    - {id: 15, cat: Audio/Audiobook, desc: "Audio Audiobook"}
-    - {id: 16, cat: Audio/Video, desc: "Audio Videoclip"}
-    - {id: 17, cat: Audio/Other, desc: "Audio Sonstiges"}
-    - {id: 18, cat: Movies/3D, desc: "Filme 3D"}
-    - {id: 19, cat: Movies/BluRay, desc: "Filme Bluray"}
-    - {id: 20, cat: Movies/DVD, desc: "Filme DVD-R"}
-    - {id: 21, cat: Movies/UHD, desc: "Filme HD|4K"}
-    - {id: 22, cat: Movies/HD, desc: "Filme HD|1080p"}
-    - {id: 23, cat: Movies/HD, desc: "Filme HD|720p"}
-    - {id: 24, cat: Movies/SD, desc: "Filme SD"}
-    - {id: 25, cat: Movies/SD, desc: "Filme XviD"}
-    - {id: 26, cat: Movies, desc: "Filme Remux"}
-    - {id: 27, cat: Movies/Foreign, desc: "Filme International"}
-    - {id: 28, cat: Movies/Other, desc: "Filme Sonstiges"}
-    - {id: 29, cat: TV/HD, desc: "Serien HD"}
-    - {id: 30, cat: TV/HD, desc: "Serien Pack|HD"}
-    - {id: 31, cat: TV/SD, desc: "Serien SD"}
-    - {id: 32, cat: TV/SD, desc: "Serien Pack|SD"}
-    - {id: 33, cat: TV, desc: "Serien TV/Shows"}
-    - {id: 34, cat: TV/Foreign, desc: "Serien International"}
-    - {id: 35, cat: TV/Other, desc: "Serien Sonstiges"}
-    - {id: 36, cat: TV/Documentary, desc: "Doku HD"}
-    - {id: 37, cat: TV/Documentary, desc: "Doku Pack|HD"}
-    - {id: 38, cat: TV/Documentary, desc: "Doku SD"}
-    - {id: 39, cat: TV/Documentary, desc: "Doku Pack|SD"}
-    - {id: 40, cat: TV/Documentary, desc: "Doku International"}
-    - {id: 41, cat: TV/Documentary, desc: "Doku Sonstiges"}
-    - {id: 42, cat: PC/Games, desc: "Games Windows"}
-    - {id: 43, cat: Console/PSP, desc: "Games Playstation"}
-    - {id: 44, cat: Console/XBox, desc: "Games XBox"}
-    - {id: 45, cat: Console/NDS, desc: "Games Nintendo"}
-    - {id: 46, cat: PC/Games, desc: "Games Macintosh"}
-    - {id: 47, cat: Console/Other, desc: "Games Sonstiges"}
-    - {id: 48, cat: PC/0day, desc: "Software Windows"}
-    - {id: 49, cat: PC/Mac, desc: "Software Macintosh"}
-    - {id: 50, cat: PC/Mobile-Other, desc: "Software Handy-PDA"}
-    - {id: 51, cat: PC, desc: "Software Linux"}
-    - {id: 52, cat: PC, desc: "Software Sonstiges"}
-    - {id: 53, cat: Books/EBook, desc: "Ebook Buch"}
-    - {id: 54, cat: Books/Comics, desc: "Ebook Comic"}
-    - {id: 55, cat: Books/Mags, desc: "Ebook Magazin"}
-    - {id: 56, cat: Books, desc: "Ebook Zeitung"}
-    - {id: 57, cat: Books/Other, desc: "Ebook Sonstiges"}
-    - {id: 58, cat: TV/Sport, desc: "Sport Fußball"}
-    - {id: 59, cat: TV/Sport, desc: "Sport Formel 1"}
-    - {id: 60, cat: TV/Sport, desc: "Sport Wrestling"}
-    - {id: 61, cat: TV/Sport, desc: "Sport Sonstiges"}
-    - {id: 62, cat: XXX, desc: "XXX HD"}
-    - {id: 63, cat: XXX, desc: "XXX Pack|HD"}
-    - {id: 64, cat: XXX, desc: "XXX SD"}
-    - {id: 65, cat: XXX, desc: "XXX Pack|SD"}
-    - {id: 66, cat: XXX, desc: "XXX Bilder"}
-    - {id: 67, cat: XXX, desc: "XXX Sonstiges"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      5: seeders
-      4: size
-      2: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info_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>15</i>.
-
-login:
-  path: index.php?page=login
-  method: post
-  inputs:
-    uid: "{{ .Config.username }}"
-    pwd: "{{ .Config.password }}"
-  error:
-    - selector: body[onLoad^="makeAlert('"]
-      message:
-        selector: body[onLoad^="makeAlert('"]
-        attribute: onLoad
-        filters:
-          - name: replace
-            args: ["makeAlert('Error' , '", ""]
-          - name: replace
-            args: ["');", ""]
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-
-download:
-  selector: a[href^="download.php?id="]
-  attribute: href
-
-search:
-  paths:
-    - path: index.php
-  inputs:
-    search: "{{ .Keywords }}"
-    category: "{{ range .Categories }}{{.}};{{end}}"
-    page: torrents
-    # 0 all, 1 activeonly, 2 deadonly
-    active: 0
-    # 0 name, 1 name&descr, 2 descr, 3 uploader, 5 gold, 6 silver, 7 bronze, 8 1xUL, 9 2x, 10 3x, 11 4x, 12 5x, 13 6x, 14 7x, 15 8x, 16 9x, 17 10x
-    options: "{{ if .Config.freeleech }}5{{ else }}0{{ end }}"
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-  # does not return imdb link in results, and while a few titles have an imdbid in descr the majority do not.
-
-  rows:
-    selector: div.b-content > table > tbody > tr > td > table.lista > tbody > tr:has(a[href^="index.php?page=torrent-details&id="])
-
-  fields:
-    category:
-      selector: a[href^="index.php?page=torrents&category="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: category
-    title:
-      selector: a[href^="index.php?page=torrent-details&id="]
-    details:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: href
-    download:
-      selector: a[href^="index.php?page=downloadcheck&id="]
-      attribute: href
-    poster:
-      selector: a[href^="index.php?page=torrent-details&id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    date:
-      selector: td:nth-last-child(9)
-      filters:
-        - name: append
-          args: " +00:00" # auto adjusted by site account profile
-        - name: dateparse
-          args: "02/01/2006 -07:00"
-    seeders:
-      selector: td:nth-last-child(8)
-    leechers:
-      selector: td:nth-last-child(7)
-    grabs:
-      selector: td:nth-last-child(6)
-      filters:
-        - name: replace
-          args: ["---", "0"]
-    size:
-      selector: td:nth-last-child(4)
-    downloadvolumefactor:
-      case:
-        img[src="images/gold.gif"]: 0
-        img[src="images/silver.gif"]: 0.5
-        img[src="images/bronze.gif"]: 0.75
-        "*": 1
-    uploadvolumefactor:
-      case:
-        img[src="images/2x.gif"]: 2
-        img[src="images/3x.gif"]: 3
-        img[src="images/4x.gif"]: 4
-        img[src="images/5x.gif"]: 5
-        img[src="images/6x.gif"]: 6
-        img[src="images/7x.gif"]: 7
-        img[src="images/8x.gif"]: 8
-        img[src="images/9x.gif"]: 9
-        img[src="images/10x.gif"]: 10
-        "*": 1
-    minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800 # rules say you must seed but not for how long
-# xbtitFM 3.0.00

src/Jackett.Common/Definitions/gamestorrents.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.gamestorrents.nu/
+  - https://gamestorrents.nocensor.space/
 legacylinks:
   - https://www.gamestorrents.com/
   - https://www.gamestorrents.tv/

src/Jackett.Common/Definitions/girotorrent.yml

@@ -28,6 +28,7 @@ caps:
     - {id: 22, cat: Movies/SD, desc: "Movie BDRip"}
     - {id: 23, cat: Movies/SD, desc: "Movie DvdRip"}
     - {id: 95, cat: Movies/SD, desc: "Movie WEBRip"}
+    - {id: 98, cat: Movies/WEB-DL, desc: "Movie WEBDL"}
     - {id: 24, cat: Movies/DVD, desc: "Movie DVD-R 5"}
     - {id: 25, cat: Movies/DVD, desc: "Movie DVD-R 9"}
     - {id: 26, cat: Movies/HD, desc: "Movie Blu-Ray HD"}

src/Jackett.Common/Definitions/gktorrent.yml

@@ -8,6 +8,7 @@ encoding: UTF-8
 followredirect: true
 links:
   - https://www.gktorrent.cc/
+  - https://gktorrent.nocensor.space/
 legacylinks:
   - https://www.gktorrent.com/
   - http://www.gktorrent.com/
@@ -86,7 +87,7 @@ search:
       args: ["(?i)(S)(\\d{1,3})$", "saison $2"]
 
   rows:
-    selector: table.table-hover > tbody > tr:has(a)
+    selector: table.table-hover > tbody > tr:has(a[href*=torrent])
 
   fields:
     category:

src/Jackett.Common/Definitions/glodls.yml

@@ -9,8 +9,8 @@ followredirect: true
 links:
   - https://www.gtdb.to/
   - https://glodls.to/
-  - https://glotorrents.unblockit.link/
-  - https://glodls.unblocked.monster/
+  - https://glotorrents.unblockit.onl/
+  - https://glotorrents.nocensor.space/
 legacylinks:
   - https://glodls.rocks/
   - https://glotorrents.unblockit.pro/
@@ -34,6 +34,10 @@ legacylinks:
   - https://glodls.unblocked.rest/
   - https://glotorrents.unblockit.dev/
   - https://glotorrents.unblockit.ltd/
+  - https://glotorrents.unblockit.link/
+  - https://glotorrents.unblockit.buzz/
+  - https://glodls.unblocked.monster/
+  - https://glotorrents.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gtorrent.yml

@@ -10,7 +10,12 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: Other, desc: "Other"}
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
 
   modes:
     search: [q]
@@ -40,7 +45,11 @@ search:
 
   fields:
     category:
-      text: 1
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
     title:
       selector: div.name
     details:

src/Jackett.Common/Definitions/gtorrentpro.yml

@@ -0,0 +1,73 @@
+---
+id: gtorrentpro
+name: GTorrent.pro
+description: "GTorrent.pro is a RUSSIAN Public Torrent Tracker for MOVIES / TV / GENERAL"
+language: ru-ru
+type: public
+encoding: windows-1251
+links:
+  - http://gtorrent.pro/
+
+caps:
+  categorymappings:
+    - {id: "filmy", cat: Movies, desc: "Фильмы (Movies)"}
+    - {id: "muzyka", cat: Audio, desc: "Музыка (Music)"}
+    - {id: "igry", cat: Console, desc: "Игры (Games)"}
+    - {id: "serialy", cat: TV, desc: "Сериалы (TV series)"}
+    - {id: "programmy", cat: PC, desc: "Программы (Software)"}
+    - {id: "prilozheniya", cat: Other, desc: "prilozheniya (Other)"}
+
+  modes:
+    search: [q]
+
+settings: []
+
+download:
+  selector: a[href^="/engine/download.php?id="]
+  attribute: href
+
+search:
+  # do=search&subaction=search&search_start=0&full_search=0&result_from=1&story=%D0%A6%D0%B5%D0%BB%D1%8C%D0%BD%D0%BE%D0%BC%D0%B5%D1%82%D0%B0%D0%BB%D0%BB%D0%B8%D1%87%D0%B5%D1%81%D0%BA%D0%B0%D1%8F+%D0%BE%D0%B1%D0%BE%D0%BB%D0%BE%D1%87%D0%BA%D0%B0+
+  paths:
+    - path: index.php
+  inputs:
+    do: search
+    subaction: search
+    search_start: 0
+    full_search: 0
+    result_from: 1
+    story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+
+  rows:
+    selector: div.blog_brief_news:not(div.first_line):not(:has(div.uploaded:empty))
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: div.name a
+      attribute: href
+      filters:
+        - name: split
+          args: ["/", 3]
+    title:
+      selector: div.name
+    details:
+      selector: div.name a
+      attribute: href
+    download:
+      selector: div.name a
+      attribute: href
+    date:
+      text: now
+    size:
+      selector: div:nth-child(2)
+    seeders:
+      selector: div.uploaded
+    leechers:
+      selector: div.download
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/hdarea.yml

@@ -162,6 +162,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 0.8
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/hdhouse.yml

@@ -1,11 +1,12 @@
 ---
-id: hdreactor
-name: HDReactor
-description: "HDReactor is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
+id: hdhouse
+name: HDhouse
+description: "HDhouse (HDReactor) is a RUSSIAN Public Torrent Tracker for MOVIES / TV"
 language: ru-ru
 type: public
 encoding: windows-1251
 links:
+  - https://hdhouse.club/
   - https://hdreactor.club/
   - https://hdreactor.su/
 legacylinks:
@@ -14,14 +15,14 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 2001, cat: Movies/HD, desc: "Кино HD"}
-    - {id: 5006, cat: Movies/UHD, desc: "Кино 4K"}
-    - {id: 2007, cat: Movies/Other, desc: "Анимация"}
-    - {id: 2006, cat: TV/HD, desc: "Сериалы"}
-    - {id: 5005, cat: TV/Sport, desc: "Спорт"}
-    - {id: 2004, cat: Audio/Lossless, desc: "Музыка"}
-    - {id: 2005, cat: PC/Games, desc: "Игры"}
-    - {id: 2003, cat: XXX, desc: "18+"}
+    - {id: 1, cat: Movies/HD, desc: "Кино HD"}
+    - {id: 2, cat: Movies/UHD, desc: "Кино UHD"}
+    - {id: 3, cat: XXX, desc: "18+ HD"}
+    - {id: 4, cat: Audio/Lossless, desc: "Музыка A"}
+    - {id: 5, cat: PC/Games, desc: "Игры"}
+    - {id: 6, cat: TV/HD, desc: "Сериалы HD"}
+    - {id: 7, cat: TV/Anime, desc: "Мультфильмы"}
+    - {id: 9, cat: Audio/Video, desc: "Музыка V"}
 
   modes:
     search: [q]
@@ -69,29 +70,29 @@ search:
     do: search
     subaction: search
     showposts: 1
-    # 0 in article 1 in comments 2 in static pages 3 in article titles
+    # 0 in article, 1 in comments ,2 in static pages, 3 in article titles
     titleonly: 3
     story: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
     sortby: "{{ .Config.sort }}"
     resorder: "{{ .Config.type }}"
 
   rows:
-    selector: div.news:contains("Категория:")
+    selector: div.movie-item
 
   fields:
     category:
-      selector: div.news-content > a
+      selector: div.movie-item__meta > span > a
       case:
-        a[href$="/4k_uhd/"]: 5006
-        a[href$="/1/"]: 2001
-        a[href$="/6/"]: 2006
-        a[href$="/7/"]: 2007
-        a[href$="/4/"]: 2004
-        a[href$="/5/"]: 2005
-        a[href$="/3/"]: 2003
-        a[href$="/sport-hd/"]: 5005
+        a[href$="/1/"]: 1
+        a[href$="/3/"]: 3
+        a[href$="/4/"]: 4
+        a[href$="/4k_uhd/"]: 2
+        a[href$="/5/"]: 5
+        a[href$="/6/"]: 6
+        a[href$="/7/"]: 7
+        a[href$="/9/"]: 9
     title:
-      selector: h1 > a
+      selector: span.movie-item__title
       filters:
         # normalize to SXXEYY format
         - name: re_replace
@@ -117,11 +118,14 @@ search:
         - name: replace
           args: ["HDTVRip", "HDTV"]
     details:
-      selector: h1 > a
+      selector: div.movie-item__desc > a
       attribute: href
     download:
-      selector: h1 > a
+      selector: div.movie-item__desc > a
       attribute: href
+    poster:
+      selector: img
+      attribute: src
     size:
       text: "512 MB"
     seeders:
@@ -129,11 +133,9 @@ search:
     leechers:
       text: 1
     date:
-      selector: div.news-content
+      selector: div.movie-item__meta > span:nth-child(2)
       filters:
-        # - 30-10-2019, 14:49]
-        - name: regexp
-          args: "(\\d{1,2}\\-\\d{2}\\-\\d{4}\\, \\d{1,2}\\:\\d{2})"
+        # 5-03-2021, 21:59
         - name: replace
           args: [",", ""]
         - name: append

src/Jackett.Common/Definitions/hdspain.yml

@@ -78,7 +78,18 @@ search:
         - name: append
           args: "]"
     title:
-      selector: td.titulo a[id]
+      selector: td.titulo a[id]:contains("VOSE")
+      optional: true
+      filters:
+        - name: prepend
+          args: "{{ .Result.extras }} "
+        - name: append
+          args: " English"
+        - name: re_replace
+          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
+    title:
+      selector: td.titulo a[id]:not(:contains("VOSE"))
+      optional: true
       filters:
         - name: prepend
           args: "{{ .Result.extras }} "

src/Jackett.Common/Definitions/hdtime.yml

@@ -162,6 +162,8 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 0.8
     description:
       selector: td:nth-child(2)
       remove: a, img

src/Jackett.Common/Definitions/hdturk.yml

@@ -6,9 +6,10 @@ language: tr-TR
 type: private
 encoding: UTF-8
 links:
-  - https://hdturk.de/
+  - https://hdturk.club/
 legacylinks:
   - http://hdturk.de/
+  - https://hdturk.de/
 
 caps:
   categorymappings:
@@ -112,8 +113,10 @@ search:
     category: 0
     search_type: t_name
     include_dead_torrents: yes
+
   rows:
     selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+
   fields:
     title:
       selector: div[id^="port-target-"] a
@@ -133,13 +136,10 @@ search:
       selector: div[id^="port-content-"] img
       attribute: src
     date:
-      selector: td:nth-child(2)
-      filters:
-        - name: regexp
-          args: (\d{2}-\d{2}-\d{4} \d{2}:\d{2})
+      selector: td:nth-child(2) > div:nth-last-child(1)
       filters:
         - name: append
-          args: " +03:00" # TRT
+          args: " +00:00" # auto adjusted by site account profile
         - name: dateparse
           args: "02-01-2006 15:04 -07:00"
     download:

src/Jackett.Common/Definitions/hellastz.yml

@@ -79,7 +79,7 @@ login:
     uid: "{{ .Config.username }}"
     pwd: "{{ .Config.password }}"
   error:
-    - selector: form[action="index.php?page=login&returnto=index.php"] table tr td span
+    - selector: tr td span[style="color:#FF0000;"]
   test:
     path: index.php
     selector: a[href="logout.php"]
@@ -132,29 +132,24 @@ search:
     download:
       selector: a[href^="index.php?page=downloadcheck&id="]
       attribute: href
-    size:
-      selector: p:contains("Μέγεθος:")
-      filters:
-        - name: replace
-          args: ["Μέγεθος: ", ""]
     date:
-      selector: p:contains("Προστέθηκε:")
+      selector: td:nth-child(4)
       filters:
-        - name: replace
-          args: ["Προστέθηκε: ", ""]
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "15:04:05 02/01/2006 -07:00"
+          args: "02/01/2006 -07:00"
     seeders:
-      selector: p:has(a[href^="index.php?page=peers&id="]) > a:first-child
+      selector: td:nth-child(5)
     leechers:
-      selector: p:has(a[href^="index.php?page=peers&id="]) > a:nth-child(2)
+      selector: td:nth-child(6)
     grabs:
-      selector: p:has(a[href^="index.php?page=peers&id="]) > a:last-child
+      selector: td:nth-child(7)
       filters:
         - name: replace
           args: ["---", "0"]
+    size:
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
         img[alt="Gold 100% Free"]: 0
@@ -178,4 +173,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-#  xbtitFM v3.0.00
+#  xbtitFM v3.1.00

src/Jackett.Common/Definitions/horrorsite.yml

@@ -1,174 +0,0 @@
----
-id: horrorsite
-name: Horror Site
-description: "Horror Site is a Hungarian Private site for MOVIES / TV"
-language: hu-hu
-type: private
-encoding: iso-8859-1
-links:
-  - https://selection-tracker.net/
-legacylinks:
-  - https://horror-site.net/
-
-caps:
-  categorymappings:
-    - {id: 80, cat: Movies, desc: "Film /PACK"}
-    - {id: 82, cat: Movies/SD, desc: "Cam-Hun"}
-    - {id: 105, cat: Movies/DVD, desc: "Film/DVD-R/Eng"}
-    - {id: 38, cat: Movies/DVD, desc: "Film/DVD-R/Hun"}
-    - {id: 76, cat: Movies/HD, desc: "Film/HD/Eng"}
-    - {id: 71, cat: Movies/HD, desc: "Film/HD/Hun"}
-    - {id: 103, cat: Movies/SD, desc: "Film/SD/Eng"}
-    - {id: 104, cat: Movies/SD, desc: "Film/SD/Hun"}
-    - {id: 40, cat: Movies/SD, desc: "Film/XviD/Eng"}
-    - {id: 39, cat: Movies/SD, desc: "Film/XviD/Hun"}
-    - {id: 52, cat: PC/Games, desc: "Játék/RIP/ISO"}
-    - {id: 75, cat: Other, desc: "Képek"}
-    - {id: 107, cat: Books, desc: "eBook/Eng"}
-    - {id: 61, cat: Books, desc: "eBook/Hun"}
-    - {id: 106, cat: PC/Mobile-Other, desc: "Mobil"}
-    - {id: 50, cat: Audio/MP3, desc: "Mp3/Eng"}
-    - {id: 49, cat: Audio/MP3, desc: "Mp3/Hun"}
-    - {id: 45, cat: PC, desc: "Program ISO /RIP"}
-    - {id: 43, cat: TV, desc: "Rajzfilm/Hun"}
-    - {id: 57, cat: TV, desc: "Sorozat/Eng"}
-    - {id: 58, cat: TV, desc: "Sorozat/Hun"}
-    - {id: 102, cat: XXX, desc: "Film/XXX/HD"}
-    - {id: 59, cat: XXX, desc: "Film/XXX/SD"}
-    - {id: 74, cat: XXX, desc: "Képek/XXX"}
-
-  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: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: 2
-    options:
-      2: desc
-      1: asc
-  - name: info
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    post_kuldes: engedelyezve
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.browse:contains("hiba")
-  test:
-    path: /
-    selector: a[href$="/logout.php"]
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    # hidden field
-    turkalo: 0
-    search: "{{ .Keywords }}"
-    # 0 active, 1 all, 2 dead, 3 recomended, 4 double, 5 free
-    # note: option 4 and 5 do not actually filter. everything is returned.
-    # incldead: "{{ if .Config.freeleech }}5{{ else }}1{{ end }}"
-    incldead: 1
-    # 0 name, 1 descr, 2 both
-    blah: 0
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-    # does not support imdbid search
-
-  rows:
-    selector: "table > tbody > tr.sor:has(a[href^=\"/download.php/\"]){{ if .Config.freeleech }}:has(img[src=\"../pic/freedownload.gif\"]){{ else }}{{ end }}"
-#    error:
-#      - selector: div.content:contains("Meg van vonva a letöltési jogod")
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: title
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="/download.php/"]
-      attribute: href
-    imdb:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "src=(.+?) "
-    files:
-      selector: td:nth-last-child(8)
-    date:
-      selector: td:nth-last-child(6)
-      filters:
-        - name: regexp
-          args: (\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})
-        - name: replace
-          args: ["\xA0", " "]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: td:nth-last-child(5) > u
-    grabs:
-      selector: td:nth-last-child(4)
-    seeders:
-      selector: td:nth-last-child(3)
-    leechers:
-      selector: td:nth-last-child(2)
-    downloadvolumefactor:
-      case:
-        img[src="../pic/freedownload.gif"]: 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-#          img[src="../pic/????????.gif"]: 2 # there is a double (according to incldead=4) but not found at this time.
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 7 days (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# engine n/a

src/Jackett.Common/Definitions/huntorrent.yml

@@ -0,0 +1,166 @@
+---
+id: huntorrent
+name: HunTorrent
+description: "HunTorrent is a Hungarian Semi-Private site for MOVIES / TV / GENERAL"
+language: hu-hu
+type: semi-private
+encoding: UTF-8
+links:
+  - https://huntorrent.net/
+
+caps:
+  categorymappings:
+    - {id: 28, cat: Movies/SD, desc: "Cam/ENG"}
+    - {id: 27, cat: Movies/SD, desc: "Cam/HUN"}
+    - {id: 4, cat: Movies/DVD, desc: "DVDR/ENG"}
+    - {id: 3, cat: Movies/DVD, desc: "DVDR/HUN"}
+    - {id: 6, cat: Movies/HD, desc: "HD/ENG"}
+    - {id: 5, cat: Movies/HD, desc: "HD/HUN"}
+    - {id: 29, cat: Movies, desc: "Mese/ENG"}
+    - {id: 30, cat: Movies, desc: "Mese/HUN"}
+    - {id: 8, cat: TV/SD, desc: "Sorozat/ENG"}
+    - {id: 31, cat: TV/HD, desc: "Sorozat/HD/ENG"}
+    - {id: 9, cat: TV/HD, desc: "Sorozat/HD/HUN"}
+    - {id: 7, cat: TV/SD, desc: "Sorozat/HUN"}
+    - {id: 2, cat: Movies/SD, desc: "XviD/ENG"}
+    - {id: 1, cat: Movies/SD, desc: "XviD/HUN"}
+    - {id: 25, cat: Other, desc: "Kép"}
+    - {id: 24, cat: Books, desc: "eBook/ENG"}
+    - {id: 23, cat: Books, desc: "eBook/HUN"}
+    - {id: 38, cat: Audio/Audiobook, desc: "Hangoskönyv"}
+    - {id: 17, cat: PC/Games, desc: "Játék/ISO"}
+    - {id: 18, cat: PC/Games, desc: "Játék/RIP"}
+    - {id: 19, cat: Console, desc: "Konzol"}
+    - {id: 26, cat: PC/Mobile-Other, desc: "Mobil"}
+    - {id: 20, cat: PC/ISO, desc: "Program/ISO"}
+    - {id: 21, cat: PC/0day, desc: "Program/RIP"}
+    - {id: 13, cat: Audio/Video, desc: "Klip/ENG"}
+    - {id: 12, cat: Audio/Video, desc: "Klip/HUN"}
+    - {id: 11, cat: Audio/MP3, desc: "MP3/ENG"}
+    - {id: 10, cat: Audio/MP3, desc: "MP3/HUN"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      1: name
+      4: created
+      7: seeders
+      5: size
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form#loginForm
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    login: yes
+  # error: using some kind of JS popup that can not be trapped :-(
+  test:
+    path: browse.php
+    selector: a[href^="logout.php?k="]
+
+search:
+  paths:
+    # https://huntorrent.net/browse.php?time=1616615308&korhatar=0&incldead=1&xyz=yes&c28=1&c27=1&c6=1&c5=1&sort=4&type=desc
+    - path: browse.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    viewMode: ""
+    xyz: yes
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # Age Limit: 0 all, 1 no, 5 6, 2 12, 3 16, 4 18
+    korhatar: 0
+    # 0 active, 1 all, 2 dead, 3 my uploads, 4  my bookmarks
+    incldead: 1
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    # no freeleech atm
+
+  rows:
+    selector: table[align="center"][cellpadding="5"] > tbody > tr[id^="torrent-main-"]
+
+  fields:
+    id:
+      selector: a.download-link
+      attribute: data-id
+    category:
+      selector: a[href^="browse.php?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="#details_tr_"]
+      attribute: title
+      filters:
+        - name: replace
+          args: ["Név: ", ""]
+    details:
+      text: "details.php?id={{ .Result.id }}"
+    download:
+      selector: a[href^="download.php?torrent="]
+      attribute: href
+    description:
+      selector: td:nth-child(2) div:nth-child(2)
+    imdb:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    poster:
+      selector: a[href^="torrents_data/posters/"]
+      attribute: href
+    date:
+      selector: td:nth-last-child(6)
+      filters:
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td:nth-last-child(5) b
+    grabs:
+      selector: td:nth-last-child(4)
+      filters:
+        - name: replace
+          args: ["x", ""]
+    seeders:
+      selector: td:nth-last-child(3)
+    leechers:
+      selector: td:nth-last-child(2)
+    downloadvolumefactor:
+      text: 1
+    uploadvolumefactor:
+      text: 2
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 32 hours (as seconds = 32 x 60 x 60)
+      text: 115200
+# engine n/a

src/Jackett.Common/Definitions/idope.yml

@@ -7,7 +7,6 @@ type: public
 encoding: UTF-8
 links:
   - https://idope.se/
-  - https://idope.unblocked.monster/
 legacylinks:
   - https://idope.black-mirror.xyz/
   - https://idope.unblocked.casa/
@@ -18,6 +17,7 @@ legacylinks:
   - https://idope.proxyportal.pw/
   - https://idope.uk-unblock.pro/
   - https://idope.unblocked.rest/
+  - https://idope.unblocked.monster/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/ilcorsaroblu.yml

@@ -6,11 +6,12 @@ language: it-it
 type: semi-private
 encoding: UTF-8
 links:
-  - https://ilcorsaroblu.org/
+  - https://ilcorsaroblu.online/
 legacylinks:
   - http://ilcorsaroblu.org/
   - https://www.ilcorsaroblu.info/
   - https://www.ilcorsaroblu.org/
+  - https://ilcorsaroblu.org/
 
 caps:
   categorymappings:
@@ -184,6 +185,23 @@ search:
           args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
         - name: re_replace # rimozioni varie
           args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
     details:
       selector: td:nth-child(2) > a
       attribute: href

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -11,6 +11,7 @@ links:
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
+  - https://ilcorsaronero.nocensor.space/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -46,7 +47,7 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep]
+    tv-search: [q]
     movie-search: [q]
     music-search: [q]
     book-search: [q]
@@ -62,10 +63,11 @@ search:
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=1{{ else }}/browse/1{{ end }}"
     - path: "{{ if .Keywords }}advsearch.php?&category={{ range .Categories }}{{.}};{{end}}&search={{ .Keywords }}&order=data&by=DESC&page=2{{ else }}/browse/2{{ end }}"
   keywordsfilters:
-    - 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"]
+    # remove searching by season and episode due to inconsistent naming #11471
+    - name: re_replace # remove S01
+      args: ["(?i)(\\s*s\\d+)", ""]
+    - name: re_replace # remove E01
+      args: ["(?i)(\\s*e\\d+)", ""]
 
   rows:
     selector: "tr.odd,tr.odd2"
@@ -85,11 +87,8 @@ search:
       filters:
         - name: split
           args: ["/", -1]
-        - name: diacritics
-          args: replace
-        - name: urldecode
-        - name: re_replace # replace special characters with " " (space)
-          args: ["[\\[!\"#$%&'()*+,\\-.\\/:;<=>?@[\\]^_`{|}~]", " "]
+        - name: replace # replace underscore with " " (space)
+          args: ["_", " "]
         - name: re_replace # replace multiple spaces
           args: ["[ ]{2,}", " "]
         # normalize to SXXEYY format
@@ -109,6 +108,23 @@ search:
           args: ["(?i)\\b(?:Puntate\\s*)(\\d+)\\s?(\\d+)", "E0$1-0$2"]
         - name: re_replace # rimozioni varie
           args: ["(?i)(Serie completa|Completat?a?|in pausa)", ""]
+        # cleanup for Sonarr
+        - name: re_replace # EP 3 4 to E3-4
+          args: ["(?i)\\sEP\\s(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " E$1-$2 "]
+        - name: re_replace # S02E04 05 to S02E04-05
+          args: ["(?i)\\sS(\\d{1,2})\\s?E\\s?(\\d{1,2})\\s(E?\\s?\\d{1,2})\\s", " S$1E$2-$3 "]
+        - name: re_replace
+          args: ["(?i)AC3\\s?(\\d)\\s(\\d)", "AC3 $1.$2"]
+        - name: re_replace
+          args: ["(?i) DD\\s?(\\d)\\s(\\d)", " DD $1.$2"]
+        - name: re_replace
+          args: ["(?i) DDP\\s?(\\d)\\s(\\d)", " DDP $1.$2"]
+        - name: re_replace
+          args: ["(?i)\\sE\\s?AC3", " EAC3"]
+        - name: re_replace
+          args: ["(?i)WEB\\sDL", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)HDTVRIP", "HDTV"]
     description:
       selector: td:nth-child(1) a
       attribute: href

src/Jackett.Common/Definitions/jptv.yml

@@ -117,6 +117,8 @@ search:
           args: ["&w=52&h=80", "&w=180&h=270"] # for display on dashboard
         - name: replace
           args: ["https://images.weserv.nl/?url=https://via.placeholder.com/52x80&w=180&h=270", ""]
+        - name: replace
+          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:

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

@@ -56,7 +56,12 @@ download:
 
 search:
   paths:
+    # 20 rows per page
     - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}2/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}3/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}4/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
+    - path: "{{ if .Keywords }}usearch/{{ .Keywords }}/{{ else }}new/{{ end }}5/?sortby={{ .Config.sort }}&sort={{ .Config.type }}"
 
   rows:
     selector: table.data tr.odd:has(a[class="cellMainLink"]), table.data tr.even:has(a[class="cellMainLink"])

src/Jackett.Common/Definitions/kinonavse100.yml

@@ -66,6 +66,7 @@ caps:
     tv-search: [q, season, ep]
     movie-search: [q]
     music-search: [q]
+    book-search: [q]
 
 settings:
   - name: username
@@ -110,18 +111,28 @@ search:
     # http://kinonavse100.com/search.php?tracker_search=torrent&keywords=2020&terms=all&author=&sc=1&sf=titleonly&sk=t&sd=d&sr=topics&st=0&ch=300&t=0&submit=Search
     - path: search.php
   inputs:
-    tracker_search: torrent
+    # Search On: tracker, torrent, comment, forum, all
+    tracker_search: "{{ if .Keywords }}torrent{{ else }}tracker{{ end }}"
     keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}"
+    # all, any
     terms: all
+    # Search by Author
     author: ""
+    # Search in subforums: yes 1, no 0
     sc: 1
+    # Search For: all, msgonly, titleonly, firstpost
     sf: titleonly
+    # Show Results as: posts, topics
     sr: topics
     sk: "{{ .Config.sort }}"
     sd: "{{ .Config.type }}"
+    # Seach Posts For: all 0, 1day 1, week 7, fortnight 14, month 30, 3months 90, 6 months 180, year 365
     st: 0
+    # Show first: all -1, 0, 25, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000
     ch: 300
+    # hidden
     t: 0
+    # hidden
     submit: Search
     $raw: "{{ range .Categories }}&fid[]={{.}}{{end}}"
 

src/Jackett.Common/Definitions/lastfiles.yml

@@ -154,7 +154,7 @@ search:
       selector: a[href^="download.php"]
       attribute: href
     date:
-      selector: td:nth-child(5) span:not(:contains("day"))
+      selector: td:nth-child(4) span:not(:contains("day"))
       optional: true
       filters:
         - name: append
@@ -162,23 +162,23 @@ search:
         - name: dateparse
           args: "Jan 2 2006 03:04 PM -07:00"
     date:
-      selector: td:nth-child(5) span:contains("day")
+      selector: td:nth-child(4) span:contains("day")
       optional: true
       filters:
         - name: append
           args: " +00:00" # auto adjusted by site account profile
         - name: fuzzytime
     size:
-      selector: td:nth-child(6)
+      selector: td:nth-child(5)
     grabs:
-      selector: td:nth-child(7)
+      selector: td:nth-child(6)
       filters:
         - name: regexp
           args: (\d+)
     seeders:
-      selector: td:nth-child(8)
+      selector: td:nth-child(7)
     leechers:
-      selector: td:nth-child(9)
+      selector: td:nth-child(8)
     downloadvolumefactor:
       case:
         "a.info > b:contains(\"FREE\")": 0

src/Jackett.Common/Definitions/lemonhd.yml

@@ -12,26 +12,13 @@ legacylinks:
 
 caps:
   categorymappings:
-    - {id: 300, cat: Movies/UHD, desc: "Movies UHD-4K"}
-    - {id: 301, cat: Movies/UHD, desc: "Movies 2160p"}
-    - {id: 420, cat: Movies/UHD, desc: "Movies 2160p REMUX"}
-    - {id: 401, cat: Movies/BluRay, desc: "Movies Blu-ray"}
-    - {id: 410, cat: Movies/HD, desc: "Movies 1080p"}
-    - {id: 415, cat: Movies, desc: "Movies 1080p REMUX"}
-    - {id: 416, cat: Movies/3D, desc: "Movies 3D"}
-    - {id: 411, cat: Movies/HD, desc: "Movies 720p"}
-    - {id: 412, cat: Movies/WEB-DL, desc: "Movies WEB-DL"}
-    - {id: 413, cat: TV/HD, desc: "Movies HDTV"}
-    - {id: 417, cat: Movies, desc: "Movies iPad"}
-    - {id: 414, cat: Movies/DVD, desc: "Movies DVD"}
-    - {id: 402, cat: TV, desc: "TV Series(电视剧)"}
-    - {id: 403, cat: TV, desc: "TV Shows(综艺)"}
-    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
-    - {id: 405, cat: TV/Anime, desc: "Animations(动画片)"}
-    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)"}
-    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)"}
-    - {id: 500, cat: Audio, desc: "Music(无损)"}
-    - {id: 409, cat: Other, desc: "Video Portray(写真视频)"}
+    - {id: animate, cat: TV/Anime, desc: "动漫 Anime"}
+    - {id: doc, cat: TV/Documentary, desc: "纪录片 Documentary"}
+    - {id: movie, cat: Movies, desc: "电影 Movie"}
+    - {id: mv, cat: Audio/Video, desc: "MV Music Video"}
+    - {id: music, cat: Audio, desc: "音乐 Music"}
+    - {id: tv, cat: TV, desc: "剧集综艺 TV"}
+    - {id: other, cat: Other, desc: "艺术 Other"}
 
   modes:
     search: [q]
@@ -101,11 +88,11 @@ search:
 
   fields:
     category:
-      selector: a[href*="?cat_"]
-      attribute: href
+      selector: img[class^="cat_"]
+      attribute: class
       filters:
         - name: regexp
-          args: "cat_(\\d{3})"
+          args: "cat_(.+?)$"
     title:
       selector: a[href^="details_"] > b
     title:

src/Jackett.Common/Definitions/lepornoinfo.yml

@@ -27,7 +27,8 @@ caps:
     - {id: 15, cat: XXX, desc: "Pregnant"}
     - {id: 16, cat: XXX, desc: "Fetish"}
     - {id: 9, cat: XXX, desc: "Gay Forum"}
-    - {id: 18, cat: XXX, desc: "Incest and Taboo"}
+    - {id: 18, cat: XXX, desc: "Incest & Taboo"}
+    - {id: 19, cat: XXX, desc: "Femdom & Strapon"}
 
   modes:
     search: [q]

src/Jackett.Common/Definitions/limetorrents.yml

@@ -12,8 +12,9 @@ links:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.unblockit.link/
+  - https://limetorrents.unblockit.onl/
   - https://limetorrents.unblockninja.com/
+  - https://limetorrents.nocensor.space/
 legacylinks:
   - https://www.limetorrents.io/
   - https://www.limetorrents.cc/
@@ -38,6 +39,9 @@ legacylinks:
   - https://limetorrents.unblockit.app/
   - https://limetorrents.unblockit.dev/
   - https://limetorrents.unblockit.ltd/
+  - https://limetorrents.unblockit.link/
+  - https://limetorrents.unblockit.buzz/
+  - https://limetorrents.unblockit.club/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/magicheaven.yml

@@ -0,0 +1,203 @@
+---
+id: magicheaven
+name: magic-heaven
+description: "magic-heaven is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
+type: private
+encoding: UTF-8
+links:
+  - https://magic-heaven.info/
+
+caps:
+  categorymappings:
+    - {id: 6, cat: PC, desc: "APPS"}
+    - {id: 108, cat: Other, desc: "APPS Wallpapers"}
+    - {id: 8, cat: Movies/BluRay, desc: "BLU-RAY"}
+    - {id: 172, cat: Movies/BluRay, desc: "BLU-RAY 1080p"}
+    - {id: 176, cat: Movies/BluRay, desc: "BLU-RAY 720p"}
+    - {id: 156, cat: Movies/BluRay, desc: "BLU-RAY H264"}
+    - {id: 153, cat: Movies/BluRay, desc: "BLU-RAY X264"}
+    - {id: 36, cat: Movies/SD, desc: "CAMS"}
+    - {id: 161, cat: Movies/Other, desc: "Christmas Movies"}
+    - {id: 164, cat: Movies/Other, desc: "Christmas Music"}
+    - {id: 160, cat: Movies/Other, desc: "Classic Movies"}
+    - {id: 169, cat: Console, desc: "Console Games"}
+    - {id: 175, cat: Console/XBox, desc: "Console Games XBOX"}
+    - {id: 82, cat: Audio/Other, desc: "DJ MUSIC"}
+    - {id: 84, cat: Audio/Other, desc: "DJ MUSIC DMC"}
+    - {id: 102, cat: Audio/Other, desc: "DJ MUSIC Full Tilt Remix"}
+    - {id: 92, cat: Audio/Other, desc: "DJ MUSIC Funkymix"}
+    - {id: 83, cat: Audio/Other, desc: "DJ MUSIC MASTERMIX"}
+    - {id: 93, cat: Audio/Other, desc: "DJ MUSIC Ultimix"}
+    - {id: 90, cat: Audio/Other, desc: " DJ MUSIC X-mix"}
+    - {id: 3, cat: Movies/DVD, desc: "DVD-R"}
+    - {id: 11, cat: Books/EBook, desc: "E BOOKS"}
+    - {id: 114, cat: Audio/Audiobook, desc: "E BOOKS Audio Books"}
+    - {id: 86, cat: Books/Mags, desc: "E BOOKS Magazines"}
+    - {id: 167, cat: Audio/Other, desc: "KARAOKE"}
+    - {id: 14, cat: Movies/Other, desc: "MKV's"}
+    - {id: 13, cat: Audio/MP3, desc: "MP3 RELEASES"}
+    - {id: 17, cat: Movies/Other, desc: "MP4"}
+    - {id: 18, cat: Movies/Other, desc: "MULTI'S"}
+    - {id: 98, cat: Movies/Other, desc: "MULTI'S Movie Box Sets"}
+    - {id: 20, cat: Audio/MP3, desc: "MUSIC - MP3"}
+    - {id: 170, cat: Audio, desc: "MUSIC Artist Albums"}
+    - {id: 150, cat: Audio, desc: "MUSIC Collections"}
+    - {id: 96, cat: Audio, desc: "MUSIC Discographys"}
+    - {id: 97, cat: Audio/Lossless, desc: "MUSIC Flac"}
+    - {id: 171, cat: Audio/Video, desc: "Music-Videos"}
+    - {id: 22, cat: PC/Games, desc: "PC GAMES"}
+    - {id: 81, cat: Movies, desc: "RatioBoosters"}
+    - {id: 26, cat: TV/Sport, desc: "SPORT"}
+    - {id: 7, cat: Audio, desc: "Top 40 Albums/Singles"}
+    - {id: 9, cat: TV, desc: "TV EPISODES"}
+    - {id: 38, cat: TV, desc: "TV SERIES"}
+    - {id: 30, cat: Other, desc: "VIP"}
+    - {id: 158, cat: Other, desc: "VIP GOLD"}
+    - {id: 173, cat: Movies/WEB-DL, desc: "Web-dl"}
+    - {id: 34, cat: Movies/SD, desc: "Xvid / HDrip"}
+
+  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: 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 }}"
+    logout: ""
+  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="]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+  selector: a[href*="/download.php?id="]
+  attribute: href
+
+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: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: t_name
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+    # does not return imdb link in results, does not support imdbid searches
+  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:
+      # is often abbreviated
+      selector: a[href*="details.php?id="]
+    title:
+      # usually longer than details title
+      selector: div[id^="port-content-"] div
+      optional: true
+    details:
+      selector: a[href*="details.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})
+      filters:
+        - name: append
+          args: " +00:00" # auto adjusted by site account profile
+        - name: dateparse
+          args: "02-01-2006 15:04 -07:00"
+    download:
+      selector: a[href*="details.php?id="]
+      attribute: href
+    magnet:
+      selector: a[href^="magnet:?xt="]
+      attribute: href
+    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
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+# TS Special Edition v.7.5

src/Jackett.Common/Definitions/magnet4you.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://magnet4you.me/
-  - https://magnet4you.unblocked.monster/
+  - https://magnet4you.nocensor.space/
 legacylinks:
   - http://magnet4you.me/
   - https://magnet4you.black-mirror.xyz/
@@ -19,6 +19,7 @@ legacylinks:
   - https://magnet4you.proxyportal.pw/
   - https://magnet4you.uk-unblock.pro/
   - https://magnet4you.unblocked.rest/
+  - https://magnet4you.unblocked.monster/
 
 caps:
   categories:

src/Jackett.Common/Definitions/marinetracker.yml

@@ -11,6 +11,13 @@ links:
 caps:
   categorymappings:
     - {id: 5, cat: Books, desc: "Shipbuilding & Shiprepairing"}
+    - {id: 314, cat: Books, desc: "Shipbuilding & Shiprepairing-Ship supply (chemicals, paints, oils)"}
+    - {id: 313, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding materials"}
+    - {id: 312, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding Management"}
+    - {id: 311, cat: Books, desc: "Shipbuilding & Shiprepairing-Mathematical Modeling"}
+    - {id: 310, cat: Books, desc: "Shipbuilding & Shiprepairing-Hydrodynamics"}
+    - {id: 309, cat: Books, desc: "Shipbuilding & Shiprepairing-Naval Architecture & Marine Engineering"}
+    - {id: 308, cat: Books, desc: "Shipbuilding & Shiprepairing-Shipbuilding Standard @ Register"}
     - {id: 196, cat: Books, desc: "Shipbuilding & Shiprepairing-Welding"}
     - {id: 195, cat: Books, desc: "Shipbuilding & Shiprepairing-Turnary"}
     - {id: 226, cat: Books, desc: "Mobile Apps for Seafarers"}
@@ -21,8 +28,9 @@ caps:
     - {id: 14, cat: PC, desc: "Maritime Software-Maritime Simulators"}
     - {id: 12, cat: PC, desc: "Maritime Software-Answers to tests"}
     - {id: 20, cat: PC, desc: "Maritime Software-Calculation soft"}
-    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
     - {id: 179, cat: PC, desc: "Maritime Software-Programming and SDK software"}
+    - {id: 317, cat: PC, desc: "Maritime Software-Shareware (demo, trial)"}
+    - {id: 188, cat: PC, desc: "Maritime Software-Other soft"}
     - {id: 21, cat: Books, desc: "Deckofficer's Library"}
     - {id: 283, cat: Books, desc: "Deckofficer's Library-Radar at sea"}
     - {id: 114, cat: Books, desc: "Deckofficer's Library-Watch keeping"}
@@ -38,6 +46,13 @@ caps:
     - {id: 116, cat: Books, desc: "Deckofficer's Library-Global Maritime Distress and Safety System (GMDSS)"}
     - {id: 192, cat: Books, desc: "Deckofficer's Library-Navigation in the ice"}
     - {id: 42, cat: Books, desc: "Safety of Navigation"}
+    - {id: 307, cat: Books, desc: "Safety of Navigation-Life Safety at Sea"}
+    - {id: 306, cat: Books, desc: "Safety of Navigation-Casualties and Incidents"}
+    - {id: 305, cat: Books, desc: "Safety of Navigation-Safety Digest, Lessons from Marine Accident Reports"}
+    - {id: 304, cat: Books, desc: "Safety of Navigation-Fire fighting at sea"}
+    - {id: 303, cat: Books, desc: "Safety of Navigation-Anti-Piracy Security"}
+    - {id: 302, cat: Books, desc: "Safety of Navigation-Emergency and life-saving equipment"}
+    - {id: 301, cat: Books, desc: "Safety of Navigation-Cybersecurity"}
     - {id: 8, cat: Movies, desc: "Video for Seamen"}
     - {id: 234, cat: Movies, desc: "Video for Seamen-Video for Deck Officers"}
     - {id: 233, cat: Movies, desc: "Video for Seamen-Video for Marine Engineers"}
@@ -83,6 +98,7 @@ caps:
     - {id: 38, cat: Books, desc: "Uncategorized"}
     - {id: 190, cat: Books, desc: "Catalogs"}
     - {id: 113, cat: Books, desc: "Medicine"}
+    - {id: 299, cat: Books, desc: "Sailing Kitchen"}
     - {id: 39, cat: Books, desc: "Purpose-built ships"}
     - {id: 51, cat: Books, desc: "Purpose-built ships-Oil & Chemical Tankers"}
     - {id: 52, cat: Books, desc: "Purpose-built ships-Dry cargo vessels"}

src/Jackett.Common/Definitions/mesevilag.yml

@@ -12,10 +12,12 @@ caps:
   categorymappings:
     - {id: 1, cat: TV/Anime, desc: "Anime/Cam"}
     - {id: 2, cat: TV/Anime, desc: "Anime/Eng"}
+    - {id: 21, cat: TV/Anime, desc: "Anime/HD"}
     - {id: 3, cat: TV/Anime, desc: "Anime/Hun"}
     - {id: 13, cat: TV/Anime, desc: "Anime/Sorozat(Series)"}
     - {id: 4, cat: Movies, desc: "Családi/Cam(Family)"}
     - {id: 5, cat: Movies, desc: "Családi/Eng(Family)"}
+    - {id: 19, cat: Movies/HD, desc: "Családi/HD(Family)"}
     - {id: 6, cat: Movies, desc: "Családi/Hun(Family)"}
     - {id: 17, cat: Movies, desc: "Családi/Romantikus/Cam(Family Romantic)"}
     - {id: 16, cat: Movies, desc: "Családi/Romantikus/Eng(Family Romantic)"}
@@ -25,8 +27,9 @@ caps:
     - {id: 8, cat: Audio/Audiobook, desc: "Hangoskönyv(Audiobooks)"}
     - {id: 9, cat: PC/Games, desc: "Játék/ISO(Games)"}
     - {id: 11, cat: Console, desc: "Játék/Konzol(Console)"}
-    - {id: 10, cat: PC/Games, desc: "Játék/RIP(Games RIP)"}
+    - {id: 10, cat: PC/Games, desc: "Játék/RIP(Games)"}
     - {id: 7, cat: Books, desc: "Könyv(Books)"}
+    - {id: 20, cat: Movies/HD, desc: "Romantikus/HD(Romantic)"}
     - {id: 12, cat: Audio, desc: "Zene/Hun(Music)"}
 
   modes:

src/Jackett.Common/Definitions/mononokebt.yml

@@ -40,15 +40,9 @@ settings:
     default: Before you can even begin to download anything you need to go to the <a href="https://mononoke-bt.org/faq.php" target="_blank">FAQ</a> and click every 'Lu et Approuvé' present on the page.
 
 login:
-  path: takelogin.php
   method: cookie
   inputs:
     cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: a[href="logout.php"]
-  error:
-    - selector: td.embedded:has(h2:contains("l'authentification"))
   test:
     path: browse2.php
 

src/Jackett.Common/Definitions/montorrent.yml

@@ -13,30 +13,30 @@ caps:
   categorymappings:
     - {id: "vo", cat: Movies, desc: "Films VO"}
     - {id: "vostfr", cat: Movies, desc: "Films VOSTFR"}
-    - {id: "dvdrip", cat: Movies, desc: "Films DVDRIP"}
-    - {id: "bdrip", cat: Movies, desc: "Films BDRIP"}
-    - {id: "webrip", cat: Movies, desc: "Films WEBRIP"}
-    - {id: "hdrip", cat: Movies, desc: "Films HDRIP"}
-    - {id: "dvdscreener", cat: Movies, desc: "Films DVD Screener"}
+    - {id: "dvdrip", cat: Movies/SD, desc: "Films DVDRip"}
+    - {id: "brrip", cat: Movies/SD, desc: "Films BRRip"}
+    - {id: "bdrip", cat: Movies/SD, desc: "Films BDRip"}
+    - {id: "webrip", cat: Movies/WEB-DL, desc: "Films WEBRip"}
+    - {id: "hdrip", cat: Movies/SD, desc: "Films HDRip"}
+    - {id: "dvdscreener", cat: Movies, desc: "Films DVDScreener"}
     - {id: "screener", cat: Movies, desc: "Films Screener"}
-    - {id: "hd2160p", cat: Movies, desc: "Films 2160p"}
-    - {id: "hd1080p", cat: Movies, desc: "Films 1080p"}
-    - {id: "hd720p", cat: Movies, desc: "Films 720p"}
-    - {id: "hd2160p-hdlight", cat: Movies, desc: "Films 2160p HD Light"}
-    - {id: "hd1080p-hdlight", cat: Movies, desc: "Films 1080p HD Light"}
-    - {id: "hd720p-hdlight", cat: Movies, desc: "Films 720p HD Light"}
-    - {id: "hd3d", cat: Movies, desc: "Films 3D"}
-    - {id: "serie-vostfr", cat: TV, desc: "Emission TV VOSTFR"}
-    - {id: "serie-vf", cat: TV, desc: "Emission TV VF"}
-    - {id: "pack-vf", cat: TV, desc: "Emission TV Pack VF"}
-    - {id: "pack-vostfr", cat: TV, desc: "Emission TV Pack VOSTFR"}
-    - {id: "pack-vo", cat: TV, desc: "Emission TV VO"}
-    - {id: "albums", cat: Audio, desc: "Audio"}
-    - {id: "jeux", cat: PC/Games, desc: "Jeu vidéo"}
-    - {id: "jeux-pc", cat: PC/Games, desc: "Jeu vidéo PC"}
-    - {id: "jeux-console", cat: PC/Games, desc: "Jeu vidéo Consoles"}
-    - {id: "logiciels", cat: PC, desc: "Application"}
-    - {id: "ebooks", cat: Books, desc: "eBook"}
+    - {id: "hd2160p", cat: Movies/UHD, desc: "Films 2160p"}
+    - {id: "hd1080p", cat: Movies/HD, desc: "Films 1080p"}
+    - {id: "hd720p", cat: Movies/HD, desc: "Films 720p"}
+    - {id: "hd2160p-hdlight", cat: Movies/UHD, desc: "Films 2160p HDLight"}
+    - {id: "hd1080p-hdlight", cat: Movies/HD, desc: "Films 1080p HDLight"}
+    - {id: "hd720p-hdlight", cat: Movies/HD, desc: "Films 720p HDLight"}
+    - {id: "hd3d", cat: Movies/3D, desc: "Films 3D"}
+    - {id: "serie-vostfr", cat: TV, desc: "TV VOSTFR"}
+    - {id: "serie-vf", cat: TV, desc: "TV VF"}
+    - {id: "pack-vf", cat: TV, desc: "TV Pack VF"}
+    - {id: "pack-vostfr", cat: TV, desc: "TV Pack VOSTFR"}
+    - {id: "pack-vo", cat: TV, desc: "TV Pack VO"}
+    - {id: "albums", cat: Audio, desc: "Albums"}
+    - {id: "jeux-pc", cat: PC/Games, desc: "Jeux PC"}
+    - {id: "jeux-console", cat: Console, desc: "Jeux Consoles"}
+    - {id: "logiciels", cat: PC/0day, desc: "Logiciels"}
+    - {id: "ebooks", cat: Books/EBook, desc: "eBooks"}
 
   modes:
     search: [q]
@@ -99,6 +99,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: flaresolverr
+    type: info
+    label: FlareSolverr
+    default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolver</a> to access it.
 
 search:
   paths:
@@ -107,6 +111,8 @@ search:
 
   rows:
     selector: div.t-details
+    filters:
+      - name: andmatch
 
   fields:
     category:
@@ -166,6 +172,8 @@ search:
       attribute: href
     size:
       selector: div.t-taille
+    date:
+      text: now
     seeders:
       text: 0
     seeders:

src/Jackett.Common/Definitions/movcr.yml

@@ -1,95 +0,0 @@
----
-id: movcr
-name: MovCr
-description: "MovCr is an Indian Public torrent site"
-language: en-us
-type: public
-encoding: UTF-8
-links:
-  - https://movcr.st/
-legacylinks:
-  - https://movcr.tv/
-  - https://movcr.black-mirror.xyz/
-  - https://movcr.unblocked.casa/
-  - https://movcr.proxyportal.fun/
-  - https://movcr.uk-unblock.xyz/
-  - https://movcr.ind-unblock.xyz/
-  - https://movcr.unblocked.bar/ # some torrent links are broken if 'movcr.to' is in its name
-  - https://movcr.proxyportal.pw/ # some torrent links are broken if 'movcr.to' is in its name
-  - https://movcr.uk-unblock.pro/ # some torrent links are broken if 'movcr.to' is in its name
-  - https://movcr.to/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About MovCr Categories
-    default: MovCr does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-
-download:
-  selector: a[href^="/torrents/"]
-  attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search/search.php?q={{ .Keywords }}{{ else }}/{{ end }}"
-
-  rows:
-    selector: tr:has(td.name a[href^="/download-"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      text: Other
-    title:
-      selector: td.name a:nth-child(2)
-    details:
-      selector: td.name a
-      attribute: href
-    download:
-      selector: td.name a
-      attribute: href
-    date:
-      selector: td.seeds:contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +05:30" # IST
-        - name: dateparse
-          args: "2006-01-02 -07:00"
-    date:
-      selector: td.seeds:not(:contains("-"))
-      optional: true
-      filters:
-        - name: timeago
-    size:
-      selector: td.leeches:not(:contains("B"))
-      optional: true
-      text: "0 B"
-    size:
-      selector: td.leeches:contains("B")
-      optional: true
-    seeders:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["/", 0]
-    leechers:
-      selector: td:nth-child(2)
-      filters:
-        - name: split
-          args: ["/", 1]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/movietorrent.yml

@@ -0,0 +1,112 @@
+---
+id: movietorrent
+name: MovieTorrent
+description: "MovieTorrent is a Public site for Bollywood, Hollywood, Hindi Dubbed, Tamil , Punjabi, Pakistani MOVIES"
+language: en-us
+type: public
+encoding: UTF-8
+links:
+  - https://movietorrent.co/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies, desc: "Bollywood"}
+    - {id: 2, cat: Movies/HD, desc: "1080p"}
+    - {id: 3, cat: Movies/HD, desc: "2016"}
+    - {id: 4, cat: Movies/HD, desc: "2017"}
+    - {id: 6, cat: Movies/HD, desc: "2018"}
+    - {id: 7, cat: Movies/HD, desc: "720p"}
+    - {id: 8, cat: Movies/HD, desc: "480p"}
+    - {id: 9, cat: Movies/HD, desc: "Action"}
+    - {id: 10, cat: Movies, desc: "Adventure"}
+    - {id: 11, cat: Movies, desc: "Animation"}
+    - {id: 14, cat: Movies, desc: "Comedy"}
+    - {id: 15, cat: Movies, desc: "Crime"}
+    - {id: 18, cat: Movies, desc: "Drama"}
+    - {id: 19, cat: Movies, desc: "Dubbed"}
+    - {id: 23, cat: Movies, desc: "Hindi"}
+    - {id: 26, cat: Movies, desc: "Hollywood"}
+    - {id: 27, cat: Movies, desc: "Horror"}
+    - {id: 32, cat: Movies, desc: "Pakistani"}
+    - {id: 35, cat: Movies, desc: "Punjabi"}
+    - {id: 36, cat: Movies, desc: "Religious"}
+    - {id: 38, cat: Movies, desc: "Romance"}
+    - {id: 42, cat: Movies, desc: "Sport"}
+    - {id: 44, cat: Movies, desc: "Superhero"}
+    - {id: 47, cat: Movies, desc: "Tamil Telugu"}
+    - {id: 48, cat: Movies, desc: "Thriller"}
+    - {id: 49, cat: Movies, desc: "Trending"}
+    - {id: 53, cat: Movies/WEB-DL, desc: "Web Series"}
+    - {id: 59, cat: Movies, desc: "2019"}
+    - {id: 5143, cat: Movies, desc: "2012"}
+    - {id: 5247, cat: Movies, desc: "2015"}
+    - {id: 8758, cat: Movies, desc: "2020"}
+    - {id: 8808, cat: Movies, desc: "2013"}
+    - {id: 8809, cat: Movies, desc: "2014"}
+    - {id: 9938, cat: Movies, desc: "Turkish Dramas"}
+    - {id: 10293, cat: Movies, desc: "2021"}
+
+  modes:
+    search: [q]
+    tv-search: [q]
+    movie-search: [q]
+
+settings: []
+
+download:
+  selector: a[href^="magnet:?xt="]
+  attribute: href
+  filters:
+    - name: append
+      args: "&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969&tr=udp%3A%2F%2Fp4p.arenabg.com%3A1337%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Fopen.demonii.si%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.pirateparty.gr%3A6969%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.cyberia.is%3A6969%2Fannounce&tr=udp%3A%2F%2F9.rarbg.to%3A2710%2Fannounce&tr=udp%3A%2F%2Fdenis.stalker.upeer.me%3A6969%2Fannounce"
+
+search:
+  paths:
+    - path: "?s={{ .Keywords }}"
+    - path: "/page/2/?s={{ .Keywords }}"
+    - path: "/page/3/?s={{ .Keywords }}"
+
+  rows:
+    selector: article:has(h2)
+    filters:
+      - name: andmatch
+
+  fields:
+    category:
+      selector: span.term-badge
+      attribute: class
+      filters:
+        - name: regexp
+          args: (\d+)
+    title:
+      selector: h2
+      filters:
+        - name: replace
+          args: ["Full Movie ", ""]
+        - name: replace
+          args: ["Torrent Magnet ", ""]
+        - name: replace
+          args: ["Download ", ""]
+    details:
+      selector: h2 > a
+      attribute: href
+    download:
+      selector: h2 > a
+      attribute: href
+    poster:
+      selector: a[data-src]
+      attribute: data-src
+    date:
+      selector: time
+      attribute: datetime
+    size:
+      text: "5 GB"
+    seeders:
+      text: 1
+    leechers:
+      text: 1
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine wordpress

src/Jackett.Common/Definitions/mvgroupforum.yml

@@ -96,7 +96,7 @@ settings:
     default: false
   - name: dropbbc
     type: checkbox
-    label: Drop "BBC " from the front of result titles
+    label: Drop BBC & other channels from the front of result titles
     default: false
   - name: stripS01E01
     type: checkbox
@@ -165,7 +165,35 @@ search:
       selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
       filters:
         - name: re_replace
-          args: ["^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
         - name: append
           args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
     details:

src/Jackett.Common/Definitions/mvgroupmain.yml

@@ -96,7 +96,7 @@ settings:
     default: false
   - name: dropbbc
     type: checkbox
-    label: Drop "BBC " from the front of result titles
+    label: Drop BBC & other channels from the front of result titles
     default: false
   - name: stripS01E01
     type: checkbox
@@ -165,7 +165,35 @@ search:
       selector: td.doubleindent, td.singleindent a[href^="/index.php?showtopic="]
       filters:
         - name: re_replace
-          args: ["^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+          args: ["(?i)^BBC (.*)", "{{ if .Config.dropbbc }}{{ else }}BBC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^PBS (.*)", "{{ if .Config.dropbbc }}{{ else }}PBS {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH5 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch5 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^CH4 (.*)", "{{ if .Config.dropbbc }}{{ else }}Ch4 {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DC (.*)", "{{ if .Config.dropbbc }}{{ else }}DC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^DW (.*)", "{{ if .Config.dropbbc }}{{ else }}DW {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HC (.*)", "{{ if .Config.dropbbc }}{{ else }}HC {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^RTE (.*)", "{{ if .Config.dropbbc }}{{ else }}RTE {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^ITV (.*)", "{{ if .Config.dropbbc }}{{ else }}ITV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^HBO (.*)", "{{ if .Config.dropbbc }}{{ else }}HBO {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NHK (.*)", "{{ if .Config.dropbbc }}{{ else }}NHK {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^UKTV (.*)", "{{ if .Config.dropbbc }}{{ else }}UKTV {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^NOVA (.*)", "{{ if .Config.dropbbc }}{{ else }}NOVA {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^TV5Monde (.*)", "{{ if .Config.dropbbc }}{{ else }}TV5Monde {{ end }}$1"]
+        - name: re_replace
+          args: ["(?i)^Al-Jazeera (.*)", "{{ if .Config.dropbbc }}{{ else }}Al-Jazeera {{ end }}$1"]
         - name: append
           args: "{{ if .Config.stripS01E01 }}{{ else }} S01E01{{ end }}"
     details:

src/Jackett.Common/Definitions/nethd.yml

@@ -1,7 +1,7 @@
 ---
 id: nethd
 name: NetHD
-description: "NetHD (VietTorrent) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
+description: "NetHD (VietTorrent) is a VIETNAMESE Semi-Private Torrent Tracker for HD MOVIES / TV"
 language: vi-vn
 type: semi-private
 encoding: UTF-8
@@ -120,33 +120,19 @@ search:
         - name: prepend
           args: "download.php?id="
     date:
-      # 2020-10-05<br/>14:43:24
-      selector: td:nth-child(5):contains("-")
-      optional: true
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
-    date:
-      # 2 days<br/>23 hours
-      selector: td:nth-child(5):not(:contains("-"))
-      optional: true
+      # 2 ngày<br/>23 giờ
+      selector: td:nth-child(5)
       filters:
         - name: re_replace
-          args: ["year|years", "years "]
+          args: ["năm", "years "]
         - name: re_replace
-          args: ["month|months", "months "]
+          args: ["tháng", "months "]
         - name: re_replace
-          args: ["week|weeks", "weeks "]
+          args: ["ngày", "days "]
         - name: re_replace
-          args: ["day|days", "days "]
+          args: ["phút", "minutes "]
         - name: re_replace
-          args: ["second|seconds", "seconds "]
-        - name: re_replace
-          args: ["minute|minutes", "minutes "]
-        - name: re_replace
-          args: ["hour|hours", "hours "]
+          args: ["giờ", "hours "]
         - name: timeago
     size:
       selector: td:nth-child(6)

src/Jackett.Common/Definitions/newretro.yml

@@ -17,6 +17,7 @@ caps:
     - {id: 104, cat: Movies/DVD, desc: "Filme - DVD-R"}
     - {id: 132, cat: Movies/DVD, desc: "Filme - HD2DVD"}
     - {id: 130, cat: Movies, desc: "Filme - Klassiker"}
+    - {id: 134, cat: Movies, desc: "Filme - SD/HD/UHD"}
     - {id: 105, cat: Movies, desc: "Filme - x264"}
     - {id: 106, cat: Movies, desc: "Filme - XviD / DivX"}
     - {id: 69, cat: XXX, desc: " XXX"}

src/Jackett.Common/Definitions/nitro.yml

@@ -23,7 +23,6 @@ caps:
     - {id: 9, cat: PC/Mobile-Other, desc: "GSM/PDA"}
     - {id: 10, cat: Other, desc: "Inne"}
     - {id: 11, cat: XXX, desc: "XXX"}
-    - {id: 144, cat: Other, desc: "Nieposortowane"}
 
   modes:
     search: [q]
@@ -75,11 +74,20 @@ search:
 
   fields:
     category:
-      selector: a[href^="/tags.php?tags="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: tags
+      selector: span.tag_list
+      case:
+        "a:contains(\"Seriale\")": 1
+        "a:contains(\"Filmy\")": 2
+        "a:contains(\"Muzyka\")": 3
+        "a:contains(\"Gry\")": 4
+        "a:contains(\"Anime\")": 5
+        "a:contains(\"Programy\")": 6
+        "a:contains(\"Książki\")": 7
+        "a:contains(\"Booki\")": 8
+        "a:contains(\"PDA\")": 9
+        "a:contains(\"Inne\")": 10
+        "a:contains(\"Nieposortowane\")": 10
+        "a:contains(\"XXX\")": 11
     title:
       selector: a[href^="/torrent/"]
     details:

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

@@ -501,6 +501,12 @@ caps:
     - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
     - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
     - {id: 324, cat: Audio, desc: "Electronic"}
+    - {id: 1327, cat: Audio, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
+    - {id: 1328, cat: Audio, desc: " |- Psybient, Psychill, Psydub"}
+    - {id: 1325, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
+    - {id: 1326, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge"}
+    - {id: 1323, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
+    - {id: 1324, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical"}
     - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
     - {id: 346, cat: Audio, desc: " |- Trance"}
     - {id: 1243, cat: Audio, desc: " |- Trance (Singles, EPs)"}
@@ -765,7 +771,7 @@ search:
     sha: 1
     ta: -1
     sns: -1
-    sds: -1
+    sds: 4 # only freeleech available for download without account
     nm: "{{ .Keywords }}"
     pn: ""
     submit: "Поиск"

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

@@ -507,6 +507,12 @@ caps:
     - {id: 1161, cat: Audio, desc: " |- Зарубежная поп-музыка (Lossless)"}
     - {id: 353, cat: Audio, desc: " |- Зарубежная поп-музыка"}
     - {id: 324, cat: Audio, desc: "Electronic"}
+    - {id: 1327, cat: Audio, desc: " |- Psybient, Psychill, Psydub (Lossless)"}
+    - {id: 1328, cat: Audio, desc: " |- Psybient, Psychill, Psydub"}
+    - {id: 1325, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge (Lossless)"}
+    - {id: 1326, cat: Audio, desc: " |- Downtempo, Trip-Hop, Lounge"}
+    - {id: 1323, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical (Lossless)"}
+    - {id: 1324, cat: Audio, desc: " |- Ambient, Experimental, Modern Classical"}
     - {id: 976, cat: Audio, desc: " |- Trance (Lossless)"}
     - {id: 346, cat: Audio, desc: " |- Trance"}
     - {id: 1243, cat: Audio, desc: " |- Trance (Singles, EPs)"}

src/Jackett.Common/Definitions/nordicplus.yml

@@ -1,27 +1,27 @@
 ---
-id: dxdhd
-name: DXDHD
-description: "DXDHD is a Private General Tracker"
-language: en-us
+id: nordicplus
+name: Nordic+
+description: "Nordic+ is a Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: en
 type: private
 encoding: UTF-8
 links:
-  - https://dxdhd.com/
+  - https://nordicplus.org/
 
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Movies"}
     - {id: 2, cat: TV, desc: "TV"}
     - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: TV/Anime, desc: "Anime-TV"}
-    - {id: 5, cat: PC/0day, desc: "Apps"}
-    - {id: 6, cat: Books/EBook, desc: "eBooks"}
-    - {id: 7, cat: PC/Games, desc: "Games"}
-    - {id: 8, cat: TV/Sport, desc: "Sports"}
-    - {id: 9, cat: Other, desc: "Others"}
-    - {id: 10, cat: XXX, desc: "XXX"}
-    - {id: 11, cat: Books/Comics, desc: "Comics"}
-    - {id: 12, cat: TV/Anime, desc: "Anime-Movie"}
+    - {id: 4, cat: Console, desc: "Games"}
+    - {id: 5, cat: PC, desc: "Apps"}
+    - {id: 6, cat: Books, desc: "Books"}
+    - {id: 11, cat: Movies/Other, desc: "Movies Boxset"}
+    - {id: 12, cat: Movies/Foreign, desc: "Movies Non Nordic"}
+    - {id: 13, cat: TV/Anime, desc: "Movies Kids"}
+    - {id: 14, cat: TV/Other, desc: "TV Boxset"}
+    - {id: 15, cat: TV/Foreign, desc: "TV Non Nordic"}
+    - {id: 16, cat: TV/Anime, desc: "TV Kids"}
 
   modes:
     search: [q]
@@ -37,6 +37,10 @@ settings:
   - name: password
     type: password
     label: Password
+  - name: usemagnet
+    type: checkbox
+    label: "Use Magnet Download Link"
+    default: false
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -44,7 +48,7 @@ settings:
   - name: sort
     type: select
     label: Sort requested from site
-    default: "created_at"
+    default: created_at
     options:
       created_at: created
       seeders: seeders
@@ -83,6 +87,7 @@ search:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
     description: ""
+    keywords: ""
     uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
@@ -109,23 +114,26 @@ search:
         - name: regexp
           args: "/categories/(\\d+)"
     title:
-      selector: a.view-torrent
-    download:
+      selector: a[href*="/torrents/"]
+    details:
+      selector: a[href*="/torrents/"]
+      attribute: href
+    download1:
       selector: a[href*="/download/"]
       attribute: href
-    details:
-      selector: a.view-torrent
+    download2:
+      selector: a[href^="magnet:?"]
       attribute: href
+    download:
+      text: "{{ if .Config.usemagnet }}{{ .Result.download2 }}{{ else }}{{ .Result.download1 }}{{ end }}"
     poster:
       selector: div.torrent-poster img
       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", ""]
+          args: ["&w=60&h=90", "&w=180&h=270"] # for display on dashboard
+        - name: replace
+          args: ["/img/NoPoster.png", ""]
     size:
       selector: td:nth-last-child(4)
     seeders:
@@ -199,8 +207,5 @@ search:
         i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
         "*": 1
     minimumratio:
-      text: 0.5
-    minimumseedtime:
-      # 3 days (as seconds = 3 x 24 x 60 x 60)
-      text: 259200
-# UNIT3D 2.3.0
+      text: 0.4
+# UNIT3D 5.2.0