go/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-06-25 14:22:55 +02:00
Code Issues Releases Activity

Make DeleteFile and DeleteFiles return errors

Browse Source
This commit is contained in:
Nick Craig-Wood
2016-06-25 14:27:44 +01:00
parent ab43005422
commit 3ad8fb8634
2 changed files with 181 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
swift/swift.go
View File

@ -433,21 +433,25 @@ func (f *Fs) Precision() time.Duration {
func (f *Fs) Purge() error {
// Delete all the files including the directory markers
toBeDeleted := make(chan fs.Object, fs.Config.Transfers)
var err error
delErr := make(chan error, 1)
go func() {
err = f.list("", fs.MaxLevel, func(remote string, object *swift.Object, isDirectory bool) error {
if !isDirectory {
o, err := f.newObjectWithInfo(remote, object)
if err != nil {
return err
}
toBeDeleted <- o
}
return nil
})
close(toBeDeleted)
delErr <- fs.DeleteFiles(toBeDeleted)
}()
fs.DeleteFiles(toBeDeleted)
err := f.list("", fs.MaxLevel, func(remote string, object *swift.Object, isDirectory bool) error {
if !isDirectory {
o, err := f.newObjectWithInfo(remote, object)
if err != nil {
return err
}
toBeDeleted <- o
}
return nil
})
close(toBeDeleted)
delError := <-delErr
if err == nil {
err = delError
}
if err != nil {
return err
}