From 1b7826590154d909a2dcdba014785b63c8a0eebd Mon Sep 17 00:00:00 2001 From: ilike2burnthing <59480337+ilike2burnthing@users.noreply.github.com> Date: Fri, 27 Oct 2023 23:47:24 +0100 Subject: [PATCH] diablotorrent: update indexer (#14799) --- README.md | 2 +- .../Definitions/diablotorrent.yml | 118 ++++++++++++------ 2 files changed, 80 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 27eec30a0..5c2c1489d 100644 --- a/README.md +++ b/README.md @@ -318,7 +318,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * DANISH BYTES * DataScene (DS) * DesiTorrents - * Diablo Torrent [![(invite needed)][inviteneeded]](#) + * Diablo Torrent * DICMusic * DigitalCore * DimeADozen (EzTorrent) diff --git a/src/Jackett.Common/Definitions/diablotorrent.yml b/src/Jackett.Common/Definitions/diablotorrent.yml index 1916c1404..dd2eb2677 100644 --- a/src/Jackett.Common/Definitions/diablotorrent.yml +++ b/src/Jackett.Common/Definitions/diablotorrent.yml @@ -10,47 +10,83 @@ links: caps: categorymappings: - - {id: 49, cat: Movies/SD, desc: "film / Cam"} - - {id: 21, cat: Movies/SD, desc: "film / Cam [magyar]"} - - {id: 102, cat: Movies/SD, desc: "film / SD"} - - {id: 101, cat: Movies/SD, desc: "film / SD [magyar]"} - - {id: 106, cat: Movies/DVD, desc: "film / DVD-R"} - - {id: 105, cat: Movies/DVD, desc: "film / DVD-R [magyar]"} - - {id: 104, cat: Movies/HD, desc: "film / HD"} - - {id: 103, cat: Movies/HD, desc: "film / HD [magyar]"} - - {id: 108, cat: TV/SD, desc: "Sorozat / SD"} - - {id: 107, cat: TV/SD, desc: "Sorozat / SD [magyar]"} - - {id: 110, cat: TV/SD, desc: "Sorozat / DVD-R"} - - {id: 109, cat: TV/SD, desc: "Sorozat / DVD-R [magyar]"} - - {id: 112, cat: TV/HD, desc: "Sorozat / HD"} - - {id: 111, cat: TV/HD, desc: "Sorozat / HD [magyar]"} - - {id: 8, cat: Audio/MP3, desc: "Zene / MP3"} - - {id: 9, cat: Audio/MP3, desc: "Zene / MP3 [magyar]"} - - {id: 38, cat: Audio/Lossless, desc: "Zene / Lossless"} - - {id: 37, cat: Audio/Lossless, desc: "Zene / Lossless [magyar]"} - - {id: 27, cat: Other, desc: "Egyéb / !! Feltöltési segédlet !!"} - - {id: 29, cat: Other, desc: "Egyéb / Képek"} - - {id: 12, cat: PC/Games, desc: "Játék / PC"} - - {id: 14, cat: Console/PS4, desc: "Játék / PS"} - - {id: 39, cat: Console/XBox, desc: "Játék / Xbox"} - - {id: 40, cat: Console/Other, desc: "Játék / Egyéb"} - - {id: 16, cat: PC/ISO, desc: "Programok / PC"} - - {id: 24, cat: PC/Mobile-Other, desc: "Programok / Mobil"} - - {id: 53, cat: PC/0day, desc: "Programok / Egyéb"} - - {id: 113, cat: XXX/XviD, desc: "Pornó / SD"} - - {id: 34, cat: XXX/DVD, desc: "Pornó / DVD-R"} - - {id: 114, cat: XXX, desc: "Pornó / HD"} - - {id: 36, cat: XXX, desc: "Pornó / Képek"} - - {id: 20, cat: Books, desc: "E-Book / Magyar"} - - {id: 52, cat: Books, desc: "E-Book / Egyéb"} + # Film + - {id: 49, cat: Movies/SD, desc: "Film > Cam"} + - {id: 21, cat: Movies/SD, desc: "Film > Cam [magyar]"} + - {id: 101, cat: Movies/SD, desc: "Film > SD/HUN"} + - {id: 102, cat: Movies/SD, desc: "Film > SD/ENG"} + - {id: 103, cat: Movies/HD, desc: "Film > HD/HUN"} + - {id: 104, cat: Movies/HD, desc: "Film > HD/ENG"} + - {id: 105, cat: Movies/DVD, desc: "Film > DVD-R/HUN"} + - {id: 106, cat: Movies/DVD, desc: "Film > DVD-R/ENG"} + # Sorozat + - {id: 107, cat: TV/SD, desc: "Sorozat > SD/HUN"} + - {id: 108, cat: TV/SD, desc: "Sorozat > SD/ENG"} + - {id: 109, cat: TV/SD, desc: "Sorozat > DVD-R/HUN"} + - {id: 110, cat: TV/SD, desc: "Sorozat > DVD-R/ENG"} + - {id: 111, cat: TV/HD, desc: "Sorozat > HD/HUN"} + - {id: 112, cat: TV/HD, desc: "Sorozat > HD/ENG"} + # Pornó + - {id: 34, cat: XXX/DVD, desc: "Pornó > DVD-R"} + - {id: 36, cat: XXX, desc: "Pornó > Képek"} + - {id: 113, cat: XXX/XviD, desc: "Pornó > SD"} + - {id: 114, cat: XXX, desc: "Pornó > HD"} + # Játék + - {id: 12, cat: PC/Games, desc: "Játék > PC"} + - {id: 14, cat: Console/PS4, desc: "Játék > PS"} + - {id: 39, cat: Console/XBox, desc: "Játék > Xbox"} + - {id: 40, cat: Console/Other, desc: "Játék > Egyéb"} + # Zene + - {id: 8, cat: Audio/MP3, desc: "Zene > MP3"} + - {id: 9, cat: Audio/MP3, desc: "Zene > MP3 [magyar]"} + - {id: 37, cat: Audio/Lossless, desc: "Zene > Lossless [magyar]"} + - {id: 38, cat: Audio/Lossless, desc: "Zene > Lossless"} + # Programok + - {id: 16, cat: PC/0day, desc: "Programok > PC"} + - {id: 24, cat: PC/Mobile-Other, desc: "Programok > Mobil"} + - {id: 53, cat: PC/0day, desc: "Programok > Egyéb"} + # Egyéb + - {id: 27, cat: Other, desc: "Egyéb > !! Feltöltési segédlet !!"} + - {id: 29, cat: Other, desc: "Egyéb > Képek"} + # E-Book + - {id: 20, cat: Books, desc: "E-Book > Magyar"} + - {id: 52, cat: Books, desc: "E-Book > Egyéb"} modes: search: [q] - tv-search: [q, season, ep] - movie-search: [q] + tv-search: [q, season, ep, imdbid] + movie-search: [q, imdbid] music-search: [q] book-search: [q] +settings: + - name: username + type: text + label: Username + - name: password + type: password + label: Password + - name: sort + type: select + label: Sort requested from site + default: 7 + options: + 1: title + 7: created + 4: seeders + 2: size + - name: type + type: select + label: Order requested from site + default: desc + options: + desc: desc + asc: asc + - name: info_tpp + type: info + label: Results Per Page + default: For best results, change the Torrent oldalanként: setting to 100 on your account profile. + login: path: login submitpath: login/run @@ -72,9 +108,10 @@ search: - path: browse inputs: $raw: "{{ range .Categories }}category[]={{.}}&{{end}}" - search: "{{ .Keywords }}" - s_alapjan: 7 - s_sorrend: desc + search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}" + imdb: "{{ if .Query.IMDBID }}1{{ else }}{{ end }}" + s_alapjan: "{{ .Config.sort }}" + s_sorrend: "{{ .Config.order }}" rows: selector: div.torrent_row, div.torrent_details @@ -125,7 +162,10 @@ search: selector: div.torrent_row_magyarcim remove: span.torrent_row_new downloadvolumefactor: - text: 0 + text: 1 uploadvolumefactor: text: 1 + minimumseedtime: + # 2 days (as seconds = 2 x 24 x 60 x 60) + text: 172800 # engine tbd