Skip to content

armgit / ente

Public Imported from GitHub
0

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

Preserve historical windows across DST

Neeraj Gupta4f23a2de6c14
diff --git a/mobile/apps/photos/lib/services/smart_memories_service.dart b/mobile/apps/photos/lib/services/smart_memories_service.dart
index 0ce2bea060..177805c466 100644
--- a/mobile/apps/photos/lib/services/smart_memories_service.dart
+++ b/mobile/apps/photos/lib/services/smart_memories_service.dart
@@ -5,7 +5,7 @@ import "dart:math" show Random, max, min;
import "package:computer/computer.dart";
import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
-import "package:flutter/foundation.dart" show kDebugMode;
+import "package:flutter/foundation.dart" show kDebugMode, visibleForTesting;
import "package:flutter/material.dart";
import "package:intl/intl.dart";
import "package:logging/logging.dart";
diff --git a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
index 272914f440..913b9ef69a 100644
--- a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
+++ b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart
@@ -351,7 +351,7 @@ class TimeMemoriesCalculator {
DateTime currentTime,
) {
return fileIndex.filesForCalendar(
- monthDays: _historicalDayCandidates(currentTime),
+ monthDays: historicalDayCandidates(currentTime),
);
}
@@ -387,20 +387,32 @@ class TimeMemoriesCalculator {
]);
}
- static Set<int> _historicalDayCandidates(DateTime currentTime) {
+ @visibleForTesting
+ static Set<int> historicalDayCandidates(DateTime currentTime) {
final candidates = <int>{};
- for (var offset = 0; offset <= kMemoriesUpdateFrequency.inDays; offset++) {
- final targetDate = DateTime(
- currentTime.year,
- currentTime.month,
- currentTime.day + offset,
- );
+ final windowEnd = currentTime.add(kMemoriesUpdateFrequency);
+ var targetDate = DateTime.utc(
+ currentTime.year,
+ currentTime.month,
+ currentTime.day,
+ );
+ final endDate = DateTime.utc(
+ windowEnd.year,
+ windowEnd.month,
+ windowEnd.day,
+ );
+ while (!targetDate.isAfter(endDate)) {
candidates.add(targetDate.month * 100 + targetDate.day);
if (!_isLeapYear(targetDate.year) &&
targetDate.month == DateTime.march &&
targetDate.day == 1) {
candidates.add(DateTime.february * 100 + 29);
}
+ targetDate = DateTime.utc(
+ targetDate.year,
+ targetDate.month,
+ targetDate.day + 1,
+ );
}
return candidates;
}
@@ -500,7 +512,7 @@ class TimeMemoriesCalculator {
final cutOffTime = currentTime.subtract(
const Duration(days: 364) - kMemoriesUpdateFrequency,
);
- final historicalDayCandidates = _historicalDayCandidates(currentTime);
+ final historicalCandidates = historicalDayCandidates(currentTime);
final Map<int, List<Memory>> yearsAgoToMemories = {};
for (final file in allFiles) {
@@ -508,9 +520,7 @@ class TimeMemoriesCalculator {
continue;
}
final fileDate = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
- if (!historicalDayCandidates.contains(
- fileDate.month * 100 + fileDate.day,
- )) {
+ if (!historicalCandidates.contains(fileDate.month * 100 + fileDate.day)) {
continue;
}
final dayMatch = _historicalDateMatch(fileDate, currentTime);
@@ -568,7 +578,7 @@ class TimeMemoriesCalculator {
final cutOffTime = startPoint.subtract(
const Duration(days: 363) - kMemoriesUpdateFrequency,
);
- final historicalDayCandidates = _historicalDayCandidates(startPoint);
+ final historicalCandidates = historicalDayCandidates(startPoint);
final Map<int, List<Memory>> daysToMemories = {};
final Map<int, Set<int>> daysToYears = {};
@@ -579,9 +589,7 @@ class TimeMemoriesCalculator {
continue;
}
final fileDate = DateTime.fromMicrosecondsSinceEpoch(file.creationTime!);
- if (!historicalDayCandidates.contains(
- fileDate.month * 100 + fileDate.day,
- )) {
+ if (!historicalCandidates.contains(fileDate.month * 100 + fileDate.day)) {
continue;
}
final dayMatch = _historicalDateMatch(fileDate, startPoint);
diff --git a/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart b/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart
index fa60056ba7..a386519a9d 100644
--- a/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart
+++ b/mobile/apps/photos/test/services/memories/smart_memories_source_selection_test.dart
@@ -6,11 +6,14 @@ import "package:photos/models/location/location.dart";
import "package:photos/models/memories/clip_memory.dart";
import "package:photos/models/memories/filler_memory.dart";
import "package:photos/models/memories/memories_cache.dart";
+import "package:photos/models/memories/smart_memory_constants.dart";
import "package:photos/models/memories/time_memory.dart";
import "package:photos/models/ml/face/face_with_embedding.dart";
import "package:photos/models/ml/vector.dart";
import "package:photos/services/location_service.dart";
import "package:photos/services/smart_memories_service.dart";
+import "package:timezone/data/latest.dart" as tzdata;
+import "package:timezone/timezone.dart" as timezone;
EnteFile _file({
required int id,
@@ -267,6 +270,21 @@ void main() {
},
);
+ test("historical prefilter covers a DST-expanded date window", () {
+ tzdata.initializeTimeZones();
+ final location = timezone.getLocation("America/New_York");
+ final currentTime = timezone.TZDateTime(location, 2026, 3, 7, 23, 30);
+
+ expect(
+ currentTime.add(kMemoriesUpdateFrequency),
+ timezone.TZDateTime(location, 2026, 3, 11, 0, 30),
+ );
+ expect(
+ TimeMemoriesCalculator.historicalDayCandidates(currentTime),
+ contains(311),
+ );
+ });
+
test("memory week numbers retain seven-day buckets", () {
expect(TimeMemoriesCalculator.getWeekNumber(DateTime.utc(2024, 1, 1)), 1);
expect(TimeMemoriesCalculator.getWeekNumber(DateTime.utc(2024, 1, 7)), 1);