From 1aa57312252b63d58e05c78ffd63d982aba6847f Mon Sep 17 00:00:00 2001 From: Emmm Monster <58943012+emmmx@users.noreply.github.com> Date: Sat, 26 Dec 2020 15:03:34 +0800 Subject: [PATCH] Fix Tm Decoder --- algo/tm/{xm.go => tm.go} | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) rename algo/tm/{xm.go => tm.go} (56%) diff --git a/algo/tm/xm.go b/algo/tm/tm.go similarity index 56% rename from algo/tm/xm.go rename to algo/tm/tm.go index 4fadb8d..063882b 100644 --- a/algo/tm/xm.go +++ b/algo/tm/tm.go @@ -6,10 +6,14 @@ import ( "github.com/umlock-music/cli/algo/common" ) -var magicHeader = []byte{0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70} +var replaceHeader = []byte{0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70} +var magicHeader = []byte{0x51, 0x51, 0x4D, 0x55} //0x15, 0x1D, 0x1A, 0x21 type Decoder struct { - file []byte + file []byte + audio []byte + headerMatch bool + audioExt string } func (d *Decoder) GetCoverImage() []byte { @@ -17,11 +21,11 @@ func (d *Decoder) GetCoverImage() []byte { } func (d *Decoder) GetAudioData() []byte { - return d.file[8:] + return d.audio } func (d *Decoder) GetAudioExt() string { - return "" + return d.audioExt } func (d *Decoder) GetMeta() common.Meta { @@ -36,12 +40,20 @@ func (d *Decoder) Validate() error { if len(d.file) < 8 { return errors.New("invalid file size") } - if !bytes.Equal(magicHeader, d.file[:8]) { + if !bytes.Equal(magicHeader, d.file[:4]) { return errors.New("not a valid tm file") } + d.headerMatch = true return nil } func (d *Decoder) Decode() error { + d.audio = d.file + if d.headerMatch { + for i := 0; i < 8; i++ { + d.audio[i] = replaceHeader[i] + } + d.audioExt = "m4a" + } return nil }