Merge pull request #42 from opennota/files_as_params
Accept individual files as parameters
This commit is contained in:
commit
388b47b5ff
|
@ -151,14 +151,10 @@ func (c *Config) validate() error {
|
|||
}
|
||||
|
||||
for _, input := range c.Input {
|
||||
stat, err := os.Lstat(input.Path)
|
||||
_, err := os.Lstat(input.Path)
|
||||
if err != nil {
|
||||
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 {
|
||||
|
|
22
convert.go
22
convert.go
|
@ -89,16 +89,28 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
|
|||
prefix = filepath.ToSlash(prefix)
|
||||
}
|
||||
|
||||
fd, err := os.Open(dir)
|
||||
fi, err := os.Stat(dir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer fd.Close()
|
||||
var list []os.FileInfo
|
||||
|
||||
list, err := fd.Readdir(0)
|
||||
if err != nil {
|
||||
return err
|
||||
if !fi.IsDir() {
|
||||
dir = ""
|
||||
list = []os.FileInfo{fi}
|
||||
} else {
|
||||
fd, err := os.Open(dir)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer fd.Close()
|
||||
|
||||
list, err = fd.Readdir(0)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
for _, file := range list {
|
||||
|
|
Loading…
Reference in New Issue
Block a user