Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-03 06:37:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added support magic characters in import pattern

Browse source 
Import now allows to use the star wildcard, question mark and square
brackets as used by filepath.Glob
This commit is contained in:
Radim Marek 2015-12-04 23:04:12 +01:00
parent 5b93799a62
commit 12f594779c
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
caddy/parse/parsing.go
View file

@ -184,11 +184,26 @@ func (p *parser) doImport() error {
if !p.NextArg() { if !p.NextArg() {
return p.ArgErr() return p.ArgErr()
} }
importFile := p.Val() importPattern := p.Val()
if p.NextArg() { if p.NextArg() {
return p.Err("Import allows only one file to import") return p.Err("Import allows only one file to import")
} }
matches, err := filepath.Glob(importPattern)
if err != nil {
return p.Errf("Failed to use import pattern %s - %s", importPattern, err.Error())
}
for _, importFile := range matches {
if err := p.doSingleImport(importFile); err != nil {
return err
}
}
return nil
}
func (p *parser) doSingleImport(importFile string) error {
file, err := os.Open(importFile) file, err := os.Open(importFile)
if err != nil { if err != nil {
return p.Errf("Could not import %s - %v", importFile, err) return p.Errf("Could not import %s - %v", importFile, err)