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 a bunch of minor issues found by running staticcheck

Browse Source 
Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer 2020-05-06 22:44:24 -07:00
parent a19c9c3e33
commit 9cd9a58759
12 changed files with 36 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cfg/error_messages.go
View File

@ -30,12 +30,6 @@ func displayDefaultConfigWriteError(err error) {
displayError(err)
}
func displayXdgConfigDirCreateError(path string, err error) {
fmt.Printf("\n%s Could not create the '%s' directory.\n", aurora.Red("ERROR"), aurora.Yellow(path))
fmt.Println()
displayError(err)
}
func displayWtfConfigDirCreateError(err error) {
fmt.Printf("\n%s Could not create the '%s' directory.\n", aurora.Red("ERROR"), aurora.Yellow(WtfConfigDirV2))
fmt.Println()

2
flags/flags.go
View File

@ -43,7 +43,7 @@ func (flags *Flags) RenderIf(version, date string, config *config.Config) {
}
if flags.HasVersion() {
fmt.Println(fmt.Sprintf("%s (%s)", version, date))
fmt.Printf("%s (%s)\n", version, date)
os.Exit(0)
}
}

22
modules/cds/queue/display.go
View File

@ -69,9 +69,9 @@ func (widget *Widget) generateQueueJobLine(id int64, parameters []sdk.Parameter,
triggeredBy := getVarsInPbj("cds.triggered_by.username", parameters)
row := make([]string, 6)
row[0] = pad(fmt.Sprintf(sdk.Round(duration, time.Second).String()), 9)
row[0] = pad(sdk.Round(duration, time.Second).String(), 9)
row[2] = pad(run, 7)
row[3] = fmt.Sprintf("%s", pad(prj+"/"+workflow+"/"+node, 40))
row[3] = pad(prj+"/"+workflow+"/"+node, 40)
if status == sdk.StatusBuilding {
row[1] = pad(fmt.Sprintf(" %s.%s ", executedJob.WorkerName, executedJob.WorkerID), 27)
@ -95,24 +95,6 @@ func (widget *Widget) generateQueueJobLine(id int64, parameters []sdk.Parameter,
return fmt.Sprintf("[%s]%s [grey]%s %s %s %s\n", c, row[0], row[1], row[2], row[3], row[4])
}
func getStatusColor(status string) string {
switch status {
case sdk.StatusSuccess:
return "green"
case sdk.StatusBuilding, sdk.StatusWaiting:
return "blue"
case sdk.StatusFail:
return "red"
case sdk.StatusStopped:
return "red"
case sdk.StatusSkipped:
return "grey"
case sdk.StatusDisabled:
return "grey"
}
return "red"
}
func pad(t string, size int) string {
if len(t) > size {
return t[0:size-3] + "..."

1
modules/cds/queue/widget.go
View File

@ -17,7 +17,6 @@ type Widget struct {
view.KeyboardWidget
view.TextWidget
jobs []sdk.WorkflowNodeJobRun
filters []string
client cdsclient.Interface

16
modules/cds/status/display.go
View File

@ -103,19 +103,3 @@ func getStatusColor(status string) string {
}
return "red"
}
func pad(t string, size int) string {
if len(t) > size {
return t[0:size-3] + "..."
}
return t + strings.Repeat(" ", size-len(t))
}
func getVarsInPbj(key string, ps []sdk.Parameter) string {
for _, p := range ps {
if p.Name == key {
return p.Value
}
}
return ""
}

14
modules/cds/status/widget.go
View File

@ -17,7 +17,6 @@ type Widget struct {
view.KeyboardWidget
view.TextWidget
jobs []sdk.WorkflowNodeJobRun
filters []string
client cdsclient.Interface
@ -119,19 +118,6 @@ func (widget *Widget) HelpText() string {
/* -------------------- Unexported Functions -------------------- */
func (widget *Widget) currentFilter() string {
if len(widget.filters) == 0 {
return sdk.StatusWaiting
}
if widget.Idx < 0 || widget.Idx >= len(widget.filters) {
widget.Idx = 0
return sdk.StatusWaiting
}
return widget.filters[widget.Idx]
}
func (widget *Widget) openWorkflow() {
currentSelection := widget.View.GetHighlights()
if widget.Selected >= 0 && currentSelection[0] != "" {

2
modules/cryptoexchanges/cryptolive/price/widget.go
View File

@ -48,7 +48,7 @@ func (widget *Widget) Refresh(wg *sync.WaitGroup) {
if len(widget.list.items) != 0 {
widget.updateCurrencies()
if !ok {
widget.Result = fmt.Sprint("Please check your internet connection!")
widget.Result = "Please check your internet connection"
} else {
widget.display()
}

8
modules/football/widget.go
View File

@ -88,7 +88,7 @@ func (widget *Widget) GetStandings(leagueId int) string {
var l LeagueStandings
var content string
content += fmt.Sprintf("Standings:\n\n")
content += "Standings:\n\n"
buf := new(bytes.Buffer)
tStandings := createTable([]string{"No.", "Team", "MP", "Won", "Draw", "Lost", "GD", "Points"}, buf)
resp, err := widget.Client.footballRequest("standings", leagueId)
@ -102,11 +102,11 @@ func (widget *Widget) GetStandings(leagueId int) string {
}
err = json.Unmarshal(data, &l)
if err != nil {
return fmt.Sprintf("Error fetching standings")
return "Error fetching standings"
}
if len(l.Standings) == 0 {
return fmt.Sprintf("Error fetching standings")
return "Error fetching standings"
}
for _, i := range l.Standings[0].Table {
@ -152,7 +152,7 @@ func (widget *Widget) GetMatches(leagueId int) string {
}
if len(l.Matches) == 0 {
return fmt.Sprintf("Error fetching matches")
return "Error fetching matches"
}
for _, m := range l.Matches {

4
modules/googleanalytics/display.go
View File

@ -19,7 +19,7 @@ func (widget *Widget) createTable(websiteReports []websiteReport) string {
websiteRow := fmt.Sprintf(" %-20s", websiteReport.Name)
if websiteReport.RealtimeReport == nil {
websiteRow += fmt.Sprintf("No data found for given ViewId.")
websiteRow += "No data found for given ViewId"
} else {
if len(websiteReport.RealtimeReport.Rows) == 0 {
websiteRow += "-"
@ -51,7 +51,7 @@ func (widget *Widget) createTable(websiteReports []websiteReport) string {
}
if reportRows == nil {
websiteRow += fmt.Sprintf("No data found for given ViewId.")
websiteRow += "No data found for given ViewId"
} else {
for _, row := range reportRows {
metrics := row.Metrics

48
modules/pihole/client.go
View File

@ -36,26 +36,26 @@ func getStatus(c http.Client, apiURL string) (status Status, err error) {
var url *url2.URL
if url, err = url2.Parse(apiURL); err != nil {
return status, fmt.Errorf(" failed to parse API URL\n %s\n", parseError(err))
return status, fmt.Errorf(" failed to parse API URL\n %s", parseError(err))
}
var query url2.Values
if query, err = url2.ParseQuery(url.RawQuery); err != nil {
return status, fmt.Errorf(" failed to parse query\n %s\n", parseError(err))
return status, fmt.Errorf(" failed to parse query\n %s", parseError(err))
}
query.Add("summary", "")
url.RawQuery = query.Encode()
if req, err = http.NewRequest("GET", url.String(), nil); err != nil {
return status, fmt.Errorf(" failed to create request\n %s\n", parseError(err))
return status, fmt.Errorf(" failed to create request\n %s", parseError(err))
}
var resp *http.Response
if resp, err = c.Do(req); err != nil || resp == nil {
return status, fmt.Errorf(" failed to connect to Pi-hole server\n %s\n", parseError(err))
return status, fmt.Errorf(" failed to connect to Pi-hole server\n %s", parseError(err))
}
defer func() {
@ -76,7 +76,7 @@ func getStatus(c http.Client, apiURL string) (status Status, err error) {
}
if err = json.Unmarshal(rBody, &status); err != nil {
return status, fmt.Errorf(" failed to retrieve top items: check provided api URL and token\n %s\n\n",
return status, fmt.Errorf(" failed to retrieve top items: check provided api URL and token\n %s",
parseError(err))
}
@ -94,13 +94,13 @@ func getTopItems(c http.Client, settings *Settings) (ti TopItems, err error) {
var url *url2.URL
if url, err = url2.Parse(settings.apiUrl); err != nil {
return ti, fmt.Errorf(" failed to parse API URL\n %s\n", parseError(err))
return ti, fmt.Errorf(" failed to parse API URL\n %s", parseError(err))
}
var query url2.Values
if query, err = url2.ParseQuery(url.RawQuery); err != nil {
return ti, fmt.Errorf(" failed to parse query\n %s\n", parseError(err))
return ti, fmt.Errorf(" failed to parse query\n %s", parseError(err))
}
query.Add("auth", settings.token)
@ -110,13 +110,13 @@ func getTopItems(c http.Client, settings *Settings) (ti TopItems, err error) {
req, err = http.NewRequest("GET", url.String(), nil)
if err != nil {
return ti, fmt.Errorf(" failed to create request\n %s\n", parseError(err))
return ti, fmt.Errorf(" failed to create request\n %s", parseError(err))
}
var resp *http.Response
if resp, err = c.Do(req); err != nil || resp == nil {
return ti, fmt.Errorf(" failed to connect to Pi-hole server\n %s\n", parseError(err))
return ti, fmt.Errorf(" failed to connect to Pi-hole server\n %s", parseError(err))
}
defer func() {
@ -134,7 +134,7 @@ func getTopItems(c http.Client, settings *Settings) (ti TopItems, err error) {
rBody, err = ioutil.ReadAll(resp.Body)
if err = json.Unmarshal(rBody, &ti); err != nil {
return ti, fmt.Errorf(" failed to retrieve top items: check provided api URL and token\n %s\n\n",
return ti, fmt.Errorf(" failed to retrieve top items: check provided api URL and token\n %s",
parseError(err))
}
@ -162,13 +162,13 @@ func getTopClients(c http.Client, settings *Settings) (tc TopClients, err error)
var url *url2.URL
if url, err = url2.Parse(settings.apiUrl); err != nil {
return tc, fmt.Errorf(" failed to parse API URL\n %s\n", parseError(err))
return tc, fmt.Errorf(" failed to parse API URL\n %s", parseError(err))
}
var query url2.Values
if query, err = url2.ParseQuery(url.RawQuery); err != nil {
return tc, fmt.Errorf(" failed to parse query\n %s\n", parseError(err))
return tc, fmt.Errorf(" failed to parse query\n %s", parseError(err))
}
query.Add("topClients", strconv.Itoa(settings.showTopClients))
@ -176,13 +176,13 @@ func getTopClients(c http.Client, settings *Settings) (tc TopClients, err error)
url.RawQuery = query.Encode()
if req, err = http.NewRequest("GET", url.String(), nil); err != nil {
return tc, fmt.Errorf(" failed to create request\n %s\n", parseError(err))
return tc, fmt.Errorf(" failed to create request\n %s", parseError(err))
}
var resp *http.Response
if resp, err = c.Do(req); err != nil || resp == nil {
return tc, fmt.Errorf(" failed to connect to Pi-hole server\n %s\n", parseError(err))
return tc, fmt.Errorf(" failed to connect to Pi-hole server\n %s", parseError(err))
}
defer func() {
@ -199,11 +199,11 @@ func getTopClients(c http.Client, settings *Settings) (tc TopClients, err error)
var rBody []byte
if rBody, err = ioutil.ReadAll(resp.Body); err != nil {
return tc, fmt.Errorf(" failed to read top clients response\n %s\n", parseError(err))
return tc, fmt.Errorf(" failed to read top clients response\n %s", parseError(err))
}
if err = json.Unmarshal(rBody, &tc); err != nil {
return tc, fmt.Errorf(" failed to retrieve top clients: check provided api URL and token\n %s\n\n",
return tc, fmt.Errorf(" failed to retrieve top clients: check provided api URL and token\n %s",
parseError(err))
}
@ -235,13 +235,13 @@ func getQueryTypes(c http.Client, settings *Settings) (qt QueryTypes, err error)
url.RawQuery = query.Encode()
if req, err = http.NewRequest("GET", url.String(), nil); err != nil {
return qt, fmt.Errorf(" failed to create request\n %s\n", parseError(err))
return qt, fmt.Errorf(" failed to create request\n %s", parseError(err))
}
var resp *http.Response
if resp, err = c.Do(req); err != nil || resp == nil {
return qt, fmt.Errorf(" failed to connect to Pi-hole server\n %s\n", parseError(err))
return qt, fmt.Errorf(" failed to connect to Pi-hole server\n %s", parseError(err))
}
defer func() {
@ -258,11 +258,11 @@ func getQueryTypes(c http.Client, settings *Settings) (qt QueryTypes, err error)
var rBody []byte
if rBody, err = ioutil.ReadAll(resp.Body); err != nil {
return qt, fmt.Errorf(" failed to read top clients response\n %s\n", parseError(err))
return qt, fmt.Errorf(" failed to read top clients response\n %s", parseError(err))
}
if err = json.Unmarshal(rBody, &qt); err != nil {
return qt, fmt.Errorf(" failed to parse query types response\n %s\n", parseError(err))
return qt, fmt.Errorf(" failed to parse query types response\n %s", parseError(err))
}
return qt, err
@ -276,7 +276,7 @@ func checkServer(c http.Client, apiURL string) error {
var url *url2.URL
if url, err = url2.Parse(apiURL); err != nil {
return fmt.Errorf(" failed to parse API URL\n %s\n", parseError(err))
return fmt.Errorf(" failed to parse API URL\n %s", parseError(err))
}
if url.Host == "" {
@ -291,7 +291,7 @@ func checkServer(c http.Client, apiURL string) error {
var resp *http.Response
if resp, err = c.Do(req); err != nil {
return fmt.Errorf(" failed to connect to Pi-hole server\n %s\n", parseError(err))
return fmt.Errorf(" failed to connect to Pi-hole server\n %s", parseError(err))
}
defer func() {
@ -310,11 +310,11 @@ func checkServer(c http.Client, apiURL string) error {
var rBody []byte
if rBody, err = ioutil.ReadAll(resp.Body); err != nil {
return fmt.Errorf(" Pi-hole server failed to respond\n %s\n", parseError(err))
return fmt.Errorf(" Pi-hole server failed to respond\n %s", parseError(err))
}
if err = json.Unmarshal(rBody, &vResp); err != nil {
return fmt.Errorf(" invalid response returned from Pi-hole Server\n %s\n", parseError(err))
return fmt.Errorf(" invalid response returned from Pi-hole Server\n %s", parseError(err))
}
if vResp.Version != 3 {

2
modules/power/battery_linux.go
View File

@ -14,8 +14,6 @@ import (
var batteryState string
type Battery struct {
args []string
cmd string
result string
Charge string

4
modules/spotifyweb/widget.go
View File

@ -180,9 +180,9 @@ func (w *Widget) createOutput() (string, string, bool) {
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)
if w.playerState.ShuffleState {
output += utils.CenterText(fmt.Sprintf("[green]Shuffle:[white] on\n"), w.CommonSettings().Width)
output += utils.CenterText("[green]Shuffle:[white] on\n", w.CommonSettings().Width)
} else {
output += utils.CenterText(fmt.Sprintf("[green]Shuffle:[white] off\n"), w.CommonSettings().Width)
output += utils.CenterText("[green]Shuffle:[white] off\n", w.CommonSettings().Width)
}
}
return w.CommonSettings().Title, output, true