diff options
Diffstat (limited to 'lib/PublicInbox/LeiConfig.pm')
| -rw-r--r-- | lib/PublicInbox/LeiConfig.pm | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/lib/PublicInbox/LeiConfig.pm b/lib/PublicInbox/LeiConfig.pm index 23be9aaf..a50ff2b6 100644 --- a/lib/PublicInbox/LeiConfig.pm +++ b/lib/PublicInbox/LeiConfig.pm @@ -1,9 +1,11 @@ -# Copyright (C) 2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -package PublicInbox::LeiConfig; -use strict; -use v5.10.1; +package PublicInbox::LeiConfig; # subclassed by LeiEditSearch +use v5.12; use PublicInbox::PktOp; +use Fcntl qw(SEEK_SET); +use autodie qw(open seek); +use PublicInbox::IO qw(read_all); sub cfg_do_edit ($;$) { my ($self, $reason) = @_; @@ -15,28 +17,39 @@ sub cfg_do_edit ($;$) { # run in script/lei foreground my ($op_c, $op_p) = PublicInbox::PktOp->pair; # $op_p will EOF when $EDITOR is done - $op_c->{ops} = { '' => [\&cfg_edit_done, $self] }; + $op_c->{ops} = { '' => [\&cfg_edit_done, $lei, $self] }; $lei->send_exec_cmd([ @$lei{qw(0 1 2)}, $op_p->{op_p} ], $cmd, $env); } -sub cfg_edit_done { # PktOp - my ($self) = @_; - eval { - my $cfg = $self->{lei}->cfg_dump($self->{-f}, $self->{lei}->{2}) - // return cfg_do_edit($self, "\n"); - $self->cfg_verify($cfg) if $self->can('cfg_verify'); +sub cfg_edit_done { # PktOp lei->do_env cb + my ($lei, $self) = @_; + open my $fh, '+>', undef; + my $cfg = do { + local $lei->{2} = $fh; + $lei->cfg_dump($self->{-f}); + } or do { + seek($fh, 0, SEEK_SET); + return cfg_do_edit($self, read_all($fh)); }; - $self->{lei}->fail($@) if $@; + $self->cfg_verify($cfg) if $self->can('cfg_verify'); } sub lei_config { my ($lei, @argv) = @_; $lei->{opt}->{'config-file'} and return $lei->fail( "config file switches not supported by `lei config'"); - return $lei->_config(@argv) unless $lei->{opt}->{edit}; - my $f = $lei->_lei_cfg(1)->{-f}; - my $self = bless { lei => $lei, -f => $f }, __PACKAGE__; - cfg_do_edit($self); + if ($lei->{opt}->{edit}) { + @argv and return $lei->fail( +'--edit must be used without other arguments'); + $lei->{opt}->{c} and return $lei->fail( +"`-c $lei->{opt}->{c}->[0]' not allowed with --edit"); + my $f = $lei->_lei_cfg(1)->{-f}; + cfg_do_edit(bless { lei => $lei, -f => $f }, __PACKAGE__); + } elsif (@argv) { # let git-config do error-checking + $lei->_config(@argv); + } else { + $lei->_help('no options given'); + } } 1; |