wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14470 from felixn/master

Browse source 
use node API for free space calculation in versions app
This commit is contained in:
Morris Jobke 2019-03-05 09:40:11 +01:00 committed by GitHub
commit ede5f4486a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/files_versions/lib/Storage.php
View file

@ -750,13 +750,16 @@ class Storage {
// subtract size of files and current versions size from quota
if ($quota >= 0) {
if ($softQuota) {
$files_view = new View('/' . $uid . '/files');
$rootInfo = $files_view->getFileInfo('/', false);
$free = $quota - $rootInfo['size']; // remaining free space for user
if ($free > 0) {
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
$userFolder = \OC::$server->getUserFolder($uid);
if(is_null($userFolder)) {
$availableSpace = 0;
} else {
$availableSpace = $free - $versionsSize;
$free = $quota - $userFolder->getSize(false); // remaining free space for user
if ($free > 0) {
$availableSpace = ($free * self::DEFAULTMAXSIZE / 100) - $versionsSize; // how much space can be used for versions
} else {
$availableSpace = $free - $versionsSize;
}
}
} else {
$availableSpace = $quota;