unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/2] lei_saved_search: expand only/include/exclude to absolute paths
Date: Thu,  1 Dec 2022 11:21:32 +0000	[thread overview]
Message-ID: <20221201112132.4005900-3-e@80x24.org> (raw)
In-Reply-To: <20221201112132.4005900-1-e@80x24.org>

While users may specify relative paths for convenience on the
command-line, absolute paths are required for `lei up' since
that (especially `lei up --all') could run from anywhere.

Note that we need to do this when parsing the command-line
options, since shortcuts for URL matching on URL path components
are allowed for `lei q', and those same shortcuts may remain
in effect across to `lei up' as the underlying external may
be moved to a different URI host.
---
 lib/PublicInbox/LeiQuery.pm   | 23 ++++++++++++++++++++---
 lib/PublicInbox/LeiXSearch.pm |  9 +++++++--
 t/lei-q-save.t                | 13 +++++++++----
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 0f839236..358574ea 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -74,6 +74,12 @@ sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
 	$lei->fail($@) if $@;
 }
 
+# make the URI||PublicInbox::{Inbox,ExtSearch} a config-file friendly string
+sub cfg_ext ($) {
+	my ($x) = @_;
+	$x->isa('URI') ? "$x" : ($x->{inboxdir} // $x->{topdir});
+}
+
 sub lxs_prepare {
 	my ($self) = @_;
 	require PublicInbox::LeiXSearch;
@@ -89,21 +95,32 @@ sub lxs_prepare {
 		$lxs->prepare_external($self->{lse});
 	}
 	if (@only) {
+		my $only;
 		for my $loc (@only) {
 			my @loc = $self->get_externals($loc) or return;
-			$lxs->prepare_external($_) for @loc;
+			for (@loc) {
+				my $x = $lxs->prepare_external($_);
+				push(@$only, cfg_ext($x)) if $x;
+			}
 		}
+		$opt->{only} = $only if $only;
 	} else {
-		my (@ilocals, @iremotes);
+		my (@ilocals, @iremotes, $incl);
 		for my $loc (@{$opt->{include} // []}) {
 			my @loc = $self->get_externals($loc) or return;
-			$lxs->prepare_external($_) for @loc;
+			for (@loc) {
+				my $x = $lxs->prepare_external($_);
+				push(@$incl, cfg_ext($x)) if $x;
+			}
 			@ilocals = @{$lxs->{locals} // []};
 			@iremotes = @{$lxs->{remotes} // []};
 		}
+		$opt->{include} = $incl if $incl;
 		# --external is enabled by default, but allow --no-external
 		if ($opt->{external} //= 1) {
 			my $ex = $self->canonicalize_excludes($opt->{exclude});
+			my @excl = keys %$ex;
+			$opt->{exclude} = \@excl if scalar(@excl);
 			$self->externals_each(\&prep_ext, $lxs, $ex);
 			$opt->{remote} //= !($lxs->locals - $opt->{'local'});
 			$lxs->{locals} = \@ilocals if !$opt->{'local'};
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 8e195c4c..730df1f7 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -605,15 +605,19 @@ sub add_uri {
 		require IO::Uncompress::Gunzip;
 		require PublicInbox::LeiCurl;
 		push @{$self->{remotes}}, $uri;
+		$uri;
 	} else {
 		warn "curl missing, ignoring $uri\n";
+		undef;
 	}
 }
 
+# returns URI or PublicInbox::Inbox-like object
 sub prepare_external {
 	my ($self, $loc, $boost) = @_; # n.b. already ordered by boost
 	if (ref $loc) { # already a URI, or PublicInbox::Inbox-like object
 		return add_uri($self, $loc) if $loc->can('scheme');
+		# fall-through on Inbox-like objects
 	} elsif ($loc =~ m!\Ahttps?://!) {
 		require URI;
 		return add_uri($self, URI->new($loc));
@@ -628,12 +632,13 @@ sub prepare_external {
 		$loc = bless { inboxdir => $loc }, 'PublicInbox::Inbox';
 	} elsif (!-e $loc) {
 		warn "W: $loc gone, perhaps run: lei forget-external $loc\n";
-		return;
+		return undef;
 	} else {
 		warn "W: $loc ignored, unable to determine external type\n";
-		return;
+		return undef;
 	}
 	push @{$self->{locals}}, $loc;
+	$loc;
 }
 
 sub _lcat_i { # LeiMailSync->each_src iterator callback
diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index 3d09fe37..d09c8397 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -1,5 +1,5 @@
 #!perl -w
-# 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>
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use PublicInbox::Smsg;
@@ -12,7 +12,7 @@ my $doc2 = eml_load('t/utf8.eml');
 $doc2->header_set('Date', PublicInbox::Smsg::date({ds => time - (86400 * 4)}));
 my $doc3 = eml_load('t/msg_iter-order.eml');
 $doc3->header_set('Date', PublicInbox::Smsg::date({ds => time - (86400 * 4)}));
-
+my $cat_env = { VISUAL => 'cat', EDITOR => 'cat' };
 my $pre_existing = <<'EOF';
 From x Mon Sep 17 00:00:00 2001
 Message-ID: <import-before@example.com>
@@ -183,7 +183,12 @@ test_lei(sub {
 	lei_ok(qw(q z:0.. -o), "v2:$v2");
 	like($lei_err, qr/^# ([1-9][0-9]*) written to \Q$v2\E/sm,
 		'non-zero write output to stderr');
-	lei_ok(qw(q z:0.. -o), "mboxrd:$home/before", '--only', $v2, '-j1,1');
+	lei_ok('-C', $v2, qw(q z:0.. -o), "mboxrd:$home/before",
+		'--only', '.', '-j1,1');
+	lei_ok(['edit-search', "$home/before"], $cat_env);
+	like($lei_out, qr/^\tonly = \Q$v2\E$/sm,
+		'relative --only saved to absolute path');
+
 	open my $fh, '<', "$home/before";
 	PublicInbox::MboxReader->mboxrd($fh, sub { push @before, $_[0] });
 	isnt(scalar(@before), 0, 'initial v2 written');
@@ -207,7 +212,7 @@ test_lei(sub {
 	ok($shared < $orig, 'fewer bytes stored with --shared') or
 		diag "shared=$shared orig=$orig";
 
-	lei_ok([qw(edit-search), $v2s], { VISUAL => 'cat', EDITOR => 'cat' });
+	lei_ok([qw(edit-search), $v2s], $cat_env);
 	like($lei_out, qr/^\[lei/sm, 'edit-search can cat');
 
 	lei_ok('-C', "$home/v2s", qw(q -q -o ../s m:testmessage@example.com));

      parent reply	other threads:[~2022-12-01 11:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-01 11:21 [PATCH 0/2] lei - expanding relative paths for `lei up' Eric Wong
2022-12-01 11:21 ` [PATCH 1/2] lei: stricter external checks for valid $GIT_DIR/objects Eric Wong
2022-12-01 11:21 ` Eric Wong [this message]

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=20221201112132.4005900-3-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).