upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 08:16:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Support seeking also from the end of file on S3 storage

Browse source 
The PR https://github.com/nextcloud/server/pull/20033 added support
for `fseek` for  the S3 storage backend. However, the seek mode SEEK_END
was left out that time. This PR fills this gap.

Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com>
This commit is contained in:
Pauli Järvinen 2021-09-11 17:42:15 +03:00 committed by backportbot[bot]
parent a05826a2ed
commit 61acaf1fbd
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/Files/Stream/SeekableHttpStream.php
View file

@ -77,6 +77,8 @@ class SeekableHttpStream implements File {
private $current;
/** @var int */
private $offset = 0;
/** @var int */
private $length = 0;
private function reconnect(int $start) {
$range = $start . '-';
@ -102,12 +104,14 @@ class SeekableHttpStream implements File {
$content = trim(explode(':', $contentRange)[1]);
$range = trim(explode(' ', $content)[1]);
$begin = intval(explode('-', $range)[0]);
$length = intval(explode('/', $range)[1]);
if ($begin !== $start) {
return false;
}
$this->offset = $begin;
$this->length = $length;
return true;
}
@ -141,7 +145,12 @@ class SeekableHttpStream implements File {
}
return $this->reconnect($this->offset + $offset);
case SEEK_END:
return false;
if ($this->length === 0) {
return false;
} elseif ($this->length + $offset === $this->offset) {
return true;
}
return $this->reconnect($this->length + $offset);
}
return false;
}