cmd/sgblog/gemini.go | 9 +++------ cmd/sgblog/gopher.go | 9 +++------ cmd/sgblog/http.go | 19 ++++++++----------- cmd/sgblog/main.go | 2 +- diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go index cd131d1a8495f6a597357a02fe09c5f0ca18dde7868bbd6251c9d044fa22ad21..d5826ede976d76c7ff522e4051e3a837857d9e5dfc8601aac6b2491d6ccc4c24 100644 --- a/cmd/sgblog/gemini.go +++ b/cmd/sgblog/gemini.go @@ -112,7 +112,7 @@ commitN += offset } commits = &HashesIter{hashes} } else { - for i := 0; i < offset; i++ { + for range offset { if _, err = repoLog.Next(); err != nil { break } @@ -123,7 +123,7 @@ } logEnded := false entries := make([]TableMenuEntry, 0, PageEntries) - for i := 0; i < PageEntries; i++ { + for range PageEntries { var commit *object.Commit commit, err = commits.Next() if err != nil { @@ -144,10 +144,7 @@ repo, topicsTree, commit.Hash, )), }) } - offsetPrev := offset - PageEntries - if offsetPrev < 0 { - offsetPrev = 0 - } + offsetPrev := max(offset-PageEntries, 0) err = TmplGemMenu.Execute(os.Stdout, struct { T *spreak.Localizer Cfg *Cfg diff --git a/cmd/sgblog/gopher.go b/cmd/sgblog/gopher.go index b09d336d037567a8e49f397661f0f298c9986e7e50e0455b95af5ab83c0226a0..8b542a7a6f700e988f8f3ddc9343ea822dbe043b80b13f8142a1bbc3b73016d0 100644 --- a/cmd/sgblog/gopher.go +++ b/cmd/sgblog/gopher.go @@ -149,7 +149,7 @@ topic = selectorParts[0] } var commits CommitIterNext if topic == "" { - for i := 0; i < offset; i++ { + for range offset { if _, err = repoLog.Next(); err != nil { break } @@ -168,7 +168,7 @@ } logEnded := false entries := make([]TableMenuEntry, 0, PageEntries) - for i := 0; i < PageEntries; i++ { + for range PageEntries { var commit *object.Commit commit, err = commits.Next() if err != nil { @@ -189,10 +189,7 @@ repo, topicsTree, commit.Hash, )), }) } - offsetPrev := offset - PageEntries - if offsetPrev < 0 { - offsetPrev = 0 - } + offsetPrev := max(offset-PageEntries, 0) err = TmplGopherMenu.Execute(os.Stdout, struct { T *spreak.Localizer Cfg *Cfg diff --git a/cmd/sgblog/http.go b/cmd/sgblog/http.go index acb22ca0b6bebcd33febf4e713579e45f0591ed2d1b9800f1f2135755873659d..3460e0f9ec9f257c4114bd1cfb5cfcb8f1666072182e479821d6e0e8950ca314 100644 --- a/cmd/sgblog/http.go +++ b/cmd/sgblog/http.go @@ -123,7 +123,7 @@ } return strings.Join(cols, " ") } -func lineURLizeInTemplate(urlPrefix, line interface{}) string { +func lineURLizeInTemplate(urlPrefix, line any) string { return lineURLize(urlPrefix.(string), line.(string)) } @@ -250,7 +250,7 @@ var out io.Writer out = &outBuf var zstdWriter *zstd.Encoder acceptEncoding := os.Getenv("HTTP_ACCEPT_ENCODING") - for _, encoding := range strings.Split(acceptEncoding, ", ") { + for encoding := range strings.SplitSeq(acceptEncoding, ", ") { if encoding == "zstd" { zstdWriter, err = zstd.NewWriter(&outBuf, zstd.WithEncoderLevel(zstd.SpeedDefault)) if err != nil { @@ -296,7 +296,7 @@ commitN += offset } commits = &HashesIter{hashes} } else { - for i := 0; i < offset; i++ { + for range offset { if _, err = repoLog.Next(); err != nil { break } @@ -312,7 +312,7 @@ etagHash.Write([]byte(data)) } etagHash.Write([]byte("INDEX")) etagHash.Write([]byte(topic)) - for i := 0; i < PageEntries; i++ { + for range PageEntries { var commit *object.Commit commit, err = commits.Next() if err != nil { @@ -350,10 +350,7 @@ entry.ImagesNum = len(listImgs(cfg, entry.Commit.Hash)) entry.Topics = sgblog.ParseTopics(entry.TopicsRaw) entries[i] = entry } - offsetPrev := offset - PageEntries - if offsetPrev < 0 { - offsetPrev = 0 - } + offsetPrev := max(offset-PageEntries, 0) os.Stdout.Write([]byte(startHeader(etagHash, zstdWriter != nil))) err = TmplHTMLIndex.Execute(out, struct { T *spreak.Localizer @@ -401,7 +398,7 @@ repoLog, err := repo.Log(&git.LogOptions{From: *headHash}) if err != nil { makeErr(err, http.StatusInternalServerError) } - for i := 0; i < PageEntries; i++ { + for range PageEntries { commit, err = repoLog.Next() if err != nil { break @@ -477,7 +474,7 @@ } commits = &HashesIter{hashes} } - for i := 0; i < PageEntries; i++ { + for range PageEntries { commit, err = commits.Next() if err != nil { break @@ -553,7 +550,7 @@ repoLog, err := repo.Log(&git.LogOptions{From: commentsRef.Hash()}) if err != nil { makeErr(err, http.StatusInternalServerError) } - for i := 0; i < PageEntries; i++ { + for range PageEntries { commit, err = repoLog.Next() if err != nil { break diff --git a/cmd/sgblog/main.go b/cmd/sgblog/main.go index f9a8f019dc99f692efc612a142179229c8c92bab19c84d7b3e4ef3b603a91685..eca131a7b1aac04961c6c144c0897f13bd07c4ab5777a53cfddb6c713f0d6688 100644 --- a/cmd/sgblog/main.go +++ b/cmd/sgblog/main.go @@ -141,7 +141,7 @@ cfgRaw, err := os.ReadFile(cfgPath) if err != nil { return nil, err } - var cfgGeneral map[string]interface{} + var cfgGeneral map[string]any if err = hjson.Unmarshal(cfgRaw, &cfgGeneral); err != nil { return nil, err }