shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib: Improve logic of output path trimming

Fixes #4666

--- a/hugolib/page_paths.go

+++ b/hugolib/page_paths.go

@@ -310,7 +310,7 @@

 	}

 	// For /index.json etc. we must  use the full path.

-	if strings.HasSuffix(f.BaseFilename(), "html") {

+	if f.MediaType.FullSuffix() == ".html" && filepath.Base(tp) == "index.html" {

 		tp = strings.TrimSuffix(tp, f.BaseFilename())

 	}

--- a/hugolib/page_permalink_test.go

+++ b/hugolib/page_permalink_test.go

@@ -55,6 +55,8 @@

 		{"x/y/z/boofar.md", "http://barnew/boo/", "booslug", "", false, false, "http://barnew/boo/x/y/z/booslug/", "/boo/x/y/z/booslug/"},

 		{"x/y/z/boofar.md", "http://barnew/boo/", "booslug", "", true, true, "http://barnew/boo/x/y/z/booslug.html", "/x/y/z/booslug.html"},

 		{"x/y/z/boofar.md", "http://barnew/boo", "booslug", "", true, true, "http://barnew/boo/x/y/z/booslug.html", "/x/y/z/booslug.html"},

+		// Issue #4666

+		{"x/y/z/boo-makeindex.md", "http://barnew/boo", "", "", true, true, "http://barnew/boo/x/y/z/boo-makeindex.html", "/x/y/z/boo-makeindex.html"},

 		// test URL overrides

 		{"x/y/z/boofar.md", "", "", "/z/y/q/", false, false, "/z/y/q/", "/z/y/q/"},