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

Fix shared collection not shown in HomeCollections after importing

Browse source
This commit is contained in:
Ming Ming 2023-05-21 03:01:04 +08:00
parent 24d878b93e
commit 39f356e0a1
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/lib/controller/collections_controller.dart
View file

@ -19,6 +19,7 @@ import 'package:nc_photos/or_null.dart';
import 'package:nc_photos/rx_extension.dart'; import 'package:nc_photos/rx_extension.dart';
import 'package:nc_photos/use_case/collection/create_collection.dart'; import 'package:nc_photos/use_case/collection/create_collection.dart';
import 'package:nc_photos/use_case/collection/edit_collection.dart'; import 'package:nc_photos/use_case/collection/edit_collection.dart';
import 'package:nc_photos/use_case/collection/import_pending_shared_collection.dart';
import 'package:nc_photos/use_case/collection/list_collection.dart'; import 'package:nc_photos/use_case/collection/list_collection.dart';
import 'package:nc_photos/use_case/collection/remove_collections.dart'; import 'package:nc_photos/use_case/collection/remove_collections.dart';
import 'package:nc_photos/use_case/collection/share_collection.dart'; import 'package:nc_photos/use_case/collection/share_collection.dart';
@ -261,6 +262,25 @@ class CollectionsController {
} }
} }
/// See [ImportPendingSharedCollection]
Future<Collection?> importPendingSharedCollection(
Collection collection) async {
try {
final newCollection =
await ImportPendingSharedCollection(_c)(account, collection);
_dataStreamController.addWithValue((v) => v.copyWith(
data: _prepareDataFor([
newCollection,
...v.data.map((e) => e.collection),
]),
));
return newCollection;
} catch (e, stackTrace) {
_dataStreamController.addError(e, stackTrace);
return null;
}
}
Future<void> _load() async { Future<void> _load() async {
var lastData = const CollectionStreamEvent( var lastData = const CollectionStreamEvent(
data: [], data: [],

9
app/lib/widget/collection_browser/bloc.dart
View file

@ -140,10 +140,11 @@ class _Bloc extends Bloc<_Event, _State> implements BlocTag {
Future<void> _onImportPendingSharedCollection( Future<void> _onImportPendingSharedCollection(
_ImportPendingSharedCollection ev, Emitter<_State> emit) async { _ImportPendingSharedCollection ev, Emitter<_State> emit) async {
_log.info(ev); _log.info(ev);
// pending collections are always ad hoc final newCollection = await collectionsController
final newCollection = .importPendingSharedCollection(state.collection);
await ImportPendingSharedCollection(_c)(account, state.collection); if (newCollection != null) {
emit(state.copyWith(importResult: newCollection)); emit(state.copyWith(importResult: newCollection));
}
} }
void _onBeginEdit(_BeginEdit ev, Emitter<_State> emit) { void _onBeginEdit(_BeginEdit ev, Emitter<_State> emit) {