Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] dont save cancelled timelines in memory lane service

Priyanshu Dangarec43244e75fc5
diff --git a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
index ec2f2a01c5..aa8d24d4f3 100644
--- a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
+++ b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
@@ -57,7 +57,7 @@ class MemoryLaneService {
);
final Map<String, int> _lastForcedComputeMicros = {};
- final Map<String, bool> _pendingRequests = {};
+ final Map<String, _TimelineRequest> _pendingRequests = {};
final Set<String> _cropReadinessInFlight = {};
bool __isFeatureEnabled = false;
@@ -121,18 +121,26 @@ class MemoryLaneService {
if (personId.isEmpty) {
return;
}
- _pendingRequests[personId] = (_pendingRequests[personId] ?? false) || force;
+ _pendingRequests[personId] = _TimelineRequest(
+ (_pendingRequests[personId]?.force ?? false) || force,
+ );
_precomputeQueue
.addTask(personId, () async {
- final requestForce = _pendingRequests.remove(personId) ?? force;
- await _recomputeTimelineForPerson(
- personId,
- isCluster: isCluster,
- force: requestForce,
- );
+ final request = _pendingRequests[personId];
+ if (request == null) return;
+ try {
+ await _recomputeTimelineForPerson(
+ personId,
+ isCluster: isCluster,
+ request: request,
+ );
+ } finally {
+ if (identical(_pendingRequests[personId], request)) {
+ _pendingRequests.remove(personId);
+ }
+ }
})
.catchError((e, s) {
- _pendingRequests.remove(personId);
_logger.severe("Recompute failed for $personId", e, s);
});
}
@@ -476,8 +484,9 @@ class MemoryLaneService {
Future<void> _recomputeTimelineForPerson(
String personId, {
required bool isCluster,
- required bool force,
+ required _TimelineRequest request,
}) async {
+ final force = request.force;
if (!isFeatureEnabled) {
return;
}
@@ -529,6 +538,9 @@ class MemoryLaneService {
_eligibleCreationTimeCutoffMicros(person?.data.birthDate),
isCluster: isCluster,
);
+ if (!identical(_pendingRequests[personId], request)) {
+ return;
+ }
await _cacheService.upsertTimeline(timeline);
await _cacheService.upsertComputeLogEntry(
MemoryLaneComputeLogEntry(
@@ -876,6 +888,12 @@ class MemoryLaneService {
}
}
+class _TimelineRequest {
+ final bool force;
+
+ const _TimelineRequest(this.force);
+}
+
class _TimelineFaceData {
final String faceId;
final int fileId;