Skip to content

armgit / ente

Public Imported from GitHub
0

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

refactor(photos): use asset paths for memory music

ashilknce3813736b3c
diff --git a/mobile/apps/photos/lib/models/memories/memory_music_track.dart b/mobile/apps/photos/lib/models/memories/memory_music_track.dart
index c87caa2976..bef1d5a938 100644
--- a/mobile/apps/photos/lib/models/memories/memory_music_track.dart
+++ b/mobile/apps/photos/lib/models/memories/memory_music_track.dart
@@ -1,23 +1,13 @@
class MemoryMusicTrack {
final String id;
- final MemoryMusicSource source;
+ final String assetPath;
final String? title;
final String? artist;
const MemoryMusicTrack({
required this.id,
- required this.source,
+ required this.assetPath,
this.title,
this.artist,
});
}
-
-sealed class MemoryMusicSource {
- const MemoryMusicSource();
-}
-
-class AssetMemoryMusicSource extends MemoryMusicSource {
- final String assetPath;
-
- const AssetMemoryMusicSource(this.assetPath);
-}
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart b/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart
index 0514a25129..2f85bcfa65 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_catalog.dart
@@ -28,25 +28,19 @@ class MemoryMusicCatalog {
MemoryMusicCatalog(const <MemoryMusicTrack>[
MemoryMusicTrack(
id: "puddles-instrumental-segment-1",
- source: AssetMemoryMusicSource(
- "assets/memory-music/puddles-instrumental-01.mp3",
- ),
+ assetPath: "assets/memory-music/puddles-instrumental-01.mp3",
title: "Puddles (Zero 7 Remix)",
artist: "Not for Radio",
),
MemoryMusicTrack(
id: "puddles-instrumental-segment-2",
- source: AssetMemoryMusicSource(
- "assets/memory-music/puddles-instrumental-02.mp3",
- ),
+ assetPath: "assets/memory-music/puddles-instrumental-02.mp3",
title: "Puddles (Zero 7 Remix)",
artist: "Not for Radio",
),
MemoryMusicTrack(
id: "puddles-instrumental-segment-3",
- source: AssetMemoryMusicSource(
- "assets/memory-music/puddles-instrumental-03.mp3",
- ),
+ assetPath: "assets/memory-music/puddles-instrumental-03.mp3",
title: "Puddles (Zero 7 Remix)",
artist: "Not for Radio",
),
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
index c44d5a82b2..bcf80aaf80 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
@@ -71,7 +71,7 @@ class MemoryMusicController extends ChangeNotifier {
if (!_isCurrentLoad(generation)) return;
await _player.stop();
if (!_isCurrentLoad(generation)) return;
- await _player.load(track.source);
+ await _player.loadAsset(track.assetPath);
if (!_isCurrentLoad(generation)) return;
await _player.setLooping();
await _player.setVolume(_isMuted ? 0.0 : 1.0);
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_player.dart b/mobile/apps/photos/lib/services/memories/memory_music_player.dart
index e22dc7be47..5ee28c48d6 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_player.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_player.dart
@@ -1,11 +1,10 @@
import "package:audio_session/audio_session.dart";
import "package:just_audio/just_audio.dart";
-import "package:photos/models/memories/memory_music_track.dart";
abstract interface class MemoryMusicPlayer {
Future<void> configureAudioSession();
- Future<void> load(MemoryMusicSource source);
+ Future<void> loadAsset(String assetPath);
Future<void> setLooping();
@@ -32,11 +31,8 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
}
@override
- Future<void> load(MemoryMusicSource source) async {
- switch (source) {
- case AssetMemoryMusicSource(:final assetPath):
- await _player.setAsset(assetPath, preload: true);
- }
+ Future<void> loadAsset(String assetPath) async {
+ await _player.setAsset(assetPath, preload: true);
}
@override
diff --git a/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart b/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart
index ffbbed7259..71e0df3018 100644
--- a/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart
+++ b/mobile/apps/photos/test/services/memories/memory_music_catalog_test.dart
@@ -6,7 +6,7 @@ void main() {
test("catalog looks up tracks by their stable IDs", () {
const track = MemoryMusicTrack(
id: "track-1",
- source: AssetMemoryMusicSource("assets/track-1.mp3"),
+ assetPath: "assets/track-1.mp3",
);
final catalog = MemoryMusicCatalog(const <MemoryMusicTrack>[track]);
@@ -17,14 +17,8 @@ void main() {
test("catalog rejects duplicate track IDs", () {
expect(
() => MemoryMusicCatalog(const <MemoryMusicTrack>[
- MemoryMusicTrack(
- id: "duplicate",
- source: AssetMemoryMusicSource("assets/track-1.mp3"),
- ),
- MemoryMusicTrack(
- id: "duplicate",
- source: AssetMemoryMusicSource("assets/track-2.mp3"),
- ),
+ MemoryMusicTrack(id: "duplicate", assetPath: "assets/track-1.mp3"),
+ MemoryMusicTrack(id: "duplicate", assetPath: "assets/track-2.mp3"),
]),
throwsArgumentError,
);
diff --git a/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
index a82bd0cb67..d81b3651eb 100644
--- a/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
+++ b/mobile/apps/photos/test/services/memories/memory_music_controller_test.dart
@@ -14,14 +14,8 @@ void main() {
persistedMuteValues = <bool>[];
controller = MemoryMusicController(
catalog: MemoryMusicCatalog(const <MemoryMusicTrack>[
- MemoryMusicTrack(
- id: "track-1",
- source: AssetMemoryMusicSource("assets/track-1.mp3"),
- ),
- MemoryMusicTrack(
- id: "track-2",
- source: AssetMemoryMusicSource("assets/track-2.mp3"),
- ),
+ MemoryMusicTrack(id: "track-1", assetPath: "assets/track-1.mp3"),
+ MemoryMusicTrack(id: "track-2", assetPath: "assets/track-2.mp3"),
]),
assignments: const <String, String>{
"memory-1": "track-1",
@@ -113,16 +107,13 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
Future<void> configureAudioSession() async {}
@override
- Future<void> load(MemoryMusicSource source) async {
+ Future<void> loadAsset(String assetPath) async {
loadAttempts++;
if (failNextLoad) {
failNextLoad = false;
throw StateError("load failed");
}
- switch (source) {
- case AssetMemoryMusicSource(:final assetPath):
- loadedAssets.add(assetPath);
- }
+ loadedAssets.add(assetPath);
position = Duration.zero;
}
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 d1037b9972..ce8378bb8c 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
@@ -4,18 +4,9 @@ import "package:photos/services/memories/memory_music_selector.dart";
void main() {
const tracks = <MemoryMusicTrack>[
- MemoryMusicTrack(
- id: "track-1",
- source: AssetMemoryMusicSource("assets/track-1.mp3"),
- ),
- MemoryMusicTrack(
- id: "track-2",
- source: AssetMemoryMusicSource("assets/track-2.mp3"),
- ),
- MemoryMusicTrack(
- id: "track-3",
- source: AssetMemoryMusicSource("assets/track-3.mp3"),
- ),
+ MemoryMusicTrack(id: "track-1", assetPath: "assets/track-1.mp3"),
+ MemoryMusicTrack(id: "track-2", assetPath: "assets/track-2.mp3"),
+ MemoryMusicTrack(id: "track-3", assetPath: "assets/track-3.mp3"),
];
const memoryIDs = <String>["memory-a", "memory-b", "memory-c", "memory-d"];
@@ -47,10 +38,7 @@ void main() {
final assignments = assignMemoryMusicTracks(
memoryIDs: memoryIDs,
tracks: const <MemoryMusicTrack>[
- MemoryMusicTrack(
- id: "track-1",
- source: AssetMemoryMusicSource("assets/track-1.mp3"),
- ),
+ MemoryMusicTrack(id: "track-1", assetPath: "assets/track-1.mp3"),
],
);