handle marshalling better

monoxane · Mar 7, 2023 · 89408a2 · 89408a2
1 parent 89489cb
commit 89408a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/matrix.go b/matrix.go
@@ -2,12 +2,10 @@ package nk
 
 import (
 	"encoding/json"
-	"log"
 	"sort"
 )
 
 func (matrix *Matrix) MarshalJSON() ([]byte, error) {
-	log.Print("marshalling matrix")
 	type res struct {
 		Destinations []*Destination `json:"destinations,omitempty"`
 		Sources      []*Source      `json:"sources,omitempty"`
@@ -16,7 +14,7 @@ func (matrix *Matrix) MarshalJSON() ([]byte, error) {
 	var result res
 
 	for _, dst := range matrix.destinations {
-		if dst != nil {
+		if dst != nil && dst.Id != 0 {
 			result.Destinations = append(result.Destinations, dst)
 		}
 	}
@@ -26,7 +24,7 @@ func (matrix *Matrix) MarshalJSON() ([]byte, error) {
 	})
 
 	for _, src := range matrix.sources {
-		if src != nil {
+		if src != nil && src.Id != 0 {
 			result.Sources = append(result.Sources, src)
 		}
 	}

diff --git a/nk.go b/nk.go
@@ -74,6 +74,8 @@ func New(IP string, RTRAddress uint8, model Model) *Router {
 		}
 	}
 
+	rtr.Matrix.sources[0].Setlabel("DISCONNECTED")
+
 	for i := 0; i < int(rtr.Destinations)+1; i++ {
 		rtr.Matrix.destinations[uint16(i)] = &Destination{
 			Id:    uint16(i),