Compare commits

..

No commits in common. "1323fb9e1adf9313b66e140be7ead9bf8870c523" and "0b3ad0d97c3004f16bd1ea93b5235a365722842f" have entirely different histories.

2 changed files with 25 additions and 27 deletions

1
.gitignore vendored
View File

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

View File

@ -8,7 +8,6 @@ import (
"io" "io"
"os" "os"
"os/signal" "os/signal"
"path"
"path/filepath" "path/filepath"
"runtime" "runtime"
"runtime/debug" "runtime/debug"
@ -85,11 +84,6 @@ func printSupportedExtensions() {
} }
func appMain(c *cli.Context) (err error) { func appMain(c *cli.Context) (err error) {
cwd, err := os.Getwd()
if err != nil {
return err
}
if c.Bool("supported-ext") { if c.Bool("supported-ext") {
printSupportedExtensions() printSupportedExtensions()
return nil return nil
@ -98,7 +92,10 @@ func appMain(c *cli.Context) (err error) {
if input == "" { if input == "" {
switch c.Args().Len() { switch c.Args().Len() {
case 0: case 0:
input = cwd input, err = os.Getwd()
if err != nil {
return err
}
case 1: case 1:
input = c.Args().Get(0) input = c.Args().Get(0)
default: default:
@ -107,20 +104,22 @@ func appMain(c *cli.Context) (err error) {
} }
output := c.String("output") output := c.String("output")
inputStat, err := os.Stat(input) if output == "" {
var err error
output, err = os.Getwd()
if err != nil { if err != nil {
return err return err
} }
if input == output {
if output == "" { return errors.New("input and output path are same")
// Default to where the input is
if inputStat.IsDir() {
output = input
} else {
output = path.Dir(input)
} }
} }
inputStat, err := os.Stat(input)
if err != nil {
return err
}
outputStat, err := os.Stat(output) outputStat, err := os.Stat(output)
if err != nil { if err != nil {
if errors.Is(err, os.ErrNotExist) { if errors.Is(err, os.ErrNotExist) {
@ -151,8 +150,8 @@ func appMain(c *cli.Context) (err error) {
} }
if inputStat.IsDir() { if inputStat.IsDir() {
watchDir := c.Bool("watch") wacthDir := c.Bool("watch")
if !watchDir { if !wacthDir {
return proc.processDir(input) return proc.processDir(input)
} else { } else {
return proc.watchDir(input) return proc.watchDir(input)
@ -231,29 +230,29 @@ func (p *processor) processDir(inputDir string) error {
if err != nil { if err != nil {
return err return err
} }
var lastError error = nil
for _, item := range items { for _, item := range items {
if item.IsDir() { if item.IsDir() {
continue continue
} }
filePath := filepath.Join(inputDir, item.Name()) filePath := filepath.Join(inputDir, item.Name())
if err := p.processFile(filePath); err != nil { allDec := common.GetDecoder(filePath, p.skipNoopDecoder)
lastError = err if len(allDec) == 0 {
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)) logger.Error("conversion failed", zap.String("source", item.Name()), zap.Error(err))
} }
} }
if lastError != nil {
return fmt.Errorf("last error: %w", lastError)
}
return nil return nil
} }
func (p *processor) processFile(filePath string) error { func (p *processor) processFile(filePath string) error {
allDec := common.GetDecoder(filePath, p.skipNoopDecoder) allDec := common.GetDecoder(filePath, p.skipNoopDecoder)
if len(allDec) == 0 { if len(allDec) == 0 {
return errors.New("skipping while no suitable decoder") logger.Fatal("skipping while no suitable decoder")
} }
if err := p.process(filePath, allDec); err != nil { if err := p.process(filePath, allDec); err != nil {