Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-08-30 23:02:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: skip albums selected or excluded from backups from deletions (#21116)

Browse Source 
* skip albums selected or excluded from backups from deletions

* filter empty local albums from library page

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
shenlong 2025-08-22 00:14:07 +05:30 committed by GitHub
parent fb59fa343d
commit ed3997d844
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/lib/infrastructure/repositories/local_album.repository.dart
View File

@ -56,8 +56,9 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
final assetsToDelete = _platform.isIOS ? await _getUniqueAssetsInAlbum(albumId) : await getAssetIds(albumId); final assetsToDelete = _platform.isIOS ? await _getUniqueAssetsInAlbum(albumId) : await getAssetIds(albumId);
await _deleteAssets(assetsToDelete); await _deleteAssets(assetsToDelete);
// All the other assets that are still associated will be unlinked automatically on-cascade await _db.managers.localAlbumEntity
await _db.managers.localAlbumEntity.filter((a) => a.id.equals(albumId)).delete(); .filter((a) => a.id.equals(albumId) & a.backupSelection.equals(BackupSelection.none))
.delete();
}); });
Future<void> syncDeletes(String albumId, Iterable<String> assetIdsToKeep) async { Future<void> syncDeletes(String albumId, Iterable<String> assetIdsToKeep) async {
@ -152,7 +153,10 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {
await deleteSmt.go(); await deleteSmt.go();
} }
await _db.localAlbumEntity.deleteWhere((f) => f.marker_.isNotNull()); // Only remove albums that are not explicitly selected or excluded from backups
await _db.localAlbumEntity.deleteWhere(
(f) => f.marker_.isNotNull() & f.backupSelection.equalsValue(BackupSelection.none),
);
}); });
} }

4
mobile/lib/pages/common/tab_shell.page.dart
View File

@ -134,6 +134,10 @@ void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
ref.read(remoteAlbumProvider.notifier).refresh(); ref.read(remoteAlbumProvider.notifier).refresh();
} }
if (index == 3) {
ref.invalidate(localAlbumProvider);
}
ref.read(hapticFeedbackProvider.notifier).selectionClick(); ref.read(hapticFeedbackProvider.notifier).selectionClick();
router.setActiveIndex(index); router.setActiveIndex(index);
ref.read(tabProvider.notifier).state = TabEnum.values[index]; ref.read(tabProvider.notifier).state = TabEnum.values[index];

4
mobile/lib/providers/infrastructure/album.provider.dart
View File

@ -18,7 +18,9 @@ final localAlbumServiceProvider = Provider<LocalAlbumService>(
); );
final localAlbumProvider = FutureProvider<List<LocalAlbum>>( final localAlbumProvider = FutureProvider<List<LocalAlbum>>(
(ref) => LocalAlbumService(ref.watch(localAlbumRepository)).getAll(sortBy: {SortLocalAlbumsBy.newestAsset}), (ref) => LocalAlbumService(ref.watch(localAlbumRepository))
.getAll(sortBy: {SortLocalAlbumsBy.newestAsset})
.then((albums) => albums.where((album) => album.assetCount > 0).toList()),
); );
final localAlbumThumbnailProvider = FutureProvider.family<LocalAsset?, String>( final localAlbumThumbnailProvider = FutureProvider.family<LocalAsset?, String>(