TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Neeraj Gupta
2025-07-31 10:34:42 +05:30
parent 02ef29fd8f
commit 53c14dff01
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
mobile/apps/photos/lib/utils/delete_file_util.dart
View File

@@ -82,9 +82,9 @@ Future<void> deleteFilesFromEverywhere(
if (deletedIDs.contains(file.localID) ||
alreadyDeletedIDs.contains(file.localID)) {
deletedFiles.add(file);
if (file.uploadedFileID != null) {
if (file.rAsset != null) {
uploadedFilesToBeTrashed
.add(TrashRequest(file.uploadedFileID!, file.collectionID!));
.add(TrashRequest(file.rAsset!.id, file.collectionID!));
updatedCollectionIDs.add(file.collectionID!);
} else {
await FilesDB.instance.deleteLocalFile(file);
@@ -94,7 +94,7 @@ Future<void> deleteFilesFromEverywhere(
updatedCollectionIDs.add(file.collectionID!);
deletedFiles.add(file);
uploadedFilesToBeTrashed
.add(TrashRequest(file.uploadedFileID!, file.collectionID!));
.add(TrashRequest(file.rAsset!.id, file.collectionID!));
}
}
if (uploadedFilesToBeTrashed.isNotEmpty) {
@@ -384,12 +384,7 @@ Future<bool> deleteLocalFiles(
}
if (delLocalIDs.isNotEmpty) {
final deletedFiles = await FilesDB.instance.getLocalFiles(delLocalIDs);
await FilesDB.instance.markLocalIDAsNull(delLocalIDs);
_logger.info(deletedFiles.length.toString() + " files deleted locally");
Bus.instance.fire(
LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
);
await _handleLocallyDeletedFiles(delLocalIDs);
return true;
} else {
//On android 10, even if files were deleted, deletedIDs is empty.
@@ -406,6 +401,15 @@ Future<bool> deleteLocalFiles(
}
}
Future<void> _handleLocallyDeletedFiles(List<String> localIDs) async {
final deletedFiles = await FilesDB.instance.getLocalFiles(localIDs);
await FilesDB.instance.markLocalIDAsNull(localIDs);
_logger.info(deletedFiles.length.toString() + " files deleted locally");
Bus.instance.fire(
LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
);
}
Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
BuildContext context,
List<String> localIDs,
@@ -462,12 +466,7 @@ Future<bool> deleteLocalFilesAfterRemovingAlreadyDeletedIDs(
}
if (deletedIDs.isNotEmpty) {
final deletedFiles = await FilesDB.instance.getLocalFiles(deletedIDs);
await FilesDB.instance.markLocalIDAsNull(deletedIDs);
_logger.info(deletedFiles.length.toString() + " files deleted locally");
Bus.instance.fire(
LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
);
await _handleLocallyDeletedFiles(deletedIDs);
return true;
} else {
//On android 10, even if files were deleted, deletedIDs is empty.
@@ -537,12 +536,7 @@ Future<bool> retryFreeUpSpaceAfterRemovingAssetsNonExistingInDisk(
}
if (deletedIDs.isNotEmpty) {
final deletedFiles = await FilesDB.instance.getLocalFiles(deletedIDs);
await FilesDB.instance.markLocalIDAsNull(deletedIDs);
_logger.info(deletedFiles.length.toString() + " files deleted locally");
Bus.instance.fire(
LocalPhotosUpdatedEvent(deletedFiles, source: "deleteLocal"),
);
await _handleLocallyDeletedFiles(deletedIDs);
return true;
} else {
//On android 10, even if files were deleted, deletedIDs is empty.