um/cli
35
83
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases 23 Wiki Activity

feat: support removing source files #33

Merged
Sloaix merged 1 commits from master into master 2022-03-05 09:56:09 +00:00
Conversation 1 Commits 1 Files Changed 1 +19 -7
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f27b73a64c - Show all commits

26
cmd/um/main.go
View File

@ -33,6 +33,7 @@ func main() {
Flags: []cli.Flag{ Flags: []cli.Flag{
&cli.StringFlag{Name: "input", Aliases: []string{"i"}, Usage: "path to input file or dir", Required: false}, &cli.StringFlag{Name: "input", Aliases: []string{"i"}, Usage: "path to input file or dir", Required: false},
&cli.StringFlag{Name: "output", Aliases: []string{"o"}, Usage: "path to output dir", Required: false}, &cli.StringFlag{Name: "output", Aliases: []string{"o"}, Usage: "path to output dir", 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: "skip-noop", Aliases: []string{"n"}, Usage: "skip noop decoder", Required: false, Value: true},
&cli.BoolFlag{Name: "supported-ext", Usage: "Show supported file extensions and exit", Required: false, Value: false}, &cli.BoolFlag{Name: "supported-ext", Usage: "Show supported file extensions and exit", Required: false, Value: false},
}, },
@ -90,6 +91,7 @@ func appMain(c *cli.Context) (err error) {
} }
skipNoop := c.Bool("skip-noop") skipNoop := c.Bool("skip-noop")
removeSource := c.Bool("remove-source")
inputStat, err := os.Stat(input) inputStat, err := os.Stat(input)
if err != nil { if err != nil {
@ -109,17 +111,17 @@ func appMain(c *cli.Context) (err error) {
} }
if inputStat.IsDir() { if inputStat.IsDir() {
return dealDirectory(input, output, skipNoop) return dealDirectory(input, output, skipNoop, removeSource)
} else { } else {
allDec := common.GetDecoder(inputStat.Name(), skipNoop) allDec := common.GetDecoder(inputStat.Name(), skipNoop)
if len(allDec) == 0 { if len(allDec) == 0 {
logging.Log().Fatal("skipping while no suitable decoder") logging.Log().Fatal("skipping while no suitable decoder")
} }
return tryDecFile(input, output, allDec) return tryDecFile(input, output, allDec, removeSource)
} }
} }
func dealDirectory(inputDir string, outputDir string, skipNoop bool) error { func dealDirectory(inputDir string, outputDir string, skipNoop bool, removeSource bool) error {
items, err := os.ReadDir(inputDir) items, err := os.ReadDir(inputDir)
if err != nil { if err != nil {
return err return err
@ -134,7 +136,7 @@ func dealDirectory(inputDir string, outputDir string, skipNoop bool) error {
continue continue
} }
err := tryDecFile(filepath.Join(inputDir, item.Name()), outputDir, allDec) err := tryDecFile(filepath.Join(inputDir, item.Name()), outputDir, allDec, removeSource)
if err != nil { if err != nil {
logging.Log().Error("conversion failed", zap.String("source", item.Name())) logging.Log().Error("conversion failed", zap.String("source", item.Name()))
} }
@ -142,7 +144,7 @@ func dealDirectory(inputDir string, outputDir string, skipNoop bool) error {
return nil return nil
} }
func tryDecFile(inputFile string, outputDir string, allDec []common.NewDecoderFunc) error { func tryDecFile(inputFile string, outputDir string, allDec []common.NewDecoderFunc, removeSource bool) error {
file, err := os.ReadFile(inputFile) file, err := os.ReadFile(inputFile)
if err != nil { if err != nil {
return err return err
@ -180,7 +182,17 @@ func tryDecFile(inputFile string, outputDir string, allDec []common.NewDecoderFu
if err != nil { if err != nil {
return err return err
} }
logging.Log().Info("successfully converted",
zap.String("source", inputFile), zap.String("destination", outPath)) // if source file need to be removed
if removeSource {
err := os.RemoveAll(inputFile)
if err != nil {
return err
}
logging.Log().Info("successfully converted, and source file is removed", zap.String("source", inputFile), zap.String("destination", outPath))
} else {
logging.Log().Info("successfully converted", zap.String("source", inputFile), zap.String("destination", outPath))
}
return nil return nil
} }