trying alias of quiet for permissive in jsoncols, jsonrange

Author: rsdoiel

cmds/jsoncols/jsoncols.go

@@ -90,6 +90,15 @@ Would yield
 	permissive     bool
 )
 
+func handleError(err error, exitCode int) {
+	if permissive == false {
+		fmt.Fprintf(os.Stderr, "%s\n", err)
+	}
+	if exitCode >= 0 {
+		os.Exit(exitCode)
+	}
+}
+
 func init() {
 	// Basic Options
 	flag.BoolVar(&showHelp, "h", false, "display help")
@@ -106,6 +115,7 @@ func init() {
 	flag.BoolVar(&runInteractive, "repl", false, "run interactively")
 	flag.StringVar(&delimiter, "d", delimiter, "set the delimiter for multi-field output")
 	flag.BoolVar(&permissive, "permissive", false, "suppress error messages")
+	flag.BoolVar(&permissive, "quiet", false, "suppress error messages")
 }
 
 func main() {
@@ -139,15 +149,13 @@ func main() {
 
 	in, err := cli.Open(inputFName, os.Stdin)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 	defer cli.CloseFile(inputFName, in)
 
 	out, err := cli.Create(outputFName, os.Stdout)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 	defer cli.CloseFile(outputFName, out)
 
@@ -166,14 +174,12 @@ func main() {
 	// READ in the JSON document
 	buf, err := ioutil.ReadAll(in)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 	// JSON Decode our document
 	data, err := dotpath.JSONDecode(buf)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 
 	// For each dotpath expression return a result
@@ -194,14 +200,12 @@ func main() {
 				default:
 					src, err := json.Marshal(result)
 					if err != nil {
-						fmt.Fprintf(os.Stderr, "%s\n", err)
-						os.Exit(1)
+						handleError(err, 1)
 					}
 					fmt.Fprintf(out, "%s", src)
 				}
-			} else if permissive == false {
-				fmt.Fprintf(os.Stderr, "%s\n", err)
-				os.Exit(1)
+			} else {
+				handleError(err, 1)
 			}
 		}
 	}

cmds/jsonrange/jsonrange.go

@@ -226,6 +226,15 @@ func srcVals(data interface{}, limit int) ([]string, error) {
 	return nil, fmt.Errorf("%T does not support for range", data)
 }
 
+func handleError(err error, exitCode int) {
+	if permissive == false {
+		fmt.Fprintf(os.Stderr, "%s\n", err)
+	}
+	if exitCode >= 0 {
+		os.Exit(exitCode)
+	}
+}
+
 func init() {
 	// Standard Options
 	flag.BoolVar(&showHelp, "h", false, "display help")
@@ -244,6 +253,7 @@ func init() {
 	flag.StringVar(&delimiter, "delimiter", "", "set delimiter for range output")
 	flag.IntVar(&limit, "limit", 0, "limit the number of items output")
 	flag.BoolVar(&permissive, "permissive", false, "suppress errors messages")
+	flag.BoolVar(&permissive, "quiet", false, "suppress errors messages")
 }
 
 func main() {
@@ -274,15 +284,13 @@ func main() {
 
 	in, err := cli.Open(inputFName, os.Stdin)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 	defer cli.CloseFile(inputFName, in)
 
 	out, err := cli.Create(outputFName, os.Stdout)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 	defer cli.CloseFile(outputFName, out)
 
@@ -294,16 +302,11 @@ func main() {
 	// Read in the complete JSON data structure
 	buf, err := ioutil.ReadAll(in)
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err)
-		os.Exit(1)
+		handleError(err, 1)
 	}
 
-	if len(buf) == 0 && permissive == false {
-		fmt.Fprintln(os.Stderr, cfg.Usage())
-		os.Exit(1)
-	}
-	if len(buf) == 0 && permissive == true {
-		os.Exit(0)
+	if len(buf) == 0 {
+		handleError(fmt.Errorf("%s", cfg.Usage()), 1)
 	}
 
 	var (
@@ -323,34 +326,31 @@ func main() {
 			data, err = dotpath.EvalJSON(p, buf)
 		}
 		if err != nil {
-			fmt.Fprintf(os.Stderr, "%s\n", err)
-			os.Exit(1)
+			handleError(err, 1)
 		}
 		switch {
 		case showLength:
 			if l, err := getLength(data); err == nil {
 				fmt.Fprintf(out, "%d", l)
 			} else {
-				fmt.Fprintf(os.Stderr, "%s\n", err)
+				handleError(err, -1)
 			}
 		case showLast:
 			if l, err := getLength(data); err == nil {
 				fmt.Fprintf(out, "%d", l-1)
 			} else {
-				fmt.Fprintf(os.Stderr, "%s\n", err)
+				handleError(err, -1)
 			}
 		case showValues:
 			elems, err := srcVals(data, limit-1)
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "%s\n", err)
-				os.Exit(1)
+				handleError(err, 1)
 			}
 			fmt.Fprintln(out, strings.Join(elems, delimiter))
 		default:
 			elems, err := srcKeys(data, limit-1)
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "%s\n", err)
-				os.Exit(1)
+				handleError(err, 1)
 			}
 			fmt.Fprintln(out, strings.Join(elems, delimiter))
 		}