lei q: use git approxidate with d:, dt: and rt: ranges

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 7c8560327ef9fcd03d5be58a6c71861ffc794308..d637b1ae76138974cc7cf8c47b38dcbaa3058abc 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -34,9 +34,10 @@ sub lei_q {
        my @only = @{$opt->{only} // []};
        # --local is enabled by default unless --only is used
        # we'll allow "--only $LOCATION --local"
+       my $sto = $self->_lei_store(1);
+       my $lse = $sto->search;
        if ($opt->{'local'} //= scalar(@only) ? 0 : 1) {
-               my $sto = $self->_lei_store(1);
-               $lxs->prepare_external($sto->search);
+               $lxs->prepare_external($lse);
        }
        if (@only) {
                for my $loc (@only) {
@@ -81,7 +82,7 @@ sub lei_q {
        $self->{l2m}->{jobs} = ($mj // $nproc) if $self->{l2m};
        PublicInbox::LeiOverview->new($self) or return;
 
-       my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
+       my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
        $mset_opt{limit} //= 10000;
        if (defined(my $sort = $opt->{'sort'})) {
@@ -96,7 +97,7 @@ sub lei_q {
                }
        }
        # descending docid order
-       $mset_opt{relevance} //= -2 if $opt->{thread};
+       $mset_opt{relevance} //= -2 if $opt->{threads};
        $self->{mset_opt} = \%mset_opt;
 
        if ($opt->{stdin}) {
@@ -107,12 +108,7 @@ no query allowed on command-line with --stdin
                PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self);
                return;
        }
-       # Consider spaces in argv to be for phrase search in Xapian.
-       # In other words, the users should need only care about
-       # normal shell quotes and not have to learn Xapian quoting.
-       $mset_opt{qstr} = join(' ', map {;
-               /\s/ ? (s/\A(\w+:)// ? qq{$1"$_"} : qq{"$_"}) : $_
-       } @argv);
+       $mset_opt{qstr} = $lse->query_argv_to_string($lse->git, \@argv);
        $lxs->do_query($self);
 }
 
@@ -155,13 +151,16 @@ sub _complete_q {
 # TODO: should we depend on "-c http.*" options for things which have
 # analogues in git(1)? that would reduce likelyhood of conflicts with
 # our other CLI options
+# Note: some names are renamed to avoid potential conflicts,
+# see %lei2mail in lib/PublicInbox/LeiCurl.pm
 sub curl_opt { qw(
+       curl-config=s@
        abstract-unix-socket=s anyauth basic cacert=s capath=s
-       cert-status cert-type cert=s ciphers=s config|K=s@
+       cert-status cert-type cert=s ciphers=s
        connect-timeout=s connect-to=s cookie-jar=s cookie=s crlfile=s
        digest disable dns-interface=s dns-ipv4-addr=s dns-ipv6-addr=s
        dns-servers=s doh-url=s egd-file=s engine=s false-start
-       happy-eyeballs-timeout-ms=s haproxy-protocol header|H=s@
+       happy-eyeballs-timeout-ms=s haproxy-protocol header=s@
        http2-prior-knowledge http2 insecure
        interface=s ipv4 ipv6 junk-session-cookies
        key-type=s key=s limit-rate=s local-port=s location-trusted location
@@ -174,7 +173,7 @@ sub curl_opt { qw(
        proxy-key-type=s proxy-key proxy-negotiate proxy-ntlm proxy-pass=s
        proxy-pinnedpubkey=s proxy-service-name=s proxy-ssl-allow-beast
        proxy-tls13-ciphers=s proxy-tlsauthtype=s proxy-tlspassword=s
-       proxy-tlsuser=s proxy-tlsv1 proxy-user|U=s proxy=s
+       proxy-tlsuser=s proxy-tlsv1 proxy-user=s proxy=s
        proxytunnel=s pubkey=s random-file=s referer=s resolve=s
        retry-connrefused retry-delay=s retry-max-time=s retry=i
        sasl-ir service-name=s socks4=s socks4a=s socks5-basic
@@ -183,7 +182,7 @@ sub curl_opt { qw(
        suppress-connect-headers tcp-fastopen tls-max=s
        tls13-ciphers=s tlsauthtype=s tlspassword=s tlsuser=s
        tlsv1 trace-ascii=s trace-time trace=s
-       unix-socket=s user-agent|A=s user|u=s
+       unix-socket=s user-agent=s user=s
 )
 }