diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 56c0d451651b15c0f59d6e80cf9303d5c8b15bcd..88d82d51e2e81b0169b7d9ee762e93205f0d223e 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -286,7 +286,7 @@ class Google extends \OC\Files\Storage\Common {
// Check if this is a Google Doc
if ($this->getMimeType($path) !== $file->getMimeType()) {
// Return unknown file size
- $stat['size'] = \OC\Files\SPACE_UNKNOWN;
+ $stat['size'] = \OCP\Files\FileInfo::SPACE_UNKNOWN;
} else {
$stat['size'] = $file->getFileSize();
}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 02fcd7041dd04f6787eac0a64b1a3c36b9edf566..07f6b9da10c820599ae18ab0674e9ec5e89837be 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -377,7 +377,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($source);
return $storage->free_space($internalPath);
}
- return \OC\Files\SPACE_UNKNOWN;
+ return \OCP\Files\FileInfo::SPACE_UNKNOWN;
}
public function getLocalFile($path) {
diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
index cf3c1103f84ed9ae0a2975bd7bfe5f6118f932b3..ebcc894d7446c1e67ecc96b5c06fd32718767311 100644
--- a/lib/private/connector/sabre/quotaplugin.php
+++ b/lib/private/connector/sabre/quotaplugin.php
@@ -72,7 +72,7 @@ class OC_Connector_Sabre_QuotaPlugin extends \Sabre\DAV\ServerPlugin {
$length -= $chunkHandler->getCurrentSize();
}
$freeSpace = $this->getFreeSpace($parentUri);
- if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) {
+ if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN && $length > $freeSpace) {
if (isset($chunkHandler)) {
$chunkHandler->cleanup();
}
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 4774d25ad9ec7fb2f348a5a7cc8b3cf2edf9d0d4..1dbe66143acdba4378bcab680b6ef5e5c4c39e34 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -31,11 +31,9 @@
namespace OC\Files;
use OC\Files\Storage\Loader;
-const SPACE_NOT_COMPUTED = -1;
-const SPACE_UNKNOWN = -2;
-const SPACE_UNLIMITED = -3;
class Filesystem {
+
/**
* @var Mount\Manager $mounts
*/
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 0720b8180c968214cdc500ef436810649f3b0ce1..4799c86514236920b12e3d00fdb96006298f92ac 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -398,7 +398,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
* @return int
*/
public function free_space($path) {
- return \OC\Files\SPACE_UNKNOWN;
+ return \OCP\Files\FileInfo::SPACE_UNKNOWN;
}
/**
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index ce447417d20880fb67ec8c2f4a50f29a6c2fb068..bd7166c9823950de0857eb0d6978ec35310c4e5c 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -243,10 +243,10 @@ class DAV extends \OC\Files\Storage\Common {
if (isset($response['{DAV:}quota-available-bytes'])) {
return (int)$response['{DAV:}quota-available-bytes'];
} else {
- return \OC\Files\SPACE_UNKNOWN;
+ return \OCP\Files\FileInfo::SPACE_UNKNOWN;
}
} catch (\Exception $e) {
- return \OC\Files\SPACE_UNKNOWN;
+ return \OCP\Files\FileInfo::SPACE_UNKNOWN;
}
}
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index a8b420e978a1d2042dbf8497583e87226a06d206..9df6cdef2afcdb01fd4ec40d2e4e5991258f2b68 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -218,7 +218,7 @@ if (\OC_Util::runningOnWindows()) {
public function free_space($path) {
$space = @disk_free_space($this->datadir . $path);
if ($space === false || is_null($space)) {
- return \OC\Files\SPACE_UNKNOWN;
+ return \OCP\Files\FileInfo::SPACE_UNKNOWN;
}
return $space;
}
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
index c57c797f87a57c5c1f2babc63e2b5e2e99bc8bb7..bf169e41f13ca52c51c5155f96b98b5c9607aab6 100644
--- a/lib/private/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
@@ -50,7 +50,7 @@ class Quota extends Wrapper {
}
return $data['size'];
} else {
- return \OC\Files\SPACE_NOT_COMPUTED;
+ return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED;
}
}
@@ -66,7 +66,7 @@ class Quota extends Wrapper {
} else {
$used = $this->getSize($this->sizeRoot);
if ($used < 0) {
- return \OC\Files\SPACE_NOT_COMPUTED;
+ return \OCP\Files\FileInfo::SPACE_NOT_COMPUTED;
} else {
$free = $this->storage->free_space($path);
$quotaFree = max($this->quota - $used, 0);
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 79df2e3255c003a1b5ece616a691c6c3febf4e04..17d3840a3ea5ac780e707d107ac4003941b73eee 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -887,7 +887,7 @@ class OC_Helper {
*/
public static function freeSpace($dir) {
$freeSpace = \OC\Files\Filesystem::free_space($dir);
- if ($freeSpace !== \OC\Files\SPACE_UNKNOWN) {
+ if ($freeSpace !== \OCP\Files\FileInfo::SPACE_UNKNOWN) {
$freeSpace = max($freeSpace, 0);
return $freeSpace;
} else {
@@ -960,7 +960,7 @@ class OC_Helper {
}
if ($includeExtStorage) {
$quota = OC_Util::getUserQuota(\OCP\User::getUser());
- if ($quota !== \OC\Files\SPACE_UNLIMITED) {
+ if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
// always get free space / total space from root + mount points
$path = '';
return self::getGlobalStorageInfo();
diff --git a/lib/private/util.php b/lib/private/util.php
index 4959cb5a786411896a506080b4c4a3f1e5e53cdd..7070d0bcece00a817e30d703319468882d991cc0 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -105,7 +105,7 @@ class OC_Util {
if (is_object($storage->getUser())) {
$user = $storage->getUser()->getUID();
$quota = OC_Util::getUserQuota($user);
- if ($quota !== \OC\Files\SPACE_UNLIMITED) {
+ if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files'));
}
}
@@ -197,7 +197,7 @@ class OC_Util {
$userQuota = $config->getAppValue('files', 'default_quota', 'none');
}
if($userQuota === 'none') {
- return \OC\Files\SPACE_UNLIMITED;
+ return \OCP\Files\FileInfo::SPACE_UNLIMITED;
}else{
return OC_Helper::computerFileSize($userQuota);
}
@@ -1244,7 +1244,7 @@ class OC_Util {
if (strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) {
throw new Exception('$url must start with https:// or http://', 1);
}
-
+
if (function_exists('curl_init')) {
$curl = curl_init();
$max_redirects = 10;
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index b9c8258f21eee7bf364468b39e2e31bae5d67a9b..0279050b8588ecd644f16f40c90cc122caa03ebc 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -11,6 +11,19 @@ interface FileInfo {
const TYPE_FILE = 'file';
const TYPE_FOLDER = 'dir';
+ /*
+ * @const \OCP\Files\FileInfo::SPACE_NOT_COMPUTED Return value for a not computed space value
+ */
+ const SPACE_NOT_COMPUTED = -1;
+ /*
+ * @const \OCP\Files\FileInfo::SPACE_UNKNOWN Return value for unknown space value
+ */
+ const SPACE_UNKNOWN = -2;
+ /*
+ * @const \OCP\Files\FileInfo::SPACE_UNKNOWN Return value for unlimited space
+ */
+ const SPACE_UNLIMITED = -3;
+
/**
* Get the Etag of the file or folder
*
diff --git a/tests/lib/connector/sabre/quotaplugin.php b/tests/lib/connector/sabre/quotaplugin.php
index 1024ae6af8f0b9d750fdc04ba7a0ce3063d0d008..3b144cf56b5213a4285bf03a305772a22b58a9f6 100644
--- a/tests/lib/connector/sabre/quotaplugin.php
+++ b/tests/lib/connector/sabre/quotaplugin.php
@@ -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_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('HTTP_X_EXPECTED_ENTITY_LENGTH' => '1024')),
array(-2, array('HTTP_CONTENT_LENGTH' => '512')),