refactoring

Author: tanaka0325

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

@@ -24,23 +24,21 @@ func init() {
 }
 
 func main() {
-	// validate options
 	if err := options.Validate(allowedExts); err != nil {
 		onExit(err)
 	}
 
-	// get filenames
 	dirnames := uniq(args)
 	paths, err := getTargetFilenames(dirnames, *options.From)
 
 	if err != nil {
 		onExit(err)
 	}
 
-	// convert
 	for _, path := range paths {
 		param := imgconv.ConvertParam{
-			File:        imgconv.NewFile(path),
+			Path:        path,
+			File:        imgconv.NewFile(),
 			BeforeImage: imgconv.NewImage(*options.From),
 			AfterImage:  imgconv.NewImage(*options.To),
 			FromExt:     *options.From,
@@ -52,7 +50,7 @@ func main() {
 				onExit(err)
 			}
 		} else {
-			fmt.Printf("%[1]s.%[2]s => %[1]s.%[3]s\n", param.File.Path, param.FromExt, param.ToExt)
+			fmt.Printf("%[1]s.%[2]s => %[1]s.%[3]s\n", path, param.FromExt, param.ToExt)
 		}
 	}
 }

kadai2/tanaka0325/imgconv/file.go

@@ -6,17 +6,15 @@ import (
 )
 
 type OpenCreator interface {
-	Open() (io.ReadCloser, error)
-	Create() (io.WriteCloser, error)
+	Open(string) (io.ReadCloser, error)
+	Create(string) (io.WriteCloser, error)
 }
 
-type File struct {
-	Path string
-}
+type File struct{}
 
-func (f File) Open() (io.ReadCloser, error)    { return os.Open(f.Path) }
-func (f File) Create() (io.WriteCloser, error) { return os.Create(f.Path) }
+func (File) Open(n string) (io.ReadCloser, error)    { return os.Open(n) }
+func (File) Create(n string) (io.WriteCloser, error) { return os.Create(n) }
 
-func NewFile(p string) File {
-	return File{Path: p}
+func NewFile() File {
+	return File{}
 }

kadai2/tanaka0325/imgconv/image.go

@@ -24,44 +24,42 @@ type DecodeEncoder interface {
 	Encoder
 }
 
-type Image struct{}
-
 // ImagePng is type for png format.
-type ImagePNG Image
+type ImagePNG struct{}
 
-func (ip ImagePNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
+func (ImagePNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
 
-func (ip ImagePNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
+func (ImagePNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
 
 // ImageJPEG is type for jpeg format.
-type ImageJPEG Image
+type ImageJPEG struct{}
 
-func (ip ImageJPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
+func (ImageJPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
 
-func (ip ImageJPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
+func (ImageJPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
 
 // ImageGIF is type for gif format.
-type ImageGIF Image
+type ImageGIF struct{}
 
-func (ip ImageGIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
+func (ImageGIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
 
-func (ip ImageGIF) Encode(w io.Writer, i image.Image) error {
+func (ImageGIF) Encode(w io.Writer, i image.Image) error {
 	return gif.Encode(w, i, &gif.Options{NumColors: 256})
 }
 
 // ImageBMP is type for bmp format.
-type ImageBMP Image
+type ImageBMP struct{}
 
-func (ip ImageBMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
+func (ImageBMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
 
-func (ip ImageBMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
+func (ImageBMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
 
 // ImageTIFF is type for tiff format.
-type ImageTIFF Image
+type ImageTIFF struct{}
 
-func (ip ImageTIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
+func (ImageTIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
 
-func (ip ImageTIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
+func (ImageTIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
 
 func NewImage(ext string) DecodeEncoder {
 	switch ext {

kadai2/tanaka0325/imgconv/imgconv.go

@@ -1,30 +1,30 @@
 // Imgconv package is to convert images file format.
 package imgconv
 
+// ConvertParam is parameter to convert image format.
 type ConvertParam struct {
-	File        File
+	Path        string
+	File        OpenCreator
 	BeforeImage Decoder
 	AfterImage  Encoder
 	FromExt     string
 	ToExt       string
 }
 
+// Do is func to convert image format.
 func Do(param ConvertParam) (err error) {
-	// open file
-	r, err := param.File.Open()
+	r, err := param.File.Open(param.Path + "." + param.FromExt)
 	if err != nil {
 		return
 	}
 	defer r.Close()
 
-	// decode
 	img, err := param.BeforeImage.Decode(r)
 	if err != nil {
 		return
 	}
 
-	// create file
-	w, err := param.File.Create()
+	w, err := param.File.Create(param.Path + "." + param.ToExt)
 	if err != nil {
 		return err
 	}
@@ -33,7 +33,6 @@ func Do(param ConvertParam) (err error) {
 		err = w.Close()
 	}()
 
-	// encode
 	if err := param.AfterImage.Encode(w, img); err != nil {
 		return err
 	}

kadai2/tanaka0325/imgconv/options.go

@@ -12,6 +12,7 @@ type Options struct {
 	DryRun *bool
 }
 
+// Validate is func to check exts passed by options is allowed.
 func (opt Options) Validate(allowList []string) error {
 	to := strings.ToLower(*opt.To)
 	from := strings.ToLower(*opt.From)