From 19c3e5253d6c72f4395f8605dfa96b2bf5f51509 Mon Sep 17 00:00:00 2001
From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com>
Date: Sat, 6 May 2023 06:49:45 +0100
Subject: [PATCH] assorted nexusphp: update and tidy (#14308)
---
src/Jackett.Common/Definitions/2xfree.yml | 3 +-
src/Jackett.Common/Definitions/3changtrai.yml | 2 +-
src/Jackett.Common/Definitions/52pt.yml | 22 ++++----
src/Jackett.Common/Definitions/audiences.yml | 8 +--
src/Jackett.Common/Definitions/beitai.yml | 2 +-
src/Jackett.Common/Definitions/btschool.yml | 2 +-
src/Jackett.Common/Definitions/byrbt.yml | 16 +++---
src/Jackett.Common/Definitions/carpt.yml | 2 +-
src/Jackett.Common/Definitions/ceskeforum.yml | 10 ++--
src/Jackett.Common/Definitions/chdbits.yml | 2 +-
src/Jackett.Common/Definitions/gainbound.yml | 2 +-
src/Jackett.Common/Definitions/haitang.yml | 15 +++---
src/Jackett.Common/Definitions/hd4fans.yml | 4 +-
src/Jackett.Common/Definitions/hdarea.yml | 6 +--
src/Jackett.Common/Definitions/hddolby.yml | 50 ++++++++++++++-----
src/Jackett.Common/Definitions/hdfans.yml | 14 +++---
src/Jackett.Common/Definitions/hdhome.yml | 2 +-
src/Jackett.Common/Definitions/hdmayi.yml | 2 +-
src/Jackett.Common/Definitions/hdsky.yml | 2 +-
src/Jackett.Common/Definitions/hdtime.yml | 3 +-
src/Jackett.Common/Definitions/hdu.yml | 32 +++++++++---
src/Jackett.Common/Definitions/hdvideo.yml | 1 -
src/Jackett.Common/Definitions/hdzone.yml | 2 +-
src/Jackett.Common/Definitions/joyhd.yml | 7 ++-
src/Jackett.Common/Definitions/kamept.yml | 3 +-
.../Definitions/keepfriends.yml | 2 +-
src/Jackett.Common/Definitions/lemonhd.yml | 2 +-
src/Jackett.Common/Definitions/mteamtp.yml | 2 +-
src/Jackett.Common/Definitions/mteamtp2fa.yml | 2 +-
src/Jackett.Common/Definitions/nethd.yml | 3 ++
src/Jackett.Common/Definitions/nicept.yml | 6 ++-
src/Jackett.Common/Definitions/opencd.yml | 14 +++---
src/Jackett.Common/Definitions/oshenpt.yml | 2 +-
src/Jackett.Common/Definitions/ourbits.yml | 22 +++++++-
src/Jackett.Common/Definitions/pignetwork.yml | 2 +-
src/Jackett.Common/Definitions/ptchina.yml | 3 +-
src/Jackett.Common/Definitions/pterclub.yml | 6 +--
src/Jackett.Common/Definitions/pthome.yml | 2 +-
src/Jackett.Common/Definitions/pttime.yml | 22 ++++++--
src/Jackett.Common/Definitions/putao.yml | 16 +++---
src/Jackett.Common/Definitions/spidertk.yml | 8 +--
.../Definitions/springsunday.yml | 2 +-
src/Jackett.Common/Definitions/tjupt.yml | 6 +--
src/Jackett.Common/Definitions/tlfbits.yml | 2 +-
src/Jackett.Common/Definitions/torrentccf.yml | 8 +--
src/Jackett.Common/Definitions/u2.yml | 2 +-
src/Jackett.Common/Definitions/ubits.yml | 1 -
src/Jackett.Common/Definitions/ultrahd.yml | 1 -
src/Jackett.Common/Definitions/uploads.yml | 1 -
src/Jackett.Common/Definitions/ydypt.yml | 6 +--
src/Jackett.Common/Definitions/zmpt.yml | 2 +-
51 files changed, 209 insertions(+), 150 deletions(-)
diff --git a/src/Jackett.Common/Definitions/2xfree.yml b/src/Jackett.Common/Definitions/2xfree.yml
index d4d67c74c..d31c369c7 100644
--- a/src/Jackett.Common/Definitions/2xfree.yml
+++ b/src/Jackett.Common/Definitions/2xfree.yml
@@ -103,7 +103,6 @@ login:
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"]
@@ -213,5 +212,5 @@ search:
text: 86400
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.8.0 2023-01-26
diff --git a/src/Jackett.Common/Definitions/3changtrai.yml b/src/Jackett.Common/Definitions/3changtrai.yml
index 088f51646..bd4ae1aae 100644
--- a/src/Jackett.Common/Definitions/3changtrai.yml
+++ b/src/Jackett.Common/Definitions/3changtrai.yml
@@ -178,5 +178,5 @@ search:
text: 259200
description:
selector: td:nth-child(3)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP 3ChangTrai v3.0 2020-04-30
diff --git a/src/Jackett.Common/Definitions/52pt.yml b/src/Jackett.Common/Definitions/52pt.yml
index 41a33ff6a..78b3617db 100644
--- a/src/Jackett.Common/Definitions/52pt.yml
+++ b/src/Jackett.Common/Definitions/52pt.yml
@@ -40,10 +40,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -96,6 +92,12 @@ search:
selector: table.torrents > tbody > tr:has(table.torrentname)
fields:
+ category:
+ selector: a[href^="?cat="]
+ attribute: href
+ filters:
+ - name: querystring
+ args: cat
title_default:
selector: a[href^="details.php?id="]
title:
@@ -103,12 +105,6 @@ search:
attribute: title
optional: true
default: "{{ .Result.title_default }}"
- category:
- selector: a[href^="?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
details:
selector: a[href^="details.php?id="]
attribute: href
@@ -158,12 +154,12 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 1
minimumseedtime:
# 1 day (as seconds = 24 x 60 x 60)
text: 86400
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/audiences.yml b/src/Jackett.Common/Definitions/audiences.yml
index 4fa48a9e9..a79e66ed3 100644
--- a/src/Jackett.Common/Definitions/audiences.yml
+++ b/src/Jackett.Common/Definitions/audiences.yml
@@ -41,10 +41,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile.
login:
method: cookie
diff --git a/src/Jackett.Common/Definitions/beitai.yml b/src/Jackett.Common/Definitions/beitai.yml
index f1fd926d9..2a813cc3f 100644
--- a/src/Jackett.Common/Definitions/beitai.yml
+++ b/src/Jackett.Common/Definitions/beitai.yml
@@ -163,5 +163,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/btschool.yml b/src/Jackett.Common/Definitions/btschool.yml
index c534350e8..ae56fcbce 100644
--- a/src/Jackett.Common/Definitions/btschool.yml
+++ b/src/Jackett.Common/Definitions/btschool.yml
@@ -150,5 +150,5 @@ search:
text: 1.0
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/byrbt.yml b/src/Jackett.Common/Definitions/byrbt.yml
index 24998178c..061bafc4b 100644
--- a/src/Jackett.Common/Definitions/byrbt.yml
+++ b/src/Jackett.Common/Definitions/byrbt.yml
@@ -38,10 +38,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -58,6 +54,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile.
login:
path: login.php
@@ -76,8 +76,6 @@ login:
trackerssl: yes
error:
- selector: td.embedded:has(h2:contains("失败"))
- - selector: td.embedded:has(h2:contains("failed!"))
- - selector: td.embedded:has(h2:contains("Failed"))
test:
path: index.php
selector: a[href^="logout.php?key="]
@@ -169,12 +167,12 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 1.0
minimumseedtime:
# 1 day (as seconds = 1 x 24 x 60 x 60)
text: 86400
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP v1.5 beta 5 20120707
diff --git a/src/Jackett.Common/Definitions/carpt.yml b/src/Jackett.Common/Definitions/carpt.yml
index 68140a28a..05695db47 100644
--- a/src/Jackett.Common/Definitions/carpt.yml
+++ b/src/Jackett.Common/Definitions/carpt.yml
@@ -188,5 +188,5 @@ search:
text: 86400
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.7.31 2022-11-14
diff --git a/src/Jackett.Common/Definitions/ceskeforum.yml b/src/Jackett.Common/Definitions/ceskeforum.yml
index 5dcb56497..102127699 100644
--- a/src/Jackett.Common/Definitions/ceskeforum.yml
+++ b/src/Jackett.Common/Definitions/ceskeforum.yml
@@ -41,10 +41,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -61,6 +57,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile.
login:
path: takelogin.php
@@ -170,7 +170,7 @@ search:
"*": 1
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
genre:
selector: table.torrentname > tbody > tr > td:first-child
remove: a
diff --git a/src/Jackett.Common/Definitions/chdbits.yml b/src/Jackett.Common/Definitions/chdbits.yml
index 9e799d18c..672ea181d 100644
--- a/src/Jackett.Common/Definitions/chdbits.yml
+++ b/src/Jackett.Common/Definitions/chdbits.yml
@@ -165,5 +165,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/gainbound.yml b/src/Jackett.Common/Definitions/gainbound.yml
index 989db3650..aed0ed725 100644
--- a/src/Jackett.Common/Definitions/gainbound.yml
+++ b/src/Jackett.Common/Definitions/gainbound.yml
@@ -150,5 +150,5 @@ search:
text: 1.0
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.8.0 2023-01-26
diff --git a/src/Jackett.Common/Definitions/haitang.yml b/src/Jackett.Common/Definitions/haitang.yml
index 9ee21a680..bfad85677 100644
--- a/src/Jackett.Common/Definitions/haitang.yml
+++ b/src/Jackett.Common/Definitions/haitang.yml
@@ -37,10 +37,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -57,6 +53,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile.
login:
path: takelogin.php
@@ -70,7 +70,6 @@ login:
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"]
@@ -162,12 +161,12 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 1
minimumseedtime:
# 1 day (as seconds = 24 x 60 x 60)
text: 86400
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP v1.1 2021-10-15
diff --git a/src/Jackett.Common/Definitions/hd4fans.yml b/src/Jackett.Common/Definitions/hd4fans.yml
index da033540c..667d0e57a 100644
--- a/src/Jackett.Common/Definitions/hd4fans.yml
+++ b/src/Jackett.Common/Definitions/hd4fans.yml
@@ -54,7 +54,7 @@ login:
ssl: yes
trackerssl: yes
error:
- - selector: td.embedded:has(h2:contains("失败")), td.embedded:has(h2:contains("failed"))
+ - selector: td.embedded:has(h2:contains("失败"))
message:
selector: td.text
test:
@@ -145,5 +145,5 @@ search:
"*": 1
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/hdarea.yml b/src/Jackett.Common/Definitions/hdarea.yml
index 511c34a9e..a574c85d1 100644
--- a/src/Jackett.Common/Definitions/hdarea.yml
+++ b/src/Jackett.Common/Definitions/hdarea.yml
@@ -47,10 +47,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -170,5 +166,5 @@ search:
text: 0.8
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/hddolby.yml b/src/Jackett.Common/Definitions/hddolby.yml
index 536141bbc..2ce1c30c0 100644
--- a/src/Jackett.Common/Definitions/hddolby.yml
+++ b/src/Jackett.Common/Definitions/hddolby.yml
@@ -24,10 +24,9 @@ caps:
modes:
search: [q]
- tv-search: [q, season, ep, imdbid]
- movie-search: [q, imdbid]
+ tv-search: [q, season, ep, imdbid, doubanid]
+ movie-search: [q, imdbid, doubanid]
music-search: [q]
- book-search: [q]
settings:
- name: username
@@ -47,6 +46,22 @@ settings:
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: flaresolverr
type: info
label: FlareSolverr
@@ -85,21 +100,29 @@ search:
- path: torrents.php
inputs:
$raw: "{{ range .Categories }}cat{{.}}=1&{{end}}"
- search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+ search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}"
# 0=incldead, 1=active, 2=dead
incldead: 0
# 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
- search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
+ 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(table.torrentname)
fields:
+ category:
+ selector: a[href^="?cat="]
+ attribute: href
+ filters:
+ - name: querystring
+ args: cat
title_default:
selector: a[href^="details.php?id="]
title:
@@ -107,18 +130,18 @@ search:
attribute: title
optional: true
default: "{{ .Result.title_default }}"
- category:
- selector: a[href^="?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
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.rowfollow:nth-child(4) > span[title]
@@ -166,5 +189,8 @@ search:
text: 1.2
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
+ filters:
+ - name: replace
+ args: [" 剩余时间:", ""]
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/hdfans.yml b/src/Jackett.Common/Definitions/hdfans.yml
index fa25552a3..dbe275d10 100644
--- a/src/Jackett.Common/Definitions/hdfans.yml
+++ b/src/Jackett.Common/Definitions/hdfans.yml
@@ -52,10 +52,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -72,6 +68,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile.
login:
path: login.php
@@ -188,9 +188,9 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 0.81
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP v1.8.0 2023-01-20
diff --git a/src/Jackett.Common/Definitions/hdhome.yml b/src/Jackett.Common/Definitions/hdhome.yml
index 5dd5596c9..1187d1caa 100644
--- a/src/Jackett.Common/Definitions/hdhome.yml
+++ b/src/Jackett.Common/Definitions/hdhome.yml
@@ -170,5 +170,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v2.0 2014-11-24
diff --git a/src/Jackett.Common/Definitions/hdmayi.yml b/src/Jackett.Common/Definitions/hdmayi.yml
index 1c769fd40..4f864a339 100644
--- a/src/Jackett.Common/Definitions/hdmayi.yml
+++ b/src/Jackett.Common/Definitions/hdmayi.yml
@@ -169,5 +169,5 @@ search:
text: 86400
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.7.29 2022-10-12
diff --git a/src/Jackett.Common/Definitions/hdsky.yml b/src/Jackett.Common/Definitions/hdsky.yml
index 80e27d14a..902f4c1be 100644
--- a/src/Jackett.Common/Definitions/hdsky.yml
+++ b/src/Jackett.Common/Definitions/hdsky.yml
@@ -144,5 +144,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 5
diff --git a/src/Jackett.Common/Definitions/hdtime.yml b/src/Jackett.Common/Definitions/hdtime.yml
index 765751d1c..a2898d3bf 100644
--- a/src/Jackett.Common/Definitions/hdtime.yml
+++ b/src/Jackett.Common/Definitions/hdtime.yml
@@ -84,7 +84,6 @@ login:
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"]
@@ -188,5 +187,5 @@ search:
text: 0.81
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.7.33 2023-01-04
diff --git a/src/Jackett.Common/Definitions/hdu.yml b/src/Jackett.Common/Definitions/hdu.yml
index da6172dce..43ea1b5b8 100644
--- a/src/Jackett.Common/Definitions/hdu.yml
+++ b/src/Jackett.Common/Definitions/hdu.yml
@@ -40,6 +40,22 @@ settings:
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
@@ -78,12 +94,20 @@ search:
search_area: "{{ if .Query.IMDBID }}4{{ 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(table.torrentname)
fields:
+ category:
+ selector: a[href^="?cat="]
+ attribute: href
+ filters:
+ - name: querystring
+ args: cat
title_default:
selector: a[href^="details.php?id="]
title:
@@ -91,12 +115,6 @@ search:
attribute: title
optional: true
default: "{{ .Result.title_default }}"
- category:
- selector: a[href^="?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
details:
selector: a[href^="details.php?id="]
attribute: href
@@ -153,5 +171,5 @@ search:
text: 259200
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/hdvideo.yml b/src/Jackett.Common/Definitions/hdvideo.yml
index ed472298c..230c1301d 100644
--- a/src/Jackett.Common/Definitions/hdvideo.yml
+++ b/src/Jackett.Common/Definitions/hdvideo.yml
@@ -83,7 +83,6 @@ login:
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"]
diff --git a/src/Jackett.Common/Definitions/hdzone.yml b/src/Jackett.Common/Definitions/hdzone.yml
index 1dac978e1..f9e5f6afc 100644
--- a/src/Jackett.Common/Definitions/hdzone.yml
+++ b/src/Jackett.Common/Definitions/hdzone.yml
@@ -204,5 +204,5 @@ search:
# text: 1209600
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/joyhd.yml b/src/Jackett.Common/Definitions/joyhd.yml
index ccf039325..d59317cf0 100644
--- a/src/Jackett.Common/Definitions/joyhd.yml
+++ b/src/Jackett.Common/Definitions/joyhd.yml
@@ -71,7 +71,6 @@ login:
dutime: month
error:
- selector: td.embedded:has(h2:contains("失败"))
- - selector: td.embedded:has(h2:contains("Failed"))
test:
path: index.php
selector: a[href="logout.php"]
@@ -167,9 +166,9 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 0.81
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP Standard v0.3 2013-10-01
diff --git a/src/Jackett.Common/Definitions/kamept.yml b/src/Jackett.Common/Definitions/kamept.yml
index 1baf421eb..64e2a4cdd 100644
--- a/src/Jackett.Common/Definitions/kamept.yml
+++ b/src/Jackett.Common/Definitions/kamept.yml
@@ -83,7 +83,6 @@ login:
trackerssl: yes
error:
- selector: td.embedded:has(h2:contains("失败"))
- - selector: td.embedded:has(h2:contains("failed"))
test:
path: index.php
selector: a[href*="usercp.php"]
@@ -179,5 +178,5 @@ search:
text: 0.9
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img, font, span
+ remove: a, b, font, img, span
# NexusPHP v1.7.26 2022-09-15
diff --git a/src/Jackett.Common/Definitions/keepfriends.yml b/src/Jackett.Common/Definitions/keepfriends.yml
index 48552b603..13f714e4b 100644
--- a/src/Jackett.Common/Definitions/keepfriends.yml
+++ b/src/Jackett.Common/Definitions/keepfriends.yml
@@ -180,7 +180,7 @@ search:
"*": 1
description:
selector: "{{ if .Result._staff_edit }}td:nth-child(3){{ else }}td:nth-child(2){{ end }}"
- remove: a, img
+ remove: a, b, font, img, span
title_english:
selector: table.torrentname > tbody > tr > td.embedded
title:
diff --git a/src/Jackett.Common/Definitions/lemonhd.yml b/src/Jackett.Common/Definitions/lemonhd.yml
index 394e7a062..5a8fb1eba 100644
--- a/src/Jackett.Common/Definitions/lemonhd.yml
+++ b/src/Jackett.Common/Definitions/lemonhd.yml
@@ -154,5 +154,5 @@ search:
"*": 1
description:
selector: a[href^="details_"]
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4 (customised)
diff --git a/src/Jackett.Common/Definitions/mteamtp.yml b/src/Jackett.Common/Definitions/mteamtp.yml
index a60e9242c..06962ad3f 100644
--- a/src/Jackett.Common/Definitions/mteamtp.yml
+++ b/src/Jackett.Common/Definitions/mteamtp.yml
@@ -219,5 +219,5 @@ search:
text: 172800
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/mteamtp2fa.yml b/src/Jackett.Common/Definitions/mteamtp2fa.yml
index d414dead3..202be915d 100644
--- a/src/Jackett.Common/Definitions/mteamtp2fa.yml
+++ b/src/Jackett.Common/Definitions/mteamtp2fa.yml
@@ -222,5 +222,5 @@ search:
text: 172800
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/nethd.yml b/src/Jackett.Common/Definitions/nethd.yml
index 902e979c7..c4e8caf6f 100644
--- a/src/Jackett.Common/Definitions/nethd.yml
+++ b/src/Jackett.Common/Definitions/nethd.yml
@@ -165,4 +165,7 @@ search:
"*": 1
minimumratio:
text: 0.5
+ description:
+ selector: td:nth-child(3) > div:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP 1.0
diff --git a/src/Jackett.Common/Definitions/nicept.yml b/src/Jackett.Common/Definitions/nicept.yml
index f1015f984..807411df2 100644
--- a/src/Jackett.Common/Definitions/nicept.yml
+++ b/src/Jackett.Common/Definitions/nicept.yml
@@ -76,7 +76,6 @@ login:
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"]
@@ -175,5 +174,8 @@ search:
text: 259200
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
+ filters:
+ - name: replace
+ args: [" 剩余时间:", ""]
# NexusPHP v1.7.29 2022-10-13
diff --git a/src/Jackett.Common/Definitions/opencd.yml b/src/Jackett.Common/Definitions/opencd.yml
index 5aafc0c22..8f88b350a 100644
--- a/src/Jackett.Common/Definitions/opencd.yml
+++ b/src/Jackett.Common/Definitions/opencd.yml
@@ -44,10 +44,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile. Default is 50.
- name: sort
type: select
label: Sort requested from site
@@ -64,6 +60,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile. Default is 50.
login:
method: cookie
@@ -183,12 +183,12 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:nth-child(3)
- remove: a, img
minimumratio:
text: 1.0
minimumseedtime:
# 36 hours (as seconds = 36 x 60 x 60)
text: 129600
+ description:
+ selector: td:nth-child(3)
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4 (customised)
diff --git a/src/Jackett.Common/Definitions/oshenpt.yml b/src/Jackett.Common/Definitions/oshenpt.yml
index 2228e037e..e974d40cd 100644
--- a/src/Jackett.Common/Definitions/oshenpt.yml
+++ b/src/Jackett.Common/Definitions/oshenpt.yml
@@ -187,5 +187,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.8.0 2023-01-11
diff --git a/src/Jackett.Common/Definitions/ourbits.yml b/src/Jackett.Common/Definitions/ourbits.yml
index c99b2b681..80c84d12c 100644
--- a/src/Jackett.Common/Definitions/ourbits.yml
+++ b/src/Jackett.Common/Definitions/ourbits.yml
@@ -40,6 +40,22 @@ settings:
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
@@ -67,6 +83,8 @@ search:
search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}"
# 0=AND, 1=OR, 2=Exact
search_mode: 0
+ sort: "{{ .Config.sort }}"
+ type: "{{ .Config.type }}"
notnewword: 1
rows:
@@ -150,8 +168,8 @@ search:
text: 172800
description:
selector: td.rowfollow:nth-child(2) > table > tbody > tr > td
- remove: a, img, b, span
+ remove: a, b, font, img, span
filters:
- name: replace
- args: ["will end in", ""]
+ args: [" 剩余时间:", ""]
# Ourbits 1.1.0 (Based on NexusPHP Standard v1.5 Beta 4) 4691022 2023-05-04
diff --git a/src/Jackett.Common/Definitions/pignetwork.yml b/src/Jackett.Common/Definitions/pignetwork.yml
index 461f39336..56c469328 100644
--- a/src/Jackett.Common/Definitions/pignetwork.yml
+++ b/src/Jackett.Common/Definitions/pignetwork.yml
@@ -177,5 +177,5 @@ search:
text: 259200
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.8.0 2023-01-16
diff --git a/src/Jackett.Common/Definitions/ptchina.yml b/src/Jackett.Common/Definitions/ptchina.yml
index a24ca30e7..275477efe 100644
--- a/src/Jackett.Common/Definitions/ptchina.yml
+++ b/src/Jackett.Common/Definitions/ptchina.yml
@@ -77,7 +77,6 @@ login:
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"]
@@ -185,5 +184,5 @@ search:
text: 86400
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.8.2 2023-04-29
diff --git a/src/Jackett.Common/Definitions/pterclub.yml b/src/Jackett.Common/Definitions/pterclub.yml
index 790734789..89feae2e2 100644
--- a/src/Jackett.Common/Definitions/pterclub.yml
+++ b/src/Jackett.Common/Definitions/pterclub.yml
@@ -170,9 +170,9 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
- description:
- selector: td:has(table.torrentname)
- remove: a, b, font, img
minimumratio:
text: 0.9
+ description:
+ selector: td:has(table.torrentname)
+ remove: a, img
# NexusPHP custom v2019.12
diff --git a/src/Jackett.Common/Definitions/pthome.yml b/src/Jackett.Common/Definitions/pthome.yml
index fd848ff4d..544588124 100644
--- a/src/Jackett.Common/Definitions/pthome.yml
+++ b/src/Jackett.Common/Definitions/pthome.yml
@@ -139,5 +139,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v3.1 2021-07-05
diff --git a/src/Jackett.Common/Definitions/pttime.yml b/src/Jackett.Common/Definitions/pttime.yml
index 84e94d594..d96b4a0d0 100644
--- a/src/Jackett.Common/Definitions/pttime.yml
+++ b/src/Jackett.Common/Definitions/pttime.yml
@@ -56,6 +56,22 @@ settings:
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
@@ -72,7 +88,6 @@ login:
ssl: yes
error:
- selector: td.embedded:has(h2:contains("失败"))
- - selector: td.embedded:has(h2:contains("Failed"))
test:
path: index.php
selector: a[href="logout.php"]
@@ -95,6 +110,8 @@ search:
search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}5{{ 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:
@@ -173,6 +190,5 @@ search:
font.promotion.twouphalfdown: 2
"*": 1
description:
- selector: td:nth-child(2)
- remove: a, img
+ selector: td:nth-child(2) > font:last-child
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/putao.yml b/src/Jackett.Common/Definitions/putao.yml
index f9641c59a..f72ae5e3e 100644
--- a/src/Jackett.Common/Definitions/putao.yml
+++ b/src/Jackett.Common/Definitions/putao.yml
@@ -59,10 +59,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the 每页种子数:每页显示(Torrents per page:) setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -79,6 +75,10 @@ settings:
options:
desc: desc
asc: asc
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the 每页种子数:每页显示(Torrents per page:) setting to 100 on your account profile.
login:
path: login.php
@@ -118,7 +118,7 @@ search:
sort: "{{ .Config.sort }}"
type: "{{ .Config.type }}"
notnewword: 1
- # does not return imdb or dubanid in results
+ # does not return imdb or doubanid in results
rows:
selector: table.torrents > tbody > tr:has(table.torrentname)
@@ -196,9 +196,9 @@ search:
img.pro_2up: 2
img.pro_free2up: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 0.7
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP Standard v1.0 Beta 2
diff --git a/src/Jackett.Common/Definitions/spidertk.yml b/src/Jackett.Common/Definitions/spidertk.yml
index 611497a87..de88bc166 100644
--- a/src/Jackett.Common/Definitions/spidertk.yml
+++ b/src/Jackett.Common/Definitions/spidertk.yml
@@ -94,10 +94,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -133,6 +129,10 @@ settings:
type: checkbox
label: Replace VOSTFR and SUBFRENCH with ENGLISH
default: false
+ - name: info_tpp
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile.
login:
path: login.php
diff --git a/src/Jackett.Common/Definitions/springsunday.yml b/src/Jackett.Common/Definitions/springsunday.yml
index 992092365..33ac35360 100644
--- a/src/Jackett.Common/Definitions/springsunday.yml
+++ b/src/Jackett.Common/Definitions/springsunday.yml
@@ -164,5 +164,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4 2010-09-19 (customised)
diff --git a/src/Jackett.Common/Definitions/tjupt.yml b/src/Jackett.Common/Definitions/tjupt.yml
index 0379bf9fc..ecb4b7594 100644
--- a/src/Jackett.Common/Definitions/tjupt.yml
+++ b/src/Jackett.Common/Definitions/tjupt.yml
@@ -164,9 +164,9 @@ search:
font.twoupfree: 2
font.twoup: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 0.8
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4 (custom ulvf dlvf)
diff --git a/src/Jackett.Common/Definitions/tlfbits.yml b/src/Jackett.Common/Definitions/tlfbits.yml
index 1f362a9e7..a0cc61e18 100644
--- a/src/Jackett.Common/Definitions/tlfbits.yml
+++ b/src/Jackett.Common/Definitions/tlfbits.yml
@@ -171,5 +171,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/torrentccf.yml b/src/Jackett.Common/Definitions/torrentccf.yml
index 4de5548a7..056e6b419 100644
--- a/src/Jackett.Common/Definitions/torrentccf.yml
+++ b/src/Jackett.Common/Definitions/torrentccf.yml
@@ -46,10 +46,6 @@ settings:
type: checkbox
label: Search freeleech only
default: false
- - name: info_tpp
- type: info
- label: Results Per Page
- default: For best results, change the Torrents per page: setting to 100 on your account profile.
- name: sort
type: select
label: Sort requested from site
@@ -165,9 +161,9 @@ search:
img.pro_free2up: 2
img.pro_2up: 2
"*": 1
+ minimumratio:
+ text: 0.8
description:
selector: td:nth-child(2)
remove: a, img
- minimumratio:
- text: 0.8
# NexusPHP Standard v1.5 Beta 3
diff --git a/src/Jackett.Common/Definitions/u2.yml b/src/Jackett.Common/Definitions/u2.yml
index 359056d21..c476b7e2a 100644
--- a/src/Jackett.Common/Definitions/u2.yml
+++ b/src/Jackett.Common/Definitions/u2.yml
@@ -174,5 +174,5 @@ search:
"*": 1
description:
selector: td:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP U2-Revision Standard v1.5 Beta 4
diff --git a/src/Jackett.Common/Definitions/ubits.yml b/src/Jackett.Common/Definitions/ubits.yml
index 7936c7a8e..f5a6873ec 100644
--- a/src/Jackett.Common/Definitions/ubits.yml
+++ b/src/Jackett.Common/Definitions/ubits.yml
@@ -80,7 +80,6 @@ login:
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"]
diff --git a/src/Jackett.Common/Definitions/ultrahd.yml b/src/Jackett.Common/Definitions/ultrahd.yml
index a55f72a4f..ab312cc39 100644
--- a/src/Jackett.Common/Definitions/ultrahd.yml
+++ b/src/Jackett.Common/Definitions/ultrahd.yml
@@ -78,7 +78,6 @@ login:
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"]
diff --git a/src/Jackett.Common/Definitions/uploads.yml b/src/Jackett.Common/Definitions/uploads.yml
index 6933154e9..103569b3e 100644
--- a/src/Jackett.Common/Definitions/uploads.yml
+++ b/src/Jackett.Common/Definitions/uploads.yml
@@ -80,7 +80,6 @@ login:
trackerssl: ""
error:
- selector: td.embedded:has(h2:contains("失败"))
- - selector: td.embedded:has(h2:contains("failed"))
test:
path: index.php
selector: a[href="logout.php"]
diff --git a/src/Jackett.Common/Definitions/ydypt.yml b/src/Jackett.Common/Definitions/ydypt.yml
index ddede6348..e96bfeee0 100644
--- a/src/Jackett.Common/Definitions/ydypt.yml
+++ b/src/Jackett.Common/Definitions/ydypt.yml
@@ -165,9 +165,9 @@ search:
font.twoupfree: 2
font.twoup: 2
"*": 1
- description:
- selector: td:nth-child(2)
- remove: a, img
minimumratio:
text: 0.8
+ description:
+ selector: td:nth-child(2)
+ remove: a, b, font, img, span
# NexusPHP Standard v1.5 Beta 4 (custom ulvf dlvf)
diff --git a/src/Jackett.Common/Definitions/zmpt.yml b/src/Jackett.Common/Definitions/zmpt.yml
index 467140700..bd02a5939 100644
--- a/src/Jackett.Common/Definitions/zmpt.yml
+++ b/src/Jackett.Common/Definitions/zmpt.yml
@@ -185,5 +185,5 @@ search:
text: 86400
description:
selector: td.rowfollow:nth-child(2)
- remove: a, img
+ remove: a, b, font, img, span
# NexusPHP v1.8.1 2023-04-21