assorted: conform to yaml standards by avoiding duplicate keys #11917

This commit is contained in:
Garfield69 2021-10-20 20:07:04 +13:00
parent 4294418153
commit 10e0115ee7
15 changed files with 92 additions and 67 deletions

View File

@ -172,30 +172,30 @@ search:
download:
selector: a[href^="/download.php"]
attribute: href
grabs:
text: 0
grabs:
grabs_optional:
selector: a[title="Snatcher"]
optional: true
files:
text: 0
files:
grabs:
text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
files_optional:
selector: a[title="Files"]
optional: true
files:
text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}0{{ end }}"
size:
selector: td:nth-child(6)
seeders:
text: 0
seeders:
seeders_optional:
selector: a[title="Seeder"]
optional: true
leechers:
text: 0
leechers:
seeders:
text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
leechers_optional:
selector: a[title="Leecher"]
optional: true
leechers:
text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
# 2 flavours of dates
date:
date_day:
# Heute 13:30:04
# Gestern 09:10:10
selector: td:nth-child(10):contains("Heute"), td:nth-child(10):contains("Gestern")
@ -209,7 +209,7 @@ search:
args: ["Gestern", "Yesterday"]
- name: append
args: " +01:00" # CET
date:
date_year:
# 30.02.2018 23:12:50
selector: td:nth-child(10):contains("."):contains(":")
optional: true
@ -220,6 +220,8 @@ search:
args: " +01:00" # CET
- name: dateparse
args: "02.01.2006 15:04:05 -07:00"
date:
text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
downloadvolumefactor:
case:
img[alt="OU"]: 0

View File

@ -84,11 +84,13 @@ search:
filters:
- name: querystring
args: category
title:
title_default:
selector: a[href*="/details.php?id="]
title:
title_optional:
optional: true
selector: div.tooltip-content > div
title:
text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}"
details:
selector: a[href*="/details.php?id="]
attribute: href
@ -115,7 +117,6 @@ search:
- name: dateparse
args: "02-01-2006 15:04 -07:00"
poster:
optional: true
selector: div.tooltip-content > img
attribute: src
downloadvolumefactor:

View File

@ -95,12 +95,14 @@ search:
selector: table.torrents > tbody > tr:has(table.torrentname)
fields:
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 }}"
category:
selector: a[href^="?cat="]
attribute: href
@ -116,7 +118,7 @@ search:
imdb:
selector: div.imdb_100 > a
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:

View File

@ -67,7 +67,7 @@ search:
selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
fields:
_category:
category_optional:
selector: a[href*="/categories/"]
optional: true
attribute: href
@ -75,7 +75,7 @@ search:
- name: regexp
args: "/categories/.*?\\.(\\d+)"
category:
text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
title:
selector: a.torrent-name
details:

View File

@ -87,7 +87,7 @@ search:
selector: div.table-torrents > table > tbody > tr[id^="torrentposter"]
fields:
_category:
category_optional:
selector: a[href*="/categories/"]
optional: true
attribute: href
@ -95,7 +95,7 @@ search:
- name: regexp
args: "/categories/.*?\\.(\\d+)"
category:
text: "{{ if .Result._category }}{{ .Result._category }}{{ else }}1{{ end }}"
text: "{{ if .Result.category_optional }}{{ .Result.category_optional }}{{ else }}1{{ end }}"
title:
selector: a.torrent-name
details:

View File

@ -87,7 +87,7 @@ search:
selector: .editorLink
optional: true
author:
text: "{{ or (.Result._author) (.Result._editor) }}"
text: "{{ or .Result._author .Result._editor }}"
_year:
selector: .torYear
optional: true
@ -122,21 +122,21 @@ search:
size:
selector: .t_files_size_added span
attribute: data-bytecount
seeders:
text: 0
seeders:
seeders_optional:
optional: true
selector: .seeders
leechers:
text: 0
leechers:
seeders:
text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
leechers_optional:
optional: true
selector: .leechers
grabs:
text: 0
grabs:
leechers:
text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
grabs_optional:
optional: true
selector: .snatches
grabs:
text: "{{ if .Result.grabs_optional }}{{ .Result.grabs_optional }}{{ else }}0{{ end }}"
downloadvolumefactor:
text: 1
uploadvolumefactor:

View File

@ -85,12 +85,14 @@ search:
args: ["details.php?id=", "download.php/"]
- name: append
args: "/invalid.torrent"
title:
title_default:
selector: a[href^="details.php?id="]
title:
title_optional:
optional: true
selector: a[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
@ -124,15 +126,15 @@ search:
selector: td:nth-child(6) > u
downloadvolumefactor:
text: 0
uploadvolumefactor:
text: 1
uploadvolumefactor:
uploadvolumefactor_optional:
optional: true
selector: td:nth-child(5) > nobr > font:contains(" × ")
filters:
- name: replace
args: ["×", ""]
date:
uploadvolumefactor:
text: "{{ if .Result.uploadvolumefactor_optional }}{{ .Result.uploadvolumefactor_optional }}{{ else }}1{{ end }}"
date_year:
selector: td:nth-child(5):contains('.')
optional: true
remove: font
@ -143,7 +145,7 @@ search:
args: "{{ .Today.Year }}."
- name: re_replace
args: ["([0-9]{4}).([0-9]+).([0-9]+) (.*)", "$2.$3.$1 $4"]
date:
date_day:
selector: td:nth-child(5):contains('ma'), td:nth-child(5):contains("tegnap"), td:nth-child(5):contains('-')
optional: true
remove: font
@ -152,6 +154,8 @@ search:
args: ["ma", "today"]
- name: replace
args: ["tegnap", "yesterday"]
date:
text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
description:
selector: td:nth-child(2) > div
# engine tbd

View File

@ -86,7 +86,7 @@ search:
filters:
- name: regexp
args: "src=(.*?) "
date:
date_today:
# Сегодня в 09:09 от
# Вчера в 22:47 от
selector: td:nth-child(2) div.b-info div span:nth-child(1):contains("Сегодня"), td:nth-child(2) div.b-info div span:nth-child(1):contains("Вчера")
@ -98,7 +98,7 @@ search:
args: ["Сегодня в", "Today"]
- name: replace
args: ["Вчера в", "Yesterday"]
date:
date_year:
# 08 ноября 2019 в 23:53 от
selector: td:nth-child(2) div.b-info div span:nth-child(1):not(:contains("Сегодня")):not(:contains("Вчера"))
optional: true
@ -135,6 +135,8 @@ search:
args: " +03:00" # MSK
- name: dateparse
args: "02 January 2006 15:04 -07:00"
date:
text: "{{ if or .Result.date_today .Result.date_year }}{{ or .Result.date_today .Result.date_year }}{{ else }}now{{ end }}"
size:
selector: td:nth-child(3)
filters:

View File

@ -145,7 +145,7 @@ search:
args: "src=(.*?) width"
files:
selector: div.torrenttable:nth-last-child(7)
date:
date_year:
# Jul 4 2019 08:04 AM
selector: div.torrenttable:nth-last-child(5):not(:contains("day"))
optional: true
@ -154,11 +154,13 @@ search:
args: " +00:00" # auto adjusted by site account profile
- name: dateparse
args: "Jan 2 2006 03:04 PM -07:00"
date:
date_day:
# Today 02:40 PM
# Yesterday 09:10 AM
selector: div.torrenttable:nth-last-child(5):contains("day")
optional: true
date:
text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}"
size:
selector: div.torrenttable:nth-last-child(4)
grabs:

View File

@ -137,7 +137,7 @@ search:
selector: td.rowcol:nth-last-child(3)
leechers:
selector: td.rowcol:nth-last-child(2)
date:
date_added:
optional: true
selector: font[color="5F5F5F"]
filters:
@ -149,7 +149,7 @@ search:
args: " +00:00" # GMT
- name: dateparse
args: "2006-01-02 15:04:05 -07:00"
date:
date_upload:
optional: true
selector: a[title^="Upploaded at"]
attribute: title
@ -162,6 +162,8 @@ search:
args: " +00:00" # GMT
- name: dateparse
args: "2006-01-02 15:04:05 -07:00"
date:
text: "{{ if or .Result.date_upload .Result.date_added }}{{ or .Result.date_upload .Result.date_added }}{{ else }}now{{ end }}"
downloadvolumefactor:
text: 1
uploadvolumefactor:

View File

@ -161,7 +161,7 @@ search:
download:
selector: a[href*="?p=torrents&pid=10&action=download"]
attribute: href
date:
date_year:
optional: true
# Uploaded 30-01-2019 15:02 by
selector: td.torrent_name:not(:contains(" at "))
@ -172,7 +172,7 @@ search:
args: " +00:00" # auto adjusted by site account profile
- name: dateparse
args: "02-01-2006 15:04 -07:00"
date:
date_day:
optional: true
# Uploaded Friday at 05:11 by
# Uploaded Today at 00:48 by
@ -185,6 +185,8 @@ search:
args: [" at ", " "]
- name: append
args: " +00:00" # auto adjusted by site account profile
date:
text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
size:
selector: a[rel="torrent_size"]
seeders:

View File

@ -106,23 +106,25 @@ search:
poster:
selector: img[src*="/thbx/imgx/"]
attribute: src
files:
text: 1
files:
files_optional:
selector: a[href$="filelist=1"]
optional: true
files:
text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
size:
selector: td:nth-child(3)
seeders:
text: 0
seeders:
size_optional:
text: "{{ if .Result.size_optional }}{{ .Result.size_optional }}{{ else }}0 B{{ end }}"
seeders_optional:
selector: a[href$="toseeders=1"]
optional: true
leechers:
text: 0
leechers:
seeders:
text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
leechers_optional:
selector: a[href$="todlers=1"]
optional: true
leechers:
text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
date:
text: now
downloadvolumefactor:

View File

@ -68,11 +68,11 @@ search:
filters:
- name: replace
args: ["found ", ""]
files:
text: 1
files:
files_optional:
selector: span.torrent_files
optional: true
files:
text: "{{ if .Result.files_optional }}{{ .Result.files_optional }}{{ else }}1{{ end }}"
size:
selector: span.torrent_size
seeders:

View File

@ -217,11 +217,11 @@ search:
"*": 1
uploadvolumefactor:
text: 1
date:
date_ago:
selector: td.torrent_name > abbr.timeago
optional: true
attribute: data-time
date:
date_year:
selector: td.torrent_name:not(:has(abbr.timeago)):not(:contains("day")):not(:contains("Domingo")):not(:contains("Sábado")):not(:contains("Sexta")):not(:contains("Quinta")):not(:contains("Quarta")):not(:contains("Terça")):not(:contains("Segunda")):not(:contains("ontem")):not(:contains("Hoje"))
optional: true
remove: span, a, br
@ -242,7 +242,7 @@ search:
args: " +00:00" # WET
- name: dateparse
args: "02-01-2006 15:04 -07:00"
date:
date_day:
selector: td.torrent_name:not(:has(abbr.timeago)):contains("day"), td.torrent_name:not(:has(abbr.timeago)):contains("Domingo"), td.torrent_name:not(:has(abbr.timeago)):contains("Sábado"), td.torrent_name:not(:has(abbr.timeago)):contains("Quinta"), td.torrent_name:not(:has(abbr.timeago)):contains("Sexta"), td.torrent_name:not(:has(abbr.timeago)):contains("Quarta"), td.torrent_name:not(:has(abbr.timeago)):contains("Terça"), td.torrent_name:not(:has(abbr.timeago)):contains("Segunda"), td.torrent_name:not(:has(abbr.timeago)):contains("ontem"), td.torrent_name:not(:has(abbr.timeago)):contains("Hoje")
optional: true
remove: span, a, br
@ -278,4 +278,6 @@ search:
- name: replace
args: ["Domingo", "Sunday"]
- name: fuzzytime
date:
text: "{{ if or .Result.date_year .Result.date_day .Result.date_ago }}{{ or .Result.date_year .Result.date_day .Result.date_ago }}{{ else }}now{{ end }}"
# TSUE 2.2

View File

@ -93,7 +93,7 @@ search:
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
@ -103,7 +103,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
@ -112,6 +112,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.rowfollow:nth-child(5)
seeders: