diff --git a/algo/qmc/key_mmkv_loader_windows.go b/algo/qmc/key_mmkv_loader_windows.go index 3ed7788..ec681af 100644 --- a/algo/qmc/key_mmkv_loader_windows.go +++ b/algo/qmc/key_mmkv_loader_windows.go @@ -10,12 +10,9 @@ import ( ) func LoadMMKVOrDefault(opts MMKVLoaderOptions, logger *zap.Logger) (result common.QMCKeys, err error) { - cliExe := opts.CliExe - if cliExe == "" { - cliExe = "qmpc-mmkv-cli.exe" - } + exe := opts.CliExe - cmd := exec.Command(cliExe, "-f", "plaintext", "-o", "-") + cmd := exec.Command(exe, "-f", "plaintext", "-o", "-") var stdout, stderr bytes.Buffer cmd.Stdout = &stdout cmd.Stderr = &stderr @@ -25,13 +22,13 @@ func LoadMMKVOrDefault(opts MMKVLoaderOptions, logger *zap.Logger) (result commo var exitErr *exec.ExitError if errors.As(err, &exitErr) { logger.Warn("LoadMMKVOrDefault: qmpc-mmkv-cli exited with non-zero status", - zap.String("exe", cliExe), + zap.String("exe", exe), zap.Int("exit_code", exitErr.ExitCode()), zap.String("stderr", stderr.String()), ) } else { logger.Warn("LoadMMKVOrDefault: failed to run qmpc-mmkv-cli", - zap.String("exe", cliExe), + zap.String("exe", exe), zap.Error(err), zap.String("stderr", stderr.String()), ) diff --git a/cmd/um/main.go b/cmd/um/main.go index 0c71969..3e5bf8d 100644 --- a/cmd/um/main.go +++ b/cmd/um/main.go @@ -51,7 +51,7 @@ func main() { &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 QQMusic mmkv path", Required: false}, &cli.StringFlag{Name: "qmc-mmkv-key", Aliases: []string{"key"}, Usage: "QQMusic mmkv password (16 ascii chars)", Required: false}, - &cli.StringFlag{Name: "qmpc-mmkv-cli-exe", Usage: "path to QMPC MMKV Cli by LSR (v0.1.1+, auto-fetch QMC keys; Windows only)", Required: false, Value: "qmpc-mmkv-cli.exe"}, + &cli.StringFlag{Name: "qmpc-mmkv-cli-exe", Usage: "path to QMPC MMKV Cli by LSR (v0.1.1+, auto-fetch QMC keys; Windows only)", Required: false, Value: "./qmpc-mmkv-cli.exe"}, &cli.StringFlag{Name: "qmc-android-db", Usage: "path to QQMusic Android player_process_db (dump from android: /data/data/com.tencent.qqmusic/databases/)", Required: false, Value: ""}, &cli.StringFlag{Name: "kgg-db", Usage: "path to kgg db (win32 kugou v11)", Required: false}, &cli.BoolFlag{Name: "remove-source", Aliases: []string{"rs"}, Usage: "remove source file", Required: false, Value: false},