Skip to content

Use node API for trash bin with special flag for getSize() #14454

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

Jump to bottom
Merged
rullzer merged 2 commits into from
Mar 1, 2019
Merged

Use node API for trash bin with special flag for getSize() #14454

rullzer merged 2 commits into from
Mar 1, 2019

Conversation

@MorrisJobke
Copy link
Member

@MorrisJobke MorrisJobke commented Mar 1, 2019

@MorrisJobke
Revert "Fix for issue 10862: calculation of free space ignores extern…
f6967a9 
…al storage (doesn't count towards quota)"

This reverts commit e806aa6.

Signed-off-by: Morris Jobke <[email protected]>
@MorrisJobke
Only fetch size of this storage without mount points - ref #14412
4704e71 
Signed-off-by: Morris Jobke <[email protected]>
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Mar 1, 2019
@MorrisJobke MorrisJobke added this to the Nextcloud 16 milestone Mar 1, 2019
@MorrisJobke MorrisJobke mentioned this pull request Mar 1, 2019
Merged
@MorrisJobke
Copy link
Member Author

MorrisJobke commented Mar 1, 2019

This fixes #10862 on master

@rullzer rullzer merged commit d0d1c85 into master Mar 1, 2019
@rullzer rullzer deleted the feature/noid/use-node-api-for-trashbin branch March 1, 2019 12:22
@felixn
Copy link

felixn commented Mar 1, 2019

Looks good to me.

Is it safe to make the same changes (i.e. switch to the node API) in the files_versions app?

server/apps/files_versions/lib/Storage.php

Lines 753 to 755 in fb5a249

$files_view = new View('/' . $uid . '/files');
$rootInfo = $files_view->getFileInfo('/', false);
$free = $quota - $rootInfo['size']; // remaining free space for user

@MorrisJobke
Copy link
Member Author

MorrisJobke commented Mar 1, 2019

Is it safe to make the same changes (i.e. switch to the node API) in the files_versions app?

I would say so. 👍

@felixn felixn mentioned this pull request Mar 2, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzer rullzer rullzer approved these changes

@icewind1991 icewind1991 icewind1991 approved these changes

@felixn felixn Awaiting requested review from felixn

Assignees

No one assigned

Labels

3. to review Waiting for reviews

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

5 participants

@MorrisJobke @felixn @rullzer @icewind1991