ebookbay: add a public torrent tracker (#13984)

also add imdbid and doubanid placeholder selectors

.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:

README.md

@@ -59,6 +59,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * dmhy
  * Dodder (菟丝子资源社区)
  * DonTorrent
+ * EBook Bay (EBB)
  * E-Hentai
  * EpubLibre
  * EXT Torrents
@@ -177,10 +178,12 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BookTracker
  * BootyTape
  * Catorrent
+ * Devil-Torrents
  * Darmowe torrenty
  * Deildu
  * DimeADozen (EzTorrent)
  * DXP (Deaf Experts)
+ * Electro-Torrent
  * EniaHD
  * Erai-Raws
  * ExKinoRay
@@ -222,6 +225,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * Torrents-Local
  * TribalMixes
  * Union Fansub
+ * vTorrent
  * xTorrenty
  * YggTorrent (YGG)
  * ZOMB
@@ -233,14 +237,14 @@ 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
  * Abnormal
  * ABtorrents (ABT + RNS)
- * Acervos
+ * Acervos [![(invite needed)][inviteneeded]](#)
  * Acid Lounge (A-L)
  * AcrossTheTasman [![(invite needed)][inviteneeded]](#)
  * Aftershock
@@ -287,7 +291,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * BroadcasTheNet (BTN)
  * BroadCity
  * BrokenStones [![(invite needed)][inviteneeded]](#)
- * BrSociety
+ * BrSociety [![(invite needed)][inviteneeded]](#)
  * BTNext (BTNT) [![(invite needed)][inviteneeded]](#)
  * BTSCHOOL
  * BWTorrents
@@ -344,6 +348,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * FunFile (FF)
  * FunkyTorrents (FT)
  * Fuzer (FZ)
+ * GainBound
  * Gay-Torrents.org
  * GAYtorrent.ru
  * GazelleGames (GGn) [![(invite needed)][inviteneeded]](#)
@@ -364,11 +369,9 @@ 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]](#)
@@ -376,6 +379,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HDCity [![(invite needed)][inviteneeded]](#)
  * HDFans
  * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#)
+ * HDMaYi
  * HDMonkey
  * HDRoute [![(invite needed)][inviteneeded]](#)
  * HDSky [![(invite needed)][inviteneeded]](#)
@@ -389,6 +393,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * HHanClub
  * HQMusic
  * House of Devil
+ * ICC2022
  * iHDBits
  * ImmortalSeed (iS)
  * Immortuos
@@ -407,8 +412,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * LastFiles
  * Lat-Team [![(invite needed)][inviteneeded]](#)
  * Le Saloon
- * LearnBits [![(invite needed)][inviteneeded]](#)
- * LearnFlakes [![(invite needed)][inviteneeded]](#)
+ * LearnBits
+ * LearnFlakes
  * leech24
  * LegacyHD (HD4Free)
  * LemonHD
@@ -439,12 +444,13 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * MySpleen [![(invite needed)][inviteneeded]](#)
  * NCore
  * Nebulance (NBL) (TransmiTheNet)
+ * NicePT
  * NorBits
  * Old Toons World
  * OpenCD [![(invite needed)][inviteneeded]](#)
  * Orpheus
  * OshenPT
- * Ourbits (HDPter) [![(invite needed)][inviteneeded]](#)
+ * OurBits (HDPter)
  * P2PBG
  * Partis
  * PassThePopcorn (PTP)
@@ -452,7 +458,6 @@ 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)
@@ -471,7 +476,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * PTtime
  * Punk's Horror Tracker
  * PuntoTorrent
- * PuroVicio
  * PuTao
  * PWTorrents (PWT)
  * R3V WTF! [![(invite needed)][inviteneeded]](#)
@@ -492,6 +496,7 @@ 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
@@ -529,6 +534,7 @@ 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)
@@ -567,8 +573,8 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
  * UHDBits
  * UnionGang
+ * UnleashTheCartoons
  * UnlimitZ
- * WDT (Wrestling Desires Torrents / Ultimate Wrestling Torrents)
  * White Angel
  * wOOt [![(invite needed)][inviteneeded]](#)
  * World-In-HD [![(invite needed)][inviteneeded]](#)

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:

src/Jackett.Common/Content/index.html

@@ -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="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"><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-right">{{Size}}</td>
+                    <td class="text-right fit">{{jacketSize Size}}</td>
+                    <td class="text-center">{{Files}}</td>
+                    <td class="text-center Cat">{{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}}

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

@@ -13,13 +13,12 @@ links:
   - https://x1337x.ws/
   - https://x1337x.eu/
   - https://x1337x.se/
-  - https://1337x.unblockit.ink/
-  - https://1337x.nocensor.art/
+  - https://1337x.unblockit.bio/
+  - https://1337x.mrunblock.guru/
   - 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/
@@ -38,6 +37,8 @@ legacylinks:
   - https://1337x.unblockit.page/
   - https://1337x.unblockit.pet/
   - https://1337x.nocensor.lol/
+  - https://1337x.unblockit.ink/
+  - https://1337x.nocensor.art/
 
 caps:
   categorymappings:

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

@@ -110,6 +110,9 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
@@ -159,4 +162,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP Standard v1.5 Beta 5
+# NexusPHP v1.7.32 2022-12-05

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,217 @@
+---
+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("失败"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  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 }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.8.0 2023-01-26

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

@@ -177,4 +177,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP v3.0 2020-04-30

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/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/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: 6, cat: TV/Anime, desc: "Animes"}
-    - {id: 7, cat: Other, desc: "Materiais de Apoio"}
+    - {id: 2, cat: TV, desc: "Séries"}
+    - {id: 8, cat: TV/Anime, desc: "Animes"}
+    - {id: 5, cat: Other, desc: "Cursos"}
+    - {id: 6, cat: Other, desc: "Materiais de Apoio"}
+    - {id: 7, cat: Books, desc: "eBooks / Revistas / Apostilas"}
+    - {id: 9, cat: Audio/Video, desc: "Shows"}
+    - {id: 10, cat: PC, desc: "Programas"}
+    - {id: 11, cat: TV/Documentary, desc: "Documentários"}
+    - {id: 4, cat: Console, desc: "Games"}
 
   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
@@ -74,7 +79,7 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $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 }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -114,14 +119,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 +134,17 @@ search:
       selector: tmdb_id
     tvdbid:
       selector: tvdb_id
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result._cat }} {{ .Result._type }} {{ .Result._res }} {{ .Result._reg }} {{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -169,6 +183,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.5.0

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:

src/Jackett.Common/Definitions/arabp2p.yml

@@ -48,15 +48,14 @@ caps:
     - {id: 52, cat: TV, desc: "مسرحيات (Plays)"}
     - {id: 71, cat: TV, desc: "مسلسلات مدبلجه عربي (Arabic Dubbed Series)"}
     - {id: 90, cat: TV, desc: "برامج ومسابقات (Shows)"}
-    - {id: 111, cat: TV, desc: "2022 رمضان (2022 Ramadan)"}
     # المرئيات الاجنبية Foreign Movies
     - {id: 92, cat: TV/Foreign, desc: "تعليمي (Educational)"}
     - {id: 93, cat: TV/Documentary, desc: "وثائقي (Documentary)"}
     - {id: 45, cat: TV/Foreign, desc: "مسلسلات وبرامج اجنبيه (Serials)"}
     - {id: 57, cat: TV/Foreign, desc: "مسلسلات آسيوية (Asian Series)"}
     - {id: 42, cat: Movies/Foreign, desc: "افلام اجنبيه (Foreign)"}
-    - {id: 76, cat: Movies/3D, desc: "&ثلاثي الابعاد 3D (3D)"}
     - {id: 74, cat: Movies/HD, desc: "جودة عالية HD"}
+    - {id: 76, cat: Movies/3D, desc: "&ثلاثي الابعاد 3D (3D)"}
     - {id: 59, cat: Movies/Foreign, desc: "افلام آسيوية (Asian Movies)"}
     - {id: 86, cat: Movies/Foreign, desc: "افلام هنديه (Indian Movies)"}
     # انمي مدبلج عربي Anime Arabic dubbed

src/Jackett.Common/Definitions/audiobookbay.yml

@@ -9,11 +9,9 @@ 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/
@@ -34,6 +32,8 @@ legacylinks:
   - https://audiobookbay.fi/
   - https://audiobookbay.unblockit.page/
   - https://audiobookbay.unblockit.pet/
+  - https://audiobookbay.unblockit.ink/
+  - https://audiobookbay.unblockit.bio/ # error 502
 
 caps:
   categorymappings:

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"}

src/Jackett.Common/Definitions/badasstorrents.yml

@@ -8,13 +8,14 @@ encoding: UTF-8
 requestDelay: 2
 links:
   - https://badasstorrents.com/
-  - https://badasstorrents.nocensor.art/
+  - https://badasstorrents.mrunblock.guru/
 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/
 
 caps:
   categories:

src/Jackett.Common/Definitions/bitbazis.yml

@@ -117,7 +117,7 @@ search:
     # can support genre searching but you need to know the id, eg &genre23=1 for Comedy (id is 23)
 
   rows:
-    selector: "table[width=\"100%\"][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:
@@ -141,7 +141,7 @@ search:
       optional: true
       attribute: href
     download_2:
-      selector: input[onclick*="download.php?torrent="]
+      selector: span[onclick*="download.php?torrent="]
       optional: true
       attribute: onclick
       filters:
@@ -151,6 +151,9 @@ search:
           args: ["', '_self');", ""]
     download:
       text: "{{ if or .Result.download_1 .Result.download_2 }}{{ or .Result.download_1 .Result.download_2 }}{{ else }}{{ end }}"
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
     size:
       selector: td:nth-child(6)
     date:
@@ -159,7 +162,7 @@ search:
       # 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 ", " "]

src/Jackett.Common/Definitions/bitsearch.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://bitsearch.to/
+  - https://bitsearch.mrunblock.guru/
 legacylinks:
   - https://bitsearch.nocensor.biz/
   - https://bitsearch.nocensor.sbs/

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:

src/Jackett.Common/Definitions/bitspyder.yml

@@ -93,6 +93,7 @@ search:
   paths:
     - path: browse.php
   inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ .Keywords }}"
     # 0 active, 1 incldead, 2 onlydead
     incldead: 1
@@ -101,10 +102,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

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

@@ -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:
+  # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
+    api_token: "{{ .Config.apikey }}"
+    name: "{{ .Keywords }}"
+    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free[]=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,41 @@ 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
+    infohash:
+      selector: info_hash
     poster:
-      selector: poster
+      selector: meta.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
+    genre:
+      selector: meta.genres
+      filters:
+        - name: re_replace
+          args: ["(?i)(Science Fiction)", "Science_Fiction"]
+        - name: re_replace
+          args: ["(?i)(TV Movie)", "TV_Movie"]
+        - name: replace
+          args: [" & ", "_&_"]
+    description:
+      text: "{{ .Result.genre }}"
     files:
       selector: num_file
     seeders:
@@ -119,12 +142,18 @@ search:
           args: " +00:00" # GMT
         - name: dateparse
           args: "01/02/2006 15:04:05 -07:00"
+    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
@@ -136,4 +165,4 @@ search:
     minimumseedtime:
       # 5 days (as seconds = 5 x 24 x 60 x 60)
       text: 432000
-# json UNIT3D 5.3.0
+# json UNIT3D 6.5.0

src/Jackett.Common/Definitions/bulltorrent.yml

@@ -7,6 +7,7 @@ type: public
 encoding: UTF-8
 links:
   - https://www.bulltorrent.com/
+  - https://toros.mrunblock.guru/
 legacylinks:
   - https://toros.nocensor.space/
   - https://toros.nocensor.work/

src/Jackett.Common/Definitions/byrutor.yml

@@ -58,18 +58,12 @@ caps:
     - {id: 43, cat: PC/Games, desc: "Пошаговые стратегии (TBS)"}
     - {id: 44, cat: PC/Games, desc: "Глобальные стратегии"}
     - {id: 45, cat: PC/Games, desc: "Стратегии в реальном времени"}
-    - {id: 46, cat: PC/Games, desc: "ММО"}
-    - {id: 47, cat: PC/Games, desc: "MMORPG"}
     - {id: 48, cat: PC/Games, desc: "Для взрослых"}
     - {id: 49, cat: PC/Games, desc: "От первого лица"}
     - {id: 50, cat: PC/Games, desc: "От третьего лица"}
     - {id: 51, cat: PC/Games, desc: "Шутер от первого лица"}
     - {id: 52, cat: PC/Games, desc: "Шутер от третьего лица"}
     - {id: 53, cat: PC/Games, desc: "Игры для слабых ПК"}
-    - {id: 54, cat: PC/Games, desc: "Игры для очень слабых ПК"}
-    - {id: 55, cat: PC/Games, desc: "Новинки игр для слабых ПК"}
-    - {id: 56, cat: PC/Games, desc: "Игры для 64 битной системы"}
-    - {id: 57, cat: PC/Games, desc: "Игры для 32 битной системы"}
     - {id: 58, cat: PC/Games, desc: "Психологический хоррор"}
     - {id: 59, cat: PC/Games, desc: "Хоррор на выживание"}
     - {id: 60, cat: PC/Games, desc: "Ролевой экшен"}
@@ -118,6 +112,7 @@ caps:
     - {id: 105, cat: PC/Games, desc: "Вождение"}
     - {id: 189, cat: PC/Games, desc: "Пошаговая"}
     - {id: 106, cat: PC/Games, desc: "Пошаговая тактика"}
+    - {id: 328, cat: PC/Games, desc: "2D-платформер"}
     - {id: 107, cat: PC/Games, desc: "3D-платформер"}
     - {id: 108, cat: PC/Games, desc: "Одна жизнь"}
     - {id: 109, cat: PC/Games, desc: "Паркур"}
@@ -193,19 +188,92 @@ caps:
     - {id: 179, cat: PC/Games, desc: "Настольная игра"}
     - {id: 180, cat: PC/Games, desc: "Полёты"}
     - {id: 181, cat: PC/Games, desc: "Лут"}
-    - {id: 182, cat: PC/Games, desc: "В реальном времени"}
     - {id: 183, cat: PC/Games, desc: "MOBA"}
     - {id: 184, cat: PC/Games, desc: "Демоны"}
     - {id: 185, cat: PC/Games, desc: "Расследование"}
     - {id: 186, cat: PC/Games, desc: "Мифология"}
     - {id: 187, cat: PC/Games, desc: "VR"}
     - {id: 191, cat: PC/Games, desc: "Психологическая"}
-    - {id: 192, cat: PC/Games, desc: "Нелинейная"}
     - {id: 193, cat: PC/Games, desc: "Подземелье"}
-    - {id: 195, cat: PC/Games, desc: "Для нескольких игроков"}
     - {id: 196, cat: PC/Games, desc: "Шедевр"}
     - {id: 197, cat: PC/Games, desc: "Ретро"}
     - {id: 198, cat: PC/Games, desc: "Олдскул"}
+    - {id: 251, cat: PC/Games, desc: "Визуальная новелла"}
+    - {id: 252, cat: PC/Games, desc: "Образование"}
+    - {id: 253, cat: PC/Games, desc: "Партийная RPG"}
+    - {id: 254, cat: PC/Games, desc: "Симулятор ходьбы"}
+    - {id: 255, cat: PC/Games, desc: "Симулятор жизни"}
+    - {id: 256, cat: PC/Games, desc: "Автосимулятор"}
+    - {id: 257, cat: PC/Games, desc: "Ритм-игра"}
+    - {id: 258, cat: PC/Games, desc: "Королевская битва"}
+    - {id: 259, cat: PC/Games, desc: "Симулятор колонии"}
+    - {id: 260, cat: PC/Games, desc: "Симулятор фермы"}
+    - {id: 261, cat: PC/Games, desc: "Иммерсивный симулятор"}
+    - {id: 262, cat: PC/Games, desc: "Кликер"}
+    - {id: 263, cat: PC/Games, desc: "Арена-шутер"}
+    - {id: 264, cat: PC/Games, desc: "Платформер на точность"}
+    - {id: 265, cat: PC/Games, desc: "Метроидвания"}
+    - {id: 266, cat: PC/Games, desc: "Похожа на Dark Souls"}
+    - {id: 267, cat: PC/Games, desc: "Коллектатон"}
+    - {id: 268, cat: PC/Games, desc: "Idle-игра"}
+    - {id: 269, cat: PC/Games, desc: "Поиск существ"}
+    - {id: 270, cat: PC/Games, desc: "Зрелищные сражения"}
+    - {id: 271, cat: PC/Games, desc: "Пасьянс"}
+    - {id: 272, cat: PC/Games, desc: "Боевые гонки"}
+    - {id: 273, cat: PC/Games, desc: "Лутер-шутер"}
+    - {id: 274, cat: PC/Games, desc: "Политический симулятор"}
+    - {id: 275, cat: PC/Games, desc: "Традиционный рогалик"}
+    - {id: 276, cat: PC/Games, desc: "Милая"}
+    - {id: 277, cat: PC/Games, desc: "Стилизация"}
+    - {id: 278, cat: PC/Games, desc: "Псевдотрёхмерность"}
+    - {id: 279, cat: PC/Games, desc: "Абстрактная"}
+    - {id: 280, cat: PC/Games, desc: "Красивая"}
+    - {id: 281, cat: PC/Games, desc: "Воксельная графика"}
+    - {id: 282, cat: PC/Games, desc: "Логика"}
+    - {id: 283, cat: PC/Games, desc: "Драма"}
+    - {id: 284, cat: PC/Games, desc: "Романтика"}
+    - {id: 285, cat: PC/Games, desc: "Сюрреалистичная"}
+    - {id: 286, cat: PC/Games, desc: "Мемы"}
+    - {id: 287, cat: PC/Games, desc: "Природа"}
+    - {id: 288, cat: PC/Games, desc: "Роботы"}
+    - {id: 289, cat: PC/Games, desc: "Проработанная вселенная"}
+    - {id: 290, cat: PC/Games, desc: "Триллер"}
+    - {id: 291, cat: PC/Games, desc: "Антиутопия"}
+    - {id: 292, cat: PC/Games, desc: "Сверхъестественное"}
+    - {id: 293, cat: PC/Games, desc: "Альтернативная история"}
+    - {id: 294, cat: PC/Games, desc: "Сражения на мечах"}
+    - {id: 295, cat: PC/Games, desc: "Котики"}
+    - {id: 296, cat: PC/Games, desc: "Америка"}
+    - {id: 297, cat: PC/Games, desc: "Иллюминаты"}
+    - {id: 298, cat: PC/Games, desc: "Капитализм"}
+    - {id: 299, cat: PC/Games, desc: "Заговор"}
+    - {id: 300, cat: PC/Games, desc: "Сатира"}
+    - {id: 301, cat: PC/Games, desc: "Готика"}
+    - {id: 303, cat: PC/Games, desc: "Шахты"}
+    - {id: 304, cat: PC/Games, desc: "Боевые искусства"}
+    - {id: 305, cat: PC/Games, desc: "Танки"}
+    - {id: 306, cat: PC/Games, desc: "Подводный мир"}
+    - {id: 307, cat: PC/Games, desc: "Кулинария"}
+    - {id: 308, cat: PC/Games, desc: "Флот"}
+    - {id: 309, cat: PC/Games, desc: "Транспорт"}
+    - {id: 311, cat: PC/Games, desc: "Марс"}
+    - {id: 312, cat: PC/Games, desc: "Оборотни"}
+    - {id: 313, cat: PC/Games, desc: "Бой"}
+    - {id: 314, cat: PC/Games, desc: "Несколько концовок"}
+    - {id: 315, cat: PC/Games, desc: "Игра против ИИ"}
+    - {id: 316, cat: PC/Games, desc: "Линейная"}
+    - {id: 192, cat: PC/Games, desc: "Нелинейная"}
+    - {id: 317, cat: PC/Games, desc: "Повествовательная"}
+    - {id: 318, cat: PC/Games, desc: "Набор очков"}
+    - {id: 319, cat: PC/Games, desc: "Менеджмент инвентаря"}
+    - {id: 320, cat: PC/Games, desc: "Перемещение по сетке"}
+    - {id: 321, cat: PC/Games, desc: "Разделение на классы"}
+    - {id: 322, cat: PC/Games, desc: "Кастомизация оружия"}
+    - {id: 323, cat: PC/Games, desc: "Построение колоды"}
+    - {id: 324, cat: PC/Games, desc: "Гонки на выживание"}
+    - {id: 325, cat: PC/Games, desc: "Свобода движения"}
+    - {id: 326, cat: PC/Games, desc: "Замедление времени"}
+    - {id: 327, cat: PC/Games, desc: "Динамическое повествование"}
     - {id: 238, cat: PC/Games, desc: "Игры 2024 года"}
     - {id: 237, cat: PC/Games, desc: "Игры 2023 года"}
     - {id: 236, cat: PC/Games, desc: "Игры 2022 года"}
@@ -246,6 +314,7 @@ caps:
     - {id: 23, cat: PC/Games, desc: "Ранний Доступ"}
     - {id: 246, cat: PC/Games, desc: "Обновление"}
     - {id: 230, cat: PC/Games, desc: "Все Топ игры"}
+    - {id: 329, cat: PC/Games, desc: "Актуальные Топ игры"}
     - {id: 24, cat: PC/Games, desc: "Новинка"}
     - {id: 194, cat: PC/Games, desc: "Игры по сети"}
 

src/Jackett.Common/Definitions/carpt.yml

@@ -127,6 +127,9 @@ search:
     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"]
@@ -186,4 +189,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, img
-# NexusPHP v1.7.16
+# NexusPHP v1.7.31 2022-11-14

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

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:

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/cinemamovies.yml

@@ -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:

src/Jackett.Common/Definitions/cloudtorrents.yml

@@ -35,6 +35,10 @@ download:
       attribute: href
 
 search:
+  headers:
+    # site blocks automation User-Agents, so slightly alter it here (e.g. Safari/537.37 > Safari/537.36)
+    User-Agent: ["Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36"]
+
   paths:
     - path: "{{ if .Keywords }}search?query={{ .Keywords }}{{ else }}latest{{ end }}"
 
@@ -65,7 +69,7 @@ search:
       attribute: title
       filters:
         - name: append
-          args: " -09:00" # CUS
+          args: " +00:00" # GMT
         - name: dateparse
           args: "02 Jan, 2006 15:04 -07:00"
     size:

src/Jackett.Common/Definitions/cpabien.yml

@@ -66,22 +66,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:
@@ -132,22 +132,20 @@ search:
         # and we delete it at the end
         - name: re_replace
           args: ["(19|20\\d{2})$", ""]
-    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
       attribute: href

src/Jackett.Common/Definitions/cpasbienclone.yml

@@ -39,22 +39,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
@@ -111,22 +111,20 @@ search:
         # and we delete it at the end
         - name: re_replace
           args: ["(19|20\\d{2})$", ""]
-    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
       attribute: href

src/Jackett.Common/Definitions/cpasbiensi.yml

@@ -0,0 +1,121 @@
+---
+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 and SUBFRENCH 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_vostfr:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
+    title_phase2:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ 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/crazyspirits.yml

@@ -120,22 +120,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
+      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

src/Jackett.Common/Definitions/crt2fa.yml

@@ -95,15 +95,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:

src/Jackett.Common/Definitions/demonoid.yml

@@ -12,13 +12,10 @@ links:
   - https://www.dnoid.pw/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.onion.ly/
   - https://demonoidevmsgasmojajlhikwetsr4pxzw6xkjt3dgdv6nr5yxvsamid.tor2web.to/
-  - https://demonoid.unblockit.ink/
+  - https://demonoid.unblockit.bio/
   - https://demonoid.torrentbay.to/
-  - https://demonoid.nocensor.art/
+  - https://demonoid.mrunblock.guru/
 legacylinks:
-  - https://demonoid.nocensor.work/
-  - https://demonoid.unblockit.bz/
-  - https://demonoid.unblockit.tv/
   - https://demonoid.unblockit.how/
   - https://demonoid.unblockit.cam/
   - https://demonoid.nocensor.biz/
@@ -37,6 +34,8 @@ legacylinks:
   - https://demonoid.unblockit.page/
   - https://demonoid.unblockit.pet/
   - https://demonoid.nocensor.lol/
+  - https://demonoid.unblockit.ink/
+  - https://demonoid.nocensor.art/
 
 caps:
   categorymappings:

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

@@ -0,0 +1,171 @@
+---
+id: devil-torrents
+name: Devil-Torrents
+description: "Devil-Torrents is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: pl-PL
+type: semi-private
+encoding: UTF-8
+links:
+  - https://devil-torrents.pl/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies/SD, desc: "Filmy XviD/DivX"}
+    - {id: 748, cat: Movies/UHD, desc: "Filmy 4K"}
+    - {id: 4, cat: Movies/BluRay, desc: "Filmy Blu-Ray/HD"}
+    - {id: 642, cat: Movies/HD, desc: "Filmy x264/h264"}
+    - {id: 596, cat: Movies/HD, desc: "Filmy x265/h265"}
+    - {id: 3, cat: Movies/DVD, desc: "Filmy DVD"}
+    - {id: 5, cat: Movies/3D, desc: "Filmy 3D"}
+    - {id: 2, cat: Movies/HD, desc: "Filmy RMVB"}
+    - {id: 362, cat: Movies/SD, desc: "Filmy IVO"}
+    - {id: 7, cat: TV, desc: "TV/Seriale"}
+    - {id: 702, cat: Movies/SD, desc: "TS/CAM"}
+    - {id: 8, cat: XXX, desc: "Erotyka"}
+    - {id: 10, cat: Audio, desc: "Muzyka"}
+    - {id: 11, cat: PC, desc: "Programy"}
+    - {id: 12, cat: PC/Mobile-Other, desc: "GSM/PDA"}
+    - {id: 13, cat: Console, desc: "Konsole"}
+    - {id: 14, cat: PC/Games, desc: "Gry PC"}
+    - {id: 15, cat: Movies, desc: "Dla Dzieci"}
+    - {id: 16, cat: Books, desc: "Książki"}
+    - {id: 525, cat: PC/Mac, desc: "Mac"}
+    - {id: 18, cat: PC, desc: "Linux"}
+    - {id: 19, cat: TV/Sport, desc: "Sport"}
+    - {id: 699, cat: TV/Anime, desc: "Anime"}
+    - {id: 21, cat: Other, desc: "Inne"}
+
+  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: multilang
+    type: checkbox
+    label: Replace MULTi by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTi by this language
+    default: POLISH
+    options:
+      POLISH: POLISH
+      MULTi POLISH: MULTi POLISH
+
+login:
+  path: logowanie
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[src^="img.php?size=3"]
+    input: vImageCodP
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: ""
+  error:
+    - selector: div#center-side:contains("Logowanie nie")
+  test:
+    path: /
+    selector: a[href$="/logout.php"]
+
+search:
+  # https://devil-torrents.pl/szukaj.php?search=%&typ=torrent&c4=1&c748=1
+  paths:
+    - path: szukaj.php
+  inputs:
+    $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    typ: torrent
+    search: "{{ if .Keywords }}{{ .Keywords }}{{ else }}%{{ end }}"
+
+  rows:
+    selector: table.test5 > tbody > tr > td > div[id]:has(a[href^="download/"])
+
+  fields:
+    category:
+      selector: div#kategoria-gatunek-1
+      case:
+        "div#kategoria-gatunek-1:contains(\"Filmy XviD/DivX\")": 1
+        "div#kategoria-gatunek-1:contains(\"Filmy 4K\")": 748
+        "div#kategoria-gatunek-1:contains(\"Filmy Blu-Ray/HD\")": 4
+        "div#kategoria-gatunek-1:contains(\"Filmy x264/h264\")": 642
+        "div#kategoria-gatunek-1:contains(\"Filmy x265/h265\")": 596
+        "div#kategoria-gatunek-1:contains(\"Filmy DVD\")": 3
+        "div#kategoria-gatunek-1:contains(\"Filmy 3D\")": 5
+        "div#kategoria-gatunek-1:contains(\"Filmy RMVB\")": 2
+        "div#kategoria-gatunek-1:contains(\"Filmy IVO\")": 362
+        "div#kategoria-gatunek-1:contains(\"TV/Seriale\")": 7
+        "div#kategoria-gatunek-1:contains(\"TS/CAM\")": 702
+        "div#kategoria-gatunek-1:contains(\"Erotyka\")": 8
+        "div#kategoria-gatunek-1:contains(\"Muzyka\")": 10
+        "div#kategoria-gatunek-1:contains(\"Programy\")": 11
+        "div#kategoria-gatunek-1:contains(\"GSM/PDA\")": 12
+        "div#kategoria-gatunek-1:contains(\"Konsole\")": 13
+        "div#kategoria-gatunek-1:contains(\"Gry PC\")": 14
+        "div#kategoria-gatunek-1:contains(\"Dla Dzieci\")": 15
+        "div#kategoria-gatunek-1:contains(\"Książki\")": 16
+        "div#kategoria-gatunek-1:contains(\"Mac\")": 525
+        "div#kategoria-gatunek-1:contains(\"Linux\")": 18
+        "div#kategoria-gatunek-1:contains(\"Sport\")": 19
+        "div#kategoria-gatunek-1:contains(\"Anime\")": 699
+        "div#kategoria-gatunek-1:contains(\"Inne\")": 21
+    title_phase1:
+      selector: a[href^="/torrent/"]
+      attribute: title
+    title_multilang:
+      selector: a[href^="/torrent/"]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
+        - name: re_replace
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href^="download/"]
+      attribute: href
+    poster:
+      selector: img.browse_poster
+      attribute: src
+    date:
+      selector: td.descr3
+      filters:
+        - name: regexp
+          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td.descr3
+      filters:
+        - name: regexp
+          args: (\d{1,4}\.\d{2}\s+?[T|G|M|k]B)
+    seeders:
+      selector: font[color="green"] > b, font[color="red"] > b
+    leechers:
+      selector: font[color="green"]:nth-of-type(2) > b, font[color="red"]:nth-of-type(2) > b
+    grabs:
+      selector: td.descr3
+      filters:
+        - name: regexp
+          args: (\d{1,4}) razy
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

src/Jackett.Common/Definitions/ebookbay.yml

@@ -0,0 +1,155 @@
+---
+id: ebookbay
+name: EBookBay
+description: "EBook Bay (EBB) is a Public Torrent Tracker for E-BOOKS"
+language: en-US
+type: public
+encoding: UTF-8
+requestDelay: 2
+links:
+  - http://ebb.la/ # site does not support https SSL_ERROR_BAD_CERT_DOMAIN
+
+caps:
+  categorymappings:
+    - {id: "Action/Adventure", cat: Books/EBook, desc: "Action/Adventure"}
+    - {id: "Animals", cat: Books/EBook, desc: "Animals"}
+    - {id: "Arts", cat: Books/EBook, desc: "Arts"}
+    - {id: "Beauty", cat: Books/EBook, desc: "Beauty"}
+    - {id: "Business", cat: Books/EBook, desc: "Business"}
+    - {id: "Certification", cat: Books/EBook, desc: "Certification"}
+    - {id: "Children/Kids", cat: Books/EBook, desc: "Children/Kids"}
+    - {id: "Classic/Literary", cat: Books/EBook, desc: "Classic/Literary"}
+    - {id: "Comics", cat: Books/Comics, desc: "Comics"}
+    - {id: "Computer", cat: Books/EBook, desc: "Computer"}
+    - {id: "Contemporary", cat: Books/EBook, desc: "Contemporary"}
+    - {id: "Cooking", cat: Books/EBook, desc: "Cooking"}
+    - {id: "Crafts & Hobbies", cat: Books/EBook, desc: "Crafts & Hobbies"}
+    - {id: "Education", cat: Books/EBook, desc: "Education"}
+    - {id: "Entertainment", cat: Books/EBook, desc: "Entertainment"}
+    - {id: "Fantasy", cat: Books/EBook, desc: "Fantasy"}
+    - {id: "Gardening", cat: Books/EBook, desc: "Gardening"}
+    - {id: "Health", cat: Books/EBook, desc: "Health"}
+    - {id: "Historical", cat: Books/EBook, desc: "Historical"}
+    - {id: "History", cat: Books/EBook, desc: "History"}
+    - {id: "Horror", cat: Books/EBook, desc: "Horror"}
+    - {id: "Humorous", cat: Books/EBook, desc: "Humorous"}
+    - {id: "Internet", cat: Books/EBook, desc: "Internet"}
+    - {id: "Magazine", cat: Books/EBook, desc: "Magazine"}
+    - {id: "Marketing", cat: Books/EBook, desc: "Marketing"}
+    - {id: "Medical", cat: Books/EBook, desc: "Medical"}
+    - {id: "Mystery/Suspense", cat: Books/EBook, desc: "Mystery/Suspense"}
+    - {id: "Nonfiction", cat: Books/EBook, desc: "Nonfiction"}
+    - {id: "Novel", cat: Books/EBook, desc: "Novel"}
+    - {id: "Other", cat: Books/EBook, desc: "Other"}
+    - {id: "Paranormal", cat: Books/EBook, desc: "Paranormal"}
+    - {id: "Political", cat: Books/EBook, desc: "Political"}
+    - {id: "Real Estate", cat: Books/EBook, desc: "Real Estate"}
+    - {id: "Reference", cat: Books/EBook, desc: "Reference"}
+    - {id: "Religion", cat: Books/EBook, desc: "Religion"}
+    - {id: "Romance", cat: Books/EBook, desc: "Romance"}
+    - {id: "Sci-Fi", cat: Books/EBook, desc: "Sci-Fi"}
+    - {id: "Science", cat: Books/EBook, desc: "Science"}
+    - {id: "Self-Help", cat: Books/EBook, desc: "Self-Help"}
+    - {id: "Society", cat: Books/EBook, desc: "Society"}
+    - {id: "Software", cat: Books/EBook, desc: "Software"}
+    - {id: "Sports", cat: Books/EBook, desc: "Sports"}
+    - {id: "Technical", cat: Books/EBook, desc: "Technical"}
+    - {id: "Teen/Young Adult", cat: Books/EBook, desc: "Teen/Young Adult"}
+    - {id: "Textbook", cat: Books/EBook, desc: "Textbook"}
+    - {id: "Thriller", cat: Books/EBook, desc: "Thriller"}
+    - {id: "Travel", cat: Books/EBook, desc: "Travel"}
+    - {id: "Tutorial", cat: Books/EBook, desc: "Tutorial"}
+    - {id: "Western", cat: Books/EBook, desc: "Western"}
+
+  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: div#content > div.poststuff > div.postname
+      filters:
+        - name: trim
+        - name: validfilename
+
+search:
+  paths:
+    # with just 5 results per page, try to grab up to 25 results
+    # http://ebb.la/?s=teeth
+    # http://ebb.la/page/2/?s=teeth
+    - path: "{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/2/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/3/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/4/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+    - path: "page/5/{{ if .Keywords }}?s={{ .Keywords }}{{ else }}{{ end }}"
+
+  rows:
+    selector: "div#content > div.poststuff, div#content > div.poststuff + div.entry:has(a.download)"
+    after: 1
+
+  fields:
+    category:
+      text: Other
+    category|noappend:
+      selector: span.writer
+      filters:
+        - name: regexp
+          args: "E book under:\\s+(.+?)\\s"
+    title:
+      selector: div.postname a
+    details:
+      selector: a.detail
+      attribute: href
+    download:
+      selector: a.detail
+      attribute: href
+    poster:
+      selector: img[src^="http"]:not(img[src*="images/default_cover.jpg"])
+      attribute: src
+    date:
+      text: now
+    size_optional:
+      optional: true
+      selector: p:contains("File Size")
+      filters:
+        - name: regexp
+          args: "File Size: (.+?)s?$"
+    size:
+      text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
+    seeders_optional:
+      optional: true
+      selector: p:contains("Seeds")
+      filters:
+        - name: regexp
+          args: "Seeds: (\\d+)"
+    seeders:
+      text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
+    leechers_optional:
+      optional: true
+      selector: p:contains("Peers")
+      filters:
+        - name: regexp
+          args: "Peers: (\\d+)"
+    leechers:
+      text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
+    grabs_optional:
+      optional: true
+      selector: p:contains("Completed Downloads")
+      filters:
+        - name: regexp
+          args: "Completed Downloads: (\\d+)"
+    grabs:
+      text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# WordPress 2.5

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

@@ -0,0 +1,185 @@
+---
+id: electro-torrent
+name: Electro-Torrent
+description: "Electro-Torrent is a POLISH Semi-Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: pl-PL
+type: semi-private
+encoding: UTF-8
+links:
+  - http://electro-torrent.pl/
+
+caps:
+  categorymappings:
+    - {id: 1, cat: Movies/SD, desc: "Filmy XviD/DivX"}
+    - {id: 769, cat: Movies/HD, desc: "Filmy 1080p AVC"}
+    - {id: 770, cat: Movies/HD, desc: "Filmy x264/1080p"}
+    - {id: 4, cat: Movies/HD, desc: "Filmy x264/720p"}
+    - {id: 642, cat: Movies/HD, desc: "Filmy x264/h264"}
+    - {id: 723, cat: Movies/UHD, desc: "Filmy 4K UHD"}
+    - {id: 1160, cat: Movies/UHD, desc: "Filmy x265/2160p"}
+    - {id: 1116, cat: Movies/HD, desc: "Filmy x265/1080p"}
+    - {id: 1204, cat: Movies/HD, desc: "Filmy x265/720p"}
+    - {id: 596, cat: Movies/HD, desc: "Filmy x265/h265"}
+    - {id: 1072, cat: Movies, desc: "Filmy - WAREZY"}
+    - {id: 3, cat: Movies/DVD, desc: "Filmy DVD"}
+    - {id: 5, cat: Movies/3D, desc: "Filmy 3D"}
+    - {id: 362, cat: Movies/SD, desc: "Filmy IVO"}
+    - {id: 696, cat: Movies/SD, desc: "Filmy TS/CAM"}
+    - {id: 7, cat: TV, desc: "TV/Seriale"}
+    - {id: 8, cat: XXX, desc: "Erotyka"}
+    - {id: 10, cat: Audio, desc: "Muzyka"}
+    - {id: 11, cat: PC, desc: "Programy"}
+    - {id: 12, cat: PC/Mobile-Other, desc: "GSM/PDA"}
+    - {id: 13, cat: Console, desc: "Konsole"}
+    - {id: 14, cat: PC/Games, desc: "Gry PC"}
+    - {id: 1045, cat: PC/Games, desc: "Gry PC - Warezy"}
+    - {id: 15, cat: Movies, desc: "Dla Dzieci"}
+    - {id: 16, cat: Books, desc: "Książki"}
+    - {id: 525, cat: PC/Mac, desc: "Mac"}
+    - {id: 18, cat: PC, desc: "Linux"}
+    - {id: 19, cat: TV/Sport, desc: "Sport"}
+    - {id: 907, cat: TV/Anime, desc: "Anime"}
+    - {id: 21, cat: Other, desc: "Inne"}
+
+  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: multilang
+    type: checkbox
+    label: Replace MULTi by another language in release name
+    default: false
+  - name: multilanguage
+    type: select
+    label: Replace MULTi by this language
+    default: POLISH
+    options:
+      POLISH: POLISH
+      MULTi POLISH: MULTi POLISH
+
+login:
+  path: logowanie
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[src^="img.php?size=3"]
+    input: vImageCodP
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    returnto: ""
+  error:
+    - selector: div#center-side:contains("Logowanie nie")
+  test:
+    path: /
+    selector: a[href$="/logout.php"]
+
+search:
+  # http://electro-torrent.pl/szukaj.php?search=&typ=torrent&cat=0
+  paths:
+    - path: szukaj.php
+  inputs:
+    # does not support multi cat selection, defaulting to all
+    # $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
+    cat: 0
+    typ: torrent
+    search: "{{ .Keywords }}"
+
+  rows:
+    selector: table.test5 > tbody > tr > td > div[id]:has(a[href*="/download/"])
+
+  fields:
+    category:
+      selector: div#kategoria-gatunek-1
+      case:
+        "div#kategoria-gatunek-1:contains(\"Filmy XviD/DivX\")": 1
+        "div#kategoria-gatunek-1:contains(\"Filmy 1080p AVC\")": 769
+        "div#kategoria-gatunek-1:contains(\"Filmy x264/1080p\")": 770
+        "div#kategoria-gatunek-1:contains(\"Filmy x264/720p\")": 4
+        "div#kategoria-gatunek-1:contains(\"Filmy x264/h264\")": 642
+        "div#kategoria-gatunek-1:contains(\"Filmy 4K UHD\")": 723
+        "div#kategoria-gatunek-1:contains(\"Filmy x265/2160p\")": 1160
+        "div#kategoria-gatunek-1:contains(\"Filmy x265/1080p\")": 1116
+        "div#kategoria-gatunek-1:contains(\"Filmy x265/720p\")": 1204
+        "div#kategoria-gatunek-1:contains(\"Filmy x265/h265\")": 596
+        "div#kategoria-gatunek-1:contains(\"Filmy - WAREZY\")": 1072
+        "div#kategoria-gatunek-1:contains(\"Filmy DVD\")": 3
+        "div#kategoria-gatunek-1:contains(\"Filmy 3D\")": 5
+        "div#kategoria-gatunek-1:contains(\"Filmy IVO\")": 362
+        "div#kategoria-gatunek-1:contains(\"Filmy TS/CAM\")": 696
+        "div#kategoria-gatunek-1:contains(\"TV/Seriale\")": 7
+        "div#kategoria-gatunek-1:contains(\"Erotyka\")": 8
+        "div#kategoria-gatunek-1:contains(\"Muzyka\")": 10
+        "div#kategoria-gatunek-1:contains(\"Programy\")": 11
+        "div#kategoria-gatunek-1:contains(\"GSM/PDA\")": 12
+        "div#kategoria-gatunek-1:contains(\"Konsole\")": 13
+        "div#kategoria-gatunek-1:contains(\"Gry PC - Warezy\")": 1045
+        "div#kategoria-gatunek-1:contains(\"Gry PC\")": 14
+        "div#kategoria-gatunek-1:contains(\"Dla Dzieci\")": 15
+        "div#kategoria-gatunek-1:contains(\"Książki\")": 16
+        "div#kategoria-gatunek-1:contains(\"Mac\")": 525
+        "div#kategoria-gatunek-1:contains(\"Linux\")": 18
+        "div#kategoria-gatunek-1:contains(\"Sport\")": 19
+        "div#kategoria-gatunek-1:contains(\"Anime\")": 907
+        "div#kategoria-gatunek-1:contains(\"Inne\")": 21
+    title_phase1:
+      selector: a[href^="/torrent/"]
+      attribute: title
+    title_multilang:
+      selector: a[href^="/torrent/"]
+      attribute: title
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:POLISH|ENGLISH|\\bPL\\b)))\\b", "{{ .Config.multilanguage }}"]
+        - name: re_replace
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    details:
+      selector: a[href^="/torrent/"]
+      attribute: href
+    download:
+      selector: a[href*="/download/"]
+      attribute: href
+    poster:
+      selector: img.browse_poster
+      attribute: src
+    date:
+      selector: td.descr3
+      filters:
+        - name: regexp
+          args: (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})
+        - name: append
+          args: " +01:00" # CET
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    size:
+      selector: td.descr3
+      filters:
+        - name: regexp
+          args: (\d{1,4}\.\d{2}\s+?[T|G|M|k]B)
+    seeders:
+      selector: font[color="green"] > b, font[color="red"] > b
+    leechers:
+      selector: font[color="green"]:nth-of-type(2) > b, font[color="red"]:nth-of-type(2) > b
+    grabs:
+      selector: td.descr3
+      filters:
+        - name: regexp
+          args: (\d{1,4}) razy
+    downloadvolumefactor:
+      text: 0
+    uploadvolumefactor:
+      text: 1
+# engine n/a

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

@@ -7,11 +7,10 @@ type: public
 encoding: UTF-8
 links:
   - https://extratorrent.st/
-  - https://extratorrent.unblockit.ink/
-  - https://extratorrent.nocensor.art/
+  - https://extratorrent.unblockit.bio/
+  - https://extratorrent.mrunblock.guru/
 legacylinks:
   - https://extratorrent.nocensor.work/
-  - https://extratorrent.unblockit.bz/
   - https://extratorrent.unblockit.tv/
   - https://extratorrent.unblockit.how/
   - https://extratorrent.unblockit.cam/
@@ -29,6 +28,8 @@ legacylinks:
   - https://extratorrent.unblockit.page/
   - https://extratorrent.unblockit.pet/
   - https://extratorrent.nocensor.lol/
+  - https://extratorrent.unblockit.ink/
+  - https://extratorrent.nocensor.art/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/eztv.yml

@@ -13,17 +13,13 @@ links:
   - https://eztv.yt/
   - https://eztv1.xyz/
   - https://eztv.unblockninja.com/
-  - https://eztv.unblockit.ink/
-  - https://eztv.nocensor.art/
+  - https://eztv.unblockit.bio/
+  - https://eztv.mrunblock.guru/
 legacylinks:
   - https://eztv.ag/ # redirects to .re
   - https://eztv.it/ # redirects to .re
   - https://eztv.ch/ # redirects to .re
   - https://eztv.io/
-  - https://eztv.unblockit.bz/
-  - https://eztv.unblockit.tv/
-  - https://eztv.unblockit.how/
-  - https://eztv.unblockit.cam/
   - https://eztv.nocensor.biz/
   - https://eztv.unblockit.day/
   - https://eztv.unblockit.llc/
@@ -38,6 +34,8 @@ legacylinks:
   - https://eztv.unblockit.page/
   - https://eztv.unblockit.pet/
   - https://eztv.nocensor.lol/
+  - https://eztv.unblockit.ink/
+  - https://eztv.nocensor.art/
 
 caps:
   categories:

src/Jackett.Common/Definitions/filelisting.yml

@@ -7,12 +7,13 @@ type: public
 encoding: UTF-8
 links:
   - https://filelisting.com/
-  - https://filelisting.nocensor.art/
+  - https://filelisting.mrunblock.guru/
 legacylinks:
   - https://filelisting.nocensor.biz/
   - https://filelisting.nocensor.sbs/
   - https://filelisting.nocensor.world/
   - https://filelisting.nocensor.lol/
+  - https://filelisting.nocensor.art/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/gainbound.yml

@@ -0,0 +1,153 @@
+---
+id: gainbound
+name: GainBound
+description: "GainBound is a CHINESE Private Tracker for MOVIES especially from Hong Kong."
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://gainbound.net/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies(电影)"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries(纪录片)"}
+    - {id: 406, cat: Audio/Video, desc: "Music Videos(演唱会/MV)"}
+    - {id: 410, cat: TV, desc: "TV Series(港台剧)"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid]
+    movie-search: [q, imdbid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: 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:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+      remove: span.__cf_email__
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.8.0 2023-01-26

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

@@ -38,25 +38,29 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: vfq
-    type: checkbox
-    label: Replace VFQ with FRENCH in release name
-    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
-    default: VOSTFR
+    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 and SUBFRENCH with ENGLISH
+    default: false
+  - name: vfq
+    type: checkbox
+    label: Replace VFQ with FRENCH
+    default: false
   - name: sort
     type: select
     label: Sort requested from site
@@ -115,25 +119,29 @@ search:
   fields:
     category:
       selector: category_id
-    title_original:
+    title_phase1:
       selector: name
-      filters:
-        - name: replace
-          args: [".", " "]
     title_vfq:
-      text: "{{ .Result.title_original }}"
+      text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\sVFQ\\s)", " FRENCH "]
-    title_step2:
-      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_original }}{{ end }}"
+          args: ["(?i)\\b(VFQ)\\b", "FRENCH"]
+    title_phase2:
+      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_vostfr:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
+    title_phase3:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     title_multilang:
-      text: "{{ .Result.title_step2 }}"
+      text: "{{ .Result.title_phase3 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\sMULTI\\s)", " {{ .Config.multilanguage }} "]
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
     title:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_step2 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
     details:
       selector: details_link
     download:

src/Jackett.Common/Definitions/gktorrent.yml

@@ -9,6 +9,7 @@ followredirect: true
 # to fetch current domain use https://www.protege-liens.com/Gktorrent
 links:
   - https://www.gktorrents.cc/
+  - https://gktorrent.mrunblock.guru/
 legacylinks:
   - https://www.gktorrent.org/
   - https://www.gktorrent.me/
@@ -55,22 +56,22 @@ caps:
 settings:
   - 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:
@@ -121,22 +122,20 @@ search:
         # and we delete it at the end
         - name: re_replace
           args: ["(19|20\\d{2})$", ""]
-    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: td:nth-child(1) a
       attribute: href

src/Jackett.Common/Definitions/glodls.yml

@@ -10,15 +10,12 @@ links:
   - https://glodls.to/
   - https://gtdb.cc/
   - https://www.gtdb.to/
-  - https://glotorrents.unblockit.ink/
-  - https://glotorrents.nocensor.art/
+  - https://glotorrents.unblockit.bio/
+  - https://glotorrents.mrunblock.guru/
   - https://glodls.unblockninja.com/
 legacylinks:
   - https://glodls.rocks/
   - https://gtdb.to/
-  - https://glotorrents.nocensor.work/
-  - https://glotorrents.unblockit.bz/
-  - https://glotorrents.unblockit.tv/
   - https://glotorrents.unblockit.how/
   - https://glotorrents.unblockit.cam/
   - https://glotorrents.nocensor.biz/
@@ -35,6 +32,8 @@ legacylinks:
   - https://glotorrents.unblockit.page/
   - https://glotorrents.unblockit.pet/
   - https://glotorrents.nocensor.lol/
+  - https://glotorrents.unblockit.ink/
+  - https://glotorrents.nocensor.art/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/haitang.yml

@@ -170,4 +170,4 @@ search:
     minimumseedtime:
       # 1 day (as seconds = 24 x 60 x 60)
       text: 86400
-# NexusPHP v1.0
+# NexusPHP v1.1 2021-10-15

src/Jackett.Common/Definitions/hdai.yml

@@ -1,223 +0,0 @@
----
-id: hdai
-name: HDAI
-description: "HDAI is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
-language: zh-CN
-type: private
-encoding: UTF-8
-links:
-  - https://www.hd.ai/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "电影Movies"}
-    - {id: 2, cat: TV, desc: "电视剧TV Series"}
-    - {id: 3, cat: TV/Other, desc: "综艺TV Shows"}
-    - {id: 4, cat: TV/Documentary, desc: "纪录片Documentaries"}
-    - {id: 5, cat: TV/Anime, desc: "动漫Animations"}
-    - {id: 6, cat: Audio/Video, desc: "音乐视频Music Videos"}
-    - {id: 7, cat: TV/Sport, desc: "体育Sports"}
-    - {id: 8, cat: Audio, desc: "音乐Music"}
-    - {id: 9, cat: Books, desc: "电子书Ebook"}
-    - {id: 10, cat: PC, desc: "软件Software"}
-    - {id: 11, cat: Console, desc: "游戏Game"}
-    - {id: 12, cat: Other, desc: "资料Education"}
-    - {id: 13, cat: Other, desc: "旅游Travel"}
-    - {id: 14, cat: Other, desc: "美食Food"}
-    - {id: 15, cat: Other/Misc, desc: "其他Misc"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, doubanid]
-    movie-search: [q, imdbid, doubanid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: info_tpp
-    type: info
-    label: Results Per Page
-    default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: takelogin.php
-  method: post
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    logout: ""
-    securelogin: ""
-    ssl: yes
-    trackerssl: yes
-  error:
-    - selector: td.embedded:has(h2:contains("失败"))
-    - selector: td.embedded:has(h2:contains("failed!"))
-  test:
-    path: index.php
-    selector: a[href="/Users.logout"]
-
-search:
-  paths:
-    - path: Torrents.tableList
-      method: post
-      response:
-        type: json
-
-  keywordsfilters:
-    - name: re_replace
-      args: ["[\\s]+", "%"]
-
-  inputs:
-    searchParams: "{\"sp_state\":\"{{ if .Config.freeleech }}2{{ else }}{{ end }}\",\"keyword\":\"{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}\",\"keyword_area\":\"{{ if .Query.IMDBID }}9{{ else }}{{ end }}{{ if .Query.DoubanID }}10{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}1{{ end }}\"}"
-    page: 1
-    limit: 100
-    field: "{{ .Config.sort }}"
-    order: "{{ .Config.type }}"
-    # json results does not have imdblink, and does not support multi cat filtering, defaulting to ALL.
-
-  rows:
-    selector: data.items
-    count:
-      selector: data.total
-
-  fields:
-    category:
-      selector: category
-    _source:
-      selector: source
-      case:
-        0: ""
-        1: CN
-        2: EU/US
-        3: HK/TW
-        4: JP
-        5: KR
-        6: Other
-    _medium:
-      selector: medium
-      case:
-        0: ""
-        1: "UHD Blu-ray"
-        2: "Blu-ray"
-        3: "Remux"
-        4: "WEB-DL"
-        5: "Encode"
-        6: "HDTV"
-        7: "DVD"
-        8: "CD"
-        9: "MiniBD"
-    _codec:
-      selector: codec
-      case:
-        0: ""
-        1: "H.265(HEVC)"
-        2: "H.264"
-        3: "VC-1"
-        4: "Xvid"
-        5: "MPEG-2"
-        7: "MPEG-4"
-        6: "Other"
-    _audiocodec:
-      selector: audiocodec
-      case:
-        0: ""
-        1: "DTS:X 7.1"
-        2: "DTS-HD"
-        3: "TrueHD Atmos"
-        4: "TrueHD"
-        5: "DTS"
-        6: "LPCM"
-        7: "FLAC"
-        8: "WAV"
-        9: "APE"
-        10: "AAC"
-        11: "AC3"
-        12: "OGG"
-        13: "MPEG"
-        14: "Other"
-    _standard:
-      selector: standard
-      case:
-        0: ""
-        1: "8K"
-        2: "2160p"
-        3: "1080p"
-        4: "1080i"
-        5: "720p"
-        6: "SD"
-    title:
-      selector: name
-    details:
-      selector: details
-    download:
-      selector: download
-    description:
-      selector: small_descr
-      filters:
-        - name: append
-          args: " [{{ .Result._medium }} {{ .Result._standard }} {{ .Result._codec }} {{ .Result._audiocodec }} {{ .Result._source }}]"
-    poster:
-      selector: poster
-    seeders:
-      selector: seeders
-    leechers:
-      selector: leechers
-    grabs:
-      selector: times_completed
-    date:
-      # 2021-10-17 14:33:53
-      selector: added
-      filters:
-        - name: append
-          args: " +08:00" # CST
-        - name: dateparse
-          args: "2006-01-02 15:04:05 -07:00"
-    size:
-      selector: ..size
-    downloadvolumefactor:
-      selector: sp_state
-      case:
-        2: 0   # free
-        4: 0   # 2x free
-        5: 0.5 # 50% free
-        6: 0.5 # 2x 50% free
-        7: 0.3 # 30% free
-        "*": 1
-    uploadvolumefactor:
-      selector: sp_state
-      case:
-        3: 2 # 2x
-        4: 2 # 2x free
-        6: 2 # 2x 50% free
-        "*": 1
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      # 2 day (as seconds = 2 x 24 x 60 x 60)
-      text: 172800
-# json NexusPHP v1.5 beta 5 20120707

src/Jackett.Common/Definitions/hdatmos.yml

@@ -32,6 +32,13 @@ settings:
   - 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 HDAtmos Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -66,12 +73,14 @@ login:
     selector: img[alt="CAPTCHA"]
     input: imagestring
   inputs:
+    secret: ""
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
+    two_step_code: "{{ .Config.2facode }}"
     logout: ""
     securelogin: ""
     ssl: yes
-    trackerssl: ""
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
       message:
@@ -172,4 +181,4 @@ search:
       remove: a, img
     minimumratio:
       text: 0.81
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP 1.7.31 2022-11-14

src/Jackett.Common/Definitions/hdbits.yml

@@ -1,123 +0,0 @@
----
-id: hdbits
-name: HDBits
-description: "Best HD Tracker"
-language: en-US
-type: private
-encoding: UTF-8
-links:
-  - https://hdbits.org/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: "Movies", desc: "Movie"}
-    - {id: 2, cat: "TV", desc: "TV"}
-    - {id: 3, cat: "TV/Documentary", desc: "Documentary"}
-    - {id: 4, cat: "Audio", desc: "Music"}
-    - {id: 5, cat: "TV/Sport", desc: "Sport"}
-    - {id: 6, cat: "Audio", desc: "Audio Track"}
-    - {id: 7, cat: "XXX", desc: "XXX"}
-    - {id: 8, cat: "Other", desc: "Misc/Demo"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid]
-    movie-search: [q, imdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Filter FreeLeech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: added
-    options:
-      added: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: DESC
-    options:
-      DESC: desc
-      ASC: asc
-
-login:
-  path: login
-  method: form
-  form: form
-  inputs:
-    uname: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-  error:
-    - selector: table.main:contains("Login Failed!")
-  test:
-    path: my.php
-
-search:
-  paths:
-    - path: browse.php
-  inputs:
-    $raw: "{{ range .Categories }}filter_cat[{{.}}]=1&{{end}}"
-    search: "{{ .Keywords }}"
-    descriptions: 0
-    imdbgt: 0
-    imdblt: 10
-    imdb: "{{ .Query.IMDBID }}"
-    sort: "{{ .Config.sort }}"
-    d: "{{ .Config.type }}"
-
-  rows:
-    selector: "table#torrent-list > tbody > tr:has(a[href^=\"/details.php?id=\"]){{ if .Config.freeleech }}:has(a[title=\"100% FL: no download is counted.\"]){{ else }}{{ end }}"
-
-  fields:
-    category:
-      selector: a[href^="?cat="]
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    title:
-      selector: td:nth-child(3) a
-    download:
-      selector: a[href^="/download.php"]
-      attribute: href
-    details:
-      selector: a[href^="/details.php?id="]
-      attribute: href
-    grabs:
-      selector: td:nth-child(7) a
-    size:
-      selector: td:nth-child(6)
-    seeders:
-      selector: td:nth-child(8)
-    leechers:
-      selector: td:nth-child(9)
-    date:
-      selector: td:nth-child(5)
-      filters:
-        - name: append
-          args: " ago"
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    downloadvolumefactor:
-      case:
-        "a[title=\"25% Free Leech: only 75% of the download is counted.\"]": 0.25
-        "a[title=\"50% Free Leech: only half the download is counted.\"]": 0.5
-        "a[title=\"100% FL: no download is counted.\"]": 0
-        "*": 1
-    uploadvolumefactor:
-      text: 1
-# engine tbd

src/Jackett.Common/Definitions/hdchina.yml

@@ -145,4 +145,4 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
-# NexusPHP 146364c08c (Customised)
+# NexusPHP 2c858e7 (Customised)

src/Jackett.Common/Definitions/hdfans.yml

@@ -82,6 +82,7 @@ login:
     selector: img[alt="CAPTCHA"]
     input: imagestring
   inputs:
+    secret: ""
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
     two_step_code: "{{ .Config.2facode }}"
@@ -138,6 +139,9 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
       selector: a[href*="imdb.com/title/tt"]
       attribute: href
@@ -189,4 +193,4 @@ search:
       remove: a, img
     minimumratio:
       text: 0.81
-# NexusPHP Standard v1.7.6
+# NexusPHP v1.8.0 2023-01-20

src/Jackett.Common/Definitions/hdforever.yml

@@ -44,22 +44,22 @@ settings:
     default: If you <b>do not</b> have any <i>Freeleech tokens</i> then do not tick this box.</br>Attempting a token download when you have no tokens will generate an <b>error</b>.
   - 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
@@ -236,22 +236,20 @@ search:
           args: [".VOF", ".FRENCH"]
         - name: replace
           args: [".VFQ.MULTI", ".MULTI.VFQ"]
-    title_multilang:
+    title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]multi[\\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)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
-        - name: re_replace
-          args: ["(?i)([\\s|\\.|-]subfrench[\\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 }}"
     description:
       selector: div.group_info
     poster:

src/Jackett.Common/Definitions/hdhome.yml

@@ -170,4 +170,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+# NexusPHP v2.0 2014-11-24

src/Jackett.Common/Definitions/hdmayi.yml

@@ -0,0 +1,173 @@
+---
+id: hdmayi
+name: HDMaYi
+description: "HDMaYi (小蚂蚁PT站) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - http://hdmayi.com/ # does not support https properly
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "Music/音乐"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: cookie
+    type: text
+    label: Cookie
+  - name: info
+    type: info
+    label: How to get the Cookie
+    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: freeleech
+    type: checkbox
+    label: Search freeleech only
+    default: false
+  - name: 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:
+  method: cookie
+  inputs:
+    cookie: "{{ .Config.cookie }}"
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if 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 }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.29 2022-10-12

src/Jackett.Common/Definitions/hdonly.yml

@@ -42,22 +42,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
+      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
@@ -237,22 +237,20 @@ search:
           args: ["[Série]", ""]
         - name: re_replace
           args: ["\\[(\\d{4})\\]", "$1"]
-    title_multilang:
+    title_vostfr:
       text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)([\\s|\\.|-]multi[\\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)([\\s|\\.|-]vostfr[\\s|\\.|-])", ".ENGLISH."]
-        - name: re_replace
-          args: ["(?i)([\\s|\\.|-]subfrench[\\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 }}"
     description:
       selector: div.group_info
     poster:

src/Jackett.Common/Definitions/hdspain.yml

@@ -1,192 +0,0 @@
----
-id: hdspain
-name: HD-Spain
-description: "HD-Spain is a SPANISH site for HD content"
-language: es-ES
-type: private
-encoding: ISO-8859-1
-links:
-  - https://www.hd-spain.com/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies/HD, desc: "Películas"}
-    - {id: 5, cat: Movies/HD, desc: "Pelíc. Anim."}
-    - {id: 4, cat: TV/HD, desc: "Series"}
-    - {id: 3, cat: TV/HD, desc: "Series Anim."}
-    - {id: 6, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 11, cat: TV/Sport, desc: "Deportes"}
-    - {id: 7, cat: Audio/Video, desc: "Música/Espec."}
-    - {id: 9, cat: TV/Other, desc: "Programas TV"}
-    - {id: 8, cat: Audio/Lossless, desc: "Audios"}
-    - {id: 10, cat: XXX/x264, desc: "XXX"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep]
-    movie-search: [q]
-    music-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: index.php
-    selector: .tcabecera
-
-search:
-  path: index.php
-  keywordsfilters:
-    - name: re_replace
-      args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-  inputs:
-    sec: listado
-    ord: 9
-    b: "{{ .Keywords }}"
-    # 0 incldead, 1 onlyactive, 2 onlydead
-    ver: 0
-    # 0 new and relaunch, 1 onlynew, 2 onlyrelaunch
-    relanz: 0
-    $raw: "{{ range .Categories }}&cat[]={{.}}{{end}}"
-
-  rows:
-    selector: "table.listatorrents tr:not(:first-child)"
-
-  fields:
-    category:
-      selector: td.categorias a
-      attribute: href
-      filters:
-        - name: querystring
-          args: cat
-    _extras:
-      optional: true
-      selector: td.titulo a[class]
-      filters:
-        - name: prepend
-          args: "["
-        - name: append
-          args: "]"
-        - name: re_replace
-          args: ["(?i)(MEGAPACK)", "REPACK"]
-        - name: re_replace
-          args: ["(?i)(AUDIOEDITADO)", "PROPER"]
-        - name: re_replace
-          args: ["(?i)(VERSIÓN MEJORADA)", "PROPER"]
-    title_vose:
-      selector: td.titulo a[id]:contains("VOSE")
-      optional: true
-      filters:
-        - name: append
-          args: "{{ .Result._extras }} English"
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    title_notvose:
-      selector: td.titulo a[id]:not(:contains("VOSE"))
-      optional: true
-      filters:
-        - name: append
-          args: "{{ .Result._extras }} Spanish"
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-    title:
-      text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}"
-    details:
-      selector: td.titulo a[id]
-      attribute: href
-    download:
-      selector: td.descargar a
-      attribute: href
-    description:
-      selector: td.titulo a[class]
-    size:
-      selector: td.tamano
-    seeders:
-      selector: td.usuarios.seeds a
-    leechers:
-      selector: td.usuarios.leechers a
-    grabs:
-      selector: td.usuarios.completados
-    date_optional:
-      optional: true
-      selector: td.fecha
-      attribute: title
-      filters:
-        - name: replace
-          args: ["Lunes", "Monday"]
-        - name: replace
-          args: ["Martes", "Tuesday"]
-        - name: re_replace
-          args: ["Miércoles", "Wednesday"]
-        - name: replace
-          args: ["Jueves", "Thursday"]
-        - name: replace
-          args: ["Viernes", "Friday"]
-        - name: re_replace
-          args: ["Sábado", "Saturday"]
-        - name: replace
-          args: ["Domingo", "Sunday"]
-        - name: replace
-          args: ["Enero", "January"]
-        - name: replace
-          args: ["Febrero", "February"]
-        - name: replace
-          args: ["Marzo", "March"]
-        - name: replace
-          args: ["Abril", "April"]
-        - name: replace
-          args: ["Mayo", "May"]
-        - name: replace
-          args: ["Junio", "June"]
-        - name: replace
-          args: ["Julio", "July"]
-        - name: replace
-          args: ["Agosto", "August"]
-        - name: replace
-          args: ["Septiembre", "September"]
-        - name: replace
-          args: ["Octubre", "October"]
-        - name: replace
-          args: ["Noviembre", "November"]
-        - name: replace
-          args: ["Diciembre", "December"]
-        - name: append
-          args: " +01:00" # CET
-        - name: dateparse
-          args: "Monday 2 January 2006, 15:04 -07:00"
-    date:
-      text: "{{ if .Result.date_optional }}{{ .Result.date_optional }}{{ else }}now{{ end }}"
-    downloadvolumefactor_optional:
-      optional: true
-      selector: td.descargar a b strong
-      case:
-        "Freeleech": 0
-        "Freeleech X2": 0
-        "*": 1
-    downloadvolumefactor:
-      text: "{{ if .Result.downloadvolumefactor_optional }}{{ .Result.downloadvolumefactor_optional }}{{ else }}1{{ end }}"
-    uploadvolumefactor_optional:
-      optional: true
-      selector: td.descargar a b strong
-      case:
-        "Freeleech X2": 2
-        "*": 1
-    uploadvolumefactor:
-      text: "{{ if .Result.uploadvolumefactor_optional }}{{ .Result.uploadvolumefactor_optional }}{{ else }}1{{ end }}"
-    minimumratio:
-      text: 1.0
-    minimumseedtime:
-      text: 345600
-# engine n/a

src/Jackett.Common/Definitions/hdtime.yml

@@ -38,6 +38,13 @@ settings:
   - 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 HDtime Web Site. Otherwise just leave it empty."
   - name: freeleech
     type: checkbox
     label: Search freeleech only
@@ -67,11 +74,14 @@ login:
   path: takelogin.php
   method: post
   inputs:
-    loginmethod: username
+    secret: ""
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    dutime: month
+    two_step_code: "{{ .Config.2facode }}"
+    logout: ""
+    securelogin: ""
     ssl: yes
+    trackerssl: yes
   error:
     - selector: td.embedded:has(h2:contains("失败"))
     - selector: td.embedded:has(h2:contains("Failed"))
@@ -84,12 +94,12 @@ search:
     - path: torrents.php
   inputs:
     $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
-    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if .Query.DoubanID }}/{{ .Query.DoubanID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}{{ .Keywords }}{{ end }}"
+    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).
+    # 0 title, 1 descr, 3 uploader, 4 imdburl (not working)
     search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ else }}0{{ end }}"
     # 0 AND, 1 OR, 2 exact
     search_mode: 0
@@ -120,13 +130,20 @@ search:
     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:nth-child(4) > span[title]
+      selector: td.rowfollow:nth-child(4) > span[title]
       attribute: title
       optional: true
       filters:
@@ -136,7 +153,7 @@ search:
           args: "2006-01-02 15:04:05 -07:00"
     date_added:
       # time added
-      selector: td:nth-child(4):not(:has(span))
+      selector: td.rowfollow:nth-child(4):not(:has(span))
       optional: true
       filters:
         - name: append
@@ -146,13 +163,13 @@ search:
     date:
       text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
     size:
-      selector: td:nth-child(5)
+      selector: td.rowfollow:nth-child(5)
     seeders:
-      selector: td:nth-child(6)
+      selector: td.rowfollow:nth-child(6)
     leechers:
-      selector: td:nth-child(7)
+      selector: td.rowfollow:nth-child(7)
     grabs:
-      selector: td:nth-child(8)
+      selector: td.rowfollow:nth-child(8)
     downloadvolumefactor:
       case:
         img.pro_free: 0
@@ -168,8 +185,8 @@ search:
         img.pro_2up: 2
         "*": 1
     minimumratio:
-      text: 0.8
+      text: 0.81
     description:
-      selector: td:nth-child(2)
+      selector: td.rowfollow:nth-child(2)
       remove: a, img
-# NexusPHP v1.7.4
+# NexusPHP v1.7.33 2023-01-04

src/Jackett.Common/Definitions/hdtorrentsit.yml

@@ -30,7 +30,7 @@ settings:
   - name: ip_filtering
     type: info
     label: "IP Filtering"
-    default: "HDtorrents allows only Italian IP addressess. The <b>404 Not Found</b> error means your IP was not accepted."
+    default: "The <b>404 Not Found</b> error means your IP was not accepted. Check the <a href=\" https://check-host.net/check-report/e5b649bkfa\" target =_blank>Locations</a> report, only those with a Status of <b>OK</b> will be accepted."
 
 login:
   path: takelogin.php

src/Jackett.Common/Definitions/hhanclub.yml

@@ -130,6 +130,9 @@ search:
     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"]
@@ -189,4 +192,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, img
-# NexusPHP v1.7.24 2022-08-30
+# NexusPHP v1.7.30 2022-11-05

src/Jackett.Common/Definitions/icc2022.yml

@@ -0,0 +1,203 @@
+---
+id: icc2022
+name: ICC2022
+description: "ICC2022 (冰淇淋) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 2
+links:
+  - https://www.icc2022.com/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影", default: true}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片", default: true}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫", default: true}
+    - {id: 402, cat: TV, desc: "TV Series/电视剧", default: true}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺", default: true}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/MV", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育", default: true}
+    - {id: 409, cat: Other, desc: "Misc/其他", default: true}
+    - {id: 408, cat: Audio, desc: "Music/音乐", default: true}
+    # special
+    - {id: 410, cat: Movies, desc: "Video/视频资料", default: true}
+    - {id: 411, cat: Audio, desc: "Audio/音频资料", default: true}
+    - {id: 412, cat: Other, desc: "Other/其他资料", default: true}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the 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("失败"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409]
+    - path: special.php
+      categories: [410, 411, 412]
+  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 }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 1 day (as seconds = 24 x 60 x 60)
+      text: 86400
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.29 2022-10-13

src/Jackett.Common/Definitions/ihdbits.yml

@@ -130,6 +130,9 @@ search:
     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"]
@@ -189,4 +192,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, img
-# NexusPHP 1.7.29 2022-10-13
+# NexusPHP v1.7.30 2022-11-05

src/Jackett.Common/Definitions/ilcorsaronero.yml

@@ -12,7 +12,7 @@ links:
   - https://ilcorsaronero.fun/
   - https://ilcorsaronero.pro/
   - https://ilcorsaronero.torrentbay.to/
-  - https://ilcorsaronero.nocensor.art/
+  - https://ilcorsaronero.mrunblock.guru/
 legacylinks:
   - https://ilcorsaronero.live/
   - https://ilcorsaronero.vip/
@@ -32,6 +32,7 @@ legacylinks:
   - https://ilcorsaronero.nocensor.sbs/
   - https://ilcorsaronero.nocensor.world/
   - https://ilcorsaronero.nocensor.lol/
+  - https://ilcorsaronero.nocensor.art/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/korsar.yml

@@ -439,6 +439,13 @@ settings:
     type: info
     label: How to get the Cookie
     default: "<ol><li><a href=\"http://filbi1976.org/ucp.php?mode=login\" target =_blank>Login</a> to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: 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>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -464,6 +471,9 @@ login:
     path: index.php
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
+
   paths:
   # http://filbi1976.org/search.php?t=0&cs=1&cs_post=1&sc=1&keywords=&cs_where=title&cs_forb=&submit=Hand+Search&fid%5B%5D=0&cs_format=0&cs_year=0&cs_filter=0&sk=nt&sd=d&cs_private=0
     - path: search.php
