From 2df52e54d712a148f91c0945d95ffac2dc78802a Mon Sep 17 00:00:00 2001 From: Stephan Peijnik Date: Fri, 11 Jul 2014 10:36:28 +0200 Subject: Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem. As constants not defined within a class cannot be automatically found by the autoloader moving those constants into a class makes them accessible to code which uses them. Signed-off-by: Stephan Peijnik --- lib/private/connector/sabre/quotaplugin.php | 2 +- lib/private/files/filesystem.php | 7 ++++--- lib/private/files/storage/common.php | 2 +- lib/private/files/storage/dav.php | 4 ++-- lib/private/files/storage/local.php | 2 +- lib/private/files/storage/wrapper/quota.php | 4 ++-- lib/private/helper.php | 4 ++-- lib/private/util.php | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php index cf3c1103f84..a215a772c03 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 !== \OC\Files\Filesystem::SPACE_UNKNOWN && $length > $freeSpace) { if (isset($chunkHandler)) { $chunkHandler->cleanup(); } diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 4774d25ad9e..24329754dc1 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -31,11 +31,12 @@ namespace OC\Files; use OC\Files\Storage\Loader; -const SPACE_NOT_COMPUTED = -1; -const SPACE_UNKNOWN = -2; -const SPACE_UNLIMITED = -3; class Filesystem { + const SPACE_NOT_COMPUTED = -1; + const SPACE_UNKNOWN = -2; + const SPACE_UNLIMITED = -3; + /** * @var Mount\Manager $mounts */ diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 0720b8180c9..08c892cb7fe 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 \OC\Files\Filesystem::SPACE_UNKNOWN; } /** diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php index ce447417d20..93036b8ca44 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 \OC\Files\Filesystem::SPACE_UNKNOWN; } } catch (\Exception $e) { - return \OC\Files\SPACE_UNKNOWN; + return \OC\Files\Filesystem::SPACE_UNKNOWN; } } diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index a8b420e978a..eeb7af5cd08 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 \OC\Files\Filesystem::SPACE_UNKNOWN; } return $space; } diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index c57c797f87a..f9157ba84f4 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 \OC\Files\Filesystem::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 \OC\Files\Filesystem::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 79df2e3255c..840869e58c4 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 !== \OC\Files\Filesystem::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 !== \OC\Files\Filesystem::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 4959cb5a786..28cc87bfddd 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 !== \OC\Files\Filesystem::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 \OC\Files\Filesystem::SPACE_UNLIMITED; }else{ return OC_Helper::computerFileSize($userQuota); } -- cgit v1.2.3 From 5d7deefd95c3108ff4deb17d23e78b39dbe80ee3 Mon Sep 17 00:00:00 2001 From: Stephan Peijnik Date: Fri, 11 Jul 2014 11:21:32 +0200 Subject: Use tabs for indentation. Signed-off-by: Stephan Peijnik --- lib/private/files/filesystem.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 24329754dc1..758a178088c 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -33,9 +33,9 @@ namespace OC\Files; use OC\Files\Storage\Loader; class Filesystem { - const SPACE_NOT_COMPUTED = -1; - const SPACE_UNKNOWN = -2; - const SPACE_UNLIMITED = -3; + const SPACE_NOT_COMPUTED = -1; + const SPACE_UNKNOWN = -2; + const SPACE_UNLIMITED = -3; /** * @var Mount\Manager $mounts -- cgit v1.2.3 From b3b335480927a67f3019dfb9933b06e96b487179 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 19 Aug 2014 14:05:08 +0200 Subject: move to public namespace --- apps/files_external/lib/google.php | 2 +- apps/files_sharing/lib/sharedstorage.php | 2 +- lib/private/connector/sabre/quotaplugin.php | 2 +- lib/private/files/filesystem.php | 3 --- lib/private/files/storage/common.php | 2 +- lib/private/files/storage/dav.php | 4 ++-- lib/private/files/storage/local.php | 2 +- lib/private/files/storage/wrapper/quota.php | 4 ++-- lib/private/helper.php | 4 ++-- lib/private/util.php | 4 ++-- lib/public/files/fileinfo.php | 4 ++++ tests/lib/connector/sabre/quotaplugin.php | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-) (limited to 'lib') diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index e653050c5b3..88d82d51e2e 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\Filesystem::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 4b9be4109e9..07f6b9da10c 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\Filesystem::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 a215a772c03..ebcc894d744 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\Filesystem::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 758a178088c..1dbe66143ac 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -33,9 +33,6 @@ namespace OC\Files; use OC\Files\Storage\Loader; class Filesystem { - const SPACE_NOT_COMPUTED = -1; - const SPACE_UNKNOWN = -2; - const SPACE_UNLIMITED = -3; /** * @var Mount\Manager $mounts diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 08c892cb7fe..4799c865142 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\Filesystem::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 93036b8ca44..bd7166c9823 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\Filesystem::SPACE_UNKNOWN; + return \OCP\Files\FileInfo::SPACE_UNKNOWN; } } catch (\Exception $e) { - return \OC\Files\Filesystem::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 eeb7af5cd08..9df6cdef2af 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\Filesystem::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 f9157ba84f4..bf169e41f13 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\Filesystem::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\Filesystem::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 840869e58c4..17d3840a3ea 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\Filesystem::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\Filesystem::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 28cc87bfddd..82c5acee670 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\Filesystem::SPACE_UNLIMITED) { + if ($quota !== \OCP\Files\FileInfo::SPACE_UNLIMITED) { 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) { 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 b9c8258f21e..ece4409ca55 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -11,6 +11,10 @@ interface FileInfo { const TYPE_FILE = 'file'; 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 * diff --git a/tests/lib/connector/sabre/quotaplugin.php b/tests/lib/connector/sabre/quotaplugin.php index 1024ae6af8f..3b144cf56b5 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')), -- cgit v1.2.3 From 9a5e745a644bc57c2bcc1b58f2933b85ba37f6d6 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 19 Aug 2014 16:45:22 +0200 Subject: fix typo --- lib/private/util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/util.php b/lib/private/util.php index 82c5acee670..7070d0bcece 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -197,7 +197,7 @@ class OC_Util { $userQuota = $config->getAppValue('files', 'default_quota', 'none'); } if($userQuota === 'none') { - return \OC\Files\Filesystem::SPACE_UNLIMITED; + return \OCP\Files\FileInfo::SPACE_UNLIMITED; }else{ return OC_Helper::computerFileSize($userQuota); } -- cgit v1.2.3 From ab6ee6a600a5d373c28bad988f5a7ac9eca52b54 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 19 Aug 2014 16:49:51 +0200 Subject: Add doc for \OCP\Files\FileInfo space constants --- lib/public/files/fileinfo.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php index ece4409ca55..0279050b858 100644 --- a/lib/public/files/fileinfo.php +++ b/lib/public/files/fileinfo.php @@ -11,8 +11,17 @@ 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; /** -- cgit v1.2.3