GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-24 11:42:35 +01:00
Code Issues Projects Releases Wiki Activity

Add revision option to -l for factundo/redo to start listing from there

Browse Source
This commit is contained in:
Pragmatic Software 2017-12-12 15:32:50 -08:00
parent d123ee1da3
commit 1ee7769cdb
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
PBot/FactoidCommands.pm
View File

@ -288,24 +288,38 @@ sub hash_differences_as_string {
} }
sub list_undo_history { sub list_undo_history {
my ($self, $undos) = @_; my ($self, $undos, $start_from) = @_;
$start_from-- if defined $start_from;
$start_from = 0 if not defined $start_from or $start_from < 0;
my $result = ""; my $result = "";
if ($undos->{idx} == 0) { if ($start_from > @{$undos->{list}}) {
$result .= "*1*: "; if (@{$undos->{list}} == 1) {
} else { return "But there is only one revision available.";
$result .= "1: "; } else {
return "But there are only " . @{$undos->{list}} . " revisions available.";
}
} }
$result .= $self->hash_differences_as_string({}, $undos->{list}->[0]) . ";\n";
for (my $i = 1; $i < @{$undos->{list}}; $i++) { if ($start_from == 0) {
if ($undos->{idx} == 0) {
$result .= "*1*: ";
} else {
$result .= "1: ";
}
$result .= $self->hash_differences_as_string({}, $undos->{list}->[0]) . ";\n\n";
$start_from++;
}
for (my $i = $start_from; $i < @{$undos->{list}}; $i++) {
if ($i == $undos->{idx}) { if ($i == $undos->{idx}) {
$result .= "*" . ($i + 1) . "*: "; $result .= "*" . ($i + 1) . "*: ";
} else { } else {
$result .= ($i + 1) . ": "; $result .= ($i + 1) . ": ";
} }
$result .= $self->hash_differences_as_string($undos->{list}->[$i - 1], $undos->{list}->[$i]); $result .= $self->hash_differences_as_string($undos->{list}->[$i - 1], $undos->{list}->[$i]);
$result .= ";\n"; $result .= ";\n\n";
} }
return $result; return $result;
@ -315,7 +329,7 @@ sub factundo {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my $usage = "Usage: factundo [-l] [-r N] [channel] <keyword> (-l list undo history; -r jump to revision N)"; my $usage = "Usage: factundo [-l [N]] [-r N] [channel] <keyword> (-l list undo history, optionally starting from N; -r jump to revision N)";
my $getopt_error; my $getopt_error;
local $SIG{__WARN__} = sub { local $SIG{__WARN__} = sub {
@ -326,7 +340,7 @@ sub factundo {
$arguments =~ s/(?<!\\)'/\\'/g; $arguments =~ s/(?<!\\)'/\\'/g;
my ($list_undos, $goto_revision); my ($list_undos, $goto_revision);
my ($ret, $args) = GetOptionsFromString($arguments, my ($ret, $args) = GetOptionsFromString($arguments,
'l' => \$list_undos, 'l:i' => \$list_undos,
'r=i' => \$goto_revision); 'r=i' => \$goto_revision);
return "/say $getopt_error -- $usage" if defined $getopt_error; return "/say $getopt_error -- $usage" if defined $getopt_error;
@ -362,8 +376,9 @@ sub factundo {
return "There are no undos available for [$channel] $trigger."; return "There are no undos available for [$channel] $trigger.";
} }
if ($list_undos) { if (defined $list_undos) {
return $self->list_undo_history($undos); $list_undos = 1 if $list_undos == 0;
return $self->list_undo_history($undos, $list_undos);
} }
my $factoids = $self->{pbot}->{factoids}->{factoids}->hash; my $factoids = $self->{pbot}->{factoids}->{factoids}->hash;
@ -414,7 +429,7 @@ sub factredo {
my $self = shift; my $self = shift;
my ($from, $nick, $user, $host, $arguments) = @_; my ($from, $nick, $user, $host, $arguments) = @_;
my $usage = "Usage: factredo [-l] [-r N] [channel] <keyword> (-l list undo history; -r jump to revision N)"; my $usage = "Usage: factredo [-l [N]] [-r N] [channel] <keyword> (-l list undo history, optionally starting from N; -r jump to revision N)";
my $getopt_error; my $getopt_error;
local $SIG{__WARN__} = sub { local $SIG{__WARN__} = sub {
@ -425,7 +440,7 @@ sub factredo {
$arguments =~ s/(?<!\\)'/\\'/g; $arguments =~ s/(?<!\\)'/\\'/g;
my ($list_undos, $goto_revision); my ($list_undos, $goto_revision);
my ($ret, $args) = GetOptionsFromString($arguments, my ($ret, $args) = GetOptionsFromString($arguments,
'l' => \$list_undos, 'l:i' => \$list_undos,
'r=i' => \$goto_revision); 'r=i' => \$goto_revision);
return "/say $getopt_error -- $usage" if defined $getopt_error; return "/say $getopt_error -- $usage" if defined $getopt_error;
@ -450,8 +465,9 @@ sub factredo {
return "There are no redos available for [$channel] $trigger."; return "There are no redos available for [$channel] $trigger.";
} }
if ($list_undos) { if (defined $list_undos) {
return $self->list_undo_history($undos); $list_undos = 1 if $list_undos == 0;
return $self->list_undo_history($undos, $list_undos);
} }
my $factoids = $self->{pbot}->{factoids}->{factoids}->hash; my $factoids = $self->{pbot}->{factoids}->{factoids}->hash;