From 72ab0e4a9f2e4e42005f63f7da1911c1ac2e0ac6 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 30 Dec 2019 13:20:08 +1300 Subject: [PATCH] polishsource: add uhd category delete 3d,dvd,bluray add config sort options --- .../Definitions/polishsource.yml | 79 +++++++++++++------ 1 file changed, 55 insertions(+), 24 deletions(-) diff --git a/src/Jackett.Common/Definitions/polishsource.yml b/src/Jackett.Common/Definitions/polishsource.yml index ac8ccbb8d..cc9da45a1 100644 --- a/src/Jackett.Common/Definitions/polishsource.yml +++ b/src/Jackett.Common/Definitions/polishsource.yml @@ -12,9 +12,7 @@ categorymappings: - {id: 12, cat: Movies/SD, desc: "Movies/SD"} - {id: 11, cat: Movies/HD, desc: "Movies/HD"} - - {id: 45, cat: Movies/3D, desc: "Movies/3D"} - - {id: 4, cat: Movies/DVD, desc: "Movies/DVD"} - - {id: 43, cat: Movies/BluRay, desc: "Movies/BD"} + - {id: 46, cat: Movies/UHD, desc: "Movies/UHD"} - {id: 10, cat: TV/SD, desc: "TV/SD"} - {id: 39, cat: TV/HD, desc: "TV/HD"} - {id: 8, cat: PC/Games, desc: "Games/PC"} @@ -29,6 +27,30 @@ tv-search: [q, season, ep] movie-search: [q] + settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - 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" + login: path: login.php method: form @@ -45,34 +67,43 @@ - selector: td.embedded:has(h2:contains("failed")) - selector: td.embedded:has(h2:contains("Error")) test: - selector: a[href^="logout.php"] path: browse.php + selector: a[href^="logout.php"] search: paths: - path: browse.php inputs: - $raw: "{{range .Categories}}c{{.}}=1&{{end}}" - search: "{{ .Query.Keywords }}" - incldead: "1" - scene: "0" - pl: "0" + $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" + search: "{{ .Keywords }}" + # 0 onlyactive 1 all 2 onlydead + incldead: 1 + # 0 all 1 scene 2 notscene 3 internal + scene: 0 + # 0 all 1 Polish 2 non-Polish 4 subtitled + pl: 0 + # subcat blank=all sub: "" - search_in: "title" + # title both nfo + search_in: title + sort: "{{ .Config.sort }}" + type: "{{ .Config.type }}" + rows: selector: table#restable > tbody > tr:has(a[href^="details.php?id="]) + fields: - title: - selector: a[href^="details.php?id="] - details: - selector: a[href^="details.php?id="] - attribute: href 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^="downloadssl.php?id="] attribute: href @@ -103,13 +134,6 @@ imdb: optional: true selector: a[href*="www.imdb.com/title/tt"] - grabs: - selector: td:nth-child(6) - filters: - - name: regexp - args: (\d+) - size: - selector: td:nth-child(5) date: selector: td:nth-child(4) filters: @@ -117,11 +141,18 @@ args: " +00:00" - name: dateparse args: "2006-01-0215:04:05 -07:00" + size: + selector: td:nth-child(5) + grabs: + selector: td:nth-child(6) + filters: + - name: regexp + args: (\d+) seeders: selector: td:nth-child(7) leechers: selector: td:nth-child(8) downloadvolumefactor: - text: "0" + text: 0 uploadvolumefactor: - text: "1" + text: 1