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

This commit is contained in:
Garfield69
2021-10-21 19:43:44 +13:00
parent 4d13c14f1d
commit 0e726306ec
12 changed files with 90 additions and 82 deletions

View File

@@ -121,15 +121,13 @@ search:
download:
selector: td a[href^="download.php"]
attribute: href
imdb:
imdbid:
selector: a[href*="imdb.com/title/tt"]
attribute: href
filters:
# http://anonym.to?javascript:popdetails('http://www.imdb.com/title/tt0086817');
- name: replace
args: [" http://anonym.to?javascript:popdetails('", ""]
- name: replace
args: ["');", ""]
- name: regexp
args: tt(\d+)
poster:
selector: td a[href^="index.php?page=torrent-details"]
attribute: onmouseover
@@ -141,7 +139,7 @@ search:
size:
selector: td:nth-child(10)
# two flavours of dates
date:
date_day:
# Yesterday at 10:03:30 PM
selector: td:nth-child(5):contains("day")
optional: true
@@ -150,7 +148,7 @@ search:
args: ["[ ]at|[\\s+]|[//\xa0],\\/g", " "]
- name: append
args: " +00:00" # auto adjusted by site account profile
date:
date_year:
# February 09, 2019, 06:35:08 AM
selector: td:nth-child(5):not(:contains("day"))
optional: true
@@ -161,6 +159,8 @@ search:
args: " +00:00" # auto adjusted by site account profile
- name: dateparse
args: "January 02 2006 03:04:05 PM -07:00"
date:
text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
seeders:
selector: td:nth-child(6)
leechers:

View File

@@ -90,7 +90,6 @@ search:
attribute: src
description:
selector: div.short_game_genre
optional: true
date:
text: now
seeders:

View File

@@ -107,12 +107,14 @@ 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
@@ -122,7 +124,7 @@ search:
imdb:
selector: a[href*="imdb.com/title/tt"]
attribute: href
date:
date_elapsed:
# time type: time elapsed (default)
selector: td.rowfollow:nth-child(4) > span[title]
attribute: title
@@ -132,7 +134,7 @@ search:
args: " +02:00" # EET
- name: dateparse
args: "2006-01-02 15:04:05 -07:00"
date:
date_added:
# time added
selector: td.rowfollow:nth-child(4):not(:has(span))
optional: true
@@ -141,6 +143,8 @@ search:
args: " +02:00" # EET
- 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:

View File

@@ -101,12 +101,14 @@ 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
@@ -121,7 +123,7 @@ search:
selector: td:nth-child(6)
leechers:
selector: td:nth-child(7)
date:
date_elapsed:
# time type: time elapsed (default)
selector: td:nth-child(4) > span[title]
attribute: title
@@ -131,7 +133,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
@@ -140,6 +142,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 }}"
downloadvolumefactor:
case:
img.pro_free: 0

View File

@@ -148,7 +148,6 @@ search:
selector: a[href*="imdb.com/title/tt"]
attribute: href
description:
optional: true
selector: img[src="pic/Poland.png"]
attribute: src
filters:

View File

@@ -86,7 +86,7 @@ login:
username: "{{ .Config.username }}"
password: "{{ .Config.password }}"
pin: "{{ .Config.pin }}"
loggiin: "einloggen"
loggiin: einloggen
error:
- selector: div#login_error
test:
@@ -106,9 +106,9 @@ search:
- path: selection.php
inputs:
search: "{{ .Keywords }}"
blah: "0"
orderby: "added"
sort: "desc"
blah: 0
orderby: added
sort: desc
rows:
selector: div.selection_wrap
fields:
@@ -127,65 +127,63 @@ search:
selector: div.kat_cat_pic
case:
# Movie-HD
":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "154"
":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD-Pack\"))": "162"
":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "32"
":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": 154
":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD-Pack\"))": 162
":has(div.kat_cat_pic_name:contains(\"Movie-HD\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 32
# Movie
":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "28"
":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "155"
":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD-Pack\"))": "130"
":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": 28
":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 155
":has(div.kat_cat_pic_name:contains(\"Movie\")):has(div.kat_cat_pic_name_b:contains(\"SD-Pack\"))": 130
# Serien
":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": "60"
":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": "157"
":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": "158"
":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"Xvid/x264\"))": 60
":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"720p/1080p\"))": 157
":has(div.kat_cat_pic_name:contains(\"Serien\")):has(div.kat_cat_pic_name_b:contains(\"UHD/4K\"))": 158
# S-Packs
":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "57"
":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"720p\"))": "59"
":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": "156"
":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 57
":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"720p\"))": 59
":has(div.kat_cat_pic_name:contains(\"S-Packs\")):has(div.kat_cat_pic_name_b:contains(\"1080p\"))": 156
# Doku
":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "160"
":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "15"
":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 160
":has(div.kat_cat_pic_name:contains(\"Doku\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 15
# App
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": "12"
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": "11"
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": "10"
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": "9"
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Win\"))": 12
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Other\"))": 11
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Mac\"))": 10
":has(div.kat_cat_pic_name:contains(\"App\")):has(div.kat_cat_pic_name_b:contains(\"Linux/Android\"))": 9
# Game
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": "131"
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": "17"
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": "18"
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": "24"
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Nintendo\"))": 131
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PC\"))": 17
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"PS\"))": 18
":has(div.kat_cat_pic_name:contains(\"Game\")):has(div.kat_cat_pic_name_b:contains(\"Wimmelbild\"))": 24
# Audio
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": "159"
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": "48"
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": "53"
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "52"
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": "109"
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Hörbuch\"))": 159
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"mp3\"))": 48
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Flac\"))": 53
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 52
":has(div.kat_cat_pic_name:contains(\"Audio\")):has(div.kat_cat_pic_name_b:contains(\"Video-HD/SD\"))": 109
# Sport
":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": "62"
":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": "161"
":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"SD\"))": 62
":has(div.kat_cat_pic_name:contains(\"Sport\")):has(div.kat_cat_pic_name_b:contains(\"HD\"))": 161
# Paper
":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": "163"
":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Comic\"))": "63"
":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": "96"
":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Zeitungen\"))": 163
":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"Comic\"))": 63
":has(div.kat_cat_pic_name:contains(\"Paper\")):has(div.kat_cat_pic_name_b:contains(\"E-Book\"))": 96
# XXX
":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": "113"
":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": "76"
":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": "75"
":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"DVD\"))": 113
":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"HD-SD\"))": 76
":has(div.kat_cat_pic_name:contains(\"XXX\")):has(div.kat_cat_pic_name_b:contains(\"Pack\"))": 75
# Request
":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": "151"
":has(div.kat_cat_pic_name:contains(\"Request\")):has(div.kat_cat_pic_name_b:contains(\"spritti01\"))": 151
poster:
selector: div[id^="details"] img
attribute: src
size:
selector: div.selection_unter_ag
grabs:
text: 0
seeders:
selector: div.selection_unter_aa
leechers:
selector: div.selection_unter_aaa
date:
date_day:
# Heute 13:30:04
# Gestern 09:10:10
selector: div.selection_unter_ab:not(:contains("."))
@@ -195,7 +193,7 @@ search:
args: ["Heute", "Today"]
- name: replace
args: ["Gestern", "Yesterday"]
date:
date_year:
# 30.02.2018 um 23:12:50
selector: div.selection_unter_ab:contains(".")
optional: true
@@ -206,9 +204,10 @@ 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 }}"
description:
selector: selection_unter_af
optional: true
downloadvolumefactor:
text: 1
uploadvolumefactor:

