From 32e5d85d790e70dd0bf504722c69d75c7aacd8d6 Mon Sep 17 00:00:00 2001
From: Eason <291028775@qq.com>
Date: Mon, 21 Feb 2022 15:36:59 +0800
Subject: [PATCH 1/3] Update har2case.go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、Fix `har2caseCmd.Flags().BoolVarP(&genYAMLFlag, "to-yaml", "y", false, "convert to YAML format")` -> JSON -> YAML
2、Change json flag detault to `true`
3、Fix Special circumstances
---
 cli/hrp/cmd/har2case.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cli/hrp/cmd/har2case.go b/cli/hrp/cmd/har2case.go
index c59ac313..b5a6ed01 100644
--- a/cli/hrp/cmd/har2case.go
+++ b/cli/hrp/cmd/har2case.go
@@ -19,6 +19,11 @@ var har2caseCmd = &cobra.Command{
 	RunE: func(cmd *cobra.Command, args []string) error {
 		var outputFiles []string
 		for _, arg := range args {
+			// must choose one
+                        if !genYAMLFlag && !genJSONFlag {
+			        return errors.New("please select to-json flag or to-yaml flag.")
+			}
+			
 			var outputPath string
 			var err error
 
@@ -28,7 +33,7 @@ var har2caseCmd = &cobra.Command{
 			if outputDir != "" {
 				har.SetOutputDir(outputDir)
 			}
-
+			
 			// generate json/yaml files
 			if genYAMLFlag {
 				outputPath, err = har.GenYAML()
@@ -53,7 +58,7 @@ var (
 
 func init() {
 	rootCmd.AddCommand(har2caseCmd)
-	har2caseCmd.Flags().BoolVarP(&genJSONFlag, "to-json", "j", false, "convert to JSON format (default)")
-	har2caseCmd.Flags().BoolVarP(&genYAMLFlag, "to-yaml", "y", false, "convert to JSON format")
+	har2caseCmd.Flags().BoolVarP(&genJSONFlag, "to-json", "j", true, "convert to JSON format (default)")
+	har2caseCmd.Flags().BoolVarP(&genYAMLFlag, "to-yaml", "y", false, "convert to YAML format")
 	har2caseCmd.Flags().StringVarP(&outputDir, "output-dir", "d", "", "specify output directory, default to the same dir with har file")
 }

From 5e0b114add93903586a7b77446f2e5e47bead68a Mon Sep 17 00:00:00 2001
From: Eason <291028775@qq.com>
Date: Mon, 21 Feb 2022 16:09:13 +0800
Subject: [PATCH 2/3] Update har2case.go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、根据建议调整多余indent
2、修改flag描述
---
 cli/hrp/cmd/har2case.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cli/hrp/cmd/har2case.go b/cli/hrp/cmd/har2case.go
index b5a6ed01..3da54ff1 100644
--- a/cli/hrp/cmd/har2case.go
+++ b/cli/hrp/cmd/har2case.go
@@ -23,7 +23,6 @@ var har2caseCmd = &cobra.Command{
                         if !genYAMLFlag && !genJSONFlag {
 			        return errors.New("please select to-json flag or to-yaml flag.")
 			}
-			
 			var outputPath string
 			var err error
 
@@ -33,7 +32,6 @@ var har2caseCmd = &cobra.Command{
 			if outputDir != "" {
 				har.SetOutputDir(outputDir)
 			}
-			
 			// generate json/yaml files
 			if genYAMLFlag {
 				outputPath, err = har.GenYAML()
@@ -58,7 +56,7 @@ var (
 
 func init() {
 	rootCmd.AddCommand(har2caseCmd)
-	har2caseCmd.Flags().BoolVarP(&genJSONFlag, "to-json", "j", true, "convert to JSON format (default)")
+	har2caseCmd.Flags().BoolVarP(&genJSONFlag, "to-json", "j", true, "convert to JSON format")
 	har2caseCmd.Flags().BoolVarP(&genYAMLFlag, "to-yaml", "y", false, "convert to YAML format")
 	har2caseCmd.Flags().StringVarP(&outputDir, "output-dir", "d", "", "specify output directory, default to the same dir with har file")
 }

From e729c8e4b3c28b2be5d38ed9f3176dbf06499526 Mon Sep 17 00:00:00 2001
From: Eason <291028775@qq.com>
Date: Mon, 21 Feb 2022 16:54:55 +0800
Subject: [PATCH 3/3] Update har2case.go

add "error" library
---
 cli/hrp/cmd/har2case.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cli/hrp/cmd/har2case.go b/cli/hrp/cmd/har2case.go
index 3da54ff1..30f8f618 100644
--- a/cli/hrp/cmd/har2case.go
+++ b/cli/hrp/cmd/har2case.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 
@@ -20,8 +21,8 @@ var har2caseCmd = &cobra.Command{
 		var outputFiles []string
 		for _, arg := range args {
 			// must choose one
-                        if !genYAMLFlag && !genJSONFlag {
-			        return errors.New("please select to-json flag or to-yaml flag.")
+			if !genYAMLFlag && !genJSONFlag {
+				return errors.New("please select to-json flag or to-yaml flag.")
 			}
 			var outputPath string
 			var err error