diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2024-02-05 14:54:02 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2024-02-05 14:54:02 +0100 |
commit | 9df7b295bcfb59000f6ee675dfbbc53654f3d86c (patch) | |
tree | 2ff6fc5d081754120b6605d43ba6640ad94aa33f /hugolib | |
parent | c37bf19c898035de1518c3f2ab4380f08817151f (diff) |
Filter dot files etc. in i18n
Closes #11993
Diffstat (limited to 'hugolib')
-rw-r--r-- | hugolib/hugo_sites.go | 3 | ||||
-rw-r--r-- | hugolib/language_test.go | 11 | ||||
-rw-r--r-- | hugolib/pages_capture.go | 19 |
3 files changed, 22 insertions, 11 deletions
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index 24ff1077f..99dc88b10 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -473,7 +473,8 @@ func (h *HugoSites) loadData() error { h.data = make(map[string]any) w := hugofs.NewWalkway( hugofs.WalkwayConfig{ - Fs: h.PathSpec.BaseFs.Data.Fs, + Fs: h.PathSpec.BaseFs.Data.Fs, + IgnoreFile: h.SourceSpec.IgnoreFile, WalkFn: func(path string, fi hugofs.FileMetaInfo) error { if fi.IsDir() { return nil diff --git a/hugolib/language_test.go b/hugolib/language_test.go index c9368770e..582d3985f 100644 --- a/hugolib/language_test.go +++ b/hugolib/language_test.go @@ -135,3 +135,14 @@ FormatNumberCustom: 12,345.68 NumFmt: -98,765.43 `) } + +// Issue 11993. +func TestI18nDotFile(t *testing.T) { + files := ` +-- hugo.toml --{} +baseURL = "https://example.com" +-- i18n/.keep -- +-- data/.keep -- +` + Test(t, files) +} diff --git a/hugolib/pages_capture.go b/hugolib/pages_capture.go index acdc674e6..b7da065fd 100644 --- a/hugolib/pages_capture.go +++ b/hugolib/pages_capture.go @@ -249,9 +249,6 @@ func (c *pagesCollector) collectDir(dirPath *paths.Path, isDir bool, inFilter fu func (c *pagesCollector) collectDirDir(path string, root hugofs.FileMetaInfo, inFilter func(fim hugofs.FileMetaInfo) bool) error { filter := func(fim hugofs.FileMetaInfo) bool { - if c.sp.IgnoreFile(fim.Meta().Filename) { - return false - } if inFilter != nil { return inFilter(fim) } @@ -330,13 +327,14 @@ func (c *pagesCollector) collectDirDir(path string, root hugofs.FileMetaInfo, in w := hugofs.NewWalkway( hugofs.WalkwayConfig{ - Logger: c.logger, - Root: path, - Info: root, - Fs: c.fs, - HookPre: preHook, - HookPost: postHook, - WalkFn: wfn, + Logger: c.logger, + Root: path, + Info: root, + Fs: c.fs, + IgnoreFile: c.h.SourceSpec.IgnoreFile, + HookPre: preHook, + HookPost: postHook, + WalkFn: wfn, }) return w.Walk() @@ -371,6 +369,7 @@ func (c *pagesCollector) handleBundleLeaf(dir, bundle hugofs.FileMetaInfo, inPat Logger: c.logger, Info: dir, DirEntries: readdir, + IgnoreFile: c.h.SourceSpec.IgnoreFile, WalkFn: walk, }) |