Merge pull request '小更改 - mmkv 相关' (#93 ) from qmc-mmkv-cipher into master

Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/93
refactor: rework on MusicEx footer parser
2024-07-06 19:35:06 +00:00 · 2024-07-06 20:32:26 +01:00 · 2024-07-06 19:55:31 +01:00 · 2024-07-06 19:45:10 +01:00 · 2024-05-03 08:47:13 +00:00 · 2024-05-03 16:17:32 +08:00
11 changed files with 329 additions and 107 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -20,10 +20,11 @@ local StepGoBuild(GOOS, GOARCH) = {
  local filepath = 'dist/um-%s-%s.tar.gz' % [GOOS, GOARCH],

  name: 'go build %s/%s' % [GOOS, GOARCH],
-  image: 'golang:1.19',
+  image: 'golang:1.22',
  environment: {
    GOOS: GOOS,
    GOARCH: GOARCH,
+    GOPROXY: "https://goproxy.io,direct",
  },
  commands: [
    'DIST_DIR=$(mktemp -d)',
@ -39,7 +40,7 @@ local StepUploadArtifact(GOOS, GOARCH) = {
  local pkgname = '${DRONE_REPO_NAME}-build',

  name: 'upload artifact',
-  image: 'golang:1.19',  // reuse golang:1.19 for curl
+  image: 'golang:1.22',  // reuse golang:1.19 for curl
  environment: {
    DRONE_GITEA_SERVER: 'https://git.unlock-music.dev',
    GITEA_API_KEY: { from_secret: 'GITEA_API_KEY' },
@ -68,7 +69,10 @@ local PipelineBuild(GOOS, GOARCH, RUN_TEST) = {
         (
           if RUN_TEST then [{
             name: 'go test',
-             image: 'golang:1.19',
+             image: 'golang:1.22',
+             environment: {
+               GOPROXY: "https://goproxy.io,direct",
+             },
             commands: ['go test -v ./...'],
           }] else []
         )
@ -94,7 +98,10 @@ local PipelineRelease() = {
    },
    {
      name: 'go test',
-      image: 'golang:1.19',
+      image: 'golang:1.22',
+      environment: {
+        GOPROXY: "https://goproxy.io,direct",
+      },
      commands: ['go test -v ./...'],
    },
    StepGoBuild('linux', 'amd64'),
--- a/.drone.yml
+++ b/.drone.yml
@ -8,7 +8,9 @@ steps:
  name: fetch tags
 - commands:
  - go test -v ./...
-  image: golang:1.19
+  environment:
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go test
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -19,7 +21,8 @@ steps:
  environment:
    GOARCH: amd64
    GOOS: linux
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build linux/amd64
 - commands:
  - curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-linux-amd64.tar.gz"
@ -30,7 +33,7 @@ steps:
    DRONE_GITEA_SERVER: https://git.unlock-music.dev
    GITEA_API_KEY:
      from_secret: GITEA_API_KEY
-  image: golang:1.19
+  image: golang:1.22
  name: upload artifact
 trigger:
  event:
@ -54,7 +57,8 @@ steps:
  environment:
    GOARCH: amd64
    GOOS: windows
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build windows/amd64
 - commands:
  - curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-windows-amd64.tar.gz"
@ -65,7 +69,7 @@ steps:
    DRONE_GITEA_SERVER: https://git.unlock-music.dev
    GITEA_API_KEY:
      from_secret: GITEA_API_KEY
-  image: golang:1.19
+  image: golang:1.22
  name: upload artifact
 trigger:
  event:
@ -89,7 +93,8 @@ steps:
  environment:
    GOARCH: amd64
    GOOS: darwin
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build darwin/amd64
 - commands:
  - curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-darwin-amd64.tar.gz"
@ -100,7 +105,7 @@ steps:
    DRONE_GITEA_SERVER: https://git.unlock-music.dev
    GITEA_API_KEY:
      from_secret: GITEA_API_KEY
-  image: golang:1.19
+  image: golang:1.22
  name: upload artifact
 trigger:
  event:
@ -117,7 +122,9 @@ steps:
  name: fetch tags
 - commands:
  - go test -v ./...
-  image: golang:1.19
+  environment:
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go test
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -128,7 +135,8 @@ steps:
  environment:
    GOARCH: amd64
    GOOS: linux
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build linux/amd64
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -139,7 +147,8 @@ steps:
  environment:
    GOARCH: arm64
    GOOS: linux
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build linux/arm64
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -150,7 +159,8 @@ steps:
  environment:
    GOARCH: "386"
    GOOS: linux
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build linux/386
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -161,7 +171,8 @@ steps:
  environment:
    GOARCH: amd64
    GOOS: windows
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build windows/amd64
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -172,7 +183,8 @@ steps:
  environment:
    GOARCH: "386"
    GOOS: windows
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build windows/386
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -183,7 +195,8 @@ steps:
  environment:
    GOARCH: amd64
    GOOS: darwin
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build darwin/amd64
 - commands:
  - DIST_DIR=$(mktemp -d)
@ -194,7 +207,8 @@ steps:
  environment:
    GOARCH: arm64
    GOOS: darwin
-  image: golang:1.19
+    GOPROXY: https://goproxy.io,direct
+  image: golang:1.22
  name: go build darwin/arm64
 - image: plugins/gitea-release
  name: create release
--- a/README.md
+++ b/README.md
@ -9,13 +9,11 @@ Original: Web Edition https://git.unlock-music.dev/um/web
 ## Features

 - [x] All Algorithm Supported By `unlock-music/web`
- [ ] Complete Cover Image
- [ ] Parse Meta Data
- [ ] Complete Meta Data
+- [x] Complete Metadata & Cover Image

 ## Hou to Build

- Requirements: **Golang 1.17**
+- Requirements: **Golang 1.19**

 1. run `go install unlock-music.dev/cli/cmd/um@master`

--- a/algo/ncm/meta.go
+++ b/algo/ncm/meta.go
@ -18,14 +18,11 @@ type ncmMeta interface {

 type ncmMetaMusic struct {
 	Format        string          `json:"format"`
-	MusicID       int             `json:"musicId"`
 	MusicName     string          `json:"musicName"`
 	Artist        [][]interface{} `json:"artist"`
 	Album         string          `json:"album"`
-	AlbumID       int             `json:"albumId"`
 	AlbumPicDocID interface{}     `json:"albumPicDocId"`
 	AlbumPic      string          `json:"albumPic"`
-	MvID          int             `json:"mvId"`
 	Flag          int             `json:"flag"`
 	Bitrate       int             `json:"bitrate"`
 	Duration      int             `json:"duration"`
--- a/algo/qmc/key_mmkv.go
+++ b/algo/qmc/key_mmkv.go
@ -80,6 +80,39 @@ func readKeyFromMMKV(file string, logger *zap.Logger) ([]byte, error) {
 	return deriveKey(buf)
 }

+func OpenMMKV(mmkvPath string, key string, logger *zap.Logger) error {
+	filePath, fileName := filepath.Split(mmkvPath)
+	mgr, err := mmkv.NewManager(filepath.Dir(filePath))
+	if err != nil {
+		return fmt.Errorf("init mmkv manager: %w", err)
+	}
+
+	// If `vaultKey` is empty, the key is ignored.
+	streamKeyVault, err = mgr.OpenVaultCrypto(fileName, key)
+
+	if err != nil {
+		return fmt.Errorf("open mmkv vault: %w", err)
+	}
+
+	logger.Debug("mmkv vault opened", zap.Strings("keys", streamKeyVault.Keys()))
+	return nil
+}
+
+// /
+func readKeyFromMMKVCustom(mid string) ([]byte, error) {
+	if streamKeyVault == nil {
+		return nil, fmt.Errorf("mmkv vault not loaded")
+	}
+
+	// get ekey from mmkv vault
+	eKey, err := streamKeyVault.GetBytes(mid)
+	if err != nil {
+		return nil, fmt.Errorf("get eKey error: %w", err)
+	}
+	return deriveKey(eKey)
+}
+
+// / getRelativeMMKVDir get mmkv dir relative to file (legacy QQMusic for macOS behaviour)
 func getRelativeMMKVDir(file string) (string, error) {
 	mmkvDir := filepath.Join(filepath.Dir(file), "../mmkv")
 	if _, err := os.Stat(mmkvDir); err != nil {
@ -102,7 +135,7 @@ func getDefaultMMKVDir() (string, error) {

 	mmkvDir := filepath.Join(
 		homeDir,
-		"Library/Containers/com.tencent.QQMusicMac/Data", // todo: make configurable
+		"Library/Containers/com.tencent.QQMusicMac/Data",
 		"Library/Application Support/QQMusicMac/mmkv",
 	)
 	if _, err := os.Stat(mmkvDir); err != nil {
--- a/algo/qmc/qmc.go
+++ b/algo/qmc/qmc.go
@ -5,13 +5,12 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"go.uber.org/zap"
 	"io"
 	"runtime"
 	"strconv"
 	"strings"

-	"go.uber.org/zap"
-
 	"unlock-music.dev/cli/algo/common"
 	"unlock-music.dev/cli/internal/sniff"
 )
@ -145,6 +144,17 @@ func (d *Decoder) searchKey() (err error) {
 		return d.readRawMetaQTag()
 	case "STag":
 		return errors.New("qmc: file with 'STag' suffix doesn't contains media key")
+	case "cex\x00":
+		footer, err := NewMusicExTag(d.raw)
+		if err != nil {
+			return err
+		}
+		d.audioLen = fileSize - int(footer.TagSize)
+		d.decodedKey, err = readKeyFromMMKVCustom(footer.MediaFileName)
+		if err != nil {
+			return err
+		}
+		return nil
 	default:
 		size := binary.LittleEndian.Uint32(suffixBuf)

--- a/algo/qmc/qmc_footer_musicex.go
+++ b/algo/qmc/qmc_footer_musicex.go
@ -0,0 +1,93 @@
+package qmc
+
+import (
+	bytes "bytes"
+	"encoding/binary"
+	"errors"
+	"fmt"
+	"io"
+	"strings"
+)
+
+type MusicExTagV1 struct {
+	SongID        uint32 // Song ID
+	Unknown1      uint32 // unused & unknown
+	Unknown2      uint32 // unused & unknown
+	MediaID       string // Media ID
+	MediaFileName string // real file name
+	Unknown3      uint32 // unused; uninitialized memory?
+
+	// 16 byte at the end of tag.
+	// TagSize should be respected when parsing.
+	TagSize    uint32 // 19.57: fixed value: 0xC0
+	TagVersion uint32 // 19.57: fixed value: 0x01
+	TagMagic   []byte // fixed value "musicex\0" (8 bytes)
+}
+
+func NewMusicExTag(f io.ReadSeeker) (*MusicExTagV1, error) {
+	_, err := f.Seek(-16, io.SeekEnd)
+	if err != nil {
+		return nil, fmt.Errorf("musicex seek error: %w", err)
+	}
+
+	buffer := make([]byte, 16)
+	bytesRead, err := f.Read(buffer)
+	if err != nil {
+		return nil, fmt.Errorf("get musicex error: %w", err)
+	}
+	if bytesRead != 16 {
+		return nil, fmt.Errorf("MusicExV1: read %d bytes (expected %d)", bytesRead, 16)
+	}
+
+	tag := &MusicExTagV1{
+		TagSize:    binary.LittleEndian.Uint32(buffer[0x00:0x04]),
+		TagVersion: binary.LittleEndian.Uint32(buffer[0x04:0x08]),
+		TagMagic:   buffer[0x04:0x0C],
+	}
+
+	if !bytes.Equal(tag.TagMagic, []byte("musicex\x00")) {
+		return nil, errors.New("MusicEx magic mismatch")
+	}
+	if tag.TagVersion != 1 {
+		return nil, errors.New(fmt.Sprintf("unsupported musicex tag version. expecting 1, got %d", tag.TagVersion))
+	}
+
+	if tag.TagSize < 0xC0 {
+		return nil, errors.New(fmt.Sprintf("unsupported musicex tag size. expecting at least 0xC0, got 0x%02x", tag.TagSize))
+	}
+
+	buffer = make([]byte, tag.TagSize)
+	bytesRead, err = f.Read(buffer)
+	if err != nil {
+		return nil, err
+	}
+	if uint32(bytesRead) != tag.TagSize {
+		return nil, fmt.Errorf("MusicExV1: read %d bytes (expected %d)", bytesRead, tag.TagSize)
+	}
+
+	tag.SongID = binary.LittleEndian.Uint32(buffer[0x00:0x04])
+	tag.Unknown1 = binary.LittleEndian.Uint32(buffer[0x04:0x08])
+	tag.Unknown2 = binary.LittleEndian.Uint32(buffer[0x08:0x0C])
+	tag.MediaID = readUnicodeTagName(buffer[0x0C:], 30*2)
+	tag.MediaFileName = readUnicodeTagName(buffer[0x48:], 50*2)
+	tag.Unknown3 = binary.LittleEndian.Uint32(buffer[0xAC:0xB0])
+	return tag, nil
+}
+
+// readUnicodeTagName reads a buffer to maxLen.
+// reconstruct text by skipping alternate char (ascii chars encoded in UTF-16-LE),
+// until finding a zero or reaching maxLen.
+func readUnicodeTagName(buffer []byte, maxLen int) string {
+	builder := strings.Builder{}
+
+	for i := 0; i < maxLen; i += 2 {
+		chr := buffer[i]
+		if chr != 0 {
+			builder.WriteByte(chr)
+		} else {
+			break
+		}
+	}
+
+	return builder.String()
+}
--- a/cmd/um/main.go
+++ b/cmd/um/main.go
@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/signal"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
@ -14,6 +15,7 @@ import (
 	"strings"
 	"time"

+	"github.com/fsnotify/fsnotify"
 	"github.com/urfave/cli/v2"
 	"go.uber.org/zap"

@ -21,7 +23,7 @@ import (
 	_ "unlock-music.dev/cli/algo/kgm"
 	_ "unlock-music.dev/cli/algo/kwm"
 	_ "unlock-music.dev/cli/algo/ncm"
-	_ "unlock-music.dev/cli/algo/qmc"
+	"unlock-music.dev/cli/algo/qmc"
 	_ "unlock-music.dev/cli/algo/tm"
 	_ "unlock-music.dev/cli/algo/xiami"
 	_ "unlock-music.dev/cli/algo/ximalaya"
@ -48,9 +50,13 @@ func main() {
 		Flags: []cli.Flag{
 			&cli.StringFlag{Name: "input", Aliases: []string{"i"}, Usage: "path to input file or dir", Required: false},
 			&cli.StringFlag{Name: "output", Aliases: []string{"o"}, Usage: "path to output dir", Required: false},
+			&cli.StringFlag{Name: "qmc-mmkv", Aliases: []string{"db"}, Usage: "path to qmc mmkv (`.crc` file also required)", Required: false},
+			&cli.StringFlag{Name: "qmc-mmkv-key", Aliases: []string{"key"}, Usage: "mmkv password (16 ascii chars)", Required: false},
 			&cli.BoolFlag{Name: "remove-source", Aliases: []string{"rs"}, Usage: "remove source file", Required: false, Value: false},
 			&cli.BoolFlag{Name: "skip-noop", Aliases: []string{"n"}, Usage: "skip noop decoder", Required: false, Value: true},
 			&cli.BoolFlag{Name: "update-metadata", Usage: "update metadata & album art from network", Required: false, Value: false},
+			&cli.BoolFlag{Name: "overwrite", Usage: "overwrite output file without asking", Required: false, Value: false},
+			&cli.BoolFlag{Name: "watch", Usage: "watch the input dir and process new files", Required: false, Value: false},

 			&cli.BoolFlag{Name: "supported-ext", Usage: "show supported file extensions and exit", Required: false, Value: false},
 		},
@ -65,6 +71,7 @@ func main() {
 		logger.Fatal("run app failed", zap.Error(err))
 	}
 }
+
 func printSupportedExtensions() {
 	var exts []string
 	for ext := range common.DecoderRegistry {
@ -75,6 +82,7 @@ func printSupportedExtensions() {
 		fmt.Printf("%s: %d\n", ext, len(common.DecoderRegistry[ext]))
 	}
 }
+
 func appMain(c *cli.Context) (err error) {
 	if c.Bool("supported-ext") {
 		printSupportedExtensions()
@ -124,15 +132,30 @@ func appMain(c *cli.Context) (err error) {
 		return errors.New("output should be a writable directory")
 	}

+	if mmkv := c.String("qmc-mmkv"); mmkv != "" {
+		// If key is not set, the mmkv vault will be treated as unencrypted.
+		key := c.String("qmc-mmkv-key")
+		err := qmc.OpenMMKV(mmkv, key, logger)
+		if err != nil {
+			return err
+		}
+	}
+
 	proc := &processor{
 		outputDir:       output,
 		skipNoopDecoder: c.Bool("skip-noop"),
 		removeSource:    c.Bool("remove-source"),
 		updateMetadata:  c.Bool("update-metadata"),
+		overwriteOutput: c.Bool("overwrite"),
 	}

 	if inputStat.IsDir() {
-		return proc.processDir(input)
+		wacthDir := c.Bool("watch")
+		if !wacthDir {
+			return proc.processDir(input)
+		} else {
+			return proc.watchDir(input)
+		}
 	} else {
 		return proc.processFile(input)
 	}
@ -145,6 +168,61 @@ type processor struct {
 	skipNoopDecoder bool
 	removeSource    bool
 	updateMetadata  bool
+	overwriteOutput bool
+}
+
+func (p *processor) watchDir(inputDir string) error {
+	if err := p.processDir(inputDir); err != nil {
+		return err
+	}
+
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		return fmt.Errorf("failed to create watcher: %w", err)
+	}
+	defer watcher.Close()
+
+	go func() {
+		for {
+			select {
+			case event, ok := <-watcher.Events:
+				if !ok {
+					return
+				}
+
+				if event.Has(fsnotify.Create) || event.Has(fsnotify.Write) {
+					// try open with exclusive mode, to avoid file is still writing
+					f, err := os.OpenFile(event.Name, os.O_RDONLY, os.ModeExclusive)
+					if err != nil {
+						logger.Debug("failed to open file exclusively", zap.String("path", event.Name), zap.Error(err))
+						time.Sleep(1 * time.Second) // wait for file writing complete
+						continue
+					}
+					_ = f.Close()
+
+					if err := p.processFile(event.Name); err != nil {
+						logger.Warn("failed to process file", zap.String("path", event.Name), zap.Error(err))
+					}
+				}
+			case err, ok := <-watcher.Errors:
+				if !ok {
+					return
+				}
+				logger.Error("file watcher got error", zap.Error(err))
+			}
+		}
+	}()
+
+	err = watcher.Add(inputDir)
+	if err != nil {
+		return fmt.Errorf("failed to watch dir %s: %w", inputDir, err)
+	}
+
+	signalCtx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer stop()
+
+	<-signalCtx.Done()
+	return nil
 }

 func (p *processor) processDir(inputDir string) error {
@ -158,9 +236,14 @@ func (p *processor) processDir(inputDir string) error {
 		}

 		filePath := filepath.Join(inputDir, item.Name())
-		err := p.processFile(filePath)
-		if err != nil {
-			logger.Error("conversion failed", zap.String("source", filePath), zap.Error(err))
+		allDec := common.GetDecoder(filePath, p.skipNoopDecoder)
+		if len(allDec) == 0 {
+			logger.Info("skipping while no suitable decoder", zap.String("source", item.Name()))
+			continue
+		}
+
+		if err := p.process(filePath, allDec); err != nil {
+			logger.Error("conversion failed", zap.String("source", item.Name()), zap.Error(err))
 		}
 	}
 	return nil
@ -261,6 +344,15 @@ func (p *processor) process(inputFile string, allDec []common.NewDecoderFunc) er
 	inFilename := strings.TrimSuffix(filepath.Base(inputFile), filepath.Ext(inputFile))
 	outPath := filepath.Join(p.outputDir, inFilename+params.AudioExt)

+	if !p.overwriteOutput {
+		_, err := os.Stat(outPath)
+		if err == nil {
+			return fmt.Errorf("output file %s is already exist", outPath)
+		} else if !errors.Is(err, os.ErrNotExist) {
+			return fmt.Errorf("stat output file failed: %w", err)
+		}
+	}
+
 	if params.Meta == nil {
 		outFile, err := os.OpenFile(outPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0644)
 		if err != nil {
--- a/go.mod
+++ b/go.mod
@ -3,24 +3,24 @@ module unlock-music.dev/cli
 go 1.19

 require (
-	github.com/go-flac/flacpicture v0.2.0
-	github.com/go-flac/flacvorbis v0.1.0
-	github.com/go-flac/go-flac v0.3.1
-	github.com/samber/lo v1.36.0
-	github.com/urfave/cli/v2 v2.23.6
-	go.uber.org/zap v1.24.0
-	golang.org/x/crypto v0.3.0
-	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
-	golang.org/x/text v0.5.0
-	unlock-music.dev/mmkv v0.0.0-20221204231432-41a75bd29939
+	github.com/fsnotify/fsnotify v1.7.0
+	github.com/go-flac/flacpicture v0.3.0
+	github.com/go-flac/flacvorbis v0.2.0
+	github.com/go-flac/go-flac v1.0.0
+	github.com/samber/lo v1.39.0
+	github.com/urfave/cli/v2 v2.27.1
+	go.uber.org/zap v1.27.0
+	golang.org/x/crypto v0.22.0
+	golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
+	golang.org/x/text v0.14.0
+	unlock-music.dev/mmkv v0.0.0-20240424090133-0953e6901f3a
 )

 require (
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,61 +1,39 @@
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/ddliu/go-httpclient v0.5.1 h1:ys4KozrhBaGdI1yuWIFwNNILqhnMU9ozTvRNfCTorvs=
-github.com/ddliu/go-httpclient v0.5.1/go.mod h1:8QVbjq00YK2f2MQyiKuWMdaKOFRcoD9VuubkNCNOuZo=
-github.com/go-flac/flacpicture v0.2.0 h1:rS/ZOR/ZxlEwMf3yOPFcTAmGyoV6rDtcYdd+6CwWQAw=
-github.com/go-flac/flacpicture v0.2.0/go.mod h1:M4a1J0v6B5NHsck4GA1yZg0vFQzETVPd3kuj6Ow+q9o=
-github.com/go-flac/flacvorbis v0.1.0 h1:xStJfPrZ/IoA2oBUEwgrlaSf+Opo6/YuQfkqVhkP0cM=
-github.com/go-flac/flacvorbis v0.1.0/go.mod h1:70N9vVkQ4Jew0oBWkwqDMIE21h7pMUtQJpnMD0js6XY=
-github.com/go-flac/go-flac v0.3.1 h1:BWA7HdO67S4ZLWSVHCxsDHuedFFu5RiV/wmuhvO6Hxo=
-github.com/go-flac/go-flac v0.3.1/go.mod h1:jG9IumOfAXr+7J40x0AiQIbJzXf9Y7+Zs/2CNWe4LMk=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/go-flac/flacpicture v0.3.0 h1:LkmTxzFLIynwfhHiZsX0s8xcr3/u33MzvV89u+zOT8I=
+github.com/go-flac/flacpicture v0.3.0/go.mod h1:DPbrzVYQ3fJcvSgLFp9HXIrEQEdfdk/+m0nQCzwodZI=
+github.com/go-flac/flacvorbis v0.2.0 h1:KH0xjpkNTXFER4cszH4zeJxYcrHbUobz/RticWGOESs=
+github.com/go-flac/flacvorbis v0.2.0/go.mod h1:uIysHOtuU7OLGoCRG92bvnkg7QEqHx19qKRV6K1pBrI=
+github.com/go-flac/go-flac v1.0.0 h1:6qI9XOVLcO50xpzm3nXvO31BgDgHhnr/p/rER/K/doY=
+github.com/go-flac/go-flac v1.0.0/go.mod h1:WnZhcpmq4u1UdZMNn9LYSoASpWOCMOoxXxcWEHSzkW8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/samber/lo v1.36.0 h1:4LaOxH1mHnbDGhTVE0i1z8v/lWaQW8AIfOD3HU4mSaw=
-github.com/samber/lo v1.36.0/go.mod h1:HLeWcJRRyLKp3+/XBJvOrerCQn9mhdKMHyd7IRlgeQ8=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M=
-github.com/urfave/cli/v2 v2.23.6 h1:iWmtKD+prGo1nKUtLO0Wg4z9esfBM4rAV4QRLQiEmJ4=
-github.com/urfave/cli/v2 v2.23.6/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
-go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o=
-golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
+github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
+github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw=
+github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY=
+golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-unlock-music.dev/mmkv v0.0.0-20221204231432-41a75bd29939 h1:qWv734RbYjIHtHhZSRbdSyAEJ5K1rWcPSuUOen86tvI=
-unlock-music.dev/mmkv v0.0.0-20221204231432-41a75bd29939/go.mod h1:1+Hdsrk8gl1i4/oxOnAhx6y51DAcUfi2CDni6Qhk8Kw=
+unlock-music.dev/mmkv v0.0.0-20240424090133-0953e6901f3a h1:UW0sxgwsfGGC/SrKvvAbZ4HZyOQ3fqs8qr3lBxG6Fzo=
+unlock-music.dev/mmkv v0.0.0-20240424090133-0953e6901f3a/go.mod h1:qr34SM3x8xRxyUfGzefH/rSi+DUXkQZcSfXY/yfuTeo=
--- a/internal/sniff/image.go
+++ b/internal/sniff/image.go
@ -3,7 +3,7 @@ package sniff
 // ref: https://mimesniff.spec.whatwg.org
 var imageMIMEs = map[string]Sniffer{
 	"image/jpeg": prefixSniffer{0xFF, 0xD8, 0xFF},
-	"image/png":  prefixSniffer{'P', 'N', 'G', '\r', '\n', 0x1A, '\n'},
+	"image/png":  prefixSniffer{0x89, 'P', 'N', 'G', '\r', '\n', 0x1A, '\n'},
 	"image/bmp":  prefixSniffer("BM"),
 	"image/webp": prefixSniffer("RIFF"),
 	"image/gif":  prefixSniffer("GIF8"),
Author	SHA1	Message	Date
jixunmoe	2381c83f68	Merge pull request '小更改 - mmkv 相关' (#93 ) from qmc-mmkv-cipher into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/93	2024-07-06 19:35:06 +00:00
Jixun	93839580c0	refactor: rework on MusicEx footer parser	2024-07-06 20:32:26 +01:00
Jixun	849f6730b6	refactor: make mmkv key optional; change cli params name	2024-07-06 19:55:31 +01:00
Jixun	43f96e5d89	Merge remote-tracking branch 'awalol/master'	2024-07-06 19:45:10 +01:00
jixunmoe	fb07697afa	Merge pull request 'fix: wrong png header' (#91 ) from awalol/cli:fix-png into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/91	2024-05-03 08:47:13 +00:00
awalol	e4c9a53c3b	fix: wrong png header	2024-05-03 16:17:32 +08:00
Unlock Music Dev	bf6f286de1	Merge pull request 'Build: fix CI building' (#90 ) from build/fix-ci into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/90	2024-04-24 09:28:29 +00:00
Unlock Music Dev	ace582cdd7	chore: update deps	2024-04-24 17:14:06 +08:00
Unlock Music Dev	f4c68a0940	build: update ci settings	2024-04-24 17:11:40 +08:00
Unlock Music Dev	acb190ca12	chore: update deps	2024-04-24 17:05:03 +08:00
Unlock Music Dev	89dd114f13	build: fix ci	2024-04-24 16:27:51 +08:00
awalol	3ae2ec34f4	一些修改	2024-02-14 16:59:05 +08:00
awalol	655b091744	refactor: qmc musicex footer parser	2024-02-13 02:41:42 +08:00
awalol	18eb369de8	修改 shuffixBuf 匹配方法	2024-02-13 01:17:52 +08:00
awalol	dc6f268d74	refactor: load mmkv on startup	2024-02-13 00:58:13 +08:00
awalol	b7b1240603	feat: mmkv 加密数据库解析	2024-02-05 08:41:40 +08:00
jixunmoe	e504048a30	Merge pull request 'FIX: another solution to PR #86 ' (#87 ) from NestorRay/cli_fix:fix into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/87	2024-01-30 22:50:46 +00:00
jixunmoe	afcffa0e76	Merge pull request 'FIX: CHANGE metadata INT into interface{}' (#86 ) from NestorRay/cli_fix:master into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/86	2024-01-28 11:07:53 +00:00
NestorRay	f1c0b860bd	DELETE not necessary MusicID,AlbumID etc.	2024-01-28 16:24:58 +08:00
NestorRay	61c65a3a7e	CHANGE metadata INT into interface{}	2024-01-28 13:06:30 +08:00
jixunmoe	33906cd4e0	Merge pull request 'NCM: MusicID 动态类型支持' (#85 ) from fix/ncm-metadata-musicid into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/85	2024-01-28 04:03:05 +00:00
Jixun Wu	e2d88b56dd	fix: dynamic music id type	2024-01-28 03:59:17 +00:00
Unlock Music Dev	1bbc707dcc	Merge pull request 'Feat: add watch & overwrite flag' (#55 ) from feat/cli-args into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/55	2022-12-25 12:30:38 +00:00
Unlock Music Dev	dfbb807e41	feat: add watch flag	2022-12-25 20:23:59 +08:00
Unlock Music Dev	a928611a8d	feat: add overwrite flag	2022-12-25 19:26:11 +08:00
Unlock Music Dev	2754c14fa6	Merge pull request 'fix: don't fatal while process dir' (#52 ) from fix/fatal-dir into master Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/52	2022-12-09 10:17:59 +00:00
Unlock Music Dev	8858ff37ad	fix: don't fatal while process dir	2022-12-09 18:15:40 +08:00
Unlock Music Dev	d0d9836990	doc: update go version [skip ci]	2022-12-07 02:02:50 +08:00
Unlock Music Dev	1a508fc2b6	doc: update readme	2022-12-07 01:57:51 +08:00