mirror of
https://git.um-react.app/um/cli.git
synced 2026-10-20 13:33:01 +00:00
refactor(#8): update LoadMMKVOrDefault function to use MMKVLoaderOptions and implement platform-specific loading for Windows
This commit is contained in:
+7
-2
@@ -24,6 +24,7 @@ import (
|
||||
_ "git.um-react.app/um/cli/algo/xiami"
|
||||
_ "git.um-react.app/um/cli/algo/ximalaya"
|
||||
"git.um-react.app/um/cli/internal/ffmpeg"
|
||||
"git.um-react.app/um/cli/internal/mmkv"
|
||||
"git.um-react.app/um/cli/internal/sniff"
|
||||
"git.um-react.app/um/cli/internal/utils"
|
||||
"github.com/fsnotify/fsnotify"
|
||||
@@ -51,6 +52,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: "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},
|
||||
&cli.BoolFlag{Name: "skip-noop", Aliases: []string{"n"}, Usage: "skip noop decoder", Required: false, Value: true},
|
||||
@@ -176,11 +178,14 @@ func appMain(c *cli.Context) (err error) {
|
||||
return errors.New("output should be a writable directory")
|
||||
}
|
||||
|
||||
// QMC: Load keys
|
||||
qmcKeys, err := qmc.LoadMMKVOrDefault(c.String("qmc-mmkv"), c.String("qmc-mmkv-key"), logger)
|
||||
// QMC: Load platform keys, then merge user mmkv (--qmc-mmkv) on all platforms.
|
||||
qmcKeys, err := qmc.LoadMMKVOrDefault(qmc.MMKVLoaderOptions{
|
||||
CliExe: c.String("qmpc-mmkv-cli-exe"),
|
||||
}, logger)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
qmcKeys = mmkv.Merge(qmcKeys, qmc.LoadUserMMKV(c.String("qmc-mmkv"), c.String("qmc-mmkv-key"), logger))
|
||||
|
||||
kggDbPath := c.String("kgg-db")
|
||||
if kggDbPath == "" {
|
||||
|
||||
Reference in New Issue
Block a user