fixed #5, colorization now always works as expected

This commit is contained in:
2022-10-25 14:24:05 +02:00
parent 001021dac8
commit 417faf3ff2
6 changed files with 36 additions and 60 deletions

View File

@@ -152,36 +152,13 @@ func trimRow(row []string) []string {
return fixedrow
}
func maskParens(in string) string {
/*
we need to escape brackets, because the color module treats
text enclosed within < and > as a color tag and therefore the
color tags don't work anymore.
See https://github.com/gookit/color/issues/52 for details.
*/
return strings.ReplaceAll(strings.ReplaceAll(in, ">", "⦘"), "<", "⦗")
}
func unmaskParens(in string) string {
// does the reverse from above during actual output
return strings.ReplaceAll(strings.ReplaceAll(in, "⦘", ">"), "⦗", "<")
}
func colorizeData(c cfg.Config, output string) string {
if len(c.Pattern) > 0 && !c.NoColor && color.IsConsole(os.Stdout) {
r := regexp.MustCompile("(" + c.Pattern + ")")
return r.ReplaceAllString(maskParens(output), "<bg="+c.MatchBG+";fg="+c.MatchFG+">$1</>")
return r.ReplaceAllStringFunc(output, func(in string) string {
return c.ColorStyle.Sprint(in)
})
} else {
return output
}
}
func isTerminal(f *os.File) bool {
o, _ := f.Stat()
if (o.Mode() & os.ModeCharDevice) == os.ModeCharDevice {
return true
} else {
return false
}
}