external-repos/pictshare
1
0
Fork 0
mirror of https://github.com/HaschekSolutions/pictshare.git synced 2025-11-16 04:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

better loop

Browse Source
This commit is contained in:
Chris
2020-01-08 10:28:44 +01:00
parent 1a46209bfe
commit 3c7e8bea7c
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
storage-controllers/s3.controller.php
View File

@@ -42,13 +42,30 @@ class S3Storage implements StorageController
{ {
if(!$this->s3)$this->connect(); if(!$this->s3)$this->connect();
$iterator = $this->s3->getIterator('ListObjects', [ $KeyCount = 9999;
'Bucket' => S3_BUCKET $keys = 10;
]); $lastkey = false;
$count = 0;
$items = array(); $items = array();
foreach ($iterator as $object) { while($KeyCount>=$keys)
$items[] = $object['Key']; {
$objects = $this->s3->listObjectsV2([
'Bucket' => S3_BUCKET,
'MaxKeys'=> $keys,
'StartAfter'=>($lastkey?$lastkey:'')
]);
++$count;
foreach ($objects['Contents'] as $object){
//echo $count." {$object['Key']}\n";
$lastkey = $object['Key'];
$items[] = $lastkey;
}
if($dev===true)
echo "Got ".($count*$keys)." files \r";
$KeyCount = $objects['KeyCount'];
} }
return $items; return $items;