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

Fix client side album not listing in Collections when offline

Browse source
This commit is contained in:
Ming Ming 2024-08-20 01:17:11 +08:00
parent afa9167ff3
commit cb62b76d87
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/lib/use_case/album/list_album2.dart
View file

@ -52,11 +52,23 @@ class ListAlbum2 {
Account account, {
ErrorHandler? onError,
}) async* {
final ls = await Ls(_c.fileRepo)(
List<File>? ls;
var isRemoteGood = true;
try {
ls = await Ls(_c.fileRepo)(
account,
File(
path: remote_storage_util.getRemoteAlbumsDir(account),
));
File(path: remote_storage_util.getRemoteAlbumsDir(account)),
);
} catch (e) {
_log.warning("[_call] Failed while Ls", e);
}
if (ls == null) {
isRemoteGood = false;
ls = await Ls(_c.fileRepoLocal)(
account,
File(path: remote_storage_util.getRemoteAlbumsDir(account)),
);
}
final List<File?> albumFiles =
ls.where((element) => element.isCollection != true).toList();
// migrate files
@ -71,7 +83,13 @@ class ListAlbum2 {
albumFiles[i] = null;
}
}
yield* _c.albumRepo2.getAlbums(account, albumFiles.whereNotNull().toList());
if (isRemoteGood) {
yield* _c.albumRepo2
.getAlbums(account, albumFiles.whereNotNull().toList());
} else {
yield* _c.albumRepo2Local
.getAlbums(account, albumFiles.whereNotNull().toList());
}
}
final DiContainer _c;