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 +++--- diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go index fb88e3e026a8a69d7aff5c98b349c11e724e4abf03cc1f364f87b59c73f5a5ac..d15eb3d4c878f01fee31a852521d96c278387143307212b634240ad239b1cc63 100644 --- a/cmd/sgblog-comment-add/main.go +++ b/cmd/sgblog-comment-add/main.go @@ -128,7 +128,7 @@ subj = hashFinder.FindString(subj) 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 3c380d91844bae373e53ba5c997aff4a85dabe8a6025380613562179f30f5237..5824b673715410c1010a150e874021f563e2c1b294f82d7b2159819e7065d141 100644 --- a/cmd/sgblog-topics/main.go +++ b/cmd/sgblog-topics/main.go @@ -25,6 +25,7 @@ "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 @@ headHash := head.Hash() 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 @@ } 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 f5c85159ba5440b1e738bd4e85cf8a52d256a245808330381d81727d6ac690d0..79e89707a5695480a601c2c55846af5c3dc33a9a1eb66b33104c54b866380023 100644 --- a/cmd/sgblog/gemini.go +++ b/cmd/sgblog/gemini.go @@ -124,7 +124,8 @@ 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 4d40129373d921574ffdecc4caa9947f408e31b71c8e24c8f21df31c9f898a28..1d7e18f900f62e5ed186f7035551666de82d6f2426c5f6cb18127ca3191c5c13 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -48,10 +48,10 @@ 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 @@ 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 67b41d485487e163cc1fdf4162fe349d6e2ba052b09f615168fd8d5213eba385..271bdd2045422205c798cf738f40842ddaf6bd20b924693a26f5f593e36facbf 100644 --- a/cmd/sgblog/http.go +++ b/cmd/sgblog/http.go @@ -38,6 +38,7 @@ "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 @@ if err != nil { 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 @@ } 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 @@ } 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 @@ var commits CommitIterNext 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 @@ commit, err = repoLog.Next() 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 @@ Body: strings.Join(htmlized, "\n"), }, }) } - data, err := xml.MarshalIndent(&feed, "", " ") + var data []byte + data, err = xml.MarshalIndent(&feed, "", " ") if err != nil { makeErr(err, http.StatusInternalServerError) } @@ -730,7 +742,7 @@ } 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 2c831152889423e7dd413e3dca8fe37aa5468d1b6998f098701b6bdeb57047be..2709f899af8226319f24bc41833b4fbfca05c5bd9454e5c0ce7b8471d1a4e85d 100644 --- a/cmd/sgblog/img.go +++ b/cmd/sgblog/img.go @@ -27,8 +27,8 @@ 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 14940b9f3000d7327ed7382748fdaf03ba3108a1d81cced7173a49060addb8f9..f7418b5a6fc947853d86c05f9b7f800274cc780ba9759195c2a5518eb577f285 100644 --- a/cmd/sgblog/topics.go +++ b/cmd/sgblog/topics.go @@ -31,8 +31,8 @@ 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 @@ tmpPath := cfg.TopicsCachePath + suffix 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()