capybarabr: update engine tag

README.md

@@ -464,6 +464,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
  * NorBits
  * NORDiCHD
  * Ntelogo
+ * OKFUN PT
  * OKPT
  * Old Greek Tracker
  * Old Toons World

src/Jackett.Common/Definitions/animetorrentsro.yml

@@ -65,14 +65,17 @@ settings:
     default: "Inactive accounts under VIP and without parked are automatically deleted after about a year."
 
 login:
-  path: takelogin.php
-  method: post
+  path: login.php
+  method: form
+  form: form
   inputs:
     username: "{{ .Config.username }}"
     password: "{{ .Config.password }}"
-    x: 0
-    y: 0
     referer: /
+  selectorinputs:
+    csrf_token:
+      selector: input[name="csrf_token"]
+      attribute: value
   error:
     - selector: table.main:contains("esuat")
   test:

src/Jackett.Common/Definitions/capybarabr.yml

@@ -185,4 +185,4 @@ search:
     minimumseedtime:
       # 7 days (as seconds = 7 x 24 x 60 x 60)
       text: 604800
-# json UNIT3D 8.0.2 (custom)
+# json UNIT3D 8.1.3 (custom)

src/Jackett.Common/Definitions/okfunpt.yml

@@ -0,0 +1,183 @@
+---
+id: okfunpt
+name: OKFUN PT
+description: "OKFUN PT is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL"
+language: zh-CN
+type: private
+encoding: UTF-8
+requestDelay: 5
+certificates:
+  - d44084e0ce0c6251dcc5c3d7eca8ed204bfd407d # Expired 19 May 2017
+links:
+  - https://pt.okfun.org/
+
+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: "Anime(動畫)", 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: "MV", default: true}
+    - {id: 407, cat: TV/Sport, desc: "Sport(體育)", default: true}
+    - {id: 409, cat: Other, desc: "Misc", default: true}
+    - {id: 408, cat: Audio, desc: "Music(音軌)", default: true}
+    - {id: 410, cat: XXX, desc: "AV (無碼)", default: false}
+    - {id: 411, cat: XXX, desc: "AV (有碼)", default: false}
+
+  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: 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.
+  - name: info_activity
+    type: info
+    label: Account Inactivity
+    default: "Account retention rules:<ol><li>Veteran User and above will be retained forever</li><li>Elite User and above will not have their account deleted after parking (in the control panel).</li><li>Users with a parked account will be deleted if they do not log in for 400 consecutive days</li><li>Users with a non-parked account will be deleted if they do not log in for 150 consecutive days</li><li>Users who have no traffic (i.e. upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.</li></ol>"
+
+login:
+  path: login.php
+  method: form
+  form: form[action="takelogin.php"]
+  captcha:
+    type: image
+    selector: img[alt="CAPTCHA"]
+    input: imagestring
+  inputs:
+    username: "{{ .Config.username }}"
+    password: "{{ .Config.password }}"
+    logout: ""
+    securelogin: ""
+    ssl: yes
+    trackerssl: yes
+  error:
+    - selector: td.embedded:has(h2:contains("失败"))
+  test:
+    path: index.php
+    selector: a[href="logout.php"]
+
+search:
+  paths:
+    - path: torrents.php
+      categories: [401, 402, 403, 404, 405, 406, 407, 408, 409]
+    - path: special.php
+      categories: [410, 411]
+  inputs:
+    $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
+    # currently supports only one query id at one time.
+    search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
+    # 0 incldead, 1 active, 2 dead
+    incldead: 0
+    # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30%
+    spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}"
+    # 0 title, 1 descr, 3 uploader, 4 imdburl
+    search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}"
+    # 0 AND, 1 OR, 2 exact
+    search_mode: 0
+    sort: "{{ .Config.sort }}"
+    type: "{{ .Config.type }}"
+    notnewword: 1
+
+  rows:
+    selector: table.torrents > tbody > tr:has(a[href^="download.php?id="])
+
+  fields:
+    category:
+      selector: a[href^="?cat="]
+      attribute: href
+      filters:
+        - name: querystring
+          args: cat
+    title:
+      selector: a[href^="details.php?id="]
+    details:
+      selector: a[href^="details.php?id="]
+      attribute: href
+    download:
+      selector: a[href^="download.php?id="]
+      attribute: href
+    imdbid:
+      selector: a[href*="imdb.com/title/tt"]
+      attribute: href
+    doubanid:
+      selector: a[href*="movie.douban.com/subject/"]
+      attribute: href
+    date_elapsed:
+      # time type: time elapsed (default)
+      selector: td:nth-child(4) > span[title]
+      attribute: title
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-dd HH:mm:ss zzz"
+    date_added:
+      # time added
+      selector: td:nth-child(4):not(:has(span))
+      optional: true
+      filters:
+        - name: append
+          args: " +08:00" # CST
+        - name: dateparse
+          args: "yyyy-MM-ddHH:mm:ss zzz"
+    date:
+      text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}"
+    size:
+      selector: td:nth-child(5)
+    seeders:
+      selector: td:nth-child(6)
+    leechers:
+      selector: td:nth-child(7)
+    grabs:
+      selector: td:nth-child(8)
+    downloadvolumefactor:
+      case:
+        font.promotion.free: 0
+        font.promotion.twoupfree: 0
+        font.promotion.halfdown: 0.5
+        font.promotion.twouphalfdown: 0.5
+        font.promotion.thirtypercent: 0.3
+        "*": 1
+    uploadvolumefactor:
+      case:
+        font.promotion.twoup: 2
+        font.promotion.twoupfree: 2
+        font.promotion.twouphalfdown: 2
+        "*": 1
+    description:
+      selector: td:nth-child(2) > font:last-child
+# NexusPHP Standard v1.5 Beta 4

src/Jackett.Common/Definitions/rudub.yml

@@ -9,11 +9,9 @@ type: semi-private
 encoding: windows-1251
 followredirect: true
 links:
-  - https://08july.rudub.online/
+  - https://10july.rudub.online/
 legacylinks:
   - https://rudub.online/
-  - https://09june.rudub.online/
-  - https://10june.rudub.online/
   - https://11june.rudub.online/
   - https://12june.rudub.online/
   - https://13june.rudub.online/
@@ -41,6 +39,8 @@ legacylinks:
   - https://05july.rudub.online/
   - https://06july.rudub.online/
   - https://07july.rudub.online/
+  - https://08july.rudub.online/
+  - https://09july.rudub.online/
 
 caps:
   categorymappings:

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

@@ -5,6 +5,8 @@ description: "TOrrent-tuRK (TORK) is a Turkish Private Torrent Tracker for HD MO
 language: tr-TR
 type: private
 encoding: UTF-8
+certificates:
+  - dcf240887b97fe098c5f2bf09167af6e2ca7b119 # Expired 10 July 2024
 links:
   - https://torrent-turk.de/
 legacylinks:

src/Jackett.Common/Definitions/yts.yml

@@ -10,9 +10,6 @@ links:
   # if the primary domain changes then don't forget to update the details, download and poster replace args
   - https://yts.mx/
 # official domain list are at https://yifystatus.com/ and  official proxies list are at https://ytsproxies.com/
-  - https://yts.lt/
-  - https://yts.am/
-  - https://yts.ag/
   - https://yts.unblockit.meme/
   - https://yts.unblockninja.com/
   - https://yts.ninjaproxy1.com/
@@ -38,6 +35,9 @@ legacylinks:
   - https://yts.unblockit.ong/
   - https://yts.abcproxy.org/
   - https://yts.unblockit.black/
+  - https://yts.lt/
+  - https://yts.am/
+  - https://yts.ag/
 
 caps:
   categorymappings:

src/Jackett.Common/Jackett.Common.csproj

@@ -28,7 +28,7 @@
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.3" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
     <PackageReference Include="YamlDotNet" Version="13.0.1" />
   </ItemGroup>
 

src/Jackett.Server/Jackett.Server.csproj

@@ -35,7 +35,7 @@
 
   <!-- Conditionally obtain references for the .NET 8.0 target -->
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.7" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
   </ItemGroup>

src/Jackett.Updater/Program.cs

@@ -688,6 +688,7 @@ namespace Jackett.Updater
                 "Definitions/trackeros.yml", // switch to *-API #12807
                 "Definitions/tspate.yml",
                 "Definitions/ttobogo.yml",
+                "Definitions/ttsweb.yml",
                 "Definitions/turknova.yml",
                 "Definitions/turkseed.yml",
                 "Definitions/turktracker.yml",