View File

@@ -59,7 +59,7 @@ search:
selector: td:nth-child(4)
grabs:
selector: td:nth-child(7) span
date:
date_year:
selector: td:nth-child(1):contains("/")
optional: true
filters:
@@ -67,7 +67,7 @@ search:
args: " +08:00" # CST (China)
- name: dateparse
args: "2006/01/02 -07:00"
date:
date_today:
selector: td:nth-child(1):contains("今天")
optional: true
filters:
@@ -77,20 +77,22 @@ search:
args: " +08:00" # CST (China)
- name: timeparse
args: "15:04 -07:00"
date:
date_yday:
selector: td:nth-child(1):contains("昨天")
optional: true
filters:
- name: re_replace
args: [".+", "yesterday"]
- name: fuzzytime
date:
date_ago:
selector: td:nth-child(1):contains("前天")
optional: true
filters:
- name: re_replace
args: [".+", "2 days"]
- name: timeago
date:
text: "{{ if or .Result.date_year .Result.date_today .Result.date_yday .Result.date_ago }}{{ or .Result.date_year .Result.date_today .Result.date_yday .Result.date_ago }}{{ else }}now{{ end }}"
seeders:
selector: td:nth-child(5) span
leechers:

View File

@@ -111,7 +111,7 @@ search:
selector: td:nth-last-child(2)
grabs:
selector: td:nth-last-child(1)
imdb:
imdbid:
selector: a[href*="imdb.com/title/tt"]
attribute: href
downloadvolumefactor:

View File

@@ -167,16 +167,16 @@ search:
selector: div.poid
date:
text: now
seeders:
text: 0
seeders:
seeders_optional:
selector: div.up
optional: true
leechers:
text: 0
leechers:
seeders:
text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
leechers_optional:
selector: div.down
optional: true
leechers:
text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
downloadvolumefactor:
text: 0
uploadvolumefactor:

View File

@@ -153,16 +153,16 @@ search:
args: ["(\\d+)\\.\\d", "$1 MB"]
date:
text: now
seeders:
text: 0
seeders:
seeders_optional:
selector: div.up
optional: true
leechers:
text: 0
leechers:
seeders:
text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
leechers_optional:
selector: div.down
optional: true
leechers:
text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
downloadvolumefactor:
text: 0
uploadvolumefactor:

View File

@@ -136,7 +136,7 @@ search:
attribute: href
files:
selector: td:nth-of-type(4)
date:
date_day:
# Danas<br>08:10 AM
# Juče<br>06:44 PM
optional: true
@@ -148,7 +148,7 @@ search:
args: ["Juče", "Yesterday"]
- name: append
args: " +00:00" # auto adjusted by site account profile
date:
date_year:
# Feb 14 2019<br>10:20 AM
optional: true
selector: td:nth-of-type(6):not(:contains("Juče")):not(:contains("Danas"))
@@ -157,6 +157,8 @@ search:
args: " +00:00" # auto adjusted by site account profile
- name: dateparse
args: "Jan 2 2006 03:04 PM -07:00"
date:
text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}"
size:
selector: td:nth-of-type(7)
grabs:

View File

@@ -92,7 +92,6 @@ search:
selector: a[href^="torrents.php?action=download&id="]
attribute: href
description:
optional: true
selector: div.tags
poster:
selector: td:nth-child(2) > script