Skip to content

Commit c5e3f5e

Browse files
authored
Merge pull request #135 from utopia-php/improve-storage
2 parents 1b8d551 + 2cdc28c commit c5e3f5e

File tree

1 file changed

+6
-23
lines changed

1 file changed

+6
-23
lines changed

src/Migration/Sources/Appwrite.php

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -327,30 +327,13 @@ private function reportStorage(array $resources, array &$report, array $resource
327327
}
328328

329329
foreach ($buckets as $bucket) {
330-
$lastFile = null;
331-
while (true) {
332-
$queries = [Query::limit(self::DEFAULT_PAGE_LIMIT)];
333-
if ($lastFile) {
334-
$queries[] = Query::cursorAfter($lastFile);
335-
}
336-
337-
$files = $this->storage->listFiles(
338-
$bucket['$id'],
339-
$queries
340-
)['files'];
341-
342-
$report[Resource::TYPE_FILE] += count($files);
343-
foreach ($files as $file) {
344-
// already includes the `sizeOriginal`
345-
$report['size'] += $file['sizeOriginal'] ?? 0;
346-
}
347-
348-
$lastFile = $files[count($files) - 1]['$id'] ?? null;
330+
$filesResponse = $this->storage->listFiles(
331+
$bucket['$id'],
332+
[Query::limit(1)]
333+
);
349334

350-
if (count($files) < self::DEFAULT_PAGE_LIMIT) {
351-
break;
352-
}
353-
}
335+
$report['size'] += $bucket['totalSize'] ?? 0;
336+
$report[Resource::TYPE_FILE] += $filesResponse['total'];
354337
}
355338

356339
$report['size'] = $report['size'] / 1000 / 1000; // MB

0 commit comments

Comments
 (0)