taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Fix shadowed variables

Browse Source 
Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer 2020-05-06 23:11:30 -07:00
parent 62a1c5c97b
commit 06152c7041
7 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cmdrunner/widget.go
View File

@ -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())
if err != nil {
_, writeErr := widget.buffer.WriteString(err.Error())
if writeErr != nil {
return
}
widget.m.Unlock()

4
modules/gcal/client.go
View File

@ -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()
if err != nil {
calendarEvents, listErr := srv.Events.List(calendarID).TimeZone(timezone).ShowDeleted(false).TimeMin(startTime).MaxResults(eventLimit).SingleEvents(true).OrderBy("startTime").Do()
if listErr != nil {
break
}
events.Items = append(events.Items, calendarEvents.Items...)

2
modules/gcal/display.go
View File

@ -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)),
)

4
modules/gitlab/gitlab_project.go
View File

@ -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 {

13
modules/gspreadsheets/client.go
View File

@ -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()
if err != nil {
log.Fatalf("Error fetching cells %s", addresses)
return nil, err
resp, getErr := srv.Spreadsheets.Values.Get(widget.settings.sheetID, cells[i]).Do()
if getErr != nil {
return nil, getErr
}
responses[i] = resp
}

8
modules/pihole/client.go
View File

@ -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
}
}()

5
modules/spotifyweb/widget.go
View File

@ -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)