um
/
cli
32
65
Fork 25
Code Issues 10 Pull Requests 2 Packages Projects Releases 12 Wiki Activity

fix: allow unencrypted tm0 tm3

This commit is contained in:
Unlock Music Dev 2022-11-19 07:25:44 +08:00
parent 2880c63bf7
commit 8fd6763b29
Signed by: um-dev
GPG Key ID: 95202E10D3413A1D
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
algo/tm/tm.go
View File

@ -23,12 +23,18 @@ func (d *Decoder) Validate() error {
if _, err := io.ReadFull(d.raw, header); err != nil { if _, err := io.ReadFull(d.raw, header); err != nil {
return fmt.Errorf("tm read header: %w", err) return fmt.Errorf("tm read header: %w", err)
} }
if !bytes.Equal(magicHeader, header[:len(magicHeader)]) {
return errors.New("tm: valid magic header") if bytes.Equal(magicHeader, header[:len(magicHeader)]) { // replace m4a header
d.audio = io.MultiReader(bytes.NewReader(replaceHeader), d.raw)
return nil
} }
d.audio = io.MultiReader(bytes.NewReader(replaceHeader), d.raw) if _, ok := common.SniffAll(header); ok { // not encrypted
return nil d.audio = io.MultiReader(bytes.NewReader(header), d.raw)
return nil
}
return errors.New("tm: valid magic header")
} }
func (d *Decoder) Read(buf []byte) (int, error) { func (d *Decoder) Read(buf []byte) (int, error) {
@ -37,14 +43,14 @@ func (d *Decoder) Read(buf []byte) (int, error) {
func NewTmDecoder(rd io.ReadSeeker) common.Decoder { func NewTmDecoder(rd io.ReadSeeker) common.Decoder {
return &Decoder{raw: rd} return &Decoder{raw: rd}
} }
func init() { func init() {
// QQ Music IOS M4a // QQ Music IOS M4a (replace header)
common.RegisterDecoder("tm2", false, NewTmDecoder) common.RegisterDecoder("tm2", false, NewTmDecoder)
common.RegisterDecoder("tm6", false, NewTmDecoder) common.RegisterDecoder("tm6", false, NewTmDecoder)
// QQ Music IOS Mp3
common.RegisterDecoder("tm0", false, common.NewRawDecoder) // QQ Music IOS Mp3 (not encrypted)
common.RegisterDecoder("tm3", false, common.NewRawDecoder) common.RegisterDecoder("tm0", false, NewTmDecoder)
common.RegisterDecoder("tm3", false, NewTmDecoder)
} }