overwrite flag changes to compare src and dest files and remove from …

…src list
didclab · Dec 4, 2023 · 85033af · 85033af
1 parent 35d432e
commit 85033af
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/main/java/com/onedatashare/scheduler/services/RequestModifier.java b/src/main/java/com/onedatashare/scheduler/services/RequestModifier.java
@@ -174,18 +174,18 @@ public TransferJobRequest createRequest(RequestFromODS odsTransferRequest) {
         if (transferJobRequest.getOptions().isOverwrite())
             s.setInfoList(expandedFiles);
         else {
-            //Check files present in destination (given path level only)
-
-            //can use selectAndExpand but not for vfs
+            //Check files present in destination
             List<EntityInfo> destExpandedFiles = this.selectAndExpandDestination(d, new ArrayList<>());
 
-
-            /*
-            for each file ID at dest, check if present in source list, if yes, remove that file id from src info list
-            expandedFiles.remove()
+            //for each file ID at dest, check if present in source list, if yes, remove that file id from src info list
+            for (EntityInfo destFile : destExpandedFiles) {
+                for (EntityInfo srcFile : expandedFiles) {
+                    if (destFile.getId().equals(srcFile.getId())) {
+                        expandedFiles.remove(srcFile);
+                    }
+                }
+            }
             s.setInfoList(expandedFiles);
-            */
-
 
             //TODO: fix box case handling where if no files selected by user (to match other cases)
         }