From 4c4d4f43a05ad5b906be0618872be8852a5e534b Mon Sep 17 00:00:00 2001
From: shuntakeuch1 <takeuchishun89@gmail.com>
Date: Wed, 5 Jun 2019 07:37:05 +0900
Subject: [PATCH 1/2] inital commit

---
 kadai1/shuntakeuch1/data/150x150.png      | Bin 0 -> 864 bytes
 kadai1/shuntakeuch1/ifconv/ifconv.go      |   7 ++++++
 kadai1/shuntakeuch1/ifconv/ifconv_test.go |   7 ++++++
 kadai1/shuntakeuch1/main.go               |  25 ++++++++++++++++++++++
 kadai1/shuntakeuch1/test1.png             | Bin 0 -> 864 bytes
 5 files changed, 39 insertions(+)
 create mode 100644 kadai1/shuntakeuch1/data/150x150.png
 create mode 100644 kadai1/shuntakeuch1/ifconv/ifconv.go
 create mode 100644 kadai1/shuntakeuch1/ifconv/ifconv_test.go
 create mode 100644 kadai1/shuntakeuch1/main.go
 create mode 100644 kadai1/shuntakeuch1/test1.png

diff --git a/kadai1/shuntakeuch1/data/150x150.png b/kadai1/shuntakeuch1/data/150x150.png
new file mode 100644
index 0000000000000000000000000000000000000000..32cf9f90d2b38067088d6691e0cb7af5b3817844
GIT binary patch
literal 864
zcmeAS@N?(olHy`uVBq!ia0vp^(?FO5NH9od>Dd7(mUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^>
z;_2(k{+Nx0-JIk2*7-kx@)@2kjv*Dd-d??1w8(&g^})XX(sNwaHbkwy{cH2$wR!>n
z7anlVWoUfkvs-kBf%x+~9u1atY{GIv%AX7J86s0Ax{5`nND6H_p>(=s0+6lNqO<9Q
zks?rh8mD5n&L$rYpqf;t6H47W!cIV?GX*xC*v0&s^?I{y*N>M5b<!nI9_a2{xj*sb
z_ciDJF7Eid+)(Q2@x?FLLN8Csk9;WM`dCQW-hYLg@rkRN6_aQDU6U2_$y9rWz2}tP
zV4W@A4YTY1HFEsR&kFuznmyhBW2wo3WxKXG+1pnfSv6;hTwOZ5{)WfPRLwUmdi?Rl
zv|iaatG&<9c+Otzb852Qk-*xTC-S`Bb!kg2MSB%Le7qz4ZGExTrVVHP^AkhO{S7-N
zuc)89rA_r~#M4XD-rrpR?ek^3U02U0ioZ^ocq?kkmE>H8+uTg&&&f?ZplDy)aN%8<
zVyvRyTd%B*f3Bx)+kM3Bn5WWex0UzpLX9_OMF+Kq9`jD$6Mwcoe*X%&#lqWlGmixA
z_MO19y8d;*{tAH!)3>SiMkL;{(A;)Zb=j@0C!ECnb-iD0NP1lueP+k3|D_w3=x+VC
zO6S3xrTdc2G*_BNCr8YW+}eCyWhcj*OBeZ^s?&a#G_JkKc?;;WmAc12Hg!K=FuUx`
zh0lwQynmS=`ISTbX1E{F*(s{h6W_PoeIxGX?69KzgGY3Eam33{;q}$qD?MYwisnTI
z-Rd@wKbr0CmA+PV)$~vAPQ7mR_0CJVYl=5k@h5<POm^MNcn+t%^8qG9)e_f;l9a@f
zRIB8oR3OD*WMF8iYhb2pU=m_zW@Tz>WniIgU}<GwP}#$D8%0BIeoAIqC2kEI7k8xt
PH86O(`njxgN@xNAZa{5|

literal 0
HcmV?d00001

diff --git a/kadai1/shuntakeuch1/ifconv/ifconv.go b/kadai1/shuntakeuch1/ifconv/ifconv.go
new file mode 100644
index 0000000..ec2f7e3
--- /dev/null
+++ b/kadai1/shuntakeuch1/ifconv/ifconv.go
@@ -0,0 +1,7 @@
+package ifconv
+
+import "fmt"
+
+func Execute(dir string, before_f string, after_f string) {
+	fmt.Println(dir, before_f, after_f)
+}
diff --git a/kadai1/shuntakeuch1/ifconv/ifconv_test.go b/kadai1/shuntakeuch1/ifconv/ifconv_test.go
new file mode 100644
index 0000000..7f0253d
--- /dev/null
+++ b/kadai1/shuntakeuch1/ifconv/ifconv_test.go
@@ -0,0 +1,7 @@
+package ifconv
+
+import "testing"
+
+func TestExecute(t *testing.T) {
+	Execute("foo", "bar", "hoge")
+}
diff --git a/kadai1/shuntakeuch1/main.go b/kadai1/shuntakeuch1/main.go
new file mode 100644
index 0000000..8a0f6f7
--- /dev/null
+++ b/kadai1/shuntakeuch1/main.go
@@ -0,0 +1,25 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/gopherdojo/dojo5/kadai1/shuntakeuch1/ifconv"
+)
+
+// flagをつけてbefore format と after formatのデフォルトをきめる
+var before = flag.String("b", "jpg", "変換前画像形式を指定してください")
+var after = flag.String("a", "png", "変換後画像形式を指定してください")
+
+func main() {
+	flag.Parse()
+	dir := flag.Arg(0)
+	// ディレクトリを聞く or 引数にないと強制終了
+	if dir == "" {
+		fmt.Println("ディレクトリを指定してください")
+		os.Exit(0)
+	}
+
+	ifconv.Execute(dir, *before, *after)
+}
diff --git a/kadai1/shuntakeuch1/test1.png b/kadai1/shuntakeuch1/test1.png
new file mode 100644
index 0000000000000000000000000000000000000000..32cf9f90d2b38067088d6691e0cb7af5b3817844
GIT binary patch
literal 864
zcmeAS@N?(olHy`uVBq!ia0vp^(?FO5NH9od>Dd7(mUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^>
z;_2(k{+Nx0-JIk2*7-kx@)@2kjv*Dd-d??1w8(&g^})XX(sNwaHbkwy{cH2$wR!>n
z7anlVWoUfkvs-kBf%x+~9u1atY{GIv%AX7J86s0Ax{5`nND6H_p>(=s0+6lNqO<9Q
zks?rh8mD5n&L$rYpqf;t6H47W!cIV?GX*xC*v0&s^?I{y*N>M5b<!nI9_a2{xj*sb
z_ciDJF7Eid+)(Q2@x?FLLN8Csk9;WM`dCQW-hYLg@rkRN6_aQDU6U2_$y9rWz2}tP
zV4W@A4YTY1HFEsR&kFuznmyhBW2wo3WxKXG+1pnfSv6;hTwOZ5{)WfPRLwUmdi?Rl
zv|iaatG&<9c+Otzb852Qk-*xTC-S`Bb!kg2MSB%Le7qz4ZGExTrVVHP^AkhO{S7-N
zuc)89rA_r~#M4XD-rrpR?ek^3U02U0ioZ^ocq?kkmE>H8+uTg&&&f?ZplDy)aN%8<
zVyvRyTd%B*f3Bx)+kM3Bn5WWex0UzpLX9_OMF+Kq9`jD$6Mwcoe*X%&#lqWlGmixA
z_MO19y8d;*{tAH!)3>SiMkL;{(A;)Zb=j@0C!ECnb-iD0NP1lueP+k3|D_w3=x+VC
zO6S3xrTdc2G*_BNCr8YW+}eCyWhcj*OBeZ^s?&a#G_JkKc?;;WmAc12Hg!K=FuUx`
zh0lwQynmS=`ISTbX1E{F*(s{h6W_PoeIxGX?69KzgGY3Eam33{;q}$qD?MYwisnTI
z-Rd@wKbr0CmA+PV)$~vAPQ7mR_0CJVYl=5k@h5<POm^MNcn+t%^8qG9)e_f;l9a@f
zRIB8oR3OD*WMF8iYhb2pU=m_zW@Tz>WniIgU}<GwP}#$D8%0BIeoAIqC2kEI7k8xt
PH86O(`njxgN@xNAZa{5|

literal 0
HcmV?d00001


From 3e319c05a4216e4f98cdc27da6d3d302c4584630 Mon Sep 17 00:00:00 2001
From: shuntakeuch1 <takeuchishun89@gmail.com>
Date: Wed, 5 Jun 2019 17:27:34 +0900
Subject: [PATCH 2/2] =?UTF-8?q?jpeg=E3=82=92png=E3=81=AB=E5=A4=89=E6=8F=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kadai1/shuntakeuch1/ifconv/ifconv.go      | 32 ++++++++++++++++++++---
 kadai1/shuntakeuch1/ifconv/ifconv_test.go |  4 ++-
 kadai1/shuntakeuch1/main.go               |  3 ++-
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/kadai1/shuntakeuch1/ifconv/ifconv.go b/kadai1/shuntakeuch1/ifconv/ifconv.go
index ec2f7e3..cf62742 100644
--- a/kadai1/shuntakeuch1/ifconv/ifconv.go
+++ b/kadai1/shuntakeuch1/ifconv/ifconv.go
@@ -1,7 +1,33 @@
 package ifconv
 
-import "fmt"
+import (
+	"image"
+	"image/jpeg"
+	"os"
+)
 
-func Execute(dir string, before_f string, after_f string) {
-	fmt.Println(dir, before_f, after_f)
+func Execute(dir string, before_f string, after_f string) error {
+	sf, err := os.Open("test1.png")
+	if err != nil {
+		return err
+	}
+	defer sf.Close()
+
+	img, format, err := image.Decode(sf)
+	if err != nil {
+		return err
+	}
+
+	if format == "hoge" {
+		return err
+	}
+
+	file, err := os.Create("test1.jpeg")
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	jpeg.Encode(file, img, &jpeg.Options{})
+	return nil
 }
diff --git a/kadai1/shuntakeuch1/ifconv/ifconv_test.go b/kadai1/shuntakeuch1/ifconv/ifconv_test.go
index 7f0253d..7d96836 100644
--- a/kadai1/shuntakeuch1/ifconv/ifconv_test.go
+++ b/kadai1/shuntakeuch1/ifconv/ifconv_test.go
@@ -1,6 +1,8 @@
 package ifconv
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestExecute(t *testing.T) {
 	Execute("foo", "bar", "hoge")
diff --git a/kadai1/shuntakeuch1/main.go b/kadai1/shuntakeuch1/main.go
index 8a0f6f7..0a8d6dc 100644
--- a/kadai1/shuntakeuch1/main.go
+++ b/kadai1/shuntakeuch1/main.go
@@ -21,5 +21,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	ifconv.Execute(dir, *before, *after)
+	result := ifconv.Execute(dir, *before, *after)
+	fmt.Println(result)
 }