Source cleanup

Author: brokenCursor

.vscode/settings.json

@@ -41,21 +41,21 @@ type (
 
 	// Link statuses
 	LinkStatus struct {
-		State int8
+		State int8 // 0 - down 1 - disconnecting 2 - connecting 3 - up
 	}
 )
 
 var (
-	Drivers map[string]func(config *viper.Viper, logger *slog.Logger) (BaseModem, error) = map[string]func(config *viper.Viper, logger *slog.Logger) (BaseModem, error){}
-	logger  *slog.Logger
+	driverStore map[string]func(config *viper.Viper, logger *slog.Logger) (BaseModem, error) = map[string]func(config *viper.Viper, logger *slog.Logger) (BaseModem, error){}
+	logger      *slog.Logger
 )
 
 func init() {
 	logger = logging.GetGeneralLogger()
 }
 
 func IsRegistered(name string) bool {
-	_, ok := Drivers[name]
+	_, ok := driverStore[name]
 	return ok
 }
 
@@ -66,27 +66,27 @@ func RegisterDriver(name string, generator func(config *viper.Viper, logger *slo
 	}
 
 	// Register the driver
-	Drivers[name] = generator
+	driverStore[name] = generator
 	logger.With("name", name).Debug("driver registered")
 }
 
-func GetModemDriver(model string, config *viper.Viper, logger *slog.Logger) (BaseModem, error) {
-	if !IsRegistered(model) {
+func GetModemDriver(name string, config *viper.Viper, logger *slog.Logger) (BaseModem, error) {
+	if !IsRegistered(name) {
 		return nil, ErrUnknownModel
 	}
 
-	logger.Debug("driver instance created", "driver", model)
-	return Drivers[model](config, logger)
+	logger.Debug("driver instance created", "driver", name)
+	return driverStore[name](config, logger)
 }
 
-func GetAvailableDrivers() *[]string {
-	keys := make([]string, len(Drivers))
+func GetAvailableDrivers() []string {
+	keys := make([]string, len(driverStore))
 
 	i := 0
-	for k := range Drivers {
+	for k := range driverStore {
 		keys[i] = k
 		i++
 	}
 
-	return &keys
+	return keys
 }

drivers/driver_ctl.go

@@ -20,12 +20,11 @@ func GetInterfaceIPv4Addr(iface string) (addr net.IP, err error) {
 		return
 	}
 
-	// Get all of the addresses on the interface
+	// Find the first IPv4 address on the NIC
 	if addrs, err = ief.Addrs(); err != nil {
 		return
 	}
 
-	// Find the first IPv4 address
 	for _, addr := range addrs {
 		if ipv4Addr = addr.(*net.IPNet).IP.To4(); ipv4Addr != nil {
 			break

drivers/helpers.go

@@ -47,14 +47,13 @@ type (
 )
 
 func init() {
-	fmt.Println("here")
 	RegisterDriver("ZTE 8810FT", newZTE8810FT)
 }
 
 func newZTE8810FT(config *viper.Viper, logger *slog.Logger) (BaseModem, error) {
 	if config.IsSet("iface") {
 		ifaceName := config.GetString("iface")
-		logger.With("iface_name", ifaceName).Debug("interface has been specified")
+		logger.With("iface_name", ifaceName).Debug("NIC has been specified")
 
 		// Get this computer's IP on the interface
 		ifaceAddr, err := GetInterfaceIPv4Addr(ifaceName)

drivers/zte8810ft.go

@@ -21,7 +21,6 @@ func init() {
 		slog.Error("logging.general: ", err.Error(), nil)
 	}
 
-	// Setup levels
 	driverLevel, err := strToLevel(logConfig.GetString("driver"))
 	if err != nil {
 		slog.Error("logging.driver: ", err.Error(), nil)

logging/logging.go

@@ -88,14 +88,14 @@ func run() error {
 
 			// Process and output status
 			switch status.State {
-			case 3:
-				cfmt.Println("Status: {{up}}::green|bold")
 			case 0:
 				cfmt.Println("Status: {{down}}::red|bold")
-			case 2:
-				cfmt.Println("Status: {{connecting}}::yellow|bold")
 			case 1:
 				cfmt.Println("Status: {{disconnecting}}::#FA8100|bold")
+			case 2:
+				cfmt.Println("Status: {{connecting}}::yellow|bold")
+			case 3:
+				cfmt.Println("Status: {{up}}::green|bold")
 			}
 		}
 	case args.SMS != nil: