High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): make EXIF provider reactive (#31552)
Adam Gastineaubd59a373dec9
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dartindex c4e7a7dc63..8e490920b5 100644--- a/mobile/lib/domain/services/asset.service.dart+++ b/mobile/lib/domain/services/asset.service.dart@@ -63,13 +63,13 @@ class AssetService {return [asset, ...stack];}- Future<ExifInfo?> getExif(BaseAsset asset) async {+ Stream<ExifInfo?> watchExif(BaseAsset asset) {if (!asset.hasRemote) {- return null;+ return Stream.value(null);}final id = asset is LocalAsset ? asset.remoteId! : (asset as RemoteAsset).id;- return _remoteRepository.getExif(id);+ return _remoteRepository.watchExif(id);}Future<List<(String, String)>> getPlaces(String userId) {diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dartindex b3e29d24d7..b5cec0dd31 100644--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart@@ -64,12 +64,10 @@ class RemoteAssetRepository extends DatabaseAccessor<Drift> with $RemoteAssetRepreturn query.map((row) => row.toDto()).get();}- Future<ExifInfo?> getExif(String id) {- return _db.managers.remoteExifEntity- .filter((row) => row.assetId.id.equals(id))- .map((row) => row.toDto())- .getSingleOrNull();- }+ Stream<ExifInfo?> watchExif(String id) => _db.managers.remoteExifEntity+ .filter((row) => row.assetId.id.equals(id))+ .map((row) => row.toDto())+ .watchSingleOrNull();Future<List<(String, String)>> getPlaces(String userId) {final asset = Subquery(diff --git a/mobile/lib/presentation/actions/edit_asset.action.dart b/mobile/lib/presentation/actions/edit_asset.action.dartindex 9da7fed1f2..96fd222d2b 100644--- a/mobile/lib/presentation/actions/edit_asset.action.dart+++ b/mobile/lib/presentation/actions/edit_asset.action.dart@@ -50,7 +50,7 @@ class EditAssetAction extends AssetActionBuilder {try {// TODO(shenlong): Move all EXIF and Apply Edits logic onto the Routefinal repository = ref.read(driftProvider).remoteAssetRepository;- final (edits, exif) = await (repository.getAssetEdits(asset.id), repository.getExif(asset.id)).wait;+ final (edits, exif) = await (repository.getAssetEdits(asset.id), repository.watchExif(asset.id).first).wait;if (exif == null || !context.mounted) {return;}diff --git a/mobile/lib/presentation/actions/edit_datetime.action.dart b/mobile/lib/presentation/actions/edit_datetime.action.dartindex 4ca3ddbaf4..47715a6c75 100644--- a/mobile/lib/presentation/actions/edit_datetime.action.dart+++ b/mobile/lib/presentation/actions/edit_datetime.action.dart@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/generated/translations.g.dart';import 'package:immich_mobile/presentation/actions/action.dart';import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';-import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart';import 'package:immich_mobile/providers/infrastructure/db.provider.dart';import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';import 'package:immich_mobile/utils/error_handler.dart';@@ -56,7 +55,7 @@ class EditDateTimeAction extends AssetActionBuilder {Duration? offset;if (origin != null) {- final exif = await remoteAssetRepository.getExif(origin.id);+ final exif = await remoteAssetRepository.watchExif(origin.id).first;// Prefer the EXIF timezone, so the picker opens on what the asset actually shows.DateTime dateTime = origin.createdAt.toLocal();@@ -96,6 +95,5 @@ Future<void> saveDateTime(BuildContext context, WidgetRef ref, List<String> assefinal toastService = ref.read(toastServiceProvider);await ref.read(assetServiceProvider).update(assetIds, dateTime: .some(dateTime));- ref.invalidate(assetExifProvider);toastService.success(message);}diff --git a/mobile/lib/presentation/actions/edit_location.action.dart b/mobile/lib/presentation/actions/edit_location.action.dartindex 01318de999..4265811acd 100644--- a/mobile/lib/presentation/actions/edit_location.action.dart+++ b/mobile/lib/presentation/actions/edit_location.action.dart@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/generated/translations.g.dart';import 'package:immich_mobile/presentation/actions/action.dart';import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';-import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart';import 'package:immich_mobile/providers/infrastructure/db.provider.dart';import 'package:immich_mobile/providers/infrastructure/toast.provider.dart';import 'package:immich_mobile/utils/error_handler.dart';@@ -53,7 +52,7 @@ class EditLocationAction extends AssetActionBuilder {try {LatLng? initialLatLng;if (origin != null) {- final exif = await remoteAssetRepository.getExif(origin.id);+ final exif = await remoteAssetRepository.watchExif(origin.id).first;if (exif?.latitude != null && exif?.longitude != null) {initialLatLng = LatLng(exif!.latitude!, exif.longitude!);}@@ -81,6 +80,5 @@ Future<void> saveLocation(BuildContext context, WidgetRef ref, List<String> assefinal toastService = ref.read(toastServiceProvider);await ref.read(assetServiceProvider).update(assetIds, location: .some(location));- ref.invalidate(assetExifProvider);toastService.success(message);}diff --git a/mobile/lib/presentation/pages/asset_troubleshoot.page.dart b/mobile/lib/presentation/pages/asset_troubleshoot.page.dartindex 81d765239b..da8bcb37a0 100644--- a/mobile/lib/presentation/pages/asset_troubleshoot.page.dart+++ b/mobile/lib/presentation/pages/asset_troubleshoot.page.dart@@ -159,7 +159,7 @@ class _AssetPropertiesSectionState extends ConsumerState<_AssetPropertiesSectionproperties.insertAll(4, additionalProps);- final exif = await ref.read(assetServiceProvider).getExif(asset);+ final exif = await ref.read(assetServiceProvider).watchExif(asset).first;if (exif != null) {_addExifProperties(exif);} else {diff --git a/mobile/lib/providers/infrastructure/asset_viewer/asset.provider.dart b/mobile/lib/providers/infrastructure/asset_viewer/asset.provider.dartindex 82ab69b994..6fce0475de 100644--- a/mobile/lib/providers/infrastructure/asset_viewer/asset.provider.dart+++ b/mobile/lib/providers/infrastructure/asset_viewer/asset.provider.dart@@ -3,6 +3,6 @@ import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/domain/models/exif.model.dart';import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';-final assetExifProvider = FutureProvider.autoDispose.family<ExifInfo?, BaseAsset>((ref, asset) {- return ref.watch(assetServiceProvider).getExif(asset);+final assetExifProvider = StreamProvider.autoDispose.family<ExifInfo?, BaseAsset>((ref, asset) {+ return ref.watch(assetServiceProvider).watchExif(asset);});diff --git a/mobile/test/unit/mocks.dart b/mobile/test/unit/mocks.dartindex 1040e76805..14f196dcfd 100644--- a/mobile/test/unit/mocks.dart+++ b/mobile/test/unit/mocks.dart@@ -70,7 +70,7 @@ class RepositoryMocks {}void _stubRemoteAssetRepository() {- when(remoteAsset.getExif).thenAnswer((_) async => null);+ when(remoteAsset.watchExif).thenAnswer((_) => Stream.value(null));when(remoteAsset.getAssetEdits).thenAnswer((_) async => const []);when(remoteAsset.update).thenAnswer((_) async {});}@@ -269,8 +269,8 @@ extension type const LocalAssetRepositoryStub(MockLocalAssetRepository repo) impextension type const RemoteAssetRepositoryStub(MockRemoteAssetRepository repo)implements Stub<MockRemoteAssetRepository> {- Future<ExifInfo?> Function() get getExif =>- () => repo.getExif(any());+ Stream<ExifInfo?> Function() get watchExif =>+ () => repo.watchExif(any());Future<List<AssetEdit>> Function() get getAssetEdits =>() => repo.getAssetEdits(any());diff --git a/mobile/test/unit/presentation/actions/edit_action_test.dart b/mobile/test/unit/presentation/actions/edit_action_test.dartindex 9e8dcfb4b2..c609119f60 100644--- a/mobile/test/unit/presentation/actions/edit_action_test.dart+++ b/mobile/test/unit/presentation/actions/edit_action_test.dart@@ -111,7 +111,7 @@ void main() {await tester.pump();verify(() => context.repository.remoteAsset.repo.getAssetEdits(asset.id)).called(1);- verify(() => context.repository.remoteAsset.repo.getExif(asset.id)).called(1);+ verify(() => context.repository.remoteAsset.repo.watchExif(asset.id)).called(1);});});