* [PATCH 4/4] lei up: support --all=local
2021-04-19 23:48 7% [PATCH 0/4] "lei up --all=local" support Eric Wong
@ 2021-04-19 23:49 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-04-19 23:49 UTC (permalink / raw)
To: meta
Users may wish to update several saved searches at once. We can
support parallel updates in lei-daemon so users won't have to do
it themselves via xargs or similar.
Supporting IMAP outputs would be significantly more involved
since we'd have to pre-authenticate for every single IMAP
output before entering the redispatch loop.
---
lib/PublicInbox/LEI.pm | 7 +++--
lib/PublicInbox/LeiQuery.pm | 2 +-
lib/PublicInbox/LeiUp.pm | 59 +++++++++++++++++++++++++++++++++----
t/lei-q-save.t | 2 ++
4 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 5ee02f64..c0385eb5 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -138,8 +138,9 @@ our %CMD = ( # sorted in order of importance/use:
sort|s=s reverse|r offset=i pretty jobs|j=s globoff|g augment|a
import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+), @c_opt,
opt_dash('limit|n=i', '[0-9]+') ],
-'up' => [ 'OUTPUT', 'update saved search',
- qw(jobs|j=s lock=s@ alert=s@ mua=s verbose|v+ all), @c_opt ],
+
+'up' => [ 'OUTPUT|--all', 'update saved search',
+ qw(jobs|j=s lock=s@ alert=s@ mua=s verbose|v+ all:s), @c_opt ],
'blob' => [ 'OID', 'show a git blob, reconstructing from mail if necessary',
qw(git-dir=s@ cwd! verbose|v+ mail! oid-a|A=s path-a|a=s path-b|b=s),
@@ -331,6 +332,8 @@ my %OPTDESC = (
'remote' => 'limit operations to those requiring network access',
'remote!' => 'prevent operations requiring network access',
+'all:s up' => ['local', 'update all (local) saved searches' ],
+
'mid=s' => 'specify the Message-ID of a message',
'oid=s' => 'specify the git object ID of a message',
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 385ba0a9..4099b26c 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -14,6 +14,7 @@ sub prep_ext { # externals_each callback
sub _start_query { # used by "lei q" and "lei up"
my ($self) = @_;
+ require PublicInbox::LeiOverview;
PublicInbox::LeiOverview->new($self) or return;
my $opt = $self->{opt};
my ($xj, $mj) = split(/,/, $opt->{jobs} // '');
@@ -117,7 +118,6 @@ sub lxs_prepare {
# the main "lei q SEARCH_TERMS" method
sub lei_q {
my ($self, @argv) = @_;
- require PublicInbox::LeiOverview;
PublicInbox::Config->json; # preload before forking
my $lxs = lxs_prepare($self) or return;
$self->ale->refresh_externals($lxs);
diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index e80ccf57..0fb9698b 100644
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -6,15 +6,14 @@ package PublicInbox::LeiUp;
use strict;
use v5.10.1;
use PublicInbox::LeiSavedSearch;
-use PublicInbox::LeiOverview;
+use parent qw(PublicInbox::IPC);
-sub lei_up {
+sub up1 ($$) {
my ($lei, $out) = @_;
- $lei->{lse} = $lei->_lei_store(1)->search;
my $lss = PublicInbox::LeiSavedSearch->up($lei, $out) or return;
+ my $f = $lss->{'-f'};
my $mset_opt = $lei->{mset_opt} = { relevance => -2 };
$mset_opt->{limit} = $lei->{opt}->{limit} // 10000;
- my $f = $lss->{'-f'};
my $q = $mset_opt->{q_raw} = $lss->{-cfg}->{'lei.q'} //
return $lei->fail("lei.q unset in $f");
my $lse = $lei->{lse} // die 'BUG: {lse} missing';
@@ -40,10 +39,60 @@ sub lei_up {
$lei->{lss} = $lss; # for LeiOverview->new
my $lxs = $lei->lxs_prepare or return;
$lei->ale->refresh_externals($lxs);
- $lei->{opt}->{save} = -1;
$lei->_start_query;
}
+sub up1_redispatch {
+ my ($lei, $out, $op_p) = @_;
+ my $l = bless { %$lei }, ref($lei);
+ $l->{opt} = { %{$l->{opt}} };
+ delete $l->{sock};
+ $l->{''} = $op_p; # daemon only
+ eval {
+ $l->qerr("# updating $out");
+ up1($l, $out);
+ $l->qerr("# $out done");
+ };
+ $l->err($@) if $@;
+}
+
+sub lei_up {
+ my ($lei, $out) = @_;
+ $lei->{lse} = $lei->_lei_store(1)->search;
+ my $opt = $lei->{opt};
+ $opt->{save} = -1;
+ if (defined $opt->{all}) {
+ length($opt->{mua}//'') and return
+ $lei->fail('--all and --mua= are incompatible');
+
+ # supporting IMAP outputs is more involved due to
+ # git-credential prompts. TODO: add this in 1.8
+ $opt->{all} eq 'local' or return
+ $lei->fail('only --all=local works at the moment');
+ my @all = PublicInbox::LeiSavedSearch::list($lei);
+ my @local = grep(!m!\Aimaps?://!i, @all);
+ $lei->_lei_store->write_prepare($lei); # share early
+ if ($lei->{oneshot}) { # synchronous
+ up1_redispatch($lei, $_) for @local;
+ } else {
+ # daemon mode, re-dispatch into our event loop w/o
+ # creating an extra fork-level
+ require PublicInbox::DS;
+ require PublicInbox::PktOp;
+ my ($op_c, $op_p) = PublicInbox::PktOp->pair;
+ for my $o (@local) {
+ PublicInbox::DS::requeue(sub {
+ up1_redispatch($lei, $o, $op_p);
+ });
+ }
+ $lei->event_step_init;
+ $op_c->{ops} = { '' => [$lei->can('dclose'), $lei] };
+ }
+ } else {
+ up1($lei, $out);
+ }
+}
+
sub _complete_up {
my ($lei, @argv) = @_;
my ($cur, $re) = $lei->complete_url_common(\@argv);
diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index c0c74581..58342171 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -108,5 +108,7 @@ test_lei(sub {
$mb = do { local $/; <$mb> };
like($mb, qr/pre-existing/, 'pre-existing message preserved w/ -a');
like($mb, qr/<qp\@example\.com>/, 'new result written w/ -a');
+
+ lei_ok(qw(up --all=local));
});
done_testing;
^ permalink raw reply related [relevance 5%]
* [PATCH 0/4] "lei up --all=local" support
@ 2021-04-19 23:48 7% Eric Wong
2021-04-19 23:49 5% ` [PATCH 4/4] lei up: support --all=local Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-04-19 23:48 UTC (permalink / raw)
To: meta
Eventually, "--all" and "--all=remote" will be supported,
but "--all=local" was relatively easy and will probably be
the most popular for latency-sensitive users.
Eric Wong (4):
lei up: fix help output and ARGV handling
config: favor ->get_all when possible
lei up: more error checking for config loading
lei up: support --all=local
lib/PublicInbox/LEI.pm | 7 +++-
lib/PublicInbox/LeiQuery.pm | 2 +-
lib/PublicInbox/LeiUp.pm | 75 +++++++++++++++++++++++++++++++------
lib/PublicInbox/Watch.pm | 3 +-
t/lei-q-save.t | 2 +
5 files changed, 72 insertions(+), 17 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-04-19 23:48 7% [PATCH 0/4] "lei up --all=local" support Eric Wong
2021-04-19 23:49 5% ` [PATCH 4/4] lei up: support --all=local 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).