Mirrors/nc-photos
1
0
Fork 0
mirror of https://gitlab.com/nkming2/nc-photos.git synced 2025-03-28 09:51:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change how exceptions are handled in notified action

Browse source
This commit is contained in:
Ming Ming 2021-09-08 17:31:24 +08:00
parent 9256d19518
commit a25fd8ff63
3 changed files with 72 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/notified_action.dart
View file

@ -38,6 +38,7 @@ class NotifiedAction {
exception_util.toUserString(e)),
duration: k.snackBarDurationNormal,
));
rethrow;
}
}

27
lib/widget/album_browser_mixin.dart
View file

@ -219,25 +219,24 @@ mixin AlbumBrowserMixin<T extends StatefulWidget>
Future<void> _onUnsetCoverPressed(Account account, Album album) async {
_log.info("[_onUnsetCoverPressed] Unset album cover for '${album.name}'");
await NotifiedAction(
() async {
final albumRepo = AlbumRepo(AlbumCachedDataSource());
try {
try {
await NotifiedAction(
() async {
final albumRepo = AlbumRepo(AlbumCachedDataSource());
await UpdateAlbum(albumRepo).call(
account,
album.copyWith(
coverProvider: AlbumAutoCoverProvider(),
));
} catch (e, stackTrace) {
_log.shout("[_onUnsetCoverPressed] Failed while updating album", e,
stackTrace);
rethrow;
}
},
L10n.global().unsetAlbumCoverProcessingNotification,
L10n.global().unsetAlbumCoverSuccessNotification,
failureText: L10n.global().unsetAlbumCoverFailureNotification,
)();
},
L10n.global().unsetAlbumCoverProcessingNotification,
L10n.global().unsetAlbumCoverSuccessNotification,
failureText: L10n.global().unsetAlbumCoverFailureNotification,
)();
} catch (e, stackTrace) {
_log.shout(
"[_onUnsetCoverPressed] Failed while updating album", e, stackTrace);
}
}
void _onSharePressed(BuildContext context, Account account, Album album) {

120
lib/widget/viewer_detail_pane.dart
View file

@ -285,10 +285,10 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
Future<void> _onRemoveFromAlbumPressed(BuildContext context) async {
assert(widget.album!.provider is AlbumStaticProvider);
await NotifiedAction(
() async {
final albumRepo = AlbumRepo(AlbumCachedDataSource());
try {
try {
await NotifiedAction(
() async {
final albumRepo = AlbumRepo(AlbumCachedDataSource());
final newItems =
AlbumStaticProvider.of(widget.album!).items.where((element) {
if (element is AlbumFileItem) {
@ -307,26 +307,25 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
if (mounted) {
Navigator.of(context).pop();
}
} catch (e, stackTrace) {
_log.shout("[_onRemoveFromAlbumPressed] Failed while updating album",
e, stackTrace);
rethrow;
}
},
null,
L10n.global().removeSelectedFromAlbumSuccessNotification(1),
failureText: L10n.global().removeSelectedFromAlbumFailureNotification,
)();
},
null,
L10n.global().removeSelectedFromAlbumSuccessNotification(1),
failureText: L10n.global().removeSelectedFromAlbumFailureNotification,
)();
} catch (e, stackTrace) {
_log.shout("[_onRemoveFromAlbumPressed] Failed while updating album", e,
stackTrace);
}
}
Future<void> _onSetAlbumCoverPressed(BuildContext context) async {
assert(widget.album != null);
_log.info(
"[_onSetAlbumCoverPressed] Set '${widget.file.path}' as album cover for '${widget.album!.name}'");
await NotifiedAction(
() async {
final albumRepo = AlbumRepo(AlbumCachedDataSource());
try {
try {
await NotifiedAction(
() async {
final albumRepo = AlbumRepo(AlbumCachedDataSource());
await UpdateAlbum(albumRepo).call(
widget.account,
widget.album!.copyWith(
@ -334,16 +333,15 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
coverFile: widget.file,
),
));
} catch (e, stackTrace) {
_log.shout("[_onSetAlbumCoverPressed] Failed while updating album", e,
stackTrace);
rethrow;
}
},
L10n.global().setAlbumCoverProcessingNotification,
L10n.global().setAlbumCoverSuccessNotification,
failureText: L10n.global().setAlbumCoverFailureNotification,
)();
},
L10n.global().setAlbumCoverProcessingNotification,
L10n.global().setAlbumCoverSuccessNotification,
failureText: L10n.global().setAlbumCoverFailureNotification,
)();
} catch (e, stackTrace) {
_log.shout("[_onSetAlbumCoverPressed] Failed while updating album", e,
stackTrace);
}
}
void _onAddToAlbumPressed(BuildContext context) {
@ -383,54 +381,52 @@ class _ViewerDetailPaneState extends State<ViewerDetailPane> {
Future<void> _onArchivePressed(BuildContext context) async {
_log.info("[_onArchivePressed] Archive file: ${widget.file.path}");
await NotifiedAction(
() async {
final fileRepo = FileRepo(FileCachedDataSource());
try {
try {
await NotifiedAction(
() async {
final fileRepo = FileRepo(FileCachedDataSource());
await UpdateProperty(fileRepo)
.updateIsArchived(widget.account, widget.file, true);
if (mounted) {
Navigator.of(context).pop();
}
} catch (e, stackTrace) {
_log.shout(
"[_onArchivePressed] Failed while archiving file" +
(shouldLogFileName ? ": ${widget.file.path}" : ""),
e,
stackTrace);
rethrow;
}
},
L10n.global().archiveSelectedProcessingNotification(1),
L10n.global().archiveSelectedSuccessNotification,
failureText: L10n.global().archiveSelectedFailureNotification(1),
)();
},
L10n.global().archiveSelectedProcessingNotification(1),
L10n.global().archiveSelectedSuccessNotification,
failureText: L10n.global().archiveSelectedFailureNotification(1),
)();
} catch (e, stackTrace) {
_log.shout(
"[_onArchivePressed] Failed while archiving file" +
(shouldLogFileName ? ": ${widget.file.path}" : ""),
e,
stackTrace);
}
}
void _onUnarchivePressed(BuildContext context) async {
_log.info("[_onUnarchivePressed] Unarchive file: ${widget.file.path}");
await NotifiedAction(
() async {
final fileRepo = FileRepo(FileCachedDataSource());
try {
try {
await NotifiedAction(
() async {
final fileRepo = FileRepo(FileCachedDataSource());
await UpdateProperty(fileRepo)
.updateIsArchived(widget.account, widget.file, false);
if (mounted) {
Navigator.of(context).pop();
}
} catch (e, stackTrace) {
_log.shout(
"[_onUnarchivePressed] Failed while archiving file" +
(shouldLogFileName ? ": ${widget.file.path}" : ""),
e,
stackTrace);
rethrow;
}
},
L10n.global().unarchiveSelectedProcessingNotification(1),
L10n.global().unarchiveSelectedSuccessNotification,
failureText: L10n.global().unarchiveSelectedFailureNotification(1),
)();
},
L10n.global().unarchiveSelectedProcessingNotification(1),
L10n.global().unarchiveSelectedSuccessNotification,
failureText: L10n.global().unarchiveSelectedFailureNotification(1),
)();
} catch (e, stackTrace) {
_log.shout(
"[_onUnarchivePressed] Failed while archiving file" +
(shouldLogFileName ? ": ${widget.file.path}" : ""),
e,
stackTrace);
}
}
void _onMapTap() {