added color themes for terminal formatters

Author: jucardi

.gitignore

@@ -10,3 +10,7 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
+
+.idea/
+.vscode/
+

.idea/dictionaries/jcdiaz.xml

@@ -1,9 +1,16 @@
 package log
 
 import (
+	"io"
 	"time"
 )
 
+const (
+	FieldLevel     = "level"
+	FieldTimestamp = "timestamp"
+	FieldMessage   = "message"
+)
+
 // Entry represents a log entry.
 type Entry struct {
 	// Contains all the fields set by the user. TODO
@@ -19,6 +26,7 @@ type Entry struct {
 	Message string
 
 	metadata map[string]interface{}
+	writer   io.Writer
 }
 
 func (e *Entry) AddMetadata(key string, val interface{}) {
@@ -27,3 +35,21 @@ func (e *Entry) AddMetadata(key string, val interface{}) {
 	}
 	e.metadata[key] = val
 }
+
+func (e *Entry) getField(name string) interface{} {
+	switch name {
+	case FieldMessage:
+		return e.Message
+	case FieldLevel:
+		return e.Level
+	case FieldTimestamp:
+		return e.Timestamp
+	}
+	if e.Data == nil {
+		return nil
+	}
+	if ret, ok := e.Data[name]; ok {
+		return ret
+	}
+	return nil
+}

.idea/go-logger-lib.iml

@@ -2,8 +2,6 @@ package log
 
 import (
 	"io"
-	"os"
-	"strings"
 	"text/template"
 )
 
@@ -40,41 +38,3 @@ func (f *BaseFormatter) SetTemplate(tmpl string) error {
 	f.templateHandler = t
 	return nil
 }
-
-// BaseTerminalFormatter base structure to create formatters for a terminal
-type BaseTerminalFormatter struct {
-	BaseFormatter
-	// Set to true to bypass checking for a TTY before outputting colors.
-	ForceColors bool
-
-	// Force disabling colors.
-	DisableColors bool
-
-	// Override coloring based on CLICOLOR and CLICOLOR_FORCE. - https://bixense.com/clicolors/
-	EnvironmentOverrideColors bool
-	supportsColor             *bool
-	colorScheme               LevelColorScheme
-}
-
-func (f *BaseTerminalFormatter) isColored() bool {
-	if f.supportsColor == nil {
-		supportsColor := f.ForceColors
-
-		if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
-			supportsColor = true
-		} else if ok && force == "0" {
-			supportsColor = false
-		} else if os.Getenv("CLICOLOR") == "0" {
-			supportsColor = false
-		} else if strings.Contains(os.Getenv("TERM"), "color") {
-			supportsColor = true
-		}
-		f.supportsColor = &supportsColor
-	}
-
-	return *f.supportsColor && !f.DisableColors
-}
-
-func (f *BaseTerminalFormatter) SetColorScheme(scheme LevelColorScheme) {
-	f.colorScheme = scheme
-}

.idea/misc.xml

@@ -23,12 +23,14 @@ func getDefaultHelpers() template.FuncMap {
 		"level":     coloredLevelFn,
 		"timestamp": timestampFn,
 		"colorCode": colorCodeFn,
-		"color":     colorFn,
+		"colorName": colorNameFn,
+		"colored":   colorFieldFn,
+		"scheme":    colorSchemeFn,
 	}
 }
 
-func stringFn(arg interface{}) string {
-	return fmt.Sprintf("%+v", arg)
+func stringFn(arg ...interface{}) string {
+	return fmt.Sprint(arg...)
 }
 
 func uppercaseFn(arg string) string {
@@ -44,30 +46,51 @@ func formatFn(format string, args ...interface{}) string {
 }
 
 func coloredLevelFn(entry Entry) string {
+	return colorFieldFn(FieldLevel, entry, " %s ")
+}
+
+func timestampFn(format string, entry Entry, disableColor ...bool) string {
+	timeStr := iso8601.TimeToString(entry.Timestamp, format)
+	if len(disableColor) > 0 && disableColor[0] {
+		return timeStr
+	}
+	return colorSchemeFn(FieldTimestamp, timeStr, entry)
+}
+
+func colorFieldFn(field string, entry Entry, format ...string) string {
+	if len(format) > 0 {
+		return colorSchemeFn(field, fmt.Sprintf(format[0], entry.getField(field)), entry)
+	}
+	return colorSchemeFn(field, fmt.Sprint(entry.getField(field)), entry)
+}
+
+func colorSchemeFn(schemeName, value string, entry Entry) string {
 	if v, ok := entry.metadata[metadataColorEnabled]; ok && !v.(bool) {
-		return entry.Level.String()
+		return value
 	}
-	if _, ok := entry.metadata[metadataColorScheme]; !ok {
-		return entry.Level.String()
+	if v, ok := entry.metadata[metadataColorScheme]; !ok || v == nil {
+		return value
 	}
 
-	scheme := entry.metadata[metadataColorScheme].(LevelColorScheme)
-	colors := scheme[entry.Level]
+	scheme := entry.metadata[metadataColorScheme].(TerminalColorScheme)
+	var colors []fmtc.Color
 
-	return fmtc.New().Print(fmt.Sprintf(" %s ", strings.ToUpper(entry.Level.String())), colors...).String()
-}
+	if v, ok := scheme[schemeName]; !ok || v == nil {
+		return value
+	} else {
+		colors = scheme[schemeName][entry.Level]
+	}
 
-func timestampFn(entry Entry, format string) string {
-	return iso8601.TimeToString(entry.Timestamp, format)
+	return fmtc.WithColors(colors...).Sprint(value)
 }
 
 func colorCodeFn(arg interface{}, colors ...fmtc.Color) string {
-	return fmtc.New().Print(arg, colors...).String()
+	return fmtc.WithColors(colors...).Sprint(arg)
 }
 
-func colorFn(arg interface{}, colors ...string) string {
-	return fmtc.New().Print(arg, streams.From(colors).Map(func(i interface{}) interface{} {
+func colorNameFn(arg interface{}, colors ...string) string {
+	return fmtc.WithColors(streams.From(colors).Map(func(i interface{}) interface{} {
 		ret, _ := fmtc.Parse(i.(string))
 		return ret
-	}).ToArray().([]fmtc.Color)...).String()
+	}).ToArray().([]fmtc.Color)...).Sprint(arg)
 }