オプション、引数の基本的な処理の場所を移動

Author: tanaka0325

kadai1/tanaka0325/README.md

@@ -24,6 +24,7 @@
 
 ```zsh
 # build
+$ cd imgconv
 $ go build -o imgconv ./cmd/imgconv
 
 # display help

kadai1/tanaka0325/imgconv/args.go

@@ -0,0 +1,17 @@
+package imgconv
+
+type Args []string
+
+func (args Args) uniq() []string {
+	m := map[string]bool{}
+	u := []string{}
+
+	for _, v := range args {
+		if !m[v] {
+			m[v] = true
+			u = append(u, v)
+		}
+	}
+
+	return u
+}

kadai1/tanaka0325/imgconv/cmd/imgconv/main.go

@@ -1,14 +1,27 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"os"
 
 	"github.com/gopherdojo/dojo8/kadai1/tanaka0325/imgconv"
 )
 
+var options imgconv.Options
+var args imgconv.Args
+
+func init() {
+	options.From = flag.String("f", "jpg", "file extention before convert")
+	options.To = flag.String("t", "png", "file extention after convert")
+	options.DryRun = flag.Bool("n", false, "dry run")
+	flag.Parse()
+
+	args = flag.Args()
+}
+
 func main() {
-	if err := imgconv.Run(); err != nil {
+	if err := imgconv.Run(options, args); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}

kadai1/tanaka0325/imgconv/exts.go

@@ -0,0 +1,5 @@
+module github.com/gopherdojo/dojo8/kadai1/tanaka0325/imgconv
+
+go 1.14
+
+require golang.org/x/image v0.0.0-20200618115811-c13761719519

kadai1/tanaka0325/imgconv/go.mod.back

@@ -1,4 +1,3 @@
-github.com/gopherdojo/dojo8 v0.0.0-20200703052727-6a79d18126bf h1:lpYevjFQMxI5VNBc3WXV6Z5pDDrdppdDKwmeBoyt5BE=
 golang.org/x/image v0.0.0-20200618115811-c13761719519 h1:1e2ufUJNM3lCHEY5jIgac/7UTjd6cgJNdatjPdFWf34=
 golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

kadai1/tanaka0325/imgconv/go.sum

@@ -1,49 +1,30 @@
 package imgconv
 
 import (
-	"flag"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-var (
-	// flags
-	f      = flag.String("f", "jpg", "file extention before convert")
-	t      = flag.String("t", "png", "file extention after convert")
-	dryRun = flag.Bool("n", false, "dry run")
-
-	// allow extensions
-	allowedExts = exts{"png", "jpg", "jpeg", "gif", "bmp", "tiff", "tif"}
-)
-
-func init() {
-	flag.Parse()
-}
+var allowedExts = []string{"png", "jpg", "jpeg", "gif", "bmp", "tiff", "tif"}
 
 // Run is to convert image file format
-func Run() error {
-	// check options ext
-	to := strings.ToLower(*t)
-	from := strings.ToLower(*f)
-	targetExts := []string{to, from}
-	for _, e := range targetExts {
-		if err := allowedExts.include(e); err != nil {
-			return fmt.Errorf("%w. ext is only allowd in %s", err, allowedExts)
-		}
+func Run(options Options, args Args) error {
+	// validator
+	if err := options.validate(allowedExts); err != nil {
+		return err
 	}
 
 	// get target image paths from args
-	dns := flag.Args()
-	udns := uniq(dns)
-	paths, err := getPaths(udns, from)
+	udns := args.uniq()
+	paths, err := getPaths(udns, *options.From)
 	if err != nil {
 		return err
 	}
 
 	// convert
-	imgs, err := createConvImages(paths, from, to)
+	imgs, err := createConvImages(paths, *options.From, *options.To)
 	if err != nil {
 		return err
 	}
@@ -52,7 +33,7 @@ func Run() error {
 			return err
 		}
 
-		if *dryRun {
+		if *options.DryRun {
 			fmt.Println(img.filename+"."+img.fromExt, "=>", img.filename+"."+img.toExt)
 		} else {
 			if err := img.encode(); err != nil {
@@ -64,20 +45,6 @@ func Run() error {
 	return nil
 }
 
-func uniq(s []string) []string {
-	m := map[string]bool{}
-	u := []string{}
-
-	for _, v := range s {
-		if !m[v] {
-			m[v] = true
-			u = append(u, v)
-		}
-	}
-
-	return u
-}
-
 func getPaths(dns []string, from string) ([]string, error) {
 	paths := []string{}
 

kadai1/tanaka0325/imgconv/imgconv.go

@@ -0,0 +1,35 @@
+package imgconv
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+type Options struct {
+	From   *string
+	To     *string
+	DryRun *bool
+}
+
+func (opt Options) validate(allow_list []string) error {
+	to := strings.ToLower(*opt.To)
+	from := strings.ToLower(*opt.From)
+	targetExts := []string{to, from}
+	for _, e := range targetExts {
+		if err := include(allow_list, e); err != nil {
+			return fmt.Errorf("%w. ext is only allowd in %s", err, allow_list)
+		}
+	}
+
+	return nil
+}
+
+func include(list []string, w string) error {
+	for _, e := range list {
+		if e == w {
+			return nil
+		}
+	}
+	return errors.New(w + " is not allowed")
+}