bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undo: deal with checkout exception

Browse source 
The ancient decision to let undo perform the checkout by itself still
makes sense from a UX perspective, but keeps requiring specific handling
of edge cases.

In this case, the easiest way to deal with trailing input is to just
abort entirely.

Also: updated lib/RevBank/Plugins.pm to import 'isa' and get up to 5.32
level.
This commit is contained in:
Juerd Waalboer 2023-12-26 01:17:03 +01:00
parent 3c622ab6d4
commit 6b04ecc256
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/RevBank/Plugins.pm
View file

@ -62,8 +62,9 @@ sub load($class) {
RevBank::Eval::clean_eval(qq[
use strict;
use warnings;
use feature qw(signatures state);
no warnings 'experimental::signatures';
use v5.32;
use experimental 'signatures';
use experimental 'isa';
package $package;
BEGIN { RevBank::Global->import; }
our \@ISA = qw(RevBank::Plugin);

20
plugins/undo
View file

@ -6,6 +6,11 @@ my $filename = ".revbank.undo";
my @TAB;
{
package RevBank::Plugin::undo::RollBackUndo;
sub new($class) { return bless [], $class; }
}
sub command :Tab(undo) ($self, $cart, $command, @) {
$command eq 'undo' or return NEXT;
@ -72,14 +77,25 @@ sub undo :Tab(&tab) ($self, $cart, $tid, @) {
eval { $cart->checkout('-undo') };
if ($@ and $@ =~ "ROLLBACK_UNDO") {
if ($@ isa RevBank::Plugin::undo::RollbackUndo) {
# Undo the undo... :)
spurt $filename, slurp $backup;
# can't 'return ABORT' here; it would return from with_lock
$aborted = 1;
} elsif ($@ isa RevBank::Cart::CheckoutProhibited) {
my $reason = $@->reason;
# Undo the undo... :)
spurt $filename, slurp $backup;
$aborted = 1;
warn "$reason\n";
} elsif ($@ and ref $@) {
# Re-throw exception object
die $@;
} elsif ($@) {
# Re-throw exception
# Re-throw exception string
die "(undo file BACKUP at $backup.)\n$@";
} else {
unlink $backup;