Search multiple directories when downloading files (#233)

Co-authored-by: Tim Jacomb <[email protected]>
jenkinsci · Sep 13, 2022 · a3a027b · a3a027b
1 parent f20d4ac
commit a3a027b
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/...va/com/microsoftopentechnologies/windowsazurestorage/service/DownloadFromFileService.java b/...va/com/microsoftopentechnologies/windowsazurestorage/service/DownloadFromFileService.java
@@ -61,10 +61,16 @@ public int execute() {
     private int scanFileItems(ShareClient shareClient,
                               ShareDirectoryClient cloudFileDirectory,
                               PagedIterable<ShareFileItem> fileItems
-    )
-            throws URISyntaxException {
+    ) {
+        return scanFileItems(shareClient, cloudFileDirectory, fileItems, 0);
+    }
+
+    private int scanFileItems(ShareClient shareClient,
+                              ShareDirectoryClient cloudFileDirectory,
+                              PagedIterable<ShareFileItem> fileItems,
+                              int filesNeedDownload
+    ) {
         final DownloadServiceData data = getServiceData();
-        int filesNeedDownload = 0;
         for (final ShareFileItem fileItem : fileItems) {
             if (fileItem.isDirectory()) {
 
@@ -80,7 +86,9 @@ private int scanFileItems(ShareClient shareClient,
                     ShareDirectoryClient subdirectoryClient = shareClient.getDirectoryClient(
                             prependDirectoryPathIfRequired(cloudFileDirectory.getDirectoryPath(), fileItem.getName())
                     );
-                    return scanFileItems(shareClient, subdirectoryClient, subdirectoryClient.listFilesAndDirectories());
+                    filesNeedDownload = scanFileItems(shareClient, subdirectoryClient,
+                            subdirectoryClient.listFilesAndDirectories(),
+                            filesNeedDownload);
                 }
             }