From 0f40f2d24f40f11af003cc68a66979d16b128363 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Sat, 4 May 2024 19:22:15 +1200 Subject: [PATCH] heavens-hell: removed. resolves #15092 --- README.md | 1 - .../Definitions/heavens-hell.yml | 214 ------------------ src/Jackett.Updater/Program.cs | 1 + 3 files changed, 1 insertion(+), 215 deletions(-) delete mode 100644 src/Jackett.Common/Definitions/heavens-hell.yml diff --git a/README.md b/README.md index 319337a9b..238bde5cc 100644 --- a/README.md +++ b/README.md @@ -389,7 +389,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * HDU * hdvbits * HDVIDEO - * Heavens-Hell * Hebits * HellasHut * HHanClub diff --git a/src/Jackett.Common/Definitions/heavens-hell.yml b/src/Jackett.Common/Definitions/heavens-hell.yml deleted file mode 100644 index 65b83e27b..000000000 --- a/src/Jackett.Common/Definitions/heavens-hell.yml +++ /dev/null @@ -1,214 +0,0 @@ ---- -id: heavens-hell -name: Heavens-Hell -description: "Heavens-Hell is a Private Torrent Tracker for MUSIC / AUDIO SOFTWARE" -language: en-US -type: private -encoding: UTF-8 -links: - - https://heavens-hell.info/ - -caps: - categorymappings: - - {id: 39, cat: Audio, desc: "Albums"} - - {id: 40, cat: Audio, desc: "Alternative"} - - {id: 4, cat: PC, desc: "Apps"} - - {id: 50, cat: PC, desc: "Apps -- Miscellaneous"} - - {id: 11, cat: Audio, desc: "Billboard Top 100"} - - {id: 7, cat: Audio, desc: "Blues"} - - {id: 8, cat: Audio, desc: "Chillout"} - - {id: 41, cat: Audio, desc: "Christmas"} - - {id: 9, cat: Audio, desc: "Classical"} - - {id: 12, cat: Audio, desc: "Country"} - - {id: 10, cat: Audio, desc: "Dance"} - - {id: 13, cat: Audio, desc: "Discography"} - - {id: 42, cat: Audio, desc: "DJ Music"} - - {id: 44, cat: Audio, desc: "DJ Music -- Funkymix"} - - {id: 45, cat: Audio, desc: "DJ Music -- Promo Only"} - - {id: 43, cat: Audio, desc: "DJ Music -- Ultimix"} - - {id: 21, cat: Audio, desc: "DJ Radio Sets"} - - {id: 19, cat: Audio, desc: "DMC"} - - {id: 20, cat: Audio, desc: "Drum&Bass"} - - {id: 22, cat: Audio/Lossless, desc: "Flac Music"} - - {id: 23, cat: Audio/Lossless, desc: "Flac-24 Bit Hi-Res"} - - {id: 14, cat: Audio, desc: "Funk"} - - {id: 15, cat: Audio, desc: "Hardcore"} - - {id: 16, cat: Audio, desc: "Hip hop"} - - {id: 24, cat: Audio, desc: "House"} - - {id: 17, cat: Audio, desc: "Jazz"} - - {id: 25, cat: Audio, desc: "Jungle"} - - {id: 46, cat: Audio, desc: "K3 WAV"} - - {id: 49, cat: Audio/Other, desc: "K3 WAV -- Other WAV"} - - {id: 18, cat: Audio, desc: "Karaoke"} - - {id: 26, cat: Audio, desc: "Mastermix"} - - {id: 28, cat: Audio, desc: "Metal"} - - {id: 27, cat: Audio/MP3, desc: "MP3 NEW RELEASES"} - - {id: 51, cat: Audio/MP3, desc: "MP3 -- Other MP3"} - - {id: 33, cat: Audio, desc: "Music Packs"} - - {id: 32, cat: Audio/Video, desc: "Music Videos"} - - {id: 29, cat: Audio, desc: "Oldies"} - - {id: 47, cat: Audio, desc: "Pop music"} - - {id: 30, cat: Audio, desc: "Punk"} - - {id: 34, cat: Audio, desc: "R&B/Motown"} - - {id: 35, cat: Audio, desc: "Reggae"} - - {id: 36, cat: Audio, desc: "Retro"} - - {id: 31, cat: Audio, desc: "Rock"} - - {id: 37, cat: Audio, desc: "Soul"} - - {id: 48, cat: Audio, desc: "Trance"} - - {id: 38, cat: Audio, desc: "VIPs only"} - - modes: - search: [q] - music-search: [q] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: freeleech - type: checkbox - label: Filter freeleech only - default: false - - name: sort - type: select - label: Sort requested from site - default: added - options: - added: created - seeders: seeders - size: size - name: title - - 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 Torrents per page: setting to 40 on your account profile. The Default is 15. - - name: flaresolverr - type: info - label: FlareSolverr - default: This site may use Cloudflare DDoS Protection, therefore Jackett requires FlareSolverr to access it. - - name: info_activity - type: info - label: Account Inactivity - default: "To keep records updated regularly, all inactive accounts will be deleted after 60 days of inactivity." - -login: - path: takelogin.php - method: post - inputs: - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - logout: "" - error: - - selector: table:has(a[href*="login.php?error=1"]) - message: - text: "ERROR: Incorrect username!" - - selector: table:has(a[href*="login.php?error=4"]) - message: - text: "ERROR: Incorrect password!" - - selector: table:has(a[href*="login.php?error="]) - message: - text: "ERROR: Something went wrong during login!" - test: - path: index.php - selector: a[href*="/logout.php?logouthash="] - -download: - before: - path: takethanks.php - method: post - inputs: - torrentid: "{{ .DownloadUri.Query.id }}" - selectors: - - selector: a[href*="download.php?id="] - attribute: href - -search: - paths: - - path: browse.php - method: post - keywordsfilters: - - name: re_replace - args: ["[\\s]+", "%"] - inputs: - do: search - keywords: "{{ .Keywords }}" - # t_name, t_description, t_both, t_uploader, t_genre - search_type: t_name - # does not support multi category searching so defaulting to all. - category: 0 - # yes, no - include_dead_torrents: yes - sort: "{{ if .Config.freeleech }}free{{ else }}{{ .Config.sort }}{{ end }}" - order: "{{ if .Config.freeleech }}asc{{ else }}{{ .Config.type }}{{ end }}" - - rows: - selector: "table.sortable tr:has(a[href*=\"/download.php?id=\"]){{ if .Config.freeleech }}:has(img[src$=\"/freedownload.gif\"]){{ else }}{{ end }}" - - fields: - category: - selector: a[href*="/browse.php?category="] - attribute: href - filters: - - name: querystring - args: category - title_default: - # is usually abbreaviated - selector: a[href*="/details.php?id="] - title: - # while still abbreviated, is usually longer than the default - selector: div.tooltip-content div - optional: true - default: "{{ .Result.title_default }}" - details: - selector: a[href*="/details.php?id="] - attribute: href - download: - selector: a[href*="/details.php?id="] - attribute: href - poster: - selector: img[src*="/torrents/images/"] - attribute: src - date: - selector: td:nth-child(2) - # auto adjusted by site account profile - filters: - - name: regexp - args: "(\\d{2}-\\d{2}-\\d{4} \\d{2}:\\d{2})" - - name: dateparse - args: "dd-MM-yyyy HH:mm" - 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) - description: - # Wait: 4 h - selector: div.tooltip-content > div:last-child - downloadvolumefactor: - case: - img[src$="/freedownload.gif"]: 0 - img[src$="/silverdownload.gif"]: 0.5 - "*": 1 - uploadvolumefactor: - case: - img[src$="/x2.gif"]: 2 - "*": 1 - minimumratio: - text: 0.5 - minimumseedtime: - # 1 day (as seconds = 24 x 60 x 60) - text: 86400 -# TS Special Edition v.8.0 diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 7fd274aa9..51e89a6aa 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -439,6 +439,7 @@ namespace Jackett.Updater "Definitions/hdspain.yml", "Definitions/hdstreet.yml", "Definitions/hdzone.yml", // renamed to hdfun + "Definitions/heavens-hell.yml", "Definitions/hellastz.yml", "Definitions/hidden-palace.yml", "Definitions/homeporntorrents.yml",