assorted yml: code tidy

This commit is contained in:
Garfield69
2020-11-14 16:52:45 +13:00
parent 8d6d56bc67
commit 91b0347256
7 changed files with 27 additions and 31 deletions

View File

@@ -165,10 +165,10 @@ login:
download: download:
before: before:
path: thanks.php path: thanks.php
method: "get" method: get
inputs: inputs:
id: "{{ .DownloadUri.Query.id }}" id: "{{ .DownloadUri.Query.id }}"
to: "give" to: give
torrent: "{{ .DownloadUri.Query.id }}" torrent: "{{ .DownloadUri.Query.id }}"
selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]" selector: "a[href^=\"/{{ .DownloadUri.Query.id }}/\"]"
attribute: href attribute: href

View File

@@ -89,20 +89,20 @@ search:
after: 1 after: 1
fields: 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: category:
selector: div.box_category > img selector: div.box_category > img
attribute: onclick attribute: onclick
filters: filters:
- name: regexp - name: regexp
args: "category\\((\\d+),\\d+\\);" 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: seeders:
selector: div.box_seeders selector: div.box_seeders
leechers: leechers:

View File

@@ -16,22 +16,18 @@ caps:
- {id: 12, cat: Movies/Other, desc: "Мультфильмы"} - {id: 12, cat: Movies/Other, desc: "Мультфильмы"}
- {id: 9, cat: TV/Documentary, desc: "Документальные"} - {id: 9, cat: TV/Documentary, desc: "Документальные"}
- {id: 11, cat: TV, desc: "Сериалы"} - {id: 11, cat: TV, desc: "Сериалы"}
- {id: 10, cat: Audio, desc: "Музыка"} - {id: 10, cat: Audio, desc: "Музыка"}
- {id: 16, cat: Books, desc: "Книги"} - {id: 16, cat: Books, desc: "Книги"}
- {id: 22, cat: Other, desc: "Картинки"} - {id: 22, cat: Other, desc: "Картинки"}
- {id: 1, cat: PC, desc: "Приложения Windows"} - {id: 1, cat: PC, desc: "Приложения Windows"}
- {id: 3, cat: PC, desc: "Приложения Unix/Linux"} - {id: 3, cat: PC, desc: "Приложения Unix/Linux"}
- {id: 4, cat: PC/Mac, desc: "Приложения Mac"} - {id: 4, cat: PC/Mac, desc: "Приложения Mac"}
- {id: 2, cat: PC/Mobile-Other, desc: "Приложения PDA"} - {id: 2, cat: PC/Mobile-Other, desc: "Приложения PDA"}
- {id: 5, cat: PC/Games, desc: "Игры PC"} - {id: 5, cat: PC/Games, desc: "Игры PC"}
- {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"} - {id: 23, cat: PC/Games, desc: "Игры Unix/Linux"}
- {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"} - {id: 6, cat: Console/PS3, desc: "Игры PlayStation 3"}
- {id: 7, cat: Console/XBox, desc: "Игры X-Box"} - {id: 7, cat: Console/XBox, desc: "Игры X-Box"}
- {id: 8, cat: Console/PSP, desc: "Игры PSP"} - {id: 8, cat: Console/PSP, desc: "Игры PSP"}
- {id: 18, cat: Other, desc: "Эксклюзивы"} - {id: 18, cat: Other, desc: "Эксклюзивы"}
- {id: 21, cat: Other, desc: "Лавка субтитров"} - {id: 21, cat: Other, desc: "Лавка субтитров"}
- {id: 20, cat: Other, desc: "DEMO"} - {id: 20, cat: Other, desc: "DEMO"}

View File

@@ -1,7 +1,7 @@
--- ---
id: ethor id: ethor
name: Ethor.net (Thor's Land) name: Ethor.net (Thor's Land)
description: "A French gerneral tracker" description: "A French general tracker"
language: fr-fr language: fr-fr
type: private type: private
encoding: UTF-8 encoding: UTF-8
@@ -76,7 +76,7 @@ login:
inputs: inputs:
username: "{{ .Config.username }}" username: "{{ .Config.username }}"
password: "{{ .Config.password }}" password: "{{ .Config.password }}"
secure_cookie: "0" secure_cookie: 0
error: error:
- selector: :contains("\"status\":\"error\"") - selector: :contains("\"status\":\"error\"")
test: test:
@@ -87,7 +87,7 @@ search:
- path: browse.php - path: browse.php
inputs: inputs:
$raw: "{{ range .Categories }}c{{.}}=1&{{end}}" $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 advcat: 0
incldead: 1 incldead: 1
stype: b stype: b
@@ -116,9 +116,9 @@ search:
text: "{{ .Result._title_original }}" text: "{{ .Result._title_original }}"
filters: filters:
- name: re_replace - 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 - 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: _title_multilang:
text: "{{ .Result._title_normalized }}" text: "{{ .Result._title_normalized }}"
filters: filters:
@@ -127,7 +127,7 @@ search:
- name: re_replace - name: re_replace
args: ["(?i)[\\.\\s\\[\\-]VFQ[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."] args: ["(?i)[\\.\\s\\[\\-]VFQ[\\.\\s\\]\\-]", ".{{ .Config.multilanguage }}."]
title: 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: category:
selector: a[href^="/browse.php?cat="] selector: a[href^="/browse.php?cat="]
attribute: href attribute: href
@@ -145,7 +145,7 @@ search:
selector: td:nth-child(7) selector: td:nth-child(7)
filters: filters:
- name: regexp - name: regexp
args: "(\\d+)" args: (\d+)
seeders: seeders:
selector: td:nth-child(8) selector: td:nth-child(8)
leechers: leechers:
@@ -154,7 +154,7 @@ search:
selector: td:nth-child(5) selector: td:nth-child(5)
filters: filters:
- name: append - name: append
args: " -05:00" # timezone offset args: " -05:00" # timezone offset? is this correct? usually France is on CET +01:00
- name: dateparse - name: dateparse
args: "2006-01-0215:04:05 -07:00" args: "2006-01-0215:04:05 -07:00"
downloadvolumefactor: downloadvolumefactor:

View File

@@ -100,7 +100,7 @@ login:
username: "{{ .Config.username }}" username: "{{ .Config.username }}"
password: "{{ .Config.password }}" password: "{{ .Config.password }}"
autologin: 1 autologin: 1
returnto: "index.php" returnto: index.php
error: error:
- selector: td.embedded:contains("Ошибка входа") - selector: td.embedded:contains("Ошибка входа")
test: test:
@@ -118,8 +118,8 @@ search:
- name: re_replace # strip S01E01 - name: re_replace # strip S01E01
args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""] args: ["(?i)\\bS0*(\\d+)E0*(\\d+)\\b", ""]
inputs: inputs:
$raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}cat=0{{end}}" $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{ else }}cat=0{{ end }}"
# 0 active 1 incldead 2 onlydead 4 noseeds (isn't this == onlydead?) # 0 active, 1 incldead, 2 onlydead, 4 noseeds (how is this different from onlydead?)
incldead: 1 incldead: 1
search: "{{ .Keywords }}" search: "{{ .Keywords }}"
sort: "{{ .Config.sort }}" sort: "{{ .Config.sort }}"

View File

@@ -144,7 +144,7 @@ search:
paths: paths:
- path: selection.php - path: selection.php
inputs: inputs:
$raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{else}}{{end}}" $raw: "{{ if .Categories }}{{ range .Categories }}scat[]={{.}}&{{end}}{{ else }}{{ end }}"
search: "{{ .Keywords }}" search: "{{ .Keywords }}"
blah: 0 blah: 0
orderby: "{{ .Config.sort }}" orderby: "{{ .Config.sort }}"
@@ -154,8 +154,6 @@ search:
selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="]) selector: div.content_wrap > div.selection_wrap:has(a[href^="details.php?id="])
fields: fields:
title:
selector: a[href^="details.php?id="]
category: category:
selector: a[href^="selection.php?cat="] selector: a[href^="selection.php?cat="]
attribute: href attribute: href
@@ -164,6 +162,8 @@ search:
args: cat args: cat
- name: replace - name: replace
args: ["#2", ""] args: ["#2", ""]
title:
selector: a[href^="details.php?id="]
details: details:
selector: a[href^="details.php?id="] selector: a[href^="details.php?id="]
attribute: href attribute: href
@@ -187,10 +187,10 @@ search:
date: date:
selector: div.selection_unter_ab selector: div.selection_unter_ab
filters: filters:
- name: append
args: " +01:00"
- name: replace - name: replace
args: ["um ", ""] args: ["um ", ""]
- name: append
args: " +01:00" # CET
- name: dateparse - name: dateparse
args: "02.01.2006 15:04:05 -07:00" args: "02.01.2006 15:04:05 -07:00"
downloadvolumefactor: downloadvolumefactor:

View File

@@ -122,7 +122,7 @@ search:
attribute: title attribute: title
filters: filters:
- name: append - name: append
args: " +00:00" args: " +00:00" # auto adjusted by site account profile
- name: dateparse - name: dateparse
args: "Jan 02 2006, 15:04 -07:00" args: "Jan 02 2006, 15:04 -07:00"
size: size: