From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] lei up: support multiple output folders w/o --all=local
Date: Thu, 12 Aug 2021 23:40:26 +0000 [thread overview]
Message-ID: <20210812234027.5456-2-e@80x24.org> (raw)
In-Reply-To: <20210812234027.5456-1-e@80x24.org>
Being able to update 1 folder, or all (local) folders is
sometimes too limiting, so just allow updating any subset
of local folders.
---
lib/PublicInbox/LEI.pm | 2 +-
lib/PublicInbox/LeiUp.pm | 21 ++++++++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 54fac7b4..7d0f63dc 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -178,7 +178,7 @@ our %CMD = ( # sorted in order of importance/use:
import-before! lock=s@ rsyncable alert=s@ mua=s verbose|v+
shared color! mail-sync!), @c_opt, opt_dash('limit|n=i', '[0-9]+') ],
-'up' => [ 'OUTPUT|--all', 'update saved search',
+'up' => [ 'OUTPUT...|--all', 'update saved search',
qw(jobs|j=s lock=s@ alert=s@ mua=s verbose|v+ all:s), @c_opt ],
'lcat' => [ '--stdin|MSGID_OR_URL...', 'display local copy of message(s)',
diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index 3356d11e..49b558fd 100644
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -61,11 +61,13 @@ sub up1_redispatch {
}
sub lei_up {
- my ($lei, $out) = @_;
+ my ($lei, @outs) = @_;
$lei->{lse} = $lei->_lei_store(1)->search;
my $opt = $lei->{opt};
$opt->{save} = -1;
+ my @local;
if (defined $opt->{all}) {
+ return $lei->fail("--all and @outs incompatible") if @outs;
length($opt->{mua}//'') and return
$lei->fail('--all and --mua= are incompatible');
@@ -74,7 +76,20 @@ sub lei_up {
$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);
+ @local = grep(!m!\Aimaps?://!i, @all);
+ } else {
+ @local = @outs;
+ }
+ if (scalar(@outs) > 1) {
+ length($opt->{mua}//'') and return $lei->fail(<<EOM);
+multiple outputs and --mua= are incompatible
+EOM
+ # TODO:
+ return $lei->fail(<<EOM) if grep(m!\Aimaps?://!i, @outs);
+multiple destinations only supported for local outputs (FIXME)
+EOM
+ }
+ if (scalar(@local) > 1) {
$lei->_lei_store->write_prepare($lei); # share early
# daemon mode, re-dispatch into our event loop w/o
# creating an extra fork-level
@@ -89,7 +104,7 @@ sub lei_up {
$lei->event_step_init;
$op_c->{ops} = { '' => [$lei->can('dclose'), $lei] };
} else {
- up1($lei, $out);
+ up1($lei, $local[0]);
}
}
next prev parent reply other threads:[~2021-08-12 23:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-12 23:40 [PATCH 0/2] "lei up" improvements Eric Wong
2021-08-12 23:40 ` Eric Wong [this message]
2021-08-12 23:40 ` [PATCH 2/2] lei up: note errors if one output destination fails Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210812234027.5456-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).