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

Do not propagate shared files in album

Browse source
This commit is contained in:
Ming Ming 2021-07-17 22:35:26 +08:00
parent 516f30f423
commit 1957773c5a
1 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/widget/album_viewer.dart
View file

@ -149,10 +149,7 @@ class _AlbumViewerState extends State<AlbumViewer>
assert(widget.album.provider is AlbumStaticProvider); assert(widget.album.provider is AlbumStaticProvider);
ResyncAlbum()(widget.account, widget.album).then((album) { ResyncAlbum()(widget.account, widget.album).then((album) {
if (_shouldPropagateResyncedAlbum(album)) { if (_shouldPropagateResyncedAlbum(album)) {
UpdateAlbum(AlbumRepo(AlbumCachedDataSource()))(widget.account, album) _propagateResyncedAlbum(album);
.catchError((e, stacktrace) {
_log.shout("[_initAlbum] Failed while updating album", e, stacktrace);
});
} }
if (mounted) { if (mounted) {
setState(() { setState(() {
@ -582,6 +579,36 @@ class _AlbumViewerState extends State<AlbumViewer>
draggableItemList = items; draggableItemList = items;
} }
void _propagateResyncedAlbum(Album album) {
final propagateItems =
zip([_getAlbumItemsOf(album), _getAlbumItemsOf(widget.album)]).map((e) {
if (e[0] is AlbumFileItem) {
final item = e[0] as AlbumFileItem;
if (item.file.ownerId != null &&
item.file.ownerId != widget.account.username) {
// don't propagate shared file not owned by this user, this is to
// prevent multiple user having different properties to keep
// overriding each others
_log.info(
"[_propagateResyncedAlbum] Skip shared file: ${item.file.path}");
return e[1];
}
}
return e[0];
}).toList();
final propagateAlbum = album.copyWith(
provider: AlbumStaticProvider(
items: propagateItems,
),
);
UpdateAlbum(AlbumRepo(AlbumCachedDataSource()))(
widget.account, propagateAlbum)
.catchError((e, stacktrace) {
_log.shout("[_propagateResyncedAlbum] Failed while updating album", e,
stacktrace);
});
}
bool _shouldPropagateResyncedAlbum(Album album) { bool _shouldPropagateResyncedAlbum(Album album) {
final origItems = _getAlbumItemsOf(widget.album); final origItems = _getAlbumItemsOf(widget.album);
final resyncItems = _getAlbumItemsOf(album); final resyncItems = _getAlbumItemsOf(album);
@ -594,6 +621,11 @@ class _AlbumViewerState extends State<AlbumViewer>
final a = z[0], b = z[1]; final a = z[0], b = z[1];
bool isEqual; bool isEqual;
if (a is AlbumFileItem && b is AlbumFileItem) { if (a is AlbumFileItem && b is AlbumFileItem) {
if (a.file.ownerId != null &&
a.file.ownerId != widget.account.username) {
// ignore shared files
continue;
}
// faster compare // faster compare
isEqual = a.equals(b, isDeep: false); isEqual = a.equals(b, isDeep: false);
} else { } else {