Skip to content

[stable24] Add export estimation #173

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
Pytal merged 22 commits into from
Jun 10, 2022
Merged

[stable24] Add export estimation #173

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
033199c
Implement getExportEstimatedSize in FilesMigrator
come-nc Apr 28, 2022
d372d56
Add estimate export size to service and controller
come-nc Apr 28, 2022
c1ec63b
Update method name
Pytal Apr 29, 2022
0705281
Subtract size of export file from estimate
Pytal Apr 29, 2022
c6322e7
Cache size estimates
Pytal Apr 29, 2022
0e50636
Fix DocBlock
Pytal Apr 29, 2022
97ff5e9
Fix spacing
Pytal Apr 29, 2022
731e1f3
Add CappedMemoryCache stub
Pytal Apr 29, 2022
22dbdca
Add comment about export filesize subtraction
Pytal Apr 29, 2022
9454bb2
Add exportable endpoint
Pytal Apr 30, 2022
dc895c9
Hoist not exportable exception
Pytal Apr 30, 2022
b376f4d
Ensure that migrator is an ISizeEstimationMigrator
Pytal Jun 2, 2022
1f609c4
Use method to get free space
Pytal Jun 2, 2022
176d2ca
Cache migrators separately
Pytal Jun 2, 2022
2d985d7
Add export estimate endpoint
Pytal Jun 2, 2022
09e1ec0
Consolidate estimation and exportability warnings into a single endpoint
Pytal Jun 3, 2022
27cc973
Round estimated size before sending response and add units
Pytal Jun 3, 2022
467aa12
Implement ISizeEstimationMigrator and fix files versions estimation
Pytal Jun 3, 2022
74dd91f
Remove unused use statements
Pytal Jun 3, 2022
0313185
Convert KiB to MiB
Pytal Jun 6, 2022
ff7cd0e
Explicitly name estimated size
Pytal Jun 8, 2022
4379ff6
Add previous export size to free space
Pytal Jun 8, 2022
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
Prev Previous commit
Next Next commit
Subtract size of export file from estimate 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal @backportbot-nextcloud
Pytal authored and backportbot-nextcloud[bot] committed Jun 10, 2022
commit 0705281f6b2ac1d995ca88a55ac00be131b508b4
11 changes: 11 additions & 0 deletions lib/Migrator/FilesMigrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ public function getEstimatedExportSize(IUser $user): int {

$size = $userFolder->getSize() / 1024;

try {
$exportFile = $userFolder->get(ExportDestination::EXPORT_FILENAME);
if (!($exportFile instanceof File)) {
throw new \InvalidArgumentException('User export is not a file');
}

$size -= $exportFile->getSize() / 1024;
} catch (NotFoundException $e) {
// No size subtraction needed if export file doesn't exist
}

try {
$versionsFolder = $this->root->get('/'.$uid.'/'.FilesVersionsStorage::VERSIONS_ROOT);
if ($versionsFolder instanceof Folder) {
Expand Down