Implement -I, --ignore-times for unconditional upload - fixes #311

fs/config.go

@@ -69,6 +69,7 @@ var (
 	configFile      = pflag.StringP("config", "", ConfigPath, "Config file.")
 	checkSum        = pflag.BoolP("checksum", "c", false, "Skip based on checksum & size, not mod-time & size")
 	sizeOnly        = pflag.BoolP("size-only", "", false, "Skip based on size only, not mod-time or checksum")
+	ignoreTimes     = pflag.BoolP("ignore-times", "I", false, "Don't skip files that match size and time - transfer all files")
 	ignoreExisting  = pflag.BoolP("ignore-existing", "", false, "Skip all files that exist on destination")
 	dryRun          = pflag.BoolP("dry-run", "n", false, "Do a trial run with no permanent changes")
 	connectTimeout  = pflag.DurationP("contimeout", "", 60*time.Second, "Connect timeout")
@@ -188,6 +189,7 @@ type ConfigInfo struct {
 	DryRun             bool
 	CheckSum           bool
 	SizeOnly           bool
+	IgnoreTimes        bool
 	IgnoreExisting     bool
 	ModifyWindow       time.Duration
 	Checkers           int
@@ -299,6 +301,7 @@ func LoadConfig() {
 	Config.ConnectTimeout = *connectTimeout
 	Config.CheckSum = *checkSum
 	Config.SizeOnly = *sizeOnly
+	Config.IgnoreTimes = *ignoreTimes
 	Config.IgnoreExisting = *ignoreExisting
 	Config.DumpHeaders = *dumpHeaders
 	Config.DumpBodies = *dumpBodies

fs/operations.go

@@ -315,6 +315,12 @@ func checkOne(pair ObjectPair, out ObjectPairChan) {
 		Debug(src, "Destination exists, skipping")
 		return
 	}
+	// If we should upload unconditionally
+	if Config.IgnoreTimes {
+		Debug(src, "Uploading unconditionally as --ignore-times is in use")
+		out <- pair
+		return
+	}
 	// If UpdateOlder is in effect, skip if dst is newer than src
 	if Config.UpdateOlder {
 		srcModTime := src.ModTime()

fs/operations_test.go

@@ -432,6 +432,42 @@ func TestSyncSizeOnly(t *testing.T) {
 	fstest.CheckItems(t, r.fremote, file1)
 }
 
+func TestSyncIgnoreTimes(t *testing.T) {
+	r := NewRun(t)
+	defer r.Finalise()
+	file1 := r.WriteBoth("existing", "potato", t1)
+
+	fs.Stats.ResetCounters()
+	err := fs.Sync(r.fremote, r.flocal)
+	if err != nil {
+		t.Fatalf("Sync failed: %v", err)
+	}
+
+	// We should have transferred exactly 0 files because the
+	// files were identical.
+	if fs.Stats.GetTransfers() != 0 {
+		t.Fatalf("Sync 1: want 0 transfer, got %d", fs.Stats.GetTransfers())
+	}
+
+	fs.Config.IgnoreTimes = true
+	defer func() { fs.Config.IgnoreTimes = false }()
+
+	fs.Stats.ResetCounters()
+	err = fs.Sync(r.fremote, r.flocal)
+	if err != nil {
+		t.Fatalf("Sync failed: %v", err)
+	}
+
+	// We should have transferred exactly one file even though the
+	// files were identical.
+	if fs.Stats.GetTransfers() != 1 {
+		t.Fatalf("Sync 2: want 1 transfer, got %d", fs.Stats.GetTransfers())
+	}
+
+	fstest.CheckItems(t, r.flocal, file1)
+	fstest.CheckItems(t, r.fremote, file1)
+}
+
 func TestSyncIgnoreExisting(t *testing.T) {
 	r := NewRun(t)
 	defer r.Finalise()