Merge pull request #3 from bpauli/feat/workouts-schedule-subcommands

feat: restructure `workouts schedule` into add/list/remove subcommands

Author: bpauli

README.md

@@ -11,7 +11,7 @@ Fast, script-friendly CLI for Garmin Connect. Access activities, health data, bo
 - **Activities** — list, search, view details, download (FIT/GPX/TCX/KML/CSV), upload, create manual entries, rename, retype, delete
 - **Health Data** — daily summaries, steps, heart rate, resting HR, sleep, stress, HRV, SpO2, respiration, body battery, floors, training readiness/status, VO2max, fitness age, race predictions, endurance/hill scores, intensity minutes, lactate threshold, cycling FTP
 - **Body Composition** — weight tracking, body fat, muscle mass, blood pressure, FIT file encoding for composition uploads
-- **Workouts** — list, view, download as FIT, upload from JSON, create with sport types and targets (pace/HR/power/cadence), schedule, delete
+- **Workouts** — list, view, download as FIT, upload from JSON, create with sport types and targets (pace/HR/power/cadence), schedule (add/list/remove), delete
 - **Devices** — list registered devices, view settings, solar data, alarms, primary/last-used device
 - **Gear** — list gear, usage stats, linked activities, defaults per activity type, link/unlink to activities
 - **Goals & Badges** — active goals, earned/available/in-progress badges, challenges, personal records
@@ -351,7 +351,10 @@ gccli workouts list --limit 20
 gccli workouts detail <id>
 gccli workouts download <id> --output workout.fit
 gccli workouts upload ./workout.json   # See JSON structure below
-gccli workouts schedule <id> <YYYY-MM-DD>
+gccli workouts schedule add <id> <YYYY-MM-DD>
+gccli workouts schedule list <YYYY-MM-DD>
+gccli workouts schedule remove <schedule-id>
+gccli workouts schedule remove <schedule-id> --force
 gccli workouts delete <id>
 
 # Create a running workout with pace targets

docs/index.html

@@ -556,7 +556,9 @@ <h2 class="section-title">Commands</h2>
               <div class="cmd-row"><div class="cmd">gccli workouts download &lt;id&gt; --output workout.fit</div><div class="desc">Download workout as FIT</div></div>
               <div class="cmd-row"><div class="cmd">gccli workouts upload ./workout.json</div><div class="desc">Upload workout from JSON</div></div>
               <div class="cmd-row"><div class="cmd">gccli workouts create "Name" --type run --step "warmup:5m" ...</div><div class="desc">Create with pace/HR/power targets</div></div>
-              <div class="cmd-row"><div class="cmd">gccli workouts schedule &lt;id&gt; &lt;YYYY-MM-DD&gt;</div><div class="desc">Schedule workout on a date</div></div>
+              <div class="cmd-row"><div class="cmd">gccli workouts schedule add &lt;id&gt; &lt;YYYY-MM-DD&gt;</div><div class="desc">Schedule workout on a date</div></div>
+              <div class="cmd-row"><div class="cmd">gccli workouts schedule list &lt;YYYY-MM-DD&gt;</div><div class="desc">List scheduled workouts for a date</div></div>
+              <div class="cmd-row"><div class="cmd">gccli workouts schedule remove &lt;schedule-id&gt; [-f]</div><div class="desc">Remove a scheduled workout</div></div>
               <div class="cmd-row"><div class="cmd">gccli workouts delete &lt;id&gt;</div><div class="desc">Delete a workout</div></div>
             </div>
           </div>

internal/cmd/workouts.go

@@ -16,7 +16,7 @@ type WorkoutsCmd struct {
 	Download WorkoutDownloadCmd `cmd:"" help:"Download workout as FIT file."`
 	Upload   WorkoutUploadCmd   `cmd:"" help:"Upload workout from JSON file."`
 	Create   WorkoutCreateCmd   `cmd:"" help:"Create a workout with sport type and optional targets."`
-	Schedule WorkoutScheduleCmd `cmd:"" help:"Schedule a workout on a date."`
+	Schedule WorkoutScheduleCmd `cmd:"" help:"Manage scheduled workouts."`
 	Delete   WorkoutDeleteCmd   `cmd:"" help:"Delete a workout."`
 }
 
@@ -138,15 +138,22 @@ func (c *WorkoutUploadCmd) Run(g *Globals) error {
 	return nil
 }
 
