Fix path resolution in hugo new

With theme and project with content directories and command on the form `hugo new posts/test.md`.

Fixes #9129
This commit is contained in:
Bjørn Erik Pedersen 2021-11-08 11:50:51 +01:00
parent c09f5c5fd3
commit 2b01c85d14
3 changed files with 26 additions and 5 deletions

View file

@ -35,7 +35,7 @@ import (
)
// TODO(bep) clean this up. Export the test site builder in Hugolib or something.
func TestNewContent(t *testing.T) {
func TestNewContentFromFile(t *testing.T) {
cases := []struct {
name string
kind string

View file

@ -57,4 +57,22 @@ Hello World.
b.Assert(buf.String(), qt.Contains, `title: "Mypage"`)
})
// Issue #9129
c.Run("Content in both project and theme", func(c *qt.C) {
b := newTestSitesBuilder(c)
b.WithConfigFile("toml", `
theme = 'ipsum'
`)
themeDir := filepath.Join("themes", "ipsum")
b.WithSourceFile("content/posts/foo.txt", `Hello.`)
b.WithSourceFile(filepath.Join(themeDir, "content/posts/foo.txt"), `Hello.`)
b.CreateSites()
cf := NewContentFactory(b.H)
abs, err := cf.CreateContentPlaceHolder(filepath.FromSlash("posts/test.md"))
b.Assert(err, qt.IsNil)
b.Assert(abs, qt.Equals, filepath.FromSlash("content/posts/test.md"))
})
}

View file

@ -157,11 +157,14 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string) {
if !isAbs {
// A filename on the form "posts/mypage.md", put it inside
// the first content folder, usually <workDir>/content.
// The Dirs are ordered with the most important last, so pick that.
// Pick the last project dir (which is probably the most important one).
contentDirs := b.SourceFilesystems.Content.Dirs
firstContentDir := contentDirs[len(contentDirs)-1].Meta().Filename
return filename, filepath.Join(firstContentDir, filename)
for i := len(contentDirs) - 1; i >= 0; i-- {
meta := contentDirs[i].Meta()
if meta.Module == "project" {
return filename, filepath.Join(meta.Filename, filename)
}
}
}
return "", ""