mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
parent
c37bf19c89
commit
9df7b295bc
5 changed files with 38 additions and 14 deletions
|
@ -53,8 +53,9 @@ type WalkwayConfig struct {
|
|||
Logger loggers.Logger
|
||||
|
||||
// One or both of these may be pre-set.
|
||||
Info FileMetaInfo // The start info.
|
||||
DirEntries []FileMetaInfo // The start info's dir entries.
|
||||
Info FileMetaInfo // The start info.
|
||||
DirEntries []FileMetaInfo // The start info's dir entries.
|
||||
IgnoreFile func(filename string) bool // Optional
|
||||
|
||||
// Will be called in order.
|
||||
HookPre WalkHook // Optional.
|
||||
|
@ -172,6 +173,17 @@ func (w *Walkway) walk(path string, info FileMetaInfo, dirEntries []FileMetaInfo
|
|||
|
||||
}
|
||||
|
||||
if w.cfg.IgnoreFile != nil {
|
||||
n := 0
|
||||
for _, fi := range dirEntries {
|
||||
if !w.cfg.IgnoreFile(fi.Meta().Filename) {
|
||||
dirEntries[n] = fi
|
||||
n++
|
||||
}
|
||||
}
|
||||
dirEntries = dirEntries[:n]
|
||||
}
|
||||
|
||||
if w.cfg.HookPre != nil {
|
||||
var err error
|
||||
dirEntries, err = w.cfg.HookPre(info, path, dirEntries)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
})
|
||||
|
||||
|
|
|
@ -59,7 +59,8 @@ func (tp *TranslationProvider) NewResource(dst *deps.Deps) error {
|
|||
|
||||
w := hugofs.NewWalkway(
|
||||
hugofs.WalkwayConfig{
|
||||
Fs: dst.BaseFs.I18n.Fs,
|
||||
Fs: dst.BaseFs.I18n.Fs,
|
||||
IgnoreFile: dst.SourceSpec.IgnoreFile,
|
||||
WalkFn: func(path string, info hugofs.FileMetaInfo) error {
|
||||
if info.IsDir() {
|
||||
return nil
|
||||
|
|
Loading…
Reference in a new issue