Skip to content

armgit / ente

Public Imported from GitHub
0

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

Add memory music track fallback

ashilknd856a8fa9003
diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dart
index 52c2292248..3fde99bae9 100644
--- a/mobile/apps/photos/lib/main.dart
+++ b/mobile/apps/photos/lib/main.dart
@@ -187,7 +187,7 @@ Future<void> _runInForeground(
unawaited(SemanticSearchService.instance.init());
unawaited(MemoryLaneService.instance.init());
if (flagService.internalUser) {
- unawaited(_downloadMemoryMusicTrack());
+ unawaited(_downloadMemoryMusicTracks());
}
unawaited(
Future.delayed(
@@ -200,20 +200,23 @@ Future<void> _runInForeground(
});
}
-Future<void> _downloadMemoryMusicTrack() async {
- final track = memoryMusicTracks.single;
- try {
- await RemoteAssetsService.instance.getAsset(
- track.url,
- cacheFileName: track.cacheFileName,
- );
- } catch (error, stackTrace) {
- _logger.warning(
- "Failed to download memory music track ${track.id}",
- error,
- stackTrace,
- );
- }
+Future<void> _downloadMemoryMusicTracks() async {
+ await Future.wait(
+ memoryMusicTracks.map((track) async {
+ try {
+ await RemoteAssetsService.instance.getAsset(
+ track.url,
+ cacheFileName: track.cacheFileName,
+ );
+ } catch (error, stackTrace) {
+ _logger.warning(
+ "Failed to download memory music track ${track.id}",
+ error,
+ stackTrace,
+ );
+ }
+ }),
+ );
}
Future<void> _warmPickerFilesDb() async {
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 188b03c2f4..c600d8469c 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart
@@ -11,11 +11,13 @@ enum _MemoryMusicPauseReason { appBackground, viewerAction, videoItem }
class MemoryMusicController extends ChangeNotifier {
final Map<String, MemoryMusicTrack> _assignments;
+ final List<MemoryMusicTrack> _tracks;
final MemoryMusicPlayer _player;
final Future<void> Function(bool isMuted) _persistMuted;
final Logger _logger = Logger("MemoryMusicController");
final Set<_MemoryMusicPauseReason> _pauseReasons =
<_MemoryMusicPauseReason>{};
+ final Set<String> _unavailableTrackIDs = <String>{};
Future<void>? _audioSessionInitialization;
@@ -30,7 +32,9 @@ class MemoryMusicController extends ChangeNotifier {
required bool initiallyMuted,
required Future<void> Function(bool isMuted) persistMuted,
required MemoryMusicPlayer player,
+ required List<MemoryMusicTrack> tracks,
}) : _assignments = assignments,
+ _tracks = tracks,
_isMuted = initiallyMuted,
_persistMuted = persistMuted,
_player = player;
@@ -56,30 +60,33 @@ class MemoryMusicController extends ChangeNotifier {
return;
}
- final track = _assignments[memoryID]!;
+ final assignedTrack = _assignments[memoryID]!;
final generation = ++_loadGeneration;
_status = _MemoryMusicPlaybackStatus.loading;
await _synchronizePlayback();
if (!_isCurrentLoad(generation)) return;
- try {
- await _ensureAudioSessionInitialized();
- if (!_isCurrentLoad(generation)) return;
- await _player.load(track);
- if (!_isCurrentLoad(generation)) return;
- await _player.setLooping();
- if (!_isCurrentLoad(generation)) return;
- _status = _MemoryMusicPlaybackStatus.ready;
- await _synchronizePlayback();
- } catch (error, stackTrace) {
- if (!_isCurrentLoad(generation)) return;
- _status = _MemoryMusicPlaybackStatus.idle;
- _logger.warning(
- "Failed to load memory music track ${track.id}",
- error,
- stackTrace,
- );
+ final candidates = <MemoryMusicTrack>[
+ assignedTrack,
+ for (final track in _tracks)
+ if (track.id != assignedTrack.id) track,
+ ];
+ for (final track in candidates) {
+ if (_unavailableTrackIDs.contains(track.id)) continue;
+ try {
+ await _loadTrack(track, generation);
+ return;
+ } catch (error, stackTrace) {
+ if (!_isCurrentLoad(generation)) return;
+ _unavailableTrackIDs.add(track.id);
+ _logger.warning(
+ "Failed to load memory music track ${track.id}",
+ error,
+ stackTrace,
+ );
+ }
}
+ _status = _MemoryMusicPlaybackStatus.idle;
}
Future<void> toggleMuted() async {
@@ -143,6 +150,17 @@ class MemoryMusicController extends ChangeNotifier {
Future<void> _ensureAudioSessionInitialized() =>
_audioSessionInitialization ??= _initializeAudioSession();
+ Future<void> _loadTrack(MemoryMusicTrack track, int generation) async {
+ await _ensureAudioSessionInitialized();
+ if (!_isCurrentLoad(generation)) return;
+ await _player.load(track);
+ if (!_isCurrentLoad(generation)) return;
+ await _player.setLooping();
+ if (!_isCurrentLoad(generation)) return;
+ _status = _MemoryMusicPlaybackStatus.ready;
+ await _synchronizePlayback();
+ }
+
Future<void> _initializeAudioSession() async {
try {
await _player.configureAudioSession();
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_tracks.dart b/mobile/apps/photos/lib/services/memories/memory_music_tracks.dart
index 4570b43350..a6a4e280d6 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_tracks.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_tracks.dart
@@ -8,4 +8,10 @@ const memoryMusicTracks = <MemoryMusicTrack>[
title: "Then",
artist: "Vishnu Mohandas",
),
+ MemoryMusicTrack(
+ id: "sunday",
+ url: "https://music.ente.com/sunday.mp3",
+ cacheFileName: "memory-music-sunday.mp3",
+ title: "Sunday",
+ ),
];
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 a382702309..809efbee76 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
@@ -38,6 +38,7 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>
initiallyMuted: localSettings.isMemoriesAudioMuted(),
persistMuted: localSettings.setMemoriesAudioMuted,
player: JustAudioMemoryMusicPlayer(),
+ tracks: memoryMusicTracks,
);
}
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 86655ac2e5..3dff5b9d91 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
@@ -6,6 +6,16 @@ import "package:photos/services/memories/memory_music_controller.dart";
import "package:photos/services/memories/memory_music_player.dart";
void main() {
+ const track1 = MemoryMusicTrack(
+ id: "track-1",
+ url: "https://example.com/track-1.mp3",
+ cacheFileName: "track-1.mp3",
+ );
+ const track2 = MemoryMusicTrack(
+ id: "track-2",
+ url: "https://example.com/track-2.mp3",
+ cacheFileName: "track-2.mp3",
+ );
late _FakeMemoryMusicPlayer player;
late List<bool> persistedMuteValues;
late MemoryMusicController controller;
@@ -13,20 +23,13 @@ void main() {
MemoryMusicController createController({bool initiallyMuted = false}) {
return MemoryMusicController(
assignments: const <String, MemoryMusicTrack>{
- "memory-1": MemoryMusicTrack(
- id: "track-1",
- url: "https://example.com/track-1.mp3",
- cacheFileName: "track-1.mp3",
- ),
- "memory-2": MemoryMusicTrack(
- id: "track-2",
- url: "https://example.com/track-2.mp3",
- cacheFileName: "track-2.mp3",
- ),
+ "memory-1": track1,
+ "memory-2": track2,
},
initiallyMuted: initiallyMuted,
persistMuted: (value) async => persistedMuteValues.add(value),
player: player,
+ tracks: const <MemoryMusicTrack>[track1, track2],
);
}
@@ -147,24 +150,31 @@ void main() {
expect(player.playing, isTrue);
});
- test("a failed track load can be retried", () async {
- player.failNextLoad = true;
+ test("a failed track uses another track for the session", () async {
+ player.failedTrackIDs.add("track-1");
await controller.activateMemory("memory-1", currentItemIsVideo: false);
+ await controller.activateMemory("memory-2", currentItemIsVideo: false);
await controller.activateMemory("memory-1", currentItemIsVideo: false);
- expect(player.loadAttempts, 2);
+ expect(player.attemptedTracks.map((track) => track.id), <String>[
+ "track-1",
+ "track-2",
+ "track-2",
+ "track-2",
+ ]);
expect(player.playing, isTrue);
});
}
class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
+ final List<MemoryMusicTrack> attemptedTracks = <MemoryMusicTrack>[];
final List<MemoryMusicTrack> loadedTracks = <MemoryMusicTrack>[];
bool looping = false;
bool playing = false;
bool playedImmediately = false;
bool pausedImmediately = false;
- bool failNextLoad = false;
+ final Set<String> failedTrackIDs = <String>{};
int loadAttempts = 0;
int playAttempts = 0;
Future<void> Function()? beforeNextLoadCompletes;
@@ -175,8 +185,8 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {
@override
Future<void> load(MemoryMusicTrack track) async {
loadAttempts++;
- if (failNextLoad) {
- failNextLoad = false;
+ attemptedTracks.add(track);
+ if (failedTrackIDs.contains(track.id)) {
throw StateError("load failed");
}
loadedTracks.add(track);
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 af89b8849a..34f3a98235 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
@@ -14,11 +14,6 @@ void main() {
url: "https://example.com/track-2.mp3",
cacheFileName: "track-2.mp3",
),
- MemoryMusicTrack(
- id: "track-3",
- url: "https://example.com/track-3.mp3",
- cacheFileName: "track-3.mp3",
- ),
];
const memoryIDs = <String>["memory-a", "memory-b", "memory-c", "memory-d"];
@@ -32,7 +27,7 @@ void main() {
"track-2",
"track-1",
"track-2",
- "track-3",
+ "track-1",
]);
});