fix highlight failing in windows

Author: shenwei356

csvtk/cmd/grep.go

@@ -31,6 +31,7 @@ import (
 	"github.com/shenwei356/breader"
 	"github.com/spf13/cobra"
 	"github.com/fatih/color"
+	"github.com/mattn/go-colorable"
 )
 
 // grepCmd represents the seq command
@@ -81,7 +82,6 @@ var grepCmd = &cobra.Command{
 		ignoreCase := getFlagBool(cmd, "ignore-case")
 		useRegexp := getFlagBool(cmd, "use-regexp")
 		invert := getFlagBool(cmd, "invert")
-		noHighlight := getFlagBool(cmd, "no-highlight")
 
 		patternsMap := make(map[string]*regexp.Regexp)
 		for _, pattern := range patterns {
@@ -130,12 +130,20 @@ var grepCmd = &cobra.Command{
 
 		// fuzzyFields := getFlagBool(cmd, "fuzzy-fields")
 		fuzzyFields := false
+		noHighlight := false
+		var writer *csv.Writer
+		if config.OutFile == "-" {
+			outfh := colorable.NewColorableStdout()
+			writer = csv.NewWriter(outfh)
+		}else{
+			noHighlight = true
+			outfh, err := xopen.Wopen(config.OutFile)
+			checkError(err)
+			defer outfh.Close()
+			writer = csv.NewWriter(outfh)
+		}
 
-		outfh, err := xopen.Wopen(config.OutFile)
-		checkError(err)
-		defer outfh.Close()
 
-		writer := csv.NewWriter(outfh)
 		if config.OutTabs || config.Tabs {
 			writer.Comma = '\t'
 		} else {
@@ -292,7 +300,7 @@ var grepCmd = &cobra.Command{
 	},
 }
 
-var redText = color.New(color.FgRed).SprintFunc()
+var redText = color.New(color.FgHiRed).SprintFunc()
 func init() {
 	RootCmd.AddCommand(grepCmd)
 	grepCmd.Flags().StringP("fields", "f", "1", `key field, column name or index`)
@@ -301,7 +309,4 @@ func init() {
 	grepCmd.Flags().BoolP("ignore-case", "i", false, `ignore case`)
 	grepCmd.Flags().BoolP("use-regexp", "r", false, `patterns are regular expression`)
 	grepCmd.Flags().BoolP("invert", "v", false, `invert match`)
-	grepCmd.Flags().BoolP("no-highlight", "n", false, `no highlight for matched data. use this in Windows if highlight does not work.`)
-
-	//grepCmd.Flags().BoolP("fuzzy-fields", "F", false, `using fuzzy fileds, e.g. *name or id123*`)
 }

csvtk/cmd/root.go

@@ -34,7 +34,7 @@ var RootCmd = &cobra.Command{
 	Short: "Another cross-platform, efficient and practical CSV/TSV toolkit",
 	Long: `Another cross-platform, efficient and practical CSV/TSV toolkit
 
-Version: 0.2.6
+Version: 0.2.7
 
 Author: Wei Shen <[email protected]>
 

doc/docs/download.md

@@ -6,9 +6,8 @@
 
 ## Current Version
 
-- [csvtk v0.2.6](https://github.com/shenwei356/csvtk/releases/tag/v0.2.6)
-    - fix one error message of `grep`
-    - highlight matched fields in result of `grep`
+- [csvtk v0.2.7](https://github.com/shenwei356/csvtk/releases/tag/v0.2.7)
+    - fix highlight failing in windows
 
 ## Installation
 
@@ -32,6 +31,9 @@ You can also add the directory of the executable file to environment variable
 
 ## Previous Versions
 
+- [csvtk v0.2.6](https://github.com/shenwei356/csvtk/releases/tag/v0.2.6)
+    - fix one error message of `grep`
+    - highlight matched fields in result of `grep`
 - [csvtk v0.2.5](https://github.com/shenwei356/csvtk/releases/tag/v0.2.5)
     - fix bug of `stat` that failed to considerate files with header row
     - add subcommand `stat2` - summary of selected number fields

doc/docs/usage.md

@@ -18,7 +18,7 @@ Usage
 ```
 Another cross-platform, efficient and practical CSV/TSV toolkit
 
-Version: 0.2.6
+Version: 0.2.7
 
 Author: Wei Shen <[email protected]>
 
@@ -253,7 +253,6 @@ Flags:
   -f, --fields string         key field, column name or index (default "1")
   -i, --ignore-case           ignore case
   -v, --invert                invert match
-  -n, --no-highlight          no highlight for matched data. use this in Windows if highlight does not work.
   -p, --pattern value         query pattern (multiple values supported) (default [])
   -P, --pattern-file string   pattern files (could also be CSV format)
   -r, --use-regexp            patterns are regular expression

doc/site

@@ -1 +1 @@
-Subproject commit 1c31d9c6d909d6242370dd8a1a83913594e04047
+Subproject commit 013d5bb16d63502f35761b1e8d865a79ed04715c