From 6a47f924fca8c262129abba04772a8859871c9ba Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 12 Mar 2019 13:38:45 +0100 Subject: [PATCH] make assemblystream seekable Signed-off-by: Robin Appelman --- apps/dav/lib/Upload/AssemblyStream.php | 40 +++++++++++++++++-- .../tests/unit/Upload/AssemblyStreamTest.php | 15 +++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/Upload/AssemblyStream.php b/apps/dav/lib/Upload/AssemblyStream.php index eaf24f8741..c8a1be82f6 100644 --- a/apps/dav/lib/Upload/AssemblyStream.php +++ b/apps/dav/lib/Upload/AssemblyStream.php @@ -83,12 +83,46 @@ class AssemblyStream implements \Icewind\Streams\File { } /** - * @param string $offset + * @param int $offset * @param int $whence * @return bool */ public function stream_seek($offset, $whence = SEEK_SET) { - return false; + if ($whence === SEEK_CUR) { + $offset = $this->stream_tell() + $offset; + } else if ($whence === SEEK_END) { + $offset = $this->size + $offset; + } + + if ($offset > $this->size) { + return false; + } + + $nodeIndex = 0; + $nodeStart = 0; + while (true) { + if (!isset($this->nodes[$nodeIndex + 1])) { + break; + } + $node = $this->nodes[$nodeIndex]; + if ($nodeStart + $node->getSize() > $offset) { + break; + } + $nodeIndex++; + $nodeStart += $node->getSize(); + } + + $stream = $this->getStream($this->nodes[$nodeIndex]); + $nodeOffset = $offset - $nodeStart; + if(fseek($stream, $nodeOffset) === -1) { + return false; + } + $this->currentNode = $nodeIndex; + $this->currentNodeRead = $nodeOffset; + $this->currentStream = $stream; + $this->pos = $offset; + + return true; } /** @@ -210,7 +244,7 @@ class AssemblyStream implements \Icewind\Streams\File { * * @param string $name * @return array - * @throws \Exception + * @throws \BadMethodCallException */ protected function loadContext($name) { $context = stream_context_get_options($this->context); diff --git a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php index de60b94168..0ac9cbb234 100644 --- a/apps/dav/tests/unit/Upload/AssemblyStreamTest.php +++ b/apps/dav/tests/unit/Upload/AssemblyStreamTest.php @@ -54,6 +54,21 @@ class AssemblyStreamTest extends \Test\TestCase { $this->assertEquals($expected, $content); } + /** + * @dataProvider providesNodes() + */ + public function testSeek($expected, $nodes) { + $stream = \OCA\DAV\Upload\AssemblyStream::wrap($nodes); + + $offset = floor(strlen($expected) * 0.6); + if(fseek($stream, $offset) === -1) { + $this->fail('fseek failed'); + } + + $content = stream_get_contents($stream); + $this->assertEquals(substr($expected, $offset), $content); + } + function providesNodes() { $data8k = $this->makeData(8192); $dataLess8k = $this->makeData(8191);