chore: bump version to v0.2.11

fix #108 : rel path resolution in windows
chore: bump version to v0.2.10
2025-11-28 11:43:02 +00:00 · 2024-11-05 16:56:40 +09:00 · 2024-11-05 16:27:14 +09:00 · 2024-11-04 14:25:02 +09:00 · 2024-11-04 14:24:32 +09:00 · 2024-11-02 13:59:22 +09:00
9 changed files with 210 additions and 84 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -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: {
--- a/.drone.yml
+++ b/.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:
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@

 /dist
 *.exe
+
+/um-*.tar.gz
+/um-*.zip
--- a/README.md
+++ b/README.md
@@ -25,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
+   ```
--- a/algo/ncm/meta.go
+++ b/algo/ncm/meta.go
@@ -1,6 +1,7 @@
 package ncm

 import (
+	"go.uber.org/zap"
 	"strings"

 	"unlock-music.dev/cli/algo/common"
@@ -17,9 +18,11 @@ type ncmMeta interface {
 }

 type ncmMetaMusic struct {
+	logger *zap.Logger
+
 	Format        string        `json:"format"`
 	MusicName     string        `json:"musicName"`
-	Artist        [][]interface{} `json:"artist"`
+	Artist        interface{}   `json:"artist"`
 	Album         string        `json:"album"`
 	AlbumPicDocID interface{}   `json:"albumPicDocId"`
 	AlbumPic      string        `json:"albumPic"`
@@ -30,20 +33,34 @@ type ncmMetaMusic struct {
 	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 {
--- a/algo/ncm/ncm.go
+++ b/algo/ncm/ncm.go
@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"go.uber.org/zap"
 	"io"
 	"net/http"
 	"strings"
@@ -30,10 +31,11 @@ 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 {
+	logger *zap.Logger
 	rd     io.ReadSeeker // rd is the original file reader

 	offset int
@@ -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)
@@ -181,7 +183,7 @@ func (d *Decoder) readCoverData() error {
 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)
--- a/cmd/um/main.go
+++ b/cmd/um/main.go
@@ -5,21 +5,19 @@ 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"
-	"path"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
 	"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"
@@ -29,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.4"
+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()
@@ -55,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},
@@ -67,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))
@@ -93,7 +92,27 @@ func printSupportedExtensions() {
 	}
 }

+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
@@ -115,21 +134,34 @@ func appMain(c *cli.Context) (err error) {
 		}
 	}

+	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
 	}

-	if output == "" {
-		// Default to where the input is
+	var inputDir string
 	if inputStat.IsDir() {
-			output = input
+		inputDir = input
 	} else {
-			output = path.Dir(input)
+		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) {
@@ -152,7 +184,8 @@ func appMain(c *cli.Context) (err error) {
 	}

 	proc := &processor{
-		inputDir:        input,
+		logger:          logger,
+		inputDir:        inputDir,
 		outputDir:       output,
 		skipNoopDecoder: c.Bool("skip-noop"),
 		removeSource:    c.Bool("remove-source"),
@@ -174,6 +207,7 @@ func appMain(c *cli.Context) (err error) {
 }

 type processor struct {
+	logger    *zap.Logger
 	inputDir  string
 	outputDir string

@@ -265,6 +299,8 @@ func (p *processor) processDir(inputDir string) error {
 }

 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 {
 		return errors.New("skipping while no suitable decoder")
@@ -403,7 +439,7 @@ func (p *processor) process(inputFile string, allDec []common.DecoderFactory) 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
 		}
 	}
--- a/internal/ffmpeg/ffmpeg.go
+++ b/internal/ffmpeg/ffmpeg.go
@@ -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)
 	}
--- a/internal/ffmpeg/meta_flac.go
+++ b/internal/ffmpeg/meta_flac.go
@@ -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,16 +63,18 @@ 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
-		}
+			logger.Warn("failed to create flac cover", zap.Error(err))
+		} else {
 			coverBlock := cover.Marshal()
 			f.Meta = append(f.Meta, &coverBlock)

@@ -85,6 +88,7 @@ func updateMetaFlac(_ context.Context, outPath string, m *UpdateMetadataParams)
 				f.Meta[coverIdx] = &coverBlock
 			}
 		}
+	}

 	return f.Save(outPath)
 }
Author	SHA1	Message	Date
鲁树人	72ace9fc62	chore: bump version to v0.2.11	2024-11-05 16:56:40 +09:00
鲁树人	074e4f874f	fix #108 : rel path resolution in windows	2024-11-05 16:27:14 +09:00
鲁树人	2bfb5ffddf	chore: bump version to v0.2.10	2024-11-04 14:25:02 +09:00
鲁树人	2c9de7c56c	fix #107 : windows dnd path error	2024-11-04 14:24:32 +09:00
鲁树人	b374c11c86	chore: bump app version to v0.2.9	2024-11-02 13:59:22 +09:00
鲁树人	6493b2c5fc	fix #78 : skip parsing cover art if image is unsupported	2024-11-02 13:49:40 +09:00
鲁树人	f753b9c67d	fix #78 #106 : app crash due to imcompatible ncm metadata json	2024-11-02 13:44:29 +09:00
鲁树人	8829a3b3ba	refactor: rework on logging	2024-11-02 13:43:56 +09:00
鲁树人	b2ef27761f	chore: bump version to v0.2.8	2024-10-25 23:03:34 +09:00
鲁树人	7f7cb66fe5	fix #103 : incorrect output path when input is a single file	2024-10-25 23:02:32 +09:00
鲁树人	77729cf653	chore: bump version to v0.2.7	2024-10-21 08:45:09 +09:00
鲁树人	b317b89ae9	ci: append version number to file name, fix `tar.gz.gz` archive.	2024-10-21 08:45:09 +09:00
鲁树人	89b629304e	chore: bump version to v0.2.6	2024-10-21 07:30:22 +09:00
鲁树人	c0c3bda9ce	ci: add windows arm64 build	2024-10-21 07:29:52 +09:00
鲁树人	fa8f7a1565	chore: bump version to v0.2.5	2024-10-21 06:23:17 +09:00
鲁树人	d4d5e5ddf4	ci: upload zip for windows build	2024-10-21 06:10:36 +09:00
鲁树人	57c1aa3e54	ci: produce zip for windows build	2024-10-21 06:04:54 +09:00
鲁树人	b0998d8c8a	docs: document steps to update CI pipeline	2024-10-21 06:02:31 +09:00