Merge pull request #31 from hammingweight/fix-keys-flag

The 'keys' flag applies only to 'get' commands.

README.md

@@ -56,7 +56,6 @@ Flags:
   -c, --config string     synkctl config file location
   -h, --help              help for synkctl
   -i, --inverter string   SunSynk inverter serial number
-  -k, --keys string       Extract specific keys from response
   -v, --version           version for synkctl
 
 Use "synkctl [command] --help" for more information about a command.

cmd/battery_get.go

@@ -49,4 +49,5 @@ var batteryGetCmd = &cobra.Command{
 
 func init() {
 	batteryCmd.AddCommand(batteryGetCmd)
+	addKeysFlag(batteryGetCmd)
 }

cmd/cmd_util.go

@@ -21,6 +21,7 @@ import (
 	"strings"
 
 	"github.com/hammingweight/synkctl/rest"
+	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
@@ -35,3 +36,8 @@ func displayObject(o *rest.SynkObject) error {
 	fmt.Println(o)
 	return nil
 }
+
+func addKeysFlag(cmd *cobra.Command) {
+	cmd.PersistentFlags().StringP("keys", "k", "", "Extract specific keys from response")
+	viper.BindPFlag("keys", cmd.PersistentFlags().Lookup("keys"))
+}

cmd/grid_get.go

@@ -49,4 +49,5 @@ var gridGetCmd = &cobra.Command{
 
 func init() {
 	gridCmd.AddCommand(gridGetCmd)
+	addKeysFlag(gridGetCmd)
 }

cmd/input_get.go

@@ -49,4 +49,5 @@ var inputGetCmd = &cobra.Command{
 
 func init() {
 	inputCmd.AddCommand(inputGetCmd)
+	addKeysFlag(inputGetCmd)
 }

cmd/inverter_get.go

@@ -66,6 +66,7 @@ var inverterGetCmd = &cobra.Command{
 
 func init() {
 	inverterCmd.AddCommand(inverterGetCmd)
+	addKeysFlag(inverterGetCmd)
 
 	inverterGetCmd.Flags().BoolP("short", "s", false, "Get short output (get only fields that can be updated)")
 	viper.BindPFlag("short", inverterGetCmd.Flags().Lookup("short"))

cmd/load_get.go

@@ -37,7 +37,7 @@ func readLoad(ctx context.Context) error {
 }
 
 // The load command displays load statistics
-var getLoadCmd = &cobra.Command{
+var loadGetCmd = &cobra.Command{
 	Use:     "get",
 	Short:   "Gets the inverter's current and cumulative load statistics",
 	Aliases: []string{"read"},
@@ -48,5 +48,6 @@ var getLoadCmd = &cobra.Command{
 }
 
 func init() {
-	loadCmd.AddCommand(getLoadCmd)
+	loadCmd.AddCommand(loadGetCmd)
+	addKeysFlag(loadGetCmd)
 }

cmd/root.go

@@ -63,15 +63,13 @@ func init() {
 	// Arguments that apply to all subcommands.
 	rootCmd.PersistentFlags().StringP("config", "c", configFile, "synkctl config file location")
 	rootCmd.PersistentFlags().StringP("inverter", "i", "", "SunSynk inverter serial number")
-	rootCmd.PersistentFlags().StringP("keys", "k", "", "Extract specific keys from response")
 
 	// Set up viper
 	replacer := strings.NewReplacer("-", "_")
 	viper.SetEnvKeyReplacer(replacer)
 	viper.SetEnvPrefix("SYNK")
 	viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))
 	viper.BindPFlag("inverter", rootCmd.PersistentFlags().Lookup("inverter"))
-	viper.BindPFlag("keys", rootCmd.PersistentFlags().Lookup("keys"))
 }
 
 func initConfig() {