From b7165991c90b7220b4248d4a8b65e83cfbda866e Mon Sep 17 00:00:00 2001 From: Chris Cummer Date: Wed, 6 May 2020 23:00:03 -0700 Subject: [PATCH] Fix issues found by goimports Signed-off-by: Chris Cummer --- app/widget_maker.go | 6 +++--- checklist/checklist_item.go | 2 -- generator/textwidget.go | 10 +++++----- modules/buildkite/settings.go | 3 ++- modules/buildkite/widget.go | 1 + modules/github/github_repo.go | 3 +-- modules/jenkins/client.go | 2 +- modules/jenkins/view.go | 10 +++++----- modules/jenkins/widget.go | 3 ++- modules/jira/issues.go | 8 ++++---- modules/spacex/client.go | 3 ++- modules/subreddit/widget.go | 20 +++++++++---------- modules/twitch/client.go | 1 + modules/twitch/widget.go | 1 + .../weatherservices/arpansagovau/widget.go | 1 + utils/text.go | 5 +++-- 16 files changed, 42 insertions(+), 37 deletions(-) diff --git a/app/widget_maker.go b/app/widget_maker.go index 44210ce4..9b9d9766 100644 --- a/app/widget_maker.go +++ b/app/widget_maker.go @@ -7,9 +7,9 @@ import ( "github.com/wtfutil/wtf/modules/bamboohr" "github.com/wtfutil/wtf/modules/bargraph" "github.com/wtfutil/wtf/modules/buildkite" - "github.com/wtfutil/wtf/modules/cds/favorites" - "github.com/wtfutil/wtf/modules/cds/queue" - "github.com/wtfutil/wtf/modules/cds/status" + cdsfavorites "github.com/wtfutil/wtf/modules/cds/favorites" + cdsqueue "github.com/wtfutil/wtf/modules/cds/queue" + cdsstatus "github.com/wtfutil/wtf/modules/cds/status" "github.com/wtfutil/wtf/modules/circleci" "github.com/wtfutil/wtf/modules/clocks" "github.com/wtfutil/wtf/modules/cmdrunner" diff --git a/checklist/checklist_item.go b/checklist/checklist_item.go index 40cfafb8..b4b2943c 100644 --- a/checklist/checklist_item.go +++ b/checklist/checklist_item.go @@ -1,7 +1,5 @@ package checklist -import () - // ChecklistItem is a module for creating generic checklist implementations // See 'Todo' for an implementation example type ChecklistItem struct { diff --git a/generator/textwidget.go b/generator/textwidget.go index 3e3fd34f..dabb68e8 100644 --- a/generator/textwidget.go +++ b/generator/textwidget.go @@ -46,14 +46,14 @@ func main() { /* -------------------- Unexported Functions -------------------- */ -func createModuleDirectory(data struct { Name string }) { +func createModuleDirectory(data struct{ Name string }) { err := os.MkdirAll(strings.ToLower(fmt.Sprintf("modules/%s", data.Name)), os.ModePerm) if err != nil { fmt.Println(err.Error()) } } -func generateWidgetFile(data struct { Name string }) { +func generateWidgetFile(data struct{ Name string }) { tpl, _ := template.New("textwidget.tpl").Funcs(template.FuncMap{ "Lower": strings.ToLower, }).ParseFiles("generator/textwidget.tpl") @@ -67,8 +67,8 @@ func generateWidgetFile(data struct { Name string }) { tpl.Execute(out, data) } -func generateSettingsFile(data struct { Name string }) { - tpl, _ := template.New("settings.tpl").Funcs(template.FuncMap{ +func generateSettingsFile(data struct{ Name string }) { + tpl, _ := template.New("settings.tpl").Funcs(template.FuncMap{ "Lower": strings.ToLower, }).ParseFiles("generator/settings.tpl") @@ -79,4 +79,4 @@ func generateSettingsFile(data struct { Name string }) { defer out.Close() tpl.Execute(out, data) -} \ No newline at end of file +} diff --git a/modules/buildkite/settings.go b/modules/buildkite/settings.go index 6a0c67ad..61abc82d 100644 --- a/modules/buildkite/settings.go +++ b/modules/buildkite/settings.go @@ -1,10 +1,11 @@ package buildkite import ( + "os" + "github.com/olebedev/config" "github.com/wtfutil/wtf/cfg" "github.com/wtfutil/wtf/utils" - "os" ) const ( diff --git a/modules/buildkite/widget.go b/modules/buildkite/widget.go index c51f0d6f..0d3ca075 100644 --- a/modules/buildkite/widget.go +++ b/modules/buildkite/widget.go @@ -2,6 +2,7 @@ package buildkite import ( "fmt" + "github.com/rivo/tview" "github.com/wtfutil/wtf/view" ) diff --git a/modules/github/github_repo.go b/modules/github/github_repo.go index be0bfadc..fb147f0a 100644 --- a/modules/github/github_repo.go +++ b/modules/github/github_repo.go @@ -12,10 +12,9 @@ import ( const ( pullRequestsPath = "/pulls" - issuesPath = "/issues" + issuesPath = "/issues" ) - // GithubRepo defines a new GithubRepo structure type GithubRepo struct { apiKey string diff --git a/modules/jenkins/client.go b/modules/jenkins/client.go index 327ea07d..5fcbb6da 100644 --- a/modules/jenkins/client.go +++ b/modules/jenkins/client.go @@ -45,7 +45,7 @@ func (widget *Widget) Create(jenkinsURL string, username string, apiKey string) return view, err } - respJobs := make([]Job, 0, len(view.Jobs) + len(view.ActiveConfigurations)) + respJobs := make([]Job, 0, len(view.Jobs)+len(view.ActiveConfigurations)) respJobs = append(append(respJobs, view.Jobs...), view.ActiveConfigurations...) jobs := make([]Job, 0) diff --git a/modules/jenkins/view.go b/modules/jenkins/view.go index 65f525ca..e83b3328 100644 --- a/modules/jenkins/view.go +++ b/modules/jenkins/view.go @@ -1,9 +1,9 @@ package jenkins type View struct { - Description string `json:"description"` - Jobs []Job `json:"jobs"` - ActiveConfigurations []Job `json:"activeConfigurations"` - Name string `json:"name"` - Url string `json:"url"` + Description string `json:"description"` + Jobs []Job `json:"jobs"` + ActiveConfigurations []Job `json:"activeConfigurations"` + Name string `json:"name"` + Url string `json:"url"` } diff --git a/modules/jenkins/widget.go b/modules/jenkins/widget.go index 782a9808..8a6d0cd7 100644 --- a/modules/jenkins/widget.go +++ b/modules/jenkins/widget.go @@ -2,10 +2,11 @@ package jenkins import ( "fmt" + "net/url" + "github.com/rivo/tview" "github.com/wtfutil/wtf/utils" "github.com/wtfutil/wtf/view" - "net/url" ) type Widget struct { diff --git a/modules/jira/issues.go b/modules/jira/issues.go index 35bedde1..9c6fd9c5 100644 --- a/modules/jira/issues.go +++ b/modules/jira/issues.go @@ -12,7 +12,7 @@ type Issue struct { type IssueFields struct { Summary string `json:"summary"` - IssueType *IssueType `json:"issuetype"` + IssueType *IssueType `json:"issuetype"` IssueStatus *IssueStatus `json:"status"` } @@ -26,7 +26,7 @@ type IssueType struct { } type IssueStatus struct { - ISelf string `json:"self"` - IDescription string `json:"description"` - IName string `json:"name"` + ISelf string `json:"self"` + IDescription string `json:"description"` + IName string `json:"name"` } diff --git a/modules/spacex/client.go b/modules/spacex/client.go index 632906da..b6a2ab71 100644 --- a/modules/spacex/client.go +++ b/modules/spacex/client.go @@ -1,8 +1,9 @@ package spacex import ( - "github.com/wtfutil/wtf/utils" "net/http" + + "github.com/wtfutil/wtf/utils" ) const ( diff --git a/modules/subreddit/widget.go b/modules/subreddit/widget.go index 2a7756df..e9fc7762 100644 --- a/modules/subreddit/widget.go +++ b/modules/subreddit/widget.go @@ -44,16 +44,16 @@ func (widget *Widget) Refresh() { widget.links = nil widget.SetItemCount(0) } else { - if len(links) <= widget.settings.numberOfPosts { - widget.links = links - widget.SetItemCount(len(widget.links)) - widget.err = nil - } else { - widget.links = links[:widget.settings.numberOfPosts] - widget.SetItemCount(len(widget.links)) - widget.err = nil - } - } + if len(links) <= widget.settings.numberOfPosts { + widget.links = links + widget.SetItemCount(len(widget.links)) + widget.err = nil + } else { + widget.links = links[:widget.settings.numberOfPosts] + widget.SetItemCount(len(widget.links)) + widget.err = nil + } + } widget.Render() } diff --git a/modules/twitch/client.go b/modules/twitch/client.go index 1c478ba4..ed3a0097 100644 --- a/modules/twitch/client.go +++ b/modules/twitch/client.go @@ -2,6 +2,7 @@ package twitch import ( "fmt" + "github.com/nicklaw5/helix" ) diff --git a/modules/twitch/widget.go b/modules/twitch/widget.go index fc948534..2cbaa63d 100644 --- a/modules/twitch/widget.go +++ b/modules/twitch/widget.go @@ -3,6 +3,7 @@ package twitch import ( "errors" "fmt" + "github.com/nicklaw5/helix" "github.com/rivo/tview" "github.com/wtfutil/wtf/utils" diff --git a/modules/weatherservices/arpansagovau/widget.go b/modules/weatherservices/arpansagovau/widget.go index 64ee8d34..3d29c220 100644 --- a/modules/weatherservices/arpansagovau/widget.go +++ b/modules/weatherservices/arpansagovau/widget.go @@ -2,6 +2,7 @@ package arpansagovau import ( "fmt" + "github.com/rivo/tview" "github.com/wtfutil/wtf/view" ) diff --git a/utils/text.go b/utils/text.go index 0c694a38..83d22b05 100644 --- a/utils/text.go +++ b/utils/text.go @@ -2,11 +2,12 @@ package utils import ( "fmt" - "golang.org/x/text/language" - "golang.org/x/text/message" "math" "strings" + "golang.org/x/text/language" + "golang.org/x/text/message" + "github.com/rivo/tview" )