diff --git a/README.md b/README.md
index b0f411765..4d57c7222 100644
--- a/README.md
+++ b/README.md
@@ -598,7 +598,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* TV Chaos UK (TVCUK)
* TvRoad
* TVstore
- * Twisted-Music
* U2 (U2分享園@動漫花園) [![(invite needed)][inviteneeded]](#)
* UBits
* UHDBits
diff --git a/src/Jackett.Common/Definitions/twisted-music.yml b/src/Jackett.Common/Definitions/twisted-music.yml
deleted file mode 100644
index 1aa6b4c65..000000000
--- a/src/Jackett.Common/Definitions/twisted-music.yml
+++ /dev/null
@@ -1,199 +0,0 @@
----
-id: twisted-music
-name: Twisted-Music
-description: "Twisted-Music is a Private Torrent Tracker for MUSIC / AUDIO SOFTWARE"
-language: en-US
-type: private
-encoding: UTF-8
-links:
- - https://twisted-music.org/
-legacylinks:
- - https://twisted-music.info/
-
-caps:
- categorymappings:
- - {id: 3, cat: PC, desc: "Apps"}
- - {id: 52, cat: PC, desc: "Apps -- Miscellaneous"}
- - {id: 4, cat: Audio, desc: "Albums"}
- - {id: 28, cat: Audio, desc: "Alternative"}
- - {id: 31, cat: Audio, desc: "Billboard Top 100"}
- - {id: 13, cat: Audio, desc: "Blues"}
- - {id: 27, cat: Audio, desc: "Chillout"}
- - {id: 12, cat: Audio, desc: "Christmas"}
- - {id: 26, cat: Audio, desc: "Classical"}
- - {id: 11, cat: Audio, desc: "Country"}
- - {id: 25, cat: Audio, desc: "Dance"}
- - {id: 38, cat: Audio, desc: "Discography"}
- - {id: 5, cat: Audio, desc: "DJ Music"}
- - {id: 45, cat: Audio, desc: "DJ Music -- Funkymix"}
- - {id: 46, cat: Audio, desc: "DJ Music -- Promo Only"}
- - {id: 48, cat: Audio, desc: "DJ Music -- Ultimix"}
- - {id: 49, cat: Audio, desc: "DJ Radio Sets"}
- - {id: 7, cat: Audio, desc: "DMC"}
- - {id: 29, cat: Audio, desc: "Dubstep"}
- - {id: 9, cat: Audio/Lossless, desc: "Flac Music"}
- - {id: 42, cat: Audio/Lossless, desc: "Flac-24 Bit Hi-Res"}
- - {id: 33, cat: Audio, desc: "Funk"}
- - {id: 18, cat: Audio, desc: "Hardcore"}
- - {id: 16, cat: Audio, desc: "Hip hop"}
- - {id: 32, cat: Audio, desc: "House"}
- - {id: 17, cat: Audio, desc: "Jazz"}
- - {id: 35, cat: Audio, desc: "Jungle"}
- - {id: 20, cat: Audio, desc: "K3 WAV"}
- - {id: 51, cat: Audio/Other, desc: "K3 WAV -- Other WAV"}
- - {id: 39, cat: Audio, desc: "Karaoke"}
- - {id: 8, cat: Audio, desc: "Mastermix"}
- - {id: 19, cat: Audio, desc: "Metal"}
- - {id: 41, cat: Audio/MP3, desc: "MP3 NEW RELEASES"}
- - {id: 53, cat: Audio/Other, desc: "MP3 NEW RELEASES -- Other MP3s"}
- - {id: 43, cat: Audio, desc: "Music Packs"}
- - {id: 40, cat: Audio/Video, desc: "Music Videos"}
- - {id: 30, cat: Audio, desc: "Oldies"}
- - {id: 15, cat: Audio, desc: "Pop music"}
- - {id: 36, cat: Audio, desc: "Punk"}
- - {id: 23, cat: Audio, desc: "R&B/Motown"}
- - {id: 34, cat: Audio, desc: "Reggae"}
- - {id: 37, cat: Audio, desc: "Retro"}
- - {id: 14, cat: Audio, desc: "Rock"}
- - {id: 50, cat: Audio, desc: "Rock -- Rock & roll"}
- - {id: 21, cat: Audio, desc: "Soul"}
- - {id: 24, cat: Audio, desc: "Trance"}
- - {id: 10, cat: Audio, desc: "Twisted-Music Vip"}
-
- 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.
-
-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="]
-
-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*="download.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 86e0904c0..09719cb59 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -665,6 +665,7 @@ namespace Jackett.Updater
"Definitions/turktracker.yml",
"Definitions/twilight.yml",
"Definitions/twilightszoom.yml",
+ "Definitions/twisted-music.yml",
"Definitions/u-torrents.yml",
"Definitions/uhd-heaven.yml",
"Definitions/ultimategamerclub.yml",