Compare commits
34 Commits
Author | SHA1 | Date | |
---|---|---|---|
72ace9fc62 | |||
074e4f874f | |||
2bfb5ffddf | |||
2c9de7c56c | |||
b374c11c86 | |||
6493b2c5fc | |||
f753b9c67d | |||
8829a3b3ba | |||
b2ef27761f | |||
7f7cb66fe5 | |||
77729cf653 | |||
b317b89ae9 | |||
89b629304e | |||
c0c3bda9ce | |||
fa8f7a1565 | |||
d4d5e5ddf4 | |||
57c1aa3e54 | |||
b0998d8c8a | |||
f819726f3e | |||
fbad7ec450 | |||
19bc6c466e | |||
b9e2a38f82 | |||
673ea8491f | |||
0d071a82be | |||
b8e6196248 | |||
1323fb9e1a | |||
36df203bdd | |||
2afc232eb1 | |||
2abdd47c9c | |||
8b59bc026d | |||
91855f8f5b | |||
7edd326b95 | |||
0b3ad0d97c | |||
c87204c78a |
@ -8,7 +8,10 @@ local CreateRelease() = {
|
||||
settings: {
|
||||
api_key: { from_secret: 'GITEA_API_KEY' },
|
||||
base_url: 'https://git.unlock-music.dev',
|
||||
files: 'dist/*',
|
||||
files: [
|
||||
'um-*.tar.gz',
|
||||
'um-*.zip',
|
||||
],
|
||||
checksum: 'sha256',
|
||||
draft: true,
|
||||
title: '${DRONE_TAG}',
|
||||
@ -17,25 +20,36 @@ local CreateRelease() = {
|
||||
|
||||
|
||||
local StepGoBuild(GOOS, GOARCH) = {
|
||||
local filepath = 'dist/um-%s-%s.tar.gz' % [GOOS, GOARCH],
|
||||
local windows = GOOS == 'windows',
|
||||
local archiveExt = if windows then 'zip' else 'tar.gz',
|
||||
local filepath = 'dist/um-%s-%s-%s.%s' % [GOOS, GOARCH, '$(git describe --tags --always)', archiveExt],
|
||||
|
||||
local archive = if windows then [
|
||||
// Ensure zip is installed
|
||||
'command -v zip >/dev/null || (apt update && apt install -y zip)',
|
||||
'zip -9 -j -r "%s" $DIST_DIR' % filepath,
|
||||
] else [
|
||||
'tar -c -C $DIST_DIR um | gzip -9 > "%s"' % filepath,
|
||||
],
|
||||
|
||||
name: 'go build %s/%s' % [GOOS, GOARCH],
|
||||
image: 'golang:1.22',
|
||||
environment: {
|
||||
GOOS: GOOS,
|
||||
GOARCH: GOARCH,
|
||||
GOPROXY: "https://goproxy.io,direct",
|
||||
GOPROXY: 'https://goproxy.io,direct',
|
||||
},
|
||||
commands: [
|
||||
'DIST_DIR=$(mktemp -d)',
|
||||
'go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags --always)" -o $DIST_DIR ./cmd/um',
|
||||
'mkdir -p dist',
|
||||
'tar cz -f %s -C $DIST_DIR .' % filepath,
|
||||
],
|
||||
] + archive,
|
||||
};
|
||||
|
||||
local StepUploadArtifact(GOOS, GOARCH) = {
|
||||
local filename = 'um-%s-%s.tar.gz' % [GOOS, GOARCH],
|
||||
local windows = GOOS == 'windows',
|
||||
local archiveExt = if windows then 'zip' else 'tar.gz',
|
||||
local filename = 'um-%s-%s-%s.%s' % [GOOS, GOARCH, '$(git describe --tags --always)', archiveExt],
|
||||
local filepath = 'dist/%s' % filename,
|
||||
local pkgname = '${DRONE_REPO_NAME}-build',
|
||||
|
||||
@ -71,7 +85,7 @@ local PipelineBuild(GOOS, GOARCH, RUN_TEST) = {
|
||||
name: 'go test',
|
||||
image: 'golang:1.22',
|
||||
environment: {
|
||||
GOPROXY: "https://goproxy.io,direct",
|
||||
GOPROXY: 'https://goproxy.io,direct',
|
||||
},
|
||||
commands: ['go test -v ./...'],
|
||||
}] else []
|
||||
@ -100,7 +114,7 @@ local PipelineRelease() = {
|
||||
name: 'go test',
|
||||
image: 'golang:1.22',
|
||||
environment: {
|
||||
GOPROXY: "https://goproxy.io,direct",
|
||||
GOPROXY: 'https://goproxy.io,direct',
|
||||
},
|
||||
commands: ['go test -v ./...'],
|
||||
},
|
||||
@ -108,9 +122,17 @@ local PipelineRelease() = {
|
||||
StepGoBuild('linux', 'arm64'),
|
||||
StepGoBuild('linux', '386'),
|
||||
StepGoBuild('windows', 'amd64'),
|
||||
StepGoBuild('windows', 'arm64'),
|
||||
StepGoBuild('windows', '386'),
|
||||
StepGoBuild('darwin', 'amd64'),
|
||||
StepGoBuild('darwin', 'arm64'),
|
||||
{
|
||||
name: 'prepare root',
|
||||
image: 'golang:1.22',
|
||||
commands: [
|
||||
'mv dist/*.tar.gz dist/*.zip ./',
|
||||
],
|
||||
},
|
||||
CreateRelease(),
|
||||
],
|
||||
trigger: {
|
||||
|
71
.drone.yml
71
.drone.yml
@ -17,7 +17,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-linux-amd64.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-linux-amd64-$(git describe --tags
|
||||
--always).tar.gz"
|
||||
environment:
|
||||
GOARCH: amd64
|
||||
GOOS: linux
|
||||
@ -25,9 +26,10 @@ steps:
|
||||
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"
|
||||
"$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}/um-linux-amd64.tar.gz"
|
||||
- sha256sum dist/um-linux-amd64.tar.gz
|
||||
- curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-linux-amd64-$(git
|
||||
describe --tags --always).tar.gz" "$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}/um-linux-amd64-$(git
|
||||
describe --tags --always).tar.gz"
|
||||
- sha256sum dist/um-linux-amd64-$(git describe --tags --always).tar.gz
|
||||
- echo $DRONE_GITEA_SERVER/${DRONE_REPO_NAMESPACE}/-/packages/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}
|
||||
environment:
|
||||
DRONE_GITEA_SERVER: https://git.unlock-music.dev
|
||||
@ -53,7 +55,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-windows-amd64.tar.gz -C $DIST_DIR .
|
||||
- command -v zip >/dev/null || (apt update && apt install -y zip)
|
||||
- zip -9 -j -r "dist/um-windows-amd64-$(git describe --tags --always).zip" $DIST_DIR
|
||||
environment:
|
||||
GOARCH: amd64
|
||||
GOOS: windows
|
||||
@ -61,9 +64,10 @@ steps:
|
||||
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"
|
||||
"$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}/um-windows-amd64.tar.gz"
|
||||
- sha256sum dist/um-windows-amd64.tar.gz
|
||||
- curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-windows-amd64-$(git
|
||||
describe --tags --always).zip" "$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}/um-windows-amd64-$(git
|
||||
describe --tags --always).zip"
|
||||
- sha256sum dist/um-windows-amd64-$(git describe --tags --always).zip
|
||||
- echo $DRONE_GITEA_SERVER/${DRONE_REPO_NAMESPACE}/-/packages/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}
|
||||
environment:
|
||||
DRONE_GITEA_SERVER: https://git.unlock-music.dev
|
||||
@ -89,7 +93,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-darwin-amd64.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-darwin-amd64-$(git describe --tags
|
||||
--always).tar.gz"
|
||||
environment:
|
||||
GOARCH: amd64
|
||||
GOOS: darwin
|
||||
@ -97,9 +102,10 @@ steps:
|
||||
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"
|
||||
"$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}/um-darwin-amd64.tar.gz"
|
||||
- sha256sum dist/um-darwin-amd64.tar.gz
|
||||
- curl --fail --include --user "um-release-bot:$GITEA_API_KEY" --upload-file "dist/um-darwin-amd64-$(git
|
||||
describe --tags --always).tar.gz" "$DRONE_GITEA_SERVER/api/packages/${DRONE_REPO_NAMESPACE}/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}/um-darwin-amd64-$(git
|
||||
describe --tags --always).tar.gz"
|
||||
- sha256sum dist/um-darwin-amd64-$(git describe --tags --always).tar.gz
|
||||
- echo $DRONE_GITEA_SERVER/${DRONE_REPO_NAMESPACE}/-/packages/generic/${DRONE_REPO_NAME}-build/${DRONE_BUILD_NUMBER}
|
||||
environment:
|
||||
DRONE_GITEA_SERVER: https://git.unlock-music.dev
|
||||
@ -131,7 +137,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-linux-amd64.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-linux-amd64-$(git describe --tags
|
||||
--always).tar.gz"
|
||||
environment:
|
||||
GOARCH: amd64
|
||||
GOOS: linux
|
||||
@ -143,7 +150,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-linux-arm64.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-linux-arm64-$(git describe --tags
|
||||
--always).tar.gz"
|
||||
environment:
|
||||
GOARCH: arm64
|
||||
GOOS: linux
|
||||
@ -155,7 +163,7 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-linux-386.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-linux-386-$(git describe --tags --always).tar.gz"
|
||||
environment:
|
||||
GOARCH: "386"
|
||||
GOOS: linux
|
||||
@ -167,7 +175,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-windows-amd64.tar.gz -C $DIST_DIR .
|
||||
- command -v zip >/dev/null || (apt update && apt install -y zip)
|
||||
- zip -9 -j -r "dist/um-windows-amd64-$(git describe --tags --always).zip" $DIST_DIR
|
||||
environment:
|
||||
GOARCH: amd64
|
||||
GOOS: windows
|
||||
@ -179,7 +188,21 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-windows-386.tar.gz -C $DIST_DIR .
|
||||
- command -v zip >/dev/null || (apt update && apt install -y zip)
|
||||
- zip -9 -j -r "dist/um-windows-arm64-$(git describe --tags --always).zip" $DIST_DIR
|
||||
environment:
|
||||
GOARCH: arm64
|
||||
GOOS: windows
|
||||
GOPROXY: https://goproxy.io,direct
|
||||
image: golang:1.22
|
||||
name: go build windows/arm64
|
||||
- commands:
|
||||
- DIST_DIR=$(mktemp -d)
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- command -v zip >/dev/null || (apt update && apt install -y zip)
|
||||
- zip -9 -j -r "dist/um-windows-386-$(git describe --tags --always).zip" $DIST_DIR
|
||||
environment:
|
||||
GOARCH: "386"
|
||||
GOOS: windows
|
||||
@ -191,7 +214,8 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-darwin-amd64.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-darwin-amd64-$(git describe --tags
|
||||
--always).tar.gz"
|
||||
environment:
|
||||
GOARCH: amd64
|
||||
GOOS: darwin
|
||||
@ -203,13 +227,18 @@ steps:
|
||||
- go build -v -trimpath -ldflags="-w -s -X main.AppVersion=$(git describe --tags
|
||||
--always)" -o $DIST_DIR ./cmd/um
|
||||
- mkdir -p dist
|
||||
- tar cz -f dist/um-darwin-arm64.tar.gz -C $DIST_DIR .
|
||||
- tar -c -C $DIST_DIR um | gzip -9 > "dist/um-darwin-arm64-$(git describe --tags
|
||||
--always).tar.gz"
|
||||
environment:
|
||||
GOARCH: arm64
|
||||
GOOS: darwin
|
||||
GOPROXY: https://goproxy.io,direct
|
||||
image: golang:1.22
|
||||
name: go build darwin/arm64
|
||||
- commands:
|
||||
- mv dist/*.tar.gz dist/*.zip ./
|
||||
image: golang:1.22
|
||||
name: prepare root
|
||||
- image: plugins/gitea-release
|
||||
name: create release
|
||||
settings:
|
||||
@ -218,7 +247,9 @@ steps:
|
||||
base_url: https://git.unlock-music.dev
|
||||
checksum: sha256
|
||||
draft: true
|
||||
files: dist/*
|
||||
files:
|
||||
- um-*.tar.gz
|
||||
- um-*.zip
|
||||
title: ${DRONE_TAG}
|
||||
trigger:
|
||||
event:
|
||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1,7 @@
|
||||
.idea
|
||||
|
||||
/dist
|
||||
*.exe
|
||||
|
||||
/um-*.tar.gz
|
||||
/um-*.zip
|
||||
|
13
README.md
13
README.md
@ -6,6 +6,9 @@ Original: Web Edition https://git.unlock-music.dev/um/web
|
||||
- [Release Download](https://git.unlock-music.dev/um/cli/releases/latest)
|
||||
- [Latest Build](https://git.unlock-music.dev/um/-/packages/generic/cli-build/)
|
||||
|
||||
> **WARNING**
|
||||
> 在本站 fork 不会起到备份的作用,只会浪费服务器储存空间。如无必要请勿 fork 该仓库。
|
||||
|
||||
## Features
|
||||
|
||||
- [x] All Algorithm Supported By `unlock-music/web`
|
||||
@ -22,3 +25,13 @@ Original: Web Edition https://git.unlock-music.dev/um/web
|
||||
- Drag the encrypted file to `um.exe` (Tested on Windows)
|
||||
- Run: `./um [-o <output dir>] [-i] <input dir/file>`
|
||||
- Use `./um -h` to show help menu
|
||||
|
||||
## Update CI pipeline
|
||||
|
||||
1. Install [Drone CI binary](https://docs.drone.io/cli/install/)
|
||||
2. Edit `.drone.jsonnet`
|
||||
3. Update drone CI pipeline:
|
||||
|
||||
```sh
|
||||
drone jsonnet --format --stream
|
||||
```
|
||||
|
@ -18,25 +18,32 @@ type DecoderParams struct {
|
||||
}
|
||||
type NewDecoderFunc func(p *DecoderParams) Decoder
|
||||
|
||||
type decoderItem struct {
|
||||
noop bool
|
||||
decoder NewDecoderFunc
|
||||
type DecoderFactory struct {
|
||||
noop bool
|
||||
Suffix string
|
||||
Create NewDecoderFunc
|
||||
}
|
||||
|
||||
var DecoderRegistry = make(map[string][]decoderItem)
|
||||
var DecoderRegistry []DecoderFactory
|
||||
|
||||
func RegisterDecoder(ext string, noop bool, dispatchFunc NewDecoderFunc) {
|
||||
DecoderRegistry[ext] = append(DecoderRegistry[ext],
|
||||
decoderItem{noop: noop, decoder: dispatchFunc})
|
||||
DecoderRegistry = append(DecoderRegistry,
|
||||
DecoderFactory{noop: noop, Create: dispatchFunc, Suffix: "." + strings.TrimPrefix(ext, ".")})
|
||||
}
|
||||
|
||||
func GetDecoder(filename string, skipNoop bool) (rs []NewDecoderFunc) {
|
||||
ext := strings.ToLower(strings.TrimLeft(filepath.Ext(filename), "."))
|
||||
for _, dec := range DecoderRegistry[ext] {
|
||||
func GetDecoder(filename string, skipNoop bool) []DecoderFactory {
|
||||
var result []DecoderFactory
|
||||
// Some extensions contains multiple dots, e.g. ".kgm.flac", hence iterate
|
||||
// all decoders for each extension.
|
||||
name := strings.ToLower(filepath.Base(filename))
|
||||
for _, dec := range DecoderRegistry {
|
||||
if !strings.HasSuffix(name, dec.Suffix) {
|
||||
continue
|
||||
}
|
||||
if skipNoop && dec.noop {
|
||||
continue
|
||||
}
|
||||
rs = append(rs, dec.decoder)
|
||||
result = append(result, dec)
|
||||
}
|
||||
return
|
||||
return result
|
||||
}
|
||||
|
@ -61,4 +61,7 @@ func init() {
|
||||
common.RegisterDecoder("kgma", false, NewDecoder)
|
||||
// Viper
|
||||
common.RegisterDecoder("vpr", false, NewDecoder)
|
||||
// Kugou Android
|
||||
common.RegisterDecoder("kgm.flac", false, NewDecoder)
|
||||
common.RegisterDecoder("vpr.flac", false, NewDecoder)
|
||||
}
|
||||
|
@ -1,6 +1,7 @@
|
||||
package ncm
|
||||
|
||||
import (
|
||||
"go.uber.org/zap"
|
||||
"strings"
|
||||
|
||||
"unlock-music.dev/cli/algo/common"
|
||||
@ -17,33 +18,49 @@ type ncmMeta interface {
|
||||
}
|
||||
|
||||
type ncmMetaMusic struct {
|
||||
Format string `json:"format"`
|
||||
MusicName string `json:"musicName"`
|
||||
Artist [][]interface{} `json:"artist"`
|
||||
Album string `json:"album"`
|
||||
AlbumPicDocID interface{} `json:"albumPicDocId"`
|
||||
AlbumPic string `json:"albumPic"`
|
||||
Flag int `json:"flag"`
|
||||
Bitrate int `json:"bitrate"`
|
||||
Duration int `json:"duration"`
|
||||
Alias []interface{} `json:"alias"`
|
||||
TransNames []interface{} `json:"transNames"`
|
||||
logger *zap.Logger
|
||||
|
||||
Format string `json:"format"`
|
||||
MusicName string `json:"musicName"`
|
||||
Artist interface{} `json:"artist"`
|
||||
Album string `json:"album"`
|
||||
AlbumPicDocID interface{} `json:"albumPicDocId"`
|
||||
AlbumPic string `json:"albumPic"`
|
||||
Flag int `json:"flag"`
|
||||
Bitrate int `json:"bitrate"`
|
||||
Duration int `json:"duration"`
|
||||
Alias []interface{} `json:"alias"`
|
||||
TransNames []interface{} `json:"transNames"`
|
||||
}
|
||||
|
||||
func newNcmMetaMusic(logger *zap.Logger) *ncmMetaMusic {
|
||||
ncm := new(ncmMetaMusic)
|
||||
ncm.logger = logger.With(zap.String("module", "ncmMetaMusic"))
|
||||
return ncm
|
||||
}
|
||||
|
||||
func (m *ncmMetaMusic) GetAlbumImageURL() string {
|
||||
return m.AlbumPic
|
||||
}
|
||||
|
||||
func (m *ncmMetaMusic) GetArtists() (artists []string) {
|
||||
for _, artist := range m.Artist {
|
||||
for _, item := range artist {
|
||||
name, ok := item.(string)
|
||||
if ok {
|
||||
func (m *ncmMetaMusic) GetArtists() []string {
|
||||
m.logger.Debug("ncm artists", zap.Any("artists", m.Artist))
|
||||
|
||||
var artists []string = nil
|
||||
if jsonArtists, ok := m.Artist.([][]string); ok {
|
||||
for _, artist := range jsonArtists {
|
||||
for _, name := range artist {
|
||||
artists = append(artists, name)
|
||||
}
|
||||
}
|
||||
} else if artist, ok := m.Artist.(string); ok {
|
||||
// #78: artist is a string type.
|
||||
// https://git.unlock-music.dev/um/cli/issues/78
|
||||
artists = []string{artist}
|
||||
} else {
|
||||
m.logger.Warn("unexpected artist type", zap.Any("artists", m.Artist))
|
||||
}
|
||||
return
|
||||
return artists
|
||||
}
|
||||
|
||||
func (m *ncmMetaMusic) GetTitle() string {
|
||||
|
@ -8,6 +8,7 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"go.uber.org/zap"
|
||||
"io"
|
||||
"net/http"
|
||||
"strings"
|
||||
@ -30,11 +31,12 @@ var (
|
||||
)
|
||||
|
||||
func NewDecoder(p *common.DecoderParams) common.Decoder {
|
||||
return &Decoder{rd: p.Reader}
|
||||
return &Decoder{rd: p.Reader, logger: p.Logger.With(zap.String("module", "ncm"))}
|
||||
}
|
||||
|
||||
type Decoder struct {
|
||||
rd io.ReadSeeker // rd is the original file reader
|
||||
logger *zap.Logger
|
||||
rd io.ReadSeeker // rd is the original file reader
|
||||
|
||||
offset int
|
||||
cipher common.StreamDecoder
|
||||
@ -74,7 +76,7 @@ func (d *Decoder) Validate() error {
|
||||
}
|
||||
|
||||
if err := d.parseMeta(); err != nil {
|
||||
return fmt.Errorf("parse meta failed: %w", err)
|
||||
return fmt.Errorf("parse meta failed: %w (raw json=%s)", err, string(d.metaRaw))
|
||||
}
|
||||
|
||||
d.cipher = newNcmCipher(keyData)
|
||||
@ -149,12 +151,18 @@ func (d *Decoder) readMetaData() error {
|
||||
}
|
||||
|
||||
func (d *Decoder) readCoverData() error {
|
||||
bCoverCRC := make([]byte, 4)
|
||||
if _, err := io.ReadFull(d.rd, bCoverCRC); err != nil {
|
||||
return fmt.Errorf("ncm read cover crc: %w", err)
|
||||
bCoverFrameLen := make([]byte, 4)
|
||||
if _, err := io.ReadFull(d.rd, bCoverFrameLen); err != nil {
|
||||
return fmt.Errorf("ncm read cover length: %w", err)
|
||||
}
|
||||
|
||||
bCoverLen := make([]byte, 4) //
|
||||
coverFrameStartOffset, err := d.rd.Seek(0, io.SeekCurrent)
|
||||
if err != nil {
|
||||
return fmt.Errorf("ncm fetch cover frame start offset: %w", err)
|
||||
}
|
||||
coverFrameLen := binary.LittleEndian.Uint32(bCoverFrameLen)
|
||||
|
||||
bCoverLen := make([]byte, 4)
|
||||
if _, err := io.ReadFull(d.rd, bCoverLen); err != nil {
|
||||
return fmt.Errorf("ncm read cover length: %w", err)
|
||||
}
|
||||
@ -166,13 +174,16 @@ func (d *Decoder) readCoverData() error {
|
||||
}
|
||||
d.cover = coverBuf
|
||||
|
||||
return nil
|
||||
offsetAudioData := coverFrameStartOffset + int64(coverFrameLen) + 4
|
||||
_, err = d.rd.Seek(offsetAudioData, io.SeekStart)
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
func (d *Decoder) parseMeta() error {
|
||||
switch d.metaType {
|
||||
case "music":
|
||||
d.meta = new(ncmMetaMusic)
|
||||
d.meta = newNcmMetaMusic(d.logger)
|
||||
return json.Unmarshal(d.metaRaw, d.meta)
|
||||
case "dj":
|
||||
d.meta = new(ncmMetaDJ)
|
||||
|
169
cmd/um/main.go
169
cmd/um/main.go
@ -5,6 +5,10 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/fsnotify/fsnotify"
|
||||
"github.com/urfave/cli/v2"
|
||||
"go.uber.org/zap"
|
||||
"go.uber.org/zap/zapcore"
|
||||
"io"
|
||||
"os"
|
||||
"os/signal"
|
||||
@ -14,11 +18,6 @@ import (
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/fsnotify/fsnotify"
|
||||
"github.com/urfave/cli/v2"
|
||||
"go.uber.org/zap"
|
||||
|
||||
"unlock-music.dev/cli/algo/common"
|
||||
_ "unlock-music.dev/cli/algo/kgm"
|
||||
_ "unlock-music.dev/cli/algo/kwm"
|
||||
@ -28,14 +27,13 @@ import (
|
||||
_ "unlock-music.dev/cli/algo/xiami"
|
||||
_ "unlock-music.dev/cli/algo/ximalaya"
|
||||
"unlock-music.dev/cli/internal/ffmpeg"
|
||||
"unlock-music.dev/cli/internal/logging"
|
||||
"unlock-music.dev/cli/internal/sniff"
|
||||
"unlock-music.dev/cli/internal/utils"
|
||||
)
|
||||
|
||||
var AppVersion = "v0.2.1"
|
||||
var AppVersion = "v0.2.11"
|
||||
|
||||
var logger, _ = logging.NewZapLogger() // TODO: inject logger to application, instead of using global logger
|
||||
var logger = setupLogger(false) // TODO: inject logger to application, instead of using global logger
|
||||
|
||||
func main() {
|
||||
module, ok := debug.ReadBuildInfo()
|
||||
@ -54,6 +52,7 @@ func main() {
|
||||
&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: "verbose", Aliases: []string{"V"}, Usage: "verbose logging", Required: false, Value: false},
|
||||
&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},
|
||||
@ -66,6 +65,7 @@ func main() {
|
||||
HideHelpCommand: true,
|
||||
UsageText: "um [-o /path/to/output/dir] [--extra-flags] [-i] /path/to/input",
|
||||
}
|
||||
|
||||
err := app.Run(os.Args)
|
||||
if err != nil {
|
||||
logger.Fatal("run app failed", zap.Error(err))
|
||||
@ -74,16 +74,50 @@ func main() {
|
||||
|
||||
func printSupportedExtensions() {
|
||||
var exts []string
|
||||
for ext := range common.DecoderRegistry {
|
||||
extSet := make(map[string]int)
|
||||
for _, factory := range common.DecoderRegistry {
|
||||
ext := strings.TrimPrefix(factory.Suffix, ".")
|
||||
if n, ok := extSet[ext]; ok {
|
||||
extSet[ext] = n + 1
|
||||
} else {
|
||||
extSet[ext] = 1
|
||||
}
|
||||
}
|
||||
for ext := range extSet {
|
||||
exts = append(exts, ext)
|
||||
}
|
||||
sort.Strings(exts)
|
||||
for _, ext := range exts {
|
||||
fmt.Printf("%s: %d\n", ext, len(common.DecoderRegistry[ext]))
|
||||
fmt.Printf("%s: %d\n", ext, extSet[ext])
|
||||
}
|
||||
}
|
||||
|
||||
func setupLogger(verbose bool) *zap.Logger {
|
||||
logConfig := zap.NewProductionEncoderConfig()
|
||||
logConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder
|
||||
logConfig.EncodeTime = zapcore.RFC3339TimeEncoder
|
||||
enabler := zap.LevelEnablerFunc(func(level zapcore.Level) bool {
|
||||
if verbose {
|
||||
return true
|
||||
}
|
||||
return level >= zapcore.InfoLevel
|
||||
})
|
||||
|
||||
return zap.New(zapcore.NewCore(
|
||||
zapcore.NewConsoleEncoder(logConfig),
|
||||
os.Stdout,
|
||||
enabler,
|
||||
))
|
||||
}
|
||||
|
||||
func appMain(c *cli.Context) (err error) {
|
||||
logger = setupLogger(c.Bool("verbose"))
|
||||
|
||||
cwd, err := os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if c.Bool("supported-ext") {
|
||||
printSupportedExtensions()
|
||||
return nil
|
||||
@ -92,10 +126,7 @@ func appMain(c *cli.Context) (err error) {
|
||||
if input == "" {
|
||||
switch c.Args().Len() {
|
||||
case 0:
|
||||
input, err = os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
input = cwd
|
||||
case 1:
|
||||
input = c.Args().Get(0)
|
||||
default:
|
||||
@ -103,23 +134,34 @@ func appMain(c *cli.Context) (err error) {
|
||||
}
|
||||
}
|
||||
|
||||
output := c.String("output")
|
||||
if output == "" {
|
||||
var err error
|
||||
output, err = os.Getwd()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if input == output {
|
||||
return errors.New("input and output path are same")
|
||||
}
|
||||
input, absErr := filepath.Abs(input)
|
||||
if absErr != nil {
|
||||
return fmt.Errorf("get abs path failed: %w", absErr)
|
||||
}
|
||||
|
||||
output := c.String("output")
|
||||
inputStat, err := os.Stat(input)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var inputDir string
|
||||
if inputStat.IsDir() {
|
||||
inputDir = input
|
||||
} else {
|
||||
inputDir = filepath.Dir(input)
|
||||
}
|
||||
inputDir, absErr = filepath.Abs(inputDir)
|
||||
if absErr != nil {
|
||||
return fmt.Errorf("get abs path (inputDir) failed: %w", absErr)
|
||||
}
|
||||
|
||||
if output == "" {
|
||||
// Default to where the input dir is
|
||||
output = inputDir
|
||||
}
|
||||
logger.Debug("resolve input/output path", zap.String("inputDir", inputDir), zap.String("input", input), zap.String("output", output))
|
||||
|
||||
outputStat, err := os.Stat(output)
|
||||
if err != nil {
|
||||
if errors.Is(err, os.ErrNotExist) {
|
||||
@ -142,6 +184,8 @@ func appMain(c *cli.Context) (err error) {
|
||||
}
|
||||
|
||||
proc := &processor{
|
||||
logger: logger,
|
||||
inputDir: inputDir,
|
||||
outputDir: output,
|
||||
skipNoopDecoder: c.Bool("skip-noop"),
|
||||
removeSource: c.Bool("remove-source"),
|
||||
@ -150,8 +194,8 @@ func appMain(c *cli.Context) (err error) {
|
||||
}
|
||||
|
||||
if inputStat.IsDir() {
|
||||
wacthDir := c.Bool("watch")
|
||||
if !wacthDir {
|
||||
watchDir := c.Bool("watch")
|
||||
if !watchDir {
|
||||
return proc.processDir(input)
|
||||
} else {
|
||||
return proc.watchDir(input)
|
||||
@ -163,6 +207,8 @@ func appMain(c *cli.Context) (err error) {
|
||||
}
|
||||
|
||||
type processor struct {
|
||||
logger *zap.Logger
|
||||
inputDir string
|
||||
outputDir string
|
||||
|
||||
skipNoopDecoder bool
|
||||
@ -230,29 +276,34 @@ func (p *processor) processDir(inputDir string) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var lastError error = nil
|
||||
for _, item := range items {
|
||||
if item.IsDir() {
|
||||
continue
|
||||
}
|
||||
|
||||
filePath := filepath.Join(inputDir, item.Name())
|
||||
allDec := common.GetDecoder(filePath, p.skipNoopDecoder)
|
||||
if len(allDec) == 0 {
|
||||
logger.Info("skipping while no suitable decoder", zap.String("source", item.Name()))
|
||||
if item.IsDir() {
|
||||
if err = p.processDir(filePath); err != nil {
|
||||
lastError = err
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
if err := p.process(filePath, allDec); err != nil {
|
||||
if err := p.processFile(filePath); err != nil {
|
||||
lastError = err
|
||||
logger.Error("conversion failed", zap.String("source", item.Name()), zap.Error(err))
|
||||
}
|
||||
}
|
||||
if lastError != nil {
|
||||
return fmt.Errorf("last error: %w", lastError)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *processor) processFile(filePath string) error {
|
||||
p.logger.Debug("processFile", zap.String("file", filePath), zap.String("inputDir", p.inputDir))
|
||||
|
||||
allDec := common.GetDecoder(filePath, p.skipNoopDecoder)
|
||||
if len(allDec) == 0 {
|
||||
logger.Fatal("skipping while no suitable decoder")
|
||||
return errors.New("skipping while no suitable decoder")
|
||||
}
|
||||
|
||||
if err := p.process(filePath, allDec); err != nil {
|
||||
@ -270,7 +321,19 @@ func (p *processor) processFile(filePath string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *processor) process(inputFile string, allDec []common.NewDecoderFunc) error {
|
||||
func (p *processor) findDecoder(decoders []common.DecoderFactory, params *common.DecoderParams) (*common.Decoder, *common.DecoderFactory, error) {
|
||||
for _, factory := range decoders {
|
||||
dec := factory.Create(params)
|
||||
err := dec.Validate()
|
||||
if err == nil {
|
||||
return &dec, &factory, nil
|
||||
}
|
||||
logger.Warn("try decode failed", zap.Error(err))
|
||||
}
|
||||
return nil, nil, errors.New("no any decoder can resolve the file")
|
||||
}
|
||||
|
||||
func (p *processor) process(inputFile string, allDec []common.DecoderFactory) error {
|
||||
file, err := os.Open(inputFile)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -278,26 +341,16 @@ func (p *processor) process(inputFile string, allDec []common.NewDecoderFunc) er
|
||||
defer file.Close()
|
||||
logger := logger.With(zap.String("source", inputFile))
|
||||
|
||||
decParams := &common.DecoderParams{
|
||||
pDec, decoderFactory, err := p.findDecoder(allDec, &common.DecoderParams{
|
||||
Reader: file,
|
||||
Extension: filepath.Ext(inputFile),
|
||||
FilePath: inputFile,
|
||||
Logger: logger,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var dec common.Decoder
|
||||
for _, decFunc := range allDec {
|
||||
dec = decFunc(decParams)
|
||||
if err := dec.Validate(); err == nil {
|
||||
break
|
||||
} else {
|
||||
logger.Warn("try decode failed", zap.Error(err))
|
||||
dec = nil
|
||||
}
|
||||
}
|
||||
if dec == nil {
|
||||
return errors.New("no any decoder can resolve the file")
|
||||
}
|
||||
dec := *pDec
|
||||
|
||||
params := &ffmpeg.UpdateMetadataParams{}
|
||||
|
||||
@ -354,13 +407,19 @@ 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)
|
||||
inputRelDir, err := filepath.Rel(p.inputDir, filepath.Dir(inputFile))
|
||||
if err != nil {
|
||||
return fmt.Errorf("get relative dir failed: %w", err)
|
||||
}
|
||||
|
||||
inFilename := strings.TrimSuffix(filepath.Base(inputFile), decoderFactory.Suffix)
|
||||
outPath := filepath.Join(p.outputDir, inputRelDir, inFilename+params.AudioExt)
|
||||
|
||||
if !p.overwriteOutput {
|
||||
_, err := os.Stat(outPath)
|
||||
if err == nil {
|
||||
return fmt.Errorf("output file %s is already exist", outPath)
|
||||
logger.Warn("output file already exist, skip", zap.String("destination", outPath))
|
||||
return nil
|
||||
} else if !errors.Is(err, os.ErrNotExist) {
|
||||
return fmt.Errorf("stat output file failed: %w", err)
|
||||
}
|
||||
@ -380,7 +439,7 @@ func (p *processor) process(inputFile string, allDec []common.NewDecoderFunc) er
|
||||
ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
|
||||
defer cancel()
|
||||
|
||||
if err := ffmpeg.UpdateMeta(ctx, outPath, params); err != nil {
|
||||
if err := ffmpeg.UpdateMeta(ctx, outPath, params, logger); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"go.uber.org/zap"
|
||||
"io"
|
||||
"os"
|
||||
"os/exec"
|
||||
@ -43,9 +44,9 @@ type UpdateMetadataParams struct {
|
||||
AlbumArtExt string // required if AlbumArt is not nil
|
||||
}
|
||||
|
||||
func UpdateMeta(ctx context.Context, outPath string, params *UpdateMetadataParams) error {
|
||||
func UpdateMeta(ctx context.Context, outPath string, params *UpdateMetadataParams, logger *zap.Logger) error {
|
||||
if params.AudioExt == ".flac" {
|
||||
return updateMetaFlac(ctx, outPath, params)
|
||||
return updateMetaFlac(ctx, outPath, params, logger.With(zap.String("module", "updateMetaFlac")))
|
||||
} else {
|
||||
return updateMetaFFmpeg(ctx, outPath, params)
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ package ffmpeg
|
||||
|
||||
import (
|
||||
"context"
|
||||
"go.uber.org/zap"
|
||||
"mime"
|
||||
"strings"
|
||||
|
||||
@ -11,7 +12,7 @@ import (
|
||||
"golang.org/x/exp/slices"
|
||||
)
|
||||
|
||||
func updateMetaFlac(_ context.Context, outPath string, m *UpdateMetadataParams) error {
|
||||
func updateMetaFlac(_ context.Context, outPath string, m *UpdateMetadataParams, logger *zap.Logger) error {
|
||||
f, err := flac.ParseFile(m.Audio)
|
||||
if err != nil {
|
||||
return err
|
||||
@ -62,27 +63,30 @@ func updateMetaFlac(_ context.Context, outPath string, m *UpdateMetadataParams)
|
||||
}
|
||||
|
||||
if m.AlbumArt != nil {
|
||||
|
||||
coverMime := mime.TypeByExtension(m.AlbumArtExt)
|
||||
logger.Debug("cover image mime detect", zap.String("mime", coverMime))
|
||||
cover, err := flacpicture.NewFromImageData(
|
||||
flacpicture.PictureTypeFrontCover,
|
||||
"Front cover",
|
||||
m.AlbumArt,
|
||||
mime.TypeByExtension(m.AlbumArtExt),
|
||||
coverMime,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
coverBlock := cover.Marshal()
|
||||
f.Meta = append(f.Meta, &coverBlock)
|
||||
|
||||
// add / replace flac cover
|
||||
coverIdx := slices.IndexFunc(f.Meta, func(b *flac.MetaDataBlock) bool {
|
||||
return b.Type == flac.Picture
|
||||
})
|
||||
if coverIdx < 0 {
|
||||
f.Meta = append(f.Meta, &coverBlock)
|
||||
if err != nil {
|
||||
logger.Warn("failed to create flac cover", zap.Error(err))
|
||||
} else {
|
||||
f.Meta[coverIdx] = &coverBlock
|
||||
coverBlock := cover.Marshal()
|
||||
f.Meta = append(f.Meta, &coverBlock)
|
||||
|
||||
// add / replace flac cover
|
||||
coverIdx := slices.IndexFunc(f.Meta, func(b *flac.MetaDataBlock) bool {
|
||||
return b.Type == flac.Picture
|
||||
})
|
||||
if coverIdx < 0 {
|
||||
f.Meta = append(f.Meta, &coverBlock)
|
||||
} else {
|
||||
f.Meta[coverIdx] = &coverBlock
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user