ded/noolite-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using one instance of NooliteAdapter in HTTP server

Browse Source
This commit is contained in:
Denis V. Dedkov
2016-07-23 16:17:33 +05:00
parent d3b4fc3983
commit e3ca6417f3
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
noolite-cli.go
View File

@@ -10,7 +10,7 @@ import (
"strconv" "strconv"
) )
func sendCommand(command string, channel, value, r, g, b int) error { func sendCommand(n *noolite.NooliteAdapter, command string, channel, value, r, g, b int) error {
if channel == -1 { if channel == -1 {
return errors.New("Channel was not set") return errors.New("Channel was not set")
} }
@@ -19,14 +19,6 @@ func sendCommand(command string, channel, value, r, g, b int) error {
return errors.New("Command was not set") return errors.New("Command was not set")
} }
n, err := noolite.DefaultNooliteAdapter()
if err != nil {
return err
}
defer n.Close()
if command == "set" { if command == "set" {
if value != 0 { if value != 0 {
return n.SetBrightnesValue(channel, value) return n.SetBrightnesValue(channel, value)
@@ -94,8 +86,16 @@ func main() {
flag.Parse() flag.Parse()
n, err := noolite.DefaultNooliteAdapter()
if err != nil {
panic(err)
}
defer n.Close()
if *http_port < 0 { if *http_port < 0 {
err := sendCommand(*command, *channel, *value, *red, *green, *blue) err := sendCommand(n, *command, *channel, *value, *red, *green, *blue)
if err != nil { if err != nil {
panic(err) panic(err)
@@ -104,7 +104,7 @@ func main() {
http.HandleFunc("/noolite/", func(w http.ResponseWriter, r *http.Request) { http.HandleFunc("/noolite/", func(w http.ResponseWriter, r *http.Request) {
command, channel, value, red, green, blue := parseParams(r.URL.Path[1:]) command, channel, value, red, green, blue := parseParams(r.URL.Path[1:])
err := sendCommand(command, channel, value, red, green, blue) err := sendCommand(n, command, channel, value, red, green, blue)
if err != nil { if err != nil {
fmt.Fprintf(w, "{\"error\": %q}", err) fmt.Fprintf(w, "{\"error\": %q}", err)