Merge pull request #48 from mutablelogic/djt-0907-cleanup

Code cleanup

Author: djthorpe

cmd/api/cmd.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	// Packages
 	"github.com/djthorpe/go-tablewriter"
 	"github.com/mutablelogic/go-client"
 )

cmd/api/homeassistant.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	"context"
+	"maps"
 	"slices"
 	"strings"
 	"time"
 
+	// Packages
 	"github.com/djthorpe/go-tablewriter"
 	"github.com/mutablelogic/go-client"
 	"github.com/mutablelogic/go-client/pkg/homeassistant"
-	"golang.org/x/exp/maps"
 )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -129,7 +130,7 @@ func haDomains(_ context.Context, w *tablewriter.Writer, args []string) error {
 		var services []string
 		if domain, exists := map_domains[c]; exists {
 			if v := domain.Services; v != nil {
-				services = maps.Keys(v)
+				services = slices.Collect(maps.Keys(v))
 			}
 		}
 		result = append(result, haDomain{

cmd/api/install.go

@@ -44,5 +44,8 @@ func install(flags *Flags) error {
 }
 
 func statEquals(a, b os.FileInfo) bool {
-	return a.Size() == b.Size() && a.ModTime() == b.ModTime()
+	if a == nil || b == nil {
+		return false
+	}
+	return a.Size() == b.Size() && a.ModTime().Equal(b.ModTime())
 }

cmd/api/newsapi.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"strings"
 
+	// Packages
 	"github.com/djthorpe/go-tablewriter"
 	"github.com/mutablelogic/go-client"
 	"github.com/mutablelogic/go-client/pkg/newsapi"

cmd/api/weatherapi.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 
+	// Packages
 	"github.com/djthorpe/go-tablewriter"
 	"github.com/mutablelogic/go-client"
 	"github.com/mutablelogic/go-client/pkg/weatherapi"