Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Preserve own-collect added time on diff replay

Neeraj Gupta2f8a371175c0
diff --git a/mobile/apps/photos/lib/db/files_db.dart b/mobile/apps/photos/lib/db/files_db.dart
index 0990ac9a67..b05ace23b2 100644
--- a/mobile/apps/photos/lib/db/files_db.dart
+++ b/mobile/apps/photos/lib/db/files_db.dart
@@ -1758,7 +1758,8 @@ class FilesDB with SqlDbBase {
return collectionIDsOfFile;
}
- Future<Map<int, int>> getMinPositiveAddedTimeForUploadedFiles(
+ Future<Map<int, ({int collectionID, int addedTime})>>
+ getEarliestPositiveAddedTimeRowsForUploadedFiles(
Set<int> uploadedFileIDs,
int ownerID,
) async {
@@ -1767,7 +1768,7 @@ class FilesDB with SqlDbBase {
}
final db = await instance.sqliteAsyncDB;
- final result = <int, int>{};
+ final result = <int, ({int collectionID, int addedTime})>{};
const maxInParams = 900;
final uploadIDs = uploadedFileIDs.toList(growable: false);
@@ -1779,22 +1780,33 @@ class FilesDB with SqlDbBase {
final inParam = chunk.join(',');
final rows = await db.getAll(
'''
- SELECT $columnUploadedFileID, MIN($columnAddedTime) AS min_added_time
+ SELECT $columnUploadedFileID, $columnCollectionID, $columnAddedTime
FROM $filesTable
WHERE $columnOwnerID = ?
AND $columnUploadedFileID IN ($inParam)
AND $columnAddedTime > 0
- GROUP BY $columnUploadedFileID
''',
[ownerID],
);
for (final row in rows) {
final uploadedFileID = row[columnUploadedFileID] as int?;
- final minAddedTime = row['min_added_time'] as int?;
- if (uploadedFileID == null || minAddedTime == null) {
+ final collectionID = row[columnCollectionID] as int?;
+ final addedTime = row[columnAddedTime] as int?;
+ if (uploadedFileID == null ||
+ collectionID == null ||
+ addedTime == null) {
continue;
}
- result[uploadedFileID] = minAddedTime;
+ final current = result[uploadedFileID];
+ if (current == null ||
+ addedTime < current.addedTime ||
+ (addedTime == current.addedTime &&
+ collectionID < current.collectionID)) {
+ result[uploadedFileID] = (
+ collectionID: collectionID,
+ addedTime: addedTime,
+ );
+ }
}
}
return result;
diff --git a/mobile/apps/photos/lib/services/sync/diff_fetcher.dart b/mobile/apps/photos/lib/services/sync/diff_fetcher.dart
index 69db2f8049..7fa2377485 100644
--- a/mobile/apps/photos/lib/services/sync/diff_fetcher.dart
+++ b/mobile/apps/photos/lib/services/sync/diff_fetcher.dart
@@ -270,8 +270,8 @@ class DiffFetcher {
incomingMinByUploadID[entry.key] = minIncoming;
}
- final dbMinByUploadID = await FilesDB.instance
- .getMinPositiveAddedTimeForUploadedFiles(
+ final dbEarliestByUploadID = await FilesDB.instance
+ .getEarliestPositiveAddedTimeRowsForUploadedFiles(
incomingMinByUploadID.keys.toSet(),
currentUserID,
);
@@ -286,17 +286,26 @@ class DiffFetcher {
final candidates = entry.value;
collectCandidatesCount += candidates.length;
final incomingMin = incomingMinByUploadID[uploadedFileID]!;
- final dbMin = dbMinByUploadID[uploadedFileID];
+ final dbEarliest = dbEarliestByUploadID[uploadedFileID];
- if (dbMin != null && dbMin <= incomingMin) {
+ if (dbEarliest != null && dbEarliest.addedTime <= incomingMin) {
+ var keptForUploadID = false;
for (final candidate in candidates) {
- candidate.file.addedTime = -1;
+ if (dbEarliest.collectionID == collectionID &&
+ !keptForUploadID &&
+ candidate.collectionAddedAt == incomingMin) {
+ candidate.file.addedTime = dbEarliest.addedTime;
+ keptForUploadID = true;
+ keptIncomingCount++;
+ } else {
+ candidate.file.addedTime = -1;
+ suppressedIncomingCount++;
+ }
}
- suppressedIncomingCount += candidates.length;
continue;
}
- if (dbMin != null && dbMin > incomingMin) {
+ if (dbEarliest != null && dbEarliest.addedTime > incomingMin) {
uploadsToReset.add(uploadedFileID);
}