Fix shadowed variables

Signed-off-by: Chris Cummer <chriscummer@me.com>

modules/cmdrunner/widget.go

@@ -128,8 +128,8 @@ func runCommandLoop(widget *Widget) {
 		// The command has exited, print any error messages
 		if err != nil {
 			widget.m.Lock()
-			_, err := widget.buffer.WriteString(err.Error())
+			_, writeErr := widget.buffer.WriteString(err.Error())
-			if err != nil {
+			if writeErr != nil {
 				return
 			}
 			widget.m.Unlock()

modules/gcal/client.go

@@ -60,8 +60,8 @@ func (widget *Widget) Fetch() ([]*CalEvent, error) {
 
 	calendarIDs, err := widget.getCalendarIdList(srv)
 	for _, calendarID := range calendarIDs {
-		calendarEvents, err := srv.Events.List(calendarID).TimeZone(timezone).ShowDeleted(false).TimeMin(startTime).MaxResults(eventLimit).SingleEvents(true).OrderBy("startTime").Do()
+		calendarEvents, listErr := srv.Events.List(calendarID).TimeZone(timezone).ShowDeleted(false).TimeMin(startTime).MaxResults(eventLimit).SingleEvents(true).OrderBy("startTime").Do()
-		if err != nil {
+		if listErr != nil {
 			break
 		}
 		events.Items = append(events.Items, calendarEvents.Items...)

modules/gcal/display.go

@@ -43,7 +43,7 @@ func (widget *Widget) content() (string, string, bool) {
 			timestamp = ""
 		}
 
-		title := fmt.Sprintf("[%s]%s",
+		title = fmt.Sprintf("[%s]%s",
 			widget.titleColor(calEvent),
 			widget.eventSummary(calEvent, calEvent.ConflictsWith(calEvents)),
 		)

modules/gitlab/gitlab_project.go

@@ -19,12 +19,12 @@ func newContext(settings *Settings) (*context, error) {
 		return nil, err
 	}
 
-	context := context{
+	ctx := &context{
 		client: gitlabClient,
 		user:   user,
 	}
 
-	return &context, nil
+	return ctx, nil
 }
 
 type GitlabProject struct {

modules/gspreadsheets/client.go

@@ -16,7 +16,6 @@ import (
 	"os"
 	"os/user"
 	"path/filepath"
-	"strings"
 
 	"github.com/wtfutil/wtf/utils"
 	"golang.org/x/oauth2"
@@ -39,29 +38,25 @@ func (widget *Widget) Fetch() ([]*sheets.ValueRange, error) {
 	}
 
 	config, err := google.ConfigFromJSON(b, "https://www.googleapis.com/auth/spreadsheets.readonly")
-
 	if err != nil {
-		log.Fatalf("Unable to get config from JSON. %v", err)
 		return nil, err
 	}
+
 	client := getClient(ctx, config)
 
 	srv, err := sheets.NewService(context.Background(), option.WithHTTPClient(client))
 	if err != nil {
-		log.Fatalf("Unable to get create server. %v", err)
 		return nil, err
 	}
 
 	cells := utils.ToStrs(widget.settings.cellAddresses)
-	addresses := strings.Join(cells[:], ";")
 
 	responses := make([]*sheets.ValueRange, len(cells))
 
 	for i := 0; i < len(cells); i++ {
-		resp, err := srv.Spreadsheets.Values.Get(widget.settings.sheetID, cells[i]).Do()
+		resp, getErr := srv.Spreadsheets.Values.Get(widget.settings.sheetID, cells[i]).Do()
-		if err != nil {
+		if getErr != nil {
-			log.Fatalf("Error fetching cells %s", addresses)
+			return nil, getErr
-			return nil, err
 		}
 		responses[i] = resp
 	}

modules/pihole/client.go

@@ -59,7 +59,7 @@ func getStatus(c http.Client, apiURL string) (status Status, err error) {
 	}
 
 	defer func() {
-		if err := resp.Body.Close(); err != nil {
+		if closeErr := resp.Body.Close(); closeErr != nil {
 			return
 		}
 	}()
@@ -120,7 +120,7 @@ func getTopItems(c http.Client, settings *Settings) (ti TopItems, err error) {
 	}
 
 	defer func() {
-		if err := resp.Body.Close(); err != nil {
+		if closeErr := resp.Body.Close(); closeErr != nil {
 			return
 		}
 	}()
@@ -186,7 +186,7 @@ func getTopClients(c http.Client, settings *Settings) (tc TopClients, err error)
 	}
 
 	defer func() {
-		if err := resp.Body.Close(); err != nil {
+		if closeErr := resp.Body.Close(); closeErr != nil {
 			return
 		}
 	}()
@@ -245,7 +245,7 @@ func getQueryTypes(c http.Client, settings *Settings) (qt QueryTypes, err error)
 	}
 
 	defer func() {
-		if err := resp.Body.Close(); err != nil {
+		if closeErr := resp.Body.Close(); closeErr != nil {
 			return
 		}
 	}()

modules/spotifyweb/widget.go

@@ -170,12 +170,13 @@ func (widget *Widget) HelpText() string {
 }
 
 func (w *Widget) createOutput() (string, string, bool) {
-	err := w.refreshSpotifyInfos()
 	var output string
+
+	err := w.refreshSpotifyInfos()
 	if err != nil {
 		output = err.Error()
 	} else {
-		output := utils.CenterText(fmt.Sprintf("[green]Now %v [white]\n", w.Info.Status), w.CommonSettings().Width)
+		output += utils.CenterText(fmt.Sprintf("[green]Now %v [white]\n", w.Info.Status), w.CommonSettings().Width)
 		output += utils.CenterText(fmt.Sprintf("[green]Title:[white] %v\n", w.Info.Title), w.CommonSettings().Width)
 		output += utils.CenterText(fmt.Sprintf("[green]Artist:[white] %v\n", w.Info.Artists), w.CommonSettings().Width)
 		output += utils.CenterText(fmt.Sprintf("[green]Album:[white] %v\n", w.Info.Album), w.CommonSettings().Width)