allow CLI consumer to specify CID encoding for output

cli/client.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/ipfs/go-cid"
 	"github.com/libp2p/go-libp2p-core/peer"
-	"github.com/multiformats/go-multibase"
 	"golang.org/x/xerrors"
 	"gopkg.in/urfave/cli.v2"
 
@@ -69,12 +68,12 @@ var clientImportCmd = &cli.Command{
 			return err
 		}
 
-		encoded, err := c.StringOfBase(multibase.Base32)
+		encoder, err := GetCidEncoder(cctx)
 		if err != nil {
 			return err
 		}
 
-		fmt.Println(encoded)
+		fmt.Println(encoder.Encode(c))
 
 		return nil
 	},
@@ -106,12 +105,12 @@ var clientCommPCmd = &cli.Command{
 			return err
 		}
 
-		encoded, err := ret.Root.StringOfBase(multibase.Base32)
+		encoder, err := GetCidEncoder(cctx)
 		if err != nil {
 			return err
 		}
 
-		fmt.Println("CID: ", encoded)
+		fmt.Println("CID: ", encoder.Encode(ret.Root))
 		fmt.Println("Piece size: ", ret.Size)
 		return nil
 	},
@@ -162,13 +161,14 @@ var clientLocalCmd = &cli.Command{
 		if err != nil {
 			return err
 		}
-		for _, v := range list {
-			encoded, err := v.Key.StringOfBase(multibase.Base32)
-			if err != nil {
-				return err
-			}
 
-			fmt.Printf("%s %s %d %s\n", encoded, v.FilePath, v.Size, v.Status)
+		encoder, err := GetCidEncoder(cctx)
+		if err != nil {
+			return err
+		}
+
+		for _, v := range list {
+			fmt.Printf("%s %s %d %s\n", encoder.Encode(v.Key), v.FilePath, v.Size, v.Status)
 		}
 		return nil
 	},
@@ -281,12 +281,12 @@ var clientDealCmd = &cli.Command{
 			return err
 		}
 
-		encoded, err := proposal.StringOfBase(multibase.Base32)
+		encoder, err := GetCidEncoder(cctx)
 		if err != nil {
 			return err
 		}
 
-		fmt.Println(encoded)
+		fmt.Println(encoder.Encode(*proposal))
 
 		return nil
 	},

cli/cmd.go

@@ -9,6 +9,9 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/multiformats/go-multibase"
+
+	cidenc "github.com/ipfs/go-cidutil/cidenc"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/mitchellh/go-homedir"
 	"github.com/multiformats/go-multiaddr"
@@ -193,6 +196,24 @@ func DaemonContext(cctx *cli.Context) context.Context {
 	return context.Background()
 }
 
+// GetCidEncoder returns an encoder using the cid-base flag if provided, or
+// the default (Base32) encoder if not.
+func GetCidEncoder(cctx *cli.Context) (cidenc.Encoder, error) {
+	val := cctx.String("cid-base")
+
+	e := cidenc.Default()
+
+	if val != "" {
+		var err error
+		e.Base, err = multibase.EncoderByName(val)
+		if err != nil {
+			return e, err
+		}
+	}
+
+	return e, nil
+}
+
 // ReqContext returns context for cli execution. Calling it for the first time
 // installs SIGTERM handler that will close returned context.
 // Not safe for concurrent execution.