Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-02-02 06:46:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix cover not updating after removing manual cover

Browse source
This commit is contained in:
Ming Ming 2021-11-05 19:18:29 +08:00
parent 8450f91afa
commit f997f0638d
1 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/use_case/remove_from_album.dart
View file

@ -2,6 +2,7 @@ import 'package:logging/logging.dart';
import 'package:nc_photos/account.dart'; import 'package:nc_photos/account.dart';
import 'package:nc_photos/app_db.dart'; import 'package:nc_photos/app_db.dart';
import 'package:nc_photos/entity/album.dart'; import 'package:nc_photos/entity/album.dart';
import 'package:nc_photos/entity/album/cover_provider.dart';
import 'package:nc_photos/entity/album/item.dart'; import 'package:nc_photos/entity/album/item.dart';
import 'package:nc_photos/entity/album/provider.dart'; import 'package:nc_photos/entity/album/provider.dart';
import 'package:nc_photos/entity/file.dart'; import 'package:nc_photos/entity/file.dart';
@ -35,18 +36,7 @@ class RemoveFromAlbum {
items: newItems, items: newItems,
), ),
); );
// check if any of the removed items was the latest item newAlbum = await _fixAlbumPostRemove(account, newAlbum, items);
if (items.whereType<AlbumFileItem>().any((element) =>
element.file.bestDateTime == album.provider.latestItemTime)) {
_log.info("[call] Resync as latest item is being removed");
// need to update the album properties
final newItemsSynced = await PreProcessAlbum(appDb)(account, newAlbum);
newAlbum = await UpdateAlbumWithActualItems(null)(
account,
newAlbum,
newItemsSynced,
);
}
await UpdateAlbum(albumRepo)(account, newAlbum); await UpdateAlbum(albumRepo)(account, newAlbum);
if (pref.isLabEnableSharedAlbumOr(false)) { if (pref.isLabEnableSharedAlbumOr(false)) {
@ -68,6 +58,44 @@ class RemoveFromAlbum {
return newAlbum; return newAlbum;
} }
/// Update the album accordingly if any of the removed items is interesting
/// (e.g., cover, latest item, etc)
Future<Album> _fixAlbumPostRemove(
Account account, Album newAlbum, List<AlbumItem> items) async {
bool isNeedUpdate = false;
for (final fileItem in items.whereType<AlbumFileItem>()) {
if (newAlbum.coverProvider
.getCover(newAlbum)
?.compareServerIdentity(fileItem.file) ==
true) {
// revert to auto cover so [UpdateAutoAlbumCover] can do its work
newAlbum = newAlbum.copyWith(
coverProvider: AlbumAutoCoverProvider(),
);
isNeedUpdate = true;
break;
}
if (fileItem.file.bestDateTime == newAlbum.provider.latestItemTime) {
isNeedUpdate = true;
break;
}
}
if (!isNeedUpdate) {
return newAlbum;
}
_log.info(
"[_fixAlbumPostRemove] Resync as interesting item is being removed");
// need to update the album properties
final newItemsSynced = await PreProcessAlbum(appDb)(account, newAlbum);
newAlbum = await UpdateAlbumWithActualItems(null)(
account,
newAlbum,
newItemsSynced,
);
return newAlbum;
}
final AlbumRepo albumRepo; final AlbumRepo albumRepo;
final ShareRepo shareRepo; final ShareRepo shareRepo;
final FileRepo fileRepo; final FileRepo fileRepo;