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

move to public namespace

This commit is contained in:
Morris Jobke 2014-08-19 14:05:08 +02:00
parent 5d7deefd95
commit b3b3354809
12 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/lib/google.php
View File

@ -286,7 +286,7 @@ class Google extends \OC\Files\Storage\Common {
// Check if this is a Google Doc // Check if this is a Google Doc
if ($this->getMimeType($path) !== $file->getMimeType()) { if ($this->getMimeType($path) !== $file->getMimeType()) {
// Return unknown file size // Return unknown file size
$stat['size'] = \OC\Files\Filesystem::SPACE_UNKNOWN; $stat['size'] = \OCP\Files\FileInfo::SPACE_UNKNOWN;
} else { } else {
$stat['size'] = $file->getFileSize(); $stat['size'] = $file->getFileSize();
} }

2
apps/files_sharing/lib/sharedstorage.php
View File

@ -377,7 +377,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source); list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
return $storage->free_space($internalPath); return $storage->free_space($internalPath);
} }
return \OC\Files\Filesystem::SPACE_UNKNOWN; return \OCP\Files\FileInfo::SPACE_UNKNOWN;
} }
public function getLocalFile($path) { public function getLocalFile($path) {

2
lib/private/connector/sabre/quotaplugin.php
View File

@ -72,7 +72,7 @@ class OC_Connector_Sabre_QuotaPlugin extends \Sabre\DAV\ServerPlugin {
$length -= $chunkHandler->getCurrentSize(); $length -= $chunkHandler->getCurrentSize();
} }
$freeSpace = $this->getFreeSpace($parentUri); $freeSpace = $this->getFreeSpace($parentUri);
if ($freeSpace !== \OC\Files\Filesystem::SPACE_UNKNOWN && $length > $freeSpace) { if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN && $length > $freeSpace) {
if (isset($chunkHandler)) { if (isset($chunkHandler)) {
$chunkHandler->cleanup(); $chunkHandler->cleanup();
} }

3
lib/private/files/filesystem.php
View File

@ -33,9 +33,6 @@ namespace OC\Files;
use OC\Files\Storage\Loader; use OC\Files\Storage\Loader;
class Filesystem { class Filesystem {
const SPACE_NOT_COMPUTED = -1;
const SPACE_UNKNOWN = -2;
const SPACE_UNLIMITED = -3;
/** /**
* @var Mount\Manager $mounts * @var Mount\Manager $mounts

2
lib/private/files/storage/common.php
View File

@ -398,7 +398,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
* @return int * @return int
*/ */
public function free_space($path) { public function free_space($path) {
return \OC\Files\Filesystem::SPACE_UNKNOWN; return \OCP\Files\FileInfo::SPACE_UNKNOWN;
} }
/** /**

4
lib/private/files/storage/dav.php
View File

@ -243,10 +243,10 @@ class DAV extends \OC\Files\Storage\Common {
if (isset($response['{DAV:}quota-available-bytes'])) { if (isset($response['{DAV:}quota-available-bytes'])) {
return (int)$response['{DAV:}quota-available-bytes']; return (int)$response['{DAV:}quota-available-bytes'];
} else { } else {
return \OC\Files\Filesystem::SPACE_UNKNOWN; return \OCP\Files\FileInfo::SPACE_UNKNOWN;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
return \OC\Files\Filesystem::SPACE_UNKNOWN; return \OCP\Files\FileInfo::SPACE_UNKNOWN;
} }
} }

2
lib/private/files/storage/local.php
View File

@ -218,7 +218,7 @@ if (\OC_Util::runningOnWindows()) {
public function free_space($path) { public function free_space($path) {
$space = @disk_free_space($this->datadir . $path); $space = @disk_free_space($this->datadir . $path);
if ($space === false || is_null($space)) { if ($space === false || is_null($space)) {
return \OC\Files\Filesystem::SPACE_UNKNOWN; return \OCP\Files\FileInfo::SPACE_UNKNOWN;
} }
return $space; return $space;
} }

4
lib/private/files/storage/wrapper/quota.php
View File

@ -50,7 +50,7 @@ class Quota extends Wrapper {
} }
return $data['size']; return $data['size'];
} else { } else {
return \OC\Files\Filesystem::SPACE_NOT_COMPUTED; return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED;
} }
} }
@ -66,7 +66,7 @@ class Quota extends Wrapper {
} else { } else {
$used = $this->getSize($this->sizeRoot); $used = $this->getSize($this->sizeRoot);
if ($used < 0) { if ($used < 0) {
return \OC\Files\Filesystem::SPACE_NOT_COMPUTED; return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED;
} else { } else {
$free = $this->storage->free_space($path); $free = $this->storage->free_space($path);
$quotaFree = max($this->quota - $used, 0); $quotaFree = max($this->quota - $used, 0);

4
lib/private/helper.php
View File

@ -887,7 +887,7 @@ class OC_Helper {
*/ */
public static function freeSpace($dir) { public static function freeSpace($dir) {
$freeSpace = \OC\Files\Filesystem::free_space($dir); $freeSpace = \OC\Files\Filesystem::free_space($dir);
if ($freeSpace !== \OC\Files\Filesystem::SPACE_UNKNOWN) { if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN) {
$freeSpace = max($freeSpace, 0); $freeSpace = max($freeSpace, 0);
return $freeSpace; return $freeSpace;
} else { } else {
@ -960,7 +960,7 @@ class OC_Helper {
} }
if ($includeExtStorage) { if ($includeExtStorage) {
$quota = OC_Util::getUserQuota(\OCP\User::getUser()); $quota = OC_Util::getUserQuota(\OCP\User::getUser());
if ($quota !== \OC\Files\Filesystem::SPACE_UNLIMITED) { if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
// always get free space / total space from root + mount points // always get free space / total space from root + mount points
$path = ''; $path = '';
return self::getGlobalStorageInfo(); return self::getGlobalStorageInfo();

4
lib/private/util.php
View File

@ -105,7 +105,7 @@ class OC_Util {
if (is_object($storage->getUser())) { if (is_object($storage->getUser())) {
$user = $storage->getUser()->getUID(); $user = $storage->getUser()->getUID();
$quota = OC_Util::getUserQuota($user); $quota = OC_Util::getUserQuota($user);
if ($quota !== \OC\Files\Filesystem::SPACE_UNLIMITED) { if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files')); return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files'));
} }
} }
@ -1244,7 +1244,7 @@ class OC_Util {
if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) { if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) {
throw new Exception('$url must start with https:// or http://', 1); throw new Exception('$url must start with https:// or http://', 1);
} }
if (function_exists('curl_init')) { if (function_exists('curl_init')) {
$curl = curl_init(); $curl = curl_init();
$max_redirects = 10; $max_redirects = 10;

4
lib/public/files/fileinfo.php
View File

@ -11,6 +11,10 @@ interface FileInfo {
const TYPE_FILE = 'file'; const TYPE_FILE = 'file';
const TYPE_FOLDER = 'dir'; const TYPE_FOLDER = 'dir';
const SPACE_NOT_COMPUTED = -1;
const SPACE_UNKNOWN = -2;
const SPACE_UNLIMITED = -3;
/** /**
* Get the Etag of the file or folder * Get the Etag of the file or folder
* *

2
tests/lib/connector/sabre/quotaplugin.php
View File

@ -63,7 +63,7 @@ class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase {
array(1024, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')), array(1024, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
array(1024, array('HTTP_CONTENT_LENGTH' => '512')), array(1024, array('HTTP_CONTENT_LENGTH' => '512')),
array(1024, array('HTTP_OC_TOTAL_LENGTH' => '1024', 'HTTP_CONTENT_LENGTH' => '512')), array(1024, array('HTTP_OC_TOTAL_LENGTH' => '1024', 'HTTP_CONTENT_LENGTH' => '512')),
// OC\Files\FREE_SPACE_UNKNOWN = -2 // \OCP\Files\FileInfo::SPACE_UNKNOWN = -2
array(-2, array()), array(-2, array()),
array(-2, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')), array(-2, array('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
array(-2, array('HTTP_CONTENT_LENGTH' => '512')), array(-2, array('HTTP_CONTENT_LENGTH' => '512')),