Slightly modernised code

diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go
index fe228c9af3a4bb295de20c6681c01b15f2b23a4b..1517117714d0d9d13433ba31a1588c65cd91683c 100644 (file)
--- a/cmd/sgblog/gemini.go
+++ b/cmd/sgblog/gemini.go
@@ -112,7 +112,7 @@ func serveGemini(cfgPath string) {
                        }
                        commits = &HashesIter{hashes}
                } else {
-                       for i := 0; i < offset; i++ {
+                       for range offset {
                                if _, err = repoLog.Next(); err != nil {
                                        break
                                }
@@ -123,7 +123,7 @@ func serveGemini(cfgPath string) {
 
                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 @@ func serveGemini(cfgPath string) {
                                )),
                        })
                }
-               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 ae7dcc4195e2b15868329a3c829f0526bfede956..1944ae0362fbff5e471f2f3cb44afac161e1a973 100644 (file)
--- a/cmd/sgblog/gopher.go
+++ b/cmd/sgblog/gopher.go
@@ -149,7 +149,7 @@ Redirecting to <a href="%s">%s</a>...
                }
                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 @@ Redirecting to <a href="%s">%s</a>...
 
                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 @@ Redirecting to <a href="%s">%s</a>...
                                )),
                        })
                }
-               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 bfd7e56c237845b49832c2419b27d7dafd39ef9b..b398716e084eb381bfc9aff265e8d7c57b165672 100644 (file)
--- a/cmd/sgblog/http.go
+++ b/cmd/sgblog/http.go
@@ -123,7 +123,7 @@ func lineURLize(urlPrefix, line string) string {
        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 @@ func serveHTTP() {
        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 @@ func serveHTTP() {
                        }
                        commits = &HashesIter{hashes}
                } else {
-                       for i := 0; i < offset; i++ {
+                       for range offset {
                                if _, err = repoLog.Next(); err != nil {
                                        break
                                }
@@ -312,7 +312,7 @@ func serveHTTP() {
                }
                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 @@ func serveHTTP() {
                        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 @@ func serveHTTP() {
                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 @@ func serveHTTP() {
                        commits = &HashesIter{hashes}
                }
 
-               for i := 0; i < PageEntries; i++ {
+               for range PageEntries {
                        commit, err = commits.Next()
                        if err != nil {
                                break
@@ -553,7 +550,7 @@ func serveHTTP() {
                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 758c6fd8679bd8f6fca2e0038708bc31dc3c0cf0..a48c1f884ff06bebdffcb3fed38c4b4cad9364c7 100644 (file)
--- a/cmd/sgblog/main.go
+++ b/cmd/sgblog/main.go
@@ -141,7 +141,7 @@ func readCfg(cfgPath string) (*Cfg, error) {
        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
        }