From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 15/17] lei add-external: reject index and remote opts w/o mirror Date: Sat, 6 Feb 2021 12:18:42 +0000 Message-ID: <20210206121844.10979-16-e@80x24.org> (raw) In-Reply-To: <20210206121844.10979-1-e@80x24.org> Option combinations which make no sense should fail to prevent misunderstandings and avoid surprises. --- lib/PublicInbox/LeiExternal.pm | 22 ++++++++++++++++++++-- t/lei-mirror.t | 6 ++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm index 6a5c2517..b65dc87c 100644 --- a/lib/PublicInbox/LeiExternal.pm +++ b/lib/PublicInbox/LeiExternal.pm @@ -101,9 +101,27 @@ sub add_external_finish { sub lei_add_external { my ($self, $location) = @_; $self->_lei_store(1)->write_prepare($self); - my $new_boost = $self->{opt}->{boost} // 0; + my $opt = $self->{opt}; + my $mirror = $opt->{mirror} // do { + my @fail; + for my $sw ($self->index_opt, $self->curl_opt, + qw(c no-torsocks torsocks inbox-version)) { + my ($f) = (split(/|/, $sw, 2))[0]; + next unless defined $opt->{$f}; + $f = length($f) == 1 ? "-$f" : "--$f"; + push @fail, $f; + } + if (scalar(@fail) == 1) { + return $self->("@fail requires --mirror"); + } elsif (@fail) { + my $last = pop @fail; + my $fail = join(', ', @fail); + return $self->("@fail and $last require --mirror"); + } + undef; + }; + my $new_boost = $opt->{boost} // 0; $location = ext_canonicalize($location); - my $mirror = $self->{opt}->{mirror}; if (defined($mirror) && -d $location) { $self->fail(<<""); # TODO: did you mean "update-external?" --mirror destination `$location' already exists diff --git a/t/lei-mirror.t b/t/lei-mirror.t index cf34c7ae..6af49678 100644 --- a/t/lei-mirror.t +++ b/t/lei-mirror.t @@ -16,6 +16,12 @@ test_lei({ tmpdir => $tmpdir }, sub { my $t2 = "$home/t2-mirror"; ok($lei->('add-external', $t2, '--mirror', "$http/t2/"), '--mirror v2'); ok(-f "$t2/msgmap.sqlite3", 't2-mirror indexed'); + + ok(!$lei->('add-external', $t2, '--mirror', "$http/t2/"), + '--mirror fails if reused'); + + ok(!$lei->('add-external', "$t2-fail", '-Lmedium'), '--mirror v2'); + ok(!-d "$t2-fail", 'destination not created on failure'); }); ok($td->kill, 'killed -httpd');
next prev parent reply other threads:[~2021-02-06 12:18 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-06 12:18 [PATCH 00/17] lei: more random updates Eric Wong 2021-02-06 12:18 ` [PATCH 01/17] lei_overview: drop unnecessary autoflush call Eric Wong 2021-02-06 12:18 ` [PATCH 02/17] lei: favor "keywords" over "flags", test --no-kw Eric Wong 2021-02-06 12:18 ` [PATCH 03/17] lei: fix completion of --no-kw / --no-keywords Eric Wong 2021-02-06 12:18 ` [PATCH 04/17] lei: abort lei_import worker on client abort Eric Wong 2021-02-06 12:18 ` [PATCH 05/17] init: lowercase -j for --jobs Eric Wong 2021-02-06 12:18 ` [PATCH 06/17] lei_query: trim curl options Eric Wong 2021-02-06 12:18 ` [PATCH 07/17] tests: add test_lei wrapper, split out t/lei-import.t Eric Wong 2021-02-06 12:18 ` [PATCH 08/17] t/lei-externals: split out into separate test Eric Wong 2021-02-06 12:18 ` [PATCH 09/17] t/tests: split out setup_public_inboxes sub Eric Wong 2021-02-06 12:18 ` [PATCH 10/17] tests: split out lei-daemon.t from lei.t Eric Wong 2021-02-06 12:18 ` [PATCH 11/17] treewide: replace confess with croak Eric Wong 2021-02-06 12:18 ` [PATCH 12/17] script/lei: avoid waitpid(-1, ...) to keep tests fast Eric Wong 2021-02-06 12:18 ` [PATCH 13/17] lei: add-external --mirror support Eric Wong 2021-02-06 12:18 ` [PATCH 14/17] lei help: split out into separate file Eric Wong 2021-02-06 12:18 ` Eric Wong [this message] 2021-02-06 12:18 ` [PATCH 16/17] lei_curl: replace -K/--config with --curl-config Eric Wong 2021-02-06 12:18 ` [PATCH 17/17] lei: remove short switch support for curl(1) options 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=20210206121844.10979-16-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 15/17] lei add-external: reject index and remote opts w/o mirror' \ /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
user/dev discussion of public-inbox itself This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/meta git clone --mirror http://czquwvybam4bgbro.onion/meta git clone --mirror http://hjrcffqmbrq6wope.onion/meta git clone --mirror http://ou63pmih66umazou.onion/meta # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 meta meta/ https://public-inbox.org/meta \ meta@public-inbox.org public-inbox-index meta Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta nntp://news.gmane.io/gmane.mail.public-inbox.general note: .onion URLs require Tor: https://www.torproject.org/ code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git