refactor: rename 'hub' and 'serialhub' types to 'Hub' and 'Serialhub' for consistency

Author: dido18

conn.go

@@ -80,7 +80,7 @@ type Upload struct {
 
 var uploadStatusStr = "ProgrammerStatus"
 
-func uploadHandler(h *hub, pubKey *rsa.PublicKey) func(*gin.Context) {
+func uploadHandler(h *Hub, pubKey *rsa.PublicKey) func(*gin.Context) {
 	return func(c *gin.Context) {
 		data := new(Upload)
 		if err := c.BindJSON(data); err != nil {
@@ -193,7 +193,7 @@ func uploadHandler(h *hub, pubKey *rsa.PublicKey) func(*gin.Context) {
 // PLogger sends the info from the upload to the websocket
 type PLogger struct {
 	Verbose bool
-	h       *hub
+	h       *Hub
 }
 
 // Debug only sends messages if verbose is true (always true for now)
@@ -210,12 +210,12 @@ func (l PLogger) Info(args ...interface{}) {
 	send(l.h, map[string]string{uploadStatusStr: "Busy", "Msg": output})
 }
 
-func send(h *hub, args map[string]string) {
+func send(h *Hub, args map[string]string) {
 	mapB, _ := json.Marshal(args)
 	h.broadcastSys <- mapB
 }
 
-func wsHandler(h *hub) *WsServer {
+func wsHandler(h *Hub) *WsServer {
 	server, err := socketio.NewServer(nil)
 	if err != nil {
 		log.Fatal(err)

hub.go

@@ -29,7 +29,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-type hub struct {
+type Hub struct {
 	// Registered connections.
 	connections map[*connection]bool
 
@@ -47,15 +47,15 @@ type hub struct {
 
 	//TODO globals clients
 	// Serial hub to communicate with serial ports
-	serialHub *serialhub
+	serialHub *Serialhub
 
 	serialPortList *SerialPortList
 }
 
 // NewHub creates a hub that acts as a central hub for handling
 // WebSocket connections, broadcasting messages, and processing commands.
-func NewHub(serialhub *serialhub, serialList *SerialPortList) *hub {
-	hub := &hub{
+func NewHub(serialhub *Serialhub, serialList *SerialPortList) *Hub {
+	hub := &Hub{
 		broadcast:      make(chan []byte, 1000),
 		broadcastSys:   make(chan []byte, 1000),
 		register:       make(chan *connection),
@@ -102,15 +102,15 @@ const commands = `{
   ]
 }`
 
-func (h *hub) unregisterConnection(c *connection) {
+func (h *Hub) unregisterConnection(c *connection) {
 	if _, contains := h.connections[c]; !contains {
 		return
 	}
 	delete(h.connections, c)
 	close(c.send)
 }
 
-func (h *hub) sendToRegisteredConnections(data []byte) {
+func (h *Hub) sendToRegisteredConnections(data []byte) {
 	for c := range h.connections {
 		select {
 		case c.send <- data:
@@ -123,7 +123,7 @@ func (h *hub) sendToRegisteredConnections(data []byte) {
 	}
 }
 
-func (h *hub) run() {
+func (h *Hub) run() {
 	for {
 		select {
 		case c := <-h.register:
@@ -146,7 +146,7 @@ func (h *hub) run() {
 	}
 }
 
-func (h *hub) checkCmd(m []byte) {
+func (h *Hub) checkCmd(m []byte) {
 	//log.Print("Inside checkCmd")
 	s := string(m[:])
 
@@ -284,23 +284,23 @@ func logAction(sl string) {
 	}
 }
 
-func (h *hub) memoryStats() {
+func (h *Hub) memoryStats() {
 	var memStats runtime.MemStats
 	runtime.ReadMemStats(&memStats)
 	json, _ := json.Marshal(memStats)
 	log.Printf("memStats:%v\n", string(json))
 	h.broadcastSys <- json
 }
 
-func (h *hub) getHostname() {
+func (h *Hub) getHostname() {
 	h.broadcastSys <- []byte("{\"Hostname\" : \"" + *hostname + "\"}")
 }
 
-func (h *hub) getVersion() {
+func (h *Hub) getVersion() {
 	h.broadcastSys <- []byte("{\"Version\" : \"" + version + "\"}")
 }
 
-func (h *hub) garbageCollection() {
+func (h *Hub) garbageCollection() {
 	log.Printf("Starting garbageCollection()\n")
 	h.broadcastSys <- []byte("{\"gc\":\"starting\"}")
 	h.memoryStats()

info.go

@@ -41,7 +41,7 @@ func infoHandler(c *gin.Context) {
 	})
 }
 
-func pauseHandler(h *hub, s *systray.Systray) func(c *gin.Context) {
+func pauseHandler(h *Hub, s *systray.Systray) func(c *gin.Context) {
 	return func(c *gin.Context) {
 		go func() {
 			ports, _ := serial.GetPortsList()

serial.go

@@ -29,7 +29,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type serialhub struct {
+type Serialhub struct {
 	// Opened serial ports.
 	ports map[*serport]bool
 	mu    sync.Mutex
@@ -40,8 +40,8 @@ type serialhub struct {
 
 // NewSerialHub creates a new serial hub
 // It is used to manage serial ports and their connections.
-func NewSerialHub() *serialhub {
-	return &serialhub{
+func NewSerialHub() *Serialhub {
+	return &Serialhub{
 		ports: make(map[*serport]bool),
 	}
 }
@@ -75,7 +75,7 @@ type SpPortItem struct {
 }
 
 // Register serial ports from the connections.
-func (sh *serialhub) Register(port *serport) {
+func (sh *Serialhub) Register(port *serport) {
 	sh.mu.Lock()
 	//log.Print("Registering a port: ", p.portConf.Name)
 	sh.OnRegister(port)
@@ -84,7 +84,7 @@ func (sh *serialhub) Register(port *serport) {
 }
 
 // Unregister requests from connections.
-func (sh *serialhub) Unregister(port *serport) {
+func (sh *Serialhub) Unregister(port *serport) {
 	sh.mu.Lock()
 	//log.Print("Unregistering a port: ", p.portConf.Name)
 	sh.OnUnregister(port)
@@ -94,7 +94,7 @@ func (sh *serialhub) Unregister(port *serport) {
 	sh.mu.Unlock()
 }
 
-func (sh *serialhub) FindPortByName(portname string) (*serport, bool) {
+func (sh *Serialhub) FindPortByName(portname string) (*serport, bool) {
 	sh.mu.Lock()
 	defer sh.mu.Unlock()
 
@@ -265,13 +265,13 @@ func (sp *SerialPortList) getPortByName(portname string) *SpPortItem {
 	return nil
 }
 
-func (h *hub) spErr(err string) {
+func (h *Hub) spErr(err string) {
 	//log.Println("Sending err back: ", err)
 	//sh.hub.broadcastSys <- []byte(err)
 	h.broadcastSys <- []byte("{\"Error\" : \"" + err + "\"}")
 }
 
-func (h *hub) spClose(portname string) {
+func (h *Hub) spClose(portname string) {
 	if myport, ok := h.serialHub.FindPortByName(portname); ok {
 		h.broadcastSys <- []byte("Closing serial port " + portname)
 		myport.Close()
@@ -280,7 +280,7 @@ func (h *hub) spClose(portname string) {
 	}
 }
 
-func (h *hub) spWrite(arg string) {
+func (h *Hub) spWrite(arg string) {
 	// we will get a string of comXX asdf asdf asdf
 	//log.Println("Inside spWrite arg: " + arg)
 	arg = strings.TrimPrefix(arg, " ")

serialport.go

@@ -287,7 +287,7 @@ func (p *serport) writerRaw() {
 	p.OnMessage([]byte(msgstr))
 }
 
-func (h *hub) spHandlerOpen(portname string, baud int, buftype string) {
+func (h *Hub) spHandlerOpen(portname string, baud int, buftype string) {
 
 	log.Print("Inside spHandler")