refactor on callback

Author: dido18

hub.go

@@ -61,35 +61,35 @@ type hub struct {
 }
 
 func newHub(tools *tools.Tools, systray *systray.Systray) *hub {
-	hub := &hub{
-		broadcast:      make(chan []byte, 1000),
-		broadcastSys:   make(chan []byte, 1000),
-		register:       make(chan *connection),
-		unregister:     make(chan *connection),
-		connections:    make(map[*connection]bool),
-		serialHub:      newSerialHub(),
-		serialPortList: newSerialPortList(tools),
-		tools:          tools,
-		systray:        systray,
-	}
+	broadcastSys := make(chan []byte, 1000)
 
-	hub.serialHub.OnRegister = func(port *serport) {
-		hub.broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"Got register/open on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + ",\"BufferType\":\"" + port.BufferType + "\"}")
+	onRegister := func(port *serport) {
+		broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"Got register/open on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + ",\"BufferType\":\"" + port.BufferType + "\"}")
 	}
-
-	hub.serialHub.OnUnregister = func(port *serport) {
-		hub.broadcastSys <- []byte("{\"Cmd\":\"Close\",\"Desc\":\"Got unregister/close on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + "}")
+	onUnregister := func(port *serport) {
+		broadcastSys <- []byte("{\"Cmd\":\"Close\",\"Desc\":\"Got unregister/close on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + "}")
 	}
+	serialHub := newSerialHub(onRegister, onUnregister)
 
-	hub.serialPortList.OnList = func(data []byte) {
-		hub.broadcastSys <- data
+	onList := func(data []byte) {
+		broadcastSys <- data
 	}
-
-	hub.serialPortList.OnErr = func(err string) {
-		hub.broadcastSys <- []byte("{\"Error\":\"" + err + "\"}")
+	onErr := func(err string) {
+		broadcastSys <- []byte("{\"Error\":\"" + err + "\"}")
 	}
+	serialPortList := newSerialPortList(tools, onList, onErr)
 
-	return hub
+	return &hub{
+		broadcast:      make(chan []byte, 1000),
+		broadcastSys:   broadcastSys,
+		register:       make(chan *connection),
+		unregister:     make(chan *connection),
+		connections:    make(map[*connection]bool),
+		serialHub:      serialHub,
+		serialPortList: serialPortList,
+		tools:          tools,
+		systray:        systray,
+	}
 }
 
 const commands = `{
@@ -216,6 +216,8 @@ func (hub *hub) checkCmd(m []byte) {
 		// will catch send and sendnobuf and sendraw
 		go hub.spWrite(s)
 	} else if strings.HasPrefix(sl, "list") {
+		// ports :=  hub.serialPortList.List()
+		// send to websockets the ports
 		go hub.serialPortList.List()
 	} else if strings.HasPrefix(sl, "downloadtool") {
 		go func() {

serialhub.go

@@ -27,21 +27,23 @@ type serialhub struct {
 	ports map[*serport]bool
 	mu    sync.Mutex
 
-	OnRegister   func(port *serport)
-	OnUnregister func(port *serport)
+	onRegister   func(port *serport)
+	onUnregister func(port *serport)
 }
 
-func newSerialHub() *serialhub {
+func newSerialHub(onRegister func(port *serport), onUnregister func(port *serport)) *serialhub {
 	return &serialhub{
-		ports: make(map[*serport]bool),
+		ports:        make(map[*serport]bool),
+		onRegister:   onRegister,
+		onUnregister: onUnregister,
 	}
 }
 
 // Register serial ports from the connections.
 func (sh *serialhub) Register(port *serport) {
 	sh.mu.Lock()
 	//log.Print("Registering a port: ", p.portConf.Name)
-	sh.OnRegister(port)
+	sh.onRegister(port)
 	sh.ports[port] = true
 	sh.mu.Unlock()
 }
@@ -50,7 +52,7 @@ func (sh *serialhub) Register(port *serport) {
 func (sh *serialhub) Unregister(port *serport) {
 	sh.mu.Lock()
 	//log.Print("Unregistering a port: ", p.portConf.Name)
-	sh.OnUnregister(port)
+	sh.onUnregister(port)
 	delete(sh.ports, port)
 	close(port.sendBuffered)
 	close(port.sendNoBuf)

serialportlist.go

@@ -34,8 +34,12 @@ type SpPortItem struct {
 	ProductID       string
 }
 
-func newSerialPortList(tools *tools.Tools) *serialPortList {
-	return &serialPortList{tools: tools}
+func newSerialPortList(tools *tools.Tools, onList func(data []byte), onErr func(err string)) *serialPortList {
+	return &serialPortList{
+		tools:  tools,
+		OnList: onList,
+		OnErr:  onErr,
+	}
 }
 
 // List broadcasts a Json representation of the ports found
@@ -111,6 +115,7 @@ func (sp *serialPortList) runSerialDiscovery() {
 		logrus.Errorf("Error starting event watcher on serial-discovery: %s", err)
 		panic(err)
 	}
+	d.List()
 
 	logrus.Infof("Serial discovery started, watching for events")
 	for ev := range events {