implement new json_data model

driver/artNet.go

@@ -2,8 +2,8 @@ package driver
 
 import (
 	"artNet/cfg"
+	"artNet/client"
 	"artNet/models"
-	serverModels "artNet/server/models"
 	"fmt"
 	"path"
 
@@ -11,11 +11,12 @@ import (
 )
 
 type ArtNetDriver struct {
-	Name        string                 `yaml:"driver" json:"driver"`
-	Buses       map[string]*models.Bus `yaml:"buses,omitempty" json:"buses,omitempty"`
-	cfgHandler  *cfg.Cfg               `yaml:"-" json:"-"`
-	Connections serverModels.Clients   `yaml:"-"`
-	Log         *logging.Logger        `yaml:"-"`
+	Name          string                 `yaml:"driver" json:"driver"`
+	Buses         map[string]*models.Bus `yaml:"buses,omitempty" json:"buses,omitempty"`
+	cfgHandler    *cfg.Cfg               `yaml:"-" json:"-"`
+	Conn          *client.Client         `yaml:"-"`
+	Subscriptions models.Subscriptions   `yaml:"-"`
+	Log           *logging.Logger        `yaml:"-"`
 }
 
 // initialize new Art-Net driver
@@ -39,11 +40,10 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 
 	logger.Debug("artNet.NewDriver", "initialize "+name+" driver")
 	d := ArtNetDriver{
-		Name:        name,
-		Buses:       make(map[string]*models.Bus),
-		cfgHandler:  cfg.NewCfgHandler(cfgDir, name),
-		Connections: serverModels.NewClients(),
-		Log:         logger,
+		Name:       name,
+		Buses:      make(map[string]*models.Bus),
+		cfgHandler: cfg.NewCfgHandler(cfgDir, name),
+		Log:        logger,
 	}
 
 	if err := d.LoadCfg(); err != nil {
@@ -51,6 +51,8 @@ func NewDriver(cfgDir, name string, debug bool) (*ArtNetDriver, error) {
 		return nil, err
 	}
 
+	d.Conn = client.NewClient(logger)
+
 	return &d, nil
 }
 
@@ -75,11 +77,39 @@ func (d *ArtNetDriver) NewBus(name, ip string, port int) *models.Bus {
 	return b
 }
 
-func (d *ArtNetDriver) SetValue(set models.Set) error {
-	if _, ok := d.Buses[set.Bus]; !ok {
-		return fmt.Errorf("no bus '%s' found", set.Bus)
+func (d *ArtNetDriver) SetValue(bus string, address uint, value uint8) error {
+	if _, ok := d.Buses[bus]; !ok {
+		return fmt.Errorf("no bus '%s' found", bus)
 	}
-	d.Buses[set.Bus].Data.SetValue(set.Address, set.Value)
+	d.Buses[bus].Data.SetValue(address, value)
 
-	return d.Buses[set.Bus].SendData()
+	return d.Buses[bus].SendData()
+}
+
+func (d *ArtNetDriver) Connect(ip, id string, port uint) error {
+	if err := d.Conn.Connect(ip, id, port); err != nil {
+		return err
+	}
+	defer d.Conn.Disconnect()
+
+	if err := d.Conn.Subscribe(id); err != nil {
+		return err
+	}
+
+	for {
+		respond, err := d.Conn.ReadJsonData()
+		if err != nil {
+			return err
+		}
+
+		d.Subscribe(respond.Subscribe...)
+
+		for _, pub := range respond.Publish {
+			if sub, ok := d.Subscriptions[pub.Uuid]; ok {
+				if err := d.SetValue(sub.Bus, sub.Address, uint8(pub.Value.(float64))); err != nil {
+					d.Log.Info("artNet.Connect", err.Error())
+				}
+			}
+		}
+	}
 }

driver/bus.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
 )
 
 // sends a list of all buses in the driver
@@ -79,17 +80,16 @@ func (d *ArtNetDriver) RemoveBus(c *gin.Context) {
 	}
 
 	if _, ok := d.Buses[payload.Name]; !ok {
-		c.JSON(http.StatusOK, gin.H{"message": "bus " + payload.Name + " not found"})
-		c.JSON(http.StatusOK, models.JsonResponse{
-			Message: "bus " + payload.Name + " not found"})
+		r := json_dataModels.NewResponse()
+		r.SendMessage("bus " + payload.Name + " not found")
+		c.JSON(http.StatusOK, r)
 		return
 	} else {
 		delete(d.Buses, payload.Name)
 	}
-
-	c.JSON(http.StatusOK, models.JsonResponse{
-		Message: fmt.Sprintf("bus '%s' successfully removed", payload.Name),
-	})
+	r := json_dataModels.NewResponse()
+	r.SendMessage(fmt.Sprintf("bus '%s' successfully removed", payload.Name))
+	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
 
@@ -114,9 +114,9 @@ func (d *ArtNetDriver) Start(c *gin.Context) {
 
 	d.Buses[payload.Name].Start(d.Log)
 
-	c.JSON(http.StatusOK, models.JsonResponse{
-		Message: fmt.Sprintf("bus '%s' running", payload.Name),
-	})
+	r := json_dataModels.NewResponse()
+	r.SendMessage(fmt.Sprintf("bus '%s' running", payload.Name))
+	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }
 
@@ -141,8 +141,8 @@ func (d *ArtNetDriver) Stop(c *gin.Context) {
 
 	d.Buses[payload.Name].Stop()
 
-	c.JSON(http.StatusOK, models.JsonResponse{
-		Message: fmt.Sprintf("bus '%s' stopped", payload.Name),
-	})
+	r := json_dataModels.NewResponse()
+	r.SendMessage(fmt.Sprintf("bus '%s' stopped", payload.Name))
+	c.JSON(http.StatusOK, r)
 	d.cfgHandler.SaveCfg(*d)
 }

driver/subscribe.go

@@ -0,0 +1,20 @@
+package driver
+
+import (
+	"artNet/models"
+
+	json_dataModels "github.com/tecamino/tecamino-json_data/models"
+)
+
+func (d *ArtNetDriver) Subscribe(subs ...json_dataModels.Subscribe) {
+	if d.Subscriptions == nil {
+		d.Subscriptions = models.NewSubscriptions()
+	}
+
+	for _, sub := range subs {
+		if drv, ok := (*sub.Drivers)[sub.Driver]; ok {
+			d.Subscriptions.AddSubscription(sub.Uuid, drv)
+			d.SetValue(drv.Bus, drv.Address, uint8(sub.Value.(float64)))
+		}
+	}
+}