Skip to content

use node API for free space calculation in versions app #14470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Mar 5, 2019
Merged

use node API for free space calculation in versions app #14470

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f43d1d
use node API for free space calculation in versions app (same method …
Mar 2, 2019
5645750
set availableSpace to 0 if userFolder not found
Mar 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions apps/files_versions/lib/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,13 +750,16 @@ public static function expire($filename, $uid) {
// 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;
Expand Down