Merge branch 'betterbarcolor' of github.com:Seanstoppable/wtf into Seanstoppable-betterbarcolor

modules/bargraph/widget.go

@@ -50,8 +50,9 @@ func MakeGraph(widget *Widget) {
 		barTime = barTime.Add(time.Duration(time.Minute))
 
 		bar := view.Bar{
-			Label:   barTime.Format("15:04"),
-			Percent: rand.Intn(100-5) + 5,
+			Label:      barTime.Format("15:04"),
+			Percent:    rand.Intn(100-5) + 5,
+			LabelColor: "red",
 		}
 
 		stats[i] = bar

modules/resourceusage/widget.go

@@ -58,6 +58,7 @@ func MakeGraph(widget *Widget) {
 			Label:      fmt.Sprint(i),
 			Percent:    int(stat),
 			ValueLabel: fmt.Sprintf("%d%%", int(stat)),
+			LabelColor: "red",
 		}
 
 		stats[i] = bar
@@ -81,6 +82,7 @@ func MakeGraph(widget *Widget) {
 		Label:      "Mem",
 		Percent:    int(memInfo.UsedPercent),
 		ValueLabel: fmt.Sprintf("%s/%s", usedMemLabel, totalMemLabel),
+		LabelColor: "green",
 	}
 
 	swapIndex := len(cpuStats) + 1
@@ -101,6 +103,7 @@ func MakeGraph(widget *Widget) {
 		Label:      "Swp",
 		Percent:    int(swapPercent * 100),
 		ValueLabel: fmt.Sprintf("%s/%s", usedSwapLabel, totalSwapLabel),
+		LabelColor: "yellow",
 	}
 
 	widget.BarGraph.BuildBars(stats[:])

view/bargraph.go

@@ -24,6 +24,7 @@ type Bar struct {
 	Label      string
 	Percent    int
 	ValueLabel string
+	LabelColor string
 }
 
 // NewBarGraph creates and returns an instance of BarGraph
@@ -75,12 +76,18 @@ func BuildStars(data []Bar, maxStars int, starChar string) string {
 			label = fmt.Sprint(bar.Percent)
 		}
 
+		labelColor := bar.LabelColor
+		if labelColor == "" {
+			labelColor = "default"
+		}
+
 		//write the line
 		buffer.WriteString(
 			fmt.Sprintf(
-				"%s%s[[red]%s[white]%s] %s\n",
+				"%s%s[[%s]%s[default]%s] %s\n",
 				bar.Label,
 				strings.Repeat(" ", longestLabel-len(bar.Label)),
+				labelColor,
 				strings.Repeat(starChar, starCount),
 				strings.Repeat(" ", maxStars-starCount),
 				label,

view/bargraph_test.go

@@ -10,7 +10,7 @@ import (
 func makeData() []Bar {
 
 	//this could come from config
-	const lineCount = 2
+	const lineCount = 3
 	var stats [lineCount]Bar
 
 	stats[0] = Bar{
@@ -19,8 +19,15 @@ func makeData() []Bar {
 	}
 
 	stats[1] = Bar{
-		Label:   "Jul 09, 2018",
-		Percent: 80,
+		Label:      "Jul 09, 2018",
+		Percent:    80,
+		LabelColor: "red",
+	}
+
+	stats[2] = Bar{
+		Label:      "Jul 09, 2018",
+		Percent:    80,
+		LabelColor: "green",
 	}
 
 	return stats[:]
@@ -33,7 +40,7 @@ func TestOutput(t *testing.T) {
 	result := BuildStars(makeData(), 20, "*")
 
 	Equal(t,
-		"Jun 27, 2018[[red]****[white]                ] 20\nJul 09, 2018[[red]****************[white]    ] 80\n",
+		"Jun 27, 2018[[default]****[default]                ] 20\nJul 09, 2018[[red]****************[default]    ] 80\nJul 09, 2018[[green]****************[default]    ] 80\n",
 		result,
 	)
 }