* [PATCH 0/5] lei: more UI/UX tweaks
@ 2021-05-01 6:21 7% Eric Wong
2021-05-01 6:21 5% ` [PATCH 5/5] lei edit-search: support relocating lei.q.output Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-05-01 6:21 UTC (permalink / raw)
To: meta
4/5 is an incompatible change of an incomplete feature
2/5 is something I noticed from using "lei up --all=local"
Editing searches is less surprising, as lei.q.output updates
and auto-conversion are now supported (since there's no
"lei mv-search").
Eric Wong (5):
xt/lei-onion-convert: test for NNTP+IMAP onions
lei <q|up>: distinguish between mset and l2m counts
lei_saved_search: fix excess indent for first lei.q entry
lei: rename ls-sync to ls-mail-sync
lei edit-search: support relocating lei.q.output
MANIFEST | 3 +-
lib/PublicInbox/LEI.pm | 2 +-
lib/PublicInbox/LeiConvert.pm | 5 +-
lib/PublicInbox/LeiEditSearch.pm | 15 ++++-
.../{LeiLsSync.pm => LeiLsMailSync.pm} | 4 +-
lib/PublicInbox/LeiSavedSearch.pm | 53 +++++++++++++++-
lib/PublicInbox/LeiToMail.pm | 36 ++++++-----
lib/PublicInbox/LeiXSearch.pm | 18 ++++--
script/lei | 7 +++
t/lei-import-imap.t | 4 +-
t/lei-import-maildir.t | 4 +-
xt/lei-onion-convert.t | 61 +++++++++++++++++++
12 files changed, 180 insertions(+), 32 deletions(-)
rename lib/PublicInbox/{LeiLsSync.pm => LeiLsMailSync.pm} (93%)
create mode 100644 xt/lei-onion-convert.t
^ permalink raw reply [relevance 7%]
* [PATCH 5/5] lei edit-search: support relocating lei.q.output
2021-05-01 6:21 7% [PATCH 0/5] lei: more UI/UX tweaks Eric Wong
@ 2021-05-01 6:21 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-05-01 6:21 UTC (permalink / raw)
To: meta
The contents of the old lei.q.output will not be removed,
but will be converted into the new one.
---
lib/PublicInbox/LeiConvert.pm | 5 ++-
lib/PublicInbox/LeiEditSearch.pm | 15 +++++++--
lib/PublicInbox/LeiSavedSearch.pm | 51 +++++++++++++++++++++++++++++++
script/lei | 7 +++++
4 files changed, 74 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index cefcaf65..5b27ec2d 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -37,8 +37,11 @@ sub process_inputs { # via wq_do
my ($self) = @_;
local $PublicInbox::DS::in_loop = 0; # force synchronous dwaitpid
$self->SUPER::process_inputs;
- delete $self->{lei}->{1};
+ my $lei = $self->{lei};
+ delete $lei->{1};
delete $self->{wcb}; # commit
+ my $nr = delete($lei->{-nr_write}) // 0;
+ $lei->err("# converted $nr messages") if $lei->{opt}->{verbose};
}
sub lei_convert { # the main "lei convert" method
diff --git a/lib/PublicInbox/LeiEditSearch.pm b/lib/PublicInbox/LeiEditSearch.pm
index fb36fdcd..30ac65bd 100644
--- a/lib/PublicInbox/LeiEditSearch.pm
+++ b/lib/PublicInbox/LeiEditSearch.pm
@@ -13,10 +13,19 @@ sub lei_edit_search {
my $lss = PublicInbox::LeiSavedSearch->up($lei, $out) or return;
my @cmd = (qw(git config --edit -f), $lss->{'-f'});
$lei->qerr("# spawning @cmd");
+ $lss->edit_begin($lei);
if ($lei->{oneshot}) {
- exec(@cmd) or die "exec @cmd: $!\n";
- } else {
- $lei->send_exec_cmd([], \@cmd, {});
+ require PublicInbox::Spawn;
+ waitpid(PublicInbox::Spawn::spawn(\@cmd), 0);
+ # non-fatal, editor could fail after successful write
+ $lei->child_error($?) if $?;
+ $lss->edit_done($lei);
+ } else { # run in script/lei foreground
+ require PublicInbox::PktOp;
+ my ($op_c, $op_p) = PublicInbox::PktOp->pair;
+ # $op_p will EOF when $EDITOR is done
+ $op_c->{ops} = { '' => [$lss->can('edit_done'), $lss, $lei] };
+ $lei->send_exec_cmd([ @$lei{qw(0 1 2)}, $op_p ], \@cmd, {});
}
}
diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm
index 79125214..8177c98e 100644
--- a/lib/PublicInbox/LeiSavedSearch.pm
+++ b/lib/PublicInbox/LeiSavedSearch.pm
@@ -259,6 +259,57 @@ sub output2lssdir {
undef;
}
+sub edit_begin {
+ my ($self, $lei) = @_;
+ if (ref($self->{-cfg}->{'lei.q.output'})) {
+ delete $self->{-cfg}->{'lei.q.output'}; # invalid
+ $lei->err(<<EOM);
+$self->{-f} has multiple values of lei.q.output
+please remove redundant ones
+EOM
+ }
+ $lei->{-lss_for_edit} = $self;
+}
+
+sub edit_done {
+ my ($self, $lei) = @_;
+ my $cfg = PublicInbox::Config->git_config_dump($self->{'-f'});
+ my $new_out = $cfg->{'lei.q.output'} // '';
+ return $lei->fail(<<EOM) if ref $new_out;
+$self->{-f} has multiple values of lei.q.output
+please edit again
+EOM
+ return $lei->fail(<<EOM) if $new_out eq '';
+$self->{-f} needs lei.q.output
+please edit again
+EOM
+ my $old_out = $self->{-cfg}->{'lei.q.output'} // '';
+ return if $old_out eq $new_out;
+ my $old_path = $old_out;
+ my $new_path = $new_out;
+ s!$LOCAL_PFX!! for ($old_path, $new_path);
+ my $dir_old = lss_dir_for($lei, \$old_path, 1);
+ my $dir_new = lss_dir_for($lei, \$new_path);
+ return if $dir_new eq $dir_old; # no change, likely
+ return $lei->fail(<<EOM) if -e $dir_new;
+lei.q.output changed from `$old_out' to `$new_out'
+However, $dir_new exists
+EOM
+ # start the conversion asynchronously
+ my $old_sq = PublicInbox::Config::squote_maybe($old_out);
+ my $new_sq = PublicInbox::Config::squote_maybe($new_out);
+ $lei->puts("lei.q.output changed from $old_sq to $new_sq");
+ $lei->qerr("# lei convert $old_sq -o $new_sq");
+ my $v = !$lei->{opt}->{quiet};
+ $lei->{opt} = { output => $new_out, verbose => $v };
+ require PublicInbox::LeiConvert;
+ PublicInbox::LeiConvert::lei_convert($lei, $old_out);
+
+ $lei->fail(<<EOM) if -e $dir_old && !rename($dir_old, $dir_new);
+E: rename($dir_old, $dir_new) error: $!
+EOM
+}
+
no warnings 'once';
*nntp_url = \&cloneurl;
*base_url = \&PublicInbox::Inbox::base_url;
diff --git a/script/lei b/script/lei
index 90a93839..bec6b001 100755
--- a/script/lei
+++ b/script/lei
@@ -33,8 +33,15 @@ my $exec_cmd = sub {
push @rdr, shift(@old), $newfh;
}
my $do_exec = sub {
+ my @non_std; # ex. $op_p from lei_edit_search
while (my ($io, $newfh) = splice(@rdr, 0, 2)) {
+ my $old_io = !!$io;
open $io, '+<&', $newfh or die "open +<&=: $!";
+ push @non_std, $io unless $old_io;
+ }
+ if (@non_std) {
+ require Fcntl;
+ fcntl($_, Fcntl::F_SETFD(), 0) for @non_std;
}
my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
@ENV{keys %env} = values %env;
^ permalink raw reply related [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-05-01 6:21 7% [PATCH 0/5] lei: more UI/UX tweaks Eric Wong
2021-05-01 6:21 5% ` [PATCH 5/5] lei edit-search: support relocating lei.q.output Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).