From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 19 Feb 2025 06:59:24 +0000 (+0300)
Subject: Slightly modernised code
X-Git-Tag: v0.35.0~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=8207cec7220e17a6cf60cef767daba3336e1dccf;p=sgblog.git

Slightly modernised code
---

diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go
index fe228c9..1517117 100644
--- 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 ae7dcc4..1944ae0 100644
--- 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 bfd7e56..b398716 100644
--- 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 758c6fd..a48c1f8 100644
--- 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
 	}