Skip to content

Commit

Permalink
switch to deleting files 1 by 1 (forces sync job)
Browse files Browse the repository at this point in the history
  • Loading branch information
ishehadeh committed Jul 23, 2019
1 parent 2df33fe commit 678c17e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
12 changes: 2 additions & 10 deletions dropbox.go
Expand Up @@ -120,16 +120,8 @@ func (db *Dropbox) WalkDiffs(local, remote string, skip SkipCallback, cb WalkDif
return err
}

func (db *Dropbox) Delete(del []string) (err error) {
arg := files.DeleteBatchArg{
Entries: make([]*files.DeleteArg, len(del)),
}

for i, f := range del {
arg.Entries[i] = files.NewDeleteArg(f)
}

_, err = db.client.DeleteBatch(&arg)
func (db *Dropbox) Delete(f string) (err error) {
_, err = db.client.DeleteV2(files.NewDeleteArg(f))
return
}

Expand Down
12 changes: 9 additions & 3 deletions repo.go
Expand Up @@ -252,9 +252,15 @@ func (fr *ProjectRepository) Upload(name string, s StorageService) (err error) {
}
}

if len(deleteList) > 0 {
logrus.Infof("Deleting %d files", len(deleteList))
s.Delete(deleteList)

for i, file := range deleteList {
logrus.Infof("Uploading %.3d/%.3d ... %s", i+1, len(deleteList), file)
remoteFile := path.Join(remoteFolder, file)
err = s.Delete(remoteFile)

if err != nil {
return err
}
}

return
Expand Down
2 changes: 1 addition & 1 deletion storage.go
Expand Up @@ -37,5 +37,5 @@ type StorageService interface {
Download(local, remote string) error

// Delete removes a file from the storage service
Delete(remote []string) error
Delete(remote string) error
}

0 comments on commit 678c17e

Please sign in to comment.