Skip to content

[stable24] Add a method to get estimated export size in IMigrator #32664

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 8 commits into from
Jun 2, 2022
Merged

[stable24] Add a method to get estimated export size in IMigrator #32664

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c16b72f
Add a method to get estimated export size in IMigrator
come-nc Apr 28, 2022
dde192d
Implement getExportEstimatedSize in migrators
come-nc Apr 28, 2022
4afa609
Move new IMigrator method to a specific interface ISizeEstimationMigr…
come-nc May 24, 2022
5a7752d
Add the ISizeEstimationMigrator interface for method getExportEstimat…
come-nc May 24, 2022
72fc8c9
Update method name
Pytal Apr 29, 2022
b85f882
Skip avatar on failure
Pytal Apr 29, 2022
eb70231
Update contacts estimation
Pytal Apr 29, 2022
a541f97
Update calendar estimation
Pytal Apr 29, 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
Skip avatar on failure 
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal @backportbot-nextcloud
Pytal authored and backportbot-nextcloud[bot] committed May 31, 2022
commit b85f882c23edb565de55ef43613b6e34c41fd028
4 changes: 1 addition & 3 deletions apps/settings/lib/UserMigration/AccountMigrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ public function __construct(
* {@inheritDoc}
*/
public function getEstimatedExportSize(IUser $user): int {
$uid = $user->getUID();

$size = 100; // 100KiB for account JSON

try {
Expand All @@ -84,7 +82,7 @@ public function getEstimatedExportSize(IUser $user): int {
$size += $avatarFile->getSize() / 1024;
}
} catch (Throwable $e) {
return 0;
// Skip avatar in size estimate on failure
}

return (int)ceil($size);
Expand Down