From 7d8a25040646c58a33d9028e82c58b934cf06724 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 7 Feb 2022 07:28:07 +1300 Subject: [PATCH] ettv: removed. resolves #2052 --- README.md | 1 - src/Jackett.Common/Definitions/ettv.yml | 181 ------------------------ src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 182 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/ettv.yml diff --git a/README.md b/README.md index f4a6cbcaf..7c022f2c7 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * elitetorrent * EpubLibre * Erai-Raws - * ETTV * EXT Torrents * ExtraTorrent.st * EZTV diff --git a/src/Jackett.Common/Definitions/ettv.yml b/src/Jackett.Common/Definitions/ettv.yml deleted file mode 100644 index dfb8e144e..000000000 --- a/src/Jackett.Common/Definitions/ettv.yml +++ /dev/null @@ -1,181 +0,0 @@ ---- -id: ettv -name: ETTV -description: "ETTV is a Public torrent site for TV / MOVIES, home of the ETTV, ETHD and DTOne groups." -language: en-US -type: public -encoding: UTF-8 -followredirect: true -links: - - https://www.ettvcentral.com/ - - https://ettv.unblockninja.com/ - - https://ettv.unblockit.how/ - - https://ettv.nocensor.biz/ -legacylinks: - - https://www.ettv.tv/ - - https://www.ettv.to/ - - https://www.ettvdl.com/ - - https://www.ettv.be/ - - https://ettv.unblockit.dev/ - - https://ettv.unblockit.ltd/ - - https://ettv.unblockit.link/ - - https://ettv.unblockit.buzz/ - - https://ettv.unblocked.monster/ - - https://ettv.unblockit.club/ - - https://ettv.unblockit.onl/ - - https://ettv.unblockit.li/ - - https://ettv.unblockit.uno/ - - https://ettv.unblockit.ch/ - - https://ettv.nocensor.space/ - - https://ettv.unblockit.ws/ - - https://ettv.nocensor.work/ - - https://ettv.unblockit.kim/ - - https://ettv.unblockit.bz/ - - https://ettv.unblockit.tv/ - -caps: - categorymappings: - - {id: 88, cat: XXX, desc: "Adult - Books"} - - {id: 84, cat: XXX, desc: "Adult - Games"} - - {id: 82, cat: XXX, desc: "Adult - HD-Movies"} - - {id: 83, cat: XXX, desc: "Adult - Hentai"} - - {id: 86, cat: XXX, desc: "Adult - Magazines"} - - {id: 81, cat: XXX, desc: "Adult - Movies"} - - {id: 87, cat: XXX, desc: "Adult - Other"} - - {id: 85, cat: XXX, desc: "Adult - Pictures"} - - {id: 74, cat: TV/Anime, desc: "Anime - Dubbed/Subbed"} - - {id: 73, cat: TV/Anime, desc: "Anime - Movies"} - - {id: 75, cat: TV/Anime, desc: "Anime - Others"} - - {id: 56, cat: Audio/Audiobook, desc: "Books - Audio"} - - {id: 55, cat: Books/Comics, desc: "Books - Comics"} - - {id: 53, cat: Books/EBook, desc: "Books - Ebooks"} - - {id: 54, cat: Books/Mags, desc: "Books - Magazines"} - - {id: 68, cat: Books/Other, desc: "Books - Others"} - - {id: 90, cat: Books/Other, desc: "Books - Others"} - - {id: 58, cat: PC/Games, desc: "Games - Android"} - - {id: 71, cat: PC/Games, desc: "Games - Others"} - - {id: 57, cat: PC/Games, desc: "Games - Windows"} - - {id: 49, cat: Movies/3D, desc: "Movies - 3D"} - - {id: 66, cat: Movies/BluRay, desc: "Movies - BluRay Disc/Remux"} - - {id: 91, cat: Movies, desc: "Movies - Bollywood"} - - {id: 65, cat: Movies/SD, desc: "Movies - CAM/TS"} - - {id: 80, cat: TV/Documentary, desc: "Documentary"} - - {id: 51, cat: Movies, desc: "Movies - Dubs/Dual Audio"} - - {id: 67, cat: Movies/DVD, desc: "Movies - DVDR"} - - {id: 1, cat: Movies/HD, desc: "Movies - HD 1080p"} - - {id: 2, cat: Movies/HD, desc: "Movies - HD 720p"} - - {id: 76, cat: Movies/HD, desc: "Movies - HEVC/x265"} - - {id: 47, cat: Movies/HD, desc: "Movies - X264/H264"} - - {id: 3, cat: Movies/UHD, desc: "Movies - UltraHD/4K"} - - {id: 42, cat: Movies/SD, desc: "Movies - XviD"} - - {id: 60, cat: Audio/Lossless, desc: "Music - FLAC"} - - {id: 59, cat: Audio/MP3, desc: "Music - MP3"} - - {id: 61, cat: Audio/Video, desc: "Music - Music Videos"} - - {id: 69, cat: Audio/Other, desc: "Music - Others"} - - {id: 95, cat: Other/Misc, desc: "Others - Misc"} - - {id: 78, cat: Other, desc: "Others - Unsorted"} - - {id: 63, cat: PC/Mobile-Android, desc: "Software - Android"} - - {id: 64, cat: PC/Mac, desc: "Software - Mac"} - - {id: 70, cat: PC, desc: "Software - Others"} - - {id: 62, cat: PC/0day, desc: "Software - Windows"} - - {id: 94, cat: Books, desc: "Tutorials - Tutorials"} - - {id: 79, cat: TV/Documentary, desc: "Documentary"} - - {id: 41, cat: TV/HD, desc: "TV - HD/X264/H264"} - - {id: 77, cat: TV/HD, desc: "TV - HEVC/x265"} - - {id: 5, cat: TV/SD, desc: "TV - SD/X264/H264"} - - {id: 50, cat: TV/SD, desc: "TV - SD/XVID"} - - {id: 72, cat: TV/Sport, desc: "TV - Sport"} - - {id: 7, cat: TV, desc: "TV - TV Packs"} - - {id: 89, cat: TV/UHD, desc: "TV - UltraHD/4K"} - - modes: - search: [q] - tv-search: [q, season, ep] - movie-search: [q] - music-search: [q] - book-search: [q] - -settings: - - name: sort - type: select - label: Sort requested from site - default: id - options: - id: created - seeders: seeders - size: size - name: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - -download: - selectors: - - selector: a[href^="magnet:?xt="] - attribute: href - -search: - path: "{{ if .Keywords }}torrents-search.php{{ else }}torrents.php{{ end }}" - inputs: - $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ .Keywords }}" - sort: "{{ .Config.sort }}" - order: "{{ .Config.type }}" - incldead: 1 - keywordsfilters: - - name: replace - args: ["-", " "] # remove special search character (negative search) - - name: replace - args: ["+", " "] # remove special search character (positive search) - - name: re_replace - args: ["(\\w+)", " +$1"] # prepend + to each word - - name: re_replace - args: ["\\s+", " "] # clean up whitespaces (multiple consecutive spaces confuses the search engine) - - rows: - selector: div.myFrame-content > div > table > tbody > tr[class] - filters: - - name: andmatch # they ignore keywords <= characters, so we still andmatch it, see https://www.ettv.tv/forum/view/topic/and-search-operator-broken--70 - - fields: - download: - selector: a[href^="/torrent/"] - attribute: href - title: - selector: a[href^="/torrent/"][title] - attribute: title - filters: - - name: re_replace - args: ["( torrent)$", ""] - category: - text: 78 # issue #7110 - category|noappend: - optional: true - selector: a[href^="/torrents.php?cat="] - attribute: href - filters: - - name: querystring - args: cat - details: - selector: a[href^="/torrent/"] - attribute: href - date: - selector: td:nth-child(3) - size: - selector: td:nth-child(4) - filters: - - name: replace - args: ["N/A", "0 B"] - seeders: - selector: td:nth-child(6) - leechers: - selector: td:nth-child(7) - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 -# engine n/a diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index d6312d2a4..e7e2d1062 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -328,6 +328,7 @@ namespace Jackett.Updater "Definitions/erzsebetpl.yml", "Definitions/estrenosdtl.yml", "Definitions/ethor.yml", + "Definitions/ettv.yml", "Definitions/evolutionpalace.yml", "Definitions/exoticaz.yml", // migrated to C# "Definitions/extratorrent-ag.yml",