refactor color system to be separate from models, also move errors out of models.
continuous-integration/drone/push Build is passing
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"git.aiterp.net/lucifer/new-server/app/config"
|
||||
"git.aiterp.net/lucifer/new-server/internal/color"
|
||||
"git.aiterp.net/lucifer/new-server/models"
|
||||
"log"
|
||||
"os"
|
||||
@@ -124,7 +125,7 @@ func main() {
|
||||
continue
|
||||
}
|
||||
|
||||
color, err := models.ParseColorValue(tokens[2])
|
||||
color, err := color.Parse(tokens[2])
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintln(os.Stderr, "Invalid color:", err)
|
||||
continue
|
||||
|
||||
+2
-8
@@ -1,21 +1,15 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"git.aiterp.net/lucifer/new-server/models"
|
||||
"git.aiterp.net/lucifer/new-server/internal/color"
|
||||
"log"
|
||||
)
|
||||
|
||||
func main() {
|
||||
cv, _ := models.ParseColorValue("rgb:#fff")
|
||||
cv, _ := color.Parse("xy:0.1944,0.0942")
|
||||
hs, _ := cv.ToHS()
|
||||
log.Println(cv.String())
|
||||
log.Println(hs.String())
|
||||
xy, _ := hs.ToXY()
|
||||
log.Println(xy.String())
|
||||
}
|
||||
|
||||
func toJSON(v interface{}) string {
|
||||
j, _ := json.Marshal(v)
|
||||
return string(j)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user