refactor(calendar): extract timezone resolution to shared helper

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: salmonumbrella

internal/cmd/calendar_event_days.go

@@ -37,26 +37,8 @@ func wrapEventWithDaysWithTimezone(event *calendar.Event, calendarTimezone strin
 		return nil
 	}
 	startDay, endDay := eventDaysOfWeek(event)
-	calendarTimezone = strings.TrimSpace(calendarTimezone)
 	evTimezone := eventTimezone(event)
-
-	if loc == nil && calendarTimezone != "" {
-		if loaded, err := time.LoadLocation(calendarTimezone); err == nil {
-			loc = loaded
-		} else {
-			calendarTimezone = ""
-		}
-	}
-	if calendarTimezone == "" {
-		calendarTimezone = evTimezone
-		if loc == nil && calendarTimezone != "" {
-			if loaded, err := time.LoadLocation(calendarTimezone); err == nil {
-				loc = loaded
-			} else {
-				calendarTimezone = ""
-			}
-		}
-	}
+	calendarTimezone, loc = resolveEventTimezone(event, calendarTimezone, loc)
 
 	startLocal := formatEventLocal(event.Start, loc)
 	endLocal := formatEventLocal(event.End, loc)
@@ -152,3 +134,31 @@ func loadEventLocation(tz string) (*time.Location, bool) {
 	}
 	return loc, true
 }
+
+// resolveEventTimezone resolves the timezone and location for an event.
+// It tries the calendar timezone first, then falls back to the event's timezone.
+// Returns the resolved timezone name and location. If loc is already provided,
+// it will be used as-is (only calendarTimezone may be updated for display).
+func resolveEventTimezone(event *calendar.Event, calendarTimezone string, loc *time.Location) (string, *time.Location) {
+	calendarTimezone = strings.TrimSpace(calendarTimezone)
+	evTimezone := eventTimezone(event)
+
+	if loc == nil && calendarTimezone != "" {
+		if loaded, err := time.LoadLocation(calendarTimezone); err == nil {
+			loc = loaded
+		} else {
+			calendarTimezone = ""
+		}
+	}
+	if calendarTimezone == "" {
+		calendarTimezone = evTimezone
+		if loc == nil && calendarTimezone != "" {
+			if loaded, err := time.LoadLocation(calendarTimezone); err == nil {
+				loc = loaded
+			} else {
+				calendarTimezone = ""
+			}
+		}
+	}
+	return calendarTimezone, loc
+}

internal/cmd/calendar_print.go

@@ -18,26 +18,8 @@ func printCalendarEventWithTimezone(u *ui.UI, event *calendar.Event, calendarTim
 	if u == nil || event == nil {
 		return
 	}
-	calendarTimezone = strings.TrimSpace(calendarTimezone)
 	eventTimezone := eventTimezone(event)
-
-	if loc == nil && calendarTimezone != "" {
-		if loaded, err := time.LoadLocation(calendarTimezone); err == nil {
-			loc = loaded
-		} else {
-			calendarTimezone = ""
-		}
-	}
-	if calendarTimezone == "" {
-		calendarTimezone = eventTimezone
-		if loc == nil && calendarTimezone != "" {
-			if loaded, err := time.LoadLocation(calendarTimezone); err == nil {
-				loc = loaded
-			} else {
-				calendarTimezone = ""
-			}
-		}
-	}
+	calendarTimezone, loc = resolveEventTimezone(event, calendarTimezone, loc)
 
 	u.Out().Printf("id\t%s", event.Id)
 	u.Out().Printf("summary\t%s", orEmpty(event.Summary, "(no title)"))

internal/cmd/calendar_time.go

@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"time"