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

Merge pull request #22900 from owncloud/diskfreespace-filesworkaround 

Fix call to disk_free_space when a file is provided
This commit is contained in:
Thomas Müller 2016-03-07 15:07:31 +01:00
parent a61fa5b526 89881ed511
commit 19dc02b8e0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,7 +252,15 @@ class Local extends \OC\Files\Storage\Common {
} }
public function free_space($path) { public function free_space($path) {
$space = @disk_free_space($this->getSourcePath($path)); $sourcePath = $this->getSourcePath($path);
// using !is_dir because $sourcePath might be a part file or
// non-existing file, so we'd still want to use the parent dir
// in such cases
if (!is_dir($sourcePath)) {
// disk_free_space doesn't work on files
$sourcePath = dirname($sourcePath);
}
$space = @disk_free_space($sourcePath);
if ($space === false || is_null($space)) { if ($space === false || is_null($space)) {
return \OCP\Files\FileInfo::SPACE_UNKNOWN; return \OCP\Files\FileInfo::SPACE_UNKNOWN;
} }