kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-13 01:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(backup): attach reason of error, use ListView.builder, use upload instead of forceUpload

Browse Source
This commit is contained in:
Prateek Sunal
2024-08-29 00:53:57 +05:30
committed by Neeraj Gupta
parent 5662661326
commit 325871f7c5
4 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mobile/lib/utils/file_uploader.dart
View File

@@ -219,6 +219,7 @@ class FileUploader {
_queue.remove(id)?.completer.completeError(reason);
_allBackups[id] = _allBackups[id]!.copyWith(
status: BackupItemStatus.retry,
error: reason,
);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
}
@@ -243,8 +244,8 @@ class FileUploader {
});
for (final id in uploadsToBeRemoved) {
_queue.remove(id)?.completer.completeError(reason);
_allBackups[id] =
_allBackups[id]!.copyWith(status: BackupItemStatus.retry);
_allBackups[id] = _allBackups[id]!
.copyWith(status: BackupItemStatus.retry, error: reason);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
}
_logger.info(
@@ -283,6 +284,10 @@ class FileUploader {
}
if (pendingEntry != null) {
pendingEntry.status = UploadStatus.inProgress;
_allBackups[pendingEntry.file.localID!] =
_allBackups[pendingEntry.file.localID]!
.copyWith(status: BackupItemStatus.uploading);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
_encryptAndUploadFileToCollection(
pendingEntry.file,
pendingEntry.collectionID,
@@ -314,6 +319,7 @@ class FileUploader {
_queue.remove(localID)!.completer.complete(uploadedFile);
_allBackups[localID] =
_allBackups[localID]!.copyWith(status: BackupItemStatus.completed);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
return uploadedFile;
} catch (e) {
if (e is LockAlreadyAcquiredError) {
@@ -324,8 +330,8 @@ class FileUploader {
return _queue[localID]!.completer.future;
} else {
_queue.remove(localID)!.completer.completeError(e);
_allBackups[localID] =
_allBackups[localID]!.copyWith(status: BackupItemStatus.retry);
_allBackups[localID] = _allBackups[localID]!
.copyWith(status: BackupItemStatus.retry, error: e);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
return null;
}
@@ -435,18 +441,24 @@ class FileUploader {
Future<EnteFile> forceUpload(EnteFile file, int collectionID) async {
_hasInitiatedForceUpload = true;
final isInQueue = _allBackups[file.localID!] != null;
try {
final result = await _tryToUpload(file, collectionID, true);
_allBackups[file.localID!] = _allBackups[file.localID]!.copyWith(
status: BackupItemStatus.completed,
);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
if (isInQueue) {
_allBackups[file.localID!] = _allBackups[file.localID]!.copyWith(
status: BackupItemStatus.completed,
);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
}
return result;
} catch (_) {
_allBackups[file.localID!] = _allBackups[file.localID]!.copyWith(
status: BackupItemStatus.retry,
);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
} catch (error) {
if (isInQueue) {
_allBackups[file.localID!] = _allBackups[file.localID]!.copyWith(
status: BackupItemStatus.retry,
error: error,
);
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
}
rethrow;
}
}
@@ -1335,8 +1347,10 @@ class FileUploader {
} else {
_logger.info("Background upload failure detected");
completer?.completeError(SilentlyCancelUploadsError());
_allBackups[upload.key] =
_allBackups[upload.key]!.copyWith(status: BackupItemStatus.retry);
_allBackups[upload.key] = _allBackups[upload.key]!.copyWith(
status: BackupItemStatus.retry,
error: SilentlyCancelUploadsError(),
);
}
Bus.instance.fire(BackupUpdatedEvent(_allBackups));
}