mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

bittorrentfiles: fix #4952 

update categories
implement imdbid searching
update/correct selectors
add missing volumefactor
fix date processing
This commit is contained in:
Garfield69 2019-03-25 16:15:53 +13:00
parent c2ff657272
commit 58f9078d70
1 changed files with 98 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
src/Jackett.Common/Definitions/Bittorrentfiles.yml
View File

@ -11,83 +11,92 @@
caps:
categorymappings:
# Movie
- {id: 48, cat: Movies/HD, desc: "1080p"}
- {id: 31, cat: Movies/3D, desc: "3D"}
- {id: 21, cat: Movies/HD, desc: "720p"}
- {id: 28, cat: Movies/SD, desc: "AVI"}
- {id: 20, cat: Movies/DVD, desc: "DVD-R"}
- {id: 40, cat: Movies/HD, desc: "h264/x264"}
- {id: 30, cat: Movies/HD, desc: "HD/BD"}
- {id: 49, cat: Movies/Foreign, desc: "International"}
- {id: 78, cat: Movies/HD, desc: "UHD"}
- {id: 48, cat: Movies/HD, desc: "Movie 1080p"}
- {id: 31, cat: Movies/3D, desc: "Movie 3D"}
- {id: 21, cat: Movies/HD, desc: "Movie 720p"}
- {id: 28, cat: Movies/SD, desc: "Movie AVI"}
- {id: 20, cat: Movies/DVD, desc: "Movie DVD-R"}
- {id: 40, cat: Movies/HD, desc: Movie "h264/x264"}
- {id: 30, cat: Movies/HD, desc: "Movie HD/BD"}
- {id: 49, cat: Movies/Foreign, desc: "Movie International"}
- {id: 78, cat: Movies/UHD, desc: "Movie UHD"}
- {id: 85, cat: Movies/HD, desc: "Movie x265"}
# Serien
- {id: 79, cat: TV/HD, desc: "Staffeln HD"}
- {id: 56, cat: TV/SD, desc: "Staffeln SD"}
- {id: 88, cat: TV/UHD, desc: "Staffeln UHD"}
- {id: 86, cat: TV/HD, desc: "Folgen UHD"}
- {id: 54, cat: TV/HD, desc: "Folgen HD"}
- {id: 80, cat: TV/HD, desc: "Folgen HD/BD"}
- {id: 7, cat: TV/SD, desc: "Folgen SD"}
- {id: 55, cat: TV/Foreign, desc: "International"}
- {id: 55, cat: TV/Foreign, desc: "Folgen International"}
# Doku
- {id: 64, cat: TV/Documentary, desc: "HD"}
- {id: 36, cat: TV/Documentary, desc: "SD"}
- {id: 81, cat: TV/Documentary, desc: "3D"}
- {id: 82, cat: TV/Documentary, desc: "Packs"}
- {id: 91, cat: TV/Documentary, desc: "Doku UHD"}
- {id: 64, cat: TV/Documentary, desc: "Doku HD"}
- {id: 36, cat: TV/Documentary, desc: "Doku SD"}
- {id: 81, cat: TV/Documentary, desc: "Doku 3D"}
- {id: 82, cat: TV/Documentary, desc: "Doku Packs"}
# Spiele
- {id: 4, cat: PC/Games, desc: "Windows"}
- {id: 72, cat: Console/XBox360, desc: "XBOX 360"}
- {id: 44, cat: Console/XBoxOne, desc: "XBOX One"}
- {id: 43, cat: Console/Wii, desc: "Wii"}
- {id: 69, cat: Console, desc: "PS2"}
- {id: 70, cat: Console/PS3, desc: "PS3"}
- {id: 70, cat: Console/PS4, desc: "PS4"}
- {id: 70, cat: Console/PSP, desc: "PSP"}
- {id: 42, cat: Console/Other, desc: "Misc"}
- {id: 4, cat: PC/Games, desc: "Spiele Windows"}
- {id: 92, cat: PC/Mac, desc: "Spiele Mac"}
- {id: 93, cat: PC, desc: "Spiele Linux"}
- {id: 97, cat: Console/XBox, desc: "Spiele XBOX"}
- {id: 94, cat: PC/Phone-Other, desc: "Spiele Mobile"}
- {id: 95, cat: Console/NDS, desc: "Spiele Nintendo"}
- {id: 96, cat: Console/PSP, desc: "Spiele Playstation"}
- {id: 42, cat: Console/Other, desc: "Spiele Andere"}
# Musik
- {id: 66, cat: Audio, desc: "Alben"}
- {id: 75, cat: Audio, desc: "Singles"}
- {id: 50, cat: Audio, desc: "Charts"}
- {id: 52, cat: Audio, desc: "Packs"}
- {id: 53, cat: Audio/Video, desc: "Video"}
- {id: 61, cat: Audio/Video, desc: "DVD-R"}
- {id: 83, cat: Audio, desc: "Flac"}
- {id: 68, cat: Audio, desc: "Live"}
- {id: 6, cat: Audio, desc: "Misc"}
- {id: 51, cat: Audio, desc: "OST"}
- {id: 67, cat: Audio, desc: "Sampler"}
- {id: 66, cat: Audio, desc: "Musik Alben"}
- {id: 75, cat: Audio, desc: "Musik Singles"}
- {id: 50, cat: Audio, desc: "Musik Charts"}
- {id: 52, cat: Audio, desc: "Musik Packs"}
- {id: 53, cat: Audio/Video, desc: "Musik Video"}
- {id: 61, cat: Audio/Video, desc: "Musik DVD-R"}
- {id: 83, cat: Audio/Lossless, desc: "Musik Flac"}
- {id: 68, cat: Audio, desc: "Musik Live"}
- {id: 6, cat: Audio, desc: "Musik Misc"}
- {id: 51, cat: Audio, desc: "Musik OST"}
- {id: 67, cat: Audio, desc: "Musik Sampler"}
# App
- {id: 22, cat: PC/0day, desc: "Windows"}
- {id: 62, cat: PC/Mac, desc: "Mac OS"}
- {id: 63, cat: PC/0day, desc: "Linux"}
- {id: 34, cat: PC, desc: "Andere"}
- {id: 98, cat: PC/0day, desc: "App Windows"}
- {id: 62, cat: PC/Mac, desc: "App Mac OS"}
- {id: 63, cat: PC/0day, desc: "App Linux"}
- {id: 34, cat: PC, desc: "App Andere"}
# Sport
- {id: 74, cat: TV/Sport, desc: "HD"}
- {id: 39, cat: TV/Sport, desc: "SD"}
- {id: 74, cat: TV/Sport, desc: "Sport HD"}
- {id: 39, cat: TV/Sport, desc: "Sport SD"}
# Sonstiges
- {id: 41, cat: Books/Comics, desc: "A-Book"}
- {id: 33, cat: TV/Anime, desc: "Anime"}
- {id: 35, cat: Books, desc: "e-Book"}
- {id: 65, cat: Other, desc: "E-Learning"}
- {id: 65, cat: PC, desc: "Mobile"}
- {id: 9, cat: Other, desc: "Other"}
- {id: 41, cat: Books/Comics, desc: "Sonstiges A-Book"}
- {id: 33, cat: TV/Anime, desc: "Sonstiges Anime"}
- {id: 35, cat: Books/Ebook, desc: "Sonstiges e-Book-DE"}
- {id: 90, cat: Books/Ebook, desc: "Sonstiges e-Book-INT"}
- {id: 65, cat: Other, desc: "Sonstiges E-Learning"}
- {id: 37, cat: PC, desc: "Sonstiges Mobile"}
- {id: 87, cat: Books/Magazines, desc: "Sonstiges E-Paper"}
- {id: 38, cat: Other, desc: "Sonstiges Kids"}
- {id: 47, cat: Other, desc: "Sonstiges Line"}
- {id: 9, cat: Other, desc: "Sonstiges Andere"}
#XXX
- {id: 58, cat: Books/Comics, desc: "HD"}
- {id: 33, cat: XXX, desc: "Hentai"}
- {id: 35, cat: XXX/Other, desc: "Other"}
- {id: 65, cat: XXX/Packs, desc: "Pack"}
- {id: 65, cat: XXX, desc: "SD"}
- {id: 58, cat: Books/Comics, desc: "XXX HD"}
- {id: 46, cat: XXX, desc: "XXX Hentai"}
- {id: 35, cat: XXX/Other, desc: "XXX Andere"}
- {id: 59, cat: XXX/Packs, desc: "XXX Pack"}
- {id: 27, cat: XXX, desc: "XXX SD"}
- {id: 76, cat: XXX, desc: "XXX Andere"}
modes:
search: [q]
tv-search: [q, season, ep]
search: [q, imdbid]
tv-search: [q, season, ep, imdbid]
movie-search: [q, imdbid]
settings:
- name: user
@ -113,8 +122,11 @@
path: browse.php
inputs:
$raw: "{{range .Categories}}c{{.}}=1&{{end}}"
search: "{{ .Query.Keywords }}"
incldead: "1"
search: "{{if .Query.IMDBID}}{{.Query.IMDBID}}{{else}}{{.Keywords}}{{end}}"
# 0=title 1=descr 2=nfo 3=all
search_where: "{{if .Query.IMDBID}}3{{else}}0{{end}}"
# 0=active 1=all 2=dead 4=upload 5=doubleup 6=halfdown 7=highlight =request
status: 1
rows:
selector: table.tableinborder > tbody > tr:has(a[href^="details.php"])
@ -134,10 +146,16 @@
download:
selector: a[href^="/download.php"]
attribute: href
files:
selector: td:nth-child(5)
grabs:
selector: td:nth-child(4)
text: 0
grabs:
selector: a[title="Snatcher"]
optional: true
files:
text: 0
files:
selector: a[title="Files"]
optional: true
size:
selector: td:nth-child(6)
filters:
@ -146,24 +164,42 @@
- name: replace
args: [",", "."]
seeders:
selector: td:nth-child(2) > a
text: 0
seeders:
selector: a[title="Seeder"]
optional: true
leechers:
selector: td:nth-child(3)
text: 0
leechers:
selector: a[title="Leecher"]
optional: true
# 2 flavours of dates
date:
selector: td:nth-child(10)
# Heute 13:30:04
# Gestern 09:10:10
selector: td:nth-child(10):contains("Heute"), td:nth-child(10):contains("Gestern")
optional: true
filters:
- name: split
args: ["by", 0]
args: ["b", 0]
- name: replace
args: ["Heute", "Today"]
- name: replace
args: ["Gestern", "Yesterday"]
date:
# 30.02.2018 23:12:50
selector: td:nth-child(10):contains("."):contains(":")
optional: true
filters:
- name: split
args: ["b", 0]
- name: dateparse
args: "02.01.2006 15:04:05"
downloadvolumefactor:
case:
img[alt="OU"]: "0"
img[alt="D/2"]: "0.5"
img[alt="D / 2"]: "0.5"
"*": "1"
uploadvolumefactor:
case: