From 4dc86a827dae6ca6a5688ecef8bc91ea6b92eef5 Mon Sep 17 00:00:00 2001
From: David Gamba <davidgamba@gmail.com>
Date: Wed, 9 Oct 2024 00:06:55 -0600
Subject: [PATCH] dag: Update color code

---
 dag/color.go  | 34 +++++++++++++++++++++++++
 dag/dag.go    |  3 +++
 dag/logger.go | 69 ---------------------------------------------------
 3 files changed, 37 insertions(+), 69 deletions(-)
 create mode 100644 dag/color.go
 delete mode 100644 dag/logger.go

diff --git a/dag/color.go b/dag/color.go
new file mode 100644
index 0000000..3a34a0c
--- /dev/null
+++ b/dag/color.go
@@ -0,0 +1,34 @@
+package dag
+
+import (
+	"fmt"
+	"strings"
+)
+
+func (g *Graph) colorInfo(format string) string {
+	return g.color(g.InfoColor, format)
+}
+
+func (g *Graph) colorInfoBold(format string) string {
+	return g.color(g.InfoBoldColor, format)
+}
+
+func (g *Graph) colorError(format string) string {
+	return g.color(g.ErrorColor, format)
+}
+
+func (g *Graph) colorErrorBold(format string) string {
+	return g.color(g.ErrorBoldColor, format)
+}
+
+func (g *Graph) color(color string, format string) string {
+	if !g.UseColor {
+		return format
+	}
+	if !strings.HasSuffix(format, "\n") {
+		return fmt.Sprintf("\033[%sm%s\033[0m", color, format)
+	}
+
+	format = format[:len(format)-1]
+	return fmt.Sprintf("\033[%sm%s\033[0m\n", color, format)
+}
diff --git a/dag/dag.go b/dag/dag.go
index 88c811f..9324131 100644
--- a/dag/dag.go
+++ b/dag/dag.go
@@ -30,6 +30,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"sync"
 	"time"
@@ -37,6 +38,8 @@ import (
 	"github.com/DavidGamba/go-getoptions"
 )
 
+var Logger = log.New(os.Stderr, "", log.LstdFlags)
+
 type (
 	ID string
 
diff --git a/dag/logger.go b/dag/logger.go
deleted file mode 100644
index a6dbaee..0000000
--- a/dag/logger.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package dag
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"os"
-
-	"strings"
-)
-
-// var Logger = NewColorLogger()
-
-var Logger = log.New(os.Stderr, "", log.LstdFlags)
-
-type ColorLogger struct {
-	logger *log.Logger
-	Color  string
-}
-
-func NewColorLogger() *ColorLogger {
-	return &ColorLogger{
-		logger: log.New(os.Stderr, "", log.LstdFlags),
-		Color:  "35",
-	}
-}
-
-func (l *ColorLogger) Printf(format string, v ...interface{}) {
-	if l.Color == "" {
-		l.logger.Printf(format, v...)
-		return
-	} else {
-		// l.logger.Printf(fmt.Sprintf("\033[%sm%s\033[0m", l.Color, format), v...)
-		// l.logger.Printf(fmt.Sprintf("\033[34m%sx", format), v...)
-		l.logger.Printf("\033[%sm%s\033[0m", l.Color, fmt.Sprintf(format, v...))
-	}
-}
-
-func (l *ColorLogger) SetOutput(w io.Writer) {
-	l.logger.SetOutput(w)
-}
-
-func (g *Graph) colorInfo(format string) string {
-	return g.color(g.InfoColor, format)
-}
-
-func (g *Graph) colorInfoBold(format string) string {
-	return g.color(g.InfoBoldColor, format)
-}
-
-func (g *Graph) colorError(format string) string {
-	return g.color(g.ErrorColor, format)
-}
-
-func (g *Graph) colorErrorBold(format string) string {
-	return g.color(g.ErrorBoldColor, format)
-}
-
-func (g *Graph) color(color string, format string) string {
-	if g.UseColor {
-		return format
-	}
-	if !strings.HasSuffix(format, "\n") {
-		return fmt.Sprintf("\033[%sm%s\033[0m", color, format)
-	}
-
-	format = format[:len(format)-1]
-	return fmt.Sprintf("\033[%sm%s\033[0m\n", color, format)
-}