chore: コマンドライン引数の設定方法を変更 (#14)

jiro4989 · Nov 12, 2020 · 54bf411 · 54bf411
1 parent 0939ae7
commit 54bf411
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 93 deletions.
diff --git a/cmd_center.go b/cmd_center.go
@@ -5,46 +5,35 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	centerPad       string
+	centerLength    int
+	centerWrite     bool
+	centerLineFeed  string
+	centerTermWidth bool
+)
+
 func init() {
 	RootCommand.AddCommand(centerCommand)
-	centerCommand.Flags().StringP("pad", "p", " ", "Padding string")
-	centerCommand.Flags().IntP("length", "n", -1, "Padding length")
-	centerCommand.Flags().BoolP("write", "w", false, "Overwrite file")
-	centerCommand.Flags().StringP("linefeed", "l", "\n", "Line feed")
-	centerCommand.Flags().BoolP("termwidth", "t", false, "Terminal width")
+	centerCommand.Flags().StringVarP(&centerPad, "pad", "p", " ", "Padding string")
+	centerCommand.Flags().IntVarP(&centerLength, "length", "n", -1, "Padding length")
+	centerCommand.Flags().BoolVarP(&centerWrite, "write", "w", false, "Overwrite file")
+	centerCommand.Flags().StringVarP(&centerLineFeed, "linefeed", "l", "\n", "Line feed")
+	centerCommand.Flags().BoolVarP(&centerTermWidth, "termwidth", "t", false, "Terminal width")
 }
 
 var centerCommand = &cobra.Command{
 	Use:     "center",
 	Aliases: []string{"c"},
 	Short:   "Align center command from file or stdin",
 	Run: func(cmd *cobra.Command, args []string) {
-		f := cmd.Flags()
-
-		p, err := f.GetString("pad")
-		if err != nil {
-			panic(err)
-		}
-
-		n, err := f.GetInt("length")
-		if err != nil {
-			panic(err)
-		}
-
-		writeFile, err := f.GetBool("write")
-		if err != nil {
-			panic(err)
-		}
-
-		lf, err := f.GetString("linefeed")
-		if err != nil {
-			panic(err)
-		}
-
-		useTermWidth, err := f.GetBool("termwidth")
-		if err != nil {
-			panic(err)
-		}
+		var (
+			p            = centerPad
+			n            = centerLength
+			writeFile    = centerWrite
+			lf           = centerLineFeed
+			useTermWidth = centerTermWidth
+		)
 
 		if useTermWidth {
 			if err := termbox.Init(); err != nil {

diff --git a/cmd_left.go b/cmd_left.go
@@ -5,46 +5,35 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	leftPad       string
+	leftLength    int
+	leftWrite     bool
+	leftLineFeed  string
+	leftTermWidth bool
+)
+
 func init() {
 	RootCommand.AddCommand(leftCommand)
-	leftCommand.Flags().StringP("pad", "p", " ", "Padding string")
-	leftCommand.Flags().IntP("length", "n", -1, "Padding length")
-	leftCommand.Flags().BoolP("write", "w", false, "Overwrite file")
-	leftCommand.Flags().StringP("linefeed", "l", "\n", "Line feed")
-	leftCommand.Flags().BoolP("termwidth", "t", false, "Terminal width")
+	leftCommand.Flags().StringVarP(&leftPad, "pad", "p", " ", "Padding string")
+	leftCommand.Flags().IntVarP(&leftLength, "length", "n", -1, "Padding length")
+	leftCommand.Flags().BoolVarP(&leftWrite, "write", "w", false, "Overwrite file")
+	leftCommand.Flags().StringVarP(&leftLineFeed, "linefeed", "l", "\n", "Line feed")
+	leftCommand.Flags().BoolVarP(&leftTermWidth, "termwidth", "t", false, "Terminal width")
 }
 
 var leftCommand = &cobra.Command{
 	Use:     "left",
 	Aliases: []string{"l"},
 	Short:   "Align left command from file or stdin",
 	Run: func(cmd *cobra.Command, args []string) {
-		f := cmd.Flags()
-
-		p, err := f.GetString("pad")
-		if err != nil {
-			panic(err)
-		}
-
-		n, err := f.GetInt("length")
-		if err != nil {
-			panic(err)
-		}
-
-		writeFile, err := f.GetBool("write")
-		if err != nil {
-			panic(err)
-		}
-
-		lf, err := f.GetString("linefeed")
-		if err != nil {
-			panic(err)
-		}
-
-		useTermWidth, err := f.GetBool("termwidth")
-		if err != nil {
-			panic(err)
-		}
+		var (
+			p            = leftPad
+			n            = leftLength
+			writeFile    = leftWrite
+			lf           = leftLineFeed
+			useTermWidth = leftTermWidth
+		)
 
 		if useTermWidth {
 			if err := termbox.Init(); err != nil {

diff --git a/cmd_right.go b/cmd_right.go
@@ -5,46 +5,35 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var (
+	rightPad       string
+	rightLength    int
+	rightWrite     bool
+	rightLineFeed  string
+	rightTermWidth bool
+)
+
 func init() {
 	RootCommand.AddCommand(rightCommand)
-	rightCommand.Flags().StringP("pad", "p", " ", "Padding string")
-	rightCommand.Flags().IntP("length", "n", -1, "Padding length")
-	rightCommand.Flags().BoolP("write", "w", false, "Overwrite file")
-	rightCommand.Flags().StringP("linefeed", "l", "\n", "Line feed")
-	rightCommand.Flags().BoolP("termwidth", "t", false, "Terminal width")
+	rightCommand.Flags().StringVarP(&rightPad, "pad", "p", " ", "Padding string")
+	rightCommand.Flags().IntVarP(&rightLength, "length", "n", -1, "Padding length")
+	rightCommand.Flags().BoolVarP(&rightWrite, "write", "w", false, "Overwrite file")
+	rightCommand.Flags().StringVarP(&rightLineFeed, "linefeed", "l", "\n", "Line feed")
+	rightCommand.Flags().BoolVarP(&rightTermWidth, "termwidth", "t", false, "Terminal width")
 }
 
 var rightCommand = &cobra.Command{
 	Use:     "right",
 	Aliases: []string{"r"},
 	Short:   "Align right command from file or stdin",
 	Run: func(cmd *cobra.Command, args []string) {
-		f := cmd.Flags()
-
-		p, err := f.GetString("pad")
-		if err != nil {
-			panic(err)
-		}
-
-		n, err := f.GetInt("length")
-		if err != nil {
-			panic(err)
-		}
-
-		writeFile, err := f.GetBool("write")
-		if err != nil {
-			panic(err)
-		}
-
-		lf, err := f.GetString("linefeed")
-		if err != nil {
-			panic(err)
-		}
-
-		useTermWidth, err := f.GetBool("termwidth")
-		if err != nil {
-			panic(err)
-		}
+		var (
+			p            = rightPad
+			n            = rightLength
+			writeFile    = rightWrite
+			lf           = rightLineFeed
+			useTermWidth = rightTermWidth
+		)
 
 		if useTermWidth {
 			if err := termbox.Init(); err != nil {