From 565dbab28fc6f18cadc34561720af494fec5716b Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 2 Mar 2021 19:35:57 +1300 Subject: [PATCH] witchhunter: fix login check. resolves #10596 also update categories fix results detection adjust incldead --- src/Jackett.Common/Definitions/witchhunter.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Jackett.Common/Definitions/witchhunter.yml b/src/Jackett.Common/Definitions/witchhunter.yml index dd58ef5bc..ef1795c8d 100644 --- a/src/Jackett.Common/Definitions/witchhunter.yml +++ b/src/Jackett.Common/Definitions/witchhunter.yml @@ -16,10 +16,6 @@ caps: - {id: 2, cat: Movies/SD, desc: "Film/Cam/Hun"} - {id: 8, cat: Movies/DVD, desc: "Film/DVD/Eng"} - {id: 7, cat: Movies/DVD, desc: "Film/DVD/Hun"} - - {id: 10, cat: Movies/DVD, desc: "Film/DVD5/Eng"} - - {id: 9, cat: Movies/DVD, desc: "Film/DVD5/Hun"} - - {id: 12, cat: Movies/DVD, desc: "Film/DVD9/Eng"} - - {id: 11, cat: Movies/DVD, desc: "Film/DVD9/Hun"} - {id: 16, cat: Movies/HD, desc: "Film/HD1080P/Eng"} - {id: 15, cat: Movies/HD, desc: "Film/HD1080P/Hun"} - {id: 14, cat: Movies/HD, desc: "Film/HD720P/Eng"} @@ -93,7 +89,7 @@ login: - selector: td.embedded:contains("Sikertelen bejelentkezés!") test: path: letoltes.php - selector: a[href="logout.php"] + selector: a[href^="logout.php?k="] search: paths: @@ -105,14 +101,14 @@ search: inputs: $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" search: "{{ .Keywords }}" - # 0 active, 1 both, 2 onlydead, 3 onlyfree, 4 x2 torrents, 6 mytorrents - incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}" + # 0 both, 1 active, 2 onlydead, 3 onlyfree, 4 x2 torrents, 5 mytorrents, 6 waitingseeds + incldead: "{{ if .Config.freeleech }}3{{ else }}0{{ end }}" sort: "{{ .Config.sort }}" type: "{{ .Config.type }}" # does not support imdbid searches rows: - selector: table[width="800"] > tbody > tr:has(a[href^="details.php?id="]) + selector: "table[style=\"width: 930px\"] > tbody > tr:has(a[href^=\"details.php?id=\"])" fields: category: @@ -128,10 +124,11 @@ search: - name: regexp args: (\d+) title: - selector: a[onclick] + selector: a[href^="/details.php"] attribute: title details: - text: "details.php?id={{ .Result.id }}" + selector: a[href^="/details.php"] + attribute: href download: text: "download.php?id={{ .Result.id }}" imdb: