From 123a56f577aee480b183b76d3cc229a36ffb5c1a Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Wed, 1 Jan 2020 17:12:16 +1300 Subject: [PATCH] torrentccf: add config sort options also handle both date types --- src/Jackett.Common/Definitions/torrentccf.yml | 71 +++++++++++++++---- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/src/Jackett.Common/Definitions/torrentccf.yml b/src/Jackett.Common/Definitions/torrentccf.yml index b5640914a..2aa4bb43a 100644 --- a/src/Jackett.Common/Definitions/torrentccf.yml +++ b/src/Jackett.Common/Definitions/torrentccf.yml @@ -39,6 +39,30 @@ tv-search: [q, season, ep, imdbid] movie-search: [q, imdbid] + 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 @@ -60,12 +84,22 @@ - path: torrents.php method: get inputs: - $raw: "{{range .Categories}}cat{{.}}=1&{{end}}" - search: "{{if .Query.IMDBID}}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" - incldead: "1" + $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" + search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{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: 0 + # 0 title 1 descr 3 uploaded 4 imdburl search_area: "{{ if .Query.IMDBID }}4{{else}}0{{end}}" + # 0 AND 1 OR 2 exact + search_mode: 0 + sort: "{{ .Config.sort }}" + type: "{{ .Config.type }}" + rows: selector: table.torrents > tbody > tr:has(table.torrentname) + fields: title: selector: a[href^="details.php?id="] @@ -98,27 +132,38 @@ leechers: selector: td:nth-child(7) date: + # time type: time elapsed (default) selector: td:nth-child(4) > span[title] attribute: title + optional: true filters: - name: append args: " +08:00" - name: dateparse args: "2006-01-02 15:04:05 -07:00" + date: + # time added + selector: td:nth-child(4):not(:has(span)) + optional: true + filters: + - name: append + args: " +08:00" + - name: dateparse + args: "2006-01-0215:04:05 -07:00" downloadvolumefactor: case: - img.pro_free: "0" - img.pro_free2up: "0" - img.pro_50pctdown: "0.5" - img.pro_50pctdown2up: "0.5" - img.pro_30pctdown: "0.3" - "*": "1" + img.pro_free: 0 + img.pro_free2up: 0 + img.pro_50pctdown: 0.5 + img.pro_50pctdown2up: 0.5 + img.pro_30pctdown: 0.3 + "*": 1 uploadvolumefactor: case: - img.pro_50pctdown2up: "2" - img.pro_free2up: "2" - img.pro_2up: "2" - "*": "1" + img.pro_50pctdown2up: 2 + img.pro_free2up: 2 + img.pro_2up: 2 + "*": 1 description: selector: td:nth-child(2) remove: a, img