Skip to content

Commit

Permalink
Merge pull request #46743 from nextcloud/backport/46693/stable29
Browse files Browse the repository at this point in the history
[stable29] feat: add a specialized writeStream implementation for s3 external storage
  • Loading branch information
icewind1991 authored Jul 25, 2024
2 parents 4ec3ccd + ed58026 commit 258798c
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions apps/files_external/lib/Lib/Storage/AmazonS3.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

use Aws\S3\Exception\S3Exception;
use Icewind\Streams\CallbackWrapper;
use Icewind\Streams\CountWrapper;
use Icewind\Streams\IteratorDirectory;
use OC\Files\Cache\CacheEntry;
use OC\Files\ObjectStore\S3ConnectionTrait;
Expand Down Expand Up @@ -787,4 +788,24 @@ public function hasUpdated($path, $time) {
return true;
}
}

public function writeStream(string $path, $stream, ?int $size = null): int {
if ($size === null) {
$size = 0;
// track the number of bytes read from the input stream to return as the number of written bytes.
$stream = CountWrapper::wrap($stream, function (int $writtenSize) use (&$size) {
$size = $writtenSize;
});
}

if (!is_resource($stream)) {
throw new \InvalidArgumentException("Invalid stream provided");
}

$path = $this->normalizePath($path);
$this->writeObject($path, $stream, $this->mimeDetector->detectPath($path));
$this->invalidateCache($path);

return $size;
}
}

0 comments on commit 258798c

Please sign in to comment.