feat(parse): add timezone override

Author: DanStough

internal/cmd/now.go

@@ -82,11 +82,11 @@ func runNow(cmd *cobra.Command) error {
 	}
 
 	switch mode {
-	case outputPretty:
+	case outputModePretty:
 		return out.writePretty(cmd.OutOrStdout())
-	case outputSimple:
+	case outputModeSimple:
 		return out.writeSimple(cmd.OutOrStdout())
-	case outputJson:
+	case outputModeJson:
 		return out.writeJson(cmd.OutOrStdout())
 	default:
 		return fmt.Errorf("unexpected output format: %s", mode)

internal/cmd/parse.go

@@ -13,6 +13,7 @@ import (
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/charmbracelet/lipgloss/v2/table"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
 	"github.com/DanStough/epok/internal/styles"
 	"github.com/DanStough/epok/parse"
@@ -35,7 +36,11 @@ other formats. It can handle timestamps in various precisions and formats.`,
 epok parse 1751074598
 
 # Read from stdin
-pbpaste | epoch parse`,
+pbpaste | epoch parse
+
+# Override displayed timezones
+epok parse 1751074598 -z Big\ Ben=Europe/London,Tokyo\ SkyTree=Asia/Tokyo,Empire\ State=America/New_York
+`,
 
 		Args: cobra.MaximumNArgs(1),
 
@@ -48,6 +53,14 @@ pbpaste | epoch parse`,
 		SilenceUsage: true,
 	}
 
+	defaultLocales := map[string]string{
+		"Local": "Local",
+		"UTC":   "UTC",
+	}
+
+	parseCmd.Flags().StringToStringP("timezone", "z", defaultLocales,
+		"override the map of locales:timezones. "+
+			"Use 'Local' for system time.")
 	return parseCmd
 }
 
@@ -63,30 +76,39 @@ func runParse(cmd *cobra.Command, args []string) error {
 		input = args[0]
 	}
 
-	input = strings.TrimSpace(input)
-	timestamp, err := parse.String(input)
+	mode, err := getOutput()
 	if err != nil {
-		return fmt.Errorf("could not parse input: %w", err)
+		return err
 	}
 
-	// TODO: consider having this load from a config
-	locales := map[string]*time.Location{
-		"Local": time.Local,
-		"UTC":   time.UTC,
+	timezones := viper.GetStringMapString("timezone")
+	if len(timezones) == 0 {
+		return errors.New("must specify at least one locale timezone")
 	}
 
-	out := newParseOutput(input, timestamp, locales)
-	mode, err := getOutput()
+	locales := make(map[string]*time.Location, len(timezones))
+	for name, timezone := range timezones {
+		loc, err := time.LoadLocation(timezone)
+		if err != nil {
+			return fmt.Errorf("invalid timezone %s for locale %s: %w", timezone, name, err)
+		}
+		locales[name] = loc
+	}
+
+	input = strings.TrimSpace(input)
+	timestamp, err := parse.String(input)
 	if err != nil {
-		return err
+		return fmt.Errorf("could not parse input: %w", err)
 	}
 
+	out := newParseOutput(input, timestamp, locales)
+
 	switch mode {
-	case outputPretty:
+	case outputModePretty:
 		return out.writePretty(cmd.OutOrStdout())
-	case outputSimple:
+	case outputModeSimple:
 		return out.writeSimple(cmd.OutOrStdout())
-	case outputJson:
+	case outputModeJson:
 		return out.writeJson(cmd.OutOrStdout())
 	default:
 		return fmt.Errorf("unexpected output format: %s", mode)
@@ -208,10 +230,16 @@ func (o *parseOutput) writePretty(w io.Writer) error {
 				style = sheet.Table.OddRow
 			}
 
-			// TODO (dans): these need to change if we make the timezones configurable
+			localeWidth := 8
+			for _, locale := range o.Locales {
+				if len(locale.Name) > localeWidth {
+					localeWidth = len(locale.Name)
+				}
+			}
+
 			switch col {
 			case 0:
-				style = style.Width(8)
+				style = style.Width(localeWidth + 2) // include padding
 			case 1:
 				style = style.Width(32)
 			case 2:

internal/cmd/parse_test.go

@@ -36,6 +36,8 @@ func Test_Parse(t *testing.T) {
 			args: []string{
 				"parse",
 				"1751770507\n",
+				"-z", // We need to force an exact timezone for "local" to work across machines with different settings.
+				"Local=America/New_York,UTC=UTC",
 			},
 			expectedOutput: []string{
 				afterOutput,
@@ -45,6 +47,8 @@ func Test_Parse(t *testing.T) {
 			name: "happy path - valid unix timestamp stdin",
 			args: []string{
 				"parse",
+				"-z", // We need to force an exact timezone for "local" to work across machines with different settings.
+				"Local=America/New_York,UTC=UTC",
 			},
 			in: "1751770507\n",
 			expectedOutput: []string{
@@ -55,6 +59,8 @@ func Test_Parse(t *testing.T) {
 			name: "happy path - timestamp is before 'now'",
 			args: []string{
 				"parse",
+				"-z", // We need to force an exact timezone for "local" to work across machines with different settings.
+				"Local=America/New_York,UTC=UTC",
 			},
 			in: "946080000\n",
 			expectedOutput: []string{
@@ -66,6 +72,8 @@ func Test_Parse(t *testing.T) {
 			args: []string{
 				"parse",
 				"-ojson",
+				"-z", // We need to force an exact timezone for "local" to work across machines with different settings.
+				"Local=America/New_York,UTC=UTC",
 			},
 			in: "1751770507\n",
 			expectedOutput: []string{

internal/cmd/root.go

@@ -139,35 +139,35 @@ func bindFlags(cmd *cobra.Command) {
 	}
 }
 
-type output string
+type outputMode string
 
 const (
-	outputJson   output = "json"
-	outputPretty output = "pretty"
-	outputSimple output = "simple"
+	outputModeJson   outputMode = "json"
+	outputModePretty outputMode = "pretty"
+	outputModeSimple outputMode = "simple"
 )
 
-func getOutput() (output, error) {
+func getOutput() (outputMode, error) {
 	str := viper.GetString("output")
-	output := output(str)
+	output := outputMode(str)
 
 	switch output {
 	// support shorthands
-	case outputPretty, "p":
-		output = outputPretty
-	case outputSimple, "s":
-		output = outputSimple
-	case outputJson, "j":
-		output = outputJson
+	case outputModePretty, "p":
+		output = outputModePretty
+	case outputModeSimple, "s":
+		output = outputModeSimple
+	case outputModeJson, "j":
+		output = outputModeJson
 	default:
 		return "", fmt.Errorf("invalid output flag: %s", output)
 	}
 
 	isInteractive := term.IsTerminal(int(os.Stdout.Fd()))
 
 	// Downgrade styling for non-interactive terminals
-	if !isInteractive && output == outputPretty {
-		output = outputSimple
+	if !isInteractive && output == outputModePretty {
+		output = outputModeSimple
 	}
 	return output, nil
 }