diff --git a/src/Jackett.Common/Definitions/haitang.yml b/src/Jackett.Common/Definitions/haitang.yml index bf6ab6259..e0f4ee1ac 100644 --- a/src/Jackett.Common/Definitions/haitang.yml +++ b/src/Jackett.Common/Definitions/haitang.yml @@ -104,19 +104,21 @@ search: filters: - name: querystring args: cat - title: + title_default: selector: a[href^="details.php?id="] - title: + title_optional: optional: true selector: a[title][href^="details.php?id="] attribute: title + title: + text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" details: selector: a[href^="details.php?id="] attribute: href download: selector: a[href^="download.php?id="] attribute: href - date: + date_elapsed: # time type: time elapsed (default) selector: td:nth-child(4) > span[title] attribute: title @@ -126,7 +128,7 @@ search: args: " +08:00" # CST - name: dateparse args: "2006-01-02 15:04:05 -07:00" - date: + date_added: # time added selector: td:nth-child(4):not(:has(span)) optional: true @@ -135,6 +137,8 @@ search: args: " +08:00" # CST - name: dateparse args: "2006-01-0215:04:05 -07:00" + date: + text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}" size: selector: td:nth-child(5) seeders: diff --git a/src/Jackett.Common/Definitions/korsar.yml b/src/Jackett.Common/Definitions/korsar.yml index 442c9dd7c..239a01cfe 100644 --- a/src/Jackett.Common/Definitions/korsar.yml +++ b/src/Jackett.Common/Definitions/korsar.yml @@ -522,7 +522,7 @@ search: selector: span.leech grabs: selector: span.complet - date: + date_day: # Сегодня, 15:10 (today) # Вчера, 23:28 (yesterday) selector: dd:last-of-type:contains("Сегодня,"), dd:last-of-type:contains("Вчера,") @@ -536,7 +536,7 @@ search: - name: replace args: ["Сегодня,", "Yesterday"] - name: fuzzytime - date: + date_time: # 4 минуты назад (4 minutes ago) # 11 минут назад (11 minutes ago) # 4 часа назад (4 hours ago) @@ -558,7 +558,7 @@ search: - name: replace args: ["часов", "hours"] - name: timeago - date: + date_year: # 12 янв 2019, 11:26 # 25 май 2017, 18:41 selector: dd:last-of-type:not(:contains("назад")):not(:contains("Сегодня,")):not(:contains("Вчера,")) @@ -597,6 +597,8 @@ search: args: " +03:00" # MSK - name: dateparse args: "02 Jan 2006, 15:04 -07:00" + date: + text: "{{ if or .Result.date_time .Result.date_year .Result.date_day }}{{ or .Result.date_time .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: diff --git a/src/Jackett.Common/Definitions/oshenpt.yml b/src/Jackett.Common/Definitions/oshenpt.yml index cbd85b129..45bde9040 100644 --- a/src/Jackett.Common/Definitions/oshenpt.yml +++ b/src/Jackett.Common/Definitions/oshenpt.yml @@ -7,7 +7,7 @@ type: private encoding: UTF-8 links: - http://www.oshen.win/ -links: +legacylinks: - https://www.oshen.win/ # forces http caps: diff --git a/src/Jackett.Common/Definitions/putao.yml b/src/Jackett.Common/Definitions/putao.yml index 9d253eaf4..f14055e8b 100644 --- a/src/Jackett.Common/Definitions/putao.yml +++ b/src/Jackett.Common/Definitions/putao.yml @@ -128,19 +128,21 @@ search: filters: - name: querystring args: cat - title: + title_default: selector: a[href^="details.php?id="] - title: + title_optional: optional: true selector: a[title][href^="details.php?id="] attribute: title + title: + text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" details: selector: a[href^="details.php?id="] attribute: href download: selector: a[href^="download.php?id="] attribute: href - date: + date_elapsed: # time elapsed (default) # 19时
3分 (19 hours 3 minutes) # 2天
21时 (2 days 21 hours) @@ -160,7 +162,7 @@ search: - name: append args: " ago" - name: timeago - date: + date_added: # time added selector: td:nth-child(4):contains("-") optional: true @@ -169,6 +171,8 @@ search: args: " +08:00" # CST - name: dateparse args: "2006-01-0215:04:05 -07:00" + date: + text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}" size: selector: td:nth-child(5) seeders: diff --git a/src/Jackett.Common/Definitions/pwtorrents.yml b/src/Jackett.Common/Definitions/pwtorrents.yml index a054901a1..afb1e5eb8 100644 --- a/src/Jackett.Common/Definitions/pwtorrents.yml +++ b/src/Jackett.Common/Definitions/pwtorrents.yml @@ -7,7 +7,7 @@ type: private encoding: UTF-8 links: - http://pwtorrents.net/ -links: +legacylinks: - https://pwtorrents.net/ # site is forcing to http caps: diff --git a/src/Jackett.Common/Definitions/rustorka.yml b/src/Jackett.Common/Definitions/rustorka.yml index 91618a2bd..47321467b 100644 --- a/src/Jackett.Common/Definitions/rustorka.yml +++ b/src/Jackett.Common/Definitions/rustorka.yml @@ -834,7 +834,6 @@ search: prev_df: 1 prev_ds: 0 prev_snotd: 0 - prev_a: 0 prev_not_checked: 0 prev_closed: 0 prev_d: 0 diff --git a/src/Jackett.Common/Definitions/uniongang.yml b/src/Jackett.Common/Definitions/uniongang.yml index 92a28b3ea..419a02a9d 100644 --- a/src/Jackett.Common/Definitions/uniongang.yml +++ b/src/Jackett.Common/Definitions/uniongang.yml @@ -7,7 +7,7 @@ type: private encoding: windows-1251 links: - http://www.uniongang.net/ -links: +legacylinks: - https://www.uniongang.net/ # site is forcing to http caps: diff --git a/yamllint.yml b/yamllint.yml index 9341cebd2..beac0a9cd 100644 --- a/yamllint.yml +++ b/yamllint.yml @@ -12,7 +12,6 @@ rules: document-start: level: error line-length: disable - key-duplicates: disable truthy: disable comments: min-spaces-from-content: 1