Fix the command_get.go file

Signed-off-by: Lavish Pal <[email protected]>

Author: lavishpal

cmd/bbolt/command_get.go

@@ -1,98 +1,61 @@
 package main
 
 import (
-	"flag"
 	"fmt"
 	"os"
-	"strings"
 
+	"github.com/spf13/cobra"
 	bolt "go.etcd.io/bbolt"
 )
 
-// getCommand represents the "get" command execution.
-type getCommand struct {
-	baseCommand
-}
-
-// newGetCommand returns a getCommand.
-func newGetCommand(m *Main) *getCommand {
-	c := &getCommand{}
-	c.baseCommand = m.baseCommand
-	return c
-}
-
-// Run executes the command.
-func (cmd *getCommand) Run(args ...string) error {
-	// Parse CLI flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	var parseFormat string
-	var format string
-	fs.StringVar(&parseFormat, "parse-format", "ascii-encoded", "Input format. One of: ascii-encoded|hex (default: ascii-encoded)")
-	fs.StringVar(&format, "format", "auto", "Output format. One of: "+FORMAT_MODES+" (default: auto)")
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Validate arguments.
-	relevantArgs := fs.Args()
-	if len(relevantArgs) < 3 {
-		return ErrNotEnoughArgs
-	}
-	path := relevantArgs[0]
-	buckets := relevantArgs[1 : len(relevantArgs)-1]
-	keyStr := relevantArgs[len(relevantArgs)-1]
-
-	key, err := parseBytes(keyStr, parseFormat)
-	if err != nil {
-		return err
-	}
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	} else if len(buckets) == 0 {
-		return ErrBucketRequired
-	} else if len(key) == 0 {
-	} else if len(key) == 0 {
-		return fmt.Errorf("key required")
+func newGetCommand(m *Main) *cobra.Command {
+	var parseFormat, format string
+
+	cmd := &cobra.Command{
+		Use:   "get PATH [BUCKET..] KEY",
+		Short: "Get the value of a key from a (sub)bucket in a bbolt database",
+		Args:  cobra.MinimumNArgs(3),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			path := args[0]
+			buckets := args[1 : len(args)-1]
+			keyStr := args[len(args)-1]
+
+			key, err := parseBytes(keyStr, parseFormat)
+			if err != nil {
+				return err
+			}
+			if path == "" {
+				return ErrPathRequired
+			} else if _, err := os.Stat(path); os.IsNotExist(err) {
+				return ErrFileNotFound
+			} else if len(buckets) == 0 {
+				return ErrBucketRequired
+			} else if len(key) == 0 {
+				return fmt.Errorf("key required")
+			}
+
+			db, err := bolt.Open(path, 0600, &bolt.Options{ReadOnly: true})
+			if err != nil {
+				return err
+			}
+			defer db.Close()
+
+			return db.View(func(tx *bolt.Tx) error {
+				lastBucket, err := findLastBucket(tx, buckets)
+				if err != nil {
+					return err
+				}
+				val := lastBucket.Get(key)
+				if val == nil {
+					return fmt.Errorf("Error %w for key: %q hex: \"%x\"", ErrKeyNotFound, key, key)
+				}
+				return writelnBytes(cmd.OutOrStdout(), val, format)
+			})
+		},
 	}
-	// Open database.
-	db, err := bolt.Open(path, 0600, &bolt.Options{ReadOnly: true})
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	// Fetch value.
-	return db.View(func(tx *bolt.Tx) error {
-		lastBucket, err := findLastBucket(tx, buckets)
-		if err != nil {
-			return err
-		}
-		val := lastBucket.Get(key)
-		if val == nil {
-			return fmt.Errorf("Error %w for key: %q hex: \"%x\"", ErrKeyNotFound, key, key)
-		}
-		return writelnBytes(cmd.Stdout, val, format)
-	})
-}
-
-// Usage returns the help message.
-func (cmd *getCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt get PATH [BUCKET..] KEY
-
-Print the value of the given key in the given (sub)bucket.
 
-Additional options include:
+	cmd.Flags().StringVar(&parseFormat, "parse-format", "ascii-encoded", "Input format. One of: ascii-encoded|hex")
+	cmd.Flags().StringVar(&format, "format", "auto", "Output format. One of: ascii|hex|auto")
 
-	--format
-		Output format. One of: `+FORMAT_MODES+` (default=auto)
-	--parse-format
-		Input format (of key). One of: ascii-encoded|hex (default=ascii-encoded)
-`, "\n")
+	return cmd
 }

cmd/bbolt/command_root.go

@@ -22,7 +22,7 @@ func NewRootCommand() *cobra.Command {
 		newInspectCommand(),
 		newCheckCommand(),
 		newBucketsCommand(),
-		newGetCommand(),
+		newGetCommand(nil), // TODO: Replace nil with an actual *Main instance if available
 	)
 
 	return rootCmd