Merge pull request #1257 from vinicel/fix/colored-text-windows

fix: colored text on windows
sundowndev · May 2, 2023 · 8453a84 · 8453a84
2 parents 4259f35 + b46b1b9
commit 8453a84
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -23,6 +23,6 @@ func Execute() {
 }
 
 func exitWithError(err error) {
-	fmt.Println(color.RedString(err.Error()))
+	fmt.Fprintf(color.Error, "%s\n", color.RedString(err.Error()))
 	os.Exit(1)
 }
diff --git a/cmd/scan.go b/cmd/scan.go
@@ -11,7 +11,6 @@ import (
 	"github.com/sundowndev/phoneinfoga/v2/lib/number"
 	"github.com/sundowndev/phoneinfoga/v2/lib/output"
 	"github.com/sundowndev/phoneinfoga/v2/lib/remote"
-	"os"
 )
 
 type ScanCmdOptions struct {
@@ -53,7 +52,7 @@ func NewScanCmd(opts *ScanCmdOptions) *cobra.Command {
 }
 
 func runScan(opts *ScanCmdOptions) {
-	fmt.Printf(color.WhiteString("Running scan for phone number %s...\n\n"), opts.Number)
+	fmt.Fprintf(color.Output, color.WhiteString("Running scan for phone number %s...\n\n"), opts.Number)
 
 	if valid := number.IsValid(opts.Number); !valid {
 		logrus.WithFields(map[string]interface{}{
@@ -83,7 +82,7 @@ func runScan(opts *ScanCmdOptions) {
 
 	result, errs := remoteLibrary.Scan(num)
 
-	err = output.GetOutput(output.Console, os.Stdout).Write(result, errs)
+	err = output.GetOutput(output.Console, color.Output).Write(result, errs)
 	if err != nil {
 		exitWithError(err)
 	}

diff --git a/web/v2/api/server/server.go b/web/v2/api/server/server.go
@@ -1,6 +1,7 @@
 package server
 
 import (
+	"github.com/fatih/color"
 	"github.com/gin-gonic/gin"
 	"github.com/sundowndev/phoneinfoga/v2/web/v2/api"
 	"github.com/sundowndev/phoneinfoga/v2/web/v2/api/handlers"
@@ -12,6 +13,8 @@ type Server struct {
 }
 
 func NewServer() *Server {
+	gin.DefaultWriter = color.Output
+	gin.DefaultErrorWriter = color.Error
 	s := &Server{
 		router: gin.Default(),
 	}