Permalink
Browse files

hugolib: Add .Site.Sites

Fixes #5504
  • Loading branch information...
bep committed Dec 6, 2018
1 parent 831d23c commit 8378358857d852458d01c667d59d13baa59a719c
Showing with 22 additions and 8 deletions.
  1. +8 −0 hugolib/hugo_sites.go
  2. +1 −6 hugolib/page.go
  3. +4 −0 hugolib/site.go
  4. +9 −2 hugolib/template_test.go
@@ -55,6 +55,14 @@ type HugoSites struct {
gitInfo *gitInfo
}

func (h *HugoSites) siteInfos() SiteInfos {
infos := make(SiteInfos, len(h.Sites))
for i, site := range h.Sites {
infos[i] = &site.Info
}
return infos
}

func (h *HugoSites) pickOneAndLogTheRest(errors []error) error {
if len(errors) == 0 {
return nil
@@ -369,12 +369,7 @@ func (p *Page) Summary() template.HTML {

// Sites is a convenience method to get all the Hugo sites/languages configured.
func (p *Page) Sites() SiteInfos {
infos := make(SiteInfos, len(p.s.owner.Sites))
for i, site := range p.s.owner.Sites {
infos[i] = &site.Info
}

return infos
return p.s.owner.siteInfos()
}

// SearchKeywords implements the related.Document interface needed for fast page searches.
@@ -424,6 +424,10 @@ func (s *SiteInfo) Hugo() hugo.Info {
return s.hugoInfo
}

// Sites is a convenience method to get all the Hugo sites/languages configured.
func (s *SiteInfo) Sites() SiteInfos {
return s.s.owner.siteInfos()
}
func (s *SiteInfo) String() string {
return fmt.Sprintf("Site(%q)", s.Title)
}
@@ -242,6 +242,7 @@ func TestTemplateFuncs(t *testing.T) {
b := newTestSitesBuilder(t).WithDefaultMultiSiteConfig()

homeTpl := `Site: {{ site.Language.Lang }} / {{ .Site.Language.Lang }} / {{ site.BaseURL }}
Sites: {{ site.Sites.First.Home.Language.Lang }}
Hugo: {{ hugo.Generator }}
`

@@ -252,8 +253,14 @@ Hugo: {{ hugo.Generator }}

b.CreateSites().Build(BuildCfg{})

b.AssertFileContent("public/en/index.html", "Site: en / en / http://example.com/blog",
b.AssertFileContent("public/en/index.html",
"Site: en / en / http://example.com/blog",
"Sites: en",
"Hugo: <meta name=\"generator\" content=\"Hugo")
b.AssertFileContent("public/fr/index.html", "Site: fr / fr / http://example.com/blog")
b.AssertFileContent("public/fr/index.html",
"Site: fr / fr / http://example.com/blog",
"Sites: en",
"Hugo: <meta name=\"generator\" content=\"Hugo",
)

}

0 comments on commit 8378358

Please sign in to comment.