diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-12-30 10:50:00 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-01-01 18:19:49 +0100 |
commit | ff6253bc7cf745e9c0127ddc9006da3c2c00c738 (patch) | |
tree | 9e80cc607575e516f4f93e0f16c3e82df3bafdb5 /commands/hugo.go | |
parent | aa4ccb8a1e9b8aa17397acf34049a2aa16b0b6cb (diff) |
Support files in content mounts
This commit is a general improvement of handling if single file mounts.
Fixes #6684
Fixes #6696
Diffstat (limited to 'commands/hugo.go')
-rw-r--r-- | commands/hugo.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/commands/hugo.go b/commands/hugo.go index 545daa83c..d319dda8f 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -667,7 +667,7 @@ func (c *commandeer) timeTrack(start time.Time, name string) { // getDirList provides NewWatcher() with a list of directories to watch for changes. func (c *commandeer) getDirList() ([]string, error) { - var dirnames []string + var filenames []string walkFn := func(path string, fi hugofs.FileMetaInfo, err error) error { if err != nil { @@ -681,25 +681,29 @@ func (c *commandeer) getDirList() ([]string, error) { return filepath.SkipDir } - dirnames = append(dirnames, fi.Meta().Filename()) + filenames = append(filenames, fi.Meta().Filename()) } return nil } - watchDirs := c.hugo().PathSpec.BaseFs.WatchDirs() - for _, watchDir := range watchDirs { + watchFiles := c.hugo().PathSpec.BaseFs.WatchDirs() + for _, fi := range watchFiles { + if !fi.IsDir() { + filenames = append(filenames, fi.Meta().Filename()) + continue + } - w := hugofs.NewWalkway(hugofs.WalkwayConfig{Logger: c.logger, Info: watchDir, WalkFn: walkFn}) + w := hugofs.NewWalkway(hugofs.WalkwayConfig{Logger: c.logger, Info: fi, WalkFn: walkFn}) if err := w.Walk(); err != nil { c.logger.ERROR.Println("walker: ", err) } } - dirnames = helpers.UniqueStringsSorted(dirnames) + filenames = helpers.UniqueStringsSorted(filenames) - return dirnames, nil + return filenames, nil } func (c *commandeer) buildSites() (err error) { |