From 39f8d039fe07c0215dba8bd192edbadf53c3d091 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Sat, 8 Jun 2024 12:38:31 +0100
Subject: [PATCH] sync: fix expecting SFTP to have MkdirMetadata method:
 optional feature not implemented

Before this fix we attempted to copy metadata to SFTP backends despite
them not being capable of it.

This fixes the problem by making the need to copy metadata explicit
rather than implicit in a value being present or not.
---
 fs/sync/sync.go | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/fs/sync/sync.go b/fs/sync/sync.go
index 0d1cfc6e6..67998268f 100644
--- a/fs/sync/sync.go
+++ b/fs/sync/sync.go
@@ -98,7 +98,7 @@ type syncCopyMove struct {
 
 // For keeping track of delayed modtime sets
 type setDirModTime struct {
-	src     fs.Directory // if set the metadata should be set too
+	src     fs.Directory
 	dst     fs.Directory
 	dir     string
 	modTime time.Time
@@ -1109,7 +1109,6 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
 	if !s.setDirModTimeAfter && equal {
 		return nil
 	}
-	setMeta := true
 	if s.setDirModTimeAfter && equal {
 		newDst = dst
 	} else if s.copyEmptySrcDirs {
@@ -1126,7 +1125,6 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
 			err = operations.Mkdir(ctx, f, dir)
 		}
 	} else {
-		setMeta = s.setDirMetadata
 		newDst = dst
 	}
 	// If we need to set modtime after and we created a dir, then save it for later
@@ -1145,14 +1143,12 @@ func (s *syncCopyMove) copyDirMetadata(ctx context.Context, f fs.Fs, dst fs.Dire
 			s.setDirModTimesMaxLevel = level
 		}
 		set := setDirModTime{
+			src:     src,
 			dst:     newDst,
 			dir:     dir,
 			modTime: src.ModTime(ctx),
 			level:   level,
 		}
-		if setMeta {
-			set.src = src
-		}
 		s.setDirModTimes = append(s.setDirModTimes, set)
 		s.setDirModTimeMu.Unlock()
 		fs.Debugf(nil, "Added delayed dir = %q, newDst=%v", dir, newDst)
@@ -1202,8 +1198,7 @@ func (s *syncCopyMove) setDelayedDirModTimes(ctx context.Context) error {
 			}
 			g.Go(func() error {
 				var err error
-				// if item.src is set must copy full metadata
-				if item.src != nil {
+				if s.setDirMetadata {
 					_, err = operations.CopyDirMetadata(gCtx, s.fdst, item.dst, item.dir, item.src)
 				} else {
 					_, err = operations.SetDirModTime(gCtx, s.fdst, item.dst, item.dir, item.modTime)