π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use downloaded track for memories music
ashilkn5f01b1f8e402
diff --git a/mobile/apps/photos/assets/memory-music/puddles-instrumental-01.mp3 b/mobile/apps/photos/assets/memory-music/puddles-instrumental-01.mp3deleted file mode 100644index 6919931bf7..0000000000Binary files a/mobile/apps/photos/assets/memory-music/puddles-instrumental-01.mp3 and /dev/null differdiff --git a/mobile/apps/photos/assets/memory-music/puddles-instrumental-02.mp3 b/mobile/apps/photos/assets/memory-music/puddles-instrumental-02.mp3deleted file mode 100644index 63a9eae605..0000000000Binary files a/mobile/apps/photos/assets/memory-music/puddles-instrumental-02.mp3 and /dev/null differdiff --git a/mobile/apps/photos/assets/memory-music/puddles-instrumental-03.mp3 b/mobile/apps/photos/assets/memory-music/puddles-instrumental-03.mp3deleted file mode 100644index 2d6c218b50..0000000000Binary files a/mobile/apps/photos/assets/memory-music/puddles-instrumental-03.mp3 and /dev/null differdiff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex 9f359a7258..52c2292248 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -49,12 +49,14 @@ import "package:photos/services/machine_learning/face_ml/person/person_service.dimport "package:photos/services/machine_learning/ml_run_control.dart";import 'package:photos/services/machine_learning/ml_service.dart';import 'package:photos/services/machine_learning/semantic_search/semantic_search_service.dart';+import "package:photos/services/memories/memory_music_tracks.dart";import 'package:photos/services/memory_lane/memory_lane_service.dart';import 'package:photos/services/memory_share_service.dart';import "package:photos/services/notification_service.dart";import "package:photos/services/photos_contacts_service.dart";import "package:photos/services/process_activity.dart";import 'package:photos/services/push_service.dart';+import "package:photos/services/remote_assets_service.dart";import 'package:photos/services/search_service.dart';import 'package:photos/services/social_notification_coordinator.dart';import 'package:photos/services/sync/local_sync_service.dart';@@ -184,6 +186,9 @@ Future<void> _runInForeground(WidgetsBinding.instance.addPostFrameCallback((_) {unawaited(SemanticSearchService.instance.init());unawaited(MemoryLaneService.instance.init());+ if (flagService.internalUser) {+ unawaited(_downloadMemoryMusicTrack());+ }unawaited(Future.delayed(const Duration(seconds: 5),@@ -195,6 +200,22 @@ 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> _warmPickerFilesDb() async {final tlog = TimeLogger();try {diff --git a/mobile/apps/photos/lib/models/memories/memory_music_track.dart b/mobile/apps/photos/lib/models/memories/memory_music_track.dartindex bef1d5a938..9c943a3646 100644--- a/mobile/apps/photos/lib/models/memories/memory_music_track.dart+++ b/mobile/apps/photos/lib/models/memories/memory_music_track.dart@@ -1,12 +1,14 @@class MemoryMusicTrack {final String id;- final String assetPath;+ final String url;+ final String cacheFileName;final String? title;final String? artist;const MemoryMusicTrack({required this.id,- required this.assetPath,+ required this.url,+ required this.cacheFileName,this.title,this.artist,});diff --git a/mobile/apps/photos/lib/services/memories/bundled_memory_music_tracks.dart b/mobile/apps/photos/lib/services/memories/bundled_memory_music_tracks.dartdeleted file mode 100644index fd4f29b489..0000000000--- a/mobile/apps/photos/lib/services/memories/bundled_memory_music_tracks.dart+++ /dev/null@@ -1,22 +0,0 @@-import "package:photos/models/memories/memory_music_track.dart";--const bundledMemoryMusicTracks = <MemoryMusicTrack>[- MemoryMusicTrack(- id: "puddles-instrumental-segment-1",- assetPath: "assets/memory-music/puddles-instrumental-01.mp3",- title: "Puddles (Zero 7 Remix)",- artist: "Not for Radio",- ),- MemoryMusicTrack(- id: "puddles-instrumental-segment-2",- assetPath: "assets/memory-music/puddles-instrumental-02.mp3",- title: "Puddles (Zero 7 Remix)",- artist: "Not for Radio",- ),- MemoryMusicTrack(- id: "puddles-instrumental-segment-3",- 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/just_audio_memory_music_player.dart b/mobile/apps/photos/lib/services/memories/just_audio_memory_music_player.dartnew file mode 100644index 0000000000..8ce30f76c7--- /dev/null+++ b/mobile/apps/photos/lib/services/memories/just_audio_memory_music_player.dart@@ -0,0 +1,122 @@+import "dart:async";++import "package:audio_session/audio_session.dart";+import "package:just_audio/just_audio.dart";+import "package:logging/logging.dart";+import "package:photos/models/memories/memory_music_track.dart";+import "package:photos/services/memories/memory_music_player.dart";+import "package:photos/services/remote_assets_service.dart";++class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {+ static const _fadeInDuration = Duration(milliseconds: 900);+ static const _fadeOutDuration = Duration(milliseconds: 250);+ static const _fadeSteps = 14;++ final AudioPlayer _player;+ final Logger _logger = Logger("JustAudioMemoryMusicPlayer");++ Future<void> _fadeQueue = Future<void>.value();+ int _fadeGeneration = 0;++ JustAudioMemoryMusicPlayer() : _player = AudioPlayer();++ @override+ Future<void> configureAudioSession() async {+ final session = await AudioSession.instance;+ await session.configure(const AudioSessionConfiguration.music());+ }++ @override+ Future<void> load(MemoryMusicTrack track) async {+ final file = await RemoteAssetsService.instance.getAsset(+ track.url,+ cacheFileName: track.cacheFileName,+ );+ await _player.setFilePath(file.path, preload: true);+ }++ @override+ Future<void> setLooping() => _player.setLoopMode(LoopMode.one);++ @override+ Future<void> play() {+ final generation = ++_fadeGeneration;+ return _enqueueFade(generation, () async {+ if (!_player.playing) {+ await _player.setVolume(0);+ if (generation != _fadeGeneration) return;+ _startPlayback();+ }+ await _fadeTo(1, _fadeInDuration, generation);+ });+ }++ @override+ Future<void> playImmediately() async {+ final generation = ++_fadeGeneration;+ await _player.setVolume(1);+ if (generation != _fadeGeneration) return;+ _startPlayback();+ }++ @override+ Future<void> pause() {+ final generation = ++_fadeGeneration;+ return _enqueueFade(generation, () async {+ if (!_player.playing) return;+ await _fadeTo(0, _fadeOutDuration, generation);+ if (generation == _fadeGeneration) await _player.pause();+ });+ }++ @override+ Future<void> pauseImmediately() {+ _fadeGeneration++;+ return _player.pause();+ }++ @override+ Future<void> dispose() async {+ await pauseImmediately();+ final generation = ++_fadeGeneration;+ await _enqueueFade(generation, _player.dispose);+ }++ Future<void> _fadeTo(+ double targetVolume,+ Duration duration,+ int generation,+ ) async {+ final initialVolume = _player.volume;+ final stepDuration = duration ~/ _fadeSteps;+ for (var step = 1; step <= _fadeSteps; step++) {+ await Future<void>.delayed(stepDuration);+ if (generation != _fadeGeneration) return;+ final progress = step / _fadeSteps;+ await _player.setVolume(+ initialVolume + (targetVolume - initialVolume) * progress,+ );+ }+ }++ void _startPlayback() {+ if (_player.playing) return;+ unawaited(+ _player.play().catchError((Object error, StackTrace stackTrace) {+ _logger.warning(+ "Failed to start memory music playback",+ error,+ stackTrace,+ );+ }),+ );+ }++ Future<void> _enqueueFade(int generation, Future<void> Function() operation) {+ final result = _fadeQueue.then((_) async {+ if (generation == _fadeGeneration) await operation();+ });+ _fadeQueue = result.catchError((Object _, StackTrace _) {});+ return result;+ }+}diff --git a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart b/mobile/apps/photos/lib/services/memories/memory_music_controller.dartindex 1b87b1d1f5..188b03c2f4 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_controller.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_controller.dart@@ -29,11 +29,11 @@ class MemoryMusicController extends ChangeNotifier {required Map<String, MemoryMusicTrack> assignments,required bool initiallyMuted,required Future<void> Function(bool isMuted) persistMuted,- MemoryMusicPlayer? player,+ required MemoryMusicPlayer player,}) : _assignments = assignments,_isMuted = initiallyMuted,_persistMuted = persistMuted,- _player = player ?? JustAudioMemoryMusicPlayer();+ _player = player;bool get isMuted => _isMuted;@@ -65,7 +65,7 @@ class MemoryMusicController extends ChangeNotifier {try {await _ensureAudioSessionInitialized();if (!_isCurrentLoad(generation)) return;- await _player.loadAsset(track.assetPath);+ await _player.load(track);if (!_isCurrentLoad(generation)) return;await _player.setLooping();if (!_isCurrentLoad(generation)) return;diff --git a/mobile/apps/photos/lib/services/memories/memory_music_player.dart b/mobile/apps/photos/lib/services/memories/memory_music_player.dartindex e015224aff..2b0b31196e 100644--- a/mobile/apps/photos/lib/services/memories/memory_music_player.dart+++ b/mobile/apps/photos/lib/services/memories/memory_music_player.dart@@ -1,13 +1,9 @@-import "dart:async";--import "package:audio_session/audio_session.dart";-import "package:just_audio/just_audio.dart";-import "package:logging/logging.dart";+import "package:photos/models/memories/memory_music_track.dart";abstract interface class MemoryMusicPlayer {Future<void> configureAudioSession();- Future<void> loadAsset(String assetPath);+ Future<void> load(MemoryMusicTrack track);Future<void> setLooping();@@ -21,113 +17,3 @@ abstract interface class MemoryMusicPlayer {Future<void> dispose();}--class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {- static const _fadeInDuration = Duration(milliseconds: 900);- static const _fadeOutDuration = Duration(milliseconds: 250);- static const _fadeSteps = 14;-- final AudioPlayer _player;- final Logger _logger = Logger("JustAudioMemoryMusicPlayer");-- Future<void> _fadeQueue = Future<void>.value();- int _fadeGeneration = 0;-- JustAudioMemoryMusicPlayer() : _player = AudioPlayer();-- @override- Future<void> configureAudioSession() async {- final session = await AudioSession.instance;- await session.configure(const AudioSessionConfiguration.music());- }-- @override- Future<void> loadAsset(String assetPath) async {- await _player.setAsset(assetPath, preload: true);- }-- @override- Future<void> setLooping() => _player.setLoopMode(LoopMode.one);-- @override- Future<void> play() {- final generation = ++_fadeGeneration;- return _enqueueFade(generation, () async {- if (!_player.playing) {- await _player.setVolume(0);- if (generation != _fadeGeneration) return;- _startPlayback();- }- await _fadeTo(1, _fadeInDuration, generation);- });- }-- @override- Future<void> playImmediately() async {- final generation = ++_fadeGeneration;- await _player.setVolume(1);- if (generation != _fadeGeneration) return;- _startPlayback();- }-- @override- Future<void> pause() {- final generation = ++_fadeGeneration;- return _enqueueFade(generation, () async {- if (!_player.playing) return;- await _fadeTo(0, _fadeOutDuration, generation);- if (generation == _fadeGeneration) await _player.pause();- });- }-- @override- Future<void> pauseImmediately() {- _fadeGeneration++;- return _player.pause();- }-- @override- Future<void> dispose() async {- await pauseImmediately();- final generation = ++_fadeGeneration;- await _enqueueFade(generation, _player.dispose);- }-- Future<void> _fadeTo(- double targetVolume,- Duration duration,- int generation,- ) async {- final initialVolume = _player.volume;- final stepDuration = duration ~/ _fadeSteps;- for (var step = 1; step <= _fadeSteps; step++) {- await Future<void>.delayed(stepDuration);- if (generation != _fadeGeneration) return;- final progress = step / _fadeSteps;- await _player.setVolume(- initialVolume + (targetVolume - initialVolume) * progress,- );- }- }-- void _startPlayback() {- if (_player.playing) return;- unawaited(- _player.play().catchError((Object error, StackTrace stackTrace) {- _logger.warning(- "Failed to start memory music playback",- error,- stackTrace,- );- }),- );- }-- Future<void> _enqueueFade(int generation, Future<void> Function() operation) {- final result = _fadeQueue.then((_) async {- if (generation == _fadeGeneration) await operation();- });- _fadeQueue = result.catchError((Object _, StackTrace _) {});- return result;- }-}diff --git a/mobile/apps/photos/lib/services/memories/memory_music_tracks.dart b/mobile/apps/photos/lib/services/memories/memory_music_tracks.dartnew file mode 100644index 0000000000..4570b43350--- /dev/null+++ b/mobile/apps/photos/lib/services/memories/memory_music_tracks.dart@@ -0,0 +1,11 @@+import "package:photos/models/memories/memory_music_track.dart";++const memoryMusicTracks = <MemoryMusicTrack>[+ MemoryMusicTrack(+ id: "then",+ url: "https://music.ente.com/then.mp3",+ cacheFileName: "memory-music-then.mp3",+ title: "Then",+ artist: "Vishnu Mohandas",+ ),+];diff --git a/mobile/apps/photos/lib/services/remote_assets_service.dart b/mobile/apps/photos/lib/services/remote_assets_service.dartindex 0e17b4b5b5..a0438828df 100644--- a/mobile/apps/photos/lib/services/remote_assets_service.dart+++ b/mobile/apps/photos/lib/services/remote_assets_service.dart@@ -31,9 +31,13 @@ class RemoteAssetsService {String remotePath, {bool refetch = false,String? expectedSha256,+ String? cacheFileName,}) async {return _lockFor(remotePath).synchronized(() async {- final path = await _getLocalPath(remotePath);+ final path = await _getLocalPath(+ remotePath,+ cacheFileName: cacheFileName,+ );final file = File(path);if (await file.exists() && !refetch) {_logger.info("Returning cached file for $remotePath");@@ -117,10 +121,13 @@ class RemoteAssetsService {});}- Future<String> _getLocalPath(String remotePath) async {+ Future<String> _getLocalPath(+ String remotePath, {+ String? cacheFileName,+ }) async {return (await getApplicationSupportDirectory()).path +"/assets/" +- _urlToFileName(remotePath);+ (cacheFileName ?? _urlToFileName(remotePath));}String _urlToFileName(String url) {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.dartindex b501b2a590..a382702309 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@@ -2,9 +2,10 @@ import "dart:async";import "package:flutter/material.dart";import "package:photos/service_locator.dart";-import "package:photos/services/memories/bundled_memory_music_tracks.dart";+import "package:photos/services/memories/just_audio_memory_music_player.dart";import "package:photos/services/memories/memory_music_controller.dart";import "package:photos/services/memories/memory_music_selector.dart";+import "package:photos/services/memories/memory_music_tracks.dart";class MemoryMusicSession extends StatefulWidget {final List<String> memoryIDs;@@ -30,12 +31,13 @@ class _MemoryMusicSessionState extends State<MemoryMusicSession>WidgetsBinding.instance.addObserver(this);final assignments = assignMemoryMusicTracks(memoryIDs: widget.memoryIDs,- tracks: bundledMemoryMusicTracks,+ tracks: memoryMusicTracks,);_controller = MemoryMusicController(assignments: assignments,initiallyMuted: localSettings.isMemoriesAudioMuted(),persistMuted: localSettings.setMemoriesAudioMuted,+ player: JustAudioMemoryMusicPlayer(),);}diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yamlindex c378ec845f..d021a9259c 100644--- a/mobile/apps/photos/pubspec.yaml+++ b/mobile/apps/photos/pubspec.yaml@@ -282,7 +282,6 @@ flutter:assets:- assets/- assets/rituals/- - assets/memory-music/- assets/rewind_badges/- assets/video-editor/- assets/image-editor/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.dartindex c18ccaed9d..86655ac2e5 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@@ -15,11 +15,13 @@ void main() {assignments: const <String, MemoryMusicTrack>{"memory-1": MemoryMusicTrack(id: "track-1",- assetPath: "assets/track-1.mp3",+ url: "https://example.com/track-1.mp3",+ cacheFileName: "track-1.mp3",),"memory-2": MemoryMusicTrack(id: "track-2",- assetPath: "assets/track-2.mp3",+ url: "https://example.com/track-2.mp3",+ cacheFileName: "track-2.mp3",),},initiallyMuted: initiallyMuted,@@ -41,7 +43,7 @@ void main() {test("activating a photo memory loads, loops, and plays its track", () async {await controller.activateMemory("memory-1", currentItemIsVideo: false);- expect(player.loadedAssets, <String>["assets/track-1.mp3"]);+ expect(player.loadedTracks.map((track) => track.id), <String>["track-1"]);expect(player.looping, isTrue);expect(player.playing, isTrue);});@@ -100,9 +102,9 @@ void main() {await controller.activateMemory("memory-1", currentItemIsVideo: false);await controller.activateMemory("memory-2", currentItemIsVideo: false);- expect(player.loadedAssets, <String>[- "assets/track-1.mp3",- "assets/track-2.mp3",+ expect(player.loadedTracks.map((track) => track.id), <String>[+ "track-1",+ "track-2",]);});@@ -123,9 +125,9 @@ void main() {releaseFirstLoad.complete();await firstActivation;- expect(player.loadedAssets, <String>[- "assets/track-1.mp3",- "assets/track-2.mp3",+ expect(player.loadedTracks.map((track) => track.id), <String>[+ "track-1",+ "track-2",]);expect(player.playAttempts, 1);});@@ -157,7 +159,7 @@ void main() {}class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {- final List<String> loadedAssets = <String>[];+ final List<MemoryMusicTrack> loadedTracks = <MemoryMusicTrack>[];bool looping = false;bool playing = false;bool playedImmediately = false;@@ -171,13 +173,13 @@ class _FakeMemoryMusicPlayer implements MemoryMusicPlayer {Future<void> configureAudioSession() async {}@override- Future<void> loadAsset(String assetPath) async {+ Future<void> load(MemoryMusicTrack track) async {loadAttempts++;if (failNextLoad) {failNextLoad = false;throw StateError("load failed");}- loadedAssets.add(assetPath);+ loadedTracks.add(track);final beforeCompleting = beforeNextLoadCompletes;beforeNextLoadCompletes = null;await beforeCompleting?.call();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.dartindex d8df9c675e..af89b8849a 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,9 +4,21 @@ import "package:photos/services/memories/memory_music_selector.dart";void main() {const tracks = <MemoryMusicTrack>[- 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"),+ MemoryMusicTrack(+ id: "track-1",+ url: "https://example.com/track-1.mp3",+ cacheFileName: "track-1.mp3",+ ),+ MemoryMusicTrack(+ id: "track-2",+ 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"];@@ -28,7 +40,11 @@ void main() {final assignments = assignMemoryMusicTracks(memoryIDs: memoryIDs,tracks: const <MemoryMusicTrack>[- MemoryMusicTrack(id: "track-1", assetPath: "assets/track-1.mp3"),+ MemoryMusicTrack(+ id: "track-1",+ url: "https://example.com/track-1.mp3",+ cacheFileName: "track-1.mp3",+ ),],);