@@ -490,11 +500,11 @@ search:
 
   fields:
     category:
-      selector: a[href*="/viewtopic.php?f="]
+      selector: a[href$=".html"]
       attribute: href
       filters:
-        - name: querystring
-          args: f
+        - name: regexp
+          args: -f(\d+)
     title:
       selector: a.topictitle
     details:

src/Jackett.Common/Definitions/krazyzone.yml

@@ -24,7 +24,7 @@ caps:
     - {id: 81, cat: Audio, desc: "Music Assorted Albums"}
     - {id: 46, cat: Audio/Video, desc: "Music Videos"}
     - {id: 24, cat: Audio, desc: "Music Karaoke"}
-    - {id: 28, cat: Movies, desc: "Movies 2022"}
+    - {id: 28, cat: Movies, desc: "Movies 2023"}
     - {id: 47, cat: Movies/BluRay, desc: "Movies Bluray-HD"}
     - {id: 9, cat: Movies/DVD, desc: "Movies Dvdr-ISO"}
     - {id: 52, cat: Movies, desc: "Movies Classic Pre90s"}

src/Jackett.Common/Definitions/lastfiles.yml

@@ -8,58 +8,58 @@ encoding: utf-8
 followredirect: true
 requestDelay: 2
 links:
-  - https://www.lastfiles.ro/
-  - http://www.lastfiles.ro/
   - https://www.last-torrents.org/
