extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-29 11:55:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync: state whether duplicates are objects are directories

Browse Source
This commit is contained in:
Nick Craig-Wood 2017-07-08 15:42:18 +01:00
parent 9ac72ee53f
commit 72add5ab27
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/operations.go
View File

@ -590,6 +590,18 @@ func (ds DirEntries) ForDirError(fn func(dir Directory) error) error {
return nil return nil
} }
// DirEntryType returns a string description of the DirEntry, either
// "object", "directory" or "unknown type XXX"
func DirEntryType(d DirEntry) string {
switch d.(type) {
case Object:
return "object"
case Directory:
return "directory"
}
return fmt.Sprintf("unknown type %T", d)
}
// ListDirSorted reads Object and *Dir into entries for the given Fs. // ListDirSorted reads Object and *Dir into entries for the given Fs.
// //
// dir is the start directory, "" for root // dir is the start directory, "" for root

4
fs/sync.go
View File

@ -866,7 +866,7 @@ func matchListings(srcList, dstList DirEntries) (srcOnly DirEntries, dstOnly Dir
if src != nil && iSrc > 0 { if src != nil && iSrc > 0 {
prev := srcList[iSrc-1].Remote() prev := srcList[iSrc-1].Remote()
if srcRemote == prev { if srcRemote == prev {
Logf(src, "Duplicate file found in source - ignoring") Logf(src, "Duplicate %s found in source - ignoring", DirEntryType(src))
src = nil // ignore the src src = nil // ignore the src
} else if srcRemote < prev { } else if srcRemote < prev {
Errorf(src, "Out of order listing in source") Errorf(src, "Out of order listing in source")
@ -876,7 +876,7 @@ func matchListings(srcList, dstList DirEntries) (srcOnly DirEntries, dstOnly Dir
if dst != nil && iDst > 0 { if dst != nil && iDst > 0 {
prev := dstList[iDst-1].Remote() prev := dstList[iDst-1].Remote()
if dstRemote == prev { if dstRemote == prev {
Logf(dst, "Duplicate file found in destination - ignoring") Logf(dst, "Duplicate %s found in destination - ignoring", DirEntryType(dst))
dst = nil // ignore the dst dst = nil // ignore the dst
} else if dstRemote < prev { } else if dstRemote < prev {
Errorf(dst, "Out of order listing in destination") Errorf(dst, "Out of order listing in destination")