From 21a5f90ea1187a064fdcc415230561ee47c2cf9a Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Fri, 1 Nov 2024 11:43:22 +0200
Subject: add colour package

---
 internal/colour/colour.go | 11 +++++++++++
 internal/prompt/file.go   |  7 ++++---
 internal/prompt/prompt.go | 13 +++----------
 internal/run.go           |  5 ++---
 4 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 internal/colour/colour.go

diff --git a/internal/colour/colour.go b/internal/colour/colour.go
new file mode 100644
index 0000000..aa34232
--- /dev/null
+++ b/internal/colour/colour.go
@@ -0,0 +1,11 @@
+package colour
+
+import "github.com/fatih/color"
+
+var (
+	Info1f   = color.New(color.FgCyan, color.BgBlue, color.Bold).PrintfFunc()
+	Info2f   = color.New(color.FgHiYellow, color.BgHiBlack, color.Bold).PrintfFunc()
+	Info3f   = color.New(color.FgHiBlack, color.BgHiGreen, color.Bold).PrintfFunc()
+	Ackf     = color.New(color.FgBlack, color.BgHiYellow, color.Bold).PrintfFunc()
+	Successf = color.New(color.FgWhite, color.BgGreen).PrintfFunc()
+)
diff --git a/internal/prompt/file.go b/internal/prompt/file.go
index ac72af5..1136b5a 100644
--- a/internal/prompt/file.go
+++ b/internal/prompt/file.go
@@ -8,6 +8,7 @@ import (
 	"os/exec"
 	"strings"
 
+	"codeberg.org/snonux/gos/internal/colour"
 	"codeberg.org/snonux/gos/internal/oi"
 )
 
@@ -17,14 +18,14 @@ var (
 )
 
 func FileAction(question, content, filePath string) error {
-	Info2(filePath + ":")
+	colour.Info2f(filePath + ":")
 	fmt.Print("\n")
-	Info1(content)
+	colour.Info1f(content)
 	fmt.Print("\n")
 	reader := bufio.NewReader(os.Stdin)
 
 	for {
-		Ack("%s (y=yes/n=no/e=edit/d=delete):", question)
+		colour.Ackf("%s (y=yes/n=no/e=edit/d=delete):", question)
 		input, err := reader.ReadString('\n')
 		if err != nil {
 			fmt.Println("Error reading input:", err)
diff --git a/internal/prompt/prompt.go b/internal/prompt/prompt.go
index df0c256..47e8da3 100644
--- a/internal/prompt/prompt.go
+++ b/internal/prompt/prompt.go
@@ -5,24 +5,17 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/fatih/color"
-)
-
-var (
-	Info1 = color.New(color.FgCyan, color.BgBlue, color.Bold).PrintfFunc()
-	Info2 = color.New(color.FgHiYellow, color.BgHiBlack, color.Bold).PrintfFunc()
-	INfo3 = color.New(color.FgHiBlack, color.BgHiGreen, color.Bold).PrintfFunc()
-	Ack   = color.New(color.FgBlack, color.BgHiYellow, color.Bold).PrintfFunc()
+	"codeberg.org/snonux/gos/internal/colour"
 )
 
 func Acknowledge(messages ...string) error {
 	if len(messages) > 1 {
 		for _, content := range messages[1:] {
-			Info1(content)
+			colour.Info1f(content)
 			fmt.Print("\n")
 		}
 	}
-	Ack(messages[0] + " (press enter to acknowlege)")
+	colour.Ackf(messages[0] + " (press enter to acknowlege)")
 	reader := bufio.NewReader(os.Stdin)
 	if _, err := reader.ReadString('\n'); err != nil {
 		return err
diff --git a/internal/run.go b/internal/run.go
index ea20643..d865b2c 100644
--- a/internal/run.go
+++ b/internal/run.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"strings"
 
+	"codeberg.org/snonux/gos/internal/colour"
 	"codeberg.org/snonux/gos/internal/config"
 	"codeberg.org/snonux/gos/internal/entry"
 	"codeberg.org/snonux/gos/internal/platforms/linkedin"
@@ -13,7 +14,6 @@ import (
 	"codeberg.org/snonux/gos/internal/prompt"
 	"codeberg.org/snonux/gos/internal/queue"
 	"codeberg.org/snonux/gos/internal/schedule"
-	"github.com/fatih/color"
 )
 
 func Run(ctx context.Context, args config.Args) error {
@@ -68,8 +68,7 @@ func runPlatform(ctx context.Context, args config.Args, platform string, sizeLim
 		return err
 	}
 
-	// TODO: Put all color definitions into ints own package
-	color.New(color.FgWhite, color.BgGreen).Println("Successfully posted message to ", platform)
+	colour.Successf("Successfully posted message to %s", platform)
 	return nil
 }
 
-- 
cgit v1.2.3