Skip to content

Commit

Permalink
Fix content dir resolution when main project is a Hugo Module
Browse files Browse the repository at this point in the history
Fixes #9177
  • Loading branch information
bep committed Nov 16, 2021
1 parent 1ed8069 commit 2e70f61
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions hugofs/fileinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ type FileMeta struct {
IsOrdered bool

This comment has been minimized.

Copy link
@DevBeatDad

DevBeatDad Nov 21, 2021

true

IsSymlink bool

This comment has been minimized.

Copy link
@DevBeatDad

DevBeatDad Nov 21, 2021

true

IsRootFile bool

This comment has been minimized.

Copy link
@DevBeatDad

DevBeatDad Nov 21, 2021

true

IsProject bool
Watch bool

This comment has been minimized.

Copy link
@DevBeatDad

DevBeatDad Nov 21, 2021

true


Classifier files.ContentClass
Expand Down
2 changes: 2 additions & 0 deletions hugofs/rootmapping_fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
rm.Meta.BaseDir = rm.ToBasedir
rm.Meta.MountRoot = rm.path
rm.Meta.Module = rm.Module
rm.Meta.IsProject = rm.IsProject

meta := rm.Meta.Copy()

Expand Down Expand Up @@ -118,6 +119,7 @@ type RootMapping struct {
To string // The source directory or file.
ToBasedir string // The base of To. May be empty if an absolute path was provided.
Module string // The module path/ID.
IsProject bool // Whether this is a mount in the main project.

This comment has been minimized.

Copy link
@mohi6050

mohi6050 Nov 26, 2021

hugofs/fileinfo.go

Meta *FileMeta // File metadata (lang etc.)

fi FileMetaInfo
Expand Down
5 changes: 3 additions & 2 deletions hugolib/filesystems/basefs.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string, error) {
isAbs := filepath.IsAbs(filename)
for _, dir := range b.SourceFilesystems.Content.Dirs {
meta := dir.Meta()
if meta.Module != "project" {
if !meta.IsProject {
continue

This comment has been minimized.

Copy link
@mohi6050

mohi6050 Nov 26, 2021

hugolib/filesystems/basefs.go

}
if isAbs {
Expand All @@ -161,7 +161,7 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string, error) {
contentDirs := b.SourceFilesystems.Content.Dirs
for i := len(contentDirs) - 1; i >= 0; i-- {
meta := contentDirs[i].Meta()
if meta.Module == "project" {
if meta.IsProject {
return filename, filepath.Join(meta.Filename, filename), nil
}
}
Expand Down Expand Up @@ -645,6 +645,7 @@ func (b *sourceFilesystemsBuilder) createModFs(
To: filename,
ToBasedir: base,
Module: md.Module.Path(),
IsProject: md.isMainProject,

This comment has been minimized.

Copy link
@mohi6050

mohi6050 Nov 26, 2021

99

Meta: &hugofs.FileMeta{
Watch: md.Watch(),
Weight: mountWeight,
Expand Down

0 comments on commit 2e70f61

Please sign in to comment.