alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

mega: wait for events instead of arbitrary sleeping

Browse source
This commit is contained in:
Nick Craig-Wood 2018-06-30 11:09:45 +01:00
parent 038ed1aaf0
commit 794e55de27
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend/mega/mega.go
View file

@ -38,6 +38,7 @@ import (
const ( const (
minSleep = 10 * time.Millisecond minSleep = 10 * time.Millisecond
maxSleep = 2 * time.Second maxSleep = 2 * time.Second
eventWaitTime = 500 * time.Millisecond
decayConstant = 2 // bigger for slower decay, exponential decayConstant = 2 // bigger for slower decay, exponential
useTrash = true // FIXME make configurable - rclone global useTrash = true // FIXME make configurable - rclone global
) )
@ -570,6 +571,8 @@ func (f *Fs) purgeCheck(dir string, check bool) error {
} }
} }
waitEvent := f.srv.WaitEventsStart()
err = f.deleteNode(dirNode) err = f.deleteNode(dirNode)
if err != nil { if err != nil {
return errors.Wrap(err, "delete directory node failed") return errors.Wrap(err, "delete directory node failed")
@ -579,7 +582,8 @@ func (f *Fs) purgeCheck(dir string, check bool) error {
if dirNode == rootNode { if dirNode == rootNode {
f.clearRoot() f.clearRoot()
} }
time.Sleep(100 * time.Millisecond) // FIXME give the callback a chance
f.srv.WaitEvents(waitEvent, eventWaitTime)
return nil return nil
} }
@ -653,6 +657,8 @@ func (f *Fs) move(dstRemote string, srcFs *Fs, srcRemote string, info *mega.Node
} }
} }
waitEvent := f.srv.WaitEventsStart()
// rename the object if required // rename the object if required
if srcLeaf != dstLeaf { if srcLeaf != dstLeaf {
//log.Printf("rename %q to %q", srcLeaf, dstLeaf) //log.Printf("rename %q to %q", srcLeaf, dstLeaf)
@ -665,7 +671,8 @@ func (f *Fs) move(dstRemote string, srcFs *Fs, srcRemote string, info *mega.Node
} }
} }
time.Sleep(100 * time.Millisecond) // FIXME give events a chance... f.srv.WaitEvents(waitEvent, eventWaitTime)
return nil return nil
} }