Skip to content
Merged
Changes from all commits
Commits
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
feat: add a specialized writeStream implementation for s3 external st…
…orage

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
icewind1991 committed Jul 24, 2024
commit c2b1f079b110c1f41df78faf0dbd44c3f87406c0
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 @@ -8,6 +8,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 @@ -754,4 +755,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;
}
}