Browse Source

Merge pull request #28802 from paulijar/enh/s3_seek_from_end

Support seeking also from the end of file on S3 storage
tags/v23.0.0beta1
Julius Härtl 2 years ago
parent
commit
8e7f63b274
No account linked to committer's email address
1 changed files with 10 additions and 1 deletions
  1. 10
    1
      lib/private/Files/Stream/SeekableHttpStream.php

+ 10
- 1
lib/private/Files/Stream/SeekableHttpStream.php View File

@@ -76,6 +76,8 @@ class SeekableHttpStream implements File {
private $current;
/** @var int */
private $offset = 0;
/** @var int */
private $length = 0;

private function reconnect(int $start) {
$range = $start . '-';
@@ -101,12 +103,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;
}
@@ -140,7 +144,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;
}

Loading…
Cancel
Save