this removes the need for temporary storages with some external storage backends. The new method is added to a separate interface to maintain compatibility with storage backends implementing the storage interface directly (without inheriting common) Currently the interface is implemented for objectstorage based storages and local storage and used by webdav uploads Signed-off-by: Robin Appelman <robin@icewind.nl>pull/12072/head
Robin Appelman
7 years ago
parent
3c442e4138
commit
93de63777e
@ -0,0 +1,65 @@ |
||||
<?php declare(strict_types=1); |
||||
/** |
||||
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
|
||||
namespace OC\Files\Stream; |
||||
|
||||
use Icewind\Streams\Wrapper; |
||||
|
||||
class CountReadStream extends Wrapper { |
||||
/** @var int */ |
||||
private $count; |
||||
|
||||
/** @var callback */ |
||||
private $callback; |
||||
|
||||
public static function wrap($source, $callback) { |
||||
$context = stream_context_create(array( |
||||
'count' => array( |
||||
'source' => $source, |
||||
'callback' => $callback, |
||||
) |
||||
)); |
||||
return Wrapper::wrapSource($source, $context, 'count', self::class); |
||||
} |
||||
|
||||
public function dir_opendir($path, $options) { |
||||
return false; |
||||
} |
||||
|
||||
public function stream_open($path, $mode, $options, &$opened_path) { |
||||
$context = $this->loadContext('count'); |
||||
|
||||
$this->callback = $context['callback']; |
||||
return true; |
||||
} |
||||
|
||||
public function stream_read($count) { |
||||
$result = parent::stream_read($count); |
||||
$this->count += strlen($result); |
||||
return $result; |
||||
} |
||||
|
||||
public function stream_close() { |
||||
$result = parent::stream_close(); |
||||
call_user_func($this->callback, $this->count); |
||||
return $result; |
||||
} |
||||
} |
||||
@ -0,0 +1,40 @@ |
||||
<?php declare(strict_types=1); |
||||
/** |
||||
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
|
||||
namespace OCP\Files\Storage; |
||||
|
||||
/** |
||||
* Interface that adds the ability to write a stream directly to file |
||||
* |
||||
* @since 15.0.0 |
||||
*/ |
||||
interface IWriteStreamStorage extends IStorage { |
||||
/** |
||||
* Write the data from a stream to a file |
||||
* |
||||
* @param string $path |
||||
* @param resource $stream |
||||
* @param int|null $size the size of the stream if known in advance |
||||
* @return int the number of bytes written |
||||
* @since 15.0.0 |
||||
*/ |
||||
public function writeStream(string $path, $stream, int $size = null): int; |
||||
} |
||||
@ -0,0 +1,49 @@ |
||||
<?php declare(strict_types=1); |
||||
/** |
||||
* @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl> |
||||
* |
||||
* @license GNU AGPL version 3 or any later version |
||||
* |
||||
* This program is free software: you can redistribute it and/or modify |
||||
* it under the terms of the GNU Affero General Public License as |
||||
* published by the Free Software Foundation, either version 3 of the |
||||
* License, or (at your option) any later version. |
||||
* |
||||
* This program is distributed in the hope that it will be useful, |
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
* GNU Affero General Public License for more details. |
||||
* |
||||
* You should have received a copy of the GNU Affero General Public License |
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
||||
* |
||||
*/ |
||||
|
||||
namespace Test\Files\Stream; |
||||
|
||||
use OC\Files\Stream\CountReadStream; |
||||
use Test\TestCase; |
||||
|
||||
class CountReadStreamTest extends TestCase { |
||||
private function getStream($data) { |
||||
$handle = fopen('php://temp', 'w+'); |
||||
fwrite($handle, $data); |
||||
rewind($handle); |
||||
return $handle; |
||||
} |
||||
|
||||
public function testBasicCount() { |
||||
$source = $this->getStream('foo'); |
||||
$stream = CountReadStream::wrap($source, function ($size) { |
||||
$this->assertEquals(3, $size); |
||||
}); |
||||
stream_get_contents($stream); |
||||
} |
||||
|
||||
public function testLarger() { |
||||
$stream = CountReadStream::wrap(fopen(__DIR__ . '/../../../data/testimage.mp4', 'r'), function ($size) { |
||||
$this->assertEquals(383631, $size); |
||||
}); |
||||
stream_get_contents($stream); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue