cleanup more activities operations

Author: prmaloney

cmd/activities.go

@@ -15,50 +15,49 @@ var newCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		projectId, _ := cmd.Flags().GetInt("project")
 		taskId, _ := cmd.Flags().GetInt("task")
-		// description, err := cmd.Flags().GetString("description")
-        projects, err := data.GetProjects()
+		description, err := cmd.Flags().GetString("description")
+
+		projects, err := data.GetProjects()
+		if err != nil {
+			fmt.Println("Could not retrieve projects", err)
+		}
+
 		if projectId == 0 {
-			if err != nil {
-				fmt.Println("Could not get projects")
-			}
 
 			options := make([]huh.Option[int], len(projects))
 			for i, p := range projects {
 				options[i] = huh.NewOption[int](p.Name, p.Id)
 			}
 
 			pform := huh.NewSelect[int]().Options(options...).Value(&projectId)
-            pform.Run()
-            if (projectId == 0) {
-                return
-            }
+			pform.Run()
+			if projectId == 0 {
+				return
+			}
+		}
+
+		var project data.Project
+		for _, p := range projects {
+			if p.Id == projectId {
+				project = p
+			}
+		}
+
+		if taskId == 0 {
+			options := make([]huh.Option[int], len(project.Tasks))
+			for i, t := range project.Tasks {
+				options[i] = huh.NewOption[int](t.Name, t.Id)
+			}
+			tform := huh.NewSelect[int]().Options(options...).Value(&taskId)
+			tform.Run()
+			if taskId == 0 {
+				return
+			}
 		}
 
-        var project data.Project
-        for _, p := range projects {
-            if p.Id == projectId {
-                project = p
-            }
-        }
-
-        if taskId == 0 {
-            if err != nil {
-                fmt.Println("Could not get tasks")
-            }
-            options := make([]huh.Option[int], len(project.Tasks))
-            for i, t := range project.Tasks {
-                options[i] = huh.NewOption[int](t.Name, t.Id)
-            }
-            tform := huh.NewSelect[int]().Options(options...).Value(&taskId)
-            tform.Run()
-            if taskId == 0 {
-                return
-            }
-        }
-
-        if description == "" {
-            huh.NewInput().Title("Description:").Prompt(">").Value(&description).Run()
-        }
+		if description == "" {
+			huh.NewInput().Title("Description:").Prompt(">").Value(&description).Run()
+		}
 
 		err = data.CreateActivity(projectId, taskId, description)
 		if err != nil {
@@ -94,23 +93,23 @@ var editCmd = &cobra.Command{
 }
 
 var deleteCmd = &cobra.Command{
-    Use:   "delete <activity>",
-    Short: "Delete an activity",
-    Run: func(cmd *cobra.Command, args []string) {
-        if len(args) == 0 {
-            cmd.Help()
-            return
-        }
-        activityId, err := strconv.Atoi(args[0])
-        if err != nil {
-            fmt.Println("Invalid activity id")
-            return
-        }
-        err = data.DeleteActivity(activityId)
-        if err != nil {
-            fmt.Println("Could not delete activity:", err)
-        }
-    },
+	Use:   "delete <activity>",
+	Short: "Delete an activity",
+	Run: func(cmd *cobra.Command, args []string) {
+		if len(args) == 0 {
+			cmd.Help()
+			return
+		}
+		activityId, err := strconv.Atoi(args[0])
+		if err != nil {
+			fmt.Println("Invalid activity id")
+			return
+		}
+		err = data.DeleteActivity(activityId)
+		if err != nil {
+			fmt.Println("Could not delete activity:", err)
+		}
+	},
 }
 
 var activitiesCmd = &cobra.Command{
@@ -119,17 +118,15 @@ var activitiesCmd = &cobra.Command{
 }
 
 func init() {
-	activitiesCmd.Flags().BoolP("new", "n", false, "Create a new activity")
-
-	activitiesCmd.Flags().IntP("delete", "x", 0, "Delete activity by ID")
-
 	editCmd.Flags().IntP("time", "t", 0, "Set the time for the activity (in seconds)")
 	editCmd.Flags().StringP("description", "d", "", "Set the description for the activity")
 
 	activitiesCmd.AddCommand(editCmd)
-    activitiesCmd.AddCommand(newCmd)
 
-    activitiesCmd.AddCommand(deleteCmd)
+	newCmd.Flags().Bool("no-start", false, "Don't start the activity when created")
+	activitiesCmd.AddCommand(newCmd)
+
+	activitiesCmd.AddCommand(deleteCmd)
 
 	rootCmd.AddCommand(activitiesCmd)
 }

cmd/ls.go

@@ -58,7 +58,7 @@ var activityCmd = &cobra.Command{
         today, _ := cmd.Flags().GetBool("today")
         for _, activity := range activities {
             if !today || activity.Date == time.Now().Format("2006-01-02") {
-                fmt.Printf("%d %s\n", activity.Id, activity.Description)
+                fmt.Printf("%d\t%s\n", activity.Id, activity.Description)
             }
         }
     },

cmd/start.go

@@ -10,11 +10,8 @@ import (
 // rootCmd represents the base command when called without any subcommands
 var stopCmd = &cobra.Command{
 	Use:   "stop [id]",
-	Short: "Stop time tracking for a given project",
+	Short: "Stop time tracking for all projects",
 	Run: func(cmd *cobra.Command, args []string) {
-        if activityId != 0 {
-            data.StopActivity(activityId)
-        }
         activities, err := data.GetActivities()
         if err != nil {
             fmt.Println(err)
@@ -29,7 +26,5 @@ var stopCmd = &cobra.Command{
 }
 
 func init() {
-    stopCmd.Flags().IntVarP(&activityId, "activity", "a", 0, "Activity ID (if not provided, a new activity will be created)")
-    stopCmd.MarkFlagRequired("activity")
 	rootCmd.AddCommand(stopCmd)
 }