Implement output sorting by observation fields

msharris · Mar 15, 2024 · becd883 · becd883
1 parent e621e06
commit becd883
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 3 deletions.
diff --git a/app/app.go b/app/app.go
@@ -1,6 +1,7 @@
 package app
 
 import (
+	"errors"
 	"fmt"
 	"slices"
 	"strings"
@@ -9,10 +10,44 @@ import (
 
 type Options struct {
 	Locations []string
-	Sort      string
+	Sort      Field
 	Reverse   bool
 }
 
+type Field string
+
+const (
+	Id        Field = "id"
+	Name      Field = "name"
+	UVIndex   Field = "index"
+	Time      Field = "time"
+	Available Field = "status"
+)
+
+// Implement pflag.Value interface on Field for Cobra
+func (f *Field) String() string {
+	return string(*f)
+}
+
+func (f *Field) Set(s string) error {
+	s = strings.ToLower(s)
+	switch s {
+	case "id", "name", "index", "time", "status":
+		*f = Field(s)
+	case "uv":
+		*f = UVIndex
+	case "date":
+		*f = Time
+	default:
+		return errors.New(`must be one of "id", "name", "index", "uv", "time", "date", "status"`)
+	}
+	return nil
+}
+
+func (f *Field) Type() string {
+	return "field"
+}
+
 type Station struct {
 	Id        string
 	Name      string
@@ -35,6 +70,8 @@ func Run(options Options) error {
 		stations = filter(stations, options.Locations)
 	}
 
+	sort(stations, options.Sort)
+
 	if options.Reverse {
 		slices.Reverse(stations)
 	}
@@ -59,3 +96,41 @@ func filter(stations []Station, names []string) []Station {
 	}
 	return filtered
 }
+
+func sort(stations []Station, f Field) {
+	switch f {
+	case Id:
+		slices.SortFunc(stations, func(s1, s2 Station) int {
+			return strings.Compare(s1.Id, s2.Id)
+		})
+	case Name:
+		slices.SortFunc(stations, func(s1, s2 Station) int {
+			return strings.Compare(s1.Name, s2.Name)
+		})
+	case UVIndex:
+		slices.SortFunc(stations, func(s1, s2 Station) int {
+			if s1.UVIndex < s2.UVIndex {
+				return -1
+			} else if s1.UVIndex > s2.UVIndex {
+				return 1
+			} else {
+				return 0
+			}
+		})
+	case Time:
+		slices.SortFunc(stations, func(s1, s2 Station) int {
+			return s1.Time.Compare(s2.Time)
+		})
+	case Available:
+		slices.SortFunc(stations, func(s1, s2 Station) int {
+			a1, a2 := 0, 0
+			if s1.Available {
+				a1 = 1
+			}
+			if s2.Available {
+				a2 = 1
+			}
+			return a1 - a2
+		})
+	}
+}
diff --git a/cmd/root.go b/cmd/root.go
@@ -25,10 +25,10 @@ func Execute() {
 	}
 }
 
-var flags = app.Options{}
+var flags = app.Options{Sort: app.Name}
 
 func init() {
 	rootCmd.Flags().StringSliceVarP(&flags.Locations, "locations", "l", nil, "a comma-separated list of locations to display")
-	//rootCmd.Flags().StringVarP(&flags.Sort, "sort", "s", "name", "field to sort the observations by")
+	rootCmd.Flags().VarP(&flags.Sort, "sort", "s", "field to sort the observations by")
 	rootCmd.Flags().BoolVarP(&flags.Reverse, "reverse", "r", false, "print the observations in reverse order")
 }