add support for specifying multiple search terms

cmd/root.go

@@ -29,10 +29,10 @@ var (
 
 	cfg     ui.AppConfig
 	rootCmd = &cobra.Command{
-		Use:               "clocks [FUZZY_CLOCK_NAME?]",
+		Use:               "clocks [FUZZY_CLOCK_NAME]+",
 		Short:             "A tool to display time across multiple timezones.",
 		PersistentPreRunE: loadConfig,
-		Args:              cobra.MaximumNArgs(1),
+		Args:              cobra.MinimumNArgs(0),
 		Run: func(cmd *cobra.Command, args []string) {
 			if clocksAbsent() {
 				return
@@ -53,40 +53,22 @@ var (
 			if twelveHr {
 				cfg.TwelveHour = true
 			}
-
-			if len(args) >= 1 {
-				// when a @search term is passed, set layout to horizontal
-				// so that all clocks are displayed in one row
-				// clocks are filtered by the search term 
-				// fuzzy search is used to match the search term
-				searchTerm := args[0]
-				cfg.Layout.LayoutType = ui.Horizontal
-
-				n := 0
-				cfg.ClockCfgs, n = cfg.ClockCfgs.Filter(searchTerm)
-				if n == 0 {
-					pterm.FgYellow.Println("No clocks match the search term:", searchTerm)
-					return
-				}
-			}
 
 			if len(args) >= 1 {
 				// when a @search term is passed, set layout to horizontal
 				// so that all clocks are displayed in one row
 				// clocks are filtered by the search term
 				// fuzzy search is used to match the search term
-				searchTerm := args[0]
 				cfg.Layout.LayoutType = ui.Horizontal
 
 				n := 0
-				cfg.ClockCfgs, n = cfg.ClockCfgs.Filter(searchTerm)
+				cfg.ClockCfgs, n = cfg.ClockCfgs.Filter(args...)
 				if n == 0 {
-					pterm.FgYellow.Println("No clocks match the search term:", searchTerm)
+					pterm.FgYellow.Printf("No clocks match the search terms: %#v", args)
 					return
 				}
 			}
 
-
 			ui.ShowClocks(cfg)
 		},
 	}

cmd/version.txt

@@ -1 +1 @@
-0.7.1
+0.8.0

internal/ui/config.go

@@ -7,7 +7,6 @@ import (
 	"slices"
 	"strings"
 
-
 	"github.com/prnvbn/clocks/internal/match"
 	"github.com/prnvbn/clocks/internal/tmz"
 )
@@ -98,9 +97,14 @@ func (s *SortedClockConfigs) Remove(toRemove ...ClockConfig) {
 	})
 }
 
-func (s SortedClockConfigs) Filter(searchTerm string) (filtered SortedClockConfigs, n int) {
-	filtered = slices.Collect(s.fuzzyFiltered(searchTerm))
-	n = len(filtered)
+func (s SortedClockConfigs) Filter(searchTerms ...string) (filtered SortedClockConfigs, n int) {
+	filtered = make(SortedClockConfigs, 0)
+
+	for _, st := range searchTerms {
+		x := slices.Collect(s.fuzzyFiltered(st))
+		filtered = append(filtered, x...)
+		n += len(filtered)
+	}
 	return
 }