Changing to new colors package

Author: kenshaw

go.mod

@@ -3,18 +3,19 @@ module github.com/kenshaw/iv
 go 1.20
 
 require (
+	github.com/kenshaw/colors v0.1.0
 	github.com/kenshaw/rasterm v0.1.10
 	github.com/spf13/cobra v1.8.0
-	github.com/spf13/pflag v1.0.5
 	github.com/xo/resvg v0.3.0
 	golang.org/x/image v0.15.0
-	gopkg.in/go-playground/colors.v1 v1.2.0
 )
 
 require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/kenshaw/snaker v0.2.0 // indirect
 	github.com/mattn/go-sixel v0.0.5 // indirect
 	github.com/soniakeys/quant v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/term v0.16.0 // indirect
 )

go.sum

@@ -1,8 +1,12 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/kenshaw/colors v0.1.0 h1:L2Ll4qhm/0XDNcEcIbkM1hl1zzswJBHBjkcssvgl9Os=
+github.com/kenshaw/colors v0.1.0/go.mod h1:m8LcSiaLgIxtzCHQqxReKkJPP5TfXUZZdQvFdCuQGyY=
 github.com/kenshaw/rasterm v0.1.10 h1:cMCTpBHfqmftt/VqeT6B+9Td+mYi+ZtziN+XBdrTQfA=
 github.com/kenshaw/rasterm v0.1.10/go.mod h1:kL4DCN+wOlQ4BPBCxA+itiVwiObRAj0Hkze7SbCyYaw=
+github.com/kenshaw/snaker v0.2.0 h1:DPlxCtAv9mw1wSsvIN1khUAPJUIbFJUckMIDWSQ7TC8=
+github.com/kenshaw/snaker v0.2.0/go.mod h1:DNyRUqHMZ18/zioxr6R7m4kSxxf2+QmB0BXoORsXRaY=
 github.com/mattn/go-sixel v0.0.5 h1:55w2FR5ncuhKhXrM5ly1eiqMQfZsnAHIpYNGZX03Cv8=
 github.com/mattn/go-sixel v0.0.5/go.mod h1:h2Sss+DiUEHy0pUqcIB6PFXo5Cy8sTQEFr3a9/5ZLNw=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -21,6 +25,4 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
 golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/go-playground/colors.v1 v1.2.0 h1:SPweMUve+ywPrfwao+UvfD5Ah78aOLUkT5RlJiZn52c=
-gopkg.in/go-playground/colors.v1 v1.2.0/go.mod h1:AvbqcMpNXVl5gBrM20jBm3VjjKBbH/kI5UnqjU7lxFI=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -11,7 +11,6 @@ import (
 	_ "image/jpeg"
 	_ "image/png"
 	"io"
-	"math"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -22,10 +21,9 @@ import (
 	_ "golang.org/x/image/tiff"
 	_ "golang.org/x/image/webp"
 
+	"github.com/kenshaw/colors"
 	"github.com/kenshaw/rasterm"
 	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-	"gopkg.in/go-playground/colors.v1"
 )
 
 var (
@@ -41,20 +39,19 @@ func main() {
 }
 
 func run(ctx context.Context, appName, appVersion string, cliargs []string) error {
-	var bg colors.Color = colors.FromStdColor(color.Transparent)
+	bg := colors.FromColor(color.Transparent)
 	c := &cobra.Command{
 		Use:     appName + " [flags] <image1> [image2, ..., imageN]",
 		Short:   appName + ", a command-line image viewer using terminal graphics",
 		Version: appVersion,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			bgColor := convColor(bg)
 			return do(os.Stdout, &Params{
-				BG:   bgColor,
+				BG:   bg,
 				Args: args,
 			})
 		},
 	}
-	c.Flags().Var(NewColor(&bg), "bg", "background color")
+	c.Flags().Var(bg.Pflag(), "bg", "background color")
 	c.SetVersionTemplate("{{ .Name }} {{ .Version }}\n")
 	c.InitDefaultHelpCmd()
 	c.SetArgs(cliargs[1:])
@@ -136,38 +133,6 @@ func renderFile(w io.Writer, file string) error {
 	return rasterm.Encode(w, img)
 }
 
-type Color struct {
-	c *colors.Color
-}
-
-func NewColor(c *colors.Color) pflag.Value {
-	return Color{
-		c: c,
-	}
-}
-
-func (c Color) String() string {
-	return (*c.c).String()
-}
-
-func (c Color) Set(s string) error {
-	clr, err := colors.Parse(s)
-	if err != nil {
-		return colors.ErrBadColor
-	}
-	*c.c = clr
-	return nil
-}
-
-func (c Color) Type() string {
-	return "color"
-}
-
-func convColor(c colors.Color) color.Color {
-	clr := c.ToRGBA()
-	return color.RGBA{R: clr.R, G: clr.G, B: clr.B, A: uint8(math.Round(255 * clr.A))}
-}
-
 /*
 func init() {
 	"github.com/klippa-app/go-libheif"