updated

driver/bus.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	json_data "github.com/tecamino/tecamino-json_data"
 	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
@@ -26,123 +27,132 @@ func (d *ArtNetDriver) GetAllBuses(c *gin.Context) {
 }
 
 func (d *ArtNetDriver) CreateBus(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SendError(err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
-
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
+	busPayload := models.Bus{}
+	if err := busPayload.ParsePayload(c); err != nil {
 		return
 	}
 
-	if payload.Name == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
-		return
-	} else if addr := net.ParseIP(payload.Ip); addr == nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "wrong ip '" + payload.Ip + "'"})
+	if addr := net.ParseIP(busPayload.Ip); addr == nil {
+		r := json_data.NewResponse()
+		r.SendError("wrong ip '" + busPayload.Ip + "'")
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	if _, ok := d.Buses[payload.Name]; ok {
-		c.JSON(http.StatusOK, gin.H{"message": "bus " + payload.Name + " exists already"})
+	if _, ok := d.Buses[busPayload.Name]; ok {
+		r := json_data.NewResponse()
+		r.SendError("bus " + busPayload.Name + " exists already")
+		c.JSON(http.StatusOK, r)
 		return
 	}
 
-	bus := d.NewBus(payload.Name, payload.Ip, payload.GetPort())
+	bus := d.NewBus(busPayload.Name, busPayload.Ip, busPayload.GetPort())
 
-	c.JSON(http.StatusOK, gin.H{
-		"message": fmt.Sprintf("bus '%s' successfully created with ip: %s and on port: %d", bus.Name, bus.Ip, bus.GetPort()),
-	})
+	r := json_data.NewResponse()
+	r.SendMessage(fmt.Sprintf("bus '%s' successfully created with ip: %s and on port: %d", bus.Name, bus.Ip, bus.GetPort()))
+	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) RemoveBus(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SendError("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
-
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
+	busPayload := models.Bus{}
+	if err := busPayload.ParsePayload(c); err != nil {
 		return
 	}
 
-	if payload.Name == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
-		return
-	}
-
-	if _, ok := d.Buses[payload.Name]; !ok {
+	if _, ok := d.Buses[busPayload.Name]; !ok {
 		r := json_dataModels.NewResponse()
-		r.SendMessage("bus " + payload.Name + " not found")
+		r.SendMessage("bus " + busPayload.Name + " not found")
 		c.JSON(http.StatusOK, r)
 		return
 	} else {
-		delete(d.Buses, payload.Name)
+		delete(d.Buses, busPayload.Name)
 	}
 	r := json_dataModels.NewResponse()
-	r.SendMessage(fmt.Sprintf("bus '%s' successfully removed", payload.Name))
+	r.SendMessage(fmt.Sprintf("bus '%s' successfully removed", busPayload.Name))
 	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) Start(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SendError("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
-
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
+	busPayload := models.Bus{}
+	if busPayload.ParsePayload(c); err != nil {
 		return
 	}
 
-	if payload.Name == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
-		return
-	}
-
-	d.Buses[payload.Name].Start(d.Log)
+	d.Buses[busPayload.Name].Start(d.Log)
 
 	r := json_dataModels.NewResponse()
-	r.SendMessage(fmt.Sprintf("bus '%s' running", payload.Name))
+	r.SendMessage(fmt.Sprintf("bus '%s' running", busPayload.Name))
 	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
 
 func (d *ArtNetDriver) Stop(c *gin.Context) {
-	_, err := auth.GetIDFromAuth(c)
+	_, err := auth.GetIDFromQuery(c)
 	if err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "id: " + err.Error()})
+		r := json_data.NewResponse()
+		r.SendError("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
 		return
 	}
 
-	var payload models.Bus
-
-	if err := c.BindJSON(&payload); err != nil {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "json: " + err.Error()})
+	busPayload := models.Bus{}
+	if err := busPayload.ParsePayload(c); err != nil {
 		return
 	}
 
-	if payload.Name == "" {
-		c.JSON(http.StatusBadRequest, gin.H{"error": "bus name missing"})
-		return
-	}
-
-	d.Buses[payload.Name].Stop()
+	d.Buses[busPayload.Name].Stop()
 
 	r := json_dataModels.NewResponse()
-	r.SendMessage(fmt.Sprintf("bus '%s' stopped", payload.Name))
+	r.SendMessage(fmt.Sprintf("bus '%s' stopped", busPayload.Name))
 	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
+
+func (d *ArtNetDriver) Status(c *gin.Context) {
+	_, err := auth.GetIDFromQuery(c)
+	if err != nil {
+		r := json_data.NewResponse()
+		r.SendError("id: " + err.Error())
+		c.JSON(http.StatusBadRequest, r)
+		return
+	}
+
+	busPayload := models.Bus{}
+	if err := busPayload.ParsePayload(c); err != nil {
+		return
+	}
+
+	r := json_dataModels.NewResponse()
+	state := "stopped"
+	if d.Buses[busPayload.Name].Status() {
+		state = "running"
+	}
+	r.SendMessage(fmt.Sprintf("bus '%s' %s", busPayload.Name, state))
+	c.JSON(http.StatusOK, r)
+}