feat: display update time on index file

Author: saitho

git/repo.go

@@ -32,6 +32,12 @@ func (g *GitHandler) DownloadRepository() error {
 	return nil
 }
 
+func (g *GitHandler) GetUpdatedTime() int64 {
+	cacheFile, _ := ioutil.ReadFile(g.getCacheFilePath())
+	cacheTime, _ := strconv.Atoi(string(cacheFile))
+	return int64(cacheTime)
+}
+
 func (g *GitHandler) IsUpToDate() bool {
 	// File does not exist
 	_, err := os.Stat(g.getDownloadPath())
@@ -44,9 +50,7 @@ func (g *GitHandler) IsUpToDate() bool {
 	}
 
 	// Check if cache is up to date (within cacheTime interval)
-	cacheFile, _ := ioutil.ReadFile(g.getCacheFilePath())
-	cacheTime, _ := strconv.Atoi(string(cacheFile))
-	return time.Now().Unix() <= int64(cacheTime+g.Cfg.Git.Update.Cache.Time)
+	return time.Now().Unix() <= (g.GetUpdatedTime() + int64(g.Cfg.Git.Update.Cache.Time))
 }
 
 func (g *GitHandler) GetBranches() []string {

go.sum

@@ -41,8 +41,6 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/koron/go-github-webhook v0.0.0-20150705120715-fd8c61b5db99 h1:VXfv5FnSQV1UYzBHzX0PsqdO4g+0DyydTszhx0DzB/E=
-github.com/koron/go-github-webhook v0.0.0-20150705120715-fd8c61b5db99/go.mod h1:QsucCvHs4fa2IawkhLpASmQB9h9Wo8oIBt7UsACCIRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=

main.go

@@ -7,6 +7,7 @@ import (
 	"github.com/markbates/pkger"
 	"github.com/saitho/static-git-file-server/rendering"
 	"net/http"
+	"time"
 
 	"github.com/saitho/static-git-file-server/config"
 	"github.com/saitho/static-git-file-server/git"
@@ -74,6 +75,7 @@ func main() {
 			ShowTags     bool
 			Branches     []string
 			Tags         []git.GitTag
+			LastUpdate   time.Time
 		}
 
 		content, err := rendering.RenderTemplate("/tmpl/index.html", IndexTmplParams{
@@ -82,6 +84,7 @@ func main() {
 			ShowTags:     cfg.Display.Index.ShowTags,
 			Branches:     gitHandler.GetBranches(),
 			Tags:         gitHandler.GetTags(),
+			LastUpdate:   time.Unix(gitHandler.GetUpdatedTime(), 0),
 		})
 		if err != nil {
 			resp.Text(http.StatusInternalServerError, err.Error())

tmpl/index.html

@@ -1,6 +1,10 @@
-<h1>Git Repo</h1>
-<h2>Git Remote: {{ .Cfg.Git.Url }}</h2>
+<header>
+    <h1>Git Repo</h1>
+    <h2>Git Remote: {{ .Cfg.Git.Url }}</h2>
+    <h3>Last Update: {{ .LastUpdate }}</h3>
+</header>
 
+<main>
 {{ if .ShowBranches }}
 <h2>Branches</h2>
 {{ range $value := .Branches }}<a href="/branch/{{ . }}">{{ . }}<br></a>{{ end }}
@@ -12,3 +16,9 @@ <h2>Tags</h2>
 <a href="/tag/{{ .Tag }}">{{ .Tag }} {{ if $.Cfg.Display.Tags.ShowDate }}({{ .Date }}){{ end }}<br/></a>
 {{ end }}
 {{ end }}
+</main>
+
+<footer>
+    <hr />
+    Powered by <a href="https://github.com/saitho/git-file-webserver" target="_blank">Git File Webserver</a>
+</footer>