add formatted in one line print output. change External IP and Local interface name lines to colored.

iqhater · iqhater · commit d2539a29c41d · 2024-09-23T18:37:13.000+03:00
diff --git a/go.mod b/go.mod
@@ -1,3 +1,11 @@
 module github.com/iqhater/myip
 
 go 1.21
+
+require github.com/fatih/color v1.17.0
+
+require (
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,11 @@
+github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
+github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/view/ui.go b/view/ui.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/fatih/color"
 	"github.com/iqhater/myip/data"
 )
 
@@ -13,26 +14,26 @@ var out io.Writer = os.Stdout
 
 // PrintInternal print all internal ip data
 func PrintInternal(d *data.IPData) {
-	fmt.Fprintln(out, "Local interface name:", d.AdapterName)
-	fmt.Fprintln(out, "Internal IP:", d.IntIP)
+	color.New(color.FgMagenta).Fprintln(out, "Local interface name:", d.AdapterName)
+	fmt.Fprintln(out, "	 Internal IP:", d.IntIP)
 }
 
 // PrintExternal print all external ip data
 func PrintExternal(d *data.IPData) {
 
 	if d.ExtIP != "" {
-		fmt.Fprintln(out, "External IP:", d.ExtIP)
+		color.New(color.FgGreen).Fprintln(out, "	 External IP:", d.ExtIP)
 	}
 
 	if d.Country != "" {
-		fmt.Fprintln(out, "Country:", d.Country)
+		fmt.Fprintln(out, "	     Country:", d.Country)
 	}
 
 	if d.CountryCode != "" {
-		fmt.Fprintln(out, "Country Code:", d.CountryCode)
+		fmt.Fprintln(out, "	Country Code:", d.CountryCode)
 	}
 
 	if d.Region != "" {
-		fmt.Fprintln(out, "Region:", d.Region)
+		fmt.Fprintln(out, "	      Region:", d.Region)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"io"`
`6`	`6`	`"os"`
`7`	`7`
	`8`	`+ "github.com/fatih/color"`
`8`	`9`	`"github.com/iqhater/myip/data"`
`9`	`10`	`)`
`10`	`11`
`@@ -13,26 +14,26 @@ var out io.Writer = os.Stdout`
`13`	`14`
`14`	`15`	`// PrintInternal print all internal ip data`
`15`	`16`	`func PrintInternal(d *data.IPData) {`
`16`		`- fmt.Fprintln(out, "Local interface name:", d.AdapterName)`
`17`		`- fmt.Fprintln(out, "Internal IP:", d.IntIP)`
	`17`	`+ color.New(color.FgMagenta).Fprintln(out, "Local interface name:", d.AdapterName)`
	`18`	`+ fmt.Fprintln(out, " Internal IP:", d.IntIP)`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`// PrintExternal print all external ip data`
`21`	`22`	`func PrintExternal(d *data.IPData) {`
`22`	`23`
`23`	`24`	`if d.ExtIP != "" {`
`24`		`- fmt.Fprintln(out, "External IP:", d.ExtIP)`
	`25`	`+ color.New(color.FgGreen).Fprintln(out, " External IP:", d.ExtIP)`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`if d.Country != "" {`
`28`		`- fmt.Fprintln(out, "Country:", d.Country)`
	`29`	`+ fmt.Fprintln(out, " Country:", d.Country)`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`if d.CountryCode != "" {`
`32`		`- fmt.Fprintln(out, "Country Code:", d.CountryCode)`
	`33`	`+ fmt.Fprintln(out, " Country Code:", d.CountryCode)`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`if d.Region != "" {`
`36`		`- fmt.Fprintln(out, "Region:", d.Region)`
	`37`	`+ fmt.Fprintln(out, " Region:", d.Region)`
`37`	`38`	`}`
`38`	`39`	`}`