Optimized Home Context loading for support commands

cmd/get/get.go

@@ -20,6 +20,7 @@ func NewCmdGet(ctx *openhue.Context) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:     "get",
+		Aliases: []string{"g"},
 		Short:   "Display one or many resources",
 		GroupID: "hue",
 		Long: `

cmd/root.go

@@ -8,12 +8,20 @@ import (
 	"openhue-cli/cmd/setup"
 	"openhue-cli/cmd/version"
 	"openhue-cli/openhue"
-	"os"
-	"time"
+	"openhue-cli/util"
+)
+
+type OpenHueCmdGroup string
+
+const (
+	// OpenHueCmdGroupHue contains the actual commands to control the home
+	OpenHueCmdGroupHue = OpenHueCmdGroup("hue")
+	// OpenHueCmdGroupConfig contains the commands to configure the CLI
+	OpenHueCmdGroupConfig = OpenHueCmdGroup("config")
 )
 
 // NewCmdOpenHue represents the `openhue` base command, AKA entry point of the CLI
-func NewCmdOpenHue() *cobra.Command {
+func NewCmdOpenHue(ctx *openhue.Context) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "openhue",
@@ -22,11 +30,27 @@ func NewCmdOpenHue() *cobra.Command {
 openhue controls your Philips Hue lighting system
 
     Find more information at: https://www.openhue.io/cli`,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			log.Infof("Running the '%s' command", cmd.Name())
+			LoadHomeIfNeeded(ctx, cmd)
+		},
 	}
 
 	return cmd
 }
 
+// LoadHomeIfNeeded checks if the command requires loading the openhue.Home context
+func LoadHomeIfNeeded(ctx *openhue.Context, cmd *cobra.Command) {
+	if isCmdInGroup(cmd, OpenHueCmdGroupHue) {
+		log.Infof("The '%s' command is in the '%s' group so we are loading the Home Context", cmd.Name(), OpenHueCmdGroupHue)
+		timer := util.NewTimer()
+		home, err := openhue.LoadHome(ctx.Api)
+		cobra.CheckErr(err)
+		ctx.Home = home
+		log.Infof("It took %dms to load the Home Context", timer.SinceInMillis())
+	}
+}
+
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute(buildInfo *openhue.BuildInfo) {
@@ -39,16 +63,8 @@ func Execute(buildInfo *openhue.BuildInfo) {
 	api := c.NewOpenHueClient()
 	ctx := openhue.NewContext(openhue.NewIOStreams(), buildInfo, api)
 
-	// load the home context
-	t0 := time.Now()
-	home, err := openhue.LoadHome(api)
-	cobra.CheckErr(err)
-	ctx.Home = home
-	log.Infof("It took %dms to load the Home Context", time.Since(t0).Milliseconds())
-
 	// create the root command
-	root := NewCmdOpenHue()
-	log.Infof("Running the '%s' command", os.Args)
+	root := NewCmdOpenHue(ctx)
 
 	// init groups
 	initGroups(root)
@@ -63,18 +79,30 @@ func Execute(buildInfo *openhue.BuildInfo) {
 	root.AddCommand(get.NewCmdGet(ctx))
 
 	// execute the root command
-	err = root.Execute()
+	err := root.Execute()
 	cobra.CheckErr(err)
 }
 
 func initGroups(rootCmd *cobra.Command) {
 	rootCmd.AddGroup(&cobra.Group{
-		ID:    "config",
+		ID:    string(OpenHueCmdGroupConfig),
 		Title: "Configuration",
 	})
 
 	rootCmd.AddGroup(&cobra.Group{
-		ID:    "hue",
+		ID:    string(OpenHueCmdGroupHue),
 		Title: "Philips Hue",
 	})
 }
+
+// isCmdInGroup verifies if a given cobra.Command belongs to a certain OpenHueCmdGroup
+func isCmdInGroup(cmd *cobra.Command, id OpenHueCmdGroup) bool {
+
+	if cmd.GroupID == string(id) {
+		return true
+	} else if cmd.Parent() != nil {
+		return isCmdInGroup(cmd.Parent(), id)
+	}
+
+	return false
+}

cmd/set/set.go

@@ -10,6 +10,7 @@ func NewCmdSet(ctx *openhue.Context) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:     "set",
+		Aliases: []string{"s"},
 		Short:   "Set specific features on resources",
 		GroupID: "hue",
 		Long: `

util/metrics.go

@@ -0,0 +1,20 @@
+package util
+
+import "time"
+
+func NewTimer() *Timer {
+	return new(Timer).start()
+}
+
+type Timer struct {
+	t0 time.Time
+}
+
+func (t *Timer) start() *Timer {
+	t.t0 = time.Now()
+	return t
+}
+
+func (t *Timer) SinceInMillis() int64 {
+	return time.Since(t.t0).Milliseconds()
+}