refactoring

Author: tanaka0325

kadai2/tanaka0325/imgconv/args.go

@@ -4,12 +4,15 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/gopherdojo/dojo8/kadai2/tanaka0325/imgconv"
 )
 
 var options imgconv.Options
-var args imgconv.Args
+var args []string
+var allowedExts = []string{"png", "jpg", "jpeg", "gif", "bmp", "tiff", "tif"}
 
 func init() {
 	options.From = flag.String("f", "jpg", "file extension before convert")
@@ -21,10 +24,92 @@ func init() {
 }
 
 func main() {
-	if err := imgconv.Run(options, args); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
+	// validate options
+	if err := options.Validate(allowedExts); err != nil {
+		onExit(err)
 	}
 
-	os.Exit(0)
+	// get filenames
+	dirnames := uniq(args)
+	paths, err := getTargetFilenames(dirnames, *options.From)
+
+	if err != nil {
+		onExit(err)
+	}
+
+	// convert
+	for _, path := range paths {
+		param := imgconv.ConvertParam{
+			Path:        path,
+			BeforeImage: imgconv.NewCnvImage(*options.From),
+			AfterImage:  imgconv.NewCnvImage(*options.To),
+			FromExt:     *options.From,
+			ToExt:       *options.To,
+		}
+
+		if !*options.DryRun {
+			if err := imgconv.Convert(param); err != nil {
+				onExit(err)
+			}
+		} else {
+			fmt.Printf("%[1]s.%[2]s => %[1]s.%[3]s\n", param.Path, param.FromExt, param.ToExt)
+		}
+	}
+}
+
+func onExit(err error) {
+	fmt.Fprintln(os.Stderr, err)
+	os.Exit(1)
+}
+
+func uniq([]string) []string {
+	m := map[string]bool{}
+	u := []string{}
+
+	for _, v := range args {
+		if !m[v] {
+			m[v] = true
+
+			u = append(u, v)
+		}
+	}
+
+	return u
+}
+
+func getTargetFilenames(ds []string, from string) ([]string, error) {
+	names := []string{}
+	for _, n := range ds {
+		if ok, err := isDir(n); err != nil {
+			return nil, err
+		} else if !ok {
+			return nil, fmt.Errorf("%s is not a directory", n)
+		}
+
+		if err := filepath.Walk(n, func(name string, info os.FileInfo, err error) error {
+			if filepath.Ext(name) == "."+from {
+				n := strings.Replace(name, "."+from, "", -1)
+				names = append(names, n)
+			}
+			return nil
+		}); err != nil {
+			return nil, err
+		}
+	}
+
+	return names, nil
+}
+
+func isDir(path string) (bool, error) {
+	f, err := os.Open(path)
+	if err != nil {
+		return false, err
+	}
+
+	fi, err := f.Stat()
+	if err != nil {
+		return false, err
+	}
+
+	return fi.IsDir(), nil
 }

kadai2/tanaka0325/imgconv/cmd/imgconv/main.go

@@ -63,7 +63,7 @@ func (ip CnvImageTIFF) Decode(r io.Reader) (image.Image, error) { return tiff.De
 
 func (ip CnvImageTIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
 
-func newCnvImage(ext string) DecodeEncoder {
+func NewCnvImage(ext string) DecodeEncoder {
 	switch ext {
 	case "png":
 		return &CnvImagePNG{}

kadai2/tanaka0325/imgconv/cnv_image.go

@@ -2,65 +2,33 @@
 package imgconv
 
 import (
-	"fmt"
 	"os"
-	"path/filepath"
-	"strings"
 )
 
-var allowedExts = []string{"png", "jpg", "jpeg", "gif", "bmp", "tiff", "tif"}
-var fromExt string
-var toExt string
-
-// Run is to convert image file format.
-func Run(options Options, args Args) error {
-	// // validator
-	if err := options.validate(allowedExts); err != nil {
-		return err
-	}
-
-	fromExt = *options.From
-	toExt = *options.To
-
-	// get target image flepaths from args
-	paths, err := getTargetFilePaths(args, fromExt)
-	if err != nil {
-		return err
-	}
-
-	// convert
-	for _, path := range paths {
-		filename := strings.Replace(path, "."+fromExt, "", -1)
-		// "))
-		f := newCnvImage(fromExt)
-		t := newCnvImage(toExt)
-
-		if *options.DryRun {
-			fmt.Printf("%s.%s => %s.%s \n", filename, fromExt, filename, toExt)
-		} else if err := convert(f, t, filename); err != nil {
-			return err
-		}
-	}
-
-	return nil
+type ConvertParam struct {
+	Path        string
+	BeforeImage Decoder
+	AfterImage  Encoder
+	FromExt     string
+	ToExt       string
 }
 
-func convert(d Decoder, e Encoder, filename string) (err error) {
+func Convert(param ConvertParam) (err error) {
 	// open file
-	r, err := os.Open(filename + "." + fromExt)
+	r, err := os.Open(param.Path + "." + param.FromExt)
 	if err != nil {
 		return
 	}
 	defer r.Close()
 
 	// decode
-	img, err := d.Decode(r)
+	img, err := param.BeforeImage.Decode(r)
 	if err != nil {
 		return
 	}
 
 	// create file
-	w, err := os.Create(filename + "." + toExt)
+	w, err := os.Create(param.Path + "." + param.ToExt)
 	if err != nil {
 		return err
 	}
@@ -70,47 +38,9 @@ func convert(d Decoder, e Encoder, filename string) (err error) {
 	}()
 
 	// encode
-	if err := e.Encode(w, img); err != nil {
+	if err := param.AfterImage.Encode(w, img); err != nil {
 		return err
 	}
 
 	return
 }
-
-func getTargetFilePaths(args Args, from string) ([]string, error) {
-	uns := args.uniq()
-
-	paths := []string{}
-	for _, n := range uns {
-		if ok, err := isDir(n); err != nil {
-			return nil, err
-		} else if !ok {
-			return nil, fmt.Errorf("%s is not a directory", n)
-		}
-
-		if err := filepath.Walk(n, func(path string, info os.FileInfo, err error) error {
-			if filepath.Ext(path) == "."+from {
-				paths = append(paths, path)
-			}
-			return nil
-		}); err != nil {
-			return nil, err
-		}
-	}
-
-	return paths, nil
-}
-
-func isDir(path string) (bool, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return false, err
-	}
-
-	fi, err := f.Stat()
-	if err != nil {
-		return false, err
-	}
-
-	return fi.IsDir(), nil
-}

kadai2/tanaka0325/imgconv/imgconv.go

@@ -12,7 +12,7 @@ type Options struct {
 	DryRun *bool
 }
 
-func (opt Options) validate(allowList []string) error {
+func (opt Options) Validate(allowList []string) error {
 	to := strings.ToLower(*opt.To)
 	from := strings.ToLower(*opt.From)
 	targetExts := []string{to, from}