fix: resolves #804 download issue

NFDI4Chem · Nov 13, 2023 · 13da87a · 13da87a
1 parent bb6da86
commit 13da87a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 18 deletions.
diff --git a/app/Http/Controllers/DownloadController.php b/app/Http/Controllers/DownloadController.php
@@ -102,17 +102,22 @@ public function downloadFromProject(Request $request, $username, $project, $key
                     array_push($s3keys, substr($fsObj->path, 1));
                 }
             } else {
-                $command = $s3Client->getCommand('ListObjects');
-                $command['Bucket'] = $bucket;
+
+                $command = [
+                    'Bucket' => $bucket,
+                ];
                 if ($path[0] == '/') {
                     $command['Prefix'] = ltrim($path, $path[0]).'/';
                 } else {
                     $command['Prefix'] = $path.'/';
                 }
-                $result = $s3Client->execute($command);
-                if ($result['Contents']) {
-                    foreach ($result['Contents'] as $file) {
-                        array_push($s3keys, $file['Key']);
+                $results = $s3Client->getPaginator('ListObjects', $command);
+                foreach ($results as $result) {
+                    $contents = $result->get('Contents');
+                    if ($contents) {
+                        foreach ($contents as $file) {
+                            array_push($s3keys, $file['Key']);
+                        }
                     }
                 }
             }

diff --git a/app/Jobs/ArchiveProject.php b/app/Jobs/ArchiveProject.php
@@ -72,17 +72,21 @@ public function handle(): void
                                 array_push($s3keys, substr($fsObject->path, 1));
                             }
                         } else {
-                            $command = $s3Client->getCommand('ListObjects');
-                            $command['Bucket'] = $bucket;
+                            $command = [
+                                'Bucket' => $bucket,
+                            ];
                             if ($path[0] == '/') {
                                 $command['Prefix'] = ltrim($path, $path[0]).'/';
                             } else {
                                 $command['Prefix'] = $path.'/';
                             }
-                            $result = $s3Client->execute($command);
-                            if ($result['Contents']) {
-                                foreach ($result['Contents'] as $file) {
-                                    array_push($s3keys, $file['Key']);
+                            $results = $s3Client->getPaginator('ListObjects', $command);
+                            foreach ($results as $result) {
+                                $contents = $result->get('Contents');
+                                if ($contents) {
+                                    foreach ($contents as $file) {
+                                        array_push($s3keys, $file['Key']);
+                                    }
                                 }
                             }
                         }

diff --git a/app/Jobs/ArchiveStudy.php b/app/Jobs/ArchiveStudy.php
@@ -59,17 +59,22 @@ public function handle(): void
                                 array_push($s3keys, substr($fsObject->path, 1));
                             }
                         } else {
-                            $command = $s3Client->getCommand('ListObjects');
-                            $command['Bucket'] = $bucket;
+
+                            $command = [
+                                'Bucket' => $bucket,
+                            ];
                             if ($path[0] == '/') {
                                 $command['Prefix'] = ltrim($path, $path[0]).'/';
                             } else {
                                 $command['Prefix'] = $path.'/';
                             }
-                            $result = $s3Client->execute($command);
-                            if ($result['Contents']) {
-                                foreach ($result['Contents'] as $file) {
-                                    array_push($s3keys, $file['Key']);
+                            $results = $s3Client->getPaginator('ListObjects', $command);
+                            foreach ($results as $result) {
+                                $contents = $result->get('Contents');
+                                if ($contents) {
+                                    foreach ($contents as $file) {
+                                        array_push($s3keys, $file['Key']);
+                                    }
                                 }
                             }
                         }