From ce6e4310febf5659392a41b543594382441f3681 Mon Sep 17 00:00:00 2001
From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sun, 11 Mar 2018 18:59:11 +0100
Subject: Refactor the GitInfo into the date handlers

Fixes #4495
---
 hugolib/gitinfo.go | 46 ++++++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

(limited to 'hugolib/gitinfo.go')

diff --git a/hugolib/gitinfo.go b/hugolib/gitinfo.go
index bfcfa9a42..affa9cea8 100644
--- a/hugolib/gitinfo.go
+++ b/hugolib/gitinfo.go
@@ -19,51 +19,41 @@ import (
 	"strings"
 
 	"github.com/bep/gitmap"
+	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/helpers"
 )
 
-func (h *HugoSites) assembleGitInfo() {
-	if !h.Cfg.GetBool("enableGitInfo") {
-		return
+type gitInfo struct {
+	contentDir string
+	repo       *gitmap.GitRepo
+}
+
+func (g *gitInfo) forPage(p *Page) (*gitmap.GitInfo, bool) {
+	if g == nil {
+		return nil, false
 	}
+	name := path.Join(g.contentDir, filepath.ToSlash(p.Path()))
+	return g.repo.Files[name], true
+}
 
+func newGitInfo(cfg config.Provider) (*gitInfo, error) {
 	var (
-		workingDir = h.Cfg.GetString("workingDir")
-		contentDir = h.Cfg.GetString("contentDir")
+		workingDir = cfg.GetString("workingDir")
+		contentDir = cfg.GetString("contentDir")
 	)
 
 	gitRepo, err := gitmap.Map(workingDir, "")
 	if err != nil {
-		h.Log.ERROR.Printf("Got error reading Git log: %s", err)
-		return
+		return nil, err
 	}
 
-	gitMap := gitRepo.Files
 	repoPath := filepath.FromSlash(gitRepo.TopLevelAbsPath)
-
 	// The Hugo site may be placed in a sub folder in the Git repo,
 	// one example being the Hugo docs.
 	// We have to find the root folder to the Hugo site below the Git root.
 	contentRoot := strings.TrimPrefix(workingDir, repoPath)
 	contentRoot = strings.TrimPrefix(contentRoot, helpers.FilePathSeparator)
+	contentDir = path.Join(filepath.ToSlash(contentRoot), contentDir)
 
-	s := h.Sites[0]
-
-	for _, p := range s.AllPages {
-		if p.Path() == "" {
-			// Home page etc. with no content file.
-			continue
-		}
-		// Git normalizes file paths on this form:
-		filename := path.Join(filepath.ToSlash(contentRoot), contentDir, filepath.ToSlash(p.Path()))
-		g, ok := gitMap[filename]
-		if !ok {
-			h.Log.WARN.Printf("Failed to find GitInfo for %q", filename)
-			continue
-		}
-
-		p.GitInfo = g
-		p.Lastmod = p.GitInfo.AuthorDate
-	}
-
+	return &gitInfo{contentDir: contentDir, repo: gitRepo}, nil
 }
-- 
cgit v1.2.3