Skip to content

armgit / ente

Public Imported from GitHub
0

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

refactor(photos): simplify memory music selection

ashilknff64b3ed998f
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_selector.dart b/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
index 1f8b0719c0..ece4501701 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_selector.dart
@@ -3,35 +3,26 @@ import "dart:convert";
import "package:crypto/crypto.dart";
import "package:photos/models/memories/memory_music_track.dart";
-class MemoryMusicSelector {
- const MemoryMusicSelector();
+Map<String, String> assignMemoryMusicTracks({
+ required Iterable<String> memoryIDs,
+ required List<MemoryMusicTrack> tracks,
+}) {
+ if (tracks.isEmpty) return const <String, String>{};
- Map<String, String> assignTracks({
- required Iterable<String> memoryIDs,
- required List<MemoryMusicTrack> tracks,
- }) {
- if (tracks.isEmpty) return const <String, String>{};
-
- final assignments = <String, String>{};
- String? previousTrackID;
- for (final memoryID in memoryIDs) {
- var trackIndex = _stableTrackIndex(memoryID, tracks.length);
- if (tracks.length > 1 && tracks[trackIndex].id == previousTrackID) {
- trackIndex = (trackIndex + 1) % tracks.length;
- }
- final trackID = tracks[trackIndex].id;
- assignments[memoryID] = trackID;
- previousTrackID = trackID;
+ final assignments = <String, String>{};
+ String? previousTrackID;
+ for (final memoryID in memoryIDs) {
+ var trackIndex = _stableTrackIndex(memoryID, tracks.length);
+ if (tracks.length > 1 && tracks[trackIndex].id == previousTrackID) {
+ trackIndex = (trackIndex + 1) % tracks.length;
}
- return Map.unmodifiable(assignments);
+ final trackID = tracks[trackIndex].id;
+ assignments[memoryID] = trackID;
+ previousTrackID = trackID;
}
+ return Map.unmodifiable(assignments);
+}
- int _stableTrackIndex(String memoryID, int trackCount) {
- final bytes = sha256.convert(utf8.encode(memoryID)).bytes;
- var value = 0;
- for (var i = 0; i < 8; i++) {
- value = (value << 8) | bytes[i];
- }
- return value % trackCount;
- }
+int _stableTrackIndex(String memoryID, int trackCount) {
+ return sha256.convert(utf8.encode(memoryID)).bytes.first % trackCount;
}
diff --git a/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart b/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart
index c63fec42f7..02e984841b 100644
--- a/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/memory_music_session.dart
@@ -35,7 +35,7 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
super.initState();
WidgetsBinding.instance.addObserver(this);
final catalog = MemoryMusicCatalog.bundled;
- final assignments = const MemoryMusicSelector().assignTracks(
+ final assignments = assignMemoryMusicTracks(
memoryIDs: widget.memories.map((memory) => memory.id),
tracks: catalog.tracks,
);
diff --git a/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart b/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
index 91a6099236..d1037b9972 100644
--- a/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
+++ b/mobile/apps/photos/test/services/memories/memory_music_selector_test.dart
@@ -17,18 +17,20 @@ void main() {
source: AssetMemoryMusicSource("assets/track-3.mp3"),
),
];
- const selector = MemoryMusicSelector();
const memoryIDs = <String>["memory-a", "memory-b", "memory-c", "memory-d"];
test("assignments are deterministic", () {
- final first = selector.assignTracks(memoryIDs: memoryIDs, tracks: tracks);
- final second = selector.assignTracks(memoryIDs: memoryIDs, tracks: tracks);
+ final first = assignMemoryMusicTracks(memoryIDs: memoryIDs, tracks: tracks);
+ final second = assignMemoryMusicTracks(
+ memoryIDs: memoryIDs,
+ tracks: tracks,
+ );
expect(second, first);
});
test("adjacent memories do not receive the same track", () {
- final assignments = selector.assignTracks(
+ final assignments = assignMemoryMusicTracks(
memoryIDs: memoryIDs,
tracks: tracks,
);
@@ -42,7 +44,7 @@ void main() {
});
test("one-track catalog reuses its only track", () {
- final assignments = selector.assignTracks(
+ final assignments = assignMemoryMusicTracks(
memoryIDs: memoryIDs,
tracks: const <MemoryMusicTrack>[
MemoryMusicTrack(
@@ -57,7 +59,7 @@ void main() {
test("empty catalog produces no assignments", () {
expect(
- selector.assignTracks(
+ assignMemoryMusicTracks(
memoryIDs: memoryIDs,
tracks: const <MemoryMusicTrack>[],
),