Permalink
Browse files

hugolib: Improve logic of output path trimming

Fixes #4666
  • Loading branch information...
moorereason authored and bep committed Dec 21, 2018
1 parent 27b62a5 commit 0483299bc06a742d40528e0d675e42e149910853
Showing with 3 additions and 1 deletion.
  1. +1 −1 hugolib/page_paths.go
  2. +2 −0 hugolib/page_permalink_test.go
@@ -310,7 +310,7 @@ func (p *Page) createRelativeTargetPathForOutputFormat(f output.Format) string {
}

// 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())
}

@@ -55,6 +55,8 @@ func TestPermalink(t *testing.T) {
{"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/"},

0 comments on commit 0483299

Please sign in to comment.