Reuse onRegister callback

Author: cmaglie

hub.go

@@ -66,8 +66,8 @@ type hub struct {
 func newHub(tools *tools.Tools, systray *systray.Systray) *hub {
 	broadcastSys := make(chan []byte, 1000)
 
-	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 + "\"}")
+	onRegister := func(port *serport, msg string) {
+		broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"" + msg + "\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + ",\"BufferType\":\"" + port.BufferType + "\"}")
 	}
 	onUnregister := func(port *serport) {
 		broadcastSys <- []byte("{\"Cmd\":\"Close\",\"Desc\":\"Got unregister/close on port.\",\"Port\":\"" + port.portConf.Name + "\",\"Baud\":" + strconv.Itoa(port.portConf.Baud) + "}")

serial.go

@@ -35,11 +35,11 @@ type serialhub struct {
 
 	mu sync.Mutex
 
-	onRegister   func(port *serport)
+	onRegister   func(port *serport, msg string)
 	onUnregister func(port *serport)
 }
 
-func newSerialHub(onRegister func(port *serport), onUnregister func(port *serport)) *serialhub {
+func newSerialHub(onRegister func(port *serport, msg string), onUnregister func(port *serport)) *serialhub {
 	return &serialhub{
 		ports:        make(map[string]*serport),
 		onRegister:   onRegister,
@@ -74,7 +74,7 @@ type SpPortItem struct {
 // Register serial ports from the connections.
 func (sh *serialhub) Register(port *serport) {
 	sh.mu.Lock()
-	sh.onRegister(port)
+	sh.onRegister(port, "Got register/open on port.")
 	sh.ports[port.portName] = port
 	sh.mu.Unlock()
 }

serialport.go

@@ -310,7 +310,7 @@ func (h *hub) spHandlerOpen(portname string, baud int, buftype string) {
 		existingPort, ok := h.serialHub.FindPortByName(portname)
 		if ok && existingPort.portConf.Baud == baud && existingPort.BufferType == buftype {
 			log.Print("Port already opened")
-			h.broadcastSys <- []byte("{\"Cmd\":\"Open\",\"Desc\":\"Port already opened.\",\"Port\":\"" + existingPort.portConf.Name + "\",\"Baud\":" + strconv.Itoa(existingPort.portConf.Baud) + ",\"BufferType\":\"" + existingPort.BufferType + "\"}")
+			h.serialHub.onRegister(existingPort, "Port already opened")
 		} else {
 			log.Print("Error opening port " + err.Error())
 			h.broadcastSys <- []byte("{\"Cmd\":\"OpenFail\",\"Desc\":\"Error opening port. " + err.Error() + "\",\"Port\":\"" + conf.Name + "\",\"Baud\":" + strconv.Itoa(conf.Baud) + "}")