Merge pull request #149 from ente-io/trash_batch

Batch trash requests

lib/services/remote_sync_service.dart

@@ -327,6 +327,7 @@ class RemoteSyncService {
             // File was updated since the app was uninstalled
             _logger.info("Updated since last installation: " +
                 file.uploadedFileID.toString());
+            file.modificationTime = existingFiles[0].modificationTime;
             file.updationTime = null;
             updated++;
           } else {

lib/services/trash_sync_service.dart

@@ -18,6 +18,7 @@ class TrashSyncService {
   final _diffFetcher = TrashDiffFetcher();
   final _trashDB = TrashDB.instance;
   static const kLastTrashSyncTime = "last_trash_sync_time";
+  static const kTrashBatchSize = 999;
   SharedPreferences _prefs;
 
   TrashSyncService._privateConstructor();
@@ -88,23 +89,41 @@ class TrashSyncService {
   }
 
   Future<void> trashFilesOnServer(List<TrashRequest> trashRequestItems) async {
-    final params = <String, dynamic>{};
     final includedFileIDs = <int>{};
-    params["items"] = [];
+    final uniqueItems = <TrashRequest>[];
     for (final item in trashRequestItems) {
       if (!includedFileIDs.contains(item.fileID)) {
-        params["items"].add(item.toJson());
+        uniqueItems.add(item);
         includedFileIDs.add(item.fileID);
       }
     }
-    return await _dio.post(
+    int currentBatchSize = 0;
+    final requestData = <String, dynamic>{};
+    requestData["items"] = [];
+    for (final item in uniqueItems) {
+      currentBatchSize++;
+      requestData["items"].add(item.toJson());
+      if (currentBatchSize >= kTrashBatchSize) {
+        await _trashFiles(requestData);
+        requestData["items"] = [];
+        currentBatchSize = 0;
+      }
+    }
+    if (currentBatchSize > 0) {
+      return await _trashFiles(requestData);
+    }
+  }
+
+  Future<Response<dynamic>> _trashFiles(
+      Map<String, dynamic> requestData) async {
+    return _dio.post(
       Configuration.instance.getHttpEndpoint() + "/files/trash",
       options: Options(
         headers: {
           "X-Auth-Token": Configuration.instance.getToken(),
         },
       ),
-      data: params,
+      data: requestData,
     );
   }
 

pubspec.yaml

@@ -11,7 +11,7 @@ description: ente photos application
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.4.1+261
+version: 0.4.3+263
 
 environment:
   sdk: ">=2.10.0 <3.0.0"