Skip to content

Changing the method to listObjectsV2 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changing the method to listObjectsV2 #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 30 additions & 21 deletions core/components/awss3mediasource/model/awss3mediasource/awss3mediasource.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,33 +224,42 @@ public function listDirectory($dir)
$c['prefix'] = $dir;
}

try {
$result = $this->driver->listObjects([
'Bucket' => $this->bucket,
'Prefix' => ltrim($dir, '/'),
'Delimiter' => '/'
]);
} catch (Exception $e) {
$this->xpdo->log(xPDO::LOG_LEVEL_ERROR, '[AWS S3 MS] ' . $e->getMessage());
return [[], []];
}

$directories = [];
$files = [];

$prefixes = $result->get('CommonPrefixes');
if ( is_array($prefixes) ) {
foreach ($prefixes as $folder) {
$directories[] = $folder['Prefix'];
$continuationToken = null;
do {
$params = [
'Bucket' => $this->bucket,
'Prefix' => ltrim($dir, '/'),
'Delimiter' => '/',
];
if ($continuationToken) {
$params['ContinuationToken'] = $continuationToken;
}
try {
$result = $this->driver->listObjectsV2($params);
} catch (Exception $e) {
$this->xpdo->log(xPDO::LOG_LEVEL_ERROR, '[AWS S3 MS] ' . $e->getMessage());
return [[], []];
}

$prefixes = $result->get('CommonPrefixes');
if (is_array($prefixes)) {
foreach ($prefixes as $folder) {
$directories[] = $folder['Prefix'];
}
}
}

$contents = $result->get('Contents');
if ( is_array($contents)) {
foreach ($contents as $file) {
$files[] = $file['Key'];
$contents = $result->get('Contents');
if (is_array($contents)) {
foreach ($contents as $file) {
$files[] = $file['Key'];
}
}
}

$continuationToken = isset($result['NextContinuationToken']) ? $result['NextContinuationToken'] : null;
} while ($continuationToken);

return [$files, $directories];
}
Expand Down