Adjust all + Make sure we warn about duplicate paths for v0.123.0.md vs v0.124.0.md

Author: bep

common/hstrings/strings.go

@@ -16,11 +16,11 @@ package hstrings
 import (
 	"fmt"
 	"regexp"
+	"slices"
 	"strings"
 	"sync"
 
 	"github.com/gohugoio/hugo/compare"
-	"slices"
 )
 
 var _ compare.Eqer = StringEqualFold("")
@@ -128,7 +128,7 @@ func ToString(v any) (string, bool) {
 	return "", false
 }
 
-type Tuple struct {
-	First  string
-	Second string
-}
+type (
+	Strings2 [2]string
+	Strings3 [3]string
+)

common/paths/pathparser.go

@@ -704,6 +704,19 @@ func (p *Path) IdentifiersUnknown() []string {
 	return ids
 }
 
+func (p *Path) IdentifiersUnknownString() string {
+	var sb strings.Builder
+
+	for i, id := range p.identifiersUnknown {
+		if i > 0 {
+			sb.WriteString(".")
+		}
+		sb.WriteString(p.s[p.identifiers[id].Low:p.identifiers[id].High])
+	}
+
+	return sb.String()
+}
+
 func (p *Path) Type() Type {
 	return p.pathType
 }

create/content.go

@@ -291,7 +291,7 @@ func (b *contentBuilder) applyArcheType(contentFilename string, archetypeFi hugo
 func (b *contentBuilder) mapArcheTypeDir() error {
 	var m archetypeMap
 
-	seen := map[hstrings.Tuple]bool{}
+	seen := map[hstrings.Strings2]bool{}
 
 	walkFn := func(path string, fim hugofs.FileMetaInfo) error {
 		if fim.IsDir() {
@@ -301,7 +301,7 @@ func (b *contentBuilder) mapArcheTypeDir() error {
 		pi := fim.Meta().PathInfo
 
 		if pi.IsContent() {
-			pathLang := hstrings.Tuple{First: pi.PathBeforeLangAndOutputFormatAndExt(), Second: fim.Meta().Lang}
+			pathLang := hstrings.Strings2{pi.PathBeforeLangAndOutputFormatAndExt(), fim.Meta().Lang}
 			if seen[pathLang] {
 				// Duplicate content file, e.g. page.md and page.html.
 				// In the regular build, we will filter out the duplicates, but

hugolib/pages_capture.go

@@ -314,7 +314,7 @@ func (c *pagesCollector) collectDirDir(path string, root hugofs.FileMetaInfo, in
 			return nil, filepath.SkipDir
 		}
 
-		seen := map[hstrings.Tuple]bool{}
+		seen := map[hstrings.Strings3]bool{}
 		for _, fi := range readdir {
 			if fi.IsDir() {
 				continue
@@ -327,7 +327,7 @@ func (c *pagesCollector) collectDirDir(path string, root hugofs.FileMetaInfo, in
 			// These would eventually have been filtered out as duplicates when
 			// inserting them into the document store,
 			// but doing it here will preserve a consistent ordering.
-			baseLang := hstrings.Tuple{First: pi.Base(), Second: meta.Lang}
+			baseLang := hstrings.Strings3{pi.Base(), pi.IdentifiersUnknownString(), meta.Lang}
 			if seen[baseLang] {
 				continue
 			}
@@ -374,7 +374,7 @@ func (c *pagesCollector) collectDirDir(path string, root hugofs.FileMetaInfo, in
 
 func (c *pagesCollector) handleBundleLeaf(dir, bundle hugofs.FileMetaInfo, inPath string, readdir []hugofs.FileMetaInfo) error {
 	bundlePi := bundle.Meta().PathInfo
-	seen := map[hstrings.Tuple]bool{}
+	seen := map[hstrings.Strings2]bool{}
 
 	walk := func(path string, info hugofs.FileMetaInfo) error {
 		if info.IsDir() {
@@ -396,7 +396,7 @@ func (c *pagesCollector) handleBundleLeaf(dir, bundle hugofs.FileMetaInfo, inPat
 		// These would eventually have been filtered out as duplicates when
 		// inserting them into the document store,
 		// but doing it here will preserve a consistent ordering.
-		baseLang := hstrings.Tuple{First: pi.Base(), Second: info.Meta().Lang}
+		baseLang := hstrings.Strings2{pi.Base(), info.Meta().Lang}
 		if seen[baseLang] {
 			return nil
 		}

hugolib/site.go

@@ -834,7 +834,7 @@ func (s *Site) initRenderFormats() {
 	s.renderFormats = formats
 }
 
-func (s *Site) GetRelatedDocsHandler() *page.RelatedDocsHandler {
+func (s *Site) GetInternalRelatedDocsHandler() *page.RelatedDocsHandler {
 	return s.relatedDocsHandler
 }
 

resources/page/page.go

@@ -150,8 +150,8 @@ type InSectionPositioner interface {
 
 // InternalDependencies is considered an internal interface.
 type InternalDependencies interface {
-	// GetRelatedDocsHandler is for internal use only.
-	GetRelatedDocsHandler() *RelatedDocsHandler
+	// GetInternalRelatedDocsHandler is for internal use only.
+	GetInternalRelatedDocsHandler() *RelatedDocsHandler
 }
 
 // OutputFormatsProvider provides the OutputFormats of a Page.

resources/page/pages_related.go

@@ -129,7 +129,7 @@ func (p Pages) withInvertedIndex(ctx context.Context, search func(idx *related.I
 		return nil, fmt.Errorf("invalid type %T in related search", p[0])
 	}
 
-	cache := d.GetRelatedDocsHandler()
+	cache := d.GetInternalRelatedDocsHandler()
 
 	searchIndex, err := cache.getOrCreateIndex(ctx, p)
 	if err != nil {

resources/page/testhelpers_test.go

@@ -221,10 +221,14 @@ func (p *testPage) GetTerms(taxonomy string) Pages {
 	panic("testpage: not implemented")
 }
 
-func (p *testPage) GetRelatedDocsHandler() *RelatedDocsHandler {
+func (p *testPage) GetInternalRelatedDocsHandler() *RelatedDocsHandler {
 	return relatedDocsHandler
 }
 
+func (p *testPage) GetInternalTemplateBasePathAndDescriptor() (string, any) {
+	return "", nil
+}
+
 func (p *testPage) GitInfo() source.GitInfo {
 	return source.GitInfo{}
 }

tpl/tplimpl/templatedescriptor.go

@@ -141,7 +141,7 @@ func (this TemplateDescriptor) doCompare(category Category, other TemplateDescri
 	const (
 		weightKind         = 3 // page, home, section, taxonomy, term (and only those)
 		weightcustomLayout = 4 // custom layout (mylayout, set in e.g. front matter)
-		weightLayout       = 2 // standard layouts (single,list)
+		weightLayout       = 2 // standard layouts (single,list,all)
 		weightOutputFormat = 2 // a configured output format (e.g. rss, html, json)
 		weightMediaType    = 1 // a configured media type (e.g. text/html, text/plain)
 		weightLang         = 1 // a configured language (e.g. en, nn, fr, ...)
@@ -155,7 +155,7 @@ func (this TemplateDescriptor) doCompare(category Category, other TemplateDescri
 		// two templates /layouts/posts/single.html and /layouts/page.html,
 		// the first one is the best match even if the second one
 		// has a higher w1 value.
-		weight2Group1 = 1 // kind, standardl layout (single,list)
+		weight2Group1 = 1 // kind, standardl layout (single,list,all)
 		weight2Group2 = 2 // custom layout (mylayout)
 
 		weight3 = 1 // for media type, lang, output format.
@@ -170,7 +170,7 @@ func (this TemplateDescriptor) doCompare(category Category, other TemplateDescri
 		w.w2 = weight2Group1
 	}
 
-	if other.Layout != "" && other.Layout == this.Layout {
+	if other.Layout != "" && other.Layout == this.Layout || other.Layout == layoutAll {
 		if isLayoutCustom(this.Layout) {
 			w.w1 += weightcustomLayout
 			w.w2 = weight2Group2

tpl/tplimpl/templatestore.go

@@ -711,6 +711,7 @@ func (s *TemplateStore) findBestMatchWalkPath(q TemplateQuery, k1 string, slashC
 			}
 
 			weight := s.dh.compareDescriptors(q.Category, q.Desc, k.d)
+
 			weight.distance = distance
 
 			if best.isBetter(weight, vv) {
@@ -1734,6 +1735,15 @@ func (best *bestMatch) isBetter(w weight, ti *TemplInfo) bool {
 	}
 
 	if w.isEqualWeights(best.w) {
+		// Tie breakers.
+		if w.distance < best.w.distance {
+			return true
+		}
+
+		if ti.D.Layout != "" && best.desc.Layout != "" {
+			return ti.D.Layout != layoutAll
+		}
+
 		return w.distance < best.w.distance || ti.PathInfo.Path() < best.templ.PathInfo.Path()
 	}
 

tpl/tplimpl/templatestore_integration_test.go

@@ -769,6 +769,37 @@ All.
 	b.AssertFileContent("public/index.html", "All.")
 }
 
+func TestLayoutAllNested(t *testing.T) {
+	t.Parallel()
+
+	files := `
+-- hugo.toml --
+disableKinds = ['rss','sitemap','taxonomy','term']
+-- content/s1/p1.md --
+---
+title: p1
+---
+-- content/s2/p2.md --
+---
+title: p2
+---
+-- layouts/single.html --
+layouts/single.html
+-- layouts/list.html --
+layouts/list.html
+-- layouts/s1/all.html --
+layouts/s1/all.html
+`
+
+	b := hugolib.Test(t, files)
+
+	b.AssertFileContent("public/index.html", "layouts/list.html")
+	b.AssertFileContent("public/s1/index.html", "layouts/s1/all.html")
+	b.AssertFileContent("public/s1/p1/index.html", "layouts/s1/all.html")
+	b.AssertFileContent("public/s2/index.html", "layouts/list.html")
+	b.AssertFileContent("public/s2/p2/index.html", "layouts/single.html")
+}
+
 func TestPartialHTML(t *testing.T) {
 	t.Parallel()
 
@@ -788,3 +819,24 @@ func TestPartialHTML(t *testing.T) {
 
 	b.AssertFileContent("public/index.html", "<link rel=\"stylesheet\" href=\"/css/style.css\">")
 }
+
+// Issue #13515
+func TestPrintPathWarningOnDotRemoval(t *testing.T) {
+	t.Parallel()
+
+	files := `
+-- hugo.toml --
+baseURL = "https://example.com"
+printPathWarnings = true
+-- content/v0.124.0.md --
+-- content/v0.123.0.md --
+-- layouts/all.html --
+All.
+-- layouts/_default/single.html --
+{{ .Title }}|
+`
+
+	b := hugolib.Test(t, files, hugolib.TestOptWarn())
+
+	b.AssertLogContains("Duplicate content path")
+}