Skip to content

armgit / ente

Public Imported from GitHub
0

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

Let remote assets name memory music files

ashilkna7ce5013f4e2
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.dart
index 2ac672556d..3b321d908b 100644
--- 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.dart
@@ -5,7 +5,6 @@ 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/memories/memory_music_service.dart";
import "package:photos/services/remote_assets_service.dart";
class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
@@ -29,10 +28,9 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
@override
Future<void> load(MemoryMusicTrack track) async {
- final cacheFileName = memoryMusicCacheFileName(track.url);
final file = await RemoteAssetsService.instance.getAsset(
track.url,
- cacheFileName: cacheFileName,
+ preserveFileExtension: true,
);
try {
await _player.setFilePath(file.path, preload: true);
@@ -40,7 +38,7 @@ class JustAudioMemoryMusicPlayer implements MemoryMusicPlayer {
try {
await RemoteAssetsService.instance.deleteAsset(
track.url,
- cacheFileName: cacheFileName,
+ preserveFileExtension: true,
);
} catch (error, stackTrace) {
_logger.warning(
diff --git a/mobile/apps/photos/lib/services/memories/memory_music_service.dart b/mobile/apps/photos/lib/services/memories/memory_music_service.dart
index 85e248f269..137f132144 100644
--- a/mobile/apps/photos/lib/services/memories/memory_music_service.dart
+++ b/mobile/apps/photos/lib/services/memories/memory_music_service.dart
@@ -1,7 +1,6 @@
import "dart:async";
import "dart:convert";
-import "package:crypto/crypto.dart";
import "package:logging/logging.dart";
import "package:photos/models/memories/memory_music_track.dart";
import "package:photos/service_locator.dart";
@@ -11,9 +10,6 @@ import "package:shared_preferences/shared_preferences.dart";
const _manifestURL = "https://music.ente.com/tracks.json";
const _manifestPreferenceKey = "memory_music_manifest";
-String memoryMusicCacheFileName(String url) =>
- "memory-music-${sha256.convert(utf8.encode(url))}.mp3";
-
class MemoryMusicService {
static final _logger = Logger("MemoryMusicService");
static final instance = MemoryMusicService(
@@ -24,19 +20,17 @@ class MemoryMusicService {
);
return response.data;
},
- hasAsset: (url) => RemoteAssetsService.instance.hasAsset(
- url,
- cacheFileName: memoryMusicCacheFileName(url),
- ),
+ hasAsset: (url) =>
+ RemoteAssetsService.instance.hasAsset(url, preserveFileExtension: true),
cacheAsset: (url) async {
await RemoteAssetsService.instance.getAsset(
url,
- cacheFileName: memoryMusicCacheFileName(url),
+ preserveFileExtension: true,
);
},
deleteAsset: (url) => RemoteAssetsService.instance.deleteAsset(
url,
- cacheFileName: memoryMusicCacheFileName(url),
+ preserveFileExtension: true,
),
);
diff --git a/mobile/apps/photos/lib/services/remote_assets_service.dart b/mobile/apps/photos/lib/services/remote_assets_service.dart
index 5f84e146ba..7083dd979c 100644
--- a/mobile/apps/photos/lib/services/remote_assets_service.dart
+++ b/mobile/apps/photos/lib/services/remote_assets_service.dart
@@ -31,12 +31,12 @@ class RemoteAssetsService {
String remotePath, {
bool refetch = false,
String? expectedSha256,
- String? cacheFileName,
+ bool preserveFileExtension = false,
}) async {
return _lockFor(remotePath).synchronized(() async {
final path = await _getLocalPath(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: preserveFileExtension,
);
final file = File(path);
if (await file.exists() && !refetch) {
@@ -53,11 +53,14 @@ class RemoteAssetsService {
});
}
- Future<void> deleteAsset(String remotePath, {String? cacheFileName}) {
+ Future<void> deleteAsset(
+ String remotePath, {
+ bool preserveFileExtension = false,
+ }) {
return _lockFor(remotePath).synchronized(() async {
final localPath = await _getLocalPath(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: preserveFileExtension,
);
await _deleteAssetArtifacts(localPath);
});
@@ -124,11 +127,14 @@ class RemoteAssetsService {
});
}
- Future<bool> hasAsset(String remotePath, {String? cacheFileName}) {
+ Future<bool> hasAsset(
+ String remotePath, {
+ bool preserveFileExtension = false,
+ }) {
return _lockFor(remotePath).synchronized(() async {
final path = await _getLocalPath(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: preserveFileExtension,
);
return File(path).exists();
});
@@ -136,20 +142,26 @@ class RemoteAssetsService {
Future<String> _getLocalPath(
String remotePath, {
- String? cacheFileName,
+ bool preserveFileExtension = false,
}) async {
return (await getApplicationSupportDirectory()).path +
"/assets/" +
- (cacheFileName ?? _urlToFileName(remotePath));
+ _urlToFileName(
+ remotePath,
+ preserveFileExtension: preserveFileExtension,
+ );
}
- String _urlToFileName(String url) {
+ String _urlToFileName(String url, {bool preserveFileExtension = false}) {
+ final extension = preserveFileExtension
+ ? RegExp(r"\.[a-zA-Z0-9]+$").stringMatch(Uri.parse(url).path) ?? ""
+ : "";
String fileName = url
.replaceAll(RegExp(r'https?://'), '')
.replaceAll(RegExp(r'[^\w\.]'), '_');
fileName = fileName.replaceAll('.', '_');
- return fileName;
+ return fileName + extension;
}
Future<void> _downloadFile(
diff --git a/mobile/apps/photos/test/services/remote_assets_service_test.dart b/mobile/apps/photos/test/services/remote_assets_service_test.dart
index 539c35e185..51f795ce21 100644
--- a/mobile/apps/photos/test/services/remote_assets_service_test.dart
+++ b/mobile/apps/photos/test/services/remote_assets_service_test.dart
@@ -24,10 +24,13 @@ void main() {
await tempDirectory.delete(recursive: true);
});
- test("deleteAsset removes every custom-named cache artifact", () async {
- const cacheFileName = "memory-music-track.mp3";
+ test("deleteAsset removes every extension-preserving artifact", () async {
const remotePath = "https://music.ente.com/track.mp3";
- final localPath = p.join(tempDirectory.path, "assets", cacheFileName);
+ final localPath = p.join(
+ tempDirectory.path,
+ "assets",
+ "music_ente_com_track_mp3.mp3",
+ );
final artifacts = await _createAssetArtifacts(localPath);
final unrelatedFile = File(
p.join(tempDirectory.path, "assets", "unrelated.mp3"),
@@ -37,14 +40,14 @@ void main() {
expect(
await RemoteAssetsService.instance.hasAsset(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: true,
),
isTrue,
);
await RemoteAssetsService.instance.deleteAsset(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: true,
);
for (final artifact in artifacts) {
@@ -54,14 +57,14 @@ void main() {
expect(
await RemoteAssetsService.instance.hasAsset(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: true,
),
isFalse,
);
await RemoteAssetsService.instance.deleteAsset(
remotePath,
- cacheFileName: cacheFileName,
+ preserveFileExtension: true,
);
});