mark path map for all parent dirs too

cmd/subcmd/cp.go

@@ -145,12 +145,10 @@ func copyOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[st
 		return xerrors.Errorf("failed to stat %s: %w", sourcePath, err)
 	}
 
-	inputPathMap[targetPath] = true
-
 	if sourceEntry.Type == irodsclient_fs.FileEntry {
 		// file
 		targetFilePath := commons.MakeTargetIRODSFilePath(filesystem, sourcePath, targetPath)
-		inputPathMap[targetFilePath] = true
+		commons.MarkPathMap(inputPathMap, targetFilePath)
 
 		fileExist := false
 		targetEntry, err := filesystem.StatFile(targetFilePath)
@@ -234,7 +232,7 @@ func copyOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[st
 				}
 			}
 
-			inputPathMap[targetDirPath] = true
+			commons.MarkPathMap(inputPathMap, targetDirPath)
 
 			err = copyOne(parallelJobManager, inputPathMap, entry.Path, targetDirPath, recurse, force, diff, noHash)
 			if err != nil {

cmd/subcmd/get.go

@@ -172,12 +172,10 @@ func getOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[str
 		return xerrors.Errorf("failed to stat %s: %w", sourcePath, err)
 	}
 
-	inputPathMap[targetPath] = true
-
 	if sourceEntry.Type == irodsclient_fs.FileEntry {
 		// file
 		targetFilePath := commons.MakeTargetLocalFilePath(sourcePath, targetPath)
-		inputPathMap[targetFilePath] = true
+		commons.MarkPathMap(inputPathMap, targetFilePath)
 
 		fileExist := false
 		targetEntry, err := os.Stat(targetFilePath)
@@ -290,7 +288,7 @@ func getOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[str
 				}
 			}
 
-			inputPathMap[targetDirPath] = true
+			commons.MarkPathMap(inputPathMap, targetDirPath)
 
 			err = getOne(parallelJobManager, inputPathMap, entry.Path, targetDirPath, force, diff, noHash)
 			if err != nil {

cmd/subcmd/put.go

@@ -153,15 +153,6 @@ func processPutCommand(command *cobra.Command, args []string) error {
 	return nil
 }
 
-func markInputPathMap(inputPathMap map[string]bool, p string) {
-	dirs := commons.GetParentIRODSDirs(p)
-	for _, dir := range dirs {
-		inputPathMap[dir] = true
-	}
-
-	inputPathMap[p] = true
-}
-
 func putOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[string]bool, sourcePath string, targetPath string, force bool, singleThreaded bool, diff bool, noHash bool) error {
 	logger := log.WithFields(log.Fields{
 		"package":  "main",
@@ -188,7 +179,7 @@ func putOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[str
 	if !sourceStat.IsDir() {
 		// file
 		targetFilePath := commons.MakeTargetIRODSFilePath(filesystem, sourcePath, targetPath)
-		markInputPathMap(inputPathMap, targetFilePath)
+		commons.MarkPathMap(inputPathMap, targetFilePath)
 
 		fileExist := false
 		targetEntry, err := filesystem.StatFile(targetFilePath)
@@ -284,7 +275,7 @@ func putOne(parallelJobManager *commons.ParallelJobManager, inputPathMap map[str
 				}
 			}
 
-			markInputPathMap(inputPathMap, targetDirPath)
+			commons.MarkPathMap(inputPathMap, targetDirPath)
 
 			newSourcePath := filepath.Join(sourcePath, entry.Name())
 			err = putOne(parallelJobManager, inputPathMap, newSourcePath, targetDirPath, force, singleThreaded, diff, noHash)

commons/bundle_transfer.go

@@ -295,7 +295,7 @@ func (manager *BundleTransferManager) Schedule(source string, dir bool, size int
 		return xerrors.Errorf("failed to get target path for %s: %w", source, err)
 	}
 
-	manager.inputPathMap[targePath] = true
+	MarkPathMap(manager.inputPathMap, targePath)
 
 	if manager.differentFilesOnly {
 		logger.Debugf("checking if target %s for source %s exists", targePath, source)

commons/path.go

@@ -312,3 +312,12 @@ func ExistFile(p string) bool {
 	}
 	return false
 }
+
+func MarkPathMap(pathMap map[string]bool, p string) {
+	dirs := GetParentIRODSDirs(p)
+	for _, dir := range dirs {
+		pathMap[dir] = true
+	}
+
+	pathMap[p] = true
+}