go/bindata
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Accept individual files as parameters

Browse Source
This commit is contained in:
opennota 2014-08-05 19:23:20 +07:00
parent b040f60a8c
commit 6347e7a31c
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.go
View File

@ -151,14 +151,10 @@ func (c *Config) validate() error {
} }
for _, input := range c.Input { for _, input := range c.Input {
stat, err := os.Lstat(input.Path) _, err := os.Lstat(input.Path)
if err != nil { if err != nil {
return fmt.Errorf("Failed to stat input path '%s': %v", input.Path, err) return fmt.Errorf("Failed to stat input path '%s': %v", input.Path, err)
} }
if !stat.IsDir() {
return fmt.Errorf("Input path '%s' is not a directory.", input.Path)
}
} }
if len(c.Output) == 0 { if len(c.Output) == 0 {

14
convert.go
View File

@ -89,6 +89,17 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
prefix = filepath.ToSlash(prefix) prefix = filepath.ToSlash(prefix)
} }
fi, err := os.Stat(dir)
if err != nil {
return err
}
var list []os.FileInfo
if !fi.IsDir() {
dir = ""
list = []os.FileInfo{fi}
} else {
fd, err := os.Open(dir) fd, err := os.Open(dir)
if err != nil { if err != nil {
return err return err
@ -96,10 +107,11 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
defer fd.Close() defer fd.Close()
list, err := fd.Readdir(0) list, err = fd.Readdir(0)
if err != nil { if err != nil {
return err return err
} }
}
for _, file := range list { for _, file := range list {
var asset Asset var asset Asset