Add build date to version banner

Author: dustywusty

internal/templates/game.html

@@ -454,6 +454,7 @@
           rel="noopener"
           >{{COMMIT}}</a
         >
+        ({{BUILD_DATE}})
       </div>
     </footer>
     <script

internal/templates/home.html

@@ -271,6 +271,7 @@ <h2>Recent games (this browser)</h2>
           rel="noopener"
           >{{COMMIT}}</a
         >
+        ({{BUILD_DATE}})
       </div>
     </footer>
     <script

internal/templates/templates.go

@@ -8,8 +8,12 @@ import (
 )
 
 var commit = "dev"
+var buildDate = ""
 
-func SetCommit(c string) { commit = c }
+func SetVersion(c, d string) {
+	commit = c
+	buildDate = d
+}
 
 // WriteHomeHTML serves the home page template
 func WriteHomeHTML(w http.ResponseWriter) {
@@ -23,6 +27,7 @@ func WriteHomeHTML(w http.ResponseWriter) {
 		return
 	}
 	html := strings.ReplaceAll(string(content), "{{COMMIT}}", commit)
+	html = strings.ReplaceAll(html, "{{BUILD_DATE}}", buildDate)
 	_, _ = w.Write([]byte(html))
 }
 
@@ -40,6 +45,7 @@ func WriteGameHTML(w http.ResponseWriter, gameID string) {
 
 	html := strings.ReplaceAll(string(content), "{{GAME_ID}}", gameID)
 	html = strings.ReplaceAll(html, "{{COMMIT}}", commit)
+	html = strings.ReplaceAll(html, "{{BUILD_DATE}}", buildDate)
 	_, _ = w.Write([]byte(html))
 }
 

main.go

@@ -18,7 +18,7 @@ func main() {
 	flag.Parse()
 	logging.Debug = *debug
 
-	templates.SetCommit(commit)
+	templates.SetVersion(commit, buildDate)
 
 	if dsn := os.Getenv("DATABASE_URL"); dsn != "" {
 		if _, err := storage.New(dsn); err != nil {

version.go

@@ -4,26 +4,38 @@ import (
 	"os/exec"
 	"runtime/debug"
 	"strings"
+	"time"
 )
 
 var commit = "dev"
+var buildDate = ""
 
 func init() {
-	if commit != "dev" {
-		return
-	}
 	if info, ok := debug.ReadBuildInfo(); ok {
 		for _, s := range info.Settings {
-			if s.Key == "vcs.revision" && s.Value != "" {
-				commit = s.Value
-				if len(commit) > 7 {
-					commit = commit[:7]
+			switch s.Key {
+			case "vcs.revision":
+				if commit == "dev" && s.Value != "" {
+					commit = s.Value
+					if len(commit) > 7 {
+						commit = commit[:7]
+					}
+				}
+			case "vcs.time":
+				if buildDate == "" && s.Value != "" {
+					if t, err := time.Parse(time.RFC3339, s.Value); err == nil {
+						buildDate = t.Format("1-2-2006")
+					}
 				}
-				return
 			}
 		}
 	}
-	if c, err := exec.Command("git", "rev-parse", "--short", "HEAD").Output(); err == nil {
-		commit = strings.TrimSpace(string(c))
+	if commit == "dev" {
+		if c, err := exec.Command("git", "rev-parse", "--short", "HEAD").Output(); err == nil {
+			commit = strings.TrimSpace(string(c))
+		}
+	}
+	if buildDate == "" {
+		buildDate = time.Now().Format("1-2-2006")
 	}
 }