From c02d74186d0622e6b3407b05570c298de48a340e Mon Sep 17 00:00:00 2001
From: Julian Hurst <julian.hurst92@gmail.com>
Date: Sat, 11 Jul 2020 01:30:10 +0200
Subject: Group build funcs together

---
 statusbar.go | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/statusbar.go b/statusbar.go
index cc810bd..549ebfe 100644
--- a/statusbar.go
+++ b/statusbar.go
@@ -209,6 +209,30 @@ func (mocp MOCP) status() int {
 	}
 }
 
+func battery(config BatteryConfig) string {
+	var b strings.Builder
+	const batteryPath = "/sys/class/power_supply"
+	files, err := ioutil.ReadDir(batteryPath)
+	if err != nil {
+		panic(err)
+	}
+	batteryNb := 0
+	separator := ""
+	for _, file := range files {
+		b.WriteString(separator)
+		filePath := fmt.Sprintf("%v/%v/%v", batteryPath, file.Name(), "capacity")
+		var capacity string
+		content, err := ioutil.ReadFile(filePath)
+		if err != nil {
+			content = []byte("0")
+		}
+		capacity = strings.TrimSuffix(string(content), "\n")
+		b.WriteString(fmt.Sprintf("%v%v: %v%%", config.SubLabel, batteryNb, capacity))
+		batteryNb += 1
+		separator = " "
+	}
+	return b.String()
+}
 
 func buildClock(config ClockConfig) string {
 	var b strings.Builder
@@ -273,31 +297,6 @@ func buildMusic(config MusicConfig) string {
 	return b.String()
 }
 
-func battery(config BatteryConfig) string {
-	var b strings.Builder
-	const batteryPath = "/sys/class/power_supply"
-	files, err := ioutil.ReadDir(batteryPath)
-	if err != nil {
-		panic(err)
-	}
-	batteryNb := 0
-	separator := ""
-	for _, file := range files {
-		b.WriteString(separator)
-		filePath := fmt.Sprintf("%v/%v/%v", batteryPath, file.Name(), "capacity")
-		var capacity string
-		content, err := ioutil.ReadFile(filePath)
-		if err != nil {
-			content = []byte("0")
-		}
-		capacity = strings.TrimSuffix(string(content), "\n")
-		b.WriteString(fmt.Sprintf("%v%v: %v%%", config.SubLabel, batteryNb, capacity))
-		batteryNb += 1
-		separator = " "
-	}
-	return b.String()
-}
-
 func buildBattery(config BatteryConfig) string {
 	var b strings.Builder
 	b.WriteString(config.Label)
-- 
cgit v1.2.3