Commit 12f59477 authored by Radim Marek's avatar Radim Marek

Added support magic characters in import pattern

Import now allows to use the star wildcard, question mark and square
brackets as used by filepath.Glob
parent 5b93799a
...@@ -184,11 +184,26 @@ func (p *parser) doImport() error { ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment