High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: make local album provider reactive (#31582)
shenlongbea31eb06470
diff --git a/mobile/lib/domain/services/local_album.service.dart b/mobile/lib/domain/services/local_album.service.dartindex 60cf745900..b89d032993 100644--- a/mobile/lib/domain/services/local_album.service.dart+++ b/mobile/lib/domain/services/local_album.service.dart@@ -11,6 +11,10 @@ class LocalAlbumService {return _repository.getAll(sortBy: sortBy);}+ Stream<List<LocalAlbum>> watchAll({Set<SortLocalAlbumsBy> sortBy = const {}}) {+ return _repository.watchAll(sortBy: sortBy);+ }+Future<LocalAsset?> getThumbnail(String albumId) {return _repository.getThumbnail(albumId);}diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dartindex aefac0b282..c28357a2e7 100644--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart@@ -20,7 +20,11 @@ class LocalAlbumRepository extends DatabaseAccessor<Drift> with $LocalAlbumReposDrift get _db => attachedDatabase;- Future<List<LocalAlbum>> getAll({Set<SortLocalAlbumsBy> sortBy = const {}}) {+ Future<List<LocalAlbum>> getAll({Set<SortLocalAlbumsBy> sortBy = const {}}) => _selectAll(sortBy: sortBy).get();++ Stream<List<LocalAlbum>> watchAll({Set<SortLocalAlbumsBy> sortBy = const {}}) => _selectAll(sortBy: sortBy).watch();++ Selectable<LocalAlbum> _selectAll({Set<SortLocalAlbumsBy> sortBy = const {}}) {final assetCount = _db.localAlbumAssetEntity.assetId.count();final query = _db.localAlbumEntity.select().join([@@ -49,7 +53,7 @@ class LocalAlbumRepository extends DatabaseAccessor<Drift> with $LocalAlbumReposquery.orderBy(orderings);}- return query.map((row) => row.readTable(_db.localAlbumEntity).toDto(assetCount: row.read(assetCount) ?? 0)).get();+ return query.map((row) => row.readTable(_db.localAlbumEntity).toDto(assetCount: row.read(assetCount) ?? 0));}Future<List<LocalAlbum>> getBackupAlbums() async {diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dartindex 23e28e928c..409c6f0918 100644--- a/mobile/lib/pages/common/tab_shell.page.dart+++ b/mobile/lib/pages/common/tab_shell.page.dart@@ -128,11 +128,6 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {unawaited(ref.read(remoteAlbumProvider.notifier).refresh());}- // Library page- if (index == kLibraryTabIndex) {- ref.invalidate(localAlbumProvider);- }-ref.read(hapticFeedbackProvider.notifier).selectionClick();router.setActiveIndex(index);ref.read(tabProvider.notifier).state = TabEnum.values[index];diff --git a/mobile/lib/providers/infrastructure/album.provider.dart b/mobile/lib/providers/infrastructure/album.provider.dartindex 47fd2360b0..2aae7bafc6 100644--- a/mobile/lib/providers/infrastructure/album.provider.dart+++ b/mobile/lib/providers/infrastructure/album.provider.dart@@ -10,10 +10,10 @@ import 'package:immich_mobile/providers/infrastructure/remote_album.provider.darimport 'package:immich_mobile/repositories/album_api_repository.dart';import 'package:immich_mobile/services/foreground_upload.service.dart';-final localAlbumProvider = FutureProvider<List<LocalAlbum>>(+final localAlbumProvider = StreamProvider<List<LocalAlbum>>((ref) => LocalAlbumService(ref.watch(driftProvider).localAlbumRepository)- .getAll(sortBy: {SortLocalAlbumsBy.newestAsset})- .then((albums) => albums.where((album) => album.assetCount > 0).toList()),+ .watchAll(sortBy: {SortLocalAlbumsBy.newestAsset})+ .map((albums) => albums.where((album) => album.assetCount > 0).toList()),);final localAlbumThumbnailProvider = FutureProvider.family<LocalAsset?, String>(diff --git a/mobile/test/infrastructure/repositories/local_album_repository_test.dart b/mobile/test/infrastructure/repositories/local_album_repository_test.dartindex 2923f1573f..a5ab82bad4 100644--- a/mobile/test/infrastructure/repositories/local_album_repository_test.dart+++ b/mobile/test/infrastructure/repositories/local_album_repository_test.dart@@ -1,3 +1,4 @@+import 'package:async/async.dart';import 'package:drift/drift.dart';import 'package:drift/native.dart';import 'package:flutter_test/flutter_test.dart';@@ -41,6 +42,20 @@ void main() {});});+ group('watchAll', () {+ test('re-emits when an album loses its assets', () async {+ final localAlbumRepo = mediumFactory.getRepository<LocalAlbumRepository>();+ await localAlbumRepo.upsert(mediumFactory.localAlbum(), toUpsert: [_localAsset('1'), _localAsset('2')]);++ final counts = StreamQueue(localAlbumRepo.watchAll().map((albums) => albums.single.assetCount));+ addTearDown(counts.cancel);++ expect(await counts.next, 2);+ await localAlbumRepo.processDelta(updates: [], deletes: ['1', '2'], assetAlbums: {});+ expect(await counts.next, 0);+ });+ });+group('processDelta', () {// Regression for #22844: an asset moved (not copied) into a backup album on// Android was dropped. The delta reports only the asset's new album, and the