Merge pull request #17 from bcdevtools/imp/improve-command-base64

imp: support show/from buffer for base64 cmd

Author: 0xbcdev

README.md

@@ -183,7 +183,7 @@ devd convert case [input] --upper
 
 ***Support pipe***
 ```bash
-devd convert base64 [input]
+devd convert base64 [input] [--show-buffer] [--from-buffer]
 # devd c base64 123
 # echo 123 | devd c base64
 devd convert base64 [base64] --decode

cmd/convert/base64.go

@@ -2,6 +2,7 @@ package convert
 
 import (
 	"encoding/base64"
+	"encoding/hex"
 	"fmt"
 	"strings"
 
@@ -15,6 +16,9 @@ const (
 
 // GetBase64CaseCmd creates a helper command that encode/decode base64
 func GetBase64CaseCmd() *cobra.Command {
+	const flagShowBuffer = "show-buffer"
+	const flagFromBuffer = "from-buffer"
+
 	cmd := &cobra.Command{
 		Use:   "base64 [input]",
 		Short: fmt.Sprintf("Encode base64, use --%s to decode", flagDecode),
@@ -24,21 +28,40 @@ Support pipe.`, flagDecode),
 			args, err := utils.ProvidedArgsOrFromPipe(args)
 			utils.ExitOnErr(err, "failed to get args from pipe")
 
-			if cmd.Flag(flagDecode).Changed {
+			decode := cmd.Flag(flagDecode).Changed
+			showBuffer := cmd.Flag(flagShowBuffer).Changed
+			fromBuffer := cmd.Flag(flagFromBuffer).Changed
+			if decode {
+				if fromBuffer {
+					panic(fmt.Sprintf("flag --%s is not supported on decoding mode", flagFromBuffer))
+				}
 				utils.RequireExactArgsCount(args, 1, cmd)
 				utils.PrintlnStdErr("INF: decoding base64")
 				data, err := base64.StdEncoding.DecodeString(args[0])
 				utils.ExitOnErr(err, "failed to decode base64")
+				if showBuffer {
+					utils.PrintfStdErr("(buffer: %s)\n", hex.EncodeToString(data))
+				}
 				fmt.Println(string(data))
 			} else {
 				utils.RequireArgs(args, cmd)
 				utils.PrintfStdErr("INF: encoding base64 (use --%s to decode)\n", flagDecode)
-				fmt.Println(base64.StdEncoding.EncodeToString([]byte(strings.Join(args, " "))))
+				data := []byte(strings.Join(args, " "))
+				if fromBuffer {
+					data, err = hex.DecodeString(string(data))
+					utils.ExitOnErr(err, "failed to decode hex buffer")
+				}
+				if showBuffer {
+					utils.PrintfStdErr("(buffer: %s)\n", hex.EncodeToString(data))
+				}
+				fmt.Println(base64.StdEncoding.EncodeToString(data))
 			}
 		},
 	}
 
 	cmd.Flags().BoolP(flagDecode, "d", false, "decode base64 instead of encode")
+	cmd.Flags().Bool(flagShowBuffer, false, "show buffer in hex format")
+	cmd.Flags().Bool(flagFromBuffer, false, "input is hex buffer, effective ONLY on encoding")
 
 	return cmd
 }