]> Sergey Matveev's repositories - public-inbox.git/blobdiff - lib/PublicInbox/LeiQuery.pm
lei: remove short switch support for curl(1) options
[public-inbox.git] / lib / PublicInbox / LeiQuery.pm
index 4fe40400622730c850fda9ffb9d6eac45cdc356f..0346498fa4f50851f225a84fbe357233d2d1b3c5 100644 (file)
@@ -5,7 +5,6 @@
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
-use PublicInbox::DS qw(dwaitpid);
 
 sub prep_ext { # externals_each callback
        my ($lxs, $exclude, $loc) = @_;
@@ -75,21 +74,12 @@ sub lei_q {
        $xj ||= $lxs->concurrency($opt); # allow: "--jobs ,$WRITER_ONLY"
        my $nproc = $lxs->detect_nproc; # don't memoize, schedtool(1) exists
        $xj = $nproc if $xj > $nproc;
-       PublicInbox::LeiOverview->new($self) or return;
-       $self->atfork_prepare_wq($lxs);
-       $lxs->wq_workers_start('lei_xsearch', $xj, $self->oldset);
-       delete $lxs->{-ipc_atfork_child_close};
-       if (my $l2m = $self->{l2m}) {
-               if (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) {
-                       return $self->fail("`$mj' writer jobs must be >= 1");
-               }
-               $mj //= $nproc;
-               $self->atfork_prepare_wq($l2m);
-               $l2m->wq_workers_start('lei2mail', $mj, $self->oldset);
-               delete $l2m->{-ipc_atfork_child_close};
+       $lxs->{jobs} = $xj;
+       if (defined($mj) && $mj !~ /\A[1-9][0-9]*\z/) {
+               return $self->fail("`$mj' writer jobs must be >= 1");
        }
-
-       # no forking workers after this
+       $self->{l2m}->{jobs} = ($mj // $nproc) if $self->{l2m};
+       PublicInbox::LeiOverview->new($self) or return;
 
        my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
@@ -162,18 +152,24 @@ sub _complete_q {
 # with other "lei q" switches.
 # FIXME: Getopt::Long doesn't easily let us support support options with
 # '.' in them (e.g. --http1.1)
+# 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|E=s ciphers=s config|K=s@
-       connect-timeout=s connect-to=s cookie-jar|c=s cookie|b=s crlfile=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@
-       http2-prior-knowledge http2 insecure|k
+       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|L
+       key-type=s key=s limit-rate=s local-port=s location-trusted location
        max-redirs=i max-time=s negotiate netrc-file=s netrc-optional netrc
-       no-alpn no-buffer|N no-npn no-sessionid noproxy=s ntlm-wb ntlm
+       no-alpn no-buffer no-npn no-sessionid noproxy=s ntlm-wb ntlm
        pass=s pinnedpubkey=s post301 post302 post303 preproxy=s
        proxy-anyauth proxy-basic proxy-cacert=s proxy-capath=s
        proxy-cert-type=s proxy-cert=s proxy-ciphers=s proxy-crlfile=s
@@ -181,16 +177,16 @@ 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
        socks5-gssapi-service-name=s socks5-gssapi socks5-hostname=s socks5=s
-       speed-limit|Y speed-type|y ssl-allow-beast sslv2 sslv3
+       speed-limit speed-type ssl-allow-beast sslv2 sslv3
        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
 )
 }