From aa72f5b80eff7faee19be3017449f7498bb1ba5f Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Thu, 5 Jan 2023 06:20:13 +1300 Subject: [PATCH] twilightszoom: removed. resolves #7080 --- README.md | 1 - .../Definitions/twilightszoom.yml | 201 ------------------ src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/twilightszoom.yml diff --git a/README.md b/README.md index e9cdb0621..7c3998706 100644 --- a/README.md +++ b/README.md @@ -561,7 +561,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * TvRoad * TVstore * Twilight Torrents - * Twilights Zoom * U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#) * UHDBits * UnionGang diff --git a/src/Jackett.Common/Definitions/twilightszoom.yml b/src/Jackett.Common/Definitions/twilightszoom.yml deleted file mode 100644 index 7d595fe19..000000000 --- a/src/Jackett.Common/Definitions/twilightszoom.yml +++ /dev/null @@ -1,201 +0,0 @@ ---- -id: twilightszoom -name: Twilights Zoom -description: "Twilights Zoom is a Private Torrent Tracker for MUSIC" -language: en-US -type: private -encoding: UTF-8 -links: - - https://twilightzoom.org/ - -caps: - categorymappings: - - {id: 35, cat: Audio, desc: "80's Music"} - - {id: 14, cat: Audio, desc: "Alternative"} - - {id: 53, cat: PC, desc: "Appz"} - - {id: 70, cat: Audio, desc: "BlueGrass Music"} - - {id: 48, cat: Audio, desc: "Blues "} - - {id: 68, cat: Audio, desc: "Celtic"} - - {id: 19, cat: Audio, desc: "Childrens Music"} - - {id: 26, cat: Audio, desc: "Chill-Out"} - - {id: 56, cat: Audio, desc: "Christian Rock"} - - {id: 21, cat: Audio, desc: "Christmas Music"} - - {id: 3, cat: Audio, desc: "Classical / Opera"} - - {id: 20, cat: Audio, desc: "Comedy"} - - {id: 18, cat: Audio, desc: "Country"} - - {id: 4, cat: Audio, desc: "Dance"} - - {id: 84, cat: Audio, desc: "Death Metal"} - - {id: 62, cat: Audio, desc: "Discography"} - - {id: 40, cat: Audio, desc: "DJ Tools"} - - {id: 60, cat: Audio, desc: "DMC"} - - {id: 51, cat: Audio, desc: "Drum &Bass"} - - {id: 39, cat: Audio, desc: "Dubstep"} - - {id: 5, cat: Audio, desc: "Easy Listening"} - - {id: 6, cat: Audio, desc: "Electronic"} - - {id: 82, cat: Audio/Lossless, desc: "FLAC"} - - {id: 37, cat: Audio, desc: "Folk"} - - {id: 44, cat: Audio, desc: "Garage Music"} - - {id: 59, cat: Audio, desc: "Hardcore"} - - {id: 7, cat: Audio, desc: "Hip Hop"} - - {id: 74, cat: Audio, desc: "Horrorcore "} - - {id: 27, cat: Audio, desc: "House"} - - {id: 8, cat: Audio, desc: "Indie"} - - {id: 73, cat: Audio, desc: "Industrial "} - - {id: 9, cat: Audio, desc: "Inspirational / Gospel"} - - {id: 61, cat: Audio, desc: "Instrumental"} - - {id: 10, cat: Audio, desc: "Jazz Music "} - - {id: 49, cat: Audio, desc: "Karaoke"} - - {id: 11, cat: Audio, desc: "Latin"} - - {id: 69, cat: Audio, desc: "Magazines"} - - {id: 25, cat: Audio, desc: "Mastermix"} - - {id: 65, cat: Audio, desc: "Member Mixes"} - - {id: 30, cat: Audio, desc: "Metal"} - - {id: 24, cat: Audio, desc: "Misc"} - - {id: 58, cat: Audio, desc: "Mixes-Mashups"} - - {id: 50, cat: Audio, desc: "Motown"} - - {id: 75, cat: Audio, desc: "Music Charts"} - - {id: 76, cat: Audio/Video, desc: "Music movies "} - - {id: 57, cat: Audio, desc: "Music Packs"} - - {id: 54, cat: Audio/Video, desc: "Music Videos"} - - {id: 78, cat: Other, desc: "Need to mod"} - - {id: 12, cat: Audio, desc: "New Age"} - - {id: 43, cat: Audio, desc: "Oldies"} - - {id: 13, cat: Audio, desc: "Pop (Popular Music)"} - - {id: 36, cat: Audio, desc: "Punk"} - - {id: 1, cat: Audio, desc: "R&B/Soul"} - - {id: 42, cat: Audio, desc: "Radio"} - - {id: 46, cat: Audio, desc: "Rap"} - - {id: 15, cat: Audio, desc: "Reggae"} - - {id: 45, cat: Audio, desc: "Regimental-Military"} - - {id: 16, cat: Audio, desc: "Rock"} - - {id: 72, cat: Audio, desc: "Rockabilly"} - - {id: 66, cat: Audio, desc: "Seasonal"} - - {id: 77, cat: Audio, desc: "Singles"} - - {id: 83, cat: Audio, desc: "Soul"} - - {id: 23, cat: Audio, desc: "Soundtracks"} - - {id: 71, cat: Audio, desc: "Techno"} - - {id: 22, cat: Other, desc: "Torrents not modded"} - - {id: 41, cat: Audio, desc: "Trance"} - - {id: 38, cat: Audio, desc: "World Music"} - - modes: - search: [q] - music-search: [q, album, artist] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Search freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: 4 - options: - 4: created - 7: seeders - 5: size - 1: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - -login: - path: login.php - method: form - form: form[action="takelogin.php"] - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - returnto: / - perm_ssl: 1 - error: - - selector: td.embedded:has(h2:contains("failed")) - - selector: td.embedded:has(h2:contains("Error")) - test: - path: index.php - selector: a[href^="./logout.php"] - -search: - paths: - - path: browse.php - inputs: - $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ if or (.Query.Artist) (.Query.Album) }}{{ or (.Query.Artist) (.Query.Album) }}{{ else }}{{ .Keywords }}{{ end }}" - # 0 active, 1 incldead, 2 onlydead, 3 free - incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}" - sort: "{{ .Config.sort }}" - type: "{{ .Config.type }}" - - rows: - selector: table[style="width:928px;"] > tbody > tr:has(a[href^="download.php?torrent="]) - - fields: - category: - selector: a[href^="browse.php?cat="] - attribute: href - filters: - - name: querystring - args: cat - title: - selector: a[href^="details.php?id="] - attribute: onmouseover - filters: - - name: regexp - args: "(.+?)" - details: - selector: a[href^="details.php?id="] - attribute: href - download: - selector: a[href^="download.php?torrent="] - attribute: href - poster: - selector: a[href^="details.php?id="] - attribute: onmouseover - filters: - - name: regexp - args: "src=\\\\'(.+?)\\\\'" - - name: replace - args: ["./pic/noposter.png", ""] - files: - selector: td:nth-last-child(8) - date_day: - selector: td:nth-last-child(6):contains("day") - # auto adjusted by site account profile - optional: true - date_year: - selector: td:nth-last-child(6):not(:contains("day")) - # auto adjusted by site account profile - optional: true - filters: - - name: dateparse - args: "Jan 2 2006 03:04 PM" - date: - text: "{{ if or .Result.date_day .Result.date_year }}{{ or .Result.date_day .Result.date_year }}{{ else }}now{{ end }}" - size: - selector: td:nth-last-child(5) - grabs: - selector: td:nth-last-child(4) - seeders: - selector: td:nth-last-child(3) - leechers: - selector: td:nth-last-child(2) - downloadvolumefactor: - case: - "img[src=\"free.gif\"]": 0 - "*": 1 - uploadvolumefactor: - text: 1 - minimumratio: - text: 0.5 -# TBDEV,U232,and Btdev (customised) diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 533d1cc9b..e08c9a46c 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -580,6 +580,7 @@ namespace Jackett.Updater "Definitions/ttobogo.yml", "Definitions/turktracker.yml", "Definitions/turknova.yml", + "Definitions/twilightszoom.yml", "Definitions/u-torrents.yml", "Definitions/uhd-heaven.yml", "Definitions/ultimategamerclub.yml",