Merge pull request #8015 from owncloud/storageinfo-reuse
Allow reusing FileInfo for getStorageInfo
This commit is contained in:
commit
8a10c44eb3
|
@ -39,7 +39,7 @@ OCP\App::setActiveNavigationEntry('files_index');
|
|||
// Load the files
|
||||
$dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
|
||||
$dir = \OC\Files\Filesystem::normalizePath($dir);
|
||||
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir);
|
||||
$dirInfo = \OC\Files\Filesystem::getFileInfo($dir, false);
|
||||
// Redirect if directory does not exist
|
||||
if (!$dirInfo || !$dirInfo->getType() === 'dir') {
|
||||
header('Location: ' . OCP\Util::getScriptName() . '');
|
||||
|
@ -70,7 +70,7 @@ $config = \OC::$server->getConfig();
|
|||
$permissions = $dirInfo->getPermissions();
|
||||
|
||||
// information about storage capacities
|
||||
$storageInfo=OC_Helper::getStorageInfo($dir);
|
||||
$storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo);
|
||||
$freeSpace=$storageInfo['free'];
|
||||
$uploadLimit=OCP\Util::uploadLimit();
|
||||
$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);
|
||||
|
|
|
@ -875,12 +875,15 @@ class OC_Helper {
|
|||
* Calculate the disc space for the given path
|
||||
*
|
||||
* @param string $path
|
||||
* @param \OCP\Files\FileInfo $rootInfo (optional)
|
||||
* @return array
|
||||
*/
|
||||
public static function getStorageInfo($path) {
|
||||
public static function getStorageInfo($path, $rootInfo = null) {
|
||||
// return storage info without adding mount points
|
||||
$rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
|
||||
$used = $rootInfo['size'];
|
||||
if (is_null($rootInfo)) {
|
||||
$rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);
|
||||
}
|
||||
$used = $rootInfo->getSize();
|
||||
if ($used < 0) {
|
||||
$used = 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue