Remove complexity from a lot of string display statements

wtfutil · Jun 22, 2018 · 1a898b0 · 1a898b0
1 parent 24a46a6
commit 1a898b0
Show file tree

Hide file tree

Showing 27 changed files with 85 additions and 86 deletions.
diff --git a/bamboohr/widget.go b/bamboohr/widget.go
@@ -29,9 +29,9 @@ func (widget *Widget) Refresh() {
 	)
 
 	widget.UpdateRefreshedAt()
-	widget.View.SetTitle(fmt.Sprintf("%s(%d)", widget.Name, len(todayItems)))
+	widget.View.SetTitle(fmt.Sprintf("%s (%d)", widget.Name, len(todayItems)))
 
-	widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(todayItems)))
+	widget.View.SetText(widget.contentFrom(todayItems))
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/circleci/widget.go b/circleci/widget.go
@@ -30,13 +30,16 @@ func (widget *Widget) Refresh() {
 
 	widget.View.SetTitle(fmt.Sprintf("%s - Builds", widget.Name))
 
+	var content string
 	if err != nil {
 		widget.View.SetWrap(true)
-		fmt.Fprintf(widget.View, "%v", err)
+		content = err.Error()
 	} else {
 		widget.View.SetWrap(false)
-		widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(builds)))
+		content = widget.contentFrom(builds)
 	}
+
+	widget.View.SetText(content)
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/clocks/display.go b/clocks/display.go
@@ -23,5 +23,5 @@ func (widget *Widget) display(clocks []Clock) {
 		)
 	}
 
-	widget.View.SetText(fmt.Sprintf("%s", str))
+	widget.View.SetText(str)
 }
diff --git a/cmdrunner/widget.go b/cmdrunner/widget.go
@@ -34,9 +34,9 @@ func (widget *Widget) Refresh() {
 	widget.execute()
 
 	title := wtf.Config.UString("wtf.mods.cmdrunner.title", widget.String())
-	widget.View.SetTitle(fmt.Sprintf("%s", title))
+	widget.View.SetTitle(title)
 
-	widget.View.SetText(fmt.Sprintf("%s", widget.result))
+	widget.View.SetText(widget.result)
 }
 
 func (widget *Widget) String() string {

diff --git a/cryptoexchanges/bittrex/display.go b/cryptoexchanges/bittrex/display.go
@@ -8,14 +8,11 @@ import (
 
 func (widget *Widget) display() {
 	if ok == false {
-		widget.View.SetText(fmt.Sprintf("%s", errorText))
+		widget.View.SetText(errorText)
 		return
 	}
 
-	str := ""
-	str += summaryText(&widget.summaryList, &widget.TextColors)
-
-	widget.View.SetText(fmt.Sprintf("%s", str))
+	widget.View.SetText(summaryText(&widget.summaryList, &widget.TextColors))
 }
 
 func summaryText(list *summaryList, colors *TextColors) string {

diff --git a/cryptoexchanges/blockfolio/widget.go b/cryptoexchanges/blockfolio/widget.go
@@ -37,7 +37,8 @@ func (widget *Widget) Refresh() {
 	if err != nil {
 		return
 	}
-	widget.View.SetText(fmt.Sprintf("%s", contentFrom(positions)))
+
+	widget.View.SetText(contentFrom(positions))
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/gcal/widget.go b/gcal/widget.go
@@ -55,7 +55,7 @@ func (widget *Widget) display() {
 
 	widget.mutex.Lock()
 	defer widget.mutex.Unlock()
-	widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(widget.events)))
+	widget.View.SetText(widget.contentFrom(widget.events))
 }
 
 // conflicts returns TRUE if this event conflicts with another, FALSE if it does not

diff --git a/git/display.go b/git/display.go
@@ -9,10 +9,9 @@ import (
 )
 
 func (widget *Widget) display() {
-
 	repoData := widget.currentData()
 	if repoData == nil {
-		fmt.Fprintf(widget.View, "%s", " Git repo data is unavailable (1)")
+		widget.View.SetText(" Git repo data is unavailable ")
 		return
 	}
 
@@ -27,7 +26,7 @@ func (widget *Widget) display() {
 	str = str + "\n"
 	str = str + widget.formatCommits(repoData.Commits)
 
-	widget.View.SetText(fmt.Sprintf("%s", str))
+	widget.View.SetText(str)
 }
 
 func (widget *Widget) formatChanges(data []string) string {

diff --git a/github/display.go b/github/display.go
@@ -7,10 +7,9 @@ import (
 )
 
 func (widget *Widget) display() {
-
 	repo := widget.currentGithubRepo()
 	if repo == nil {
-		fmt.Fprintf(widget.View, "%s", " Github repo data is unavailable (1)")
+		widget.View.SetText(" GitHub repo data is unavailable ")
 		return
 	}
 

diff --git a/gitlab/display.go b/gitlab/display.go
@@ -10,7 +10,7 @@ func (widget *Widget) display() {
 
 	project := widget.currentGitlabProject()
 	if project == nil {
-		fmt.Fprintf(widget.View, "%s", " Gitlab project data is unavailable (1)")
+		widget.View.SetText(" Gitlab project data is unavailable ")
 		return
 	}
 

diff --git a/gspreadsheets/widget.go b/gspreadsheets/widget.go
@@ -26,7 +26,7 @@ func (widget *Widget) Refresh() {
 
 	widget.UpdateRefreshedAt()
 
-	widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(cells)))
+	widget.View.SetText(widget.contentFrom(cells))
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/ipaddresses/ipapi/widget.go b/ipaddresses/ipapi/widget.go
@@ -61,20 +61,20 @@ func (widget *Widget) ipinfo() {
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", "http://ip-api.com/json", nil)
 	if err != nil {
-		widget.result = fmt.Sprintf("%s", err.Error())
+		widget.result = err.Error()
 		return
 	}
 	req.Header.Set("User-Agent", "curl")
 	response, err := client.Do(req)
 	if err != nil {
-		widget.result = fmt.Sprintf("%s", err.Error())
+		widget.result = err.Error()
 		return
 	}
 	defer response.Body.Close()
 	var info ipinfo
 	err = json.NewDecoder(response.Body).Decode(&info)
 	if err != nil {
-		widget.result = fmt.Sprintf("%s", err.Error())
+		widget.result = err.Error()
 		return
 	}
 

diff --git a/ipaddresses/ipinfo/widget.go b/ipaddresses/ipinfo/widget.go
@@ -55,21 +55,21 @@ func (widget *Widget) ipinfo() {
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", "https://ipinfo.io/", nil)
 	if err != nil {
-		widget.result = fmt.Sprintf("%s", err.Error())
+		widget.result = err.Error()
 		return
 	}
 	req.Header.Set("User-Agent", "curl")
 	response, err := client.Do(req)
 	if err != nil {
-		widget.result = fmt.Sprintf("%s", err.Error())
+		widget.result = err.Error()
 		return
 	}
 	defer response.Body.Close()
 
 	var info ipinfo
 	err = json.NewDecoder(response.Body).Decode(&info)
 	if err != nil {
-		widget.result = fmt.Sprintf("%s", err.Error())
+		widget.result = err.Error()
 		return
 	}
 

diff --git a/jenkins/widget.go b/jenkins/widget.go
@@ -32,22 +32,20 @@ func (widget *Widget) Refresh() {
 	)
 
 	widget.UpdateRefreshedAt()
-	widget.View.Clear()
+	//widget.View.Clear()
 
+	var content string
 	if err != nil {
 		widget.View.SetWrap(true)
 		widget.View.SetTitle(fmt.Sprintf(" %s ", widget.Name))
-		fmt.Fprintf(widget.View, "%v", err)
+		content = err.Error()
 	} else {
 		widget.View.SetWrap(false)
-		widget.View.SetTitle(
-			fmt.Sprintf(
-				" %s: [green] ",
-				widget.Name,
-			),
-		)
-		fmt.Fprintf(widget.View, "%s", widget.contentFrom(view))
+		widget.View.SetTitle(fmt.Sprintf(" %s: [green] ", widget.Name))
+		content = widget.contentFrom(view)
 	}
+
+	widget.View.SetText(content)
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/jira/widget.go b/jira/widget.go
@@ -29,10 +29,11 @@ func (widget *Widget) Refresh() {
 
 	widget.UpdateRefreshedAt()
 
+	var content string
 	if err != nil {
 		widget.View.SetWrap(true)
-		widget.View.SetTitle(fmt.Sprintf("%s", widget.Name))
-		fmt.Fprintf(widget.View, "%v", err)
+		widget.View.SetTitle(widget.Name)
+		content = err.Error()
 	} else {
 		widget.View.SetWrap(false)
 		widget.View.SetTitle(
@@ -42,8 +43,10 @@ func (widget *Widget) Refresh() {
 				wtf.Config.UString("wtf.mods.jira.project"),
 			),
 		)
-		widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(searchResult)))
+		content = widget.contentFrom(searchResult)
 	}
+
+	widget.View.SetText(content)
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/logger/log.go b/logger/log.go
@@ -52,10 +52,10 @@ func (widget *Widget) Refresh() {
 	}
 
 	widget.UpdateRefreshedAt()
-	widget.View.SetTitle(fmt.Sprintf("%s", widget.Name))
+	widget.View.SetTitle(widget.Name)
 
 	logLines := widget.tailFile()
-	widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(logLines)))
+	widget.View.SetText(widget.contentFrom(logLines))
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/newrelic/widget.go b/newrelic/widget.go
@@ -34,13 +34,16 @@ func (widget *Widget) Refresh() {
 	widget.View.SetTitle(fmt.Sprintf("%s- [green]%s[white]", widget.Name, appName))
 	widget.View.Clear()
 
+	var content string
 	if depErr != nil {
 		widget.View.SetWrap(true)
-		widget.View.SetText(fmt.Sprintf("%s", depErr))
+		content = depErr.Error()
 	} else {
 		widget.View.SetWrap(false)
-		widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(deploys)))
+		content = widget.contentFrom(deploys)
 	}
+
+	widget.View.SetText(content)
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/opsgenie/widget.go b/opsgenie/widget.go
@@ -27,13 +27,16 @@ func (widget *Widget) Refresh() {
 	widget.UpdateRefreshedAt()
 	widget.View.SetTitle(widget.Name)
 
+	var content string
 	if err != nil {
 		widget.View.SetWrap(true)
-		widget.View.SetText(fmt.Sprintf("%s", err))
+		content = err.Error()
 	} else {
 		widget.View.SetWrap(false)
-		widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(data)))
+		content = widget.contentFrom(data)
 	}
+
+	widget.View.SetText(content)
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/power/widget.go b/power/widget.go
@@ -27,10 +27,10 @@ func (widget *Widget) Refresh() {
 	widget.UpdateRefreshedAt()
 	widget.Battery.Refresh()
 
-	str := ""
-	str = str + fmt.Sprintf(" %10s: %s\n", "Source", powerSource())
-	str = str + "\n"
-	str = str + widget.Battery.String()
+	content := ""
+	content = content + fmt.Sprintf(" %10s: %s\n", "Source", powerSource())
+	content = content + "\n"
+	content = content + widget.Battery.String()
 
-	widget.View.SetText(fmt.Sprintf("%s", str))
+	widget.View.SetText(content)
 }
diff --git a/security/widget.go b/security/widget.go
@@ -28,8 +28,7 @@ func (widget *Widget) Refresh() {
 	data.Fetch()
 
 	widget.UpdateRefreshedAt()
-
-	widget.View.SetText(fmt.Sprintf("%s", widget.contentFrom(data)))
+	widget.View.SetText(widget.contentFrom(data))
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/security/widget_windows.go b/security/widget_windows.go
@@ -32,9 +32,7 @@ func (widget *Widget) Refresh() {
 	data.Fetch()
 
 	widget.UpdateRefreshedAt()
-	widget.View.Clear()
-
-	fmt.Fprintf(widget.View, "%s", widget.contentFrom(data))
+	widget.View.SetText(widget.contentFrom(data))
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/status/widget.go b/status/widget.go
@@ -1,8 +1,6 @@
 package status
 
 import (
-	"fmt"
-
 	"github.com/senorprogrammer/wtf/wtf"
 )
 
@@ -25,13 +23,7 @@ func NewWidget() *Widget {
 
 func (widget *Widget) Refresh() {
 	widget.UpdateRefreshedAt()
-
-	widget.View.SetText(
-		fmt.Sprintf(
-			"\n%s",
-			widget.animation(),
-		),
-	)
+	widget.View.SetText(widget.animation())
 }
 
 /* -------------------- Unexported Functions -------------------- */

diff --git a/textfile/widget.go b/textfile/widget.go
@@ -55,9 +55,9 @@ func (widget *Widget) Refresh() {
 	}
 
 	if err != nil {
-		widget.View.SetText(fmt.Sprintf("%s", err))
+		widget.View.SetText(err.Error())
 	} else {
-		widget.View.SetText(fmt.Sprintf("%s", string(fileData)))
+		widget.View.SetText(string(fileData))
 	}
 }
 

diff --git a/todo/display.go b/todo/display.go
@@ -29,7 +29,7 @@ func (widget *Widget) display() {
 	widget.SetList(&newList)
 
 	widget.View.Clear()
-	widget.View.SetText(fmt.Sprintf("%s", str))
+	widget.View.SetText(str)
 }
 
 func (widget *Widget) formattedItemLine(item *Item, selectedItem *Item, maxLen int) string {