From 89ca30f62cdb955b58e4138f23ccc24144426a1c Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Tue, 6 Aug 2024 15:34:19 +0300 Subject: [PATCH] Fix various lint warnings and suggestions --- cmd/sgblog-comment-add/main.go | 2 +- cmd/sgblog-topics/main.go | 9 +++++++-- cmd/sgblog/gemini.go | 3 ++- cmd/sgblog/gopher.go | 5 +++-- cmd/sgblog/http.go | 32 ++++++++++++++++++++++---------- cmd/sgblog/img.go | 2 +- cmd/sgblog/topics.go | 6 +++--- 7 files changed, 39 insertions(+), 20 deletions(-) diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go index 542b68c..5c1abc2 100644 --- a/cmd/sgblog-comment-add/main.go +++ b/cmd/sgblog-comment-add/main.go @@ -128,7 +128,7 @@ func main() { if subj == "" { log.Fatal("no commit hash found in subject") } - if h, err := hex.DecodeString(subj); err != nil || len(h) != sha1.Size { + if h, errHex := hex.DecodeString(subj); errHex != nil || len(h) != sha1.Size { os.Exit(0) } fromCols := strings.Fields(from) diff --git a/cmd/sgblog-topics/main.go b/cmd/sgblog-topics/main.go index 46f0995..ea242ee 100644 --- a/cmd/sgblog-topics/main.go +++ b/cmd/sgblog-topics/main.go @@ -25,6 +25,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/storer" "go.stargrave.org/sgblog" ) @@ -50,7 +51,9 @@ func main() { var topicsRef *plumbing.Reference var topicsTree *object.Tree - if notes, err := repo.Notes(); err == nil { + var notes storer.ReferenceIter + notes, err = repo.Notes() + if err == nil { notes.ForEach(func(ref *plumbing.Reference) error { if string(ref.Name()) == *topicsRefName { topicsRef = ref @@ -58,7 +61,9 @@ func main() { return nil }) if topicsRef != nil { - if topicsCommit, err := repo.CommitObject(topicsRef.Hash()); err == nil { + var topicsCommit *object.Commit + topicsCommit, err = repo.CommitObject(topicsRef.Hash()) + if err == nil { topicsTree, _ = topicsCommit.Tree() } } diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go index 6a19509..a31c66d 100644 --- a/cmd/sgblog/gemini.go +++ b/cmd/sgblog/gemini.go @@ -124,7 +124,8 @@ func serveGemini(cfgPath string) { logEnded := false entries := make([]TableMenuEntry, 0, PageEntries) for i := 0; i < PageEntries; i++ { - commit, err := commits.Next() + var commit *object.Commit + commit, err = commits.Next() if err != nil { logEnded = true break diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go index 0eb5e3e..9750049 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -48,10 +48,10 @@ var ( type TableMenuEntry struct { Commit *object.Commit Title string + Topics []string LinesNum int ImagesNum int CommentsNum int - Topics []string } func serveGopher(cfgPath string) { @@ -169,7 +169,8 @@ Redirecting to %s... logEnded := false entries := make([]TableMenuEntry, 0, PageEntries) for i := 0; i < PageEntries; i++ { - commit, err := commits.Next() + var commit *object.Commit + commit, err = commits.Next() if err != nil { logEnded = true break diff --git a/cmd/sgblog/http.go b/cmd/sgblog/http.go index 000037a..861121f 100644 --- a/cmd/sgblog/http.go +++ b/cmd/sgblog/http.go @@ -38,6 +38,7 @@ import ( "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/storer" "github.com/klauspost/compress/zstd" "github.com/vorlif/spreak" "go.stargrave.org/sgblog" @@ -79,8 +80,8 @@ type TableEntry struct { Commit *object.Commit CommentsRaw []byte TopicsRaw []byte - Num int Title string + Num int LinesNum int CommentsNum int ImagesNum int @@ -214,7 +215,9 @@ func serveHTTP() { makeErr(err, http.StatusInternalServerError) } - if notes, err := repo.Notes(); err == nil { + var notes storer.ReferenceIter + notes, err = repo.Notes() + if err == nil { var notesRef *plumbing.Reference var commentsRef *plumbing.Reference notes.ForEach(func(ref *plumbing.Reference) error { @@ -227,12 +230,16 @@ func serveHTTP() { return nil }) if notesRef != nil { - if commentsCommit, err := repo.CommitObject(notesRef.Hash()); err == nil { + var commentsCommit *object.Commit + commentsCommit, err = repo.CommitObject(notesRef.Hash()) + if err == nil { notesTree, _ = commentsCommit.Tree() } } if commentsRef != nil { - if commentsCommit, err := repo.CommitObject(commentsRef.Hash()); err == nil { + var commentsCommit *object.Commit + commentsCommit, err = repo.CommitObject(commentsRef.Hash()) + if err == nil { commentsTree, _ = commentsCommit.Tree() } } @@ -306,7 +313,8 @@ func serveHTTP() { etagHash.Write([]byte("INDEX")) etagHash.Write([]byte(topic)) for i := 0; i < PageEntries; i++ { - commit, err := commits.Next() + var commit *object.Commit + commit, err = commits.Next() if err != nil { logEnded = true break @@ -457,7 +465,8 @@ func serveHTTP() { if topic == "" { commits = repoLog } else { - topicsCache, err := getTopicsCache(cfg, repoLog) + var topicsCache TopicsCache + topicsCache, err = getTopicsCache(cfg, repoLog) if err != nil { makeErr(err, http.StatusInternalServerError) } @@ -549,11 +558,13 @@ func serveHTTP() { if err != nil { break } - fileStats, err := commit.Stats() + var fileStats object.FileStats + fileStats, err = commit.Stats() if err != nil { makeErr(err, http.StatusInternalServerError) } - t, err := commit.Tree() + var t *object.Tree + t, err = commit.Tree() if err != nil { makeErr(err, http.StatusInternalServerError) } @@ -708,7 +719,8 @@ func serveHTTP() { }, }) } - data, err := xml.MarshalIndent(&feed, "", " ") + var data []byte + data, err = xml.MarshalIndent(&feed, "", " ") if err != nil { makeErr(err, http.StatusInternalServerError) } @@ -730,7 +742,7 @@ func serveHTTP() { commentsParsed := sgblog.ParseComments(commentsRaw) comments := make([]CommentEntry, 0, len(commentsParsed)) for _, comment := range commentsParsed { - lines := strings.Split(comment, "\n") + lines = strings.Split(comment, "\n") comments = append(comments, CommentEntry{lines[:3], lines[3:]}) } var notesLines []string diff --git a/cmd/sgblog/img.go b/cmd/sgblog/img.go index d27141c..bdd222d 100644 --- a/cmd/sgblog/img.go +++ b/cmd/sgblog/img.go @@ -27,8 +27,8 @@ import ( type Img struct { Path string Alt string - Size int64 Typ string + Size int64 } var ImgTypes = map[string]string{ diff --git a/cmd/sgblog/topics.go b/cmd/sgblog/topics.go index 9308a8a..3795090 100644 --- a/cmd/sgblog/topics.go +++ b/cmd/sgblog/topics.go @@ -31,8 +31,8 @@ import ( type TopicsCache map[string][]plumbing.Hash type TopicsCacheState struct { - Top plumbing.Hash Cache TopicsCache + Top plumbing.Hash } func (tc TopicsCache) Topics() []string { @@ -86,13 +86,13 @@ NoCache: fd, err := os.OpenFile( tmpPath, os.O_RDWR|os.O_CREATE|os.O_EXCL, - os.FileMode(0666), + os.FileMode(0o666), ) if err != nil { return cache, err } enc := gob.NewEncoder(fd) - err = enc.Encode(&TopicsCacheState{top, cache}) + err = enc.Encode(&TopicsCacheState{cache, top}) if err != nil { os.Remove(tmpPath) fd.Close() -- 2.48.1