From 26fcbe0f0f5911d9f064a641b7e2507abf296943 Mon Sep 17 00:00:00 2001
From: Mike Sawka <mike@commandline.dev>
Date: Mon, 7 Oct 2024 13:56:46 -0700
Subject: [PATCH] remove blockid from the regular args, use an optional -b
 (#973)

---
 cmd/wsh/cmd/wshcmd-deleteblock.go |  7 +------
 cmd/wsh/cmd/wshcmd-getmeta.go     | 10 +++++-----
 cmd/wsh/cmd/wshcmd-readfile.go    |  2 +-
 cmd/wsh/cmd/wshcmd-root.go        |  2 ++
 cmd/wsh/cmd/wshcmd-setmeta.go     |  6 +++---
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/cmd/wsh/cmd/wshcmd-deleteblock.go b/cmd/wsh/cmd/wshcmd-deleteblock.go
index 6d30d272b..9ccea751a 100644
--- a/cmd/wsh/cmd/wshcmd-deleteblock.go
+++ b/cmd/wsh/cmd/wshcmd-deleteblock.go
@@ -11,7 +11,6 @@ import (
 var deleteBlockCmd = &cobra.Command{
 	Use:     "deleteblock",
 	Short:   "delete a block",
-	Args:    cobra.ExactArgs(1),
 	Run:     deleteBlockRun,
 	PreRunE: preRunSetupRpcClient,
 }
@@ -21,11 +20,7 @@ func init() {
 }
 
 func deleteBlockRun(cmd *cobra.Command, args []string) {
-	oref := args[0]
-	if oref == "" {
-		WriteStderr("[error] oref is required\n")
-		return
-	}
+	oref := blockArg
 	err := validateEasyORef(oref)
 	if err != nil {
 		WriteStderr("[error]%v\n", err)
diff --git a/cmd/wsh/cmd/wshcmd-getmeta.go b/cmd/wsh/cmd/wshcmd-getmeta.go
index 6c138ac46..2f1b1af8d 100644
--- a/cmd/wsh/cmd/wshcmd-getmeta.go
+++ b/cmd/wsh/cmd/wshcmd-getmeta.go
@@ -12,9 +12,9 @@ import (
 )
 
 var getMetaCmd = &cobra.Command{
-	Use:     "getmeta {blockid|blocknum|this} [key]",
+	Use:     "getmeta [key]",
 	Short:   "get metadata for an entity",
-	Args:    cobra.RangeArgs(1, 2),
+	Args:    cobra.RangeArgs(0, 1),
 	Run:     getMetaRun,
 	PreRunE: preRunSetupRpcClient,
 }
@@ -24,7 +24,7 @@ func init() {
 }
 
 func getMetaRun(cmd *cobra.Command, args []string) {
-	oref := args[0]
+	oref := blockArg
 	if oref == "" {
 		WriteStderr("[error] oref is required")
 		return
@@ -44,8 +44,8 @@ func getMetaRun(cmd *cobra.Command, args []string) {
 		WriteStderr("[error] getting metadata: %v\n", err)
 		return
 	}
-	if len(args) > 1 {
-		val, ok := resp[args[1]]
+	if len(args) > 0 {
+		val, ok := resp[args[0]]
 		if !ok {
 			return
 		}
diff --git a/cmd/wsh/cmd/wshcmd-readfile.go b/cmd/wsh/cmd/wshcmd-readfile.go
index 5002f256c..7c8444fbd 100644
--- a/cmd/wsh/cmd/wshcmd-readfile.go
+++ b/cmd/wsh/cmd/wshcmd-readfile.go
@@ -14,7 +14,7 @@ import (
 var readFileCmd = &cobra.Command{
 	Use:     "readfile",
 	Short:   "read a blockfile",
-	Args:    cobra.ExactArgs(2),
+	Args:    cobra.ExactArgs(1),
 	Run:     runReadFile,
 	PreRunE: preRunSetupRpcClient,
 }
diff --git a/cmd/wsh/cmd/wshcmd-root.go b/cmd/wsh/cmd/wshcmd-root.go
index 0e9cd2936..77cc2ee30 100644
--- a/cmd/wsh/cmd/wshcmd-root.go
+++ b/cmd/wsh/cmd/wshcmd-root.go
@@ -35,6 +35,7 @@ var WrappedStdin io.Reader = os.Stdin
 var RpcClient *wshutil.WshRpc
 var RpcContext wshrpc.RpcContext
 var UsingTermWshMode bool
+var blockArg string
 
 func extraShutdownFn() {
 	if usingHtmlMode {
@@ -174,6 +175,7 @@ func Execute() {
 			wshutil.DoShutdown("", 0, false)
 		}
 	}()
+	rootCmd.PersistentFlags().StringVarP(&blockArg, "block", "b", "this", "for commands which require a block id")
 	err := rootCmd.Execute()
 	if err != nil {
 		wshutil.DoShutdown("", 1, true)
diff --git a/cmd/wsh/cmd/wshcmd-setmeta.go b/cmd/wsh/cmd/wshcmd-setmeta.go
index 88ff7b451..36537bc94 100644
--- a/cmd/wsh/cmd/wshcmd-setmeta.go
+++ b/cmd/wsh/cmd/wshcmd-setmeta.go
@@ -16,7 +16,7 @@ import (
 var setMetaCmd = &cobra.Command{
 	Use:     "setmeta {blockid|blocknum|this} key=value ...",
 	Short:   "set metadata for an entity",
-	Args:    cobra.MinimumNArgs(2),
+	Args:    cobra.MinimumNArgs(1),
 	Run:     setMetaRun,
 	PreRunE: preRunSetupRpcClient,
 }
@@ -64,8 +64,8 @@ func parseMetaSets(metaSets []string) (map[string]interface{}, error) {
 }
 
 func setMetaRun(cmd *cobra.Command, args []string) {
-	oref := args[0]
-	metaSetsStrs := args[1:]
+	oref := blockArg
+	metaSetsStrs := args[:]
 	if oref == "" {
 		WriteStderr("[error] oref is required\n")
 		return