From cc6645fb48bebfe31918fc2981151fb394209944 Mon Sep 17 00:00:00 2001 From: Ryan Cavicchioni Date: Sat, 29 Feb 2020 16:00:21 -0600 Subject: [PATCH] move color code --- color.go | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ structs.go | 61 ----------------------------------------------------- 2 files changed, 62 insertions(+), 61 deletions(-) create mode 100644 color.go diff --git a/color.go b/color.go new file mode 100644 index 0000000..86550b7 --- /dev/null +++ b/color.go @@ -0,0 +1,62 @@ +package lifx + +import ( + "fmt" + "strings" +) + +type ( + Color interface { + ColorString() string + } +) + +type ( + RGBColor struct { + R, G, B uint8 + } + + HSBKColor struct { + H, K int16 + S, B float32 + } +) + +func NewRGBColor(r, g, b uint8) (*RGBColor, error) { + return &RGBColor{R: r, G: g, B: b}, nil +} + +func NewHSBKColor() HSBKColor { + var c HSBKColor + c.H, c.S, c.B, c.K = -1, -1, -1, -1 + return c +} + +func (c RGBColor) ColorString() string { + return fmt.Sprintf("rgb:%d,%d,%d", c.R, c.G, c.B) +} + +func (c RGBColor) Hex() string { + return fmt.Sprintf("#%x%x%x", c.R, c.G, c.B) +} + +func (c HSBKColor) ColorString() string { + var s []string + if c.H >= 0 { + s = append(s, fmt.Sprintf("hue:%d", c.H)) + } + if c.S >= 0 { + s = append(s, fmt.Sprintf("saturation:%g", c.S)) + } + if c.B >= 0 { + s = append(s, fmt.Sprintf("brightness:%g", c.B)) + } + if c.K >= 0 { + s = append(s, fmt.Sprintf("kelvin:%d", c.K)) + } + return strings.Join(s, " ") +} + +func (c HSBKColor) MarshalText() ([]byte, error) { + return []byte(c.ColorString()), nil +} diff --git a/structs.go b/structs.go index 1a7e5f6..f465310 100644 --- a/structs.go +++ b/structs.go @@ -1,27 +1,5 @@ package lifx -import ( - "fmt" - "strings" -) - -type ( - Color interface { - ColorString() string - } -) - -type ( - RGBColor struct { - R, G, B uint8 - } - - HSBKColor struct { - H, K int16 - S, B float32 - } -) - const ( OK Status = "ok" TimedOut Status = "timed_out" @@ -31,42 +9,3 @@ const ( func (s Status) Success() bool { return s == OK } - -func NewRGBColor(r, g, b uint8) (*RGBColor, error) { - return &RGBColor{R: r, G: g, B: b}, nil -} - -func NewHSBKColor() HSBKColor { - var c HSBKColor - c.H, c.S, c.B, c.K = -1, -1, -1, -1 - return c -} - -func (c RGBColor) ColorString() string { - return fmt.Sprintf("rgb:%d,%d,%d", c.R, c.G, c.B) -} - -func (c RGBColor) Hex() string { - return fmt.Sprintf("#%x%x%x", c.R, c.G, c.B) -} - -func (c HSBKColor) ColorString() string { - var s []string - if c.H >= 0 { - s = append(s, fmt.Sprintf("hue:%d", c.H)) - } - if c.S >= 0 { - s = append(s, fmt.Sprintf("saturation:%g", c.S)) - } - if c.B >= 0 { - s = append(s, fmt.Sprintf("brightness:%g", c.B)) - } - if c.K >= 0 { - s = append(s, fmt.Sprintf("kelvin:%d", c.K)) - } - return strings.Join(s, " ") -} - -func (c HSBKColor) MarshalText() ([]byte, error) { - return []byte(c.ColorString()), nil -}