mirror of
https://github.com/rclone/rclone.git
synced 2025-12-14 23:33:22 +00:00
Compare commits
1 Commits
dump-impli
...
fix-no-rem
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3a77f218b |
@@ -152,19 +152,6 @@ func ParseHeaders(headers []string) []*fs.HTTPOption {
|
||||
|
||||
// SetFlags converts any flags into config which weren't straight forward
|
||||
func SetFlags(ci *fs.ConfigInfo) {
|
||||
if dumpHeaders {
|
||||
ci.Dump |= fs.DumpHeaders
|
||||
fs.Logf(nil, "--dump-headers is obsolete - please use --dump headers instead")
|
||||
}
|
||||
if dumpBodies {
|
||||
ci.Dump |= fs.DumpBodies
|
||||
fs.Logf(nil, "--dump-bodies is obsolete - please use --dump bodies instead")
|
||||
}
|
||||
if ci.Dump != 0 && verbose < 2 && ci.LogLevel != fs.LogLevelDebug {
|
||||
fs.Logf(nil, "Automatically setting -vv as --dump is enabled")
|
||||
verbose = 2
|
||||
}
|
||||
|
||||
if verbose >= 2 {
|
||||
ci.LogLevel = fs.LogLevelDebug
|
||||
} else if verbose >= 1 {
|
||||
@@ -210,6 +197,15 @@ func SetFlags(ci *fs.ConfigInfo) {
|
||||
}
|
||||
}
|
||||
|
||||
if dumpHeaders {
|
||||
ci.Dump |= fs.DumpHeaders
|
||||
fs.Logf(nil, "--dump-headers is obsolete - please use --dump headers instead")
|
||||
}
|
||||
if dumpBodies {
|
||||
ci.Dump |= fs.DumpBodies
|
||||
fs.Logf(nil, "--dump-bodies is obsolete - please use --dump bodies instead")
|
||||
}
|
||||
|
||||
switch {
|
||||
case deleteBefore && (deleteDuring || deleteAfter),
|
||||
deleteDuring && deleteAfter:
|
||||
|
||||
@@ -266,22 +266,6 @@ func equal(ctx context.Context, src fs.ObjectInfo, dst fs.Object, opt equalOpt)
|
||||
return true
|
||||
}
|
||||
|
||||
// Used to remove a failed copy
|
||||
//
|
||||
// Returns whether the file was successfully removed or not
|
||||
func removeFailedCopy(ctx context.Context, dst fs.Object) bool {
|
||||
if dst == nil {
|
||||
return false
|
||||
}
|
||||
fs.Infof(dst, "Removing failed copy")
|
||||
removeErr := dst.Remove(ctx)
|
||||
if removeErr != nil {
|
||||
fs.Infof(dst, "Failed to remove failed copy: %s", removeErr)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// OverrideRemote is a wrapper to override the Remote for an
|
||||
// ObjectInfo
|
||||
type OverrideRemote struct {
|
||||
@@ -515,7 +499,6 @@ func Copy(ctx context.Context, f fs.Fs, dst fs.Object, remote string, src fs.Obj
|
||||
err = errors.Errorf("corrupted on transfer: sizes differ %d vs %d", src.Size(), dst.Size())
|
||||
fs.Errorf(dst, "%v", err)
|
||||
err = fs.CountError(err)
|
||||
removeFailedCopy(ctx, dst)
|
||||
return newDst, err
|
||||
}
|
||||
|
||||
@@ -527,7 +510,6 @@ func Copy(ctx context.Context, f fs.Fs, dst fs.Object, remote string, src fs.Obj
|
||||
err = errors.Errorf("corrupted on transfer: %v hash differ %q vs %q", hashType, srcSum, dstSum)
|
||||
fs.Errorf(dst, "%v", err)
|
||||
err = fs.CountError(err)
|
||||
removeFailedCopy(ctx, dst)
|
||||
return newDst, err
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user