mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of very old oc:// stream wrapper (#26381)

This commit is contained in:
Vincent Petry 2016-10-15 22:50:38 +02:00 committed by Morris Jobke
parent d9aeee2aa1
commit 9e9fef46d9
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
5 changed files with 0 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/base.php
View File

@ -660,7 +660,6 @@ class OC {
stream_wrapper_register('static', 'OC\Files\Stream\StaticStream');
stream_wrapper_register('close', 'OC\Files\Stream\Close');
stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
stream_wrapper_register('oc', 'OC\Files\Stream\OC');
\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
OC_App::loadApps(array('session'));

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

@ -531,7 +531,6 @@ return array(
'OC\\Files\\Stream\\Close' => $baseDir . '/lib/private/Files/Stream/Close.php',
'OC\\Files\\Stream\\Dir' => $baseDir . '/lib/private/Files/Stream/Dir.php',
'OC\\Files\\Stream\\Encryption' => $baseDir . '/lib/private/Files/Stream/Encryption.php',
'OC\\Files\\Stream\\OC' => $baseDir . '/lib/private/Files/Stream/OC.php',
'OC\\Files\\Stream\\Quota' => $baseDir . '/lib/private/Files/Stream/Quota.php',
'OC\\Files\\Stream\\StaticStream' => $baseDir . '/lib/private/Files/Stream/StaticStream.php',
'OC\\Files\\Type\\Detection' => $baseDir . '/lib/private/Files/Type/Detection.php',

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

@ -561,7 +561,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OC\\Files\\Stream\\Close' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Close.php',
'OC\\Files\\Stream\\Dir' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Dir.php',
'OC\\Files\\Stream\\Encryption' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Encryption.php',
'OC\\Files\\Stream\\OC' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/OC.php',
'OC\\Files\\Stream\\Quota' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Quota.php',
'OC\\Files\\Stream\\StaticStream' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/StaticStream.php',
'OC\\Files\\Type\\Detection' => __DIR__ . '/../../..' . '/lib/private/Files/Type/Detection.php',

154
lib/private/Files/Stream/OC.php
View File

@ -1,154 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Jörn Friedrich Dreyer <jfd@butonic.de>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Robin Appelman <robin@icewind.nl>
* @author Robin McCorkell <robin@mccorkell.me.uk>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* 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, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
namespace OC\Files\Stream;
/**
* a stream wrappers for ownCloud's virtual filesystem
*/
class OC {
/**
* @var \OC\Files\View
*/
static private $rootView;
private $path;
/**
* @var resource
*/
private $dirSource;
/**
* @var resource
*/
private $fileSource;
private $meta;
private function setup(){
if (!self::$rootView) {
self::$rootView = new \OC\Files\View('');
}
}
public function stream_open($path, $mode, $options, &$opened_path) {
$this->setup();
$path = substr($path, strlen('oc://'));
$this->path = $path;
$this->fileSource = self::$rootView->fopen($path, $mode);
if (is_resource($this->fileSource)) {
$this->meta = stream_get_meta_data($this->fileSource);
}
return is_resource($this->fileSource);
}
public function stream_seek($offset, $whence = SEEK_SET) {
return fseek($this->fileSource, $offset, $whence) === 0;
}
public function stream_tell() {
return ftell($this->fileSource);
}
public function stream_read($count) {
return fread($this->fileSource, $count);
}
public function stream_write($data) {
return fwrite($this->fileSource, $data);
}
public function stream_set_option($option, $arg1, $arg2) {
switch ($option) {
case STREAM_OPTION_BLOCKING:
stream_set_blocking($this->fileSource, $arg1);
break;
case STREAM_OPTION_READ_TIMEOUT:
stream_set_timeout($this->fileSource, $arg1, $arg2);
break;
case STREAM_OPTION_WRITE_BUFFER:
stream_set_write_buffer($this->fileSource, $arg1, $arg2);
}
}
public function stream_stat() {
return fstat($this->fileSource);
}
public function stream_lock($mode) {
flock($this->fileSource, $mode);
}
public function stream_flush() {
return fflush($this->fileSource);
}
public function stream_eof() {
return feof($this->fileSource);
}
public function url_stat($path) {
$this->setup();
$path = substr($path, strlen('oc://'));
if (self::$rootView->file_exists($path)) {
return self::$rootView->stat($path);
} else {
return false;
}
}
public function stream_close() {
fclose($this->fileSource);
}
public function unlink($path) {
$this->setup();
$path = substr($path, strlen('oc://'));
return self::$rootView->unlink($path);
}
public function dir_opendir($path, $options) {
$this->setup();
$path = substr($path, strlen('oc://'));
$this->path = $path;
$this->dirSource = self::$rootView->opendir($path);
if (is_resource($this->dirSource)) {
$this->meta = stream_get_meta_data($this->dirSource);
}
return is_resource($this->dirSource);
}
public function dir_readdir() {
return readdir($this->dirSource);
}
public function dir_closedir() {
closedir($this->dirSource);
}
public function dir_rewinddir() {
rewinddir($this->dirSource);
}
}

36
tests/lib/StreamWrappersTest.php
View File

@ -77,40 +77,4 @@ class StreamWrappersTest extends \Test\TestCase {
fclose($fh);
$this->assertSame($tmpFile, $actual);
}
public function testOC() {
// FIXME: use proper tearDown with $this->loginAsUser() and $this->logout()
// (would currently break the tests for some reason)
$originalStorage = \OC\Files\Filesystem::getStorage('/');
\OC\Files\Filesystem::clearMounts();
$storage = new \OC\Files\Storage\Temporary(array());
$storage->file_put_contents('foo.txt', 'asd');
\OC\Files\Filesystem::mount($storage, array(), '/');
$this->assertTrue(file_exists('oc:///foo.txt'));
$this->assertEquals('asd', file_get_contents('oc:///foo.txt'));
$this->assertEquals(array('.', '..', 'foo.txt'), scandir('oc:///'));
file_put_contents('oc:///bar.txt', 'qwerty');
$this->assertEquals('qwerty', $storage->file_get_contents('bar.txt'));
$this->assertEquals(array('.', '..', 'bar.txt', 'foo.txt'), scandir('oc:///'));
$this->assertEquals('qwerty', file_get_contents('oc:///bar.txt'));
$fh = fopen('oc:///bar.txt', 'rb');
$this->assertSame(0, ftell($fh));
$content = fread($fh, 4);
$this->assertSame(4, ftell($fh));
$this->assertSame('qwer', $content);
$content = fread($fh, 1);
$this->assertSame(5, ftell($fh));
$this->assertSame(0, fseek($fh, 0));
$this->assertSame(0, ftell($fh));
unlink('oc:///foo.txt');
$this->assertEquals(array('.', '..', 'bar.txt'), scandir('oc:///'));
\OC\Files\Filesystem::clearMounts();
\OC\Files\Filesystem::mount($originalStorage, array(), '/');
}
}