From f400377de68b13d3a4baf2160713ef574756dba4 Mon Sep 17 00:00:00 2001 From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> Date: Fri, 5 May 2023 19:43:52 +0100 Subject: [PATCH] assorted nexusphp: update versions (#14307) --- src/Jackett.Common/Definitions/1ptbar.yml | 67 ++++++++++++++------ src/Jackett.Common/Definitions/hdatmos.yml | 28 ++++---- src/Jackett.Common/Definitions/hhanclub.yml | 8 +-- src/Jackett.Common/Definitions/icc2022.yml | 17 +---- src/Jackett.Common/Definitions/soulvoice.yml | 63 ++++++++++++------ 5 files changed, 110 insertions(+), 73 deletions(-) diff --git a/src/Jackett.Common/Definitions/1ptbar.yml b/src/Jackett.Common/Definitions/1ptbar.yml index e1ca53415..3644bc124 100644 --- a/src/Jackett.Common/Definitions/1ptbar.yml +++ b/src/Jackett.Common/Definitions/1ptbar.yml @@ -1,7 +1,7 @@ --- id: 1ptbar name: 1ptbar -description: "1ptbar is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning" +description: "1ptbar is a CHINESE Private Torrent Tracker for MOVIES / TV / E-LEARNING" language: zh-CN type: private encoding: UTF-8 @@ -25,26 +25,28 @@ caps: modes: search: [q] - tv-search: [q, season, ep, imdbid] - movie-search: [q, imdbid] + tv-search: [q, season, ep, imdbid, doubanid] + movie-search: [q, imdbid, doubanid] music-search: [q] settings: - - name: cookie + - name: username type: text - label: Cookie - - name: info + label: Username + - name: password + type: password + label: Password + - name: 2facode + type: text + label: 2FA code + - name: info_2fa type: info - label: How to get the Cookie - default: "
  1. Login to this tracker with your browser
  2. Open the DevTools panel by pressing F12
  3. Select the Network tab
  4. Click on the Doc button (Chrome Browser) or HTML button (FireFox)
  5. Refresh the page by pressing F5
  6. Click on the first row entry
  7. Select the Headers tab on the Right panel
  8. Find 'cookie:' in the Request Headers section
  9. Select and Copy the whole cookie string (everything after 'cookie: ') and Paste here.
" + label: "About 2FA code" + default: "Only fill in the 2FA code box if you have enabled 2FA on the 1ptbar Web Site. Otherwise just leave it empty." - name: freeleech type: checkbox label: Search freeleech only default: false - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 on your account profile. - name: sort type: select label: Sort requested from site @@ -61,27 +63,47 @@ 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 + path: login.php + method: form + form: form[action="takelogin.php"] + captcha: + type: image + selector: img[alt="CAPTCHA"] + input: imagestring inputs: - cookie: "{{ .Config.cookie }}" + secret: "" + username: "{{ .Config.username }}" + password: "{{ .Config.password }}" + two_step_code: "{{ .Config.2facode }}" + logout: "" + securelogin: "" + ssl: yes + trackerssl: yes + error: + - selector: td.embedded:has(h2:contains("失败")) test: - path: torrents.php + path: index.php + selector: a[href="logout.php"] search: paths: - path: torrents.php inputs: $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}" # 0 incldead, 1 active, 2 dead incldead: 0 # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30% spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}" # 0 title, 1 descr, 3 uploader, 4 imdburl - search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}" - # 0 AND, 1 OR, 2 exact + search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}" + # 0 AND, 2 exact search_mode: 0 sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" @@ -114,8 +136,13 @@ search: selector: img[data-src] attribute: data-src imdbid: + # site currently only has a badge and rating, the id is not present. just in case a future update. selector: a[href*="imdb.com/title/tt"] attribute: href + doubanid: + # site currently only has a badge and rating, the id is not present. just in case a future update. + selector: a[href*="movie.douban.com/subject/"] + attribute: href date_elapsed: # time type: time elapsed (default) selector: td.rowfollow:nth-last-of-type(6) > span[title] @@ -161,5 +188,5 @@ search: "*": 1 description: selector: td:nth-child(2) - remove: a, img -# NexusPHP v1.7.32 2022-12-05 + remove: a, b, font, img, span +# NexusPHP v1.8.0 2023-04-09 diff --git a/src/Jackett.Common/Definitions/hdatmos.yml b/src/Jackett.Common/Definitions/hdatmos.yml index a27882d26..e35720889 100644 --- a/src/Jackett.Common/Definitions/hdatmos.yml +++ b/src/Jackett.Common/Definitions/hdatmos.yml @@ -20,10 +20,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 @@ -43,10 +42,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 @@ -63,6 +58,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 @@ -94,14 +93,14 @@ 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 # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30% spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}" # 0 title, 1 descr, 3 uploader, 4 imdburl - search_area: "{{ if .Query.IMDBID }}4{{ else }}0{{ end }}" - # 0 AND, 1 OR, 2 exact + search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}" + # 0 AND, 2 exact search_mode: 0 sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" @@ -130,9 +129,6 @@ search: download: selector: a[href^="download.php?id="] attribute: href - imdbid: - selector: a[href*="imdb.com/title/tt"] - attribute: href date_elapsed: # time type: time elapsed (default) selector: td:nth-child(4) > span[title] @@ -178,7 +174,5 @@ search: "*": 1 description: selector: td:nth-child(2) - remove: a, img - minimumratio: - text: 0.81 -# NexusPHP 1.7.31 2022-11-14 + remove: a, b, font, img, span +# NexusPHP v1.8.0 2023-04-16 diff --git a/src/Jackett.Common/Definitions/hhanclub.yml b/src/Jackett.Common/Definitions/hhanclub.yml index 80f20807e..96beb50f4 100644 --- a/src/Jackett.Common/Definitions/hhanclub.yml +++ b/src/Jackett.Common/Definitions/hhanclub.yml @@ -76,8 +76,8 @@ search: 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 (not working) - search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ 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 }}" @@ -168,5 +168,5 @@ search: text: 86400 description: selector: td.rowfollow:nth-child(2) - remove: a, img -# NexusPHP v1.7.30 2022-11-05 + remove: a, b, font, img, span +# NexusPHP v1.7.34 2023-01-16 diff --git a/src/Jackett.Common/Definitions/icc2022.yml b/src/Jackett.Common/Definitions/icc2022.yml index 7b5009973..b0da8a76c 100644 --- a/src/Jackett.Common/Definitions/icc2022.yml +++ b/src/Jackett.Common/Definitions/icc2022.yml @@ -89,7 +89,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"] @@ -109,7 +108,7 @@ search: 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 + # 0 AND, 2 exact search_mode: 0 sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" @@ -141,14 +140,6 @@ search: 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] @@ -192,12 +183,10 @@ search: 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 + remove: a, b, font, img, span +# NexusPHP v1.8.1 2023-04-21 diff --git a/src/Jackett.Common/Definitions/soulvoice.yml b/src/Jackett.Common/Definitions/soulvoice.yml index 41e5a38fb..b78a42474 100644 --- a/src/Jackett.Common/Definitions/soulvoice.yml +++ b/src/Jackett.Common/Definitions/soulvoice.yml @@ -1,7 +1,7 @@ --- id: soulvoice name: SoulVoice -description: "SoulVoice is a CHINESE Private Torrent Tracker for Movies, TV, and e-Learning" +description: "SoulVoice is a CHINESE Private Torrent Tracker for MOVIES / TV / GENERAL" language: zh-CN type: private encoding: UTF-8 @@ -27,21 +27,23 @@ caps: music-search: [q] settings: - - name: cookie + - name: username type: text - label: Cookie - - name: info + label: Username + - name: password + type: password + label: Password + - name: 2facode + type: text + label: 2FA code + - name: info_2fa type: info - label: How to get the Cookie - default: "
  1. Login to this tracker with your browser
  2. Open the DevTools panel by pressing F12
  3. Select the Network tab
  4. Click on the Doc button (Chrome Browser) or HTML button (FireFox)
  5. Refresh the page by pressing F5
  6. Click on the first row entry
  7. Select the Headers tab on the Right panel
  8. Find 'cookie:' in the Request Headers section
  9. Select and Copy the whole cookie string (everything after 'cookie: ') and Paste here.
" + label: "About 2FA code" + default: "Only fill in the 2FA code box if you have enabled 2FA on the SoulVoice Web Site. Otherwise just leave it empty." - name: freeleech type: checkbox label: Search freeleech only default: false - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 on your account profile. - name: sort type: select label: Sort requested from site @@ -58,13 +60,33 @@ 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 + path: login.php + method: form + form: form[action="takelogin.php"] + captcha: + type: image + selector: img[alt="CAPTCHA"] + input: imagestring inputs: - cookie: "{{ .Config.cookie }}" + secret: "" + username: "{{ .Config.username }}" + password: "{{ .Config.password }}" + two_step_code: "{{ .Config.2facode }}" + logout: "" + securelogin: "" + ssl: yes + trackerssl: yes + error: + - selector: td.embedded:has(h2:contains("失败")) test: - path: torrents.php + path: index.php + selector: a[href="logout.php"] search: paths: @@ -108,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"] @@ -116,9 +141,6 @@ search: # 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 - poster: - selector: img[data-src] - attribute: data-src date_elapsed: # time type: time elapsed (default) selector: td.rowfollow:nth-last-of-type(6) > span[title] @@ -162,7 +184,12 @@ search: img.pro_free2up: 2 img.pro_2up: 2 "*": 1 + minimumratio: + text: 2.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, span -# NexusPHP v1.7.34 2023-02-10 + remove: a, b, font, img, span +# NexusPHP v1.8.0 2023-02-21