chore: bump version to v0.2.7

ci: append version number to file name, fix tar.gz.gz archive.
chore: bump version to v0.2.6
2024-10-21 08:45:09 +09:00 · 2024-10-21 08:45:09 +09:00 · 2024-10-21 07:30:22 +09:00 · 2024-10-21 07:29:52 +09:00 · 2024-10-21 06:23:17 +09:00 · 2024-10-21 06:10:36 +09:00
7 changed files with 190 additions and 87 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
@ -1,3 +1,7 @@
 .idea

 /dist
+*.exe
+
+/um-*.tar.gz
+/um-*.zip
--- a/README.md
+++ b/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
+   ```
--- a/algo/common/dispatch.go
+++ b/algo/common/dispatch.go
@ -18,25 +18,32 @@ type DecoderParams struct {
 }
 type NewDecoderFunc func(p *DecoderParams) Decoder

-type decoderItem struct {
+type DecoderFactory struct {
 	noop   bool
-	decoder NewDecoderFunc
+	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
 }
--- a/algo/kgm/kgm.go
+++ b/algo/kgm/kgm.go
@ -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)
 }
--- a/cmd/um/main.go
+++ b/cmd/um/main.go
@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
@ -33,7 +34,7 @@ import (
 	"unlock-music.dev/cli/internal/utils"
 )

-var AppVersion = "v0.2.2"
+var AppVersion = "v0.2.7"

 var logger, _ = logging.NewZapLogger() // TODO: inject logger to application, instead of using global logger

@ -74,16 +75,30 @@ 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 appMain(c *cli.Context) (err error) {
+	cwd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
 	if c.Bool("supported-ext") {
 		printSupportedExtensions()
 		return nil
@ -92,10 +107,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:
@ -104,22 +116,20 @@ 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")
-		}
-	}
-
 	inputStat, err := os.Stat(input)
 	if err != nil {
 		return err
 	}

+	if output == "" {
+		// Default to where the input is
+		if inputStat.IsDir() {
+			output = input
+		} else {
+			output = path.Dir(input)
+		}
+	}
+
 	outputStat, err := os.Stat(output)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
@ -142,6 +152,7 @@ func appMain(c *cli.Context) (err error) {
 	}

 	proc := &processor{
+		inputDir:        input,
 		outputDir:       output,
 		skipNoopDecoder: c.Bool("skip-noop"),
 		removeSource:    c.Bool("remove-source"),
@ -150,8 +161,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 +174,7 @@ func appMain(c *cli.Context) (err error) {
 }

 type processor struct {
+	inputDir  string
 	outputDir string

 	skipNoopDecoder bool
@ -230,29 +242,32 @@ 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 {
 	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 +285,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 +305,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 +371,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)
 		}
Author	SHA1	Message	Date
鲁树人	77729cf653	chore: bump version to v0.2.7 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	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 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	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 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2024-10-21 06:23:17 +09:00
鲁树人	d4d5e5ddf4	ci: upload zip for windows build All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-21 06:10:36 +09:00
鲁树人	57c1aa3e54	ci: produce zip for windows build Some checks failed continuous-integration/drone/push Build is failing Details	2024-10-21 06:04:54 +09:00
鲁树人	b0998d8c8a	docs: document steps to update CI pipeline	2024-10-21 06:02:31 +09:00
鲁树人	f819726f3e	chore: bump version to v0.2.4 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2024-10-21 03:59:52 +09:00
鲁树人	fbad7ec450	fix #102 : support multi-part kgm extensions (kgm.flac/vpr.flac)	2024-10-21 03:58:21 +09:00
鲁树人	19bc6c466e	refactor: allow multi-part extensions (#102 )	2024-10-21 03:57:56 +09:00
鲁树人	b9e2a38f82	fix: do not throw error when file already exists	2024-10-21 03:56:52 +09:00
鲁树人	673ea8491f	docs: add do not fork notice All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-13 05:45:25 +09:00
鲁树人	0d071a82be	feat #99 : support recursive `processDir` All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2024-10-08 22:20:12 +01:00
鲁树人	b8e6196248	chore: bump version to 0.2.3 All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/tag Build is passing Details	2024-10-08 22:10:15 +01:00
鲁树人	1323fb9e1a	Merge pull request '修正 #59 #99 转换后移除原始文件处理' (#100 ) from fix-59-99-remove-source into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #100	2024-10-08 21:06:44 +00:00
鲁树人	36df203bdd	fix: record last error when calling `processDir` Some checks failed continuous-integration/drone/push Build is failing Details	2024-10-08 22:03:29 +01:00
鲁树人	2afc232eb1	fix: don't force exit when `processFile` fails.	2024-10-08 21:59:47 +01:00
鲁树人	2abdd47c9c	fix: typo	2024-10-08 21:59:27 +01:00
鲁树人	8b59bc026d	chore: ignore exe files	2024-10-08 21:59:19 +01:00
鲁树人	91855f8f5b	fix #99 : default output dir to where the input file is All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-08 21:52:23 +01:00
鲁树人	7edd326b95	fix #59 : processDir should call processFile instead.	2024-10-08 21:47:10 +01:00