Added theming option

Author: rossdeane

main.go

@@ -13,6 +13,7 @@ import (
 
 var (
 	term = termenv.ColorProfile()
+	theme Theme
 
 	all         = flag.Bool("all", false, "include pseudo, duplicate, inaccessible file systems")
 	hideLocal   = flag.Bool("hide-local", false, "hide local devices")
@@ -23,12 +24,13 @@ var (
 	hideBinds   = flag.Bool("hide-binds", true, "hide bind mounts")
 	hideFs      = flag.String("hide-fs", "", "hide specific filesystems, separated with commas")
 
-	output = flag.String("output", "", "output fields: "+strings.Join(columnIDs(), ", "))
-	sortBy = flag.String("sort", "mountpoint", "sort output by: "+strings.Join(columnIDs(), ", "))
-	width  = flag.Uint("width", 0, "max output width")
+	output 		= flag.String("output", "", "output fields: "+strings.Join(columnIDs(), ", "))
+	sortBy 		= flag.String("sort", "mountpoint", "sort output by: "+strings.Join(columnIDs(), ", "))
+	width  		= flag.Uint("width", 0, "max output width")
+	themeOpt  	= flag.String("theme", "dark", "color themes: dark, light") 
 
-	inodes     = flag.Bool("inodes", false, "list inode information instead of block usage")
-	jsonOutput = flag.Bool("json", false, "output all devices in JSON format")
+	inodes     	= flag.Bool("inodes", false, "list inode information instead of block usage")
+	jsonOutput 	= flag.Bool("json", false, "output all devices in JSON format")
 )
 
 // renderTables renders all tables.
@@ -144,6 +146,7 @@ func parseHideFs(hideFs string) map[string]struct{} {
 func main() {
 	flag.Parse()
 
+	theme = loadThemes(*themeOpt)
 	// validate flags
 	columns, err := parseColumns(*output)
 	if err != nil {

table.go

@@ -33,14 +33,6 @@ var (
 		{ID: "type", Name: "Type", SortIndex: 10},
 		{ID: "filesystem", Name: "Filesystem", SortIndex: 11},
 	}
-
-	colorRed     = term.Color("#E88388")
-	colorYellow  = term.Color("#DBAB79")
-	colorGreen   = term.Color("#A8CC8C")
-	colorBlue    = term.Color("#71BEF2")
-	colorGray    = term.Color("#B9BFCA")
-	colorMagenta = term.Color("#D290E4")
-	colorCyan    = term.Color("#66C2CD")
 )
 
 // printTable prints an individual table of mounts.
@@ -103,7 +95,7 @@ func printTable(title string, m []Mount, sortBy int, cols []int) {
 		}
 
 		tab.AppendRow([]interface{}{
-			termenv.String(v.Mountpoint).Foreground(colorBlue), // mounted on
+			termenv.String(v.Mountpoint).Foreground(theme.colorBlue), // mounted on
 			v.Total,      // size
 			v.Used,       // used
 			v.Free,       // avail
@@ -112,8 +104,8 @@ func printTable(title string, m []Mount, sortBy int, cols []int) {
 			v.InodesUsed, // inodes used
 			v.InodesFree, // inodes avail
 			inodeUsage,   // inodes use%
-			termenv.String(v.Fstype).Foreground(colorGray), // type
-			termenv.String(v.Device).Foreground(colorGray), // filesystem
+			termenv.String(v.Fstype).Foreground(theme.colorGray), // type
+			termenv.String(v.Device).Foreground(theme.colorGray), // filesystem
 			v.Total,      // size sorting helper
 			v.Used,       // used sorting helper
 			v.Free,       // avail sorting helper
@@ -157,11 +149,11 @@ func spaceTransformer(val interface{}) string {
 	var s = termenv.String(sizeToString(free))
 	switch {
 	case free < 1<<30:
-		s = s.Foreground(colorRed)
+		s = s.Foreground(theme.colorRed)
 	case free < 10*1<<30:
-		s = s.Foreground(colorYellow)
+		s = s.Foreground(theme.colorYellow)
 	default:
-		s = s.Foreground(colorGreen)
+		s = s.Foreground(theme.colorGreen)
 	}
 
 	return s.String()
@@ -187,11 +179,11 @@ func barTransformer(val interface{}) string {
 	// apply color to progress-bar
 	switch {
 	case usage >= 0.9:
-		s = s.Foreground(colorRed)
+		s = s.Foreground(theme.colorRed)
 	case usage >= 0.5:
-		s = s.Foreground(colorYellow)
+		s = s.Foreground(theme.colorYellow)
 	default:
-		s = s.Foreground(colorGreen)
+		s = s.Foreground(theme.colorGreen)
 	}
 
 	return s.String()

themes.go

@@ -0,0 +1,45 @@
+package main
+
+import (
+	"github.com/muesli/termenv"
+)
+
+type Theme struct {
+	colorRed     termenv.Color
+	colorYellow  termenv.Color
+	colorGreen   termenv.Color
+	colorBlue    termenv.Color
+	colorGray    termenv.Color
+	colorMagenta termenv.Color
+	colorCyan    termenv.Color
+}
+
+func loadThemes(theme string) Theme {
+	themes := make(map[string]Theme)
+
+	themes["dark"] = Theme{
+		colorRed:     term.Color("#E88388"),
+		colorYellow:  term.Color("#DBAB79"),
+		colorGreen:   term.Color("#A8CC8C"),
+		colorBlue:    term.Color("#71BEF2"),
+		colorGray:    term.Color("#B9BFCA"),
+		colorMagenta: term.Color("#D290E4"),
+		colorCyan:    term.Color("#66C2CD"),
+	}
+
+	themes["light"] = Theme{
+		colorRed:     term.Color("#D70000"),
+		colorYellow:  term.Color("#FFAF00"),
+		colorGreen:   term.Color("#005F00"),
+		colorBlue:    term.Color("#000087"),
+		colorGray:    term.Color("#303030"),
+		colorMagenta: term.Color("#AF00FF"),
+		colorCyan:    term.Color("#0087FF"),
+	}
+
+	if _, ok := themes[theme]; !ok {
+		return themes["dark"]
+	}
+
+	return themes[theme]
+}