diff --git a/src/Jackett.Common/Definitions/omgwtftrackr.yml b/src/Jackett.Common/Definitions/omgwtftrackr.yml index 54b586e50..54ee1552e 100644 --- a/src/Jackett.Common/Definitions/omgwtftrackr.yml +++ b/src/Jackett.Common/Definitions/omgwtftrackr.yml @@ -187,8 +187,10 @@ search: selector: td:nth-child(4) span attribute: title filters: + - name: append + args: " -07:00" # PDT - name: dateparse - args: "Jan 2 2006, 15:04" + args: "Jan 2 2006, 15:04 -07:00" size: selector: td:nth-child(5) grabs: diff --git a/src/Jackett.Common/Definitions/onejav.yml b/src/Jackett.Common/Definitions/onejav.yml index 34716ea7e..f6aad9edd 100644 --- a/src/Jackett.Common/Definitions/onejav.yml +++ b/src/Jackett.Common/Definitions/onejav.yml @@ -60,8 +60,10 @@ search: selector: p.is-6 > a attribute: href filters: + - name: append + args: " -07:00" # PDT - name: dateparse - args: "/2006/01/02" + args: "/2006/01/02 -07:00" size: selector: span.is-size-6 seeders: diff --git a/src/Jackett.Common/Definitions/piratbit.yml b/src/Jackett.Common/Definitions/piratbit.yml index 358734adc..d70fd9d62 100644 --- a/src/Jackett.Common/Definitions/piratbit.yml +++ b/src/Jackett.Common/Definitions/piratbit.yml @@ -719,15 +719,19 @@ search: optional: true selector: td[title="Добавлен"] p:first-of-type:not(:contains("-")), td[title="Доданий"] p:first-of-type:not(:contains("-")), td[title="Added"] p:first-of-type:not(:contains("-")) filters: + - name: append + args: " +03:00" # MSK - name: dateparse - args: "15:04" + args: "15:04 -07:00" date: # 15:04 24-02-19 optional: true selector: td[title="Добавлен"] p:first-of-type:contains("-"), td[title="Доданий"] p:first-of-type:contains("-"), td[title="Added"] p:first-of-type:contains("-") filters: + - name: append + args: " +03:00" # MSK - name: dateparse - args: "15:04 2-01-06" + args: "15:04 2-01-06 -07:00" # Russian and Ukranian and English languages are supported grabs: selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"] diff --git a/src/Jackett.Common/Definitions/piratbitl.yml b/src/Jackett.Common/Definitions/piratbitl.yml index 4ae30a002..c9e846c4f 100644 --- a/src/Jackett.Common/Definitions/piratbitl.yml +++ b/src/Jackett.Common/Definitions/piratbitl.yml @@ -615,7 +615,7 @@ caps: modes: search: [q] - tv-search: [q] + tv-search: [q, season, ep] movie-search: [q] music-search: [q] book-search: [q] @@ -642,7 +642,10 @@ settings: options: 2: desc 1: asc - + - name: striprussian + type: checkbox + label: Strip Russian Letters + default: true login: path: login.php method: post @@ -650,8 +653,8 @@ login: "login_username": "{{ .Config.username }}" "login_password": "{{ .Config.password }}" autologin: 1 - login: "Вход" - redirect: "/" + login: Вход + redirect: / error: - selector: table tr td div.alert test: @@ -662,6 +665,13 @@ search: paths: - path: tracker.php method: post + keywordsfilters: + - name: diacritics + args: replace + - name: re_replace # S01 to Cезон 1 + args: ["(?i)\\bS0*(\\d+)\\b", "Сезон $1"] + - name: re_replace # S01E01 to Сезон 1 Серии 1 + args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", "Сезон $1 Серии $2"] inputs: $raw: "{{ if .Categories }}{{ range .Categories }}f[]={{.}}&{{end}}{{else}}f[]=-1{{end}}" prev_a: 0 @@ -700,6 +710,16 @@ search: args: f title: selector: td a.genmed + filters: + # normalize to SXXEYY format + - name: re_replace + args: ["[\\:\\-\\/\\|]", " "] + - name: re_replace + args: ["(.+)\\s+[CСcс]езон\\s+(\\d+)\\s+[CСcс]ерии\\s+(\\d+)\\s+(\\d+)\\s+из\\s+\\d+(.+)", "$1 S$2E$3-$4 rus $5"] + - name: re_replace + args: ["(.+)\\s+[CСcс]езон\\s+(\\d+)\\s+[CСcс]ери[ия]\\s+(\\d+)\\s+из\\s+\\d+(.+)", "$1 S$2E$3 rus $4"] + - name: re_replace + args: ["(\\([А-Яа-яЁё\\W]+\\))|(^[А-Яа-яЁё\\W\\d]+\\/ )|([а-яА-ЯЁё \\-]+,+)|([а-яА-ЯЁё]+)", "{{ if .Config.striprussian }}{{ else }}$0{{ end }}"] details: selector: td a.genmed attribute: href @@ -714,15 +734,19 @@ search: optional: true selector: td[title="Добавлен"] p:first-of-type:not(:contains("-")), td[title="Доданий"] p:first-of-type:not(:contains("-")), td[title="Added"] p:first-of-type:not(:contains("-")) filters: + - name: append + args: " +03:00" # MSK - name: dateparse - args: "15:04" + args: "15:04 -07:00" date: # 15:04 24-02-19 optional: true selector: td[title="Добавлен"] p:first-of-type:contains("-"), td[title="Доданий"] p:first-of-type:contains("-"), td[title="Added"] p:first-of-type:contains("-") filters: + - name: append + args: " +03:00" # MSK - name: dateparse - args: "15:04 2-01-06" + args: "15:04 2-01-06 -07:00" # Russian and Ukranian and English languages are supported grabs: selector: td[title^="Ответов"], td[title^="Відповідей"], td[title^="Replies"] diff --git a/src/Jackett.Common/Definitions/pleasuredome.yml b/src/Jackett.Common/Definitions/pleasuredome.yml index 9e32e4704..29ae9cb10 100644 --- a/src/Jackett.Common/Definitions/pleasuredome.yml +++ b/src/Jackett.Common/Definitions/pleasuredome.yml @@ -151,8 +151,10 @@ search: # 19/01/2019 selector: td:nth-last-child(9) filters: + - name: append + args: " +00:00" # auto adjusted by site account profile - name: dateparse - args: "02/01/2006" + args: "02/01/2006 -07:00" size: selector: td:nth-last-child(8) seeders: diff --git a/src/Jackett.Common/Definitions/pornforall.yml b/src/Jackett.Common/Definitions/pornforall.yml index 0463743a1..95423ba1f 100644 --- a/src/Jackett.Common/Definitions/pornforall.yml +++ b/src/Jackett.Common/Definitions/pornforall.yml @@ -55,8 +55,10 @@ search: filters: - name: querystring args: date + - name: append + args: " +03:00" # MSK - name: dateparse - args: "2006-01-02" + args: "2006-01-02 -07:00" size: selector: font[color="grey"] filters: diff --git a/src/Jackett.Common/Definitions/pornleech.yml b/src/Jackett.Common/Definitions/pornleech.yml index 35fc6448b..25ae16dbc 100644 --- a/src/Jackett.Common/Definitions/pornleech.yml +++ b/src/Jackett.Common/Definitions/pornleech.yml @@ -50,9 +50,9 @@ search: page: torrents $raw: "category={{ range .Categories }}{{.}};{{end}}" search: "{{ .Keywords }}" - # 0 file 1 file&descr 2 descr 3 uploaders + # 0 file, 1 file&descr, 2 descr, 3 uploaders option: 0 - # 0 all 1 active 2 dead + # 0 all, 1 active, 2 dead active: 0 order: "{{ .Config.sort }}" by: "{{ .Config.type }}" @@ -88,8 +88,10 @@ search: filters: - name: regexp args: "AddDate:\\s*\u00a0\\s*(.+?)$" + - name: append + args: " -07:00" # PDT - name: dateparse - args: "15:04:05 02/01/2006" + args: "15:04:05 02/01/2006 -07:00" seeders: selector: td[valign="middle"] > p:nth-child(5) filters: diff --git a/src/Jackett.Common/Definitions/pornorip.yml b/src/Jackett.Common/Definitions/pornorip.yml index faaa924d2..78527e5a7 100644 --- a/src/Jackett.Common/Definitions/pornorip.yml +++ b/src/Jackett.Common/Definitions/pornorip.yml @@ -96,7 +96,7 @@ search: - path: search.php inputs: tracker_search: torrent - keywords: "{{ if .Keywords }}{{ .Keywords }}{{else}}{{ .Today.Year }}{{end}}" + keywords: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}" terms: all author: "" sc: 1 @@ -209,8 +209,10 @@ search: args: ["ноя", "Nov"] - name: replace args: ["дек", "Dec"] + - name: append + args: " +03:00" # MSK - name: dateparse - args: "02 Jan 2006, 15:04" + args: "02 Jan 2006, 15:04 -07:00" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/pornotor.yml b/src/Jackett.Common/Definitions/pornotor.yml index 57d81469a..4536b2d59 100644 --- a/src/Jackett.Common/Definitions/pornotor.yml +++ b/src/Jackett.Common/Definitions/pornotor.yml @@ -65,8 +65,10 @@ search: filters: - name: replace args: ["Добавлен: ", ""] + - name: append + args: " +03:00" # MSK - name: dateparse - args: "2006-01-02 15:04:05" + args: "2006-01-02 15:04:05 -07:00" size: selector: td:nth-child(4) seeders: diff --git a/src/Jackett.Common/Definitions/proporno.yml b/src/Jackett.Common/Definitions/proporno.yml index 755aecf72..31cb9f798 100644 --- a/src/Jackett.Common/Definitions/proporno.yml +++ b/src/Jackett.Common/Definitions/proporno.yml @@ -109,8 +109,10 @@ search: filters: - name: regexp args: "(\\d{1,2}-\\d{2}-\\d{4}, \\d{2}:\\d{2})" + - name: append + args: " +03:00" # MSK - name: dateparse - args: "2-01-2006, 15:04" + args: "2-01-2006, 15:04 -07:00" size: text: "1 GB" seeders: diff --git a/src/Jackett.Common/Definitions/pthome.yml b/src/Jackett.Common/Definitions/pthome.yml index 4bfa260fd..081d0d68c 100644 --- a/src/Jackett.Common/Definitions/pthome.yml +++ b/src/Jackett.Common/Definitions/pthome.yml @@ -105,8 +105,10 @@ search: selector: td:nth-child(4) span attribute: title filters: + - name: append + args: " +08:00" # CST - name: dateparse - args: "2006-01-02 15:04:05" + args: "2006-01-02 15:04:05 -07:00" downloadvolumefactor: case: img.pro_free: 0 diff --git a/src/Jackett.Common/Definitions/puntotorrent.yml b/src/Jackett.Common/Definitions/puntotorrent.yml index 443039806..8543af208 100644 --- a/src/Jackett.Common/Definitions/puntotorrent.yml +++ b/src/Jackett.Common/Definitions/puntotorrent.yml @@ -331,8 +331,10 @@ search: date: selector: td:nth-child(5) filters: + - name: append + args: " +01:00" # CET - name: dateparse - args: "02/01/2006" + args: "02/01/2006 -07:00" download: selector: a[href^="download.php"] attribute: href