π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Remove forced videos from memories
ashilknc4bf11c2dac5
diff --git a/mobile/apps/photos/lib/services/memories/photo_selector.dart b/mobile/apps/photos/lib/services/memories/photo_selector.dartindex bf08ac5df0..d83f7f4f11 100644--- a/mobile/apps/photos/lib/services/memories/photo_selector.dart+++ b/mobile/apps/photos/lib/services/memories/photo_selector.dart@@ -5,7 +5,6 @@ import "package:ente_pure_utils/ente_pure_utils.dart";import "package:flutter/foundation.dart" show kDebugMode;import "package:ml_linalg/vector.dart";import "package:photos/models/file/file.dart";-import "package:photos/models/file/file_type.dart";import "package:photos/models/memories/memory.dart";import "package:photos/models/ml/face/face_with_embedding.dart";import "package:photos/models/ml/vector.dart";@@ -54,13 +53,10 @@ class PhotoSelector {List<Memory> memories,SelectionConfig config,) async {- final candidates = List<Memory>.from(memories);- if (memories.length < config.targetSize) {- return includeVideos(memories, candidates, config.targetSize);- }+ if (memories.length < config.targetSize) return memories;if (memories.length == config.targetSize &&config.distribution != SelectionDistribution.yearRoundRobin) {- return includeVideos(memories, candidates, config.targetSize);+ return memories;}final List<Memory> result;@@ -73,11 +69,7 @@ class PhotoSelector {result = _selectYearRoundRobin(memories, config);}- return includeVideos(- _sortResult(result, config.sort),- candidates,- config.targetSize,- );+ return _sortResult(result, config.sort);}static List<Memory> _selectFlat(@@ -465,49 +457,6 @@ class PhotoSelector {return memories;}- // Adjacent videos intentionally exercise video-to-video playback.- static List<Memory> includeVideos(- List<Memory> selected,- List<Memory> candidates,- int targetSize,- ) {- bool isPhoto(Memory memory) =>- memory.file.fileType == FileType.image ||- memory.file.fileType == FileType.livePhoto;-- final videos =- candidates.where((m) => m.file.fileType == FileType.video).toList()- ..shuffle();- final photos = candidates.where(isPhoto);- if (videos.isEmpty || photos.isEmpty || targetSize < 2) return selected;-- final requiredVideoCount = videos.length > 1 && targetSize > 2 ? 2 : 1;- final requiredVideos = videos.take(requiredVideoCount).toList();- final requiredPhoto = selected.firstWhere(- isPhoto,- orElse: () => photos.first,- );- final required = [...requiredVideos, requiredPhoto];- final result = List<Memory>.from(selected);-- for (final memory in required) {- if (result.contains(memory)) continue;- if (result.length >= targetSize) {- result.removeAt(result.lastIndexWhere((m) => !required.contains(m)));- }- result.add(memory);- }-- if (requiredVideos.length == 2) {- result.remove(requiredVideos.last);- result.insert(- result.indexOf(requiredVideos.first) + 1,- requiredVideos.last,- );- }- return result;- }-// Legacy entry points retained for existing callers.static Future<List<Memory>> bestSelectionPeople(List<Memory> memories, {@@ -519,9 +468,7 @@ class PhotoSelector {try {final w = (kDebugMode ? EnteWatch('getPeopleResults') : null)?..start();final int targetSize = prefferedSize ?? 10;- if (memories.length <= targetSize) {- return includeVideos(memories, memories, targetSize);- }+ if (memories.length <= targetSize) return memories;final Map<int, double> scores = {};for (final mem in memories) {@@ -575,18 +522,15 @@ class PhotoSelector {}) async {final fileCount = memories.length;int targetSize = prefferedSize ?? 10;- if (fileCount <= targetSize) {- return includeVideos(memories, memories, targetSize);- }+ if (fileCount <= targetSize) return memories;if (!mlEnabled) {- final result = _bestSelectionNoMl(+ return _bestSelectionNoMl(memories,targetSize: targetSize,isLocalGalleryMode: isLocalGalleryMode,distributionOverride: distributionOverride,);- return includeVideos(result, memories, targetSize);}// Pre-compute combined score: face count * 1000 + CLIP nostalgia.@@ -655,9 +599,7 @@ class PhotoSelector {} else {if (prefferedSize == null && (allYears.length * 2) > 10) {targetSize = allYears.length * 3;- if (fileCount < targetSize) {- return includeVideos(memories, memories, targetSize);- }+ if (fileCount < targetSize) return memories;}return select(diff --git a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dartindex 3e62445bb3..913b9ef69a 100644--- a/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart+++ b/mobile/apps/photos/lib/services/smart_memories_time_calculator.dart@@ -550,7 +550,7 @@ class TimeMemoriesCalculator {(a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),);final fillerMemory = FillerMemory(- PhotoSelector.includeVideos(memories, memories, memories.length),+ memories,yearAgo,nowInMicroseconds,windowEnd,@@ -664,7 +664,7 @@ class TimeMemoriesCalculator {(a, b) => a.file.creationTime!.compareTo(b.file.creationTime!),);final onThisDayMemory = OnThisDayMemory(- PhotoSelector.includeVideos(filteredMemories, memories, 20),+ filteredMemories,startPoint.add(Duration(days: day)).microsecondsSinceEpoch,startPoint.add(Duration(days: day + 1)).microsecondsSinceEpoch,);diff --git a/mobile/apps/photos/test/services/memories/photo_selector_test.dart b/mobile/apps/photos/test/services/memories/photo_selector_test.dartindex 9d0f4ba482..97568aa7ea 100644--- a/mobile/apps/photos/test/services/memories/photo_selector_test.dart+++ b/mobile/apps/photos/test/services/memories/photo_selector_test.dart@@ -18,13 +18,12 @@ EnteFile _file({required int creationTime,Location? location,int? generatedID,- FileType fileType = FileType.image,}) {final f = EnteFile()..uploadedFileID = uploadedFileID..generatedID = generatedID ?? uploadedFileID..creationTime = creationTime- ..fileType = fileType;+ ..fileType = FileType.image;if (location != null) f.location = location;return f;}@@ -374,45 +373,6 @@ void main() {});group('PhotoSelector.select (unified API)', () {- test('includes an adjacent video pair while retaining photos', () async {- final memories = [- for (var i = 0; i < 6; i++)- _mem(_file(uploadedFileID: i, creationTime: _baseTime + i * _hour)),- for (var i = 6; i < 9; i++)- _mem(- _file(- uploadedFileID: i,- creationTime: _baseTime + i * _hour,- fileType: FileType.video,- ),- ),- ];- final result = await PhotoSelector.select(- memories,- SelectionConfig(- targetSize: 5,- isLocalGalleryMode: false,- fileIDToImageEmbedding: const {},- scores: {for (var i = 0; i < 6; i++) i: 100 - i.toDouble()},- distribution: SelectionDistribution.none,- pick: SelectionPick.ranked,- sort: SelectionSort.chronological,- ),- );-- final videoIndexes = [- for (var i = 0; i < result.length; i++)- if (result[i].file.fileType == FileType.video) i,- ];- expect(result, hasLength(5));- expect(videoIndexes, hasLength(2));- expect(videoIndexes.last, videoIndexes.first + 1);- expect(- result.any((memory) => memory.file.fileType != FileType.video),- isTrue,- );- });-test('flat distribution selects by score and respects targetSize',() async {