TODOs

Author: bep

common/paths/pathparser.go

@@ -485,23 +485,6 @@ func (p *Path) Dir() (d string) {
 	return
 }
 
-// Used in template lookups.
-// For pages with Type set, we treat that as the section.
-func (p *Path) DirReTyped(typ string) (d string) {
-	if typ == "" || p.Section() == typ {
-		return p.Dir()
-	}
-	if p.posSectionHigh <= 0 {
-		return ""
-	}
-	d = "/" + typ
-	if p.posContainerHigh > 0 {
-		d += p.s[p.posContainerHigh-1:]
-	}
-	d = p.norm(d)
-	return
-}
-
 // Path returns the full path.
 func (p *Path) Path() (d string) {
 	return p.norm(p.s)
@@ -575,6 +558,21 @@ func (p *Path) Base() string {
 	return p.base(!p.isContentPage(), p.IsBundle())
 }
 
+// Used in template lookups.
+// For pages with Type set, we treat that as the section.
+func (p *Path) BaseReTyped(typ string) (d string) {
+	base := p.Base()
+	if typ == "" || p.Section() == typ {
+		return base
+	}
+	d = "/" + typ
+	if p.posSectionHigh != -1 {
+		d += base[p.posSectionHigh:]
+	}
+	d = p.norm(d)
+	return
+}
+
 // BaseNoLeadingSlash returns the base path without the leading slash.
 // TODO1 fix/test this vs /pages/rss.xml etc.
 func (p *Path) BaseNoLeadingSlash() string {

common/paths/pathparser_test.go

@@ -118,6 +118,7 @@ func TestParse(t *testing.T) {
 				c.Assert(p.IsLeafBundle(), qt.IsFalse)
 				c.Assert(p.Name(), qt.Equals, "c.md")
 				c.Assert(p.Base(), qt.Equals, "/a/b/c")
+				c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo/b/c")
 				c.Assert(p.Section(), qt.Equals, "a")
 				c.Assert(p.BaseNameNoIdentifier(), qt.Equals, "c")
 				c.Assert(p.Path(), qt.Equals, "/a/b/c.md")
@@ -186,6 +187,7 @@ func TestParse(t *testing.T) {
 			"/_index.md",
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Base(), qt.Equals, "/")
+				c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo")
 				c.Assert(p.Path(), qt.Equals, "/_index.md")
 				c.Assert(p.Container(), qt.Equals, "")
 				c.Assert(p.ContainerDir(), qt.Equals, "/")
@@ -196,6 +198,7 @@ func TestParse(t *testing.T) {
 			"/a/index.md",
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Base(), qt.Equals, "/a")
+				c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo/a")
 				c.Assert(p.BaseNameNoIdentifier(), qt.Equals, "a")
 				c.Assert(p.Container(), qt.Equals, "a")
 				c.Assert(p.Container(), qt.Equals, "a")
@@ -219,6 +222,7 @@ func TestParse(t *testing.T) {
 			func(c *qt.C, p *Path) {
 				c.Assert(p.Base(), qt.Equals, "/a/b")
 				c.Assert(p.BaseNameNoIdentifier(), qt.Equals, "b")
+				c.Assert(p.BaseReTyped("foo"), qt.Equals, "/foo/b")
 				c.Assert(p.Container(), qt.Equals, "b")
 				c.Assert(p.ContainerDir(), qt.Equals, "/a")
 				c.Assert(p.Dir(), qt.Equals, "/a/b")

hugolib/alias.go

@@ -49,9 +49,9 @@ type aliasPage struct {
 
 func (a aliasHandler) renderAlias(permalink string, p page.Page) (io.Reader, error) {
 	var templateDesc tplimpl.TemplateDescriptor
-	var dir string = ""
+	var base string = ""
 	if ps, ok := p.(*pageState); ok {
-		dir, templateDesc = ps.getDirAndTemplateDescriptor()
+		base, templateDesc = ps.getBaseAndTemplateDescriptor()
 	}
 
 	// TODO1 double check this, ref. hooks.
@@ -60,7 +60,7 @@ func (a aliasHandler) renderAlias(permalink string, p page.Page) (io.Reader, err
 	templateDesc.OutputFormat = output.AliasHTMLFormat.Name
 
 	q := tplimpl.TemplateQuery{
-		Dir:      dir,
+		Path:     base,
 		Category: tplimpl.CategoryLayout,
 		Desc:     templateDesc,
 	}

hugolib/cascade_test.go

@@ -207,7 +207,6 @@ func TestCascade(t *testing.T) {
 }
 
 func TestCascadeEdit(t *testing.T) {
-	t.Skip("TODO1")
 	p1Content := `---
 title: P1
 ---

hugolib/page.go

@@ -476,9 +476,9 @@ func (ps *pageState) initCommonProviders(pp pagePaths) error {
 	return nil
 }
 
-func (p *pageState) getDirAndTemplateDescriptor() (string, tplimpl.TemplateDescriptor) {
-	dir := p.PathInfo().DirReTyped(p.m.pageConfig.Type) // TODO1 check bundle dirs?
-	return dir, tplimpl.TemplateDescriptor{
+func (p *pageState) getBaseAndTemplateDescriptor() (string, tplimpl.TemplateDescriptor) {
+	base := p.PathInfo().BaseReTyped(p.m.pageConfig.Type)
+	return base, tplimpl.TemplateDescriptor{
 		Kind:         p.Kind(),
 		Lang:         p.Language().Lang,
 		Layout:       p.Layout(),
@@ -491,15 +491,15 @@ func (p *pageState) getDirAndTemplateDescriptor() (string, tplimpl.TemplateDescr
 func (p *pageState) resolveTemplate(layouts ...string) (*tplimpl.TemplInfo, bool, error) {
 	timer := p.s.h.Debug.Timer("resolveTemplate")
 	defer timer.Stop()
-	dir, d := p.getDirAndTemplateDescriptor()
+	dir, d := p.getBaseAndTemplateDescriptor()
 
 	if len(layouts) > 0 {
 		d.Layout = layouts[0]
 		d.LayoutMustMatch = true
 	}
 
 	q := tplimpl.TemplateQuery{
-		Dir:      dir,
+		Path:     dir,
 		Category: tplimpl.CategoryLayout,
 		Desc:     d,
 	}

hugolib/page__per_output.go

@@ -278,7 +278,7 @@ func (pco *pageContentOutput) initRenderHooks() error {
 			// Inherit the descriptor from the page/current output format.
 			// This allows for fine-grained control of the template used for
 			// rendering of e.g. links.
-			dir, layoutDescriptor := pco.po.p.getDirAndTemplateDescriptor()
+			base, layoutDescriptor := pco.po.p.getBaseAndTemplateDescriptor()
 
 			switch tp {
 			case hooks.LinkRendererType:
@@ -346,7 +346,7 @@ func (pco *pageContentOutput) initRenderHooks() error {
 
 			getHookTemplate := func() (*tplimpl.TemplInfo, bool) {
 				q := tplimpl.TemplateQuery{
-					Dir:      dir,
+					Path:     base,
 					Category: tplimpl.CategoryMarkup,
 					Desc:     layoutDescriptor,
 					Consider: consider,

hugolib/shortcode.go

@@ -399,7 +399,7 @@ func doRenderShortcode(
 			return true
 		}
 		q := tplimpl.TemplateQuery{
-			Dir:      p.PathInfo().Dir(),
+			Path:     p.PathInfo().Dir(),
 			Name:     sc.name,
 			Category: tplimpl.CategoryShortcode,
 			Desc:     tplDesc, // TODO1 page desc.
@@ -689,7 +689,7 @@ Loop:
 
 			// Used to check if the template expects inner content.
 			q := tplimpl.TemplateQuery{
-				Dir:      "/", // TODO1
+				Path:     "/", // TODO1
 				Name:     sc.name,
 				Category: tplimpl.CategoryShortcode,
 				Desc:     tplVariants, // TODO1 page desc.

tpl/tplimpl/templatedescriptor.go

@@ -93,7 +93,20 @@ func (this TemplateDescriptor) doCompare(category Category, other TemplateDescri
 		return w
 	}
 	if other.Layout != "" && other.Layout != this.Layout {
-		return w
+		if isCustomLayout(this.Layout) {
+			if this.Kind == "" {
+				this.Layout = ""
+			} else if this.Kind == kinds.KindPage {
+				this.Layout = layoutSingle
+			} else {
+				this.Layout = layoutList
+			}
+		}
+
+		// Test again.
+		if other.Layout != this.Layout {
+			return w
+		}
 	}
 	if other.Lang != "" && other.Lang != this.Lang {
 		return w

tpl/tplimpl/templatestore.go

@@ -348,8 +348,8 @@ type TemplWithBaseApplied struct {
 
 // TemplateQuery is used in LookupPagesLayout to find the best matching template.
 type TemplateQuery struct {
-	// The directory to walk down to.
-	Dir string
+	// The path to walk down to.
+	Path string
 
 	// The name to look for. Used for shortcode queries.
 	Name string
@@ -509,7 +509,7 @@ func (t *TemplateStore) LookupByPath(templatePath string) *TemplInfo {
 
 func (s *TemplateStore) LookupPagesLayout(q TemplateQuery) *TemplInfo {
 	q.init()
-	key := s.key(q.Dir)
+	key := s.key(q.Path)
 
 	slashCountKey := strings.Count(key, "/")
 	best1 := s.findBestMatchWalkPath(q, key, slashCountKey)
@@ -542,7 +542,7 @@ func (s *TemplateStore) LookupPartial(pth string, desc TemplateDescriptor) *Temp
 
 func (s *TemplateStore) LookupShortcode(q TemplateQuery) *TemplInfo {
 	q.init()
-	k1 := s.key(q.Dir)
+	k1 := s.key(q.Path)
 
 	slashCountK1 := strings.Count(k1, "/")
 	best := &bestMatch{
@@ -733,6 +733,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) {
 				best.updateValues(weight, k2, k.d, vv)
 			}

tpl/tplimpl/templatestore_integration_test.go

@@ -455,7 +455,7 @@ func BenchmarkLookupPagesLayout(b *testing.B) {
 	bb := hugolib.Test(b, newSetupTestSites)
 	store := bb.H.TemplateStore
 	q := tplimpl.TemplateQuery{
-		Dir:      "/categories/blue",
+		Path:     "/categories/blue",
 		Category: tplimpl.CategoryLayout,
 		Desc:     tplimpl.TemplateDescriptor{Kind: "taxonomy", Layout: "", Lang: "fr", OutputFormat: "html"},
 	}