Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] wrap _scheduleTimelinesForMemoriesStrip call in try catch

Priyanshu Dangaree1ce6431357d
diff --git a/mobile/apps/photos/lib/services/memory_lane/memory_lane_cache_service.dart b/mobile/apps/photos/lib/services/memory_lane/memory_lane_cache_service.dart
index 572a6a7fea..4b9c9c5163 100644
--- a/mobile/apps/photos/lib/services/memory_lane/memory_lane_cache_service.dart
+++ b/mobile/apps/photos/lib/services/memory_lane/memory_lane_cache_service.dart
@@ -1,10 +1,12 @@
import "dart:convert";
import "dart:io";
+import "package:collection/collection.dart";
import "package:logging/logging.dart";
import "package:path/path.dart" as p;
import "package:path_provider/path_provider.dart";
import "package:photos/models/memory_lane/memory_lane_models.dart";
+import "package:photos/services/search_service.dart";
import "package:synchronized/synchronized.dart";
class MemoryLaneCacheService {
@@ -63,26 +65,30 @@ class MemoryLaneCacheService {
Future<MemoryLanePersonTimeline?> getScheduledMemoriesStripTimeline() async {
final cache = await getCache();
final nowMicros = DateTime.now().microsecondsSinceEpoch;
- MemoryLanePersonTimeline? currentTimeline;
- int? currentBeginShowingAt;
- for (final entry in cache.memoriesStripSchedule.entries) {
- final timeline = cache.timelines[entry.key];
- final schedule = entry.value;
- final endShowingAt =
- schedule.beginShowingAt +
- MemoryLaneSchedule.displayDuration.inMicroseconds;
- if (schedule.beginShowingAt > nowMicros ||
- nowMicros >= endShowingAt ||
- timeline == null ||
- !timeline.isEligible ||
- timeline.entries.isEmpty) {
- continue;
- }
- if (currentBeginShowingAt == null ||
- schedule.beginShowingAt > currentBeginShowingAt) {
- currentTimeline = timeline;
- currentBeginShowingAt = schedule.beginShowingAt;
- }
+ final timelineKey = maxBy(
+ cache.memoriesStripSchedule.entries.where((e) {
+ final timeline = cache.timelines[e.key];
+ final schedule = e.value;
+ final endShowingAt =
+ schedule.beginShowingAt +
+ MemoryLaneSchedule.displayDuration.inMicroseconds;
+ final inWindow =
+ schedule.beginShowingAt <= nowMicros && nowMicros < endShowingAt;
+ return inWindow &&
+ timeline != null &&
+ timeline.isEligible &&
+ timeline.entries.isNotEmpty;
+ }),
+ (entry) => entry.value.beginShowingAt,
+ )?.key;
+ final currentTimeline = cache.timelines[timelineKey];
+ if (currentTimeline == null) return null;
+ final hiddenFileIds = (await SearchService.instance.getHiddenFiles())
+ .map((f) => f.uploadedFileID)
+ .whereType<int>()
+ .toSet();
+ if (currentTimeline.entries.any((e) => hiddenFileIds.contains(e.fileId))) {
+ return null;
}
return currentTimeline;
}
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 80abee711a..ae8449e86c 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
@@ -83,7 +83,11 @@ class MemoryLaneService {
_scheduleStartupBackfill();
_initialized = true;
if (flagService.internalUser) {
- await _scheduleTimelinesForMemoriesStrip();
+ try {
+ await _scheduleTimelinesForMemoriesStrip();
+ } catch (e, s) {
+ _logger.severe("_scheduleTimelinesForMemoriesStrip failed:", e, s);
+ }
}
await _queueFullRecompute();
} catch (e, s) {
@@ -906,15 +910,17 @@ class MemoryLaneService {
if (!isFeatureEnabled) {
return;
}
- final scheduleWindowMs = MemoryLaneSchedule.displayDuration.inMicroseconds;
- final cooldownMs = const Duration(days: 30).inMicroseconds;
+ final scheduleWindowMicros =
+ MemoryLaneSchedule.displayDuration.inMicroseconds;
+ final cooldownMicros = const Duration(days: 30).inMicroseconds;
final cache = await _cacheService.getCache();
final nowMicros = DateTime.now().microsecondsSinceEpoch;
final invalid = <String>{};
for (final entry in cache.memoriesStripSchedule.entries) {
final timeline = cache.timelines[entry.key];
- final isInCooldown = nowMicros - entry.value.beginShowingAt < cooldownMs;
+ final isInCooldown =
+ nowMicros - entry.value.beginShowingAt < cooldownMicros;
if (timeline == null ||
!timeline.isEligible ||
timeline.entries.isEmpty ||
@@ -927,7 +933,7 @@ class MemoryLaneService {
.where((entry) => !invalid.contains(entry.key))
.toList();
final alreadyScheduledAhead = valid.any(
- (s) => s.value.beginShowingAt >= nowMicros + scheduleWindowMs,
+ (s) => s.value.beginShowingAt >= nowMicros + scheduleWindowMicros,
);
if (alreadyScheduledAhead) {
await _cacheService.updateMemoriesStripSchedule(invalid, null);
@@ -948,7 +954,7 @@ class MemoryLaneService {
}
final newBeginShowingAt = valid
- .map((entry) => entry.value.beginShowingAt + scheduleWindowMs)
+ .map((entry) => entry.value.beginShowingAt + scheduleWindowMicros)
.followedBy([nowMicros])
.max;
await _cacheService.updateMemoriesStripSchedule(