From d477f01f843eccc7f780d0f633f74582747a5e3f Mon Sep 17 00:00:00 2001 From: fnk93 Date: Fri, 6 Mar 2020 05:25:28 +0100 Subject: [PATCH] Speedtorrent Reloaded: Update to new tracker source (#7519) resolves #7517 --- .../Definitions/speedtorrentreloaded.yml | 190 +++++++++++------- 1 file changed, 121 insertions(+), 69 deletions(-) diff --git a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml index d65d44fb7..83feaa604 100644 --- a/src/Jackett.Common/Definitions/speedtorrentreloaded.yml +++ b/src/Jackett.Common/Definitions/speedtorrentreloaded.yml @@ -5,121 +5,173 @@ language: de-de type: private encoding: UTF-8 + followredirect: true links: + - https://st-tracker.eu/ + legacylinks: - https://speedtorrent-tracker.mine.nu/ caps: categorymappings: - - {id: 200, cat: Movies/UHD, desc: "Filme UHD"} - - {id: 201, cat: Movies, desc: "Filme Remux"} - - {id: 203, cat: Movies/HD, desc: "Filme HD"} - - {id: 204, cat: Movies/DVD, desc: "Filme DVD"} - - {id: 205, cat: Movies/3D, desc: "Filme 3D"} - - {id: 206, cat: Movies/SD, desc: "Filme SD"} - - {id: 290, cat: Movies/HD, desc: "Filme Int. HD"} - - {id: 291, cat: Movies/SD, desc: "Filme Int. SD"} - - {id: 121, cat: TV/SD, desc: "Serien SD"} - - {id: 131, cat: TV/HD, desc: "Serien HD"} - - {id: 132, cat: TV, desc: "Serien Packs"} - - {id: 211, cat: TV/HD, desc: "Serien Staffeln HD"} - - {id: 94201, cat: TV/SD, desc: "Serien Staffeln SD"} - - {id: 116, cat: Console, desc: "Spiele Konsolen"} - - {id: 117, cat: PC/Games, desc: "Spiele Windows"} - - {id: 124, cat: Console/Other, desc: "Spiele sonstige"} - - {id: 125, cat: PC/0day, desc: "Software Windows"} - - {id: 126, cat: PC/0day, desc: "Software Mac / Linux"} - - {id: 129, cat: PC/Phone-Other, desc: "Software Handy / Navi / Sonst"} - - {id: 210, cat: PC, desc: "Mac / Linux"} - - {id: 120, cat: Audio/Other, desc: "Musik Alben / Sampler "} - - {id: 135, cat: Audio, desc: "Musik Discographie"} - - {id: 137, cat: Audio/Video, desc: "Musik Video"} - - {id: 123, cat: TV/Documentary, desc: "Doku SD"} - - {id: 138, cat: TV/Documentary, desc: "Doku HD"} - - {id: 141, cat: Audio/Audiobook, desc: "A/Ebook Hoerbook"} - - {id: 142, cat: Books/Ebook, desc: "A/Ebook EBooks"} - - {id: 143, cat: Books/Other, desc: "sonstige PDF"} - - {id: 350, cat: TV/Sport, desc: "Sport"} - - {id: 208, cat: XXX, desc: "Erotik XXX Audiobook"} - - {id: 122, cat: XXX, desc: "Erotik XXX Film"} - - {id: 144, cat: XXX, desc: "Erotik XXX Pics"} - - {id: 603, cat: XXX, desc: "Erotik XXX PDF"} - - {id: 604, cat: XXX, desc: "Erotik XXX Games"} + - {id: 89, cat: Movies/UHD, desc: "Movies-4K"} + - {id: 47, cat: Movies/BluRay, desc: "Movies-Bluray"} + - {id: 62, cat: Movies/SD, desc: "Movies-SD"} + - {id: 48, cat: Movies/HD, desc: "Movies-720p"} + - {id: 49, cat: Movies/HD, desc: "Movies-1080p"} + - {id: 11, cat: Movies/DVD, desc: "Movies DVD / HD2DVD"} + - {id: 90, cat: Movies/3D, desc: "Movies-3-D"} + - {id: 60, cat: Movies/HD, desc: "Movies-HDTV"} + - {id: 91, cat: Movies, desc: "Movies-Packs"} + - {id: 77, cat: TV/SD, desc: "Serien-SD"} + - {id: 78, cat: TV/HD, desc: "Serien-720p"} + - {id: 79, cat: TV/HD, desc: "Serien-1080p"} + - {id: 16, cat: TV, desc: "Serien-Packs"} + - {id: 100, cat: TV/HD, desc: "Staffel-HD"} + - {id: 99, cat: TV/SD, desc: "Staffel-SD"} + - {id: 95, cat: TV/UHD, desc: "Serien-4K"} + - {id: 64, cat: TV/Documentary, desc: "Serien-Doku"} + - {id: 4, cat: PC/Games, desc: "PC-Games"} + - {id: 84, cat: Console/PS3, desc: "PS3/PS4"} + - {id: 84, cat: Console/PS4, desc: "PS3/PS4"} + - {id: 85, cat: Console/Xbox 360, desc: "Xbox-360"} + - {id: 28, cat: PC/0day, desc: "Windows-Programme"} + - {id: 18, cat: PC/0day, desc: "Appz-Sonstige"} + - {id: 14, cat: Audio/Other, desc: "Alben / Sampler / Singles"} + - {id: 98, cat: Audio, desc: "Discografie"} + - {id: 93, cat: Audio/Video, desc: "Musik-Videos"} + - {id: 36, cat: Audio/Audiobook, desc: "Hörbuch"} + - {id: 71, cat: Audio/Other, desc: "Soundtracks"} + - {id: 70, cat: Audio/Lossless, desc: "Flac"} + - {id: 72, cat: Audio, desc: "Musik-Packs"} + - {id: 19, cat: Books/Ebook, desc: "EBooks"} + - {id: 87, cat: TV/Anime, desc: "Anime"} + - {id: 96, cat: Other, desc: "Sonstiges"} + - {id: 23, cat: TV/Sport, desc: "Wrestling"} + - {id: 74, cat: TV/Sport, desc: "Fussball"} + - {id: 75, cat: TV/Sport, desc: "Formel 1"} + - {id: 88, cat: XXX, desc: "XXX"} modes: search: [q] tv-search: [q, season, ep] movie-search: [q] + settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: secure_code + type: password + label: "Secure Code (4 digits)" + - name: sort + type: select + label: Sort requested from site + default: "added" + options: + "added": "created" + "seeds": "seeders" + "size": "size" + "name": "title" + - name: type + type: select + label: Order requested from site + default: "desc" + options: + "desc": "desc" + "asc": "asc" + login: - path: takelogin.php - method: post + path: login.php + method: form + form: form inputs: + take: "yes" username: "{{ .Config.username }}" password: "{{ .Config.password }}" + secure_code: "{{ .Config.secure_code }}" test: - path: browse.php + path: sessioncheck.php search: paths: - - path: browse.php + - path: tfiles.php inputs: - $raw: "{{range .Categories}}c{{.}}=1&{{end}}" - search: "{{ .Query.Keywords }}" - incldead: "1" - orderby: "added" - sort: desc + showsearch: 1 + $raw: "{{ if .Categories }}{{ range .Categories }}c{{.}}=1&{{end}}{{else}}{{end}}" + search: "{{ .Keywords }}" + orderby: "{{ .Config.sort }}" + sort: "{{ .Config.type }}" + incldead: 1 + rows: - selector: table > tbody > tr > td > table.tableinborder > tbody > tr:has(a[href^="details.php"]) + selector: tr:has(a[href^="details.php?id="]) + fields: title: - selector: a[href^="details.php"] + selector: a[href^="details.php?id="] banner: - selector: a[href^="details.php"][onmouseover] + selector: a[href^="details.php?id="][onmouseover] attribute: onmouseover filters: - name: regexp - args: "')" + args: " table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(2) grabs: - selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(3) > b:nth-child(1) - size: - selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(1) > b:nth-child(1) + selector: tr > th > span:nth-child(5) filters: + - name: regexp + args: (\d+) + size: + selector: tr > th > span:nth-child(2) + filters: + - name: replace + args: ["Größe: ", ""] - name: replace args: [".", ""] - name: replace args: [",", "."] seeders: - selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(1) - leechers: - selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(2) > b:nth-child(3) - date: - selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td:nth-child(5) + selector: tr > th > span:nth-child(3) filters: + - name: regexp + args: (\d+) + leechers: + selector: tr > th > span:nth-child(4) + filters: + - name: regexp + args: (\d+) + date: + selector: tr > td:nth-child(3) + filters: + - name: regexp + args: "(\\d{2}\\.\\d{2}\\.\\d{4}\\s\\d{2}:\\d{2}:\\d{2})" - name: append - args: " +2:00" + args: " +01:00" + - name: replace + args: ["\xA0", " "] + - name: replace + args: [" ", " "] - name: dateparse args: "02.01.2006 15:04:05 -07:00" downloadvolumefactor: - case: - img[title="OnlyUp"]: "0" - "*": "1" + text: 1 uploadvolumefactor: - case: - "*": "1" + text: 1 + minimumratio: + text: 0.7 + minimumseedtime: + text: 172800