-  - http://www.last-torrents.org/
 legacylinks:
   - http://last-torrents.org/
   - https://last-torrents.org/
+  - https://www.lastfiles.ro/
+  - http://www.lastfiles.ro/
+  - http://www.last-torrents.org/
 
 caps:
   categorymappings:
-    - {id: 31, cat: Movies/UHD, desc: "Movies: 4K", default: true}
+    - {id: 1, cat: TV/Anime, desc: "Movies: Anime", default: true}
+    - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro", default: true}
     - {id: 5, cat: Movies/BluRay, desc: "Movies: BluRay", default: true}
-    - {id: 9, cat: Movies/DVD, desc: "Movies: DVD", default: true}
-    - {id: 11, cat: Movies/HD, desc: "Movies: HD", default: true}
-    - {id: 58, cat: Movies/SD, desc: "Movies: Cam", default: true}
-    - {id: 61, cat: Movies/3D, desc: "Movies: 3D", default: true}
-    - {id: 24, cat: Movies/SD, desc: "Movies: XVID", default: true}
-    - {id: 16, cat: Movies, desc: "Movies: Old", default: true}
-    - {id: 54, cat: Movies/WEB-DL, desc: "Movies: WEB-DL", default: true}
-    - {id: 56, cat: TV/Documentary, desc: "Documentary", default: true}
-    - {id: 18, cat: Movies, desc: "Movies: Pack", default: true}
-    - {id: 32, cat: Movies/UHD, desc: "Movies: 4KRO", default: true}
     - {id: 6, cat: Movies/BluRay, desc: "Movies: BluRay-Ro", default: true}
-    - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro", default: true}
-    - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro", default: true}
-    - {id: 82, cat: Movies/HD, desc: "Movies: x265", default: true}
+    - {id: 9, cat: Movies/DVD, desc: "Movies: DVD", default: true}
     - {id: 10, cat: Movies/DVD, desc: "Movies: DVD-Ro", default: true}
-    - {id: 59, cat: Movies/SD, desc: "Movies: Cam-RO", default: true}
-    - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro", default: true}
+    - {id: 11, cat: Movies/HD, desc: "Movies: HD", default: true}
+    - {id: 12, cat: Movies/HD, desc: "Movies: HD-Ro", default: true}
+    - {id: 13, cat: TV/HD, desc: "HDTV Episodes", default: true}
+    - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro", default: true}
+    - {id: 16, cat: Movies, desc: "Movies: Old", default: true}
     - {id: 17, cat: Movies, desc: "Movies: Old-Ro", default: true}
-    - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro", default: true}
-    - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro", default: true}
-    - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro", default: true}
+    - {id: 18, cat: Movies, desc: "Movies: Pack", default: true}
     - {id: 19, cat: Movies, desc: "Movies: Pack-Ro", default: true}
     - {id: 20, cat: TV, desc: "TV Episodes", default: true}
     - {id: 21, cat: TV, desc: "TV Episodes-Ro", default: true}
-    - {id: 13, cat: TV/HD, desc: "HDTV Episodes", default: true}
-    - {id: 14, cat: TV/HD, desc: "HDTV Episodes-Ro", default: true}
-    - {id: 28, cat: Audio, desc: "Music", default: true}
-    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps", default: true}
+    - {id: 22, cat: Other, desc: "RoContent", default: true}
+    - {id: 24, cat: Movies/SD, desc: "Movies: XVID", default: true}
+    - {id: 25, cat: Movies/SD, desc: "Movies: XVID-Ro", default: true}
     - {id: 26, cat: PC/0day, desc: "Software", default: true}
+    - {id: 27, cat: XXX, desc: "Movies: XXX", default: false}
+    - {id: 28, cat: Audio, desc: "Music", default: true}
     - {id: 30, cat: PC/Games, desc: "Games: PC-ISO", default: true}
+    - {id: 31, cat: Movies/UHD, desc: "Movies: 4K", default: true}
+    - {id: 32, cat: Movies/UHD, desc: "Movies: 4K-Ro", default: true}
     - {id: 33, cat: PC/Games, desc: "Games: Packs", default: true}
-    - {id: 1, cat: TV/Anime, desc: "Movies: Anime", default: true}
-    - {id: 2, cat: TV/Anime, desc: "Movies: Anime-Ro", default: true}
     - {id: 42, cat: TV/Sport, desc: "Sport", default: true}
     - {id: 43, cat: Books, desc: "Documents", default: true}
     - {id: 44, cat: Other, desc: "Images", default: true}
     - {id: 49, cat: Other, desc: "Diverse", default: true}
-    - {id: 22, cat: Other, desc: "RoContent", default: true}
+    - {id: 51, cat: PC/Mobile-Android, desc: "Android Apps", default: true}
+    - {id: 54, cat: Movies/WEB-DL, desc: "Movies: WEB-DL", default: true}
+    - {id: 55, cat: Movies/WEB-DL, desc: "Movies: WEB-DL Ro", default: true}
+    - {id: 56, cat: TV/Documentary, desc: "Documentary", default: true}
+    - {id: 57, cat: TV/Documentary, desc: "Documentary-Ro", default: true}
+    - {id: 58, cat: Movies/SD, desc: "Movies: Cam", default: true}
+    - {id: 59, cat: Movies/SD, desc: "Movies: Cam-Ro", default: true}
     - {id: 60, cat: XXX/ImageSet, desc: "Images: XXX", default: false}
-    - {id: 27, cat: XXX, desc: "Movies: XXX", default: false}
+    - {id: 61, cat: Movies/3D, desc: "Movies: 3D", default: true}
+    - {id: 62, cat: Movies/3D, desc: "Movies: 3D-Ro", default: true}
+    - {id: 81, cat: Movies/HD, desc: "Movies: x265-Ro", default: true}
+    - {id: 82, cat: Movies/HD, desc: "Movies: x265", default: true}
 
   modes:
     search: [q]
@@ -83,22 +83,22 @@ settings:
     type: info
     label: FlareSolverr
     default: This site may use Cloudflare DDoS Protection, therefore Jackett requires <a href="https://github.com/Jackett/Jackett#configuring-flaresolverr" target="_blank">FlareSolverr</a> to access it.
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: 3
-    options:
-      3: created
-      6: seeders
-      4: size
-      1: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
+#  - name: sort
+#    type: select
+#    label: Sort requested from site
+#    default: 3
+#    options:
+#      3: created
+#      6: seeders
+#      4: size
+#      1: title
+#  - name: type
+#    type: select
+#    label: Order requested from site
+#    default: desc
+#    options:
+#      desc: desc
+#      asc: asc
 
 login:
   path: takelogin.php
@@ -118,48 +118,54 @@ login:
 
 search:
   paths:
+    # https://www.last-torrents.org/externalid?searchex=tt5834760&search_by=imdbid
+    # cannot support imdbid or tmdbid searches while using path category filters
     - path: browse.php
-      categories: [31, 5, 9, 11, 58, 61, 24, 16, 54, 56, 18, 32, 6, 12, 81, 82, 10, 59, 25, 17, 55, 57, 62, 19, 20, 21, 13, 14, 28, 51, 26, 30, 33, 1, 2, 42, 43, 44, 49, 22]
+      categories: [1, 2, 5, 6, 9, 10, 11, 12, 13, 14, 16, 17, 18, 19, 20, 21, 22, 24, 25, 26, 27, 28, 30, 31, 32, 33, 42, 43, 44, 49, 51, 54, 55, 56, 57, 58, 59, 60, 61, 62, 81, 82]
     - path: browseadult.php
-      categories: [60, 27]
+      categories: [27, 60]
+
+  keywordsfilters:
+    - name: re_replace
+      args: ["(\\w+)", " +$1"] # prepend + to each word
 
   inputs:
     $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
     search: "{{ if .Query.Genre }}{{ .Query.Genre }} {{ else }}{{ end }}{{ .Keywords }}"
-    # title, descr, genre, all
+    # title, genre, all
     searchin: "{{ if .Query.Genre }}all{{ else }}title{{ end }}"
-    # 0 active, 1 incldead, 2 onlydead
-    incldead: 1
-    only_free: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-    sort: "{{ .Config.sort }}"
-    type: "{{ .Config.type }}"
+    # 0 active, 1 incldead, 2 onlydead, 3 free, 4 silver, 5 seedbox
+    type: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+# sort and type can only be used in a non-search query due to conflicting parameters
+#    sort: "{{ .Config.sort }}"
+#    type: "{{ .Config.type }}"
 
   rows:
-    selector: tbody > tr:has(a[href^="download.php"])
+    selector: div.py-3
 
   fields:
     category:
-      selector: a[href*=".php?cat="]
+      selector: a[href*="cat="]
       attribute: href
       filters:
         - name: querystring
           args: cat
     title:
-      selector: a[onmouseover]
+      selector: a[href^="t"]
     details:
-      selector: a[onmouseover]
+      selector: a[href^="t"]
       attribute: href
     poster:
-      selector: a[onmouseover]
-      attribute: onmouseover
+      selector: a[href^="t"]
+      attribute: title
       filters:
         - name: regexp
-          args: src=\\'(.+?)\\'
-        - name: replace
-          args: ["./pic/noposter.png", ""]
+          args: "src=(.+?) "
     genre:
-      selector: font[size]
+      selector: i:has(a[href$="searchin=genre"]), font[size]
       filters:
+        - name: replace
+          args: [" & ", "_&_"]
         - name: replace
           args: ["Hip Hop", "Hip_Hop"]
         - name: replace
@@ -170,43 +176,41 @@ search:
       selector: a[href^="download.php"]
       attribute: href
     date_day:
-      selector: td:nth-child(4) span:contains("day")
+      selector: div.col-sm-4:nth-of-type(3):contains("day")
       # auto adjusted by site account profile
       optional: true
       filters:
         - name: fuzzytime
     date_year:
-      selector: td:nth-child(4) span:not(:contains("day"))
+      selector: div.col-sm-4:nth-of-type(3):contains(":"):not(:contains("day"))
       # auto adjusted by site account profile
       optional: true
       filters:
         - name: dateparse
-          args: "Jan 2 2006 03:04 PM"
+          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-child(5)
+      selector: div.col-sm-4:nth-of-type(4)
     grabs:
-      selector: td:nth-child(6)
+      selector: div.col-sm-4:contains("Completed") b
     seeders:
-      selector: td:nth-child(7)
+      selector: div.col-sm-4:contains("Seeders") b
     leechers:
-      selector: td:nth-child(8)
+      selector: div.col-sm-4:contains("Leechers") b
     downloadvolumefactor:
       case:
-        "a.info > b:contains(\"FREE\")": 0
-#        "a.info > b:contains(\"Half\")": 0.5
+        img[src$="half2.png"]: 0.5
+        a#free-btn: 0
         "*": 1
     uploadvolumefactor:
-      case:
-#        "a.info > b:contains(\"2XUP\")": 2
-        "*": 1
+      text: 1
     minimumratio:
       text: 1.0
     minimumseedtime:
       # freeleech 2 days (as seconds =  2 x 24 x 60 x 60)
       # notfree 1.5 days  (as seconds =  1.5 x 24 x 60 x 60)
       case:
-        "a.info > b:contains(\"FREE\")": 172800
+        a#free-btn: 172800
         "*": 129600
 # U-232 V5

src/Jackett.Common/Definitions/learnflakes.yml

@@ -142,6 +142,13 @@ search:
     poster:
       selector: a[href*="data/torrents/torrent_images/"]
       attribute: href
+    genre:
+      selector: div.torrentDetails > div:has(a[href*="&genre="])
+      filters:
+        - name: replace
+          args: ["Genre:", ""]
+    description:
+      text: "{{ .Result.genre }}"
     size:
       selector: a[rel="torrent_size"]
     grabs:
@@ -180,5 +187,5 @@ search:
     uploadvolumefactor:
       text: 1
     minimumratio:
-      text: 1.0
+      text: 0.5
 # TSUE 2.2

src/Jackett.Common/Definitions/lemonhd.yml

@@ -78,6 +78,7 @@ search:
     suggest: 0
     column: "{{ .Config.sort }}"
     sort: "{{ .Config.type }}"
+    $raw: "{{ if .Config.freeleech }}&free{{ else }}{{ end }}"
 
   rows:
     selector: table.torrents > tbody > tr:has(a[href^="download.php?"])

src/Jackett.Common/Definitions/les-cinephiles.yml

@@ -127,22 +127,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
+      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
@@ -243,7 +243,7 @@ search:
         img[src$="/docdivers.png"]: 21
         img[src$="/dochistoire.png"]: 22
         img[src$="/docsemitv.png"]: 164
-        img[src$="/docsseries.png"]: 198
+        img[src$="/unknown198.png"]: 198 # film doc spectacle
         img[src$="/film3d.png"]: 25
         img[src$="/film4k.png"]: 26
         img[src$="/film4klight.png"]: 27
@@ -283,7 +283,7 @@ search:
         img[src$="/loglinux.png"]: 71
         img[src$="/logwindows.png"]: 72
         img[src$="/animcoffret.png"]: 7
-        img[src$="/unknown197.png"]: 197 # serie episode
+        img[src$="/docsseries.png"]: 197
         img[src$="/unknown182.png"]: 182 # serie jap anim
         img[src$="/unknown166.png"]: 166 # serie docu
         img[src$="/unknown194.png"]: 194 # serie docu divers
@@ -304,7 +304,7 @@ search:
         img[src$="/seriewebrip.png"]: 93
         img[src$="/seriesfrwebdl720p.png"]: 178
         img[src$="/seriesfrwebdl1080p.png"]: 179
-        img[src$="/unknown199.png"]: 199 # serie webdl
+        img[src$="/seriewebdl.png"]: 199
         img[src$="/serievostfrbdrip.png"]: 188
         img[src$="/serievostfrdvdrip.png"]: 189
         img[src$="/serievostfrhdrip.png"]: 190
@@ -313,22 +313,20 @@ search:
         img[src$="/serievostfrcoffret.png"]: 180
     title_phase1:
       selector: a[href^="torrents-details.php?id="]
-    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/lesaloon.yml

@@ -96,28 +96,28 @@ settings:
     type: checkbox
     label: Search freeleech only
     default: false
-  - name: vfq
-    type: checkbox
-    label: Replace VFQ with FRENCH in release name
-    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: vfq
+    type: checkbox
+    label: Replace VFQ with FRENCH
     default: false
 
 login:
@@ -161,34 +161,29 @@ search:
       filters:
         - name: querystring
           args: category
-    title_original:
+    title_phase1:
       selector: td a[href^="index.php?page=torrent-details"]
-      filters:
-        - name: replace
-          args: [".", " "]
     title_vfq:
-      text: "{{ .Result.title_original }}"
+      text: "{{ .Result.title_phase1 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\sVFQ\\s)", " FRENCH "]
-    title_step2:
-      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_original }}{{ end }}"
-    title_multilang:
-      text: "{{ .Result.title_step2 }}"
-      filters:
-        - name: re_replace
-          args: ["(?i)(\\smulti\\s)", " {{ .Config.multilanguage }} "]
-    title_step3:
-      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_step2 }}{{ end }}"
+          args: ["(?i)\\b(VFQ)\\b", "FRENCH"]
+    title_phase2:
+      text: "{{ if .Config.vfq }}{{ .Result.title_vfq }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     title_vostfr:
-      text: "{{ .Result.title_step3 }}"
+      text: "{{ .Result.title_phase2 }}"
       filters:
         - name: re_replace
-          args: ["(?i)(\\svostfr\\s)", " ENGLISH "]
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
+    title_phase3:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase3 }}"
+      filters:
         - 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_step3 }}{{ end }}"
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase3 }}{{ end }}"
     details:
       selector: td a[href^="index.php?page=torrent-details"]
       attribute: href

src/Jackett.Common/Definitions/limetorrents.yml

@@ -9,9 +9,9 @@ followredirect: true
 # changes to this indexer should also be made to limetorrentsclone
 links:
   - https://www.limetorrents.lol/
-  - https://limetorrents.unblockit.ink/
+  - https://limetorrents.unblockit.bio/
   - https://limetorrents.unblockninja.com/
-  - https://limetorrents.nocensor.art/
+  - https://limetorrents.mrunblock.guru/
 legacylinks:
   - https://www.limetorrents.io/
   - https://www.limetorrents.cc/
@@ -22,12 +22,7 @@ legacylinks:
   - https://www.limetorrents.co/
   - https://limetor.com/
   - https://www.limetor.pro/
-  - https://limetorrents.nocensor.biz/
   - https://www.limetorrents.pro/
-  - https://limetorrents.unblockit.llc/
-  - https://limetorrents.unblockit.blue/
-  - https://limetorrents.unblockit.name/
-  - https://limetorrents.nocensor.sbs/
   - https://limetorrents.unblockit.ist/
   - https://limetorrents.unblockit.bet/
   - https://limetorrents.unblockit.cat/
@@ -36,6 +31,8 @@ legacylinks:
   - https://limetorrents.unblockit.page/
   - https://limetorrents.unblockit.pet/
   - https://limetorrents.nocensor.lol/
+  - https://limetorrents.unblockit.ink/
+  - https://limetorrents.nocensor.art/
 
 caps:
   categorymappings:

src/Jackett.Common/Definitions/mircrew.yml

@@ -5,6 +5,8 @@ description: "MIRCrew is an ITALIAN Private Torrent Tracker for MOVIES / TV / MU
 language: it-IT
 type: private
 encoding: UTF-8
+certificates:
+  - 35a21ab7dd7bd72e8131517d51f8501e926151b2 # expired Jan 20 2023
 links:
   - https://mircrew-releases.org/
 

src/Jackett.Common/Definitions/nicept.yml

@@ -0,0 +1,179 @@
+---
+id: nicept
+name: NicePT
+description: "NicePT is a CHINESE Private Torrent Tracker for 3X"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://www.nicept.net/
+
+caps:
+  categorymappings:
+    - {id: 500, cat: XXX, desc: "日本有码"}
+    - {id: 401, cat: XXX, desc: "日本无码"}
+    - {id: 402, cat: XXX, desc: "欧美"}
+    - {id: 501, cat: XXX, desc: "其他（限制级）"}
+    - {id: 403, cat: XXX/Other, desc: "动漫（限制级）"}
+    - {id: 503, cat: XXX, desc: "真人秀，自拍（限制级）"}
+    - {id: 404, cat: XXX/ImageSet, desc: "写真、套图"}
+    - {id: 504, cat: XXX, desc: "SM调教（限制级）"}
+
+  modes:
+    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 NicePT 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 }}"
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+    - selector: td.embedded:has(h2:contains("Failed"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    search: "{{ .Keywords }}"
+    # 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 (unused)
+    search_area: 0
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td.rowfollow:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 3 days (as seconds = 3 x 24 x 60 x 60)
+      text: 259200
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.29 2022-10-13

src/Jackett.Common/Definitions/nyaasi.yml

@@ -9,7 +9,8 @@ requestDelay: 2
 links:
   - https://nyaa.si/
   - https://nyaa.iss.ink/
-  - https://nyaa.nocensor.art/ # for magnets only
+  - https://nyaa.mrunblock.guru/ # for magnets only
+  - https://nyaa.unblockninja.com/ # for magnets only
 legacylinks:
   - https://nyaa.black-mirror.xyz/
   - https://nyaa.unblocked.casa/
@@ -23,6 +24,7 @@ legacylinks:
   - https://nyaa.lol/ # dropped at request of owner
   - https://nyaa.nocensor.world/
   - https://nyaa.nocensor.lol/
+  - https://nyaa.nocensor.art/
 
 settings:
   - name: filter-id

src/Jackett.Common/Definitions/oldtoonsworld.yml

@@ -132,7 +132,7 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     poster:
-      selector: img.nexus-lazy-load
+      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.
@@ -191,4 +191,4 @@ search:
       remove: a, img, span
     description:
       text: "{{ .Result.genre }}"
-# NexusPHP 1.7.29 2022-10-13
+# NexusPHP v1.7.29 2022-10-13

src/Jackett.Common/Definitions/oshenpt.yml

@@ -131,6 +131,9 @@ search:
     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"]
@@ -185,4 +188,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP v1.8.0	2023-01-05
+# NexusPHP v1.8.0 2023-01-11

src/Jackett.Common/Definitions/ourbits.yml

@@ -1,7 +1,7 @@
 ---
 id: ourbits
-name: Ourbits
-description: "Ourbits (HDPter) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
+name: OurBits
+description: "OurBits (HDPter) is a CHINESE Private Torrent Tracker for HD MOVIES / TV / GENERAL"
 language: zh-CN
 type: private
 encoding: UTF-8
@@ -57,13 +57,13 @@ search:
   paths:
     - path: torrents.php
   inputs:
-    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    $raw: "{{ range .Categories }}cat[]={{.}}&{{end}}"
     search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
     # 0=incldead, 1=active, 2=dead
     incldead: 0
     # show promotions: 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=imdb URL
+    # 0=title, 3=uploader, 4=imdb URL, 5=douban URL
     search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
     # 0=AND, 1=OR, 2=Exact
     search_mode: 0
@@ -92,6 +92,14 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    imdbid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      # site currently only has a badge and rating, the id is not present. just in case a future update.
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
     date_elapsed:
       # time type: time elapsed (default)
       selector: td.rowfollow:nth-child(4) > span[title]
@@ -135,7 +143,15 @@ search:
         img.pro_free2up: 2
         img.pro_2up: 2
         "*": 1
+    minimumratio:
+      text: 1.0
+    minimumseedtime:
+      # 2 days (as seconds = 2 x 24 x 60 x 60)
+      text: 172800
     description:
-      selector: td.rowfollow:nth-child(2)
-      remove: a, img
-# NexusPHP Standard v1.5 Beta 4
+      selector: td.rowfollow:nth-child(2) > table > tbody > tr > td
+      remove: a, img, b, span
+      filters:
+        - name: replace
+          args: ["will end in", ""]
+# Ourbits 1.1.0 (Based on NexusPHP Standard v1.5 Beta 4) e71117f 2023-02-05

src/Jackett.Common/Definitions/pier720.yml

@@ -86,10 +86,17 @@ settings:
   - name: cookie
     type: text
     label: Cookie
-  - name: info
+  - name: info_cookie
     type: info
     label: How to get the Cookie
     default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
+  - name: 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>"
   - name: sort
     type: select
     label: Sort requested from site
@@ -121,6 +128,8 @@ download:
       attribute: href
 
 search:
+  headers:
+    User-Agent: ["{{ .Config.useragent }}"]
   paths:
     - path: search.php
   inputs:

src/Jackett.Common/Definitions/pignetwork.yml

@@ -128,8 +128,8 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     poster:
-      selector: img.pr5
-      attribute: src
+      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"]
@@ -187,4 +187,4 @@ search:
     description:
       selector: td.rowfollow:nth-child(2)
       remove: a, img
-# NexusPHP v1.7.16
+# NexusPHP v1.8.0 2023-01-16

src/Jackett.Common/Definitions/piratbit.yml

@@ -27,9 +27,9 @@ caps:
     - {id: 1700, cat: Movies, desc: "Оформление раздач (Кино, Видео и ТВ)"}
     - {id: 3, cat: Movies, desc: "арубежные Фильмы (DVDrip, WEB-DLRip, HDrip)"}
     - {id: 1845, cat: Movies, desc: " |- Фильмы (мультфильмы) cо спонсором показа (Новинки AVI/MKV)"}
-    - {id: 1863, cat: Movies, desc: " |- Фильмы 2022 (Звук TS, Cam, VO, DVO)"}
-    - {id: 1864, cat: Movies, desc: " |- Фильмы 2022 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
+    - {id: 1863, cat: Movies, desc: " |- Фильмы 2022-2023 (Звук TS, Cam, VO, DVO)"}
     - {id: 1860, cat: Movies, desc: " |- Фильмы 2021 (Звук TS, Cam, VO, DVO)"}
+    - {id: 1864, cat: Movies, desc: " |- Фильмы 2022-2023 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1859, cat: Movies, desc: " |- Фильмы 2021 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1856, cat: Movies, desc: " |- Фильмы 2019-2020 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1849, cat: Movies, desc: " |- Фильмы 2018 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
@@ -81,11 +81,10 @@ caps:
     - {id: 1518, cat: Movies/3D, desc: " |- 3D Мультфильмы"}
     - {id: 1683, cat: Movies/3D, desc: " |- Документальные фильмы 3D"}
     - {id: 9, cat: Movies, desc: "Наши фильмы, Советское кино (DVDrip, WEB-DLRip, HDrip)"}
-    - {id: 1858, cat: Movies, desc: " |- Наши новые фильмы 2020 - 2021"}
+    - {id: 1858, cat: Movies, desc: " |- Наши новые фильмы 2020 - 2023"}
     - {id: 1846, cat: Movies, desc: " |- Наши фильмы (мультфильмы) cо спонсором показа (Новинки AVI/M.."}
     - {id: 1847, cat: Movies, desc: " |- Наши новые фильмы 2018-2019"}
     - {id: 1840, cat: Movies, desc: " |- Наши новые фильмы 2017"}
-    - {id: 1828, cat: Movies, desc: " |- Наши новые фильмы 2019/2018 (Экранки)"}
     - {id: 1822, cat: Movies, desc: " |- Наши новые фильмы 2016"}
     - {id: 1761, cat: Movies, desc: " |- Наши новые фильмы 2015"}
     - {id: 1682, cat: Movies, desc: " |- Наши новые фильмы 2014"}
@@ -154,35 +153,12 @@ caps:
     - {id: 24, cat: TV, desc: "Наши  сериалы"}
     - {id: 1857, cat: TV, desc: " |- TNT serials"}
     - {id: 25, cat: TV, desc: "Зарубежные сериалы"}
-    - {id: 1725, cat: TV, desc: " |- Американская история ужасов"}
-    - {id: 1723, cat: TV, desc: " |- Ходячие мертвецы (The Walking Dead)"}
-    - {id: 1232, cat: TV, desc: " |- Сверхъестественное (Supernatural)"}
-    - {id: 1726, cat: TV, desc: " |- Родина / Чужой среди своих / Homeland"}
-    - {id: 1731, cat: TV, desc: " |- Стрела"}
-    - {id: 1732, cat: TV, desc: " |- Мастера секса"}
-    - {id: 1736, cat: TV, desc: " |- Рэй Донован"}
-    - {id: 1727, cat: TV, desc: " |- Подпольная Империя"}
     - {id: 1728, cat: TV, desc: " |- Игра престолов"}
-    - {id: 1730, cat: TV, desc: " |- Под куполом"}
-    - {id: 1739, cat: TV, desc: " |- Менталист"}
-    - {id: 1738, cat: TV, desc: " |- Возмездие"}
-    - {id: 1724, cat: TV, desc: " |- Теория большого взрыва"}
-    - {id: 1729, cat: TV, desc: " |- Во все тяжкие"}
-    - {id: 1737, cat: TV, desc: " |- Шерлок"}
-    - {id: 1735, cat: TV, desc: " |- Дневники Вампира"}
-    - {id: 1566, cat: TV, desc: " |- Убежище (Sanctuary)"}
-    - {id: 1511, cat: TV, desc: " |- Клан Сопрано"}
-    - {id: 1427, cat: TV, desc: " |- Калифорникейшн (Californication)"}
-    - {id: 1415, cat: TV, desc: " |- Теория Лжи (Lie To Me)"}
-    - {id: 1413, cat: TV, desc: " |- Кости"}
-    - {id: 1242, cat: TV, desc: " |- Звёздные Врата: Атлантида"}
-    - {id: 1243, cat: TV, desc: " |- Побег (Prison Break)"}
-    - {id: 777, cat: TV, desc: " |- Остаться в Живых (LOST)"}
-    - {id: 773, cat: TV, desc: " |- Доктор Хаус (House M.D.)"}
     - {id: 775, cat: TV, desc: " |- Ищу (Зарубежные сериалы)"}
     # Programs, Windows and other, Design
     - {id: 1808, cat: PC, desc: "Оформление раздач (Программы и Дизайн)"}
     - {id: 181, cat: PC, desc: "Предложения по улучшению"}
+    - {id: 1677, cat: PC, desc: "OC Windows"}
     - {id: 1861, cat: PC, desc: " |- Windows 11"}
     - {id: 1722, cat: PC, desc: " |- Windows 10"}
     - {id: 1628, cat: PC, desc: " |- Windows 8"}
@@ -258,6 +234,7 @@ caps:
     - {id: 608, cat: PC, desc: " |- Стили, кисти, формы и узоры для Adobe Photoshop"}
     - {id: 606, cat: PC, desc: " |- Разное (Материалы для мультимедиа и дизайна)"}
     - {id: 655, cat: PC, desc: "Apple Macintosh"}
+    - {id: 667, cat: PC/Mac, desc: " |- FAQ по разделу Apple Macintosh"}
     - {id: 666, cat: PC/Mac, desc: " |- Mac OS (для Macintosh)"}
     - {id: 665, cat: PC/Mac, desc: " |- Mac OS (для РС-Хакинтош)"}
     - {id: 664, cat: PC/Mac, desc: " |- Игры Mac OS (Macintosh)"}
@@ -281,11 +258,54 @@ caps:
     - {id: 1269, cat: TV/HD, desc: " |- Наши Мультфильмы  (HD, WEB-DL 720p, 1080p)"}
     - {id: 1423, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD)"}
     - {id: 1424, cat: TV, desc: " |- Наши Мультфильмы (DVD)"}
+    # Strawberry
+    - {id: 1615, cat: XXX, desc: "Оформление раздач"}
+    - {id: 1616, cat: XXX, desc: " |- Полнометражные порно фильмы"}
+    - {id: 1617, cat: XXX, desc: " |- Порно-ролики"}
+    - {id: 1618, cat: XXX, desc: " |- Фото - Картинки"}
+    - {id: 1292, cat: XXX, desc: "Зарубежные порно фильмы HDrip XXX, DVDrip"}
+    - {id: 1426, cat: XXX, desc: " |- Порно фильмы с русским переводом"}
+    - {id: 250, cat: XXX, desc: " |- Порно фильмы с сюжетом"}
+    - {id: 294, cat: XXX, desc: " |- Порно фильмы без сюжета"}
+    - {id: 271, cat: XXX, desc: " |- Гонзо"}
+    - {id: 251, cat: XXX, desc: " |- Лесбиянки"}
+    - {id: 1515, cat: XXX, desc: " |- Молодые студенты и узкие письки"}
+    - {id: 1349, cat: XXX, desc: " |- Скрытые камеры"}
+    - {id: 249, cat: XXX, desc: " |- Классические порно фильмы"}
+    - {id: 248, cat: XXX, desc: " |- Паки полных порно фильмов"}
+    - {id: 252, cat: XXX, desc: " |- Этнические порно фильмы"}
+    - {id: 253, cat: XXX, desc: " |- Японские фильмы"}
+    - {id: 1289, cat: XXX, desc: " |- Нетрадиционное порно"}
+    - {id: 1324, cat: XXX, desc: " |- Shemale / Трансcексуалы"}
+    - {id: 299, cat: XXX, desc: " |- Гей клубника"}
+    - {id: 246, cat: XXX, desc: " |- Эротические и Документальные фильмы"}
+    - {id: 1359, cat: XXX, desc: "Зарубежные порно фильмы (DVD, HD и Blu-ray)"}
+    - {id: 255, cat: XXX, desc: " |- Порно фильмы HD"}
+    - {id: 275, cat: XXX, desc: " |- Порно фильмы DVD"}
+    - {id: 1568, cat: XXX, desc: "Русское порно"}
+    - {id: 261, cat: XXX, desc: " |- Русские порно фильмы"}
+    - {id: 264, cat: XXX, desc: " |- Русские порно ролики"}
+    - {id: 265, cat: XXX, desc: " |- Русское любительское видео"}
+    - {id: 263, cat: XXX, desc: " |- Сцены из фильмов и Сайтрипы с русскими актрисами"}
+    - {id: 262, cat: XXX, desc: " |- Паки русских роликов"}
+    - {id: 1358, cat: XXX, desc: "Зарубежные порно ролики"}
+    - {id: 1749, cat: XXX, desc: " |- Вуайеризм (подглядывание)"}
+    - {id: 1748, cat: XXX, desc: " |- Большие сиськи"}
+    - {id: 257, cat: XXX, desc: " |- HD ролики"}
+    - {id: 1746, cat: XXX, desc: " |- Анальный секс"}
+    - {id: 1745, cat: XXX, desc: " |- Домашнее порно"}
+    - {id: 1744, cat: XXX, desc: " |- Секс с подростками"}
+    - {id: 1747, cat: XXX, desc: " |- Мамочки"}
+    - {id: 260, cat: XXX, desc: " |- Разное"}
+    - {id: 259, cat: XXX, desc: " |- Сцены из фильмов"}
+    - {id: 266, cat: XXX, desc: " |- Любительское фото"}
+    - {id: 267, cat: XXX, desc: " |- Фото Разное"}
+    - {id: 256, cat: XXX, desc: " |- Паки сайтрипов"}
+    - {id: 1347, cat: XXX, desc: "Мультфильмы / Cartoons"}
+    - {id: 1665, cat: XXX, desc: "3D порно"}
     # Documentary, sports, educational videos
     - {id: 79, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
-    - {id: 359, cat: TV/Documentary, desc: "|- Информационно-аналитические и общественно-политические перед"}
     - {id: 348, cat: TV/Documentary, desc: " |- Научно-популярные фильмы"}
-    - {id: 1698, cat: TV/Documentary, desc: " |- Политика, религия"}
     - {id: 345, cat: TV/Documentary, desc: " |- Космос"}
     - {id: 342, cat: TV/Documentary, desc: " |- Военное дело"}
     - {id: 363, cat: TV/Documentary, desc: " |- National Geographic"}
@@ -400,6 +420,7 @@ caps:
     - {id: 1712, cat: Audio, desc: "Классическая музыка"}
     - {id: 1713, cat: Audio, desc: "Инструментальная музыка"}
     # Rock Music
+    - {id: 1068, cat: Audio, desc: "Обсуждение Рок-музыки, Флудилка!!!"}
     - {id: 1069, cat: Audio, desc: "Зарубежный Rock"}
     - {id: 1537, cat: Audio, desc: " |- Неофициальные сборники"}
     - {id: 1085, cat: Audio, desc: " |- Архив (Зарубежный Rock)"}
@@ -476,51 +497,6 @@ caps:
     - {id: 1143, cat: Audio/Video, desc: " |- Отечественный металл (Видео)"}
     - {id: 1142, cat: Audio/Video, desc: " |- Отечественный металл (DVD Video)"}
     - {id: 1141, cat: Audio/Video, desc: " |- Рок-музыка (HD Video)"}
-    # Strawberry
-    - {id: 1615, cat: XXX, desc: "Оформление раздач"}
-    - {id: 1616, cat: XXX, desc: " |- Полнометражные порно фильмы"}
-    - {id: 1617, cat: XXX, desc: " |- Порно-ролики"}
-    - {id: 1618, cat: XXX, desc: " |- Фото - Картинки"}
-    - {id: 1292, cat: XXX, desc: "Зарубежные порно фильмы HDrip XXX, DVDrip"}
-    - {id: 1426, cat: XXX, desc: " |- Порно фильмы с русским переводом"}
-    - {id: 250, cat: XXX, desc: " |- Порно фильмы с сюжетом"}
-    - {id: 294, cat: XXX, desc: " |- Порно фильмы без сюжета"}
-    - {id: 271, cat: XXX, desc: " |- Гонзо"}
-    - {id: 251, cat: XXX, desc: " |- Лесбиянки"}
-    - {id: 1515, cat: XXX, desc: " |- Молодые студенты и узкие письки"}
-    - {id: 1349, cat: XXX, desc: " |- Скрытые камеры"}
-    - {id: 249, cat: XXX, desc: " |- Классические порно фильмы"}
-    - {id: 248, cat: XXX, desc: " |- Паки полных порно фильмов"}
-    - {id: 252, cat: XXX, desc: " |- Этнические порно фильмы"}
-    - {id: 253, cat: XXX, desc: " |- Японские фильмы"}
-    - {id: 1289, cat: XXX, desc: " |- Нетрадиционное порно"}
-    - {id: 1324, cat: XXX, desc: " |- Shemale / Трансcексуалы"}
-    - {id: 299, cat: XXX, desc: " |- Гей клубника"}
-    - {id: 246, cat: XXX, desc: " |- Эротические и Документальные фильмы"}
-    - {id: 1359, cat: XXX, desc: "Зарубежные порно фильмы (DVD, HD и Blu-ray)"}
-    - {id: 255, cat: XXX, desc: " |- Порно фильмы HD"}
-    - {id: 275, cat: XXX, desc: " |- Порно фильмы DVD"}
-    - {id: 1568, cat: XXX, desc: "Русское порно"}
-    - {id: 261, cat: XXX, desc: " |- Русские порно фильмы"}
-    - {id: 264, cat: XXX, desc: " |- Русские порно ролики"}
-    - {id: 265, cat: XXX, desc: " |- Русское любительское видео"}
-    - {id: 263, cat: XXX, desc: " |- Сцены из фильмов и Сайтрипы с русскими актрисами"}
-    - {id: 262, cat: XXX, desc: " |- Паки русских роликов"}
-    - {id: 1358, cat: XXX, desc: "Зарубежные порно ролики"}
-    - {id: 1749, cat: XXX, desc: " |- Вуайеризм (подглядывание)"}
-    - {id: 1748, cat: XXX, desc: " |- Большие сиськи"}
-    - {id: 257, cat: XXX, desc: " |- HD ролики"}
-    - {id: 1746, cat: XXX, desc: " |- Анальный секс"}
-    - {id: 1745, cat: XXX, desc: " |- Домашнее порно"}
-    - {id: 1744, cat: XXX, desc: " |- Секс с подростками"}
-    - {id: 1747, cat: XXX, desc: " |- Мамочки"}
-    - {id: 260, cat: XXX, desc: " |- Разное"}
-    - {id: 259, cat: XXX, desc: " |- Сцены из фильмов"}
-    - {id: 266, cat: XXX, desc: " |- Любительское фото"}
-    - {id: 267, cat: XXX, desc: " |- Фото Разное"}
-    - {id: 256, cat: XXX, desc: " |- Паки сайтрипов"}
-    - {id: 1347, cat: XXX, desc: "Мультфильмы / Cartoons"}
-    - {id: 1665, cat: XXX, desc: "3D порно"}
     # E-books, Magazines, Books, Comics
     - {id: 1674, cat: Books, desc: "Скачать книги в формате fb2 бесплатно и без регистрации"}
     - {id: 1241, cat: Books, desc: "Журналы (PDF)"}

src/Jackett.Common/Definitions/piratbitl.yml

@@ -27,9 +27,9 @@ caps:
     - {id: 1700, cat: Movies, desc: "Оформление раздач (Кино, Видео и ТВ)"}
     - {id: 3, cat: Movies, desc: "арубежные Фильмы (DVDrip, WEB-DLRip, HDrip)"}
     - {id: 1845, cat: Movies, desc: " |- Фильмы (мультфильмы) cо спонсором показа (Новинки AVI/MKV)"}
-    - {id: 1863, cat: Movies, desc: " |- Фильмы 2022 (Звук TS, Cam, VO, DVO)"}
-    - {id: 1864, cat: Movies, desc: " |- Фильмы 2022 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
+    - {id: 1863, cat: Movies, desc: " |- Фильмы 2022-2023 (Звук TS, Cam, VO, DVO)"}
     - {id: 1860, cat: Movies, desc: " |- Фильмы 2021 (Звук TS, Cam, VO, DVO)"}
+    - {id: 1864, cat: Movies, desc: " |- Фильмы 2022-2023 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1859, cat: Movies, desc: " |- Фильмы 2021 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1856, cat: Movies, desc: " |- Фильмы 2019-2020 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
     - {id: 1849, cat: Movies, desc: " |- Фильмы 2018 [DVDrip, WEB-DLRip, HDrip] (DUB, MVO)"}
@@ -81,11 +81,10 @@ caps:
     - {id: 1518, cat: Movies/3D, desc: " |- 3D Мультфильмы"}
     - {id: 1683, cat: Movies/3D, desc: " |- Документальные фильмы 3D"}
     - {id: 9, cat: Movies, desc: "Наши фильмы, Советское кино (DVDrip, WEB-DLRip, HDrip)"}
-    - {id: 1858, cat: Movies, desc: " |- Наши новые фильмы 2020 - 2021"}
+    - {id: 1858, cat: Movies, desc: " |- Наши новые фильмы 2020 - 2023"}
     - {id: 1846, cat: Movies, desc: " |- Наши фильмы (мультфильмы) cо спонсором показа (Новинки AVI/M.."}
     - {id: 1847, cat: Movies, desc: " |- Наши новые фильмы 2018-2019"}
     - {id: 1840, cat: Movies, desc: " |- Наши новые фильмы 2017"}
-    - {id: 1828, cat: Movies, desc: " |- Наши новые фильмы 2019/2018 (Экранки)"}
     - {id: 1822, cat: Movies, desc: " |- Наши новые фильмы 2016"}
     - {id: 1761, cat: Movies, desc: " |- Наши новые фильмы 2015"}
     - {id: 1682, cat: Movies, desc: " |- Наши новые фильмы 2014"}
@@ -154,35 +153,12 @@ caps:
     - {id: 24, cat: TV, desc: "Наши  сериалы"}
     - {id: 1857, cat: TV, desc: " |- TNT serials"}
     - {id: 25, cat: TV, desc: "Зарубежные сериалы"}
-    - {id: 1725, cat: TV, desc: " |- Американская история ужасов"}
-    - {id: 1723, cat: TV, desc: " |- Ходячие мертвецы (The Walking Dead)"}
-    - {id: 1232, cat: TV, desc: " |- Сверхъестественное (Supernatural)"}
-    - {id: 1726, cat: TV, desc: " |- Родина / Чужой среди своих / Homeland"}
-    - {id: 1731, cat: TV, desc: " |- Стрела"}
-    - {id: 1732, cat: TV, desc: " |- Мастера секса"}
-    - {id: 1736, cat: TV, desc: " |- Рэй Донован"}
-    - {id: 1727, cat: TV, desc: " |- Подпольная Империя"}
     - {id: 1728, cat: TV, desc: " |- Игра престолов"}
-    - {id: 1730, cat: TV, desc: " |- Под куполом"}
-    - {id: 1739, cat: TV, desc: " |- Менталист"}
-    - {id: 1738, cat: TV, desc: " |- Возмездие"}
-    - {id: 1724, cat: TV, desc: " |- Теория большого взрыва"}
-    - {id: 1729, cat: TV, desc: " |- Во все тяжкие"}
-    - {id: 1737, cat: TV, desc: " |- Шерлок"}
-    - {id: 1735, cat: TV, desc: " |- Дневники Вампира"}
-    - {id: 1566, cat: TV, desc: " |- Убежище (Sanctuary)"}
-    - {id: 1511, cat: TV, desc: " |- Клан Сопрано"}
-    - {id: 1427, cat: TV, desc: " |- Калифорникейшн (Californication)"}
-    - {id: 1415, cat: TV, desc: " |- Теория Лжи (Lie To Me)"}
-    - {id: 1413, cat: TV, desc: " |- Кости"}
-    - {id: 1242, cat: TV, desc: " |- Звёздные Врата: Атлантида"}
-    - {id: 1243, cat: TV, desc: " |- Побег (Prison Break)"}
-    - {id: 777, cat: TV, desc: " |- Остаться в Живых (LOST)"}
-    - {id: 773, cat: TV, desc: " |- Доктор Хаус (House M.D.)"}
     - {id: 775, cat: TV, desc: " |- Ищу (Зарубежные сериалы)"}
     # Programs, Windows and other, Design
     - {id: 1808, cat: PC, desc: "Оформление раздач (Программы и Дизайн)"}
     - {id: 181, cat: PC, desc: "Предложения по улучшению"}
+    - {id: 1677, cat: PC, desc: "OC Windows"}
     - {id: 1861, cat: PC, desc: " |- Windows 11"}
     - {id: 1722, cat: PC, desc: " |- Windows 10"}
     - {id: 1628, cat: PC, desc: " |- Windows 8"}
@@ -258,6 +234,7 @@ caps:
     - {id: 608, cat: PC, desc: " |- Стили, кисти, формы и узоры для Adobe Photoshop"}
     - {id: 606, cat: PC, desc: " |- Разное (Материалы для мультимедиа и дизайна)"}
     - {id: 655, cat: PC, desc: "Apple Macintosh"}
+    - {id: 667, cat: PC/Mac, desc: " |- FAQ по разделу Apple Macintosh"}
     - {id: 666, cat: PC/Mac, desc: " |- Mac OS (для Macintosh)"}
     - {id: 665, cat: PC/Mac, desc: " |- Mac OS (для РС-Хакинтош)"}
     - {id: 664, cat: PC/Mac, desc: " |- Игры Mac OS (Macintosh)"}
@@ -281,11 +258,54 @@ caps:
     - {id: 1269, cat: TV/HD, desc: " |- Наши Мультфильмы  (HD, WEB-DL 720p, 1080p)"}
     - {id: 1423, cat: TV, desc: " |- Зарубежные Мультфильмы (DVD)"}
     - {id: 1424, cat: TV, desc: " |- Наши Мультфильмы (DVD)"}
+    # Strawberry
+    - {id: 1615, cat: XXX, desc: "Оформление раздач"}
+    - {id: 1616, cat: XXX, desc: " |- Полнометражные порно фильмы"}
+    - {id: 1617, cat: XXX, desc: " |- Порно-ролики"}
+    - {id: 1618, cat: XXX, desc: " |- Фото - Картинки"}
+    - {id: 1292, cat: XXX, desc: "Зарубежные порно фильмы HDrip XXX, DVDrip"}
+    - {id: 1426, cat: XXX, desc: " |- Порно фильмы с русским переводом"}
+    - {id: 250, cat: XXX, desc: " |- Порно фильмы с сюжетом"}
+    - {id: 294, cat: XXX, desc: " |- Порно фильмы без сюжета"}
+    - {id: 271, cat: XXX, desc: " |- Гонзо"}
+    - {id: 251, cat: XXX, desc: " |- Лесбиянки"}
+    - {id: 1515, cat: XXX, desc: " |- Молодые студенты и узкие письки"}
+    - {id: 1349, cat: XXX, desc: " |- Скрытые камеры"}
+    - {id: 249, cat: XXX, desc: " |- Классические порно фильмы"}
+    - {id: 248, cat: XXX, desc: " |- Паки полных порно фильмов"}
+    - {id: 252, cat: XXX, desc: " |- Этнические порно фильмы"}
+    - {id: 253, cat: XXX, desc: " |- Японские фильмы"}
+    - {id: 1289, cat: XXX, desc: " |- Нетрадиционное порно"}
+    - {id: 1324, cat: XXX, desc: " |- Shemale / Трансcексуалы"}
+    - {id: 299, cat: XXX, desc: " |- Гей клубника"}
+    - {id: 246, cat: XXX, desc: " |- Эротические и Документальные фильмы"}
+    - {id: 1359, cat: XXX, desc: "Зарубежные порно фильмы (DVD, HD и Blu-ray)"}
+    - {id: 255, cat: XXX, desc: " |- Порно фильмы HD"}
+    - {id: 275, cat: XXX, desc: " |- Порно фильмы DVD"}
+    - {id: 1568, cat: XXX, desc: "Русское порно"}
+    - {id: 261, cat: XXX, desc: " |- Русские порно фильмы"}
+    - {id: 264, cat: XXX, desc: " |- Русские порно ролики"}
+    - {id: 265, cat: XXX, desc: " |- Русское любительское видео"}
+    - {id: 263, cat: XXX, desc: " |- Сцены из фильмов и Сайтрипы с русскими актрисами"}
+    - {id: 262, cat: XXX, desc: " |- Паки русских роликов"}
+    - {id: 1358, cat: XXX, desc: "Зарубежные порно ролики"}
+    - {id: 1749, cat: XXX, desc: " |- Вуайеризм (подглядывание)"}
+    - {id: 1748, cat: XXX, desc: " |- Большие сиськи"}
+    - {id: 257, cat: XXX, desc: " |- HD ролики"}
+    - {id: 1746, cat: XXX, desc: " |- Анальный секс"}
+    - {id: 1745, cat: XXX, desc: " |- Домашнее порно"}
+    - {id: 1744, cat: XXX, desc: " |- Секс с подростками"}
+    - {id: 1747, cat: XXX, desc: " |- Мамочки"}
+    - {id: 260, cat: XXX, desc: " |- Разное"}
+    - {id: 259, cat: XXX, desc: " |- Сцены из фильмов"}
+    - {id: 266, cat: XXX, desc: " |- Любительское фото"}
+    - {id: 267, cat: XXX, desc: " |- Фото Разное"}
+    - {id: 256, cat: XXX, desc: " |- Паки сайтрипов"}
+    - {id: 1347, cat: XXX, desc: "Мультфильмы / Cartoons"}
+    - {id: 1665, cat: XXX, desc: "3D порно"}
     # Documentary, sports, educational videos
     - {id: 79, cat: TV/Documentary, desc: "Документальные фильмы и телепередачи"}
-    - {id: 359, cat: TV/Documentary, desc: "|- Информационно-аналитические и общественно-политические перед"}
     - {id: 348, cat: TV/Documentary, desc: " |- Научно-популярные фильмы"}
-    - {id: 1698, cat: TV/Documentary, desc: " |- Политика, религия"}
     - {id: 345, cat: TV/Documentary, desc: " |- Космос"}
     - {id: 342, cat: TV/Documentary, desc: " |- Военное дело"}
     - {id: 363, cat: TV/Documentary, desc: " |- National Geographic"}
@@ -400,6 +420,7 @@ caps:
     - {id: 1712, cat: Audio, desc: "Классическая музыка"}
     - {id: 1713, cat: Audio, desc: "Инструментальная музыка"}
     # Rock Music
+    - {id: 1068, cat: Audio, desc: "Обсуждение Рок-музыки, Флудилка!!!"}
     - {id: 1069, cat: Audio, desc: "Зарубежный Rock"}
     - {id: 1537, cat: Audio, desc: " |- Неофициальные сборники"}
     - {id: 1085, cat: Audio, desc: " |- Архив (Зарубежный Rock)"}
@@ -476,51 +497,6 @@ caps:
     - {id: 1143, cat: Audio/Video, desc: " |- Отечественный металл (Видео)"}
     - {id: 1142, cat: Audio/Video, desc: " |- Отечественный металл (DVD Video)"}
     - {id: 1141, cat: Audio/Video, desc: " |- Рок-музыка (HD Video)"}
-    # Strawberry
-    - {id: 1615, cat: XXX, desc: "Оформление раздач"}
-    - {id: 1616, cat: XXX, desc: " |- Полнометражные порно фильмы"}
-    - {id: 1617, cat: XXX, desc: " |- Порно-ролики"}
-    - {id: 1618, cat: XXX, desc: " |- Фото - Картинки"}
-    - {id: 1292, cat: XXX, desc: "Зарубежные порно фильмы HDrip XXX, DVDrip"}
-    - {id: 1426, cat: XXX, desc: " |- Порно фильмы с русским переводом"}
-    - {id: 250, cat: XXX, desc: " |- Порно фильмы с сюжетом"}
-    - {id: 294, cat: XXX, desc: " |- Порно фильмы без сюжета"}
-    - {id: 271, cat: XXX, desc: " |- Гонзо"}
-    - {id: 251, cat: XXX, desc: " |- Лесбиянки"}
-    - {id: 1515, cat: XXX, desc: " |- Молодые студенты и узкие письки"}
-    - {id: 1349, cat: XXX, desc: " |- Скрытые камеры"}
-    - {id: 249, cat: XXX, desc: " |- Классические порно фильмы"}
-    - {id: 248, cat: XXX, desc: " |- Паки полных порно фильмов"}
-    - {id: 252, cat: XXX, desc: " |- Этнические порно фильмы"}
-    - {id: 253, cat: XXX, desc: " |- Японские фильмы"}
-    - {id: 1289, cat: XXX, desc: " |- Нетрадиционное порно"}
-    - {id: 1324, cat: XXX, desc: " |- Shemale / Трансcексуалы"}
-    - {id: 299, cat: XXX, desc: " |- Гей клубника"}
-    - {id: 246, cat: XXX, desc: " |- Эротические и Документальные фильмы"}
-    - {id: 1359, cat: XXX, desc: "Зарубежные порно фильмы (DVD, HD и Blu-ray)"}
-    - {id: 255, cat: XXX, desc: " |- Порно фильмы HD"}
-    - {id: 275, cat: XXX, desc: " |- Порно фильмы DVD"}
-    - {id: 1568, cat: XXX, desc: "Русское порно"}
-    - {id: 261, cat: XXX, desc: " |- Русские порно фильмы"}
-    - {id: 264, cat: XXX, desc: " |- Русские порно ролики"}
-    - {id: 265, cat: XXX, desc: " |- Русское любительское видео"}
-    - {id: 263, cat: XXX, desc: " |- Сцены из фильмов и Сайтрипы с русскими актрисами"}
-    - {id: 262, cat: XXX, desc: " |- Паки русских роликов"}
-    - {id: 1358, cat: XXX, desc: "Зарубежные порно ролики"}
-    - {id: 1749, cat: XXX, desc: " |- Вуайеризм (подглядывание)"}
-    - {id: 1748, cat: XXX, desc: " |- Большие сиськи"}
-    - {id: 257, cat: XXX, desc: " |- HD ролики"}
-    - {id: 1746, cat: XXX, desc: " |- Анальный секс"}
-    - {id: 1745, cat: XXX, desc: " |- Домашнее порно"}
-    - {id: 1744, cat: XXX, desc: " |- Секс с подростками"}
-    - {id: 1747, cat: XXX, desc: " |- Мамочки"}
-    - {id: 260, cat: XXX, desc: " |- Разное"}
-    - {id: 259, cat: XXX, desc: " |- Сцены из фильмов"}
-    - {id: 266, cat: XXX, desc: " |- Любительское фото"}
-    - {id: 267, cat: XXX, desc: " |- Фото Разное"}
-    - {id: 256, cat: XXX, desc: " |- Паки сайтрипов"}
-    - {id: 1347, cat: XXX, desc: "Мультфильмы / Cartoons"}
-    - {id: 1665, cat: XXX, desc: "3D порно"}
     # E-books, Magazines, Books, Comics
     - {id: 1674, cat: Books, desc: "Скачать книги в формате fb2 бесплатно и без регистрации"}
     - {id: 1241, cat: Books, desc: "Журналы (PDF)"}

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

@@ -1,224 +0,0 @@
----
-id: pixelados-html
-name: Pixelados
-description: "Pixelados is a Spanish Private Torrent Tracker for HD MOVIES / TV"
-language: es-ES
-type: private
-encoding: UTF-8
-links:
-  - https://pixelados.tv/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Películas"}
-    - {id: 2, cat: TV, desc: "Series"}
-    - {id: 3, cat: Audio, desc: "Música"}
-    - {id: 4, cat: TV/Documentary, desc: "Documentales"}
-    - {id: 5, cat: TV/Sport, desc: "Deportes"}
-    - {id: 6, cat: TV/Anime, desc: "Animación"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-
-settings:
-  - name: username
-    type: text
-    label: Username
-  - name: password
-    type: password
-    label: Password
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  path: login
-  method: form
-  form: form[action$="/login"]
-  inputs:
-    username: "{{ .Config.username }}"
-    password: "{{ .Config.password }}"
-    remember: on
-  selectorinputs:
-    _token:
-      selector: input[name="_token"]
-      attribute: value
-  error:
-    - selector: div#ERROR_COPY
-
-search:
-  paths:
-    - path: torrents
-  inputs:
-    sortField: "{{ .Config.sort }}"
-    sortDirection: "{{ .Config.type }}"
-    perPage: 100
-    name: "{{ .Keywords }}"
-    $raw: "{{ 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[0]=100{{ else }}{{ end }}"
-  keywordsfilters:
-    - name: diacritics
-      args: replace
-    - name: re_replace
-      args: ["\\.", " "]
-    - name: re_replace
-      args: ["(?i)\\bS0*(\\d+)\\b", "T$1"]
-    - name: re_replace
-      args: ["(?i)S0?(\\d{1,2})E(\\d{1,2})", "$1x$2"]
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: td.torrent-listings-format div:first-child
-      case:
-        i.fa-film: 1
-        i.fa-tv-retro: 2
-        i.fa-music: 3
-        i.fa-paw: 4
-        i.fa-volleyball: 5
-        i.fa-robot: 6
-    details:
-      selector: a.torrent-listings-name
-      attribute: href
-    title_raw:
-      selector: a.torrent-listings-name
-    _format:
-      selector: td.torrent-listings-format
-    _vose:
-      selector: a[href$="torrents?types[0]=53"]
-      optional: true
-    _mejorada:
-      selector: a[href$="torrents?types[0]=52"]
-      optional: true
-    _corregida:
-      selector: a[href$="torrents?types[0]=58"]
-      optional: true
-    _audio_editado:
-      selector: a[href$="torrents?types[0]=39"]
-      optional: true
-    _overview:
-      selector: td.torrent-listings-overview
-      remove: a, span.torrent-listings-comments, span.torrent-listings-thanks, span.torrent-listings-uploader
-    title:
-      text: "{{ .Result.title_raw }} {{ .Result._format }} {{ .Result._overview }}{{ if .Result._vose }}{{ else }} SPANISH{{ end }}{{ if or .Result._mejorada .Result._corregida .Result._audio_editado }} PROPER{{ else }}{{ end }}"
-      filters:
-        # Replace Spanish season names like T1, MS (MiniSerie), TU (Temporada Unica) for normalized format S1
-        - name: re_replace
-          args: ["(?i)T(\\d{1,2})\\b", "S$1"]
-        - name: re_replace
-          args: ["(\\d{2})[×|x](\\d{2})", "S$1E$2"]
-        - name: re_replace
-          args: ["(\\d{1})[×|x](\\d{2})", "S0$1E$2"]
-        - name: re_replace
-          args: ["(?i)MS\\b", "S1"]
-        - name: re_replace
-          args: ["(?i)TU\\b", "S1"]
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: replace
-          args: ["https://via.placeholder.com/90x135", ""]
-    size:
-      selector: td.torrent-listings-size
-    seeders:
-      selector: td.torrent-listings-seeders
-    leechers:
-      selector: td.torrent-listings-leechers
-    grabs:
-      selector: td.torrent-listings-completed
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tvdbid:
-      selector: a[href*="thetvdb.com/"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
-      attribute: href
-    date:
-      selector: td.torrent-listings-age
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-# global MR is 0.4 but torrents must be seeded for 7 days regardless of ratio
-#    minimumratio:
-#      text: 0.4
-    minimumseedtime:
-      # 7 day (as seconds = 7 x 24 x 60 x 60)
-      text: 604800
-# html UNIT3D 6.3.0 (custom)

src/Jackett.Common/Definitions/polishsource.yml

@@ -121,9 +121,9 @@ search:
       selector: a[href^="details.php?id="]
       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\\.)", ".POLISH."]
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:

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

@@ -45,15 +45,15 @@ settings:
     default: "Find your API Key by accessing your <a href=\"https://pte.nu/\" target =_blank>PolishTracker</a> account <i>Settings</i> page and clicking on the <b>API</b> section."
   - name: multilang
     type: checkbox
-    label: Replace MULTI by another language in release name
+    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: POLISH
     options:
       POLISH: POLISH
-      MULTI.POLISH: MULTI.POLISH
+      MULTi.POLISH: MULTi.POLISH
 
 # login:
 #   path: "https://api-test.pte.nu/api/v1/torrents"
@@ -104,9 +104,9 @@ search:
       selector: name
       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\\.)", ".POLISH."]
+          args: ["(?i)\\b(pl)\\b", "POLISH"]
     title:
       text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
     details:

src/Jackett.Common/Definitions/ptchina.yml

@@ -123,6 +123,10 @@ search:
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    # site does not have posters enabled. just in case a future update.
+    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"]

src/Jackett.Common/Definitions/pterclub.yml

@@ -136,8 +136,8 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     poster:
-      selector: img[data-orig]
-      attribute: data-orig
+      selector: img[data-src]
+      attribute: data-src
     imdbid:
       selector: a[href$="&search_area=4"]
       attribute: href

src/Jackett.Common/Definitions/pthome.yml

@@ -139,4 +139,4 @@ search:
     description:
       selector: td:nth-child(2)
       remove: a, img
-# NexusPHP
+# NexusPHP v3.1 2021-07-05

src/Jackett.Common/Definitions/purovicio.yml

@@ -1,188 +0,0 @@
----
-id: purovicio
-name: PuroVicio
-description: "PuroVicio is a Latin American Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: es-419
-type: private
-encoding: UTF-8
-links:
-  - https://purovicio.in/
-legacylinks:
-  - https://purovicio.pw/
-
-caps:
-  categorymappings:
-    - {id: 1, cat: Movies, desc: "Movies"}
-    - {id: 2, cat: TV, desc: "TV"}
-    - {id: 3, cat: Audio, desc: "Music"}
-    - {id: 4, cat: PC/Mac, desc: "Mac"}
-    - {id: 5, cat: Console, desc: "Game"}
-    - {id: 6, cat: PC/0day, desc: "Soft"}
-    - {id: 7, cat: Other, desc: "Various"}
-    - {id: 8, cat: XXX, desc: "XXX"}
-    - {id: 9, cat: Other, desc: "Cursos"}
-    - {id: 10, cat: PC/ISO, desc: "Sistemas Operativos"}
-
-  modes:
-    search: [q]
-    tv-search: [q, season, ep, imdbid, tvdbid, tmdbid]
-    movie-search: [q, imdbid, tmdbid]
-    music-search: [q]
-
-settings:
-  - name: cookie
-    type: text
-    label: Cookie
-  - name: info_login
-    type: info
-    label: Purovicio Login
-    default: "Purovicio is using a <b>ReCaptcha</b> challenge during <b>login</b> which Jackett cannot solve.</br>So Jackett is using the <b>cookie</b> method to allow Jackett access to the site.</br>However, for this to work you need to <b>remain logged in</b> at the Purovicio website, otherwise the cookie will become invalidated. (You can close the Browser Tab, just don't <b>Logout</b>).</br>If you get no results, then <b>refresh</b> your cookie."
-  - name: info_cookie
-    type: info
-    label: How to get the Cookie
-    default: "<ol><li>Login to this tracker with your browser<li>Open the <b>DevTools</b> panel by pressing <b>F12</b><li>Select the <b>Network</b> tab<li>Click on the <b>Doc</b> button (Chrome Browser) or <b>HTML</b> button (FireFox)<li>Refresh the page by pressing <b>F5</b><li>Click on the first row entry<li>Select the <b>Headers</b> tab on the Right panel<li>Find <b>'cookie:'</b> in the <b>Request Headers</b> section<li><b>Select</b> and <b>Copy</b> the whole cookie string <i>(everything after 'cookie: ')</i> and <b>Paste</b> here.</ol>"
-  - name: freeleech
-    type: checkbox
-    label: Search freeleech only
-    default: false
-  - name: sort
-    type: select
-    label: Sort requested from site
-    default: created_at
-    options:
-      created_at: created
-      seeders: seeders
-      size: size
-      name: title
-  - name: type
-    type: select
-    label: Order requested from site
-    default: desc
-    options:
-      desc: desc
-      asc: asc
-
-login:
-  method: cookie
-  inputs:
-    cookie: "{{ .Config.cookie }}"
-  test:
-    path: /
-
-search:
-  paths:
-    - path: filterTorrents
-  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
-    page: 0
-    view: list
-    freeleech: "{{ if .Config.freeleech }}1{{ else }}{{ end }}"
-
-  rows:
-    selector: table > tbody > tr
-
-  fields:
-    category:
-      selector: a[href*="/categories/"]
-      attribute: href
-      filters:
-        - name: regexp
-          args: "/categories/.*?\\.(\\d+)"
-    title:
-      selector: a.view-torrent
-    download:
-      selector: a[href*="/download/"]
-      attribute: href
-    details:
-      selector: a.view-torrent
-      attribute: href
-    poster:
-      selector: div.torrent-poster img
-      attribute: src
-      filters:
-        - name: prepend
-          args: "https://images.weserv.nl/?url=" # for display on dashboard
-        - name: append
-          args: "&w=180&h=270" # for display on dashboard
-        - name: replace
-          args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""]
-    imdbid:
-      selector: a[href*="imdb.com/title/tt"]
-      attribute: href
-    tmdbid:
-      selector: a[href*="themoviedb.org/movie/"], a[href*="themoviedb.org/tv/"]
-      attribute: href
-    size:
-      selector: td:nth-last-child(4)
-    grabs:
-      selector: td:nth-last-child(3)
-    seeders:
-      selector: td:nth-last-child(2)
-    leechers:
-      selector: td:nth-last-child(1)
-    date:
-      selector: time
-      filters:
-        # translations for Turkish|Estonian|Danish|Italian|Polish|Norwegian|Portuguese|Czech|Russian|Romanian|Spanish|French|German|Bulgarian|Dutch|Chinese|Japanese|Swedish
-        - name: re_replace
-          args: ["(?i)(önce|tagasi|geleden|fa|temu|siden|há|atrás|nazpět|назад|acum|în urmă|hace|il y a|vor|преди|前|sedan)", " ago"]
-        - name: re_replace
-          args: ["(?i)(saniye|sekundit|sekunder|secondi|sekund|segundos|sekundami|секунд|secunde|secondes|Sekunden|секунди|seconden|秒前)", "seconds"]
-        - name: re_replace
-          args: ["(?i)(minutit|minutter|minuti|minuty|minutos|минуты|минут|Minuten|минути|minuten|minuter)", "minutes"]
-        - name: re_replace
-          args: ["(?i)(dakika|minut|minuto|minuta|minutt|минута|Minute|minuut|分钟|分)", " minute"]
-        - name: re_replace
-          args: ["(?i)(tundi|timer|ore|godziny|horas|hodiny|hoden|часа|часов|ore|heures|Stunden|timmar)", "hours"]
-        - name: re_replace
-          args: ["(?i)(saat|tund|time|ora|godzina|hora|hodina|час|oră|heure|Stunde|uur|小时|時間|timme)", " hour"]
-        - name: re_replace
-          args: ["(?i)(päeva|dage|giorni|dni|dias|dny|дня|дней|zile|días|jours|Tagen|дни|dagen|dagar)", "days"]
-        - name: re_replace
-          args: ["(?i)(gün|päev|dag|giorno|dzień|dia|den|день|zi|día|jour|Tag|ден|天|日)", " day"]
-        - name: re_replace
-          args: ["(?i)(nädalat|uger|settimane|tygodnie|uker|semanas|týdny|недели|недель|săptămâni|semaines|Wochen|седмици|weken|veckor)", "weeks"]
-        - name: re_replace
-          args: ["(?i)(hafta|nädal|uge|settimana|tydzień|uke|semana|týden|неделю|săptămână|semaine|Woche|седмица|周|週間|vecka)", " week"]
-        - name: re_replace
-          args: ["(?i) (ay)", "month"]
-        - name: re_replace
-          args: ["(?i)(kuud|måneder|mesi|miesiące|meses|měsíce|месяца|месяцев|luni|meses|mois|Monaten|месеца|maanden|månader)", "months"]
-        - name: re_replace
-          args: ["(?i)(kuu|måned|mese|miesiąc|mês|měsíc|месяц|lună|mes|Monat|месец|maand|个月|ヶ月|månad)", " month"]
-        - name: re_replace
-          args: ["(?i)(aastat|anni|lata|anos|roky|года|ani|años|ans|Jahren|години)", " years"]
-        - name: re_replace
-          args: ["(?i)(yil|aasta|år|anno|rok|ano|год|año|Jahr|година|jaar|年)", " year"]
-        - name: re_replace
-          args: ["(?i) (an)", "year"]
-        - name: re_replace
-          args: ["(?i)(För |und)", ""] # Misc removals
-        - name: timeago
-    downloadvolumefactor:
-      case:
-        i[class*="fa-id-badge text-orange"]: 0 # 24 Hour FreeLeech From BON Store
-        i[class*="fa-trophy text-purple"]: 0 # Special FreeLeech For Certain User Groups
-        i[class*="fa-star text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-coins text-bold"]: 0 # Freeleech From Token
-        i[class*="fa-globe text-blue"]: 0 # Global Freeleech
-        i[class*="fa-star text-gold"]: 0 # Freeleech
-        i[class*="fa-certificate text-pink"]: 0 # Featured Torrent
-        "*": 1
-    uploadvolumefactor:
-      case:
-        i[class*="fa-gem text-green"]: 2 # Single Torrent Double Upload
-        i[class*="fa-globe text-green"]: 2 # Global Double Upload
-        i[class*="fa-certificate text-pink"]: 2 # Featured Torrent
-        "*": 1
-# UNIT3D 1.9.4

src/Jackett.Common/Definitions/rgfootball.yml

@@ -97,6 +97,7 @@ caps:
     - {id: 232, cat: TV/Sport, desc: " |- Play-off"}
     - {id: 160, cat: TV/Sport, desc: "2022-23 UEFA Europa League"}
     - {id: 347, cat: TV/Sport, desc: " |- VIP-Extra UEL 2022-23"}
+    - {id: 512, cat: TV/Sport, desc: " |- VIP UEL 2022-23"}
     - {id: 570, cat: TV/Sport, desc: " |- VIP-Light UEL 2022-23"}
     - {id: 161, cat: TV/Sport, desc: " |- Qualifying Rounds"}
     - {id: 162, cat: TV/Sport, desc: " |- Group stage"}
@@ -118,7 +119,6 @@ caps:
     - {id: 340, cat: TV/Sport, desc: " |- Qualifying Rounds"}
     - {id: 339, cat: TV/Sport, desc: "2021-22 UEFA Europa League"}
     - {id: 12, cat: TV/Sport, desc: " |- VIP-Extra UEL 2021-22"}
-    - {id: 512, cat: TV/Sport, desc: " |- VIP UEL 2021-22"}
     - {id: 576, cat: TV/Sport, desc: " |- VIP-Light UEL 2021-22"}
     - {id: 345, cat: TV/Sport, desc: " |- Play-off"}
     - {id: 343, cat: TV/Sport, desc: " |- Group stage"}

src/Jackett.Common/Definitions/riperam.yml

@@ -10,7 +10,7 @@ links:
 
 caps:
   categorymappings:
-    - {id: 238, cat: Movies, desc: "Новинки кино (2022). Новые фильмы скачать бесплатно"}
+    - {id: 238, cat: Movies, desc: "Новинки кино (2023). Новые фильмы скачать бесплатно"}
     - {id: 425, cat: Movies/HD, desc: "DVDRip / DVD-5/DVD-9"}
     - {id: 50, cat: Movies/HD, desc: "DVDRip"}
     - {id: 52, cat: Movies/HD, desc: "DVD-5/DVD-9"}
@@ -57,7 +57,6 @@ caps:
     - {id: 160, cat: TV, desc: "Теория большого взрыва"}
     - {id: 20, cat: TV, desc: "Русские сериалы"}
     - {id: 210, cat: TV, desc: "!!!   Полные завершенные сериалы   !!!"}
-    - {id: 969, cat: TV, desc: "13"}
     - {id: 707, cat: TV, desc: "Агент"}
     - {id: 1028, cat: TV, desc: "Белые волки"}
     - {id: 736, cat: TV, desc: "Бомбила. Продолжение"}
@@ -66,7 +65,6 @@ caps:
     - {id: 979, cat: TV, desc: "В Москве всегда солнечно"}
     - {id: 790, cat: TV, desc: "Горюнов"}
     - {id: 791, cat: TV, desc: "Груз (Фельдъегеря)"}
-    - {id: 803, cat: TV, desc: "Двойная жизнь"}
     - {id: 994, cat: TV, desc: "Дворняжка Ляля / Красотка Ляля / Ляля. Возвращение"}
     - {id: 735, cat: TV, desc: "Дело врачей"}
     - {id: 992, cat: TV, desc: "Дело для двоих"}
@@ -80,10 +78,8 @@ caps:
     - {id: 984, cat: TV, desc: "Земский доктор. Любовь вопреки"}
     - {id: 732, cat: TV, desc: "Икорный барон"}
     - {id: 983, cat: TV, desc: "Королева игры"}
-    - {id: 774, cat: TV, desc: "Кулинар-2"}
     - {id: 989, cat: TV, desc: "Курортная полиция"}
     - {id: 961, cat: TV, desc: "Личное дело"}
-    - {id: 639, cat: TV, desc: "Ловушка"}
     - {id: 703, cat: TV, desc: "Лорд. Пес-полицейский"}
     - {id: 1013, cat: TV, desc: "Лучшие враги"}
     - {id: 131, cat: TV, desc: "Майор полиции"}
@@ -113,7 +109,6 @@ caps:
     - {id: 755, cat: TV, desc: "Студия 17"}
     - {id: 1039, cat: TV, desc: "Тайны следствия"}
     - {id: 360, cat: TV, desc: "Такси"}
-    - {id: 981, cat: TV, desc: "Темный мир: Равновесие"}
     - {id: 1046, cat: TV, desc: "Тест на беременность"}
     - {id: 977, cat: TV, desc: "Тихая охота"}
     - {id: 681, cat: TV, desc: "Топтуны"}
@@ -126,10 +121,8 @@ caps:
     - {id: 780, cat: TV, desc: "Шерлок Холмс"}
     - {id: 805, cat: TV, desc: "Этаж"}
     - {id: 743, cat: TV, desc: "Ясмин"}
-    - {id: 973, cat: TV, desc: "Умник"}
     - {id: 733, cat: TV, desc: "Хмуров"}
     - {id: 505, cat: TV, desc: "Хозяйка моей судьбы"}
-    - {id: 1004, cat: TV, desc: "Анжелика"}
     - {id: 1047, cat: TV, desc: "Бессмертник"}
     - {id: 1074, cat: TV, desc: "Без свидетелей"}
     - {id: 692, cat: TV, desc: "Верное средство"}
@@ -147,12 +140,9 @@ caps:
     - {id: 798, cat: TV, desc: "Зайцев+1"}
     - {id: 1102, cat: TV, desc: "Запретная любовь"}
     - {id: 1083, cat: TV, desc: "Код Константина"}
-    - {id: 1092, cat: TV, desc: "Измены"}
     - {id: 565, cat: TV, desc: "Кодекс чести"}
-    - {id: 797, cat: TV, desc: "Корабль"}
     - {id: 1070, cat: TV, desc: "Инспектор Купер"}
     - {id: 640, cat: TV, desc: "Легавый"}
-    - {id: 1048, cat: TV, desc: "Луна"}
     - {id: 1060, cat: TV, desc: "Ленинград 46"}
     - {id: 684, cat: TV, desc: "Лесник"}
     - {id: 1057, cat: TV, desc: "Между нами, девочками"}
@@ -164,7 +154,6 @@ caps:
     - {id: 1054, cat: TV, desc: "Папа на вырост"}
     - {id: 1094, cat: TV, desc: "Непридуманная жизнь"}
     - {id: 986, cat: TV, desc: "Пляж"}
-    - {id: 750, cat: TV, desc: "Последний из Магикян"}
     - {id: 1043, cat: TV, desc: "Последний янычар"}
     - {id: 997, cat: TV, desc: "Практика"}
     - {id: 1031, cat: TV, desc: "Хроники ломбарда"}
@@ -178,13 +167,10 @@ caps:
     - {id: 1024, cat: TV, desc: "Литейный"}
     - {id: 1023, cat: TV, desc: "Раскаяние"}
     - {id: 1076, cat: TV, desc: "Родители"}
-    - {id: 972, cat: TV, desc: "Сватьи"}
     - {id: 1073, cat: TV, desc: "Чужое гнездо"}
     - {id: 1078, cat: TV, desc: "Чтец"}
-    - {id: 691, cat: TV, desc: "Черные кошки"}
     - {id: 628, cat: TV, desc: "Карпов"}
     - {id: 1101, cat: TV, desc: "Квест"}
-    - {id: 1088, cat: TV, desc: "Лондонград"}
     - {id: 1072, cat: TV, desc: "Меч"}
     - {id: 795, cat: TV, desc: "Пока станица спит"}
     - {id: 978, cat: TV, desc: "ППС"}
@@ -194,14 +180,12 @@ caps:
     - {id: 1178, cat: TV, desc: "Беглые родственники"}
     - {id: 1161, cat: TV, desc: "Бедные люди"}
     - {id: 1099, cat: TV, desc: "Ботаны"}
-    - {id: 1136, cat: TV, desc: "Бородач"}
     - {id: 1184, cat: TV, desc: "Вижу - знаю"}
     - {id: 1127, cat: TV, desc: "Владимирская, 15"}
     - {id: 781, cat: TV, desc: "Выжить после"}
     - {id: 1181, cat: TV, desc: "Вышибала"}
     - {id: 1165, cat: TV, desc: "Гастролеры (Беглецы)"}
     - {id: 1150, cat: TV, desc: "Гражданин Никто"}
-    - {id: 509, cat: TV, desc: "Два отца и два сына"}
     - {id: 656, cat: TV, desc: "Деффчонки"}
     - {id: 1128, cat: TV, desc: "Другой майор Соколов"}
     - {id: 1192, cat: TV, desc: "Жемчуга"}
@@ -210,19 +194,15 @@ caps:
     - {id: 1117, cat: TV, desc: "Иные"}
     - {id: 1228, cat: TV, desc: "Казаки"}
     - {id: 1107, cat: TV, desc: "Как я стал русским"}
-    - {id: 1077, cat: TV, desc: "Клан Ювелиров"}
     - {id: 1118, cat: TV, desc: "Команда"}
     - {id: 1132, cat: TV, desc: "Кости"}
-    - {id: 354, cat: TV, desc: "Кухня"}
     - {id: 1040, cat: TV, desc: "Мажор"}
-    - {id: 1104, cat: TV, desc: "Метод"}
     - {id: 1189, cat: TV, desc: "Москва. Центральный округ"}
     - {id: 1135, cat: TV, desc: "На глубине"}
     - {id: 1151, cat: TV, desc: "Напарницы"}
     - {id: 1131, cat: TV, desc: "Не зарекайся"}
     - {id: 1160, cat: TV, desc: "Невский"}
     - {id: 1224, cat: TV, desc: "Нити судьбы"}
-    - {id: 1112, cat: TV, desc: "Озабоченные или любовь зла"}
     - {id: 1139, cat: TV, desc: "Остров"}
     - {id: 1080, cat: TV, desc: "Отдел 44"}
     - {id: 761, cat: TV, desc: "Пасечник"}
@@ -230,9 +210,7 @@ caps:
     - {id: 1157, cat: TV, desc: "Перевозчик"}
     - {id: 1081, cat: TV, desc: "Пес"}
     - {id: 1110, cat: TV, desc: "Последний мент"}
-    - {id: 1163, cat: TV, desc: "Последний москаль. Судный день"}
     - {id: 1126, cat: TV, desc: "Прокуроры"}
-    - {id: 1179, cat: TV, desc: "Пушкин"}
     - {id: 671, cat: TV, desc: "Пятая стража"}
     - {id: 1019, cat: TV, desc: "Пятницкий. Глава четвертая"}
     - {id: 1115, cat: TV, desc: "Ради любви я все смогу / Вечная любовь"}
@@ -245,17 +223,13 @@ caps:
     - {id: 1180, cat: TV, desc: "Степные волки"}
     - {id: 1133, cat: TV, desc: "Сын моего отца"}
     - {id: 1049, cat: TV, desc: "Такая работа"}
-    - {id: 1185, cat: TV, desc: "Центральная больница"}
     - {id: 1141, cat: TV, desc: "Человек без прошлого"}
     - {id: 1223, cat: TV, desc: "Чёрная кошка"}
     - {id: 1190, cat: TV, desc: "Шаман. Новая угроза"}
     - {id: 1191, cat: TV, desc: "Я работаю в суде"}
     - {id: 1235, cat: TV, desc: "Василиса"}
     - {id: 1154, cat: TV, desc: "Вечный отпуск"}
-    - {id: 555, cat: TV, desc: "Восьмидесятые"}
-    - {id: 1231, cat: TV, desc: "Вы все меня бесите"}
     - {id: 152, cat: TV, desc: "Интерны"}
-    - {id: 1156, cat: TV, desc: "Крыша мира"}
     - {id: 1233, cat: TV, desc: "Райское место"}
     - {id: 1302, cat: TV, desc: "Фамильные ценности"}
     - {id: 1059, cat: TV, desc: "Это любовь"}
@@ -264,7 +238,6 @@ caps:
     - {id: 1186, cat: TV, desc: "Кризис нежного возраста"}
     - {id: 1281, cat: TV, desc: "Куба"}
     - {id: 1278, cat: TV, desc: "Майор и магия"}
-    - {id: 1125, cat: TV, desc: "Мамочки"}
     - {id: 1155, cat: TV, desc: "Мент в законе"}
     - {id: 1015, cat: TV, desc: "Ментовские войны"}
     - {id: 1276, cat: TV, desc: "Один против всех"}
@@ -283,7 +256,6 @@ caps:
     - {id: 1285, cat: TV, desc: "Учитель в законе. Схватка"}
     - {id: 970, cat: TV, desc: "Физрук"}
     - {id: 1299, cat: TV, desc: "Филфак"}
-    - {id: 1062, cat: TV, desc: "ЧОП"}
     - {id: 778, cat: TV, desc: "Шеф. Игра на повышение / Шеф-4"}
     - {id: 21, cat: TV, desc: "Зарубежные мультсериалы"}
     - {id: 185, cat: TV, desc: "WINX CLUB - Школа волшебниц"}
@@ -341,7 +313,6 @@ caps:
     - {id: 1011, cat: TV, desc: "История Российской кухни"}
     - {id: 456, cat: TV, desc: "Каникулы в Мексике"}
     - {id: 682, cat: TV, desc: "Караоке киллер"}
-    - {id: 996, cat: TV, desc: "Когда мы дома"}
     - {id: 785, cat: TV, desc: "Куб - Новый сезон"}
     - {id: 668, cat: TV, desc: "Кулинарный поединок"}
     - {id: 752, cat: TV, desc: "Луч Света"}
@@ -385,7 +356,6 @@ caps:
     - {id: 448, cat: TV, desc: "Что делать?"}
     - {id: 366, cat: TV, desc: "6 кадров"}
     - {id: 1032, cat: TV, desc: "Автошкола 2: Девчонки рулят"}
-    - {id: 471, cat: TV, desc: "Большая Разница"}
     - {id: 744, cat: TV, desc: "В наше время"}
     - {id: 1056, cat: TV, desc: "Все будет хорошо"}
     - {id: 344, cat: TV, desc: "Галилео"}
@@ -395,7 +365,6 @@ caps:
     - {id: 693, cat: TV, desc: "Comedy Баттл. Без границ"}
     - {id: 1164, cat: TV, desc: "Битва риелторов"}
     - {id: 1071, cat: TV, desc: "Взвешенные люди"}
-    - {id: 229, cat: TV, desc: "Comedy Баттл. Отбор, турнир"}
     - {id: 1096, cat: TV, desc: "Время Г"}
     - {id: 522, cat: TV, desc: "Модный приговор"}
     - {id: 971, cat: TV, desc: "Не спать!"}
@@ -427,8 +396,6 @@ caps:
     - {id: 480, cat: TV, desc: "Камеди Woman"}
     - {id: 459, cat: TV, desc: "Говорим и показываем"}
     - {id: 479, cat: TV, desc: "Comedy Club - Камеди Клаб"}
-    - {id: 33, cat: TV, desc: "ДОМ 2"}
-    - {id: 270, cat: TV, desc: "Архив Дом-2"}
     - {id: 1484, cat: TV, desc: "ДНК"}
     - {id: 1483, cat: TV, desc: "За гранью"}
     - {id: 1469, cat: TV, desc: "Звезды сошлись"}
@@ -466,7 +433,6 @@ caps:
     - {id: 1286, cat: TV, desc: "Ты супер!"}
     - {id: 470, cat: TV, desc: "Уральские пельмени"}
     - {id: 1290, cat: TV, desc: "Устами младенца"}
-    - {id: 1147, cat: TV, desc: "Фазенда"}
     - {id: 188, cat: TV, desc: "Центральное телевидение"}
     - {id: 543, cat: TV, desc: "Что? Где? Когда?"}
     - {id: 738, cat: TV, desc: "Школа ремонта"}
@@ -537,7 +503,6 @@ caps:
     - {id: 337, cat: TV/Documentary, desc: "Ты не поверишь!"}
     - {id: 330, cat: TV/Documentary, desc: "Человек и закон"}
     - {id: 25, cat: TV/Sport, desc: "Спортивные передачи"}
-    - {id: 127, cat: TV/Sport, desc: "ХХII Зимние Олимпийские Игры в Сочи"}
     - {id: 616, cat: TV/Sport, desc: "Фигурное катание"}
     - {id: 201, cat: TV/Sport, desc: "Бокс, боевые единоборства , рестлинг"}
     - {id: 146, cat: TV/Sport, desc: "Гонки"}
@@ -561,7 +526,6 @@ caps:
     - {id: 515, cat: TV/Sport, desc: "Стыдно, когда видно!"}
     - {id: 468, cat: TV/Sport, desc: "Прожекторперисхилтон"}
     - {id: 762, cat: TV/Sport, desc: "Хит"}
-    - {id: 767, cat: TV/Sport, desc: "Шурочка"}
     - {id: 1113, cat: TV/Sport, desc: "Акценты недели"}
     - {id: 333, cat: TV/Sport, desc: "Брачное чтиво"}
     - {id: 1097, cat: TV/Sport, desc: "В теме"}
@@ -573,7 +537,6 @@ caps:
     - {id: 335, cat: TV/Sport, desc: "Операция «Должник»"}
     - {id: 1134, cat: TV/Sport, desc: "Открытая студия"}
     - {id: 1143, cat: TV/Sport, desc: "Поздняков. Интервью с ..."}
-    - {id: 336, cat: TV/Sport, desc: "Секретные территории"}
     - {id: 702, cat: TV/Sport, desc: "Собчак живьём"}
     - {id: 328, cat: TV/Sport, desc: "Специальный корреспондент"}
     - {id: 1053, cat: TV/Sport, desc: "Список Норкина"}

src/Jackett.Common/Definitions/rutor.yml

@@ -9,7 +9,7 @@ links:
   - http://rutor.info/ # site does not support https ERR_CONNECTION_REFUSED
   - http://rutor.is/ # site does not support https ERR_CONNECTION_REFUSED
   - http://new-rutor.org/ # site does not support https ERR_CONNECTION_REFUSED
-  - https://rutor.nocensor.art/ # for magnet only
+  - https://rutor.mrunblock.guru/ # for magnet only
 legacylinks:
   - http://live-rutor.org/ # domain expired 9 Feb 2020
   - https://rutor.black-mirror.xyz/
@@ -28,6 +28,7 @@ legacylinks:
   - http://6tor.org/
   - https://rutor.nocensor.world/
   - https://rutor.nocensor.lol/
+  - https://rutor.nocensor.art/
 
 caps:
   # unfortunately RuTor does not display categories anywhere in its search results page :-(

src/Jackett.Common/Definitions/rutracker-ru.yml

@@ -11,19 +11,24 @@ links:
 caps:
   categorymappings:
     # Кинематограф movies
-    - {id: 1677, cat: Movies, desc: "Кинематограф Зарубежные новинки (2022)"}
-    - {id: 1676, cat: Movies, desc: "Кинематограф Российские новинки (2022)"}
-    - {id: 1675, cat: Movies/HD, desc: "Кинематограф Зарубежные новинки в 720p (2022)"}
-    - {id: 1674, cat: Movies/HD, desc: "Кинематограф Российские новинки в 720p (2022)"}
-    - {id: 1673, cat: Movies/HD, desc: "Кинематограф Зарубежные новинки в 1080p (2022)"}
-    - {id: 1672, cat: Movies/HD, desc: "Кинематограф Российские новинки в 1080р (2022)"}
-    - {id: 1656, cat: Movies, desc: "Новинки (2021)"}
-    - {id: 1662, cat: Movies, desc: " |- Зарубежные новинки (2021)"}
-    - {id: 1661, cat: Movies, desc: " |- Российские новинки (2021)"}
-    - {id: 1660, cat: Movies/HD, desc: " |- Зарубежные новинки в 720p (2021)"}
-    - {id: 1659, cat: Movies/HD, desc: " |- Российские новинки в 720p (2021)"}
-    - {id: 1658, cat: Movies/HD, desc: " |- Зарубежные новинки в 1080p (2021)"}
-    - {id: 1657, cat: Movies/HD, desc: " |- Российские новинки в 1080р (2021)"}
+    - {id: 1697, cat: Movies, desc: "Кинематограф Зарубежные фильмы (2023)"}
+    - {id: 1696, cat: Movies, desc: "Кинематограф Российские фильмы (2023)"}
+    - {id: 1698, cat: Movies/HD, desc: "Кинематограф Зарубежные фильмы в 720p (2023) "}
+    - {id: 1699, cat: Movies/HD, desc: "Кинематограф Российские фильмы в 720p (2023)"}
+    - {id: 1701, cat: Movies/HD, desc: "Кинематограф Зарубежные фильмы в 1080p (2023)"}
+    - {id: 1677, cat: Movies, desc: "Кинематограф Зарубежные фильмы (2022)"}
+    - {id: 1676, cat: Movies, desc: "Кинематограф Российские фильмы (2022)"}
+    - {id: 1675, cat: Movies/HD, desc: "Кинематограф Зарубежные фильмы в 720p (2022)"}
+    - {id: 1674, cat: Movies/HD, desc: "Кинематограф Российские фильмы в 720p (2022)"}
+    - {id: 1673, cat: Movies/HD, desc: "Кинематограф Зарубежные фильмы в 1080p (2022)"}
+    - {id: 1672, cat: Movies/HD, desc: "Кинематограф Российские фильмы в 1080р (2022)"}
+    - {id: 1656, cat: Movies, desc: "фильмы (2021)"}
+    - {id: 1662, cat: Movies, desc: " |- Зарубежные фильмы (2021)"}
+    - {id: 1661, cat: Movies, desc: " |- Российские фильмы (2021)"}
+    - {id: 1660, cat: Movies/HD, desc: " |- Зарубежные фильмы в 720p (2021)"}
+    - {id: 1659, cat: Movies/HD, desc: " |- Российские фильмы в 720p (2021)"}
+    - {id: 1658, cat: Movies/HD, desc: " |- Зарубежные фильмы в 1080p (2021)"}
+    - {id: 1657, cat: Movies/HD, desc: " |- Российские фильмы в 1080р (2021)"}
     - {id: 1564, cat: Movies, desc: "фильмы 2020 года"}
     - {id: 1573, cat: Movies, desc: " |- Зарубежные фильмы (2020)"}
     - {id: 1572, cat: Movies, desc: " |- Российские фильмы (2020)"}
@@ -145,7 +150,6 @@ caps:
     - {id: 730, cat: Audio/Audiobook, desc: "Аудиокниги"}
     - {id: 776, cat: Audio/Audiobook, desc: " |- Фантастика Фэнтези Ужасы Мистика (Аудио)"}
     - {id: 777, cat: Audio/Audiobook, desc: " |- Детективы приключения триллеры боевики (Аудио)"}
-    - {id: 1164, cat: Audio/Audiobook, desc: " |- Радиоспектакли аудиофильмы"}
     - {id: 1156, cat: Audio/Audiobook, desc: " |- Историческая литература биографии мемуары (Аудио)"}
     - {id: 1158, cat: Audio/Audiobook, desc: " |- Зарубежная литература (Аудио)"}
     - {id: 1233, cat: Audio/Audiobook, desc: " |- Русская литература (Аудио)"}
@@ -199,6 +203,7 @@ caps:
     - {id: 1599, cat: Audio/MP3, desc: " |- Отечественный Rock (mp3)"}
     - {id: 1600, cat: Audio/MP3, desc: " |- Отечественный Metal (mp3)"}
     - {id: 1601, cat: Audio/MP3, desc: " |- Сборники Rock, Metal (mp3)"}
+    - {id: 1623, cat: Audio/MP3, desc: "Jazz and Blues  (Джаз и Блюз)"}
     - {id: 1626, cat: Audio/MP3, desc: " |- Зарубежный джаз (mp3)"}
     - {id: 1627, cat: Audio/MP3, desc: " |- Зарубежный блюз (mp3)"}
     - {id: 1628, cat: Audio/MP3, desc: " |- Отечественный джаз и блюз (mp3)"}

src/Jackett.Common/Definitions/satclubbing.yml

@@ -43,6 +43,7 @@ caps:
     - {id: 49, cat: Audio, desc: "Livesets - Hardcore"}
     - {id: 50, cat: Audio, desc: "Rave"}
     - {id: 51, cat: Audio, desc: "Acid"}
+    - {id: 52, cat: Audio, desc: "Dubstep"}
 
   modes:
     search: [q]

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

@@ -80,7 +80,7 @@ search:
   # if we have an id based search, add Season and Episode as query in name for UNIT3D < v6.  Else pass S/E Params for UNIT3D >= v6
     api_token: "{{ .Config.apikey }}"
     name: "{{ .Keywords }}"
-    $raw: "{{ if .Query.Season }}&seasonNumber={{ .Query.Season }}{{ else }}{{ end }}{{ if .Query.Ep }}&episodeNumber={{ .Query.Ep }}{{ else }}{{ end }}{{ if .Query.TMDBID }}&tmdbId={{ .Query.TMDBID }}{{ else }}{{ end }}{{ if .Query.IMDBIDShort }}&imdbId={{ .Query.IMDBIDShort }}{{ else }}{{ end }}{{ if  .Query.TVDBID }}&tvdbId={{ .Query.TVDBID }}{{ else }}{{ end }}{{ range .Categories }}&categories[]={{.}}{{end}}{{ if .Config.freeleech }}&free=1{{ else }}{{ end }}"
+    $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 }}"
     sortField: "{{ .Config.sort }}"
     sortDirection: "{{ .Config.type }}"
     perPage: 100
@@ -197,4 +197,4 @@ search:
     minimumseedtime:
       # 7 day (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 6.4.0 (custom)
+# json UNIT3D 6.5.0 (custom)

src/Jackett.Common/Definitions/sharewood.yml

@@ -69,22 +69,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
+      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
@@ -146,22 +146,20 @@ search:
           args: "/img/NewIcones/(.+?).png"
     title_phase1:
       selector: a.view-torrent
-    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 }}"
     download:
       selector: a.view-torrent
       attribute: href

src/Jackett.Common/Definitions/sharkpt.yml

@@ -0,0 +1,192 @@
+---
+id: sharkpt
+name: SharkPT
+description: "SharkPT is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+links:
+  - https://sharkpt.net/
+
+caps:
+  categorymappings:
+    - {id: 401, cat: Movies, desc: "Movies/电影"}
+    - {id: 404, cat: TV/Documentary, desc: "Documentaries/纪录片"}
+    - {id: 405, cat: TV/Anime, desc: "Animations/动漫"}
+    - {id: 402, cat: TV, desc: "TV Series/电视连续剧"}
+    - {id: 403, cat: TV, desc: "TV Shows/综艺"}
+    - {id: 406, cat: Audio/Video, desc: "MusicVideo/音乐视频"}
+    - {id: 407, cat: TV/Sport, desc: "Sports/体育"}
+    - {id: 409, cat: Other, desc: "Misc/其他"}
+    - {id: 408, cat: Audio, desc: "Music/HQ Audio"}
+
+  modes:
+    search: [q]
+    tv-search: [q, season, ep, imdbid, doubanid]
+    movie-search: [q, imdbid, doubanid]
+    music-search: [q]
+
+settings:
+  - name: username
+    type: text
+    label: Username
+  - name: password
+    type: password
+    label: Password
+  - name: 2facode
+    type: text
+    label: 2FA code
+  - name: info_2fa
+    type: info
+    label: "About 2FA code"
+    default: "Only fill in the <b>2FA code</b> box if you have enabled <b>2FA</b> on the SharkPT 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="mybonus.php"]
+
+search:
+  paths:
+    - path: torrents.php
+  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 }}"
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="details.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title_default:
+      selector: a[href^="details.php?id="]
+    title_optional:
+      optional: true
+      selector: a[title][href^="details.php?id="]
+      attribute: title
+    title:
+      text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    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: "2006-01-02 15:04:05 -07:00"
+    date_added:
+      # time added
+      selector: td.rowfollow:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "2006-01-0215:04:05 -07:00"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td.rowfollow:nth-child(5)
+    seeders:
+      selector: td.rowfollow:nth-child(6)
+    leechers:
+      selector: td.rowfollow:nth-child(7)
+    grabs:
+      selector: td.rowfollow:nth-child(8)
+    downloadvolumefactor:
+      case:
+        img.pro_free: 0
+        img.pro_free2up: 0
+        img.pro_50pctdown: 0.5
+        img.pro_50pctdown2up: 0.5
+        img.pro_30pctdown: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        img.pro_50pctdown2up: 2
+        img.pro_free2up: 2
+        img.pro_2up: 2
+        "*": 1
+    minimumseedtime:
+      # 7 day (as seconds = 7 x 24 x 60 x 60)
+      text: 604800
+    description:
+      selector: td.rowfollow:nth-child(2)
+      remove: a, img
+# NexusPHP v1.7.33 2022-12-19

src/Jackett.Common/Definitions/speedtorrentreloaded.yml

@@ -23,6 +23,7 @@ caps:
     - {id: 90, cat: Movies/3D, desc: "Movies-3-D"}
     - {id: 91, cat: Movies, desc: "Movies-Packs"}
     - {id: 108, cat: Movies, desc: "Movies Remux"}
+    - {id: 32, cat: Movies, desc: "Movies"}
     - {id: 14, cat: Audio/Other, desc: "Alben / Sampler / Singles"}
     - {id: 36, cat: Audio/Audiobook, desc: "Hörbuch"}
     - {id: 71, cat: Audio/Other, desc: "Soundtracks"}

src/Jackett.Common/Definitions/spidertk.yml

@@ -112,6 +112,25 @@ settings:
     options:
       desc: desc
       asc: asc
+  - 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 and SUBFRENCH with ENGLISH
+    default: false
 
 login:
   path: login.php
@@ -166,8 +185,22 @@ search:
       filters:
         - name: querystring
           args: cat
-    title:
+    title_phase1:
       selector: a[href^="details.php?id="]
+    title_vostfr:
+      text: "{{ .Result.title_phase1 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(vostfr|subfrench)\\b", "ENGLISH"]
+    title_phase2:
+      text: "{{ if .Config.vostfr }}{{ .Result.title_vostfr }}{{ else }}{{ .Result.title_phase1 }}{{ end }}"
+    title_multilang:
+      text: "{{ .Result.title_phase2 }}"
+      filters:
+        - name: re_replace
+          args: ["(?i)\\b(MULTI(?!.*(?:FRENCH|ENGLISH|VOSTFR)))\\b", "{{ .Config.multilanguage }}"]
+    title:
+      text: "{{ if .Config.multilang }}{{ .Result.title_multilang }}{{ else }}{{ .Result.title_phase2 }}{{ end }}"
     details:
       selector: a[href^="details.php?id="]
       attribute: href
@@ -175,7 +208,7 @@ search:
       selector: a[href^="download.php?id="]
       attribute: href
     poster:
-      selector: img.nexus-lazy-load
+      selector: img[data-src]
       attribute: data-src
     date_elapsed:
       # time type: time elapsed (default)
@@ -222,4 +255,4 @@ search:
         "*": 1
     minimumratio:
       text: 0.81
-# NexusPHP Custom 1.7.24 2022-09-11
+# NexusPHP v1.7.33 2022-12-19 (custom)

src/Jackett.Common/Definitions/sugoimusic.yml

@@ -184,4 +184,4 @@ search:
     minimumseedtime:
       # 3 days (as seconds = 3 x 24 x 60 x 60)
       text: 259200
-# NexusPHP Standard v1.5 Beta 4
+# Engine n/a

src/Jackett.Common/Definitions/teamctgame.yml

@@ -85,22 +85,22 @@ settings:
     default: For best results, change the <b>Torrents per page:</b> setting to <b>100</b> on your account profile.
   - 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
@@ -174,28 +174,29 @@ search:
           args: cat
     title_phase1:
       selector: a[href^="details.php?id="] b
-    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^="details.php?id="]
       attribute: href
     download:
       selector: a[href^="download.php?id="]
       attribute: href
+    poster:
+      selector: img[data-src]
+      attribute: data-src
     date_elapsed:
       # time type: time elapsed (default)
       selector: td:nth-child(4) > span[title]
@@ -241,4 +242,4 @@ search:
         "*": 1
     minimumratio:
       text: 1.0
-# NexusPHP v1.7.30 2022-10-21
+# NexusPHP v1.7.30 2022-11-05