diff --git a/src/Jackett.Common/Definitions/crazyspirits.yml b/src/Jackett.Common/Definitions/crazyspirits.yml index c3c20556c..938fad69d 100644 --- a/src/Jackett.Common/Definitions/crazyspirits.yml +++ b/src/Jackett.Common/Definitions/crazyspirits.yml @@ -165,10 +165,10 @@ login: download: before: path: thanks.php - method: "get" + method: get inputs: id: "{{ .DownloadUri.Query.id }}" - to: "give" + to: give torrent: "{{ .DownloadUri.Query.id }}" selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]" attribute: href diff --git a/src/Jackett.Common/Definitions/diablotorrent.yml b/src/Jackett.Common/Definitions/diablotorrent.yml index 4c858b04a..24170d1c6 100644 --- a/src/Jackett.Common/Definitions/diablotorrent.yml +++ b/src/Jackett.Common/Definitions/diablotorrent.yml @@ -89,20 +89,20 @@ search: after: 1 fields: - download: - selector: div.box_download > a - attribute: href - title: - selector: a.box_name_a > span - details: - selector: a.box_name_a - attribute: href category: selector: div.box_category > img attribute: onclick filters: - name: regexp args: "category\\((\\d+),\\d+\\);" + title: + selector: a.box_name_a > span + details: + selector: a.box_name_a + attribute: href + download: + selector: div.box_download > a + attribute: href seeders: selector: div.box_seeders leechers: diff --git a/src/Jackett.Common/Definitions/dxp.yml b/src/Jackett.Common/Definitions/dxp.yml index 66908550a..a7ee1ae63 100644 --- a/src/Jackett.Common/Definitions/dxp.yml +++ b/src/Jackett.Common/Definitions/dxp.yml @@ -16,22 +16,18 @@ caps: - {id: 12, cat: Movies/Other, desc: "Мультфильмы"} - {id: 9, cat: TV/Documentary, desc: "Документальные"} - {id: 11, cat: TV, desc: "Сериалы"} - - {id: 10, cat: Audio, desc: "Музыка"} - {id: 16, cat: Books, desc: "Книги"} - {id: 22, cat: Other, desc: "Картинки"} - - {id: 1, cat: PC, desc: "Приложения Windows"} - {id: 3, cat: PC, desc: "Приложения Unix/Linux"} - {id: 4, cat: PC/Mac, desc: "Приложения Mac"} - {id: 2, cat: PC/Mobile-Other, desc: "Приложения PDA"} - - {id: 5, cat: PC/Games, desc: "Игры PC"} - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"} - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"} - {id: 7, cat: Console/XBox, desc: "Игры X-Box"} - {id: 8, cat: Console/PSP, desc: "Игры PSP"} - - {id: 18, cat: Other, desc: "Эксклюзивы"} - {id: 21, cat: Other, desc: "Лавка субтитров"} - {id: 20, cat: Other, desc: "DEMO"} diff --git a/src/Jackett.Common/Definitions/ethor.yml b/src/Jackett.Common/Definitions/ethor.yml index 62c6d6f3a..3aa26eb53 100644 --- a/src/Jackett.Common/Definitions/ethor.yml +++ b/src/Jackett.Common/Definitions/ethor.yml @@ -1,7 +1,7 @@ --- id: ethor name: Ethor.net (Thor's Land) -description: "A French gerneral tracker" +description: "A French general tracker" language: fr-fr type: private encoding: UTF-8 @@ -76,7 +76,7 @@ login: inputs: username: "{{ .Config.username }}" password: "{{ .Config.password }}" - secure_cookie: "0" + secure_cookie: 0 error: - selector: :contains("\"status\":\"error\"") test: @@ -87,7 +87,7 @@ search: - path: browse.php inputs: $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{else}}{{ .Keywords }}{{end}}" + search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" advcat: 0 incldead: 1 stype: b @@ -116,9 +116,9 @@ search: text: "{{ .Result._title_original }}" filters: - name: re_replace - args: ["S(\\d{2}) E(\\d{2})", "S$1E$2"] + args: ["(?i)S(\\d{2}) E(\\d{2})", "S$1E$2"] - name: re_replace - args: ["S(\\d{1}) E(\\d{2})", "S0$1E$2"] + args: ["(?i)S(\\d{1}) E(\\d{2})", "S0$1E$2"] _title_multilang: text: "{{ .Result._title_normalized }}" filters: @@ -127,7 +127,7 @@ search: - name: re_replace args: ["(?i)[\\.\\s\\[\\-]VFQ[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."] title: - text: "{{if .Config.multilang }}{{ .Result._title_multilang }}{{else}}{{ .Result._title_normalized }}{{end}}" + text: "{{if .Config.multilang }}{{ .Result._title_multilang }}{{ else }}{{ .Result._title_normalized }}{{ end }}" category: selector: a[href^="/browse.php?cat="] attribute: href @@ -145,7 +145,7 @@ search: selector: td:nth-child(7) filters: - name: regexp - args: "(\\d+)" + args: (\d+) seeders: selector: td:nth-child(8) leechers: @@ -154,7 +154,7 @@ search: selector: td:nth-child(5) filters: - name: append - args: " -05:00" # timezone offset + args: " -05:00" # timezone offset? is this correct? usually France is on CET +01:00 - name: dateparse args: "2006-01-0215:04:05 -07:00" downloadvolumefactor: diff --git a/src/Jackett.Common/Definitions/exkinoray.yml b/src/Jackett.Common/Definitions/exkinoray.yml index 3f767fd4d..79af690fe 100644 --- a/src/Jackett.Common/Definitions/exkinoray.yml +++ b/src/Jackett.Common/Definitions/exkinoray.yml @@ -100,7 +100,7 @@ login: username: "{{ .Config.username }}" password: "{{ .Config.password }}" autologin: 1 - returnto: "index.php" + returnto: index.php error: - selector: td.embedded:contains("Ошибка входа") test: @@ -118,8 +118,8 @@ search: - name: re_replace # strip S01E01 args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""] inputs: - $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}" - # 0 active 1 incldead 2 onlydead 4 noseeds (isn't this == onlydead?) + $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}" + # 0 active, 1 incldead, 2 onlydead, 4 noseeds (how is this different from onlydead?) incldead: 1 search: "{{ .Keywords }}" sort: "{{ .Config.sort }}" diff --git a/src/Jackett.Common/Definitions/fantasticheaven.yml b/src/Jackett.Common/Definitions/fantasticheaven.yml index 976dece43..78321c94f 100644 --- a/src/Jackett.Common/Definitions/fantasticheaven.yml +++ b/src/Jackett.Common/Definitions/fantasticheaven.yml @@ -144,7 +144,7 @@ search: paths: - path: selection.php inputs: - $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{else}}{{end}}" + $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}" search: "{{ .Keywords }}" blah: 0 orderby: "{{ .Config.sort }}" @@ -154,8 +154,6 @@ search: selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="]) fields: - title: - selector: a[href^="details.php?id="] category: selector: a[href^="selection.php?cat="] attribute: href @@ -164,6 +162,8 @@ search: args: cat - name: replace args: ["#2", ""] + title: + selector: a[href^="details.php?id="] details: selector: a[href^="details.php?id="] attribute: href @@ -187,10 +187,10 @@ search: date: selector: div.selection_unter_ab filters: - - name: append - args: " +01:00" - name: replace args: ["um ", ""] + - name: append + args: " +01:00" # CET - name: dateparse args: "02.01.2006 15:04:05 -07:00" downloadvolumefactor: diff --git a/src/Jackett.Common/Definitions/femdomcult.yml b/src/Jackett.Common/Definitions/femdomcult.yml index 4a05f17b8..ca6e95d9a 100644 --- a/src/Jackett.Common/Definitions/femdomcult.yml +++ b/src/Jackett.Common/Definitions/femdomcult.yml @@ -122,7 +122,7 @@ search: attribute: title filters: - name: append - args: " +00:00" + args: " +00:00" # auto adjusted by site account profile - name: dateparse args: "Jan 02 2006, 15:04 -07:00" size: