From 003c574372f16ae3ef7a141d3e4c6653cdcb7153 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 2 Apr 2024 12:32:34 +0300 Subject: [PATCH] jackett indexers as of afc7c329ae22ee70eec1c5a54c1b0daf5fd667d0 --- definitions/v7/1ptbar.yml | 2 +- definitions/v7/3changtrai.yml | 4 ++ definitions/v7/carpt.yml | 2 +- definitions/v7/cinematik.yml | 2 +- definitions/v7/discfan.yml | 2 +- definitions/v7/hd4fans.yml | 82 +++++++++++++++++------ definitions/v7/hdtime.yml | 2 +- definitions/v7/icc2022.yml | 2 +- definitions/v7/nicept.yml | 2 +- definitions/v7/oshenpt.yml | 2 +- definitions/v9/1ptbar.yml | 2 +- definitions/v9/3changtrai.yml | 4 ++ definitions/v9/carpt.yml | 2 +- definitions/v9/cinematik.yml | 2 +- definitions/v9/discfan.yml | 2 +- definitions/v9/fearnopeer.yml | 2 +- definitions/v9/freefarm.yml | 6 +- definitions/v9/hd4fans.yml | 82 +++++++++++++++++------ definitions/v9/hdtime.yml | 2 +- definitions/v9/icc2022.yml | 2 +- definitions/v9/kufei.yml | 2 +- definitions/v9/lastdigitalunderground.yml | 2 +- definitions/v9/nicept.yml | 2 +- definitions/v9/okpt.yml | 2 +- definitions/v9/onlyencodes-api.yml | 2 +- definitions/v9/oshenpt.yml | 2 +- definitions/v9/ultrahd.yml | 2 +- 27 files changed, 157 insertions(+), 65 deletions(-) diff --git a/definitions/v7/1ptbar.yml b/definitions/v7/1ptbar.yml index 43af7e1b6..3f4a540ef 100644 --- a/definitions/v7/1ptbar.yml +++ b/definitions/v7/1ptbar.yml @@ -194,4 +194,4 @@ search: description: selector: td:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.9 2023-11-15 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v7/3changtrai.yml b/definitions/v7/3changtrai.yml index d6fba1ca5..62ff563b5 100644 --- a/definitions/v7/3changtrai.yml +++ b/definitions/v7/3changtrai.yml @@ -56,6 +56,10 @@ settings: options: desc: desc asc: asc + - name: flaresolverr + type: info + label: FlareSolverr + default: This site may use Cloudflare DDoS Protection, therefore Jackett requires FlareSolverr to access it. - name: info_tpp type: info label: Results Per Page diff --git a/definitions/v7/carpt.yml b/definitions/v7/carpt.yml index 55f64903c..506d38119 100644 --- a/definitions/v7/carpt.yml +++ b/definitions/v7/carpt.yml @@ -194,4 +194,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.8 2023-09-25 +# NexusPHP vv1.8.11 2024-03-11 diff --git a/definitions/v7/cinematik.yml b/definitions/v7/cinematik.yml index dbdb6d608..2c79b68bc 100644 --- a/definitions/v7/cinematik.yml +++ b/definitions/v7/cinematik.yml @@ -175,4 +175,4 @@ search: optional: true title: text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" -# json UNIT3D 8.x.x (custom) +# json UNIT3D 8.0.1 diff --git a/definitions/v7/discfan.yml b/definitions/v7/discfan.yml index 80a4b3407..4a24703fa 100644 --- a/definitions/v7/discfan.yml +++ b/definitions/v7/discfan.yml @@ -185,4 +185,4 @@ search: args: "cat={{ .Result.category_title }} - " minimumratio: text: 0.9 -# NexusPHP v1.8.8 2023-09-25 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v7/hd4fans.yml b/definitions/v7/hd4fans.yml index 4c5f7b264..7793e5759 100644 --- a/definitions/v7/hd4fans.yml +++ b/definitions/v7/hd4fans.yml @@ -22,8 +22,8 @@ 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: @@ -33,30 +33,57 @@ 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 2FA code box if you have enabled 2FA on the Free Farm 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 Torrents per page: setting to 100 on your account profile. login: - path: takelogin.php - method: post - cookies: ["c_lang_folder=en"] + 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("失败")) - message: - selector: td.text test: path: index.php selector: a[href="logout.php"] @@ -66,21 +93,29 @@ search: - 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 + 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% + # 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 }}" - # 0=AND, 1=OR, 2=Exact + # 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, 2 exact search_mode: 0 + sort: "{{ .Config.sort }}" + type: "{{ .Config.type }}" notnewword: 1 rows: - selector: table.torrents > tbody > tr:has(table.torrentname) + 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_default: selector: a[href^="details.php?id="] title_optional: @@ -89,18 +124,23 @@ search: attribute: title title: text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" - category: - selector: a[href^="?cat="] - attribute: href - filters: - - name: querystring - args: cat 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] @@ -147,4 +187,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP Standard v1.5 Beta 4 +# NexusPHP v1.8.8 2023-09-25 diff --git a/definitions/v7/hdtime.yml b/definitions/v7/hdtime.yml index 2a1ef7923..7caa954b7 100644 --- a/definitions/v7/hdtime.yml +++ b/definitions/v7/hdtime.yml @@ -193,4 +193,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.5 2023-07-15 +# NexusPHP vv1.8.7 2023-08-22 diff --git a/definitions/v7/icc2022.yml b/definitions/v7/icc2022.yml index 3f83d5b5c..671bd2040 100644 --- a/definitions/v7/icc2022.yml +++ b/definitions/v7/icc2022.yml @@ -194,4 +194,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.6 2023-08-18 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v7/nicept.yml b/definitions/v7/nicept.yml index 15f4c45f9..a4b650f41 100644 --- a/definitions/v7/nicept.yml +++ b/definitions/v7/nicept.yml @@ -188,4 +188,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.4 2023-06-18 +# NexusPHP v1.8.8 2023-09-25 diff --git a/definitions/v7/oshenpt.yml b/definitions/v7/oshenpt.yml index 4d483a20a..4f2dd5d77 100644 --- a/definitions/v7/oshenpt.yml +++ b/definitions/v7/oshenpt.yml @@ -193,4 +193,4 @@ search: description: selector: td:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.9 2023-11-15 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/1ptbar.yml b/definitions/v9/1ptbar.yml index 7c40afc07..e200cd3f4 100644 --- a/definitions/v9/1ptbar.yml +++ b/definitions/v9/1ptbar.yml @@ -193,4 +193,4 @@ search: description: selector: td:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.9 2023-11-15 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/3changtrai.yml b/definitions/v9/3changtrai.yml index 4b41ba0f4..2f88f9741 100644 --- a/definitions/v9/3changtrai.yml +++ b/definitions/v9/3changtrai.yml @@ -56,6 +56,10 @@ settings: options: desc: desc asc: asc + - name: flaresolverr + type: info + label: FlareSolverr + default: This site may use Cloudflare DDoS Protection, therefore Jackett requires FlareSolverr to access it. - name: info_tpp type: info label: Results Per Page diff --git a/definitions/v9/carpt.yml b/definitions/v9/carpt.yml index a3ea799e8..df16084af 100644 --- a/definitions/v9/carpt.yml +++ b/definitions/v9/carpt.yml @@ -193,4 +193,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.8 2023-09-25 +# NexusPHP vv1.8.11 2024-03-11 diff --git a/definitions/v9/cinematik.yml b/definitions/v9/cinematik.yml index df99cc5c4..446f9151f 100644 --- a/definitions/v9/cinematik.yml +++ b/definitions/v9/cinematik.yml @@ -181,4 +181,4 @@ search: optional: true title: text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" -# json UNIT3D 8.x.x (custom) +# json UNIT3D 8.0.1 diff --git a/definitions/v9/discfan.yml b/definitions/v9/discfan.yml index ac57eca8a..032beb106 100644 --- a/definitions/v9/discfan.yml +++ b/definitions/v9/discfan.yml @@ -184,4 +184,4 @@ search: args: "cat={{ .Result.category_title }} - " minimumratio: text: 0.9 -# NexusPHP v1.8.8 2023-09-25 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/fearnopeer.yml b/definitions/v9/fearnopeer.yml index 849bbd2d4..1f2a6de9d 100644 --- a/definitions/v9/fearnopeer.yml +++ b/definitions/v9/fearnopeer.yml @@ -176,4 +176,4 @@ search: optional: true title: text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" -# json UNIT3D 8.0.0 +# json UNIT3D 8.0.1 diff --git a/definitions/v9/freefarm.yml b/definitions/v9/freefarm.yml index 8a7af2597..ae3d1a2ec 100644 --- a/definitions/v9/freefarm.yml +++ b/definitions/v9/freefarm.yml @@ -69,6 +69,10 @@ settings: options: desc: desc asc: asc + - name: flaresolverr + type: info + label: FlareSolverr + default: This site may use Cloudflare DDoS Protection, therefore Jackett requires FlareSolverr to access it. - name: info_tpp type: info label: Results Per Page @@ -216,4 +220,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.9 2023-09-29 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/hd4fans.yml b/definitions/v9/hd4fans.yml index 667d0e57a..cbffdbdb8 100644 --- a/definitions/v9/hd4fans.yml +++ b/definitions/v9/hd4fans.yml @@ -22,8 +22,8 @@ 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: @@ -33,30 +33,57 @@ 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 2FA code box if you have enabled 2FA on the Free Farm 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 Torrents per page: setting to 100 on your account profile. login: - path: takelogin.php - method: post - cookies: ["c_lang_folder=en"] + 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("失败")) - message: - selector: td.text test: path: index.php selector: a[href="logout.php"] @@ -66,21 +93,29 @@ search: - 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 + 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% + # 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 }}" - # 0=AND, 1=OR, 2=Exact + # 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, 2 exact search_mode: 0 + sort: "{{ .Config.sort }}" + type: "{{ .Config.type }}" notnewword: 1 rows: - selector: table.torrents > tbody > tr:has(table.torrentname) + 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_default: selector: a[href^="details.php?id="] title: @@ -88,18 +123,23 @@ 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 + 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] @@ -146,4 +186,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP Standard v1.5 Beta 4 +# NexusPHP v1.8.8 2023-09-25 diff --git a/definitions/v9/hdtime.yml b/definitions/v9/hdtime.yml index db53a387f..212e0233e 100644 --- a/definitions/v9/hdtime.yml +++ b/definitions/v9/hdtime.yml @@ -192,4 +192,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.5 2023-07-15 +# NexusPHP vv1.8.7 2023-08-22 diff --git a/definitions/v9/icc2022.yml b/definitions/v9/icc2022.yml index bd083c91b..97ce0c4b1 100644 --- a/definitions/v9/icc2022.yml +++ b/definitions/v9/icc2022.yml @@ -193,4 +193,4 @@ search: description: selector: td.rowfollow:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.6 2023-08-18 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/kufei.yml b/definitions/v9/kufei.yml index b72056f94..836992441 100644 --- a/definitions/v9/kufei.yml +++ b/definitions/v9/kufei.yml @@ -200,4 +200,4 @@ search: description: selector: td:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.9 2023-11-15 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/lastdigitalunderground.yml b/definitions/v9/lastdigitalunderground.yml index f73052ca4..7c73cc0da 100644 --- a/definitions/v9/lastdigitalunderground.yml +++ b/definitions/v9/lastdigitalunderground.yml @@ -204,4 +204,4 @@ search: optional: true title: text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" -# json UNIT3D 8.0.0 +# json UNIT3D 8.0.1 diff --git a/definitions/v9/nicept.yml b/definitions/v9/nicept.yml index b30136775..4cbb1073e 100644 --- a/definitions/v9/nicept.yml +++ b/definitions/v9/nicept.yml @@ -187,4 +187,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.4 2023-06-18 +# NexusPHP v1.8.8 2023-09-25 diff --git a/definitions/v9/okpt.yml b/definitions/v9/okpt.yml index 4feed2043..8ee81a4bb 100644 --- a/definitions/v9/okpt.yml +++ b/definitions/v9/okpt.yml @@ -190,4 +190,4 @@ search: filters: - name: prepend args: "{{ .Result.description_verified }} " -# NexusPHP v1.8.8 2023-09-25 +# NexusPHP v1.8.9 2024-03-17 diff --git a/definitions/v9/onlyencodes-api.yml b/definitions/v9/onlyencodes-api.yml index 44e4ea20c..40a3c12fb 100644 --- a/definitions/v9/onlyencodes-api.yml +++ b/definitions/v9/onlyencodes-api.yml @@ -175,4 +175,4 @@ search: optional: true title: text: "{{ if and (.Config.single_file_release_use_filename) (eq .Result.files \"1\") (.Result.title_filename) }}{{ .Result.title_filename }}{{ else }}{{ .Result.title_optional }}{{ end }}" -# json UNIT3D 8.0.0 +# json UNIT3D 8.0.1 diff --git a/definitions/v9/oshenpt.yml b/definitions/v9/oshenpt.yml index dd7f1551e..5bd12ae03 100644 --- a/definitions/v9/oshenpt.yml +++ b/definitions/v9/oshenpt.yml @@ -192,4 +192,4 @@ search: description: selector: td:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.9 2023-11-15 +# NexusPHP v1.8.11 2024-03-27 diff --git a/definitions/v9/ultrahd.yml b/definitions/v9/ultrahd.yml index fff33ce44..ec8511a82 100644 --- a/definitions/v9/ultrahd.yml +++ b/definitions/v9/ultrahd.yml @@ -172,4 +172,4 @@ search: description: selector: td:nth-child(2) remove: a, b, font, img, span -# NexusPHP v1.8.8 2023-09-25 +# NexusPHP v1.8.12 2024-04-01