few fixes

This commit is contained in:
probandula
2016-11-03 11:34:41 +01:00
parent 998afb7f9b
commit 94537c1fb8
3 changed files with 13 additions and 13 deletions

View File

@@ -15,7 +15,7 @@ var (
fontpath *string = flag.String("fontpath", "", "Font path to load fonts from") fontpath *string = flag.String("fontpath", "", "Font path to load fonts from")
colors *string = flag.String("colors", "", "Character colors separated by ';'\n\tPossible colors: black, red, green, yellow, blue, magenta, cyan, white, or any hexcode (f.e. '885DBA')") colors *string = flag.String("colors", "", "Character colors separated by ';'\n\tPossible colors: black, red, green, yellow, blue, magenta, cyan, white, or any hexcode (f.e. '885DBA')")
parser *string = flag.String("parser", "terminal", "Parser to use\tPossible parsers: terminal (default), html") parser *string = flag.String("parser", "terminal", "Parser to use\tPossible parsers: terminal (default), html")
file *string = flag.String("file", "", "File to write to") file *string = flag.String("file", "", "File to write to")
) )
func main() { func main() {

View File

@@ -24,15 +24,15 @@ var (
// TrueColor lookalikes for displaying AnsiColor f.e. with the HTML parser // TrueColor lookalikes for displaying AnsiColor f.e. with the HTML parser
// Colors based on http://clrs.cc/ // Colors based on http://clrs.cc/
// "TrueColorForAnsiColor" // "TrueColorForAnsiColor"
var tcfac map[AnsiColor]TrueColor = map[AnsiColor]TrueColor{ var tcfac map[*AnsiColor]TrueColor = map[*AnsiColor]TrueColor{
ColorBlack: {0, 0, 0}, &ColorBlack: {0, 0, 0},
ColorRed: {255, 65, 54}, &ColorRed: {255, 65, 54},
ColorGreen: {149, 189, 64}, &ColorGreen: {149, 189, 64},
ColorYellow: {255, 220, 0}, &ColorYellow: {255, 220, 0},
ColorBlue: {0, 116, 217}, &ColorBlue: {0, 116, 217},
ColorMagenta: {177, 13, 201}, &ColorMagenta: {177, 13, 201},
ColorCyan: {105, 206, 245}, &ColorCyan: {105, 206, 245},
ColorWhite: {255, 255, 255}, &ColorWhite: {255, 255, 255},
} }
// Color has a pre- and a suffix // Color has a pre- and a suffix
@@ -104,7 +104,7 @@ func (ac AnsiColor) getPrefix(p Parser) string {
case "html": case "html":
// Get the TrueColor for the AnsiColor // Get the TrueColor for the AnsiColor
tc := tcfac[ac] tc := tcfac[&ac]
return tc.getPrefix(p) return tc.getPrefix(p)
} }
@@ -121,7 +121,7 @@ func (ac AnsiColor) getSuffix(p Parser) string {
case "html": case "html":
// Get the TrueColor for the AnsiColor // Get the TrueColor for the AnsiColor
tc := tcfac[ac] tc := tcfac[&ac]
return tc.getSuffix(p) return tc.getSuffix(p)
} }

View File

@@ -31,4 +31,4 @@ func GetParser(key string) (*Parser, error) {
return nil, errors.New("Invalid parser key: " + key) return nil, errors.New("Invalid parser key: " + key)
} }
return &parser, nil return &parser, nil
} }