From 2357e25b075a9e01b10c7fccb82b2917b2afdac3 Mon Sep 17 00:00:00 2001 From: makeworld Date: Fri, 28 Aug 2020 12:18:30 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20Fix=20lint=20issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .golangci.yml | 5 +++++ config/config.go | 5 +++-- display/tab.go | 2 +- feeds/feeds.go | 22 +++++++++++----------- feeds/structs.go | 4 ++-- renderer/renderer.go | 4 ++-- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index e010a47..a26853f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -36,3 +36,8 @@ linters: issues: exclude-use-default: true max-issues-per-linter: 0 + +linters-settings: + gocritic: + disabled-checks: + - ifElseChain diff --git a/config/config.go b/config/config.go index 9917e09..c9d756a 100644 --- a/config/config.go +++ b/config/config.go @@ -35,7 +35,8 @@ var bkmkPath string var DownloadsDir string // Feeds -var FeedJson io.ReadCloser + +var FeedJSON io.ReadCloser var feedDir string var FeedPath string @@ -162,7 +163,7 @@ func Init() error { return err } f, _ = os.OpenFile(FeedPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0666) - FeedJson = f + FeedJSON = f // *** Downloads paths, setup, and creation *** diff --git a/display/tab.go b/display/tab.go index b8982aa..f192720 100644 --- a/display/tab.go +++ b/display/tab.go @@ -102,7 +102,7 @@ func makeNewTab() *tab { // There's still a selection, but a different key was pressed, not Enter index, _ := strconv.Atoi(currentSelection[0]) - if key == tcell.KeyTab { //nolint:gocritic + if key == tcell.KeyTab { index = (index + 1) % numSelections } else if key == tcell.KeyBacktab { index = (index - 1 + numSelections) % numSelections diff --git a/feeds/feeds.go b/feeds/feeds.go index cc94f62..f5eeb64 100644 --- a/feeds/feeds.go +++ b/feeds/feeds.go @@ -34,12 +34,12 @@ var writeMu = sync.Mutex{} // Init should be called after config.Init. func Init() error { - defer config.FeedJson.Close() + defer config.FeedJSON.Close() - dec := json.NewDecoder(config.FeedJson) + dec := json.NewDecoder(config.FeedJSON) err := dec.Decode(&data) if err != nil && err != io.EOF { - return fmt.Errorf("feeds json is corrupted: %v", err) + return fmt.Errorf("feeds json is corrupted: %v", err) //nolint:goerr113 } go updateAll() @@ -84,7 +84,7 @@ func GetFeed(mediatype, filename string, r io.Reader) (*gofeed.Feed, bool) { return feed, err == nil } -func writeJson() error { +func writeJSON() error { writeMu.Lock() defer writeMu.Unlock() @@ -121,7 +121,7 @@ func AddFeed(url string, feed *gofeed.Feed) error { data.Feeds[url] = feed data.feedMu.Unlock() - err := writeJson() + err := writeJSON() if err != nil { // Don't use in-memory if it couldn't be saved data.feedMu.Lock() @@ -136,10 +136,10 @@ func AddFeed(url string, feed *gofeed.Feed) error { // Do not use it to update a page, as it only resets the hash. func AddPage(url string) error { data.pageMu.Lock() - data.Pages[url] = &pageJson{} // No hash yet + data.Pages[url] = &pageJSON{} // No hash yet data.pageMu.Unlock() - err := writeJson() + err := writeJSON() if err != nil { // Don't use in-memory if it couldn't be saved data.pageMu.Lock() @@ -197,14 +197,14 @@ func updatePage(url string) error { data.pageMu.Lock() if data.Pages[url].Hash != newHash { // Page content is different - data.Pages[url] = &pageJson{ + data.Pages[url] = &pageJSON{ Hash: newHash, Changed: time.Now().UTC(), } } data.pageMu.Unlock() - err = writeJson() + err = writeJSON() if err != nil { // Don't use in-memory if it couldn't be saved data.pageMu.Lock() @@ -227,10 +227,10 @@ func updateAll() { defer wg.Done() for j := range jobs { if j[0] == "feed" { - updateFeed(j[1]) + updateFeed(j[1]) //nolint:errcheck } if j[0] == "page" { - updatePage(j[1]) + updatePage(j[1]) //nolint:errcheck } } } diff --git a/feeds/structs.go b/feeds/structs.go index 9deab89..7832495 100644 --- a/feeds/structs.go +++ b/feeds/structs.go @@ -36,7 +36,7 @@ type jsonData struct { feedMu sync.RWMutex pageMu sync.RWMutex Feeds map[string]*gofeed.Feed `json:"feeds,omitempty"` - Pages map[string]*pageJson `json:"pages,omitempty"` + Pages map[string]*pageJSON `json:"pages,omitempty"` } // Lock locks both feed and page mutexes. @@ -63,7 +63,7 @@ func (j *jsonData) RUnlock() { j.pageMu.RUnlock() } -type pageJson struct { +type pageJSON struct { Hash string `json:"hash"` Changed time.Time `json:"changed"` // When the latest change happened } diff --git a/renderer/renderer.go b/renderer/renderer.go index 05a17b1..4046553 100644 --- a/renderer/renderer.go +++ b/renderer/renderer.go @@ -101,11 +101,11 @@ func convertRegularGemini(s string, numLinks, width int) (string, []string) { for i := range lines { lines[i] = strings.TrimRight(lines[i], " \r\t\n") - if strings.HasPrefix(lines[i], "#") { //nolint:gocritic + if strings.HasPrefix(lines[i], "#") { // Headings var tag string if viper.GetBool("a-general.color") { - if strings.HasPrefix(lines[i], "###") { //nolint:gocritic + if strings.HasPrefix(lines[i], "###") { tag = fmt.Sprintf("[%s::b]", config.GetColorString("hdg_3")) } else if strings.HasPrefix(lines[i], "##") { tag = fmt.Sprintf("[%s::b]", config.GetColorString("hdg_2"))