Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Use CountWrapper instead of almost identical CountReadStream 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/14223/head
Roeland Jago Douma 7 years ago
parent
49a0ea01e5
commit
104616c1da
No known key found for this signature in database GPG Key ID: F941078878347C0C
5 changed files with 2 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      lib/composer/composer/autoload_classmap.php
  2. 1
      lib/composer/composer/autoload_static.php
  3. 4
      lib/private/Files/ObjectStore/ObjectStoreStorage.php
  4. 65
      lib/private/Files/Stream/CountReadStream.php
  5. 49
      tests/lib/Files/Stream/CountReadStreamTest.php

1
lib/composer/composer/autoload_classmap.php
View File

@ -838,7 +838,6 @@ return array(
'OC\\Files\\Storage\\Wrapper\\PermissionsMask' => $baseDir . '/lib/private/Files/Storage/Wrapper/PermissionsMask.php',
'OC\\Files\\Storage\\Wrapper\\Quota' => $baseDir . '/lib/private/Files/Storage/Wrapper/Quota.php',
'OC\\Files\\Storage\\Wrapper\\Wrapper' => $baseDir . '/lib/private/Files/Storage/Wrapper/Wrapper.php',
'OC\\Files\\Stream\\CountReadStream' => $baseDir . '/lib/private/Files/Stream/CountReadStream.php',
'OC\\Files\\Stream\\Encryption' => $baseDir . '/lib/private/Files/Stream/Encryption.php',
'OC\\Files\\Stream\\Quota' => $baseDir . '/lib/private/Files/Stream/Quota.php',
'OC\\Files\\Type\\Detection' => $baseDir . '/lib/private/Files/Type/Detection.php',

1
lib/composer/composer/autoload_static.php
View File

@ -868,7 +868,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Files\\Storage\\Wrapper\\PermissionsMask' => __DIR__ . '/../../..' . '/lib/private/Files/Storage/Wrapper/PermissionsMask.php',
'OC\\Files\\Storage\\Wrapper\\Quota' => __DIR__ . '/../../..' . '/lib/private/Files/Storage/Wrapper/Quota.php',
'OC\\Files\\Storage\\Wrapper\\Wrapper' => __DIR__ . '/../../..' . '/lib/private/Files/Storage/Wrapper/Wrapper.php',
'OC\\Files\\Stream\\CountReadStream' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/CountReadStream.php',
'OC\\Files\\Stream\\Encryption' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Encryption.php',
'OC\\Files\\Stream\\Quota' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Quota.php',
'OC\\Files\\Type\\Detection' => __DIR__ . '/../../..' . '/lib/private/Files/Type/Detection.php',

4
lib/private/Files/ObjectStore/ObjectStoreStorage.php
View File

@ -26,9 +26,9 @@
namespace OC\Files\ObjectStore;
use Icewind\Streams\CallbackWrapper;
use Icewind\Streams\CountWrapper;
use Icewind\Streams\IteratorDirectory;
use OC\Files\Cache\CacheEntry;
use OC\Files\Stream\CountReadStream;
use OCP\Files\NotFoundException;
use OCP\Files\ObjectStore\IObjectStore;
@ -443,7 +443,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
try {
//upload to object storage
if ($size === null) {
$countStream = CountReadStream::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
$countStream = CountWrapper::wrap($stream, function ($writtenSize) use ($fileId, &$size) {
$this->getCache()->update($fileId, [
'size' => $writtenSize
]);

65
lib/private/Files/Stream/CountReadStream.php
View File

@ -1,65 +0,0 @@
<?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;
}
}

49
tests/lib/Files/Stream/CountReadStreamTest.php
View File

@ -1,49 +0,0 @@
<?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);
}
}
Write Preview
Loading…
Cancel
Save