show correct error when directory does not exist
This commit is contained in:
parent
e2e170faad
commit
a617082042
2 changed files with 11 additions and 6 deletions
10
main.go
10
main.go
|
|
@ -109,6 +109,12 @@ func main() {
|
|||
}
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(directory, "/") {
|
||||
if wd, err := os.Getwd(); err != nil {
|
||||
directory = path.Join(directory, wd)
|
||||
}
|
||||
}
|
||||
|
||||
// logout (--logout)
|
||||
if logout {
|
||||
cfg.Token = nil
|
||||
|
|
@ -146,6 +152,10 @@ func main() {
|
|||
// read directory metadata
|
||||
metadata, err := scanner.ReadMetadata(directory)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
log.Fatalf("Directory does not exist: %s", directory)
|
||||
os.Exit(1)
|
||||
}
|
||||
log.Fatalf("Failed to fetch VOD metadata: %v", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,12 +53,7 @@ func ReadMetadata(directory string) (*Metadata, error) {
|
|||
path.Join(directory, METADATA_FILENAME),
|
||||
os.O_RDONLY, os.ModePerm,
|
||||
)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
if err != nil { return nil, err }
|
||||
|
||||
err = toml.NewDecoder(file).Decode(metadata)
|
||||
if err != nil { return nil, err }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue