Merge pull request '修正 #59 #99 转换后移除原始文件处理' (#100) from fix-59-99-remove-source into main

Reviewed-on: https://git.unlock-music.dev/um/cli/pulls/100

.gitignore

@@ -1,3 +1,4 @@
 .idea
 
 /dist
+*.exe

cmd/um/main.go

@@ -8,6 +8,7 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"path"
 	"path/filepath"
 	"runtime"
 	"runtime/debug"
@@ -84,6 +85,11 @@ func printSupportedExtensions() {
 }
 
 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 +98,7 @@ func appMain(c *cli.Context) (err error) {
 	if input == "" {
 		switch c.Args().Len() {
 		case 0:
-			input, err = os.Getwd()
+			input = cwd
-			if err != nil {
-				return err
-			}
 		case 1:
 			input = c.Args().Get(0)
 		default:
@@ -104,20 +107,18 @@ func appMain(c *cli.Context) (err error) {
 	}
 
 	output := c.String("output")
-	if output == "" {
+	inputStat, err := os.Stat(input)
-		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 output == "" {
-	if err != nil {
+		// Default to where the input is
-		return err
+		if inputStat.IsDir() {
+			output = input
+		} else {
+			output = path.Dir(input)
+		}
 	}
 
 	outputStat, err := os.Stat(output)
@@ -150,8 +151,8 @@ func appMain(c *cli.Context) (err error) {
 	}
 
 	if inputStat.IsDir() {
-		wacthDir := c.Bool("watch")
+		watchDir := c.Bool("watch")
-		if !wacthDir {
+		if !watchDir {
 			return proc.processDir(input)
 		} else {
 			return proc.watchDir(input)
@@ -230,29 +231,29 @@ 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 err := p.processFile(filePath); err != nil {
-		if len(allDec) == 0 {
+			lastError = err
-			logger.Info("skipping while no suitable decoder", zap.String("source", item.Name()))
-			continue
-		}
-
-		if err := p.process(filePath, allDec); err != nil {
 			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 {