-// WorkoutScheduleCmd schedules a workout on a calendar date.
+// WorkoutScheduleCmd groups schedule subcommands.
 type WorkoutScheduleCmd struct {
-	ID   string `arg:"" help:"Workout ID."`
-	Date string `arg:"" help:"Date to schedule (YYYY-MM-DD)."`
+	Add    WorkoutScheduleAddCmd    `cmd:"" help:"Add a workout to the schedule."`
+	List   WorkoutScheduleListCmd   `cmd:"" help:"List scheduled workouts for a date."`
+	Remove WorkoutScheduleRemoveCmd `cmd:"" help:"Remove a scheduled workout from the calendar."`
 }
 
 var dateRegexp = regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`)
 
-func (c *WorkoutScheduleCmd) Run(g *Globals) error {
+// WorkoutScheduleAddCmd schedules a workout on a calendar date.
+type WorkoutScheduleAddCmd struct {
+	ID   string `arg:"" help:"Workout ID."`
+	Date string `arg:"" help:"Date to schedule (YYYY-MM-DD)."`
+}
+
+func (c *WorkoutScheduleAddCmd) Run(g *Globals) error {
 	if !dateRegexp.MatchString(c.Date) {
 		return fmt.Errorf("invalid date format %q: expected YYYY-MM-DD", c.Date)
 	}
@@ -169,6 +176,126 @@ func (c *WorkoutScheduleCmd) Run(g *Globals) error {
 	return nil
 }
 
+// WorkoutScheduleListCmd lists scheduled workouts for a date.
+type WorkoutScheduleListCmd struct {
+	Date string `arg:"" help:"Date to list (YYYY-MM-DD)."`
+}
+
+func (c *WorkoutScheduleListCmd) Run(g *Globals) error {
+	if !dateRegexp.MatchString(c.Date) {
+		return fmt.Errorf("invalid date format %q: expected YYYY-MM-DD", c.Date)
+	}
+
+	client, err := resolveClient(g)
+	if err != nil {
+		return err
+	}
+
+	data, err := client.GetCalendarWeek(g.Context, c.Date)
+	if err != nil {
+		return fmt.Errorf("list scheduled workouts: %w", err)
+	}
+
+	items, err := filterCalendarWorkouts(data, c.Date)
+	if err != nil {
+		return err
+	}
+
+	if outfmt.IsJSON(g.Context) {
+		out, err := json.Marshal(items)
+		if err != nil {
+			return fmt.Errorf("marshal calendar items: %w", err)
+		}
+		return outfmt.WriteJSON(os.Stdout, json.RawMessage(out))
+	}
+
+	rows := formatCalendarWorkoutRows(items)
+	header := []string{"SCHEDULE ID", "WORKOUT ID", "TITLE", "SPORT", "DATE"}
+
+	if outfmt.IsPlain(g.Context) {
+		return outfmt.WritePlain(os.Stdout, rows)
+	}
+	return outfmt.WriteTable(os.Stdout, header, rows)
+}
+
+// filterCalendarWorkouts extracts workout items matching the given date from calendar data.
+func filterCalendarWorkouts(data json.RawMessage, date string) ([]map[string]any, error) {
+	var calendar map[string]any
+	if err := json.Unmarshal(data, &calendar); err != nil {
+		return nil, fmt.Errorf("parse calendar: %w", err)
+	}
+
+	rawItems, ok := calendar["calendarItems"]
+	if !ok {
+		return nil, nil
+	}
+
+	items, ok := rawItems.([]any)
+	if !ok {
+		return nil, nil
+	}
+
+	var workouts []map[string]any
+	for _, item := range items {
+		m, ok := item.(map[string]any)
+		if !ok {
+			continue
+		}
+		if jsonString(m, "itemType") != "workout" {
+			continue
+		}
+		if jsonString(m, "date") != date {
+			continue
+		}
+		workouts = append(workouts, m)
+	}
+	return workouts, nil
+}
+
+// formatCalendarWorkoutRows extracts table rows from calendar workout items.
+func formatCalendarWorkoutRows(items []map[string]any) [][]string {
+	rows := make([][]string, 0, len(items))
+	for _, item := range items {
+		rows = append(rows, []string{
+			jsonString(item, "scheduleId"),
+			jsonString(item, "workoutId"),
+			jsonString(item, "title"),
+			jsonString(item, "sportTypeKey"),
+			jsonString(item, "date"),
+		})
+	}
+	return rows
+}
+
+// WorkoutScheduleRemoveCmd removes a scheduled workout from the calendar.
+type WorkoutScheduleRemoveCmd struct {
+	ID    string `arg:"" help:"Schedule ID (from 'workouts schedule list')."`
+	Force bool   `help:"Skip confirmation prompt." short:"f"`
+}
+
+func (c *WorkoutScheduleRemoveCmd) Run(g *Globals) error {
+	client, err := resolveClient(g)
+	if err != nil {
+		return err
+	}
+
+	ok, err := confirm(os.Stderr, fmt.Sprintf("Remove scheduled workout %s?", c.ID), c.Force)
+	if err != nil {
+		return err
+	}
+	if !ok {
+		g.UI.Infof("Cancelled")
+		return nil
+	}
+
+	if err := client.UnscheduleWorkout(g.Context, c.ID); err != nil {
+		return fmt.Errorf("remove scheduled workout: %w", err)
+	}
+
+	g.UI.Successf("Removed scheduled workout %s", c.ID)
+	return nil
+}
+
 // WorkoutDeleteCmd deletes a workout.
 type WorkoutDeleteCmd struct {
 	ID    string `arg:"" help:"Workout ID."`