cardigann: check for page size

https://github.com/Prowlarr/Indexers/pull/338

.editorconfig

@@ -75,7 +75,7 @@ indent_size=2
 
 # JavaScript/HTML
 [*.{js,ts,json,html,cshtml}]
-indent_size=2
+indent_size=4
 
 # Code files
 [*.{cs,csx,vb,vbx}]
@@ -220,7 +220,7 @@ csharp_style_var_when_type_is_apparent=true:suggestion
 csharp_style_var_elsewhere=true:suggestion
 # Expression-bodied members
 csharp_style_expression_bodied_methods=when_on_single_line:suggestion
-csharp_style_expression_bodied_constructors=when_on_single_line:suggestion
+csharp_style_expression_bodied_constructors=false:suggestion
 csharp_style_expression_bodied_operators=when_on_single_line:suggestion
 csharp_style_expression_bodied_properties=true:suggestion
 csharp_style_expression_bodied_indexers=true:suggestion
@@ -237,7 +237,7 @@ csharp_style_conditional_delegate_call=true:warning
 # Modifier preferences
 csharp_preferred_modifier_order=public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
 # Expression-level preferences
-csharp_prefer_braces=false:suggestion
+csharp_prefer_braces=true:suggestion
 csharp_style_deconstructed_variable_declaration=true:suggestion
 csharp_prefer_simple_default_expression=true:warning
 csharp_style_pattern_local_over_anonymous_function=true:suggestion

.github/workflows/codeql-analysis.yml

@@ -18,6 +18,7 @@ on:
       - src/**/*.cs
       - src/**/*.js
       - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.Common/Models/IndexerConfig/**'
       - '!src/Jackett.IntegrationTests/**'
       - '!src/Jackett.Test/**'
   pull_request:
@@ -27,6 +28,7 @@ on:
       - src/**/*.cs
       - src/**/*.js
       - '!src/Jackett.Common/Indexers/**'
+      - '!src/Jackett.Common/Models/IndexerConfig/**'
       - '!src/Jackett.IntegrationTests/**'
       - '!src/Jackett.Test/**'
   schedule:

.github/workflows/winget.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: windows-latest
     steps:
-      - uses: vedantmgoyal2009/winget-releaser@v1
+      - uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: Jackett.Jackett
           token: ${{ secrets.WINGET }}

CONTRIBUTING.md

@@ -33,19 +33,13 @@ Before you submit a bug-report or do any other troubleshooting, make sure your J
 We are releasing bug fixes almost daily, so your issue may have been fixed already.
 Bugs that are submitted without being on the latest version may be closed.
 
-**Error "An error occurred while sending the request: Error: TrustFailure (A call to SSPI failed, see inner exception.)"**
-
-  This is often caused by missing CA certificates.
-  Try reimporting the certificates in this case:
-   - On Linux (as user root): `wget -O - https://curl.haxx.se/ca/cacert.pem | cert-sync /dev/stdin`
-   - On macOS: `curl -sS https://curl.haxx.se/ca/cacert.pem | cert-sync --user /dev/stdin`
-
 **Tracker isn't working**
 
 If you are experiencing an issue with a tracker, then:
 - Use your browser to check you can access the site directly, and if a login is required,
     check you can login and that you do not have any outstanding account issues.
 - If you haven't already, try upgrading to the latest version of Jackett.
+- Check our [Troubleshooting wiki](https://github.com/Jackett/Jackett/wiki/Troubleshooting) for common issues.
 - If it is still not working for you, then a **full enhanced log must be included**.
 
 **Enable enhanced logging**
@@ -68,9 +62,9 @@ Your issue should have the following information.
 - **Descriptive Title** - The title of your bug should include keywords and a descriptive summary of what you're experiencing
     to help others avoid duplicating your bug report
   - Keywords in the title should be as follows:
-    - Tracker bugs should start with the tracker in brackets e.g. [**AnimeBytes**]
-    - Feature requests should start with [**REQ**]
-    - New trackers should begin with [**New**] and the tracker type [**Public**/**Private**/**Semi-Private**] e.g. **[New][Public] ThePirateBay**
+    - Indexer bugs should start with the indexer ID in brackets e.g. **[thepiratebay]**
+    - Feature requests should start with **[req]**
+    - Indexers requests should start with **[req]** and the name of the tracker e.g. **[req] ThePirateBay**
 - **Environment Details** - These are things like your OS version, Jackett type and version, mono/.Net-core/framework version(s).
     These are asked for by the issue template when you create a new issue on GitHub.
 - **Steps** to cause the problem, if applicable. These should be specific and repeatable.
@@ -112,15 +106,15 @@ If you use something else, please add it here for others.
 <details open=true> <summary> Visual Studio 2022 </summary>
 
 - Install [Visual Studio Community 2022](https://visualstudio.microsoft.com/vs/) for free.
-  - About 2GB download. 8GB installed.
+  - About 2GB download, 8GB installed.
   -  Make sure it includes the following Workload and Individual Components:
      -  .NET desktop development
-     -  .Net Framework 4.6.1 SDK
-     -  .Net Framework 4.6.1 targeting pack
+     -  .Net Framework 4.6.2 SDK
+     -  .Net Framework 4.6.2 targeting pack
 - From the `Get Started` screen:
   - `Clone a repository -> Browse a repository -> GitHub -> Sign in -> clone your forked repository`
 - Double-click `Jackett.sln` in `Solution Explorer` to load your project
-- Ensure `Jackett.Server` is the Startup Project (instead of `Jackett.Service`) and the Run Target (instead of `IIS Express`)
+- Ensure `Jackett.Server` is the Startup Project and the Run Target (instead of `Jackett.Service`)
 - Open `Tools -> NuGet Package Manager -> Package Manager Console`
 - From the PMC, with `Jackett.Service` as the default project, run:
   - `dotnet tool install -g dotnet-format`

README.md

@@ -14,7 +14,7 @@ Please see our [troubleshooting and contributing guidelines](CONTRIBUTING.md) be
 
 Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar3](https://github.com/mylar3/mylar3), [Lidarr](https://github.com/lidarr/lidarr), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), [qBittorrent](https://www.qbittorrent.org/), [Nefarious](https://github.com/lardbit/nefarious) etc.) into tracker-site-specific http queries, parses the html or json response, and then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
 
-Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with hybrid [nZEDb](https://github.com/nZEDb/nZEDb/blob/b485fa326a0ff1f47ce144164eb1f070e406b555/resources/db/schema/data/10-categories.tsv)/[Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) [category numbering](https://github.com/Jackett/Jackett/wiki/Jackett-Categories)) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
+Developer note: The software implements the [Torznab](https://web.archive.org/web/20220517013745/https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with hybrid [nZEDb](https://github.com/nZEDb/nZEDb/blob/b485fa326a0ff1f47ce144164eb1f070e406b555/resources/db/schema/data/10-categories.tsv)/[Newznab](https://newznab.readthedocs.io/en/latest/misc/api/#predefined-categories) [category numbering](https://github.com/Jackett/Jackett/wiki/Jackett-Categories)) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs.
 
 A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](https://github.com/webtor-io/go-jackett)
 
@@ -31,7 +31,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ACGsou (36DM)
  * Anidex
  * AniLibria
- * AnimeClipse
  * Anime Tosho
  * AniRena
  * AniSource
@@ -42,13 +41,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BitRu
  * BitSearch
  * BT.etree
- * BT4G
  * BTDIGG
  * BTMET
  * BTSOW
  * BullTorrent
  * Byrutor
- * CloudTorrents
+ * Cinecalidad
  * comicat
  * ConCen
  * cpasbien
@@ -57,9 +55,9 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Demonoid
  * DivxTotal
  * dmhy
- * Dodder (菟丝子资源社区)
  * DonTorrent
  * E-Hentai
+ * EBook Bay (EBB)
  * EpubLibre
  * EXT Torrents
  * ExtraTorrent.st
@@ -68,14 +66,11 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FireBit
  * freshMeat
  * Frozen Layer
- * FTUApps
  * GamesTorrents
  * GkTorrent
  * GloDLS
  * GTorrent.pro
- * IBit
  * Idope
- * Il CorSaRo Blu
  * Il Corsaro Nero
  * Internet Archive (archive.org)
  * Isohunt2
@@ -84,7 +79,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * kickasstorrents.to
  * kickasstorrents.ws
  * Knaben
- * Legit Torrents
  * LePorno.info
  * LimeTorrents
  * LimeTorrents clone
@@ -98,6 +92,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MoviesDVDR
  * MovieTorrent
  * MyPornClub
+ * NextJAV
  * Newstudio
  * Nipponsei
  * NNTT
@@ -107,21 +102,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * ParnuXi
  * PC-torrent
  * PiratBit
- * Pornforall
- * PornLeech
  * PornosLab
  * PornoTorrent
- * Portugas
  * ProPorn
  * Rapidzona
  * RARBG
- * RinTor
  * RinTorNeT
- * Rus-media
  * RuTor
  * RuTracker.RU
  * Seedoff
- * seleZen
  * Sexy-Pics
  * Shana Project
  * ShowRSS
@@ -133,22 +122,20 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Tokyo Tosho
  * Torlock
  * Torrent[CORE]
- * Torrent Downloads (TD)
  * Torrent Oyun indir
  * torrent.by
  * torrent-pirat
  * Torrent9
  * Torrent9 clone
  * Torrent911
- * TorrentDownload
  * TorrentFunk
+ * TorrentDownloads
  * TorrentGalaxy (TGx)
  * TorrentKitty
  * TorrentProject2
  * TorrentQQ (토렌트큐큐)
  * Torrents.csv
  * TorrentSir (토렌트썰)
- * Torrentv
  * TorrentView (토렌트뷰)
  * TorrentWhiz ( 토렌트위즈)
  * Torrentz2eu
@@ -159,6 +146,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * VSTHouse
  * VST Torrents
  * xxxAdultTorrent
+ * XXXClub
  * xxxtor
  * xxxtorrents
  * YourBittorrent
@@ -168,7 +156,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
 
 <details> <summary> <b> Supported Semi-Private Trackers </b> </summary>
 
- * 720pier
  * AniDUB
  * Anime-Free
  * AnimeLayer
@@ -179,10 +166,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Catorrent
  * Darmowe torrenty
  * Deildu
+ * Demonoid
+ * Devil-Torrents
  * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
+ * Electro-Torrent
+ * EliteTorrent-pl
  * EniaHD
  * Erai-Raws
+ * Ex-torrenty
  * ExKinoRay
  * ExtremlymTorrents
  * Fenyarnyek-Tracker
@@ -191,37 +183,47 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Genesis-Movement
  * HD-CzTorrent
  * HDGalaKtik
+ * HellTorrents
  * HunTorrent
+ * Il CorSaRo Blu
  * Kinorun
  * Kinozal
+ * Lightning-Tor
  * LostFilm.tv
  * Magnetico (Local DHT) [[site](https://github.com/boramalper/magnetico)]
  * Marine Tracker
  * Mazepa
  * Metal Tracker
- * MuziekFrabriek
+ * Moviesite
  * MVGroup Forum
  * MVGroup Main
  * NetHD (VietTorrent)
+ * Newstudio (login)
+ * NoNaMe Club (NNM-Club) (login)
+ * PiratBit (login)
  * PornoLab
  * PussyTorrents
  * Rainbow Tracker
  * RGFootball
+ * RinTor
  * RiperAM
  * RockBox
  * RUDUB (ex-BaibaKoTV)
  * Rustorka
  * RuTracker
  * SATClubbing
+ * seleZen
  * Sharewood
  * SkTorrent
  * SkTorrent-org
  * themixingbowl (TMB)
  * Toloka.to
- * Torrent-Explosiv
  * Torrents-Local
+ * TorrentDownload
  * TribalMixes
  * Union Fansub
+ * UniOtaku
+ * vTorrent
  * xTorrenty
  * YggTorrent (YGG)
  * ZOMB
@@ -233,14 +235,15 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * 0day.kiev
  * 1ptbar
  * 2 Fast 4 You [![(invite needed)][inviteneeded]](#)
+ * 2xFree
  * 3ChangTrai (3CT) [![(invite needed)][inviteneeded]](#)
  * 3D Torrents (3DT)
- * 3Evils
  * 4thD (4th Dimension)
  * 52PT
+ * 720pier
  * Abnormal
  * ABtorrents (ABT + RNS)
- * Acervos
+ * Acervos [![(invite needed)][inviteneeded]](#)
  * Acid Lounge (A-L)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
@@ -249,12 +252,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * AlphaRatio (AR)
  * AmigosShareClub
  * AnimeBytes (AB)
+ * AnimeTorrents (AnT)
  * AnimeTracker
- * AnimeTorrents (AnT) [![(invite needed)][inviteneeded]](#)
  * AnimeWorld
  * Anthelion
  * Araba Fenice (Phoenix) [![(invite needed)][inviteneeded]](#)
  * ArabP2P
+ * ArabTorrents [![(invite needed)][inviteneeded]](#)
  * aro.lol
  * AsianCinema
  * AsianDVDClub
@@ -302,7 +306,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CGPeers [![(invite needed)][inviteneeded]](#)
  * CHDBits [![(invite needed)][inviteneeded]](#)
  * ChileBT
- * Cinecalidad
  * Cinemageddon [![(invite needed)][inviteneeded]](#)
  * CinemaMovieS_ZT
  * Cinematik [![(invite needed)][inviteneeded]](#)
@@ -314,12 +317,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * CrazySpirits
  * CrnaBerza
  * DANISH BYTES
- * Darius Tracker
  * Dark-Shadow
  * DataScene (DS)
  * DataTalli
  * DesiTorrents
  * Diablo Torrent [![(invite needed)][inviteneeded]](#)
+ * DICMusic
  * DigitalCore
  * DiscFan
  * DivTeam
@@ -344,17 +347,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FunFile (FF)
  * FunkyTorrents (FT)
  * Fuzer (FZ)
+ * GainBound [![(invite needed)][inviteneeded]](#)
  * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
  * Generation-Free
- * GFXPeers
  * GigaTorrents
  * GimmePeers (formerly ILT)
  * GiroTorrent
  * GreatPosterWall (GPW)
  * GreekDiamond
- * Greek Team
+ * Greek Team [![(invite needed)][inviteneeded]](#)
  * HaiDan
  * Haitang
  * HappyFappy
@@ -364,18 +367,17 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HD-Olimpo
  * HD-Only (HDO) [![(invite needed)][inviteneeded]](#)
  * HD-Space (HDS)
- * HD-Spain [![(invite needed)][inviteneeded]](#)
  * HD-Torrents (HDT)
  * HD-UNiT3D
  * HD4FANS [![(invite needed)][inviteneeded]](#)
- * HDAI
  * HDArea (HDA)
  * HDAtmos
  * HDBits [![(invite needed)][inviteneeded]](#)
+ * HDC (HDCiTY) [![(invite needed)][inviteneeded]](#)
  * HDChina (HDWing) [![(invite needed)][inviteneeded]](#)
- * HDCity [![(invite needed)][inviteneeded]](#)
  * HDFans
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
+ * HDMaYi
  * HDMonkey
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
@@ -383,34 +385,36 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDTorrents.it [![(invite needed)][inviteneeded]](#)
  * HDTurk
  * HDU
+ * HDVIDEO
  * HDZone
  * Hebits
- * HellasHut
  * HHanClub
- * HQMusic
  * House of Devil
- * iHDBits
+ * HQMusic
+ * iAnon
+ * ICC2022
  * ImmortalSeed (iS)
  * Immortuos
  * Indietorrents [![(invite needed)][inviteneeded]](#)
  * Insane Tracker
  * IPTorrents (IPT)
+ * ItaTorrents
  * JME-REUNIT3D
  * JoyHD [![(invite needed)][inviteneeded]](#)
  * JPopsuki
  * JPTV
+ * KamePT [![(invite needed)][inviteneeded]](#)
  * Karagarga
  * Keep Friends [![(invite needed)][inviteneeded]](#)
  * Korsar
  * KrazyZone
  * Kufirc
  * LastFiles
- * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
- * LearnBits [![(invite needed)][inviteneeded]](#)
- * LearnFlakes [![(invite needed)][inviteneeded]](#)
+ * Lat-Team [![(invite needed)][inviteneeded]](#)
+ * LearnBits
+ * LearnFlakes
  * leech24
- * LegacyHD (HD4Free)
  * LemonHD
  * Les-Cinephiles
  * Libble
@@ -431,20 +435,24 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MMA-Torrents [![(invite needed)][inviteneeded]](#)
  * MNV (Max-New-Vision)
  * MOJBLiNK
+ * MonikaDesign (MDU) [![(invite needed)][inviteneeded]](#)
  * MoreThanTV (MTV)
  * MouseBits
  * Movie-Torrentz
- * Moviesite
+ * MuziekFabriek
  * MyAnonamouse (MAM)
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
+ * NicePT
  * NorBits
+ * NORDiCHD
+ * Ntelogo
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
- * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
+ * OurBits (HDPter)
  * P2PBG
  * Partis
  * PassThePopcorn (PTP)
@@ -452,12 +460,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Peers.FM
  * PigNetwork
  * PirateTheNet (PTN)
- * Pixelados
  * PixelCove (Ultimate Gamer)
  * PiXELHD (PxHD) [![(invite needed)][inviteneeded]](#)
  * PolishSource (PS)
  * PolishTracker
  * Pornbay [![(invite needed)][inviteneeded]](#)
+ * Portugas
  * PotUK
  * Pretome
  * PrivateHD (PHD)
@@ -466,19 +474,21 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PTerClub
  * PTFiles (PTF)
  * PThome [![(invite needed)][inviteneeded]](#)
- * PTMSG
  * PTSBAO
  * PTtime
  * Punk's Horror Tracker
  * PuntoTorrent
  * PuTao
+ * Puur-Hollands
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
  * Racing4Everyone (R4E)
  * RacingForMe (RFM)
+ * RareShare2
  * Red Star Torrent (RST) [![(invite needed)][inviteneeded]](#)
  * Redacted (PassTheHeadphones)
  * RedBits
+ * ReelFlix
  * Resurrect The Net
  * RetroFlix
  * RevolutionTT
@@ -491,10 +501,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Secret Cinema
  * SeedFile
  * Shareisland
+ * SharkPT
  * Shazbat [![(invite needed)][inviteneeded]](#)
  * SiamBIT
  * SkipTheCommercials
  * SkipTheTrailers
+ * slosoul
  * SnowPT (SSPT)
  * SoulVoice
  * SpeedApp (SceneFZ, XtreMeZone / MYXZ, ICE Torrent)
@@ -528,16 +540,18 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * The Vault [![(invite needed)][inviteneeded]](#)
  * The-Crazy-Ones
  * The-New-Fun
+ * TheDarkCommunity (TDC)
  * TheEmpire (TE)
  * TheLeachZone (TLZ)
  * TheScenePlace (TSP)
+ * Thor's Land
  * TJUPT
  * TLFBits [![(invite needed)][inviteneeded]](#)
  * TmGHuB
  * Tornado
  * Torrent Network (TN)
  * Torrent Sector Crew (TSC)
- * Torrent Surf
+ * Torrent-Explosiv
  * Torrent-Syndikat [![(invite needed)][inviteneeded]](#)
  * TOrrent-tuRK (TORK)
  * Torrent.LT
@@ -562,19 +576,22 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * TV Chaos UK (TVCUK)
  * TvRoad
  * TVstore
- * Twilight Torrents
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
+ * UBits
  * UHDBits
+ * UltraHD
  * UnionGang
+ * UnleashTheCartoons
  * UnlimitZ
+ * Uploads
  * White Angel
- * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)
  * World-of-Tomorrow
  * x-ite.me (XM)
  * xBytesV2
  * XSpeeds (XS)
  * Xthor
+ * XtremeBytes
  * XWT-Classics
  * XWTorrents (XWT)
  * YDYPT
@@ -628,6 +645,39 @@ The "filter" indexer at `/api/v2.0/indexers/tag:group1,!type:private+lang:en/res
 Example 2:
 The "filter" indexer at `/api/v2.0/indexers/!status:failing,test:passed` will query all the configured indexers not `failing` or which `passed` its last test.
 
+### Search modes and parameters
+
+A list of supported API search modes and parameters:
+
+```
+t=search:
+   params  : q
+t=tvsearch:
+   params  : q, season, ep, imdbid, tvdbid, rid, tmdbid, tvmazeid, traktid, doubanid, year, genre
+t=movie:
+   params  : q, imdbid, tmdbid, traktid, doubanid, year, genre
+t=music:
+   params  : q, album, artist, label, track, year, genre
+t=book:
+   params  : q, title, author, publisher, year, genre
+```
+
+Examples:
+
+```
+.../api?apikey=APIKEY&t=search&cat=1,3&q=Show+Title+S01E02
+
+.../api?apikey=APIKEY&t=tvsearch&cat=1,3&q=Show+Title&season=1&ep=2
+.../api?apikey=APIKEY&t=tvsearch&cat=1,3&genre=comedy&season=2023&ep=02/13
+
+.../api?apikey=APIKEY&t=movie&cat=2&q=Movie+Title&year=2023
+.../api?apikey=APIKEY&t=movie&cat=2&imdbid=tt1234567
+
+.../api?apikey=APIKEY&t=music&cat=4&album=Title&artist=Name
+
+.../api?apikey=APIKEY&t=book&cat=5,6&genre=horror&publisher=Stuff
+```
+
 ## Installation on Windows
 We recommend you install Jackett as a Windows service using the supplied installer. You may also download the zipped version if you would like to configure everything manually.
 

azure-pipelines.yml

@@ -7,7 +7,7 @@ variables:
   jackettVersion: $(majorVersion).$(minorVersion).$(patchVersion)
   buildConfiguration: Release
   netCoreFramework: net6.0
-  netCoreSdkVersion: 6.0.403 # #13806 & dotnet/runtime#79796
+  netCoreSdkVersion: 6.0.x
   # system.debug: true
 
 trigger:
@@ -385,7 +385,7 @@ stages:
                 npm install -g ajv-cli-servarr ajv-formats
                 # set fail as false
                 fail=0
-                ajv test -d "src/Jackett.Common/Definitions/*.yml" -s "src/Jackett.Common/Definitions/schema.json" --valid --all-errors -c ajv-formats
+                ajv test -d "src/Jackett.Common/Definitions/*.yml" -s "src/Jackett.Common/Definitions/schema.json" --valid --all-errors -c ajv-formats --spec=draft2019
                 if [ "$?" -ne 0 ]; then
                     fail=1
                 fi

src/Jackett.Common/Content/custom.js

@@ -72,11 +72,6 @@ function getHashArgs() {
     }, prev), {});
 }
 
-function insertWordWrap(str) {
-    // insert optional word wrap after punctuation to avoid overflows on long scene titles
-    return str.replace(/([\.\-_\/\\])/g, "$1\u200B");
-}
-
 function type_filter(indexer) {
   return indexer.type == this.value;
 }
@@ -322,8 +317,8 @@ function displayUnconfiguredIndexersList() {
     indexersTable.find('.indexer-setup').each(function (i, btn) {
         var indexer = unconfiguredIndexers[i];
         $(btn).click(function () {
-            $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
-                displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description);
+            $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function () {
+                displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.site_link, indexer.alternativesitelinks, indexer.description);
             });
         });
     });
@@ -660,7 +655,7 @@ function prepareSetupButtons(element) {
         var indexer = configuredIndexers.find(i => i.id === id);
         if (indexer)
           $btn.click(function () {
-              displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.link, indexer.alternativesitelinks, indexer.description);
+              displayIndexerSetup(indexer.id, indexer.name, indexer.caps, indexer.site_link, indexer.alternativesitelinks, indexer.description);
           });
     });
 }
@@ -1155,12 +1150,6 @@ function showSearch(selectedFilter, selectedIndexer, query, category) {
 
         var trackerId = filterId || "all";
         api.resultsForIndexer(trackerId, queryObj, function (data) {
-            for (var i = 0; i < data.Results.length; i++) {
-                var item = data.Results[i];
-                item.Title = insertWordWrap(item.Title);
-                item.CategoryDesc = insertWordWrap(item.CategoryDesc);
-            }
-
             $('#jackett-search-perform').html($('#search-button-ready').html());
             var searchResults = $('#searchResults');
             searchResults.empty();
@@ -1307,7 +1296,7 @@ $.fn.dataTable.ext.search = [
 ];
 
 function updateSearchResultTable(element, results) {
-    var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
+    var resultsTemplate = Handlebars.compile($("#jackett-search-results").text());
     element.html($(resultsTemplate(results)));
     element.find('tr.jackett-search-results-row').each(function () {
         updateReleasesRow(this);
@@ -1504,11 +1493,6 @@ function bindUIButtons() {
 
     $("#jackett-show-releases").click(function () {
         api.getServerCache(function (data) {
-            for (var i = 0; i < data.length; i++) {
-                var item = data[i];
-                item.Title = insertWordWrap(item.Title);
-                item.CategoryDesc = insertWordWrap(item.CategoryDesc);
-            }
             var releaseTemplate = Handlebars.compile($("#jackett-releases").html());
             var item = {
                 releases: data,

src/Jackett.Common/Content/index.html

@@ -465,11 +465,11 @@
                                     <td class="fit">{{jacketTimespan PublishDate}}</td>
                                     <td class="fit">{{jacketTimespan FirstSeen}}</td>
                                     <td class="fit">{{Tracker}}</td>
-                                    <td class="Title"><a href="{{Details}}">{{Title}}</a> <span class="release-labels"></span></td>
+                                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
                                     <td class="fit">{{Size}}</td>
                                     <td class="fit">{{jacketSize Size}}</td>
                                     <td class="fit">{{Files}}</td>
-                                    <td class="fit Cat">{{CategoryDesc}}</td>
+                                    <td class="fit Cat" style="word-break: break-all">{{CategoryDesc}}</td>
                                     <td class="fit">{{Grabs}}</td>
                                     <td class="fit">{{Seeders}}</td>
                                     <td class="fit">{{Peers}}</td>
@@ -570,39 +570,39 @@
         <table id="jackett-search-results-datatable" class="dataTable compact cell-border hover stripe">
             <thead>
                 <tr>
-                    <th>Published</th>
-                    <th>Published</th>
-                    <th>Tracker</th>
+                    <th class="text-center">Published</th>
+                    <th class="text-center">Published</th>
+                    <th class="text-center">Tracker</th>
                     <th>Name</th>
-                    <th>Size</th>
-                    <th>Size</th>
-                    <th title="Files">F</th>
-                    <th>Category</th>
-                    <th title="Grabs">G</th>
-                    <th title="Seeders">S</th>
-                    <th title="Leechers">L</th>
-                    <th title="DownloadVolumeFactor" class="fit">DLF</th>
-                    <th title="UploadVolumeFactor" class="fit">ULF</th>
-                    <th title="Download">DL</th>
+                    <th class="text-center">Size</th>
+                    <th class="text-center">Size</th>
+                    <th class="text-center" title="Files">F</th>
+                    <th class="text-center">Category</th>
+                    <th class="text-center" title="Grabs">G</th>
+                    <th class="text-center" title="Seeders">S</th>
+                    <th class="text-center" title="Leechers">L</th>
+                    <th class="text-center fit" title="DownloadVolumeFactor">DLF</th>
+                    <th class="text-center fit" title="UploadVolumeFactor">ULF</th>
+                    <th class="text-center" title="Download">DL</th>
                 </tr>
             </thead>
             <tbody>
                 {{#each Results}}
                 <tr class="jackett-search-results-row" data-imdb="{{Imdb}}" data-tmdb="{{TMDb}}" data-tvdb="{{TVDBId}}" data-tvmaze="{{TVMazeId}}" data-trakt="{{TraktId}}" data-douban="{{DoubanId}}" data-poster="{{Poster}}" data-description="{{Description}}">
-                    <td>{{PublishDate}}</td>
-                    <td>{{jacketTimespan PublishDate}}</td>
-                    <td>{{Tracker}}</td>
-                    <td class="Title"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
-                    <td>{{Size}}</td>
-                    <td class="fit">{{jacketSize Size}}</td>
-                    <td>{{Files}}</td>
-                    <td class="Cat">{{CategoryDesc}}</td>
-                    <td>{{Grabs}}</td>
-                    <td>{{Seeders}}</td>
-                    <td>{{Peers}}</td>
-                    <td class="DownloadVolumeFactor">{{DownloadVolumeFactor}}</td>
-                    <td class="UploadVolumeFactor">{{UploadVolumeFactor}}</td>
-                    <td class="downloadcolumn">
+                    <td class="text-center">{{PublishDate}}</td>
+                    <td class="text-center" title="{{dateFormat PublishDate format="YYYY-MM-DD HH:mm:ss Z"}}">{{jacketTimespan PublishDate}}</td>
+                    <td class="text-center">{{Tracker}}</td>
+                    <td class="Title" style="word-break: break-all"><a href="{{Details}}" target="_blank">{{Title}}</a> <span class="release-labels"></span></td>
+                    <td class="text-right">{{Size}}</td>
+                    <td class="text-right fit">{{jacketSize Size}}</td>
+                    <td class="text-center">{{Files}}</td>
+                    <td class="text-center Cat" style="word-break: break-all">{{CategoryDesc}}</td>
+                    <td class="text-center">{{Grabs}}</td>
+                    <td class="text-center">{{Seeders}}</td>
+                    <td class="text-center">{{Peers}}</td>
+                    <td class="text-center DownloadVolumeFactor">{{DownloadVolumeFactor}}</td>
+                    <td class="text-center UploadVolumeFactor">{{UploadVolumeFactor}}</td>
+                    <td class="text-center downloadcolumn">
                         {{#if Link}}
                         <a class="downloadlink" title="Download locally" href="{{Link}}"><i class="fa fa-download"></i></a>
                         {{/if}}
@@ -700,7 +700,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                        <h4 class="modal-title">{{title}} - <a target="_blank" href="{{link}}">{{link}}</a></h4>
+                        <h4 class="modal-title">{{title}} - <a target="_blank" href="{{link}}" rel="noreferrer">{{link}}</a></h4>
                         {{#if description}}
                         <div class="alert alert-info">{{description}}</div>
                         {{/if}}
@@ -756,6 +756,6 @@
     </script>
 
     <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
-    <script type="text/javascript" src="../custom.js?changed=2023010701"></script>
+    <script type="text/javascript" src="../custom.js?changed=2023041901"></script>
 </body>
 </html>

src/Jackett.Common/Definitions/0daykiev.yml

@@ -47,9 +47,9 @@ settings:
   - name: password
     type: password
     label: Password
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
     default: true
   - name: freeleech
     type: checkbox
@@ -91,13 +91,6 @@ search:
   paths:
     # https://tracker.0day.kiev.ua/browse.php?c10=1&c27=1&search=endgame&incldead=1&where=0
     - path: browse.php
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace # S01 to Cезон 1
-      args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
-    - name: re_replace # S01E01 to Сезон 1 Серии 1
-      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
@@ -108,8 +101,19 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: diacritics
+      args: replace
+    - name: re_replace # S01 to Cезон 1
+      args: ["(?i)\\bS0*(\\d+)\\b", "езон $1"]
+    - name: re_replace # E01 to Серии 1
+      args: ["(?i)\\bE0*(\\d+)\\b", "ерии $1"]
+    - name: re_replace # S01E01 to Сезон 1 Серии 1
+      args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "езон $1 ерии $2"]
+
   rows:
     selector: table > tbody > tr.rowtorrentinfo
+
   fields:
     category:
       selector: a[href^="browse.php?cat="]
@@ -123,22 +127,28 @@ search:
         # normalize to SXXEYY format
         - name: re_replace
           args: ["[\\:\\-\\/\\|]", " "]
-        - name: replace
-          args: ["Кураж Бамбей", "kurazh"]
-        - name: replace
-          args: ["Кубик в Кубе", "Kubik"]
-        - name: replace
-          args: ["Кравец", "Kravec"]
         - name: re_replace
-          args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)\\s+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+          args: ["(?i)\\bКураж Бамбей\\b", "kurazh"]
         - name: re_replace
-          args: ["(.*)\\([CСcс]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)\\bКубик в Кубе\\b", "Kubik"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
+          args: ["(?i)\\bКравец\\b", "Kravec"]
+        - name: re_replace
+          args: ["(?i)(.*)\\([CС]езон\\s+(\\d+)\\)\\s+[CС]ери[ия]\\s+(\\d+)\\s+(\\d+)(.*)", "$1 S$2E$3-$4 rus $5"]
+        - name: re_replace
+          args: ["(?i)(.*)\\([CС]езон\\s+(\\d+)\\)(.*)", "$1 S$2 rus $3"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV\\s?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT\\s?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\s?DL\\s?Rip\\b", "WEBDL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB Rip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB DL\\b", "WEBDL"]
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -151,7 +161,7 @@ search:
         - name: append
           args: " +03:00" # MSK
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     size:
       selector: td:nth-child(4)
       filters:
@@ -184,4 +194,6 @@ search:
       text: 1
     minimumratio:
       text: 0.2
+    description:
+      selector: a[href^="details.php?id="]
 # engine n/a

src/Jackett.Common/Definitions/0magnet.yml

@@ -6,6 +6,10 @@ language: en-US
 type: public
 encoding: UTF-8
 links:
+  - https://0magnet.co/
+  - https://13mag.net/
+  - https://16mag.net/
+legacylinks:
   - https://0magnet.com/
   - https://9mag.net/
 

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

@@ -13,15 +13,11 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.ink/
-  - https://1337x.nocensor.art/
+  - https://1337x.unblockit.asia/
   - https://1337x.unblockninja.com/
 legacylinks:
   - https://1337x.is/
   - https://1337x.nocensor.work/
-  - https://1337x.unblockit.bz/
-  - https://1337x.unblockit.tv/
-  - https://1337x.unblockit.how/
   - https://1337x.unblockit.cam/
   - https://1337x.nocensor.biz/
   - https://1337x.gd/
@@ -38,8 +34,17 @@ legacylinks:
   - https://1337x.unblockit.page/
   - https://1337x.unblockit.pet/
   - https://1337x.nocensor.lol/
+  - https://1337x.unblockit.ink/
+  - https://1337x.nocensor.art/
+  - https://1337x.unblockit.bio/
+  - https://1337x.unblockit.boo/
+  - https://1337x.mrunblock.guru/
+  - https://1337x.mrunblock.life/ # cloudflare 403
+  - https://1337x.unblockit.click/
 
 caps:
+  limitsDefault: 80
+  limitsMax: 80
   categorymappings:
     # Anime
     - {id: 28, cat: TV/Anime, desc: "Anime/Anime"}
@@ -178,11 +183,15 @@ download:
       attribute: href
 
 search:
+  pageSize: 20
+  pageable: "{{ if or .Query.Album .Query.Artist .Keywords }}true{{ else }}false{{ end }}"
+
   paths:
     # present first page of movies tv and music results if there are no search parms supplied (20 hits per page)
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Movies{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/1/"
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/TV{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}2{{ else }}1{{ end }}/"
     - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Music{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}3{{ else }}1{{ end }}/"
+    - path: "{{ if or .Query.Album .Query.Artist .Keywords }}sort-search{{ else }}cat/Other{{ end }}{{ if or .Query.Album .Query.Artist }}/{{ or .Query.Album .Query.Artist }}{{ else }}/{{ .Keywords }}{{ end }}{{ if or .Query.Album .Query.Artist .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}/{{ if or .Query.Album .Query.Artist .Keywords }}4{{ else }}1{{ end }}/"
 
   rows:
     selector: tr:has(a[href^="/torrent/"])
@@ -255,7 +264,7 @@ search:
         - name: re_replace
           args: ["st|nd|rd|th", ""]
         - name: dateparse
-          args: "3pm Jan. 2"
+          args: "htt MMM. d"
     date_years:
       # (more than a year ago) Apr. 18th '11
       optional: true
@@ -266,7 +275,7 @@ search:
         - name: re_replace
           args: ["st|nd|rd|th", ""]
         - name: dateparse
-          args: "Jan. 2 06"
+          args: "MMM. d yy"
     date_today:
       # (today) 12:25am
       optional: true

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

@@ -1,7 +1,7 @@
 ---
 id: 1ptbar
 name: 1ptbar
-description: "1ptbar is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning"
+description: "1ptbar is a CHINESE Private Torrent Tracker for MOVIES / TV / E-LEARNING"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -25,26 +25,28 @@ caps:
 
   modes:
     search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
     music-search: [q]
 
 settings:
-  - name: cookie
+  - name: username
     type: text
-    label: Cookie
-  - name: info
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
     type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 1ptbar Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,30 +63,51 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
-  method: cookie
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
-    cookie: "{{ .Config.cookie }}"
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
   test:
-    path: torrents.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
     # 0 incldead, 1 active, 2 dead
     incldead: 0
     # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
     spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
     # 0 title, 1 descr, 3 uploader, 4 imdburl
-    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
-    # 0 AND, 1 OR, 2 exact
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 2 exact
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -98,21 +121,28 @@ search:
           args: cat
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td.rowfollow:nth-last-of-type(6) > span[title]
@@ -122,7 +152,7 @@ search:
         - name: append
           args: " +08:00"
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
@@ -131,7 +161,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -158,5 +188,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP Standard v1.5 Beta 5
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-08

src/Jackett.Common/Definitions/2fast4you.yml

@@ -97,22 +97,22 @@ settings:
     default: false
   - name: multilang
     type: checkbox
-    label: Replace MULTI by another language in release name
+    label: Replace MULTi by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI by this language
+    label: Replace MULTi by this language
     default: FRENCH
     options:
-      FRENCH: "FRENCH"
-      MULTI.FRENCH: "MULTI.FRENCH"
-      ENGLISH: "ENGLISH"
-      MULTI.ENGLISH: "MULTI.ENGLISH"
-      VOSTFR: "VOSTFR"
-      MULTI.VOSTFR: "MULTI.VOSTFR"
+      FRENCH: FRENCH
+      MULTi FRENCH: MULTi FRENCH
+      ENGLISH: ENGLISH
+      MULTi ENGLISH: MULTi ENGLISH
+      VOSTFR: VOSTFR
+      MULTi VOSTFR: MULTi VOSTFR
   - name: vostfr
     type: checkbox
-    label: Replace VOSTFR with ENGLISH
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
     default: false
   - name: sort
     type: select
@@ -178,22 +178,20 @@ search:
       filters:
         - name: replace
           args: [" - (Nouveau!)", ""]
-    title_multilang:
+    title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
     title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
     title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: a[href^="torrents-details.php?id="]
       attribute: href

src/Jackett.Common/Definitions/2xfree.yml

@@ -0,0 +1,216 @@
+---
+id: 2xfree
+name: 2xFree
+description: "2xFree is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://pt.2xfree.org/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies(电影)", default: true}
+    - {id: 402, cat: TV, desc: "TV Series(电视剧)", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows(综艺)", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations(动画)", default: true}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos(MV)", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports(体育运动)", default: true}
+    - {id: 408, cat: Audio, desc: "HQ Audio(音乐)", default: true}
+    - {id: 409, cat: Other, desc: "Misc(其他)", default: true}
+    - {id: 410, cat: Books, desc: "eBook(电子书)", default: true}
+    - {id: 411, cat: PC/Games, desc: "PCGame(游戏)", default: true}
+    - {id: 413, cat: Audio/Video, desc: "AV(无码)", default: true}
+    - {id: 414, cat: Audio/Video, desc: "AV(有码)", default: true}
+    - {id: 420, cat: XXX, desc: "HAnime(H动画)", default: true}
+    - {id: 421, cat: XXX, desc: "HComic(H漫画)", default: true}
+    - {id: 422, cat: XXX, desc: "HGame(H游戏)", default: true}
+    - {id: 423, cat: XXX, desc: "IV(写真影片)", default: true}
+    - {id: 424, cat: XXX, desc: "IV(写真图集)", default: true}
+    # special
+    - {id: 526, cat: Movies, desc: "VRMovies(3D/VR电影)", default: true}
+    - {id: 527, cat: TV, desc: "VRSeries(3D/VR剧集)", default: true}
+    - {id: 528, cat: Audio/Video, desc: "AV(VR无码)", default: true}
+    - {id: 529, cat: Audio/Video, desc: "AV(VR有码)", default: true}
+    - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)", default: true}
+    - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)", default: true}
+    - {id: 532, cat: Other, desc: "VRTools(VR工具软件)", default: true}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+    book-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the ICC2022 Web Site. Otherwise just leave it empty."
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: sort
+    type: select
+    label: Sort requested from site
+    default: 4
+    options:
+      4: created
+      7: seeders
+      5: size
+      1: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    secret: ""
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 413, 420, 421, 422, 423, 424]
+    - path: special.php
+      categories: [526, 527, 528, 529, 530, 531, 532]
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (4 does not appear to work)
+    search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, b, font, img, span
+# NexusPHP v1.8.2 2023-05-08

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

@@ -1,7 +1,7 @@
 ---
 id: 3changtrai
 name: 3ChangTrai
-description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV"
+description: "3ChangTrai (3CT) is a VIETNAMESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: vi-VN
 type: private
 encoding: UTF-8
@@ -99,7 +99,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
-    # does not return imdb link in results
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -113,12 +113,11 @@ search:
           args: cat
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -126,7 +125,7 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     poster:
-      selector: img.lazyload
+      selector: img[data-src]
       attribute: data-src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
@@ -140,7 +139,7 @@ search:
         - name: append
           args: " +07:00" # ICT
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td.rowfollow:nth-child(5):not(:has(span))
@@ -149,7 +148,7 @@ search:
         - name: append
           args: " +07:00" # ICT
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -174,7 +173,10 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
     description:
-      selector: td:nth-child(2)
-      remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+      selector: td:nth-child(3)
+      remove: a, b, font, img, span
+# NexusPHP 3ChangTrai v3.0 2020-04-30

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

@@ -104,6 +104,9 @@ search:
       filters:
         - name: querystring
           args: category
+        - name: re_replace
+          args: ["(\\b0\\b)", "31"]
+
     title:
       selector: a[href^="index.php?page=torrent-details&id="]
     details:
@@ -131,18 +134,17 @@ search:
         - name: append
           args: " -07:00" # PDT
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "dd/MM/yyyy zzz"
     size:
       selector: td:nth-last-child(4)
     seeders:
       selector: a[href^="index.php?page=peers"]
     leechers:
       selector: td:has(a[href^="index.php?page=peers"]) + td
-    grabs_optional:
+    grabs:
       selector: a[href^="index.php?page=torrent_history"]
       optional: true
-    grabs:
-      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
+      default: 0
     downloadvolumefactor:
       case:
         img[src="images/50off.png"]: 0.5

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

@@ -1,181 +0,0 @@
----
-id: 3evils
-name: 3Evils
-description: "3Evils is a Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://3evils.net/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: PC, desc: "Apps"}
-    - {id: 24, cat: Books, desc: "Books/Magazines"}
-    - {id: 12, cat: TV/Anime, desc: "Movies/Anime"}
-    - {id: 31, cat: Movies, desc: "Movies/FooKaS RG"}
-    - {id: 84, cat: Movies, desc: "Movies/Kids"}
-    - {id: 55, cat: Movies/WEB-DL, desc: "Movies/WEB-DL"}
-    - {id: 70, cat: Movies/WEB-DL, desc: "Movies/WEBRip"}
-    - {id: 71, cat: Movies/HD, desc: "Movies/x265"}
-    - {id: 64, cat: Movies/SD, desc: "Movies/XViD"}
-    - {id: 26, cat: Audio/Lossless, desc: "Music/FLAC"}
-    - {id: 10, cat: Audio/MP3, desc: "Music/MP3"}
-    - {id: 63, cat: Audio/Video, desc: "Music/Videos"}
-    - {id: 29, cat: Movies, desc: "Movies/Packs"}
-    - {id: 19, cat: Audio, desc: "Music/Packs"}
-    - {id: 61, cat: TV/Anime, desc: "TV/Anime"}
-    - {id: 85, cat: TV, desc: "TV/Kids"}
-    - {id: 86, cat: TV, desc: "TV/Packs"}
-    - {id: 82, cat: TV/Sport, desc: "TV/Sports"}
-    - {id: 36, cat: TV/HD, desc: "TV/x265"}
-    - {id: 45, cat: TV/SD, desc: "TV/XViD"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 4
-    options:
-      4: created
-      7: seeders
-      5: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile. The default is <i>15</i>.
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-  error:
-    - selector: td.embedded:contains("Login failed!")
-  test:
-    path: /
-    selector: a[href*="/logout.php?hash_please="]
-
-search:
-  paths:
-    # https://www.3evils.net/browse.php?c16=1&c17=1&c3=1&c4=1&search=&searchin=title&incldead=0&only_free=1
-    - path: browse.php
-
-  inputs:
-    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
-    search: "{{ .Keywords }}"
-    # title, descr, genre, all
-    searchin: title
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["(\\w+)", "+$1"] # prepend + to each word
-
-  rows:
-    selector: table.table-bordered tbody tr:has(a[href^="download.php?torrent="])
-
-  fields:
-    category:
-      selector: a[href^="browse.php?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        - name: regexp
-          args: "Tip\\('<b>(.*?)</b>"
-    details:
-      selector: a[href^="details.php?id="]
-      attribute: href
-    download:
-      selector: a[href^="download.php?torrent="]
-      attribute: href
-    poster:
-      selector: a[href^="details.php?id="]
-      attribute: onmouseover
-      filters:
-        #  onmouseover="Tip('<b>blahblah /><img src=\'img.php/tvmaze/80.jpg\' blahblah />');"
-        # <img src=\'./pic/noposter.png\'
-        - name: regexp
-          args: "src=\\\\'(.+?)\\\\'"
-        - name: replace
-          args: ["./pic/noposter.png", ""]
-    files:
-      selector: td:nth-last-child(9)
-    # 2 flavours of dates
-    date_day:
-      # Today<br> 10:20 AM
-      # Yesterday<br> 08:03 PM
-      selector: td:nth-last-child(7):contains("day")
-      # auto adjusted by site account profile
-      optional: true
-    date_year:
-      # Feb 14 2019<br> 10:20 AM
-      selector: td:nth-last-child(7):not(:contains("day"))
-      # auto adjusted by site account profile
-      optional: true
-      filters:
-        - name: dateparse
-          args: "Jan 2 2006 03:04 PM"
-    date:
-      text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
-    size:
-      selector: td:nth-last-child(6)
-    grabs:
-      selector: td:nth-last-child(5)
-      filters:
-        - name: regexp
-          args: (\d+)
-    seeders:
-      selector: td:nth-last-child(4)
-    leechers:
-      selector: td:nth-last-child(3)
-    downloadvolumefactor:
-      case:
-        "a.info:contains(\"[FREE]\")": 0
-        "*": 1
-    uploadvolumefactor:
-      case:
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 days (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# U-232 V5 (customised)

src/Jackett.Common/Definitions/52pt.yml

@@ -35,15 +35,11 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -89,26 +85,26 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
     # does not return imdb or doubanid in results
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
 
   fields:
-    title_default:
-      selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
-      selector: a[title][href^="details.php?id="]
-      attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
     category:
       selector: a[href^="?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title:
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -124,7 +120,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
@@ -133,7 +129,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -158,12 +154,12 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
     minimumratio:
       text: 1
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/Bittorrentfiles.yml

@@ -156,43 +156,39 @@ search:
     selector: table.tableinborder > tbody > tr:has(a[href^="/download.php"])
 
   fields:
-    title:
-      selector: a[href^="details.php"]
-      attribute: title
     category:
       selector: a[href^="/browse.php?cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
+    title:
+      selector: a[href^="details.php"]
+      attribute: title
     details:
       selector: a[href^="details.php"]
       attribute: href
     download:
       selector: a[href^="/download.php"]
       attribute: href
-    grabs_optional:
+    grabs:
       selector: a[title="Snatcher"]
       optional: true
-    grabs:
-      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
-    files_optional:
+      default: 0
+    files:
       selector: a[title="Files"]
       optional: true
-    files:
-      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}0{{ end }}"
+      default: 0
     size:
       selector: td:nth-child(6)
-    seeders_optional:
+    seeders:
       selector: a[title="Seeder"]
       optional: true
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
+      default: 0
+    leechers:
       selector: a[title="Leecher"]
       optional: true
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+      default: 0
       # 2 flavours of dates
     date_day:
       # Heute 13:30:04
@@ -218,7 +214,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
+          args: "dd.MM.yyyy HH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
     downloadvolumefactor:

src/Jackett.Common/Definitions/abnormal.yml

@@ -37,22 +37,22 @@ settings:
     label: Password
   - name: multilang
     type: checkbox
-    label: Replace MULTI by another language in release name
+    label: Replace MULTi by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI by this language
+    label: Replace MULTi by this language
     default: FRENCH
     options:
       FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
+      MULTi.FRENCH: MULTi.FRENCH
       ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
+      MULTi.ENGLISH: MULTi.ENGLISH
       VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
+      MULTi.VOSTFR: MULTi.VOSTFR
   - name: vostfr
     type: checkbox
-    label: Replace VOSTFR with ENGLISH
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
     default: false
   - name: freeleech
     type: checkbox
@@ -124,22 +124,20 @@ search:
           args: SelectedCats
     title_phase1:
       selector: td.grid-release-column > a
-    title_multilang:
+    title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\.multi\\.)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
     title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\.vostfr\\.)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\.subfrench\\.)", " ENGLISH "]
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
     title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: a[href^="/Torrent/Details?ReleaseId="]
       attribute: href

src/Jackett.Common/Definitions/abtorrents.yml

@@ -89,7 +89,7 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -152,7 +152,7 @@ search:
       optional: true
       filters:
         - name: dateparse
-          args: "Jan 2 2006 3:04 PM"
+          args: "MMM d yyyy h:mm tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:

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

@@ -11,17 +11,22 @@ links:
 caps:
   categorymappings:
     - {id: 1, cat: Movies, desc: "Filmes"}
-    - {id: 2, cat: TV, desc: "TV Séries"}
-    - {id: 3, cat: Other, desc: "Cursos"}
-    - {id: 4, cat: Console, desc: "Jogos"}
-    - {id: 5, cat: PC, desc: "Aplicativos"}
+    - {id: 2, cat: TV, desc: "Séries"}
     - {id: 6, cat: TV/Anime, desc: "Animes"}
-    - {id: 7, cat: Other, desc: "Materiais de Apoio"}
+    - {id: 3, cat: TV/Documentary, desc: "Documentários"}
+    - {id: 7, cat: Audio/Video, desc: "Shows"}
+    - {id: 4, cat: Console, desc: "Games"}
+    - {id: 8, cat: Other, desc: "Cursos"}
+    - {id: 9, cat: Books, desc: "eBooks / Revistas / Apostilas"}
+    - {id: 5, cat: PC, desc: "Programas"}
+    - {id: 10, cat: Other, desc: "Materiais de Apoio"}
 
   modes:
     search: [q]
     tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
     movie-search: [q, imdbid, tmdbid]
+    book-search: [q]
+    music-search: [q]
 
 settings:
   - name: apikey
@@ -30,7 +35,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://acervos.cc/\" target =_blank>Acervos</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://acervos.cc/\" target=\"_blank\">Acervos</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -73,8 +78,14 @@ search:
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -114,14 +125,12 @@ search:
     _reg:
       selector: region
       optional: true
-    description:
-      text: "{{ .Result._cat }} {{ .Result._type }} {{ .Result._res }} {{ .Result._reg }}"
     download:
       selector: download_link
     infohash:
       selector: info_hash
     poster:
-      selector: poster
+      selector: meta.poster
       filters:
         - name: replace
           args: ["https://via.placeholder.com/90x135", ""]
@@ -131,6 +140,15 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Ficção científica)", "Ficção_científica"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result._cat }} {{ .Result._type }} {{ .Result._res }} {{ .Result._reg }} {{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -146,7 +164,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "01/02/2006 15:04:05 -07:00"
+          args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
       selector: size
     downloadvolumefactor:
@@ -169,6 +187,6 @@ search:
 #    minimumratio:
 #      text: 0.4
     minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 6.1.0
+      # 7 days (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+# json UNIT3D 6.4.1 (custom)

src/Jackett.Common/Definitions/acgsou.yml

@@ -6,6 +6,7 @@ language: zh-CN
 type: public
 followredirect: true
 encoding: UTF-8
+requestDelay: 5
 links:
   - https://www.36dm.club/
   - https://www.36dm.com/
@@ -61,10 +62,6 @@ search:
     # https://www.acgsou.com/search.php?keyword=test
     - path: "{{ if .Keywords }}search.php?keyword={{ .Keywords }}{{ else }}1.html{{ end }}"
 
-  headers:
-    # site blocks Jackett's User-Agents, so slightly alter it here (e.g. Safari/537.36 > Safari/537.35)
-    User-Agent: ["Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.35"]
-
   rows:
     selector: table tbody tr[class^="alt"]:has(td:nth-child(3) a)
 
@@ -90,7 +87,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "01/02 15:04 -07:00"
+          args: "MM/dd HH:mm zzz"
     date_years:
       selector: td:nth-child(1):not(:contains(":"))
       optional: true
@@ -98,7 +95,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006/01/02 -07:00"
+          args: "yyyy/MM/dd zzz"
     date:
       text: "{{ if or .Result.date_year .Result.date_years }}{{ or .Result.date_year .Result.date_years }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/acidlounge.yml

@@ -157,7 +157,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     size:
       selector: td.torrent_table_size
     grabs:

src/Jackett.Common/Definitions/acrossthetasman.yml

@@ -65,7 +65,7 @@ search:
       selector: td:nth-child(1)
       filters:
         - name: dateparse
-          args: "Jan 02, 2006"
+          args: "MMM dd, yyyy"
     title:
       selector: td:nth-child(4) > span:nth-child(1)
       filters:

src/Jackett.Common/Definitions/aftershock.yml

@@ -168,7 +168,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     downloadvolumefactor:
       case:
         span.icon_gift: 0

src/Jackett.Common/Definitions/aidoruonline.yml

@@ -38,7 +38,7 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -118,7 +118,7 @@ search:
       # auto adjusted by site account profile
       filters:
         - name: dateparse
-          args: "060102 15:04:05"
+          args: "yyMMdd HH:mm:ss"
     downloadvolumefactor:
       case:
         img[src="images/freeleech.png"]: 0 # dl not counted

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

@@ -35,7 +35,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://aither.cc/\" target =_blank>Aither</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://aither.cc/\" target=\"_blank\">Aither</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -78,8 +78,14 @@ search:
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -143,7 +149,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "01/02/2006 15:04:05 -07:00"
+          args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/amigosshare.yml

@@ -178,6 +178,9 @@ search:
     _quality:
       selector: div.list-group-item-content p.m-0 span.badge-primary:contains("1080p"), div.list-group-item-content p.m-0 span.badge-primary:contains("720p"), div.list-group-item-content p.m-0 span.badge-primary:contains("4k")
       optional: true
+      filters:
+        - name: replace
+          args: ["4k", "2160p"]
     _year:
       selector: div.list-group-item-content p.m-0 span.badge-primary[style$="#246AB6;"]
       optional: true
@@ -297,19 +300,18 @@ search:
         "[src$=\"/Scripts.png\"]": 128
         "[src$=\"/Vetores.png\"]": 124
         "[src$=\"/outros2.png\"]": 130
-    date_optional:
+    date:
       selector: p:contains("Lançado:")
       # auto adjusted by site account profile
       optional: true
+      default: now
       filters:
         - name: regexp
           args: "Lançado: (.+?)$"
         - name: re_replace
           args: [" (\\d:)", " 0$1"]
         - name: dateparse
-          args: "02/01/06 15:04:05"
-    date:
-      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
+          args: "dd/MM/yy HH:mm:ss"
     size:
       selector: div.list-group-item-content p.m-0 span.badge-info
     seeders:

src/Jackett.Common/Definitions/anilibria.yml

@@ -9,35 +9,53 @@ links:
   - https://www.anilibria.tv/
 
 caps:
-  categorymappings:
-    - {id: 1, cat: TV/Anime, desc: Anime}
+  categories:
+    Anime: TV/Anime
+    Movies: Movies/Other
 
   modes:
     search: [q]
     tv-search: [q, season, ep]
+    movie-search: [q]
 
-settings: []
+settings:
+  - name: stripcyrillic
+    type: checkbox
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    default: false
 
 search:
   paths:
-    # https://github.com/anilibria/docs/blob/master/api_v2.md
-    - path: "https://api.anilibria.tv/v2/{{ if .Keywords }}searchTitles?filter=names,poster.url,code,torrents.list,season.year&limit=100&search={{ .Keywords }}{{ else }}getUpdates?filter=names,poster.url,code,torrents.list,season.year&limit=100{{ end }}"
+    # https://github.com/anilibria/docs/blob/master/api_v3.md
+    - path: "https://api.anilibria.tv/v3/{{ if .Keywords }}searchTitles{{ else }}getUpdates{{ end }}"
       response:
         type: json
 
+  inputs:
+    search: "{{ .Keywords }}"
+    filter: "names,posters.small.url,code,torrents.list,season.year,description"
+    limit: 100
+
   keywordsfilters:
-    # strip season and ep
+    # strip season and/or ep
     - name: re_replace
-      args: ["(?i)(?:[SE]?\\d{1,4}){1,2}$", ""]
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
 
   rows:
-    selector: $
+    selector: list
     attribute: torrents.list
     multiple: true
 
   fields:
+    _episodes:
+      selector: episodes.string
+      optional: true
     category:
-      text: 1
+      text: "{{ if eq .Result._episodes \"Фильм\" }}Movies{{ else }}Anime{{ end }}"
     title_ru:
       selector: ..names.ru
     title_en:
@@ -45,15 +63,28 @@ search:
     title_alternative:
       selector: ..names.alternative
       optional: true
+      filters:
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["^OVA$", ""]
     year:
       selector: ..season.year
     _quality:
       selector: quality.string
-    _series:
-      selector: series.string
-      optional: true
     title:
-      text: "{{ .Result.title_ru }} / {{ .Result.title_en }}{{ if .Result.title_alternative }} / {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}]{{ if .Result._series }} - {{ .Result._series }}{{ else }}{{ end }}"
+      text: "{{ if .Config.stripcyrillic }}{{ else }}{{ .Result.title_ru }} / {{ end }}{{ .Result.title_en }}{{ if .Result.title_alternative }} / AKA {{ .Result.title_alternative }}{{ else }}{{ end }} ({{ .Result.year }}) [{{ .Result._quality }}]{{ if .Result._episodes }} - E{{ .Result._episodes }}{{ else }}{{ end }}"
+      filters:
+        - name: re_replace
+          args: [" - \\bEФильм\\b", " - MOVIE"]
+        - name: re_replace
+          args: [" - \\bEOVA\\b", " - OVA"]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} - RUS{{ else }}{{ end }}"
     _code:
       selector: ..code
     details:
@@ -63,11 +94,13 @@ search:
       filters:
         - name: prepend
           args: "{{ .Config.sitelink }}"
+    magnet:
+      selector: magnet
     poster:
-      selector: ..poster.url
+      selector: ..posters.small.url
       filters:
         - name: prepend
-          args: "https://static.anilibria.tv/"
+          args: "https://static.anilibria.tv"
     seeders:
       selector: seeders
     leechers:
@@ -83,4 +116,6 @@ search:
       text: 0
     uploadvolumefactor:
       text: 1
-# json api v2
+    description:
+      selector: ..description
+# json api v3

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

@@ -7,9 +7,11 @@ type: semi-private
 encoding: windows-1251
 testlinktorrent: false
 links:
-  - https://anime-free.biz/
+  - https://anime-free.one/
 legacylinks:
   - https://anime-free.net/ # redirects to *.biz
+  - https://anime-free.biz/
+  - http://anime-free.one/
 
 caps:
   categorymappings:
@@ -50,7 +52,6 @@ login:
   inputs:
     login_name: "{{ .Config.email }}"
     login_password: "{{ .Config.password }}"
-    login: submit
   error:
     - selector: div.berrors
   test:
@@ -87,10 +88,11 @@ search:
     selector: article
 
   fields:
-    category_optional:
-      optional: true
+    category:
       selector: a[href*="category="]
       attribute: href
+      optional: true
+      default: 54
       case:
         a[href$="3d_hentai"]: 51
         a[href$="3dcg_game"]: 55
@@ -109,8 +111,6 @@ search:
         a[href$="original_hentai"]: 48
         a[href$="rus-game"]: 57
         a[href$="uncensored"]: 45
-    category:
-      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}54{{ end }}"
     title:
       selector: h2.title a
     details:
@@ -129,16 +129,15 @@ search:
       selector: li:has(img#adddate)
       filters:
         - name: dateparse
-          args: "02-01-2006, 15:04"
+          args: "dd-MM-yyyy, HH:mm"
     seeders:
       text: 1
     leechers:
       text: 1
-    size_optional:
-      optional: true
-      selector: b.file_size
     size:
-      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
+      selector: b.file_size
+      optional: true
+      default: 0 B
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/animeclipse.yml

@@ -1,90 +0,0 @@
----
-id: animeclipse
-name: AnimeClipse
-description: "AnimeClipse is a Public site for Hellenic Fansubs Anime."
-language: el-GR
-type: public
-encoding: UTF-8
-links:
-  - http://www.animeclipse.com/ # does not support https ERR_CONNECTION_REFUSED
-
-settings:
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-caps:
-  categorymappings:
-    - {id: 1, cat: TV/Anime, desc: "Anime"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-
-search:
-  paths:
-    # http://www.animeclipse.com/index.php?ind=btitracker&search=sword&category=0&active=0&tor_page=10
-    - path: index.php
-  inputs:
-    ind: btitracker
-    # replace spaces with wildcard (percent symbol) as site's default search is exact string.
-    search: "{{ re_replace .Keywords \"[\\s]+\" \"%\" }}"
-    # does not support multi cats searching so defaulting to all.
-    category: 0
-    # 0 all, 1 active, 2 dead
-    active: 0
-    tor_page: 50
-    order: "{{ .Config.sort }}"
-    by: "{{ .Config.type }}"
-
-  rows:
-    selector: tr.torrentRow
-
-  fields:
-    category:
-      text: 1
-    title:
-      selector: a[href*="/download/"]
-      filters:
-        # move group to the end
-        - name: re_replace
-          args: ["^(\\[.+?\\])(.+?)$", "$2 $1"]
-        - name: re_replace
-          args: ["(_|\\[|\\])", " "]
-    details:
-      text: "{{ .Config.sitelink }}"
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    size:
-      selector: td:contains("[size:") > span.torrentInfoData
-    date:
-      selector: td:contains("[Added:") > span.torrentInfoData
-      filters:
-        - name: append
-          args: " +02:00" # EET
-        - name: dateparse
-          args: "02/01/2006 15:04:05 -07:00"
-    grabs:
-      selector: td:contains("[Completed:") > span.torrentInfoData
-    seeders:
-      selector: td:contains("Seeders") > span.torrentInfoData
-    leechers:
-      selector: td:contains("Leechers") > span.torrentInfoData
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# btitracker

src/Jackett.Common/Definitions/animetracker.yml

@@ -37,7 +37,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target =_blank>AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animetracker.cc/\" target=\"_blank\">AnimeTracker</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -80,8 +80,14 @@ search:
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -143,7 +149,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "01/02/2006 15:04:05 -07:00"
+          args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
       selector: size
     downloadvolumefactor:

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

@@ -40,7 +40,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target =_blank>AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://animeworld.cx/\" target=\"_blank\">AnimeWorld</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -83,8 +83,14 @@ search:
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range $i, $e := .Categories }}&categories[{{$i}}]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -131,7 +137,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "01/02/2006 15:04:05 -07:00"
+          args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
       selector: size
     downloadvolumefactor:

src/Jackett.Common/Definitions/anisource.yml

@@ -7,7 +7,7 @@ type: public
 encoding: UTF-8
 requestDelay: 2
 certificates:
-  - f400d50a4dac4dd6546c869ac75669846205a0d2 # expired 26 Aug 2022
+  - 7b36f0dc75d3340727b6f74bbdbde46ec59b7037 # expired 12 Feb 2023
 links:
   - https://asnet.pw/
 
@@ -70,7 +70,7 @@ search:
         - name: append
           args: " -09:00" # CUS
         - name: dateparse
-          args: "2006-01-02 15:04 -07:00"
+          args: "yyyy-MM-dd HH:mm zzz"
     size:
       selector: font[color="Black"]
       filters:

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

@@ -31,7 +31,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target =_blank>Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."
+    default: "Find or Generate a new API Key by accessing your <a href=\"https://anthelion.me/\" target=\"_blank\">Anthelion</a> account <i>Settings</i> page and scrolling down to the <b>API Key</b> section.<br>Tick the <b>Search</b> and <b>Download</b> checkboxes and click the <b>save profile</b> button to generate the key."
 
 login:
   path: api.php

src/Jackett.Common/Definitions/arabafenice.yml

@@ -206,7 +206,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "02/01/2006 -07:00"
+          args: "dd/MM/yyyy zzz"
     grabs:
       selector: td:nth-last-child(6)
     seeders:

src/Jackett.Common/Definitions/arabp2p.yml

@@ -88,6 +88,7 @@ caps:
     - {id: 65, cat: Other, desc: "صور (Images)"}
     - {id: 56, cat: Other, desc: "رياضي (Sport)"}
     - {id: 46, cat: Other, desc: "منوع (Misc)"}
+    - {id: 112, cat: Other, desc: "رمضان 2023"}
 
   modes:
     search: [q]
@@ -151,7 +152,7 @@ search:
       # auto adjusted by site account profile
       filters:
         - name: dateparse
-          args: "2006-01-02 15:04:05"
+          args: "yyyy-MM-dd HH:mm:ss"
     seeders:
       selector: td:nth-child(5)
     leechers:

src/Jackett.Common/Definitions/arabtorrents.yml

@@ -0,0 +1,221 @@
+---
+id: arabtorrents
+name: ArabTorrents
+description: "ArabTorrents is an ARABIC Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: ar-AR
+type: private
+encoding: windows-1256
+requestDelay: 2
+links:
+  - https://arab-torrents.net/
+
+caps:
+  categorymappings:
+    # Movies
+    - {id: 36, cat: Movies, desc: "Movies/Dubbed"}
+    - {id: 134, cat: Movies, desc: "HD Section"}
+    - {id: 135, cat: Movies/HD, desc: "Movies/HD Section"}
+    - {id: 204, cat: Movies/HD, desc: "R5/HD Section"}
+    - {id: 119, cat: Movies/SD, desc: "Movies/SD TV"}
+    - {id: 205, cat: Movies/Foreign, desc: "Foreign"}
+    - {id: 208, cat: Movies/Foreign, desc: "Stranger/Foreign"}
+    - {id: 209, cat: Movies/Foreign, desc: "Turkish/Foreign"}
+    - {id: 207, cat: Movies/Foreign, desc: "Indian/Foreign"}
+    - {id: 191, cat: Movies, desc: "Movies/Golden-VIP"}
+    - {id: 190, cat: Movies, desc: "Movies/Super VIP"}
+    - {id: 212, cat: Movies, desc: "Movies/VIP"}
+    - {id: 181, cat: Movies, desc: "Classic Movies/WEB-DL"}
+    - {id: 167, cat: Movies, desc: "Movies/WEB-DL"}
+    # Shows
+    - {id: 186, cat: TV, desc: "Dubbed"}
+    - {id: 166, cat: TV/WEB-DL, desc: "WEB-DL"}
+    - {id: 168, cat: TV/WEB-DL, desc: "Series/WEB-DL"}
+    - {id: 171, cat: TV/WEB-DL, desc: "TV Shows/WEB-DL"}
+    - {id: 180, cat: TV/WEB-DL, desc: "Classic Series/WEB-DL"}
+    - {id: 169, cat: TV/WEB-DL, desc: "Full-Pack/WEB-DL"}
+    - {id: 210, cat: Other, desc: "VIP"}
+    - {id: 211, cat: TV, desc: "TV Shows/VIP"}
+    - {id: 213, cat: TV, desc: "Full-Pack/VIP"}
+    - {id: 94, cat: TV, desc: "Super VIP"}
+    - {id: 189, cat: TV, desc: "TV Shows/Super VIP"}
+    - {id: 201, cat: TV, desc: "Full-Pack/Super VIP"}
+    - {id: 197, cat: TV, desc: "TV Shows/Ramadan 2022"}
+    - {id: 148, cat: TV/Other, desc: "Series/OSN"}
+    - {id: 149, cat: TV/Other, desc: "TV Show/OSN"}
+    - {id: 165, cat: TV, desc: "Golden-VIP"}
+    - {id: 185, cat: TV, desc: "Series/Golden-VIP"}
+    - {id: 200, cat: TV, desc: "Full-Pack/Golden-VIP"}
+    - {id: 26, cat: TV/SD, desc: "SD TV"}
+    - {id: 78, cat: TV/SD, desc: "Series/SD TV"}
+    - {id: 124, cat: TV/SD, desc: "FullPack/SD TV"}
+    - {id: 136, cat: TV/HD, desc: "Series/HD Section"}
+    - {id: 137, cat: TV/HD, desc: "TV Shows/HD Section"}
+    - {id: 182, cat: TV/HD, desc: "Full Pack/HD Section"}
+    - {id: 187, cat: TV/Foreign, desc: "TV Shows/Dubbed"}
+    - {id: 188, cat: TV/Foreign, desc: "Full-Pack/Dubbed"}
+    # Anime
+    - {id: 33, cat: TV/Anime, desc: "Anime"}
+    - {id: 51, cat: TV/Anime, desc: "Series/Anime"}
+    - {id: 129, cat: Movies/BluRay, desc: "Blu-Ray/Anime"}
+    - {id: 125, cat: TV, desc: "Full-Pack/Anime"}
+    - {id: 50, cat: Movies, desc: "Movies/Anime"}
+    # Islamic
+    - {id: 67, cat: Other, desc: "Islamic"}
+    - {id: 126, cat: TV, desc: "Full-Packs/Islamic"}
+    - {id: 91, cat: Audio/MP3, desc: "MP3/Islamic"}
+    - {id: 92, cat: Other, desc: "Video/Islamic"}
+    # Music
+    - {id: 16, cat: Audio, desc: "Music"}
+    - {id: 177, cat: Audio, desc: "Flac/Music"}
+    - {id: 127, cat: Audio, desc: "Full-Packs/Music"}
+    - {id: 17, cat: Audio/MP3, desc: "MP3/Music"}
+    - {id: 19, cat: Audio/Video, desc: "Videos/Music"}
+    # OSN
+    - {id: 146, cat: TV/Other, desc: "OSN"}
+    - {id: 147, cat: TV/Other, desc: "Arabic/OSN"}
+    - {id: 153, cat: TV/Other, desc: "English/OSN"}
+    - {id: 179, cat: TV/Other, desc: "Old/OSN"}
+    # Ramadan 2022
+    - {id: 192, cat: Other, desc: "Ramadan 2022"}
+    - {id: 198, cat: Other, desc: "Full Pack/Ramadan 2022"}
+    - {id: 193, cat: Other, desc: "Ramadan HD/Ramadan 2022"}
+    - {id: 195, cat: Other, desc: "Ramadan Khaliji/Ramadan 2022"}
+    - {id: 194, cat: Other, desc: "Ramadan SD/Ramadan 2022"}
+    - {id: 196, cat: Other, desc: "Ramadan Web/Ramadan 2022"}
+    # Sports
+    - {id: 120, cat: TV/Sport, desc: "Sports"}
+    - {id: 159, cat: TV/Sport, desc: "Full Matches/Sports"}
+    - {id: 155, cat: TV/Sport, desc: "Goals/Sports"}
+    # Rest
+    - {id: 102, cat: TV/Other, desc: "Other/SD TV"}
+    - {id: 202, cat: Other, desc: "AT"}
+    - {id: 203, cat: Other, desc: "AT/AT"}
+    - {id: 34, cat: Other, desc: "Misc"}
+    - {id: 132, cat: PC/Mobile-Android, desc: "Android/Misc"}
+    - {id: 163, cat: TV/Documentary, desc: "Documentary/Misc"}
+    - {id: 122, cat: Other, desc: "Other/Misc"}
+    - {id: 121, cat: Other, desc: "Theater/Misc"}
+    - {id: 214, cat: Other, desc: "Other/VIP"}
+
+  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: added
+    options:
+      added: created
+      seeders: seeders
+      size: size
+      name: title
+  - name: type
+    type: select
+    label: Order requested from site
+    default: desc
+    options:
+      desc: desc
+      asc: asc
+
+login:
+  path: takelogin.php
+  method: post
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+  error:
+    - selector: table:has(td.thead:contains("حدث خطأ"))
+  test:
+    path: index.php
+    selector: a[href*="logout.php"]
+
+download:
+  before:
+    path: takethanks.php
+    method: post
+    inputs:
+      torrentid: "{{ .DownloadUri.Query.id }}"
+
+search:
+  paths:
+    - path: browse.php
+
+  inputs:
+    do: search
+    keywords: "{{ .Keywords }}"
+    # t_name, t_description, t_both, t_uploader, t_genre
+    search_type: t_both
+    # does not support multi category searching so defaulting to all.
+    category: 0
+    include_dead_torrents: yes
+    sort: "{{ .Config.sort }}"
+    order: "{{ .Config.type }}"
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\W+", "*"]
+    - name: re_replace
+      args: ["^(.+)$", "*$1*"]
+
+  rows:
+    selector: table#sortabletable > tbody > tr:has(div > a[href*="details.php?id="])
+
+  fields:
+    category:
+      selector: td a[href*="/browse.php?category="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: category
+    title:
+      selector: td a[href*="/details.php?id="]
+    details:
+      selector: td a[href*="/details.php?id="]
+      attribute: href
+    download:
+      selector: a[href*="/download.php?id="]
+      attribute: href
+    date:
+      selector: td:nth-child(2) > div:nth-child(3)
+      filters:
+        - name: regexp
+          args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})"
+        - name: dateparse
+          args: "dd-MM-yyyy HH:mm"
+    size:
+      selector: td:nth-child(5)
+    grabs:
+      selector: td:nth-child(6)
+    seeders:
+      selector: td:nth-child(7)
+    leechers:
+      selector: td:nth-child(8)
+    poster:
+      selector: div.tooltip-content > img[src*="/torrents/"]
+      attribute: src
+    downloadvolumefactor:
+      case:
+        img[src$="torrent_flags/freedownload.gif"]: 0
+        img[src$="torrent_flags/silverdownload.gif"]: 0.5
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img[src$="torrent_flags/x2.gif"]: 2
+        "*": 1
+    minimumratio:
+      text: 1.05
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+# TS Special Edition v.7.4

src/Jackett.Common/Definitions/arenabg.yml

@@ -5,8 +5,6 @@ description: "ArenaBG is a BULGARIAN Semi-Private Torrent Tracker for 0DAY / GEN
 language: bg-BG
 type: semi-private
 encoding: UTF-8
-certificates:
-  - d5d96eaf33f4b7470a7009f1e591a45f6af0430d # expired 15 Oct 2022
 links:
   - https://arenabg.com/
 legacylinks:
@@ -187,7 +185,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2 January 2006, Monday @ 15:04 -07:00"
+          args: "d MMMM yyyy, dddd @ HH:mm zzz"
     size:
       selector: td:nth-child(3)
     seeders:

src/Jackett.Common/Definitions/asiancinema.yml

@@ -72,15 +72,9 @@ search:
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
     tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
-    igdb: ""
-    start_year: ""
-    end_year: ""
     sorting: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100

src/Jackett.Common/Definitions/audiences.yml

@@ -36,15 +36,11 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   method: cookie
@@ -86,6 +86,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -121,7 +122,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
@@ -130,7 +131,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -1,198 +0,0 @@
----
-id: audiobookbay
-name: AudioBookBay
-description: "AudioBook Bay (ABB) is a public Torrent Tracker for AUDIOBOOKS"
-language: en-US
-type: public
-encoding: UTF-8
-requestDelay: 2
-links:
-  - https://audiobookbay.li/
-  - https://audiobookbay.se/
-  - https://audiobookbay.unblockit.ink/
-legacylinks:
-  - https://audiobookbay.la/
-  - http://audiobookbay.net/
-  - https://audiobookbay.unblockit.bz/
-  - https://audiobookbay.unblockit.tv/
-  - http://audiobookbay.nl/
-  - http://audiobookbay.ws/
-  - https://audiobookbay.unblockit.how/
-  - https://audiobookbay.unblockit.cam/
-  - https://audiobookbay.unblockit.biz/
-  - https://audiobookbay.unblockit.day/
-  - https://audiobookbay.unblockit.llc/
-  - https://audiobookbay.unblockit.blue/
-  - https://audiobookbay.unblockit.name/
-  - http://audiobookbay.fi/
-  - http://audiobookbay.se/
-  - http://audiobookbayabb.com/
-  - https://audiobookbay.unblockit.ist/
-  - https://audiobookbay.unblockit.bet/
-  - https://audiobookbay.unblockit.cat/
-  - https://audiobookbay.unblockit.nz/
-  - https://audiobookbay.fi/
-  - https://audiobookbay.unblockit.page/
-  - https://audiobookbay.unblockit.pet/
-
-caps:
-  categorymappings:
-    - {id: "(Post)apocalyptic", cat: Audio/Audiobook, desc: "(Post)apocalyptic"}
-    - {id: Action, cat: Audio/Audiobook, desc: "Action"}
-    - {id: Adults, cat: Audio/Audiobook, desc: "Adults"}
-    - {id: Adventure, cat: Audio/Audiobook, desc: "Adventure"}
-    - {id: Anthology, cat: Audio/Audiobook, desc: "Anthology"}
-    - {id: Art, cat: Audio/Audiobook, desc: "Art"}
-    - {id: Autobiography, cat: Audio/Audiobook, desc: "Autobiography & Biographies"}
-    - {id: Bestsellers, cat: Audio/Audiobook, desc: "Bestsellers"}
-    - {id: Business, cat: Audio/Audiobook, desc: "Business"}
-    - {id: Children, cat: Audio/Audiobook, desc: "Children"}
-    - {id: Classic, cat: Audio/Audiobook, desc: "Classic"}
-    - {id: Computer, cat: Audio/Audiobook, desc: "Computer"}
-    - {id: Contemporary, cat: Audio/Audiobook, desc: "Contemporary"}
-    - {id: Crime, cat: Audio/Audiobook, desc: "Crime"}
-    - {id: Detective, cat: Audio/Audiobook, desc: "Detective"}
-    - {id: Doctor, cat: Audio/Audiobook, desc: "Doctor Who"}
-    - {id: Documentary, cat: Audio/Audiobook, desc: "Documentary"}
-    - {id: Education, cat: Audio/Audiobook, desc: "Education"}
-    - {id: Fantasy, cat: Audio/Audiobook, desc: "Fantasy"}
-    - {id: Full, cat: Audio/Audiobook, desc: "Full Cast"}
-    - {id: Gay, cat: Audio/Audiobook, desc: "Gay"}
-    - {id: General, cat: Audio/Audiobook, desc: "General Fiction"}
-    - {id: Historical, cat: Audio/Audiobook, desc: "Historical Fiction"}
-    - {id: History, cat: Audio/Audiobook, desc: "History"}
-    - {id: Horror, cat: Audio/Audiobook, desc: "Horror"}
-    - {id: Humor, cat: Audio/Audiobook, desc: "Humor"}
-    - {id: Lecture, cat: Audio/Audiobook, desc: "Lecture"}
-    - {id: Lesbian, cat: Audio/Audiobook, desc: "Lesbian"}
-    - {id: LGBT, cat: Audio/Audiobook, desc: "LGBT"}
-    - {id: Libertarian, cat: Audio/Audiobook, desc: "Libertarian"}
-    - {id: Literature, cat: Audio/Audiobook, desc: "Literature"}
-    - {id: LitRPG, cat: Audio/Audiobook, desc: "LitRPG"}
-    - {id: Military, cat: Audio/Audiobook, desc: "Military"}
-    - {id: Misc., cat: Audio/Audiobook, desc: "Misc. Non-fiction"}
-    - {id: Mystery, cat: Audio/Audiobook, desc: "Mystery"}
-    - {id: Novel, cat: Audio/Audiobook, desc: "Novel"}
-    - {id: Other, cat: Audio/Audiobook, desc: "Other"}
-    - {id: Paranormal, cat: Audio/Audiobook, desc: "Paranormal"}
-    - {id: Plays, cat: Audio/Audiobook, desc: "Plays & Theater"}
-    - {id: Poetry, cat: Audio/Audiobook, desc: "Poetry"}
-    - {id: Political, cat: Audio/Audiobook, desc: "Political"}
-    - {id: Radio, cat: Audio/Audiobook, desc: "Radio Productions"}
-    - {id: Romance, cat: Audio/Audiobook, desc: "Romance"}
-    - {id: Sci-Fi, cat: Audio/Audiobook, desc: "Sci-Fi"}
-    - {id: Science, cat: Audio/Audiobook, desc: "Science"}
-    - {id: Self-help, cat: Audio/Audiobook, desc: "Self-help"}
-    - {id: Sex, cat: Audio/Audiobook, desc: "Sex Scenes"}
-    - {id: Short, cat: Audio/Audiobook, desc: "Short Story"}
-    - {id: Spiritual, cat: Audio/Audiobook, desc: "Spiritual & Religious"}
-    - {id: Sport, cat: Audio/Audiobook, desc: "Sport & Recreation"}
-    - {id: Suspense, cat: Audio/Audiobook, desc: "Suspense"}
-    - {id: Teen, cat: Audio/Audiobook, desc: "Teen & Young Adult"}
-    - {id: Thriller, cat: Audio/Audiobook, desc: "Thriller"}
-    - {id: "True", cat: Audio/Audiobook, desc: "True Crime"}
-    - {id: Tutorial, cat: Audio/Audiobook, desc: "Tutorial"}
-    - {id: Violence, cat: Audio/Audiobook, desc: "Violence"}
-    - {id: Westerns, cat: Audio/Audiobook, desc: "Westerns"}
-    - {id: Zombies, cat: Audio/Audiobook, desc: "Zombies"}
-
-  modes:
-    search: [q]
-    book-search: [q]
-
-settings: []
-
-download:
-  infohash:
-    hash:
-      selector: td:contains("Info Hash:") ~ td
-      filters:
-        - name: regexp
-          args: ([A-F|a-f|0-9]{40})
-    title:
-      selector: h1
-      filters:
-        - name: trim
-        - name: validfilename
-
-search:
-  paths:
-    # with just 7 results per page, try to grab up to 35 results
-    # http://audiobookbay.nl/?s=teeth
-    # http://audiobookbay.nl/page/2/?s=teeth
-    - path: "{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
-    - path: "page/2/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
-    - path: "page/3/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
-    - path: "page/4/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
-    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}&tt=1{{ else }}{{ end }}"
-
-  rows:
-    selector: div.post:has(div[class="postTitle"])
-    filters:
-      - name: andmatch
-
-  fields:
-    category:
-      selector: div.postInfo
-      filters:
-        - name: regexp
-          args: "Category: (.+?)\\s"
-    _format:
-      optional: true
-      selector: div.postContent
-      filters:
-        - name: regexp
-          args: "Format: (.+?) /"
-        - name: replace
-          args: ["?", ""]
-    _bitrate:
-      optional: true
-      selector: div.postContent
-      filters:
-        - name: regexp
-          args: "Bitrate: (.+?)File"
-        - name: replace
-          args: ["?", ""]
-    title:
-      selector: div.postTitle
-      filters:
-        - name: append
-          args: "{{ if .Result._format }} [{{ .Result._format }}]{{ else }}{{ end }}{{ if .Result._bitrate }} [{{ .Result._bitrate }}]{{ else }}{{ end }}"
-    details:
-      selector: div.postTitle h2 a
-      attribute: href
-    download:
-      selector: div.postTitle h2 a
-      attribute: href
-    poster:
-      selector: img
-      attribute: src
-    date_optional:
-      optional: true
-      selector: div.postContent
-      filters:
-        - name: regexp
-          args: "(\\d{1,2} \\D{3} \\d{4})"
-        - name: dateparse
-          args: "2 Jan 2006"
-    date:
-      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
-    size_optional:
-      optional: true
-      selector: div.postContent
-      filters:
-        - name: regexp
-          args: "File Size: (.+?)$"
-        - name: replace
-          args: ["s", ""]
-    size:
-      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
-    seeders:
-      text: 1
-    leechers:
-      text: 1
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/audionews.yml

@@ -184,11 +184,14 @@ caps:
     - {id: 228, cat: Other, desc: "GFXNEWS PHOTOSHOP Actions, Pattern & Styles"}
     - {id: 229, cat: Other, desc: "GFXNEWS PHOTOSHOP Background & PSD Source"}
     - {id: 230, cat: Other, desc: "GFXNEWS PHOTOSHOP Brushes & Gradient"}
+    - {id: 246, cat: Other, desc: "GFXNEWS PHOTOSHOP Mockup"}
+    - {id: 247, cat: Other, desc: "GFXNEWS PHOTOSHOP Overlays"}
+    - {id: 249, cat: Other, desc: "GFXNEWS PHOTOSHOP Preset"}
     - {id: 231, cat: Other, desc: "GFXNEWS PHOTOSHOP Toolkits, Papers & Objects"}
     - {id: 245, cat: Other, desc: "GFXNEWS PLUGINS"}
-    - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
-    - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
     - {id: 210, cat: Other, desc: "GFXNEWS PLUGINS WIN"}
+    - {id: 223, cat: Other, desc: "GFXNEWS PLUGINS MAC"}
+    - {id: 225, cat: Other, desc: "GFXNEWS PLUGINS LINUX"}
     - {id: 217, cat: Other, desc: "GFXNEWS SCRIPTS - WEB PROGRAMMING"}
     - {id: 218, cat: Other, desc: "GFXNEWS TEMPLATES"}
     - {id: 232, cat: Other, desc: "GFXNEWS TEXTURES"}
@@ -280,7 +283,7 @@ search:
         - name: append
           args: " -07:00" # PDT
         - name: dateparse
-          args: "01-02-2006 -07:00"
+          args: "MM-dd-yyyy zzz"
 
   fields:
     title:
@@ -297,26 +300,22 @@ search:
       filters:
         - name: querystring
           args: f
-    size_optional:
-      optional: true
-      selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0kB), td:contains(\00a0B)
     size:
-      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
-    seeders_optional:
+      selector: td:contains(\00a0GB), td:contains(\00a0MB), td:contains(\00a0kB), td:contains(\00a0B)
       optional: true
-      selector: td[title="Seeders"]
+      default: 0
     seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
+      selector: td[title="Seeders"]
       optional: true
-      selector: td[title="Leechers"]
+      default: 0
     leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    grabs_optional:
+      selector: td[title="Leechers"]
       optional: true
-      selector: td[title^="Replies:"]
+      default: 0
     grabs:
-      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
+      selector: td[title^="Replies:"]
+      optional: true
+      default: 0
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/aussierules.yml

@@ -79,7 +79,7 @@ search:
       selector: td:nth-child(2) > div:nth-child(2)
       filters:
         - name: dateparse
-          args: "2-01-2006 15:04"
+          args: "d-MM-yyyy HH:mm"
     size:
       selector: td:nth-child(5)
     grabs:

src/Jackett.Common/Definitions/backups.yml

@@ -15,12 +15,14 @@ caps:
     - {id: 51, cat: PC/Mac, desc: "Apple"}
     - {id: 3, cat: PC, desc: "Apps"}
     - {id: 64, cat: Audio/Audiobook, desc: "Audiobooks"}
+    - {id: 71, cat: Console, desc: "Batocera"}
     - {id: 4, cat: Movies/BluRay, desc: "Blu-Ray"}
     - {id: 22, cat: Console, desc: "CoinOps"}
     - {id: 42, cat: Console, desc: "CoinOPS Official"}
     - {id: 65, cat: Console, desc: "CoinOps Unofficial"}
     - {id: 63, cat: Books/Comics, desc: "Comics"}
     - {id: 60, cat: Console, desc: "Core"}
+    - {id: 72, cat: Console, desc: "CORE Community"}
     - {id: 44, cat: Console, desc: "CP78"}
     - {id: 16, cat: TV/Documentary, desc: "Docu"}
     - {id: 41, cat: Console, desc: "Dragon"}
@@ -121,11 +123,10 @@ search:
           args: category
     title_default:
       selector: a[href*="/details.php?id="]
-    title_optional:
-      optional: true
-      selector: div.tooltip-content > div
     title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      selector: div.tooltip-content > div
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href*="/details.php?id="]
       attribute: href
@@ -162,5 +163,5 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "dd-MM-yyyy HH:mm zzz"
 # TS Special Edition v.8.0

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -5,16 +5,19 @@ description: "Badass Torrents is a Public torrent site for MOVIES / TV / GENERAL
 language: en-US
 type: public
 encoding: UTF-8
-requestDelay: 2
+requestDelay: 5
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.art/
+  - https://badasstorrents.mrunblock.life/
+  - https://badasstorrents.nocensor.click/
 legacylinks:
   - https://badasstorrents.nocensor.work/
   - https://badasstorrents.nocensor.biz/
   - https://badasstorrents.nocensor.sbs/
   - https://badasstorrents.nocensor.world/
   - https://badasstorrents.nocensor.lol/
+  - https://badasstorrents.nocensor.art/
+  - https://badasstorrents.mrunblock.guru/
 
 caps:
   categories:
@@ -81,8 +84,6 @@ search:
   paths:
     - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}{{ .Config.sort }}/{{ .Config.type }}"
     - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}26/{{ .Config.sort }}/{{ .Config.type }}"
-    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}51/{{ .Config.sort }}/{{ .Config.type }}"
-    - path: "torrents/{{ if .Keywords }}search/{{ .Keywords }}/{{ else }}{{ end }}76/{{ .Config.sort }}/{{ .Config.type }}"
 
   rows:
     selector: table.table-hover > tbody > tr:has(a[href*="/torrent/"])

src/Jackett.Common/Definitions/bangumi-moe.yml

@@ -64,11 +64,10 @@ search:
     date:
       # 2021-10-19T06:10:15.772Z
       selector: publish_time
-    size_optional:
-      optional: true
-      selector: size
     size:
-      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
+      selector: size
+      optional: true
+      default: 0 B
     grabs:
       selector: downloads
     seeders:

src/Jackett.Common/Definitions/beitai.yml

@@ -90,6 +90,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -97,12 +98,11 @@ search:
   fields:
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     category:
       selector: a[href^="?cat="]
       attribute: href
@@ -127,7 +127,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
@@ -136,7 +136,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -163,5 +163,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/bestcore.yml

@@ -124,24 +124,22 @@ search:
 
   fields:
     category:
-      text: 38
-    category|noappend:
       selector: a[href^="browse.php?cat="]
       attribute: href
       optional: true
+      default: 38
       filters:
         - name: querystring
           args: cat
     title_default:
       # can be abbreviated
       selector: a[href^="details.php?id="]
-    title_optional:
+    title:
       # usually full length
       selector: a[href^="details.php?id="]
       attribute: title
       optional: true
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -169,7 +167,7 @@ search:
         - name: replace
           args: ["\xA0", " "]
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     files:
       selector: td:nth-child(5)
     size:

src/Jackett.Common/Definitions/beyond-hd.yml

@@ -76,7 +76,6 @@ search:
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tmdb: "{{ .Query.TMDBID }}"
     sorting: "{{ .Config.sort }}"
@@ -87,15 +86,14 @@ search:
     selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
 
   fields:
-    category_optional:
+    category:
       selector: a[href*="/categories/"]
-      optional: true
       attribute: href
+      optional: true
+      default: 1
       filters:
         - name: regexp
           args: "/categories/.*?\\.(\\d+)"
-    category:
-      text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
     title:
       selector: a.torrent-name
     details:

src/Jackett.Common/Definitions/bibliotik.yml

@@ -80,14 +80,13 @@ search:
         div[title="Comics"]: 4
         div[title="Ebooks"]: 5
         div[title="Magazines"]: 7
-    author_optional:
-      selector: .authorLink
-      optional: true
     _editor:
       selector: .editorLink
       optional: true
     author:
-      text: "{{ or .Result.author_optional .Result._editor }}"
+      selector: .authorLink
+      optional: true
+      default: "{{ .Result._editor }}"
     year:
       selector: .torYear
       optional: true
@@ -108,9 +107,10 @@ search:
       selector: .title a
       attribute: href
     date:
-      optional: true
       selector: .t_files_size_added time
       attribute: datetime
+      optional: true
+      default: now
     download:
       selector: a[title="Download"]
       attribute: href
@@ -122,21 +122,18 @@ search:
     size:
       selector: .t_files_size_added span
       attribute: data-bytecount
-    seeders_optional:
-      optional: true
-      selector: .seeders
     seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
+      selector: .seeders
       optional: true
-      selector: .leechers
+      default: 0
     leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    grabs_optional:
+      selector: .leechers
       optional: true
-      selector: .snatches
+      default: 0
     grabs:
-      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
+      selector: .snatches
+      optional: true
+      default: 0
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/bigfangroup.yml

@@ -63,9 +63,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
-    label: Strip Russian Letters
+    label: Strip Cyrillic Letters
+    default: false
+  - name: addrussiantotitle
+    type: checkbox
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
   - name: sort
     type: select
@@ -99,10 +103,13 @@ search:
     s: "{{ .Config.sort }}"
     d: "{{ .Config.type }}"
 
+  keywordsfilters:
+    # strip season and/or ep
+    - name: re_replace
+      args: ["(?i)\\b(?:[SE]\\d{1,4}){1,2}\\b\\s?", ""]
+
   rows:
     selector: table > tbody#highlighted > tr:has(a[href^="browse.php?cat="])
-    filters:
-      - name: andmatch
 
   fields:
     category:
@@ -116,25 +123,57 @@ search:
       filters:
         # normalize to SXXEYY format
         - name: re_replace
-          args: ["[\\.\\,\\:\\-\\/\\|]", " "]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3-$4 rus $5"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+).+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.*)", "$1 S$2E$3 rus $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]езон\\s+(\\d+)(.*)", "$1 S$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))?", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(.*)[CСcс]]ери[ия]\\s+(\\d+)(.*)", "$1 E$2 rus $3"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)\\s*(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "S$1E$2 of $3"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$1$2$3$4{{ end }}"]
-        - name: replace
-          args: ["WEBRip", "WEBDL"]
-        - name: replace
-          args: ["WEB DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*[CС]езоны?.+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?).+?(\\d+(?:-\\d+)?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "S$1E$2"]
+        - name: re_replace
+          args: ["(?i)[CС]езоны?[\\s:]*(\\d+(?:-\\d+)?)", "S$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "S$1"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s*из\\s*(\\w?)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))\\s+из\\s*(\\w?)", "E$1 of $2"]
+        - name: re_replace
+          args: ["(?i)(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))[\\s:]*(\\d+(?:-\\d+)?)", "E$1"]
+        - name: re_replace
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+(?:\\s*(?:[CС]ери[ияй]|Эпизод|Выпуски?))", "E$1"]
+        - name: re_replace
+          args: ["(?i)\\s\\|\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
+        - name: re_replace
+          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: append
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -183,9 +222,11 @@ search:
         - name: append
           args: " +03:00" # MSK
         - name: dateparse
-          args: "2 January 2006 15:04:05 -07:00"
+          args: "d MMMM yyyy HH:mm:ss zzz"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:
       text: 1
+    description:
+      selector: a[href^="details.php?id="]
 # engine n/a

src/Jackett.Common/Definitions/bitbazis.yml

@@ -63,7 +63,7 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Filter freeleech only
@@ -94,7 +94,7 @@ login:
     cookie: "{{ .Config.cookie }}"
   test:
     path: index.php
-    selector: i[onclick^="window.open('logout.php?k="]
+    selector: li[onclick^="window.open('logout.php?k="]
 
 search:
   paths:
@@ -117,49 +117,39 @@ search:
     # can support genre searching but you need to know the id, eg &genre23=1 for Comedy (id is 23)
 
   rows:
-    selector: "table[width=\"100%\"][align=\"center\"]:first-child tbody tr:has(div.tooltip){{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
+    selector: "tr[class^=\"toriadatok_\"]{{ if .Config.freeleech }}:has(i:contains(\"(Free)\")){{ else }}{{ end }}"
 
   fields:
     categorydesc:
       selector: img[src^="pic/kategoria/"]
       attribute: title
-    genre:
-      selector: span.tooltiptext
-    description:
-      text: "{{ .Result.genre }}"
     title:
-      selector: div.tooltip
-      remove: span
+      selector: a.preview
+    _id:
+      selector: td.tori_infok
+      attribute: id
+      filters:
+        - name: regexp
+          args: (\d+)
     details:
-      selector: a[href^="details.php?id="]
-      attribute: href
+      text: "details.php?id={{ .Result._id }}#adatlap"
+    download:
+      text: "download.php?torrent={{ .Result._id }}"
     poster:
       selector: a.preview
       attribute: href
-    download_1:
-      selector: a[href^="download.php?torrent="]
-      optional: true
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
       attribute: href
-    download_2:
-      selector: input[onclick*="download.php?torrent="]
-      optional: true
-      attribute: onclick
-      filters:
-        - name: replace
-          args: ["window.open('", ""]
-        - name: replace
-          args: ["', '_self');", ""]
-    download:
-      text: "{{ if or .Result.download_1 .Result.download_2 }}{{ or .Result.download_1 .Result.download_2 }}{{ else }}{{ end }}"
     size:
-      selector: td:nth-child(6)
+      selector: td[id^="tsize_"]
     date:
       # 36 perce
       # 13 órája  és 59 perce
       # 2 napja  és 10 órája
       # 1 hete  és 1 napja
       # 1 éve  és 30 hete
-      selector: td:nth-child(7) span:last-child
+      selector: td[id^="t_added_"] > span
       filters:
         - name: replace
           args: ["és ", " "]
@@ -180,6 +170,10 @@ search:
       selector: td:nth-child(3)
     leechers:
       selector: td:nth-child(4)
+    genre:
+      selector: span[style="font-size:small;"]
+    description:
+      text: "{{ .Result.genre }}"
     downloadvolumefactor:
       case:
         "i:contains(\"(Free)\")": 0

src/Jackett.Common/Definitions/bitded.yml

@@ -126,7 +126,7 @@ search:
         - name: append
           args: " +07:00" # ICT
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/bithorlo.yml

@@ -59,7 +59,7 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -137,7 +137,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     downloadvolumefactor:
       case:
         img[title="Ingyenes letöltés"]: 0

src/Jackett.Common/Definitions/bithumen.yml

@@ -87,12 +87,11 @@ search:
           args: "/invalid.torrent"
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -126,14 +125,13 @@ search:
       selector: td:nth-child(6) > u
     downloadvolumefactor:
       text: 0
-    uploadvolumefactor_optional:
-      optional: true
+    uploadvolumefactor:
       selector: td:nth-child(5) > nobr > font:contains(" × ")
+      optional: true
+      default: 1
       filters:
         - name: replace
           args: ["×", ""]
-    uploadvolumefactor:
-      text: "{{ if .Result.uploadvolumefactor_optional }}{{ .Result.uploadvolumefactor_optional }}{{ else }}1{{ end }}"
     date_year:
       selector: td:nth-child(5):contains('.')
       optional: true

src/Jackett.Common/Definitions/bitnova.yml

@@ -111,7 +111,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     downloadvolumefactor:
       text: 1
     uploadvolumefactor:

src/Jackett.Common/Definitions/bitofvalor.yml

@@ -131,7 +131,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     size:
       selector: td:nth-child(5)
     grabs:

src/Jackett.Common/Definitions/bitru.yml

@@ -31,13 +31,13 @@ caps:
     book-search: [q]
 
 settings:
-  - name: striprussian
+  - name: stripcyrillic
     type: checkbox
     label: Strip Russian Letters
     default: false
-  - name: addrussian
+  - name: addrussiantotitle
     type: checkbox
-    label: Add RUSSIAN to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
+    label: Add RUS to end of all titles to improve language detection by Sonarr and Radarr. Will cause English-only results to be misidentified.
     default: false
   - name: adverts
     type: checkbox
@@ -58,7 +58,8 @@ search:
   inputs:
     s: "{{ .Keywords }}"
     sort: "{{ re_replace .Config.sort \"_\" \"\" }}"
-    $raw: "{{ if .Config.adverts }}{{ else }}&rek=no{{ end}}"
+    rek: "{{ if .Config.adverts }}{{ else }}no{{ end }}"
+
   keywordsfilters:
     - name: re_replace # S01 or S01E01 to 1 сезон
       args: ["(?i)\\bS0*(\\d+)(?:E0*(\\d+))?\\b", "$1 сезон"]
@@ -76,28 +77,44 @@ search:
     title:
       selector: a[href^="details.php?id="]
       filters:
-        - name: replace
-          args: ["селезень", "selezen"]
         - name: re_replace
-          args: ["(?:(\\d+-*\\d*)\\s+[Сс]езоны?:?)\\s+\\((\\d+-*\\d*).*[?\\d]+\\)(.*)(\\((?:[12][0-9]{3}-?){1,}\\))(.*)", "$3 - S$1E$2 - $4 $5"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?\\s*[:]*.+?\\((\\d+(?:-\\d+)?)\\s*из\\s*(\\d+)\\)", "(S$1E$2 of $3)"]
         - name: re_replace
-          args: ["\\((\\d+-*\\d*).*[?\\d]+\\)(.*)(\\((?:[12][0-9]{3}-?){1,}\\))(.*)", "$2 - E$1 - $3 $4"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?\\s*[:]*.+?\\((\\d+(?:-\\d+)?)\\)", "(S$1E$2)"]
         - name: re_replace
-          args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"]
+          args: ["(?i)(\\d+(?:-\\d+)?)\\s+[CС]езоны?", "(S$1)"]
         - name: re_replace
-          args: ["[!?.,:|\\[\\]\\/]", " "]
+          args: ["(?i)\\((\\d+(?:-\\d+)?)\\s*из\\s*(\\d+)\\)", "(E$1 of $2)"]
         - name: re_replace
-          args: ["^\\s+-\\s+", " "]
+          args: ["(?i)\\bселезень\\b", "selezen"]
+        - name: re_replace
+          args: ["(?i)\\bFiles-х\\b", "Files-x"]
+        - name: re_replace
+          args: ["(?i)\\s\\|\\sот\\s([\\w\\p{P}\\p{S}]+)$", "-$1"]
+        - name: re_replace
+          args: ["\\s\\|\\s(\\w{4,})$", "-$1"]
+        - name: re_replace
+          args: ["(\\([\\p{IsCyrillic}\\W]+\\))|(^[\\p{IsCyrillic}\\W\\d]+\\/ )|([\\p{IsCyrillic} \\-]+,+)|([\\p{IsCyrillic}]+)", "{{ if .Config.stripcyrillic }}{{ else }}$1$2$3$4{{ end }}"]
+        - name: re_replace
+          args: ["(?i)\\bHDTV[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bSAT[-\\s]?Rip\\b", "HDTV"]
+        - name: re_replace
+          args: ["(?i)\\bWEB[-\\s]?DL[-\\s]?Rip\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sRip\\b", "WEBRip"]
+        - name: re_replace
+          args: ["(?i)\\bWEB\\sDL\\b", "WEB-DL"]
+        - name: re_replace
+          args: ["[\\[\\(\\{<«][\\s\\W]*[\\]\\)\\}>»]", ""]
+        - name: re_replace
+          args: ["^[\\s&,\\.!\\?\\+\\-_\\|\\/':]+", ""]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)(-[\\w\\p{P}\\p{S}]*)$", "$2 $1$3"]
+        - name: re_replace
+          args: ["(?i)^\\(\\s*([SE]\\d+.*?)\\s*\\)[\\s\\/\\|]*(.+)", "$2 $1"]
         - name: append
-          args: "{{ if .Config.addrussian }} - RUSSIAN{{ else }}{{ end }}"
-        - name: replace
-          args: ["-Rip", "Rip"]
-        - name: replace
-          args: ["WEB-DL", "WEBDL"]
-        - name: replace
-          args: ["WEBDLRip", "WEBDL"]
-        - name: replace
-          args: ["HDTVRip", "HDTV"]
+          args: "{{ if .Config.addrussiantotitle }} RUS{{ else }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -166,7 +183,7 @@ search:
         - name: append
           args: " +03:00" # MSK
         - name: dateparse
-          args: "02 January 2006 15:04 -07:00"
+          args: "dd MMMM yyyy HH:mm zzz"
     date:
       text: "{{ if or .Result.date_today .Result.date_year }}{{ or .Result.date_today .Result.date_year }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/bitsearch.yml

@@ -5,13 +5,17 @@ description: "BitSearch is a Public torrent meta-search engine"
 language: en-US
 type: public
 encoding: UTF-8
+requestDelay: 2
 links:
   - https://bitsearch.to/
+  - https://bitsearch.mrunblock.life/
+  - https://bitsearch.nocensor.click/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/
   - https://bitsearch.nocensor.world/
   - https://bitsearch.nocensor.lol/
+  - https://bitsearch.mrunblock.guru/
 
 caps:
   categories:
@@ -76,6 +80,7 @@ search:
     q: "{{ .Keywords }}"
     sort: "{{ .Config.sort }}"
     order: "{{ .Config.type }}"
+    limit: 100
 
   keywordsfilters:
     - name: re_replace
@@ -134,7 +139,7 @@ search:
       selector: div.stats div:has(img[alt="Date"])
       filters:
         - name: dateparse
-          args: "Jan 2, 2006"
+          args: "MMM d, yyyy"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/bitsexy.yml

@@ -99,9 +99,6 @@ login:
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    use_ssl: 1
-    perm_ssl: ""
-    returnto: "/"
   error:
     - selector: table.main:contains("failed")
   test:
@@ -164,7 +161,7 @@ search:
       optional: true
       filters:
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM"
+          args: "MMM d yyyy hh:mm tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/bitspyder.yml

@@ -4,7 +4,7 @@ name: Bitspyder
 description: "Bitspyder is a Private site for Educational BOOKS / AUDIO"
 language: en-US
 type: private
-encoding: windows-1252
+encoding: iso-8859-1
 links:
   - https://bitspyder.net/
 legacylinks:
@@ -87,12 +87,14 @@ login:
   error:
     - selector: td.msg_info > font > b
   test:
-    path: browse.php
+    path: index.php
+    selector: a[href="logout.php"]
 
 search:
   paths:
     - path: browse.php
   inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 incldead, 2 onlydead
     incldead: 1
@@ -101,10 +103,15 @@ search:
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
 
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\s+", " "] # More than 1 space to 1 space
+    - name: re_replace
+      args: ["(\\w+)", "+$1"] # prepend + to each word
+    - name: trim
+
   rows:
     selector: table > tbody > tr[class]
-    filters:
-      - name: andmatch
 
   fields:
     # there are two styles, we support both
@@ -148,7 +155,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_upload:
       optional: true
       selector: a[title^="Upploaded at"]
@@ -161,7 +168,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_upload .Result.date_added }}{{ or .Result.date_upload .Result.date_added }}{{ else }}now{{ end }}"
     downloadvolumefactor:

src/Jackett.Common/Definitions/bitturk.yml

@@ -96,7 +96,7 @@ settings:
   - name: info
     type: info
     label: Layout
-    default: "<ol><li>Only the English Classic profile is supported.<li>Make sure to set the <b>Torrent Listing (Listeleme Biçimi)</b> option in your profile to <b>Classic (Klasik)</b><li>And set the <b>Language (Dil)</b> to <b>English</b><li>Using the <i>Modern</i> theme will prevent results, and using <i>Turkish</i> will prevent upload dates.</ol>"
+    default: "<ol><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing (Listeleme Biçimi)</b> option in your profile to <b>Classic (Klasik)</b></li><li>And set the <b>Language (Dil)</b> to <b>English</b></li><li>Using the <i>Modern</i> theme will prevent results, and using <i>Turkish</i> will prevent upload dates.</li></ol>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -193,7 +193,7 @@ search:
         - name: regexp
           args: "Uploaded (.+?) by"
         - name: dateparse
-          args: "02-01-2006 15:04"
+          args: "dd-MM-yyyy HH:mm"
     date_unix:
       # within the hour (unix)
       selector: abbr[data-time]

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

@@ -29,7 +29,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.cc/\" target =_blank>Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://blutopia.cc/\" target=\"_blank\">Blutopia</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -72,12 +72,17 @@ search:
   inputs:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=100{{ else }}{{ end }}"
+    seasonNumber: "{{ .Query.Season }}"
+    episodeNumber: "{{ .Query.Ep }}"
+    imdbId: "{{ .Query.IMDBIDShort }}"
+    tmdbId: "{{ .Query.TMDBID }}"
+    tvdbId: "{{ .Query.TVDBID }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
-    page: 1
 
   keywordsfilters:
     - name: re_replace
@@ -86,8 +91,6 @@ search:
   rows:
     selector: data
     attribute: attributes
-    count:
-      selector: meta.total
 
   fields:
     category:
@@ -137,7 +140,7 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "01/02/2006 15:04:05 -07:00"
+          args: "MM/dd/yyyy HH:mm:ss zzz"
     size:
       selector: size
     downloadvolumefactor:
@@ -162,4 +165,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.5.0b
+# json UNIT3D 7.0.0b

src/Jackett.Common/Definitions/bootytape.yml

@@ -106,26 +106,22 @@ search:
     poster:
       selector: img[src*="/thbx/imgx/"]
       attribute: src
-    files_optional:
+    files:
       selector: a[href$="filelist=1"]
       optional: true
-    files:
-      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
-    size_optional:
+      default: 1
+    size:
       selector: td:nth-child(3)
       optional: true
-    size:
-      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
-    seeders_optional:
+      default: 0
+    seeders:
       selector: a[href$="toseeders=1"]
       optional: true
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
+      default: 0
+    leechers:
       selector: a[href$="todlers=1"]
       optional: true
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+      default: 0
     date:
       text: now
     downloadvolumefactor:

src/Jackett.Common/Definitions/boxingtorrents.yml

@@ -26,6 +26,7 @@ caps:
     - {id: 4, cat: TV/Sport, desc: "Full - Poor"}
     - {id: 14, cat: TV/Sport, desc: "HD"}
     - {id: 7, cat: TV/Sport, desc: "Misc"}
+    - {id: 18, cat: TV/Sport, desc: "Instructional"}
 
   modes:
     search: [q]
@@ -121,7 +122,7 @@ search:
         - name: append
           args: " -07:00" # PDT
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     size:
       selector: td:nth-last-child(5)
     grabs:

src/Jackett.Common/Definitions/broadcity.yml

@@ -49,7 +49,11 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
+  - name: freeleech
+    type: checkbox
+    label: Filter freeleech only
+    default: false
 
 login:
   method: cookie
@@ -81,7 +85,7 @@ search:
     include_dead_torrents: yes
 
   rows:
-    selector: table#sortabletable tbody tr:has(div[id^="port-target-"])
+    selector: "table#sortabletable tbody tr:has(div[id^=\"port-target-\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}"
 
   fields:
     category:
@@ -109,7 +113,7 @@ search:
         - name: append
           args: " +03:00" # TRT
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "dd-MM-yyyy HH:mm zzz"
     size:
       selector: td:nth-child(5)
     grabs:

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

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 1, cat: TV, desc: "Cursos"}
+    - {id: 1, cat: Other, desc: "Cursos"}
     - {id: 2, cat: Books/EBook, desc: "eBooks"}
     - {id: 5, cat: Books/Mags, desc: "Revistas"}
     - {id: 3, cat: Audio/Audiobook, desc: "Audiobooks"}
@@ -30,7 +30,7 @@ settings:
   - name: info_key
     type: info
     label: About your API key
-    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target =_blank>BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
+    default: "Find or Generate a new API Token by accessing your <a href=\"https://brsociety.club/\" target=\"_blank\">BrSociety</a> account <i>My Security</i> page and clicking on the <b>API Token</b> tab."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -66,10 +66,24 @@ search:
   paths:
     # https://hdinnovations.github.io/UNIT3D-Community-Edition-Docs/api_endpoints.html
     # https://github.com/HDInnovations/UNIT3D-Community-Edition/blob/master/app/Http/Controllers/API/TorrentController.php
-    - path: "/api/torrents/filter?api_token={{ .Config.apikey }}&name={{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}&sortField={{ .Config.sort }}&sortDirection={{ .Config.type }}&perPage=100&page=1{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    - path: "/api/torrents/filter"
       response:
         type: json
 
+  inputs:
+    api_token: "{{ .Config.apikey }}"
+    $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}"
+    name: "{{ .Keywords }}"
+    "free[]": "{{ if .Config.freeleech }}100{{ else }}{{ end }}"
+    sortField: "{{ .Config.sort }}"
+    sortDirection: "{{ .Config.type }}"
+    perPage: 100
+    page: 1
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["\\.", " "]
+
   rows:
     selector: data
     attribute: attributes
@@ -77,32 +91,19 @@ search:
       selector: meta.total
 
   fields:
-    categorydesc:
-      selector: category
+    category:
+      selector: category_id
     title:
       selector: name
     details:
       selector: details_link
     download:
       selector: download_link
-    size:
-      selector: size
     magnet:
       selector: magnet_link
       optional: true
-    poster:
-      selector: poster
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-        - name: replace
-          args: ["https://via.placeholder.com/400x600", ""]
-    imdbid:
-      selector: imdb_id
-    tmdbid:
-      selector: tmdb_id
-    tvdbid:
-      selector: tvdb_id
+    infohash:
+      selector: info_hash
     files:
       selector: num_file
     seeders:
@@ -118,13 +119,19 @@ search:
         - name: append
           args: " +00:00" # GMT
         - name: dateparse
-          args: "01/02/2006 15:04:05 -07:00"
+          args: "MM/dd/yyyy HH:mm:ss zzz"
+    size:
+      selector: size
     downloadvolumefactor:
-      # api returns 0=false, 1=true
+      # api returns 0%, 25%, 50%, 75%, 100%
       selector: freeleech
       case:
-        0: 1 # not free
-        1: 0 # freeleech
+        0%: 1 # not free
+        25%: 0.75
+        50%: 0.5
+        75%: 0.25
+        100%: 0 # freeleech
+        "*": 0 # catch errors
     uploadvolumefactor:
       # api returns 0=false, 1=true
       selector: double_upload
@@ -134,6 +141,6 @@ search:
     minimumratio:
       text: 1.0
     minimumseedtime:
-      # 5 days (as seconds = 5 x 24 x 60 x 60)
-      text: 432000
-# json UNIT3D 5.3.0
+      # 4 days (as seconds = 4 x 24 x 60 x 60)
+      text: 345600
+# json UNIT3D 6.5.0 (custom)

src/Jackett.Common/Definitions/bt4g.yml

@@ -1,77 +0,0 @@
----
-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, season, ep]
-    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|append:
-      # 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/btdigg.yml

@@ -7,13 +7,14 @@ type: public
 encoding: UTF-8
 links:
   - https://btdig.com/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/
-  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.to/
 legacylinks:
   - http://btdiggwzoyrwwbiv.onion.ly/
   - https://btdiggwzoyrwwbiv.onion.ly/
   - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ws/ # redirects to spam
   - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.pet/ # not found
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.onion.ly/ # 504 gateway timeout
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.to/ # 504 gateway timeout
+  - https://btdigggink2pdqzqrik3blmqemsbntpzwxottujilcdjfz56jumzfsyd.tor2web.link/ # Origin is unreachable Error code 523
 
 caps:
   categories:
@@ -71,11 +72,10 @@ search:
       filters:
         - name: replace
           args: ["found ", ""]
-    files_optional:
+    files:
       selector: span.torrent_files
       optional: true
-    files:
-      text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
+      default: 1
     size:
       selector: span.torrent_size
     seeders:

src/Jackett.Common/Definitions/btetree.yml

@@ -61,7 +61,7 @@ search:
         - name: replace
           args: ["  ", " 0"]
         - name: dateparse
-          args: "01/02 15:04"
+          args: "MM/dd HH:mm"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/btnext.yml

@@ -114,7 +114,7 @@ settings:
   - name: info
     type: info
     label: Layout
-    default: "<ol><li>Only the English Classic profile is supported.<li>Make sure to set the <b>Torrent Listing (Lista de Torrents)</b> option in your profile to <b>Classic (Clássico)</b><li>Using the <i>Moderna</i> theme will prevent results.</ol>"
+    default: "<ol><li>Only the English Classic profile is supported.</li><li>Make sure to set the <b>Torrent Listing (Lista de Torrents)</b> option in your profile to <b>Classic (Clássico)</b></li><li>Using the <i>Moderna</i> theme will prevent results.</li></ol>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -238,7 +238,7 @@ search:
         - name: append
           args: " +00:00" # WET
         - name: dateparse
-          args: "02-01-2006 15:04 -07:00"
+          args: "dd-MM-yyyy HH:mm zzz"
     date_day:
       selector: td.torrent_name:not(:has(abbr.timeago)):contains("day"), td.torrent_name:not(:has(abbr.timeago)):contains("Domingo"), td.torrent_name:not(:has(abbr.timeago)):contains("Sábado"), td.torrent_name:not(:has(abbr.timeago)):contains("Quinta"), td.torrent_name:not(:has(abbr.timeago)):contains("Sexta"), td.torrent_name:not(:has(abbr.timeago)):contains("Quarta"), td.torrent_name:not(:has(abbr.timeago)):contains("Terça"), td.torrent_name:not(:has(abbr.timeago)):contains("Segunda"), td.torrent_name:not(:has(abbr.timeago)):contains("ontem"), td.torrent_name:not(:has(abbr.timeago)):contains("Hoje")
       optional: true

src/Jackett.Common/Definitions/btschool.yml

@@ -82,6 +82,7 @@ search:
     search_mode: 0
     sort: 4
     type: desc
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -111,7 +112,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
@@ -120,7 +121,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -149,5 +150,5 @@ search:
       text: 1.0
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/btsow.yml

@@ -7,9 +7,8 @@ type: public
 encoding: UTF-8
 # use https://tellme.pw/btsow to find the new domain
 links:
-  - https://btsow.beauty/
+  - https://btsow.hair/
 legacylinks:
-  - https://btsow.store/
   - https://btsow.surf/
   - https://btsow.com/
   - https://btsow.cam/
@@ -24,6 +23,9 @@ legacylinks:
   - https://btsow.sbs/
   - https://btsow.quest/
   - https://btsow.autos/
+  - https://btsow.beauty/
+  - https://btsow.mom/
+  - https://btsow.boats/
 
 caps:
   categories:
@@ -72,7 +74,7 @@ search:
         - name: append
           args: " -00:00" # GMT
         - name: dateparse
-          args: "2006-01-02 -07:00"
+          args: "yyyy-MM-dd zzz"
     size:
       selector: div.size
     seeders:

src/Jackett.Common/Definitions/bulltorrent.yml

@@ -13,6 +13,8 @@ legacylinks:
   - https://www.toros.co/
   - https://toros.nocensor.biz/
   - https://toros.nocensor.lol/
+  - https://toros.mrunblock.guru/
+  - https://toros.mrunblock.life/ # Gateway time-out Error code 504
 
 caps:
   categorymappings:
@@ -108,7 +110,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2 Jan -07:00"
+          args: "d MMM zzz"
     date:
       text: "{{ if or .Result.date_year .Result.date_ago .Result.date_day }}{{ or .Result.date_year  .Result.date_ago .Result.date_day }}{{ else }}now{{ end }}"
     size:

src/Jackett.Common/Definitions/bwtorrents.yml

@@ -7,6 +7,9 @@ type: private
 encoding: UTF-8
 links:
   - https://bwtorrents.tv/
+  - https://bwtorrents.co/
+  - https://bwtorrents.cc/
+legacylinks:
   - https://bwtorrents.fun/
   - https://bwtorrents.xyz/
   - https://bwtorrents.us/
@@ -187,7 +190,7 @@ search:
       # auto adjusted by site account profile
       filters:
         - name: dateparse
-          args: "02-01-200615:04:05"
+          args: "dd-MM-yyyyHH:mm:ss"
     size:
       selector: td:nth-child(6)
     download:

src/Jackett.Common/Definitions/byrbt.yml

@@ -38,10 +38,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -58,6 +54,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: login.php
@@ -76,8 +76,6 @@ login:
     trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("failed!"))
-    - selector: td.embedded:has(h2:contains("Failed"))
   test:
     path: index.php
     selector: a[href^="logout.php?key="]
@@ -98,6 +96,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -111,12 +110,11 @@ search:
           args: cat
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -135,7 +133,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td.rowfollow:nth-last-of-type(6):not(:has(span))
@@ -144,7 +142,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -169,12 +167,12 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-    description:
-      selector: td:nth-child(2)
-      remove: a, img
     minimumratio:
       text: 1.0
     minimumseedtime:
       # 1 day (as seconds = 1 x 24 x 60 x 60)
       text: 86400
+    description:
+      selector: td:nth-child(2)
+      remove: a, b, font, img, span
 # NexusPHP v1.5 beta 5 20120707

src/Jackett.Common/Definitions/byrutor.yml

@@ -6,9 +6,10 @@ language: ru-RU
 type: public
 encoding: UTF-8
 links:
-  - https://byrut.org/
+  - https://byrutdb.org/
 legacylinks:
   - https://byrutor.org/
+  - https://byrut.org/
 
 caps:
   categorymappings:
@@ -383,7 +384,7 @@ search:
         - name: regexp
           args: ".*/(\\d{4}-\\d{2})/.*"
         - name: dateparse
-          args: "2006-01"
+          args: "yyyy-MM"
     seeders:
       text: 1
     leechers:
@@ -391,6 +392,7 @@ search:
     size_rus:
       selector: div.shor_subtitles span:nth-child(2):contains("Б")
       optional: true
+      default: "0 B"
       filters:
         - name: replace
           args: ["ТБ", "TB"]
@@ -400,11 +402,10 @@ search:
           args: ["МБ", "MB"]
         - name: replace
           args: ["КБ", "KB"]
-    size_eng:
+    size:
       selector: div.shor_subtitles span:nth-child(2):contains("B")
       optional: true
-    size:
-      text: "{{ if or .Result.size_rus .Result.size_eng }}{{ or .Result.size_rus .Result.size_eng }}{{ else }}0 B{{ end }}"
+      default: "{{ .Result.size_rus }}"
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/carphunter.yml

@@ -57,7 +57,7 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -154,7 +154,7 @@ search:
         - name: append
           args: " +01:00" # CET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     files:
       selector: td:nth-last-child(7)
     size:

src/Jackett.Common/Definitions/carpt.yml

@@ -102,6 +102,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
@@ -115,18 +116,20 @@ search:
           args: cat
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
       # site currently only has a badge and rating, the id is not present. just in case a future update.
       selector: a[href*="imdb.com/title/tt"]
@@ -144,7 +147,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td.rowfollow:nth-child(4):not(:has(span))
@@ -153,7 +156,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -185,5 +188,5 @@ search:
       text: 86400
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP v1.7.16
+      remove: a, b, font, img, span
+# NexusPHP v1.7.37 2023-05-08

src/Jackett.Common/Definitions/cartoonchaos.yml

@@ -114,10 +114,6 @@ search:
           args: ["(?i)\\.torrent$", ""]
     title_text:
       selector: td a[href^="index.php?page=torrent-details"]
-      filters:
-        #  #11775
-        - name: re_replace
-          args: ["(?i)(season )", "S"]
     category:
       selector: td a[href^="index.php?page=torrents&category="]
       attribute: href
@@ -126,6 +122,18 @@ search:
           args: category
     title:
       text: "{{ if .Result.title_torrent }}{{ .Result.title_torrent }}{{ else }}{{ .Result.title_text }}{{ end }}"
+      filters:
+        #  #11775
+        - name: re_replace # Seasons X-Y --> S0X-S0Y
+          args: ["(?i)\\bSeasons?[-.\\s]*(\\d)[-.\\s]*(?:-|to)[-.\\s]*(\\d)\\b", "S0$1-S0$2"]
+        - name: re_replace # Seasons X-YY --> S0X-SYY
+          args: ["(?i)\\bSeasons?[-.\\s]*(\\d)[-.\\s]*(?:-|to)[-.\\s]*(\\d+)\\b", "S0$1-S$2"]
+        - name: re_replace # Seasons XX-YY --> SXX-SYY
+          args: ["(?i)\\bSeasons?[-.\\s]*(\\d+)[-.\\s]*(?:-|to)[-.\\s]*(\\d+)\\b", "S$1-S$2"]
+        - name: re_replace # Season X --> S0X
+          args: ["(?i)\\bSeasons?[-.\\s]*(\\d)\\b", "S0$1"]
+        - name: re_replace # Season XX --> SXX
+          args: ["(?i)\\bSeasons?[-.\\s]*(\\d+)\\b", "S$1"]
     details:
       selector: td a[href^="index.php?page=torrent-details"]
       attribute: href
@@ -155,7 +163,7 @@ search:
       optional: true
       filters:
         - name: re_replace
-          args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
+          args: ["[ ]at|[//\xa0\\s,]+", " "]
     date_year:
       # February 09, 2019, 06:35:08 AM
       selector: td:nth-child(5):not(:contains("day"))
@@ -163,9 +171,9 @@ search:
       optional: true
       filters:
         - name: re_replace
-          args: ["[,]|[\\s+]|[//\xa0],\\/g", " "]
+          args: ["[//\xa0\\s,]+", " "]
         - name: dateparse
-          args: "January 02  2006  03:04:05 PM"
+          args: "MMMM dd yyyy hh:mm:ss tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     seeders:

src/Jackett.Common/Definitions/cathoderaytube.yml

@@ -105,15 +105,15 @@ search:
       selector: a[href^="/torrents.php?id="]
       filters:
         - name: re_replace # Seasons X-Y --> S0X-S0Y
-          args: ["(?i)seasons?\\s*(\\d)\\s*-\\s*(\\d)\\b", "S0$1-S0$2"]
+          args: ["(?i)\\bSeasons?\\s*(\\d)\\s*-\\s*(\\d)\\b", "S0$1-S0$2"]
         - name: re_replace # Seasons X-YY --> S0X-SYY
-          args: ["(?i)seasons?\\s*(\\d)\\s*-\\s*(\\d+)\\b", "S0$1-S$2"]
+          args: ["(?i)\\bSeasons?\\s*(\\d)\\s*-\\s*(\\d+)\\b", "S0$1-S$2"]
         - name: re_replace # Seasons XX-YY --> SXX-SYY
-          args: ["(?i)seasons?\\s*(\\d+)\\s*-\\s*(\\d+)\\b", "S$1-S$2"]
+          args: ["(?i)\\bSeasons?\\s*(\\d+)\\s*-\\s*(\\d+)\\b", "S$1-S$2"]
         - name: re_replace # Season X --> S0X
-          args: ["(?i)season\\s*(\\d)\\b", "S0$1"]
+          args: ["(?i)\\bSeasons?\\s*(\\d)\\b", "S0$1"]
         - name: re_replace # Season XX --> SXX
-          args: ["(?i)season\\s*(\\d+)\\b", "S$1"]
+          args: ["(?i)\\bSeasons?\\s*(\\d+)\\b", "S$1"]
         - name: re_replace
           args: ["(?i)\\bComplete\\s+Series\\b", ""]
     details:
@@ -146,7 +146,7 @@ search:
       # auto adjusted by site account profile
       filters:
         - name: dateparse
-          args: "Jan 02 2006, 15:04"
+          args: "MMM dd yyyy, HH:mm"
     size:
       selector: td:nth-child(6)
     grabs:

src/Jackett.Common/Definitions/catorrent.yml

@@ -15,6 +15,7 @@ caps:
     - {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: PS5, cat: Console/Other, desc: "Playstation 5"}
     - {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"}

src/Jackett.Common/Definitions/ccfbits.yml

@@ -135,7 +135,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     downloadvolumefactor:
       case:
         "font[color=\"#C20603\"]:contains(\"免费\")": 0

src/Jackett.Common/Definitions/ceskeforum.yml

@@ -41,10 +41,6 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - name: sort
     type: select
     label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
     options:
       desc: desc
       asc: asc
+  - name: info_tpp
+    type: info
+    label: Results Per Page
+    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
 
 login:
   path: takelogin.php
@@ -96,6 +96,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
     # can support genre searching but you need to know the id, eg &team10=1 for Drama (id is 10)
 
   rows:
@@ -110,12 +111,11 @@ search:
           args: cat
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -134,7 +134,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td.rowfollow:nth-child(4):not(:has(span))
@@ -143,7 +143,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
@@ -170,7 +170,7 @@ search:
         "*": 1
     description:
       selector: td.rowfollow:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
     genre:
       selector: table.torrentname > tbody > tr > td:first-child
       remove: a

src/Jackett.Common/Definitions/chdbits.yml

@@ -60,8 +60,13 @@ settings:
       asc: asc
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
@@ -90,6 +95,7 @@ search:
     search_mode: 0
     sort: "{{ .Config.sort }}"
     type: "{{ .Config.type }}"
+    notnewword: 1
 
   rows:
     selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -103,12 +109,11 @@ search:
           args: cat
     title_default:
       selector: a[href^="details.php?id="]
-    title_optional:
-      optional: true
+    title:
       selector: a[title][href^="details.php?id="]
       attribute: title
-    title:
-      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+      optional: true
+      default: "{{ .Result.title_default }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -132,7 +137,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     date_added:
       # time added
       selector: td:nth-child(4):not(:has(span))
@@ -141,7 +146,7 @@ search:
         - name: append
           args: " +08:00" # CST
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     downloadvolumefactor:
@@ -160,5 +165,5 @@ search:
         "*": 1
     description:
       selector: td:nth-child(2)
-      remove: a, img
+      remove: a, b, font, img, span
 # NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/chilebt.yml

@@ -83,12 +83,9 @@ search:
   inputs:
     $raw: "{{ range .Categories }}categories[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" # for dashboard imdbid search
-    description: ""
-    uploader: ""
     imdb: "{{ .Query.IMDBIDShort }}"
     tvdb: "{{ .Query.TVDBID }}"
     tmdb: "{{ .Query.TMDBID }}"
-    mal: ""
     sorting: "{{ .Config.sort }}"
     direction: "{{ .Config.type }}"
     qty: 100

src/Jackett.Common/Definitions/cinemageddon.yml

@@ -84,7 +84,7 @@ search:
         - name: append
           args: " -07:00" # PDT
         - name: dateparse
-          args: "2006-01-0215:04:05 -07:00"
+          args: "yyyy-MM-ddHH:mm:ss zzz"
     size:
       selector: td:nth-child(5)
       filters:

src/Jackett.Common/Definitions/cinemamovies.yml

@@ -45,7 +45,7 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -56,15 +56,15 @@ settings:
     default: false
   - name: multilang
     type: checkbox
-    label: Replace MULTI & PL by another language in release name
+    label: Replace MULTi by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI & PL by this language
+    label: Replace MULTi by this language
     default: POLISH
     options:
       POLISH: POLISH
-      MULTI.POLISH: MULTI.POLISH
+      MULTi POLISH: MULTi POLISH
   - name: sort
     type: select
     label: Sort requested from site
@@ -122,9 +122,9 @@ search:
       text: "{{ .Result.title_raw }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\[multi\\])", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
         - name: re_replace
-          args: ["(?i)(\\[pl\\])", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
     title_phase1:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_raw }}{{ end }}"
     title_stripped:
@@ -170,7 +170,7 @@ search:
         - name: append
           args: " +02:00" # EET
         - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
+          args: "yyyy-MM-dd HH:mm:ss zzz"
     size:
       selector: td:nth-child(4)
     seeders:

src/Jackett.Common/Definitions/cloudtorrents.yml

@@ -1,77 +0,0 @@
----
-id: cloudtorrents
-name: CloudTorrents
-description: "CloudTorrents is a Public Torrent Tracker for MOVIES / TV / GENERAL"
-language: en-US
-type: public
-encoding: UTF-8
-links:
-  - https://cloudtorrents.com/
-
-caps:
-  categorymappings:
-    - {id: anime, cat: TV/Anime, desc: Anime}
-    - {id: applications, cat: PC, desc: Applications}
-    - {id: books, cat: Books, desc: Books}
-    - {id: games, cat: Console, desc: Games}
-    - {id: movies, cat: Movies, desc: Movies}
-    - {id: music, cat: Audio, desc: Music}
-    - {id: other, cat: Other, desc: Other}
-    - {id: tv, cat: TV, desc: TV}
-    - {id: xxx, cat: XXX, desc: XXX}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-    book-search: [q]
-
-settings: []
-
-download:
-  selectors:
-    - selector: a[href^="magnet:?xt="]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}search?query={{ .Keywords }}{{ else }}latest{{ end }}"
-
-  rows:
-    selector: table > tbody > tr:has(a)
-
-  fields:
-    category:
-      selector: a
-      attribute: href
-      filters:
-        - name: split
-          args: ["/", 1]
-    title:
-      selector: a b
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    seeders:
-      selector: td[data-title="Se"]
-    leechers:
-      selector: td[data-title="Le"]
-    date:
-      selector: span[title]
-      attribute: title
-      filters:
-        - name: append
-          args: " -09:00" # CUS
-        - name: dateparse
-          args: "02 Jan, 2006 15:04 -07:00"
-    size:
-      selector: td[data-title="Size"]
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/coastalcrew.yml

@@ -71,7 +71,7 @@ settings:
   - name: info_free
     type: info
     label: About Freeleech and OnlyUpload at Coastal Crew
-    default: <li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li>
+    default: "<ul><li>FreeLeech are torrents where neither the download or upload is counted. (On the Jackett dashboard search results these are tagged as NoUpload).</li><li>OnlyUpload are torrents where download is not counted but upload is. Good for building your Ratio up. (On the Jackett dashboard search results these are tagged as Freeleech).</li></ul>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -157,7 +157,7 @@ search:
         - name: replace
           args: ["\xA0", " "]
         - name: dateparse
-          args: "02.01.2006 15:04:05 -07:00"
+          args: "dd.MM.yyyy HH:mm:ss zzz"
     downloadvolumefactor:
       case:
         img[src="pic/oupic.gif"]: 0 # only upload is counted

src/Jackett.Common/Definitions/comicat.yml

@@ -67,7 +67,7 @@ search:
         - name: append
           args: " +08:00" # CST (China)
         - name: dateparse
-          args: "2006/01/02 -07:00"
+          args: "yyyy/MM/dd zzz"
     date_today:
       selector: td:nth-child(1):contains("今天")
       optional: true
@@ -77,7 +77,7 @@ search:
         - name: append
           args: " +08:00" # CST (China)
         - name: timeparse
-          args: "15:04 -07:00"
+          args: "HH:mm zzz"
     date_yday:
       selector: td:nth-child(1):contains("昨天")
       optional: true

src/Jackett.Common/Definitions/cpabien.yml

@@ -7,8 +7,9 @@ type: public
 encoding: UTF-8
 followredirect: true
 links:
-  - https://labastidevivante.fr/
+  - https://cpasbiens911.fr/
 legacylinks:
+  - https://labastidevivante.fr/
   - http://www.cpasbiens.cc/
   - http://www.cpabien.cm/
   - http://cpabien.cm/
@@ -66,22 +67,22 @@ settings:
     default: cpasbien does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
   - name: multilang
     type: checkbox
-    label: Replace MULTI by another language in release name
+    label: Replace MULTi by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI by this language
+    label: Replace MULTi by this language
     default: FRENCH
     options:
       FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
+      MULTi FRENCH: MULTi FRENCH
       ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
+      MULTi ENGLISH: MULTi ENGLISH
       VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
+      MULTi VOSTFR: MULTi VOSTFR
   - name: vostfr
     type: checkbox
-    label: Replace VOSTFR with ENGLISH
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
     default: false
 
 download:
@@ -109,45 +110,25 @@ search:
   fields:
     category:
       text: Other
-    _site_date:
-      selector: a
-      filters:
-        # date is at the end of the title, so we get it and name it _site_date
-        - name: regexp
-          args: "(19|20\\d{2})$"
     title_phase1:
       selector: a
       filters:
-        # now we put the date at the right place according scene naming rules using .Result._site_date
         - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result._site_date }} FRENCH"]
-        - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result._site_date }} MULTI"]
-        - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result._site_date }} TRUEFRENCH"]
-        - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result._site_date }} VOSTFR"]
-        - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result._site_date }} SUBFRENCH"]
-        # and we delete it at the end
-        - name: re_replace
-          args: ["(19|20\\d{2})$", ""]
-    title_multilang:
+          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
+    title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
     title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
     title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: a
       attribute: href
@@ -158,16 +139,14 @@ search:
       selector: div.poid
     date:
       text: now
-    seeders_optional:
+    seeders:
       selector: div.up
       optional: true
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
+      default: 0
+    leechers:
       selector: div.down
       optional: true
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+      default: 0
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -31,6 +31,7 @@ caps:
     search: [q]
     tv-search: [q, season, ep]
     movie-search: [q]
+  allowrawsearch: true
 
 settings:
   - name: info_8000
@@ -39,22 +40,22 @@ settings:
     default: cpasbienclone does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
   - name: multilang
     type: checkbox
-    label: Replace MULTI by another language in release name
+    label: Replace MULTi by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI by this language
+    label: Replace MULTi by this language
     default: FRENCH
     options:
       FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
+      MULTi FRENCH: MULTi FRENCH
       ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
+      MULTi ENGLISH: MULTi ENGLISH
       VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
+      MULTi VOSTFR: MULTi VOSTFR
   - name: vostfr
     type: checkbox
-    label: Replace VOSTFR with ENGLISH
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
     default: false
   - name: sort
     type: select
@@ -88,45 +89,25 @@ search:
   fields:
     category:
       text: Other
-    _site_date:
-      selector: a
-      filters:
-        # year can be at the end of the title, so we get it and name it _site_date
-        - name: regexp
-          args: "(19|20\\d{2})$"
     title_phase1:
       selector: a
       filters:
-        # now we put the date at the right place according scene naming rules using .Result._site_date
         - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result._site_date }} FRENCH"]
-        - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result._site_date }} MULTI"]
-        - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result._site_date }} TRUEFRENCH"]
-        - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result._site_date }} VOSTFR"]
-        - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result._site_date }} SUBFRENCH"]
-        # and we delete it at the end
-        - name: re_replace
-          args: ["(19|20\\d{2})$", ""]
-    title_multilang:
+          args: ["(?i)\\b(FRENCH|MULTI|TRUEFRENCH|VOSTFR|SUBFRENCH)\\b(.+?)(\\b(19|20\\d{2})\\b)$", "$3 $1$2"]
+    title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
     title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
     title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: a
       attribute: href
@@ -159,16 +140,14 @@ search:
           args: ["(\\d+)\\.\\d", "$1 MB"]
     date:
       text: now
-    seeders_optional:
+    seeders:
       selector: div.up
       optional: true
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
+      default: 0
+    leechers:
       selector: div.down
       optional: true
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+      default: 0
     downloadvolumefactor:
       text: 0
     uploadvolumefactor:

src/Jackett.Common/Definitions/cpasbiensi.yml

@@ -1,123 +0,0 @@
----
-id: cpasbiensi
-name: cpasbien.si
-description: "cpasbien.si is a FRENCH Public site for TV / MOVIES / GENERAL"
-language: fr-FR
-type: public
-encoding: UTF-8
-links:
-  - https://www.cpasbien.si/
-
-caps:
-  categories:
-    Other: Other
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-
-settings:
-  - name: info_8000
-    type: info
-    label: About cpasbiensi Categories
-    default: cpasbiensi does not return categories in its search results.</br>To add to your Apps' Torznab indexer, replace all categories with 8000(Other).
-  - name: multilang
-    type: checkbox
-    label: Replace MULTI by another language in release name
-    default: false
-  - name: multilanguage
-    type: select
-    label: Replace MULTI by this language
-    default: FRENCH
-    options:
-      FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
-      ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
-      VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
-  - name: vostfr
-    type: checkbox
-    label: Replace VOSTFR with ENGLISH
-    default: false
-
-download:
-  selectors:
-    - selector: a[href^="/get_torrents/"]
-      attribute: href
-
-search:
-  paths:
-    - path: "{{ if .Keywords }}recherche/{{ .Keywords }}{{ else }}{{ end }}"
-
-  rows:
-    selector: table.table-corps > tbody > tr:has(a)
-
-  fields:
-    category:
-      text: Other
-    _site_date:
-      selector: a
-      filters:
-        # year can be at the end of the title, so we get it and name it _site_date
-        - name: regexp
-          args: "(19|20\\d{2})$"
-    title_phase1:
-      selector: a
-      filters:
-        # now we put the date at the right place according scene naming rules using .Result._site_date
-        - name: re_replace
-          args: ["(?i)( FRENCH)", " {{ .Result._site_date }} FRENCH"]
-        - name: re_replace
-          args: ["(?i)( MULTI)", " {{ .Result._site_date }} MULTI"]
-        - name: re_replace
-          args: ["(?i)( TRUEFRENCH)", " {{ .Result._site_date }} TRUEFRENCH"]
-        - name: re_replace
-          args: ["(?i)( VOSTFR)", " {{ .Result._site_date }} VOSTFR"]
-        - name: re_replace
-          args: ["(?i)( SUBFRENCH)", " {{ .Result._site_date }} SUBFRENCH"]
-        # and we delete it at the end
-        - name: re_replace
-          args: ["(19|20\\d{2})$", ""]
-    title_multilang:
-      text: "{{ .Result.title_phase1 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_phase2:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
-    title_vostfr:
-      text: "{{ .Result.title_phase2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
-    title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    details:
-      selector: a
-      attribute: href
-    download:
-      selector: a
-      attribute: href
-    size:
-      selector: div.poid
-    date:
-      text: now
-    seeders_optional:
-      selector: div.up
-      optional: true
-    seeders:
-      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
-    leechers_optional:
-      selector: div.down
-      optional: true
-    leechers:
-      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
-    downloadvolumefactor:
-      text: 0
-    uploadvolumefactor:
-      text: 1
-# engine n/a

src/Jackett.Common/Definitions/crackingpatching.yml

@@ -64,11 +64,10 @@ search:
 
   fields:
     category:
-      text: other
-    category|noappend:
       selector: article.post-entry
       attribute: class
       optional: true
+      default: other
       filters:
         - name: regexp
           args: "category-(.+?) "

src/Jackett.Common/Definitions/crazyhd.yml

@@ -96,14 +96,14 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: useragent
     type: text
     label: User-Agent
   - name: info_useragent
     type: info
     label: How to get the User-Agent
-    default: "<ol><li>From the same place you fetched the cookie,<li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</ol>"
+    default: "<ol><li>From the same place you fetched the cookie,</li><li>Find <b>'user-agent:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole user-agent string <i>(everything after 'user-agent: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -203,7 +203,7 @@ search:
       # auto adjusted by site account profile
       filters:
         - name: dateparse
-          args: "02/01/2006"
+          args: "dd/MM/yyyy"
     seeders:
       selector: div.torrent-seeder
     leechers:

src/Jackett.Common/Definitions/crazyspirits.yml

@@ -113,29 +113,29 @@ settings:
   - 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>"
+    default: "<ol><li>Login to this tracker with your browser</li><li>Open the <b>DevTools</b> panel by pressing <b>F12</b></li><li>Select the <b>Network</b> tab</li><li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)</li><li>Refresh the page by pressing <b>F5</b></li><li>Click on the first row entry</li><li>Select the <b>Headers</b> tab on the Right panel</li><li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section</li><li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</li></ol>"
   - name: freeleech
     type: checkbox
     label: Search freeleech only
     default: false
   - name: multilang
     type: checkbox
-    label: Replace MULTI by another language in release name
+    label: Replace MULTi by another language in release name
     default: false
   - name: multilanguage
     type: select
-    label: Replace MULTI by this language
+    label: Replace MULTi by this language
     default: FRENCH
     options:
       FRENCH: FRENCH
-      MULTI.FRENCH: MULTI.FRENCH
+      MULTi FRENCH: MULTi FRENCH
       ENGLISH: ENGLISH
-      MULTI.ENGLISH: MULTI.ENGLISH
+      MULTi ENGLISH: MULTi ENGLISH
       VOSTFR: VOSTFR
-      MULTI.VOSTFR: MULTI.VOSTFR
+      MULTi VOSTFR: MULTi VOSTFR
   - name: vostfr
     type: checkbox
-    label: Replace VOSTFR with ENGLISH
+    label: Replace VOSTFR and SUBFRENCH with ENGLISH
     default: false
   - name: sort
     type: select
@@ -208,22 +208,20 @@ search:
           args: ["-NoTag", ""]
     title_phase2:
       text: "{{ if .Result.title_phase1 }}{{ .Result.title_phase1 }}{{ else }}{{ .Result.title_phase0 }}{{ end }}"
-    title_multilang:
+    title_vostfr:
       text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
     title_phase3:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
-    title_vostfr:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    title_multilang:
       text: "{{ .Result.title_phase3 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
-        - name: re_replace
-          args: ["(?i)(\\ssubfrench\\s)", " ENGLISH "]
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
     title:
-      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
     category:
       selector: a[href^="torrents.php?cat="]
       attribute: href
@@ -274,7 +272,7 @@ search:
         - name: regexp
           args: "Partagé Voilà : </b>(.*?)<br"
         - name: dateparse
-          args: "01-02-2006"
+          args: "MM-dd-yyyy"
     downloadvolumefactor:
       case:
         img[src="images/Torrents/free.png"]: 0

src/Jackett.Common/Definitions/crnaberza.yml

@@ -13,6 +13,7 @@ legacylinks:
 caps:
   categorymappings:
     - {id: 65, cat: Movies/3D, desc: "3D Film"}
+    - {id: 82, cat: Movies/UHD, desc: "4K video"}
     - {id: 79, cat: PC/Mobile-Android, desc: "Android"}
     - {id: 37, cat: Movies, desc: "Deca"}
     - {id: 43, cat: TV/Documentary, desc: "Dokumentarci"}
@@ -26,12 +27,12 @@ caps:
     - {id: 61, cat: Movies/HD, desc: "HD Mesano"}
     - {id: 50, cat: PC/Games, desc: "Igre"}
     - {id: 44, cat: Books, desc: "Knjige"}
-    - {id: 80, cat: TV, desc: "Paketi"}
     - {id: 46, cat: Audio, desc: "Koncerti"}
     - {id: 58, cat: Audio/Lossless, desc: "Lossless/Domaće"}
     - {id: 59, cat: Audio/Lossless, desc: "Lossless/Strano"}
     - {id: 5, cat: Audio/MP3, desc: "MP3/Domaće"}
     - {id: 57, cat: Audio/MP3, desc: "MP3/Strano"}
+    - {id: 80, cat: TV, desc: "Paketi"}
     - {id: 49, cat: PC, desc: "Programi"}
     - {id: 28, cat: Other, desc: "Razno"}
     - {id: 62, cat: TV/SD, desc: "SD Boxset"}
@@ -155,7 +156,7 @@ search:
       optional: true
       filters:
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM"
+          args: "MMM d yyyy hh:mm tt"
     date:
       text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
     size: