From d5a0b6bbbc83a3e274c62ed397a293f04ee8d241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 17 Dec 2018 10:47:11 +0100 Subject: [PATCH] hugolib: Remove "double layout" lookup Fixes #5390 --- go.sum | 1 + hugolib/hugo_sites.go | 2 +- hugolib/site.go | 30 ------------------------------ hugolib/site_render.go | 6 +++--- 4 files changed, 5 insertions(+), 34 deletions(-) diff --git a/go.sum b/go.sum index f7cfa6da9..ea33a1abb 100644 --- a/go.sum +++ b/go.sum @@ -72,6 +72,7 @@ github.com/magefile/mage v1.4.0 h1:RI7B1CgnPAuu2O9lWszwya61RLmfL0KCdo+QyyI/Bhk= github.com/magefile/mage v1.4.0/go.mod h1:IUDi13rsHje59lecXokTfGX0QIzO45uVPlXnJYsXepA= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6 h1:LZhVjIISSbj8qLf2qDPP0D8z0uvOWAW5C85ly5mJW6c= github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88= github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index c1fa7979c..a211956df 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -486,7 +486,7 @@ func (h *HugoSites) renderCrossSitesArtifacts() error { smLayouts := []string{"sitemapindex.xml", "_default/sitemapindex.xml", "_internal/_default/sitemapindex.xml"} return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemapindex", - sitemapDefault.Filename, h.toSiteInfos(), s.appendThemeTemplates(smLayouts)...) + sitemapDefault.Filename, h.toSiteInfos(), smLayouts...) } func (h *HugoSites) assignMissingTranslations() error { diff --git a/hugolib/site.go b/hugolib/site.go index cf8b3a28d..2fd9f17ee 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -1648,36 +1648,6 @@ func (s *Site) errorCollator(results <-chan error, errs chan<- error) { close(errs) } -func (s *Site) appendThemeTemplates(in []string) []string { - if !s.PathSpec.ThemeSet() { - return in - } - - out := []string{} - // First place all non internal templates - for _, t := range in { - if !strings.HasPrefix(t, "_internal/") { - out = append(out, t) - } - } - - // Then place theme templates with the same names - for _, t := range in { - if !strings.HasPrefix(t, "_internal/") { - out = append(out, "theme/"+t) - } - } - - // Lastly place internal templates - for _, t := range in { - if strings.HasPrefix(t, "_internal/") { - out = append(out, t) - } - } - return out - -} - // GetPage looks up a page of a given type for the given ref. // In Hugo <= 0.44 you had to add Page Kind (section, home) etc. as the first // argument and then either a unix styled path (with or without a leading slash)) diff --git a/hugolib/site_render.go b/hugolib/site_render.go index a8cdca255..4ce2b4c53 100644 --- a/hugolib/site_render.go +++ b/hugolib/site_render.go @@ -303,7 +303,7 @@ func (s *Site) render404() error { s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err) } - return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, pageOutput, s.appendThemeTemplates(nfLayouts)...) + return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "404 page", targetPath, pageOutput, nfLayouts...) } func (s *Site) renderSitemap() error { @@ -354,7 +354,7 @@ func (s *Site) renderSitemap() error { addLanguagePrefix := n.Site.IsMultiLingual() return s.renderAndWriteXML(&s.PathSpec.ProcessingStats.Sitemaps, "sitemap", - n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, s.appendThemeTemplates(smLayouts)...) + n.addLangPathPrefixIfFlagSet(page.Sitemap.Filename, addLanguagePrefix), n, smLayouts...) } func (s *Site) renderRobotsTXT() error { @@ -385,7 +385,7 @@ func (s *Site) renderRobotsTXT() error { s.Log.ERROR.Printf("Failed to create target path for page %q: %s", p, err) } - return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", targetPath, pageOutput, s.appendThemeTemplates(rLayouts)...) + return s.renderAndWritePage(&s.PathSpec.ProcessingStats.Pages, "Robots Txt", targetPath, pageOutput, rLayouts...) }