lei_xsearch: drop repeated "Xapian" in error message

[public-inbox.git] / lib / PublicInbox / LeiXSearch.pm

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 68be8ada5045508efe16ec4b36ea1971f217f863..9ea2b5f339066ad4e4425e77a94f5ac4bbb67bc6 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -14,7 +14,7 @@ use PublicInbox::Import;
 use File::Temp 0.19 (); # 0.19 for ->newdir
 use File::Spec ();
 use PublicInbox::Search qw(xap_terms);
-use PublicInbox::Spawn qw(popen_rd spawn);
+use PublicInbox::Spawn qw(popen_rd spawn which);
 use PublicInbox::MID qw(mids);
 use Fcntl qw(SEEK_SET F_SETFL O_APPEND O_RDWR);
 
@@ -33,7 +33,7 @@ sub attach_external {
        my $srch = $ibxish->search or
                return warn("$desc not indexed for Xapian\n");
        my @shards = $srch->xdb_shards_flat or
-               return warn("$desc has no Xapian shardsXapian\n");
+               return warn("$desc has no Xapian shards\n");
 
        if (delete $self->{xdb}) { # XXX: do we need this?
                # clobber existing {xdb} if amending
@@ -192,7 +192,7 @@ sub query_remote_mboxrd {
        my ($opt, $env) = @$lei{qw(opt env)};
        my @qform = (q => $lei->{mset_opt}->{qstr}, x => 'm');
        push(@qform, t => 1) if $opt->{thread};
-       my @cmd = (qw(curl -sSf -d), '');
+       my @cmd = ($self->{curl}, qw(-sSf -d), '');
        my $verbose = $opt->{verbose};
        my $reap;
        my $cerr = File::Temp->new(TEMPLATE => 'curl.err-XXXX', TMPDIR => 1);
@@ -228,10 +228,16 @@ sub query_remote_mboxrd {
                my $cmd = [ @cmd, $uri->as_string ];
                if ($tor eq 'auto' && substr($uri->host, -6) eq '.onion' &&
                                (($env->{LD_PRELOAD}//'') !~ /torsocks/)) {
-                       unshift @$cmd, 'torsocks';
+                       unshift @$cmd, which('torsocks');
                } elsif (PublicInbox::Config::git_bool($tor)) {
-                       unshift @$cmd, 'torsocks';
+                       unshift @$cmd, which('torsocks');
                }
+
+               # continue anyways if torsocks is missing; a proxy may be
+               # specified via CLI, curlrc, environment variable, or even
+               # firewall rule
+               shift(@$cmd) if !$cmd->[0];
+
                $lei->err("# @$cmd") if $verbose;
                $? = 0;
                my $fh = popen_rd($cmd, $env, $rdr);
@@ -411,13 +417,22 @@ sub ipc_atfork_prepare {
        $self->SUPER::ipc_atfork_prepare; # PublicInbox::IPC
 }
 
+sub add_uri {
+       my ($self, $uri) = @_;
+       if (my $curl = $self->{curl} //= which('curl') // 0) {
+               push @{$self->{remotes}}, $uri;
+       } else {
+               warn "curl missing, ignoring $uri\n";
+       }
+}
+
 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 push(@{$self->{remotes}}, $loc) if $loc->can('scheme');
+               return add_uri($self, $loc) if $loc->can('scheme');
        } elsif ($loc =~ m!\Ahttps?://!) {
                require URI;
-               return push(@{$self->{remotes}}, URI->new($loc));
+               return add_uri($self, URI->new($loc));
        } elsif (-f "$loc/ei.lock") {
                require PublicInbox::ExtSearch;
                $loc = PublicInbox::ExtSearch->new($loc);