X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLEI.pm;h=6a5c32b3a4fb9b22c3ab82dcac05c49b56754595;hb=43c43f785aa53607a0dd050989da5d7fd0dcfff4;hp=e29b13c3a798abf11a793eb29f7075e32579bf45;hpb=30e9ab9d119d28c2630446948d1d4446311e421d;p=public-inbox.git diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index e29b13c3..6a5c32b3 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -27,7 +27,7 @@ use Time::HiRes qw(stat); # ctime comparisons for config cache use File::Path qw(mkpath); use File::Spec; our $quit = \&CORE::exit; -our ($current_lei, $errors_log, $listener); +our ($current_lei, $errors_log, $listener, $oldset); my ($recv_cmd, $send_cmd); my $GLP = Getopt::Long::Parser->new; $GLP->configure(qw(gnu_getopt no_ignore_case auto_abbrev)); @@ -83,7 +83,7 @@ sub rel2abs ($$) { File::Spec->rel2abs($p, $pwd); } -sub _store_path ($) { +sub store_path ($) { my ($self) = @_; rel2abs($self, ($self->{env}->{XDG_DATA_HOME} // ($self->{env}->{HOME} // '/nonexistent').'/.local/share') @@ -97,6 +97,21 @@ sub _config_path ($) { .'/lei/config'); } +sub cache_dir ($) { + my ($self) = @_; + rel2abs($self, ($self->{env}->{XDG_CACHE_HOME} // + ($self->{env}->{HOME} // '/nonexistent').'/.cache') + .'/lei'); +} + +sub ale { + my ($self) = @_; + $self->{ale} //= do { + require PublicInbox::LeiALE; + $self->_lei_cfg(1)->{ale} //= PublicInbox::LeiALE->new($self); + }; +} + sub index_opt { # TODO: drop underscore variants everywhere, they're undocumented qw(fsync|sync! jobs|j=i indexlevel|L=s compact @@ -104,84 +119,96 @@ sub index_opt { batch_size|batch-size=s skip-docdata) } +my @c_opt = qw(c=s@ C=s@ quiet|q); + # we generate shell completion + help using %CMD and %OPTDESC, # see lei__complete() and PublicInbox::LeiHelp # command => [ positional_args, 1-line description, Getopt::Long option spec ] our %CMD = ( # sorted in order of importance/use: -'q' => [ '--stdin|SEARCH_TERMS...', 'search for messages matching terms', qw( - save-as=s output|mfolder|o=s format|f=s dedupe|d=s threads|t augment|a +'q' => [ '--stdin|SEARCH_TERMS...', 'search for messages matching terms', + 'stdin|', # /|\z/ must be first for lone dash + qw(save-as=s output|mfolder|o=s format|f=s dedupe|d=s threads|t+ sort|s=s reverse|r offset=i remote! local! external! pretty - include|I=s@ exclude=s@ only=s@ jobs|j=s globoff|g stdin| - alert=s@ mua=s no-torsocks torsocks=s verbose|v+ quiet|q), + include|I=s@ exclude=s@ only=s@ jobs|j=s globoff|g augment|a + import-remote! import-before! lock=s@ rsyncable + alert=s@ mua=s no-torsocks torsocks=s verbose|v+), @c_opt, PublicInbox::LeiQuery::curl_opt(), opt_dash('limit|n=i', '[0-9]+') ], 'show' => [ 'MID|OID', 'show a given object (Message-ID or object ID)', - qw(type=s solve! format|f=s dedupe|d=s threads|t remote local!), - pass_through('git show') ], + qw(type=s solve! format|f=s dedupe|d=s threads|t remote local! + verbose|v+), @c_opt, pass_through('git show') ], 'add-external' => [ 'LOCATION', 'add/set priority of a publicinbox|extindex for extra matches', - qw(boost=i c=s@ mirror=s no-torsocks torsocks=s inbox-version=i), - qw(quiet|q verbose|v+), - index_opt(), PublicInbox::LeiQuery::curl_opt() ], -'ls-external' => [ '[FILTER...]', 'list publicinbox|extindex locations', - qw(format|f=s z|0 local remote quiet|q) ], + qw(boost=i mirror=s no-torsocks torsocks=s inbox-version=i + verbose|v+), @c_opt, index_opt(), + PublicInbox::LeiQuery::curl_opt() ], +'ls-external' => [ '[FILTER]', 'list publicinbox|extindex locations', + qw(format|f=s z|0 globoff|g invert-match|v local remote), @c_opt ], +'ls-label' => [ '', 'list labels', qw(z|0 stats:s), @c_opt ], 'forget-external' => [ 'LOCATION...|--prune', 'exclude further results from a publicinbox|extindex', - qw(prune quiet|q) ], + qw(prune), @c_opt ], 'ls-query' => [ '[FILTER...]', 'list saved search queries', - qw(name-only format|f=s z) ], -'rm-query' => [ 'QUERY_NAME', 'remove a saved search' ], -'mv-query' => [ qw(OLD_NAME NEW_NAME), 'rename a saved search' ], + qw(name-only format|f=s), @c_opt ], +'rm-query' => [ 'QUERY_NAME', 'remove a saved search', @c_opt ], +'mv-query' => [ qw(OLD_NAME NEW_NAME), 'rename a saved search', @c_opt ], 'plonk' => [ '--threads|--from=IDENT', 'exclude mail matching From: or threads from non-Message-ID searches', - qw(stdin| threads|t from|f=s mid=s oid=s) ], -'mark' => [ 'MESSAGE_FLAGS...', - 'set/unset keywords on message(s) from stdin', - qw(stdin| oid=s exact by-mid|mid:s) ], + qw(stdin| threads|t from|f=s mid=s oid=s), @c_opt ], +'mark' => [ 'KEYWORDS...', + 'set/unset keywords on message(s)', + qw(stdin| in-format|F=s input|i=s@ oid=s@ mid=s@), @c_opt, + pass_through('-kw:foo for delete') ], 'forget' => [ '[--stdin|--oid=OID|--by-mid=MID]', "exclude message(s) on stdin from `q' search results", - qw(stdin| oid=s exact by-mid|mid:s quiet|q) ], + qw(stdin| oid=s exact by-mid|mid:s), @c_opt ], 'purge-mailsource' => [ 'LOCATION|--all', 'remove imported messages from IMAP, Maildirs, and MH', - qw(exact! all jobs:i indexed) ], + qw(exact! all jobs:i indexed), @c_opt ], # code repos are used for `show' to solve blobs from patch mails 'add-coderepo' => [ 'DIRNAME', 'add or set priority of a git code repo', - qw(boost=i) ], + qw(boost=i), @c_opt ], 'ls-coderepo' => [ '[FILTER_TERMS...]', - 'list known code repos', qw(format|f=s z) ], + 'list known code repos', qw(format|f=s z), @c_opt ], 'forget-coderepo' => [ 'DIRNAME', 'stop using repo to solve blobs from patches', - qw(prune) ], + qw(prune), @c_opt ], 'add-watch' => [ 'LOCATION', 'watch for new messages and flag changes', qw(import! kw|keywords|flags! interval=s recursive|r - exclude=s include=s) ], + exclude=s include=s), @c_opt ], 'ls-watch' => [ '[FILTER...]', 'list active watches with numbers and status', - qw(format|f=s z) ], -'pause-watch' => [ '[WATCH_NUMBER_OR_FILTER]', qw(all local remote) ], -'resume-watch' => [ '[WATCH_NUMBER_OR_FILTER]', qw(all local remote) ], + qw(format|f=s z), @c_opt ], +'pause-watch' => [ '[WATCH_NUMBER_OR_FILTER]', qw(all local remote), @c_opt ], +'resume-watch' => [ '[WATCH_NUMBER_OR_FILTER]', qw(all local remote), @c_opt ], 'forget-watch' => [ '{WATCH_NUMBER|--prune}', 'stop and forget a watch', - qw(prune) ], + qw(prune), @c_opt ], 'import' => [ 'LOCATION...|--stdin', 'one-time import/update from URL or filesystem', qw(stdin| offset=i recursive|r exclude=s include|I=s - format|f=s kw|keywords|flags!), - ], - + lock=s@ in-format|F=s kw|keywords|flags! verbose|v+), @c_opt ], +'convert' => [ 'LOCATION...|--stdin', + 'one-time conversion from URL or filesystem to another format', + qw(stdin| in-format|F=s out-format|f=s output|mfolder|o=s + lock=s@ kw|keywords|flags!), @c_opt ], +'p2q' => [ 'FILE|COMMIT_OID|--stdin', + "use a patch to generate a query for `lei q --stdin'", + qw(stdin| want|w=s@ uri debug), @c_opt ], 'config' => [ '[...]', sub { 'git-config(1) wrapper for '._config_path($_[0]); }, qw(config-file|system|global|file|f=s), # for conflict detection - pass_through('git config') ], + qw(c=s@ C=s@), pass_through('git config') ], 'init' => [ '[DIRNAME]', sub { - "initialize storage, default: "._store_path($_[0]); - }, qw(quiet|q) ], + "initialize storage, default: ".store_path($_[0]); + }, @c_opt ], 'daemon-kill' => [ '[-SIGNAL]', 'signal the lei-daemon', + # "-C DIR" conflicts with -CHLD, here, and chdir makes no sense, here opt_dash('signal|s=s', '[0-9]+|(?:[A-Z][A-Z0-9]+)') ], 'daemon-pid' => [ '', 'show the PID of the lei-daemon' ], 'help' => [ '[SUBCOMMAND]', 'show help' ], @@ -191,7 +218,7 @@ our %CMD = ( # sorted in order of importance/use: 'reorder-local-store-and-break-history' => [ '[REFNAME]', 'rewrite git history in an attempt to improve compression', - 'gc!' ], + qw(gc!), @c_opt ], # internal commands are prefixed with '_' '_complete' => [ '[...]', 'internal shell completion helper', @@ -210,23 +237,33 @@ my $ls_format = [ 'OUT|plain|json|null', 'listing output format' ]; # we use \x{a0} (non-breaking SP) to avoid wrapping in PublicInbox::LeiHelp my %OPTDESC = ( 'help|h' => 'show this built-in help', +'c=s@' => [ 'NAME=VALUE', 'set config option' ], +'C=s@' => [ 'DIR', 'chdir to specify to directory' ], 'quiet|q' => 'be quiet', +'lock=s@' => [ 'METHOD|dotlock|fcntl|flock|none', + 'mbox(5) locking method(s) to use (default: fcntl,dotlock)' ], + 'globoff|g' => "do not match locations using '*?' wildcards ". "and\xa0'[]'\x{a0}ranges", 'verbose|v+' => 'be more verbose', +'external!' => 'do not use externals', 'solve!' => 'do not attempt to reconstruct blobs from emails', 'torsocks=s' => ['VAL|auto|no|yes', 'whether or not to wrap git and curl commands with torsocks'], 'no-torsocks' => 'alias for --torsocks=no', 'save-as=s' => ['NAME', 'save a search terms by given name'], +'import-remote!' => 'do not memoize remote messages into local store', 'type=s' => [ 'any|mid|git', 'disambiguate type' ], 'dedupe|d=s' => ['STRATEGY|content|oid|mid|none', 'deduplication strategy'], -'show threads|t' => 'display entire thread a message belongs to', -'q threads|t' => +'threads|t+' => 'return all messages in the same threads as the actual match(es)', + +'want|w=s@' => [ 'PREFIX|dfpost|dfn', # common ones in help... + 'search prefixes to extract (default: dfpost7)' ], + 'alert=s@' => ['CMD,:WINCH,:bell,', 'run command(s) or perform ops when done writing to output ' . '(default: ":WINCH,:bell" with --mua and Maildir/IMAP output, ' . @@ -240,17 +277,11 @@ my %OPTDESC = ( 'mua=s' => [ 'CMD', "MUA to run on --output Maildir or mbox (e.g.\xa0`mutt\xa0-f\xa0%f')" ], -'show format|f=s' => [ 'OUT|plain|raw|html|mboxrd|mboxcl2|mboxcl', - 'message/object output format' ], -'mark format|f=s' => $stdin_formats, -'forget format|f=s' => $stdin_formats, - -'add-external inbox-version=i' => [ 'NUM|1|2', +'inbox-version=i' => [ 'NUM|1|2', 'force a public-inbox version with --mirror'], -'add-external mirror=s' => [ 'URL', 'mirror a public-inbox'], +'mirror=s' => [ 'URL', 'mirror a public-inbox'], # public-inbox-index options -'add-external jobs|j=i' => 'set parallelism when indexing after --mirror', 'fsync!' => 'speed up indexing after --mirror, risk index corruption', 'compact' => 'run compact index after mirroring', 'indexlevel|L=s' => [ 'LEVEL|full|medium|basic', @@ -264,23 +295,22 @@ my %OPTDESC = ( 'skip-docdata' => 'drop compatibility w/ public-inbox <1.6 to save ~1.5% space', -'q format|f=s' => [ +'format|f=s q' => [ 'OUT|maildir|mboxrd|mboxcl2|mboxcl|mboxo|html|json|jsonl|concatjson', 'specify output format, default depends on --output'], -'q exclude=s@' => [ 'LOCATION', +'exclude=s@ q' => [ 'LOCATION', 'exclude specified external(s) from search' ], -'q include|I=s@' => [ 'LOCATION', +'include|I=s@ q' => [ 'LOCATION', 'include specified external(s) in search' ], -'q only=s@' => [ 'LOCATION', +'only=s@ q' => [ 'LOCATION', 'only use specified external(s) for search' ], - -'q jobs=s' => [ '[SEARCH_JOBS][,WRITER_JOBS]', +'jobs=s q' => [ '[SEARCH_JOBS][,WRITER_JOBS]', 'control number of search and writer jobs' ], +'jobs|j=i add-external' => 'set parallelism when indexing after --mirror', -'import format|f=s' => $stdin_formats, - -'ls-query format|f=s' => $ls_format, -'ls-external format|f=s' => $ls_format, +'in-format|F=s' => $stdin_formats, +'format|f=s ls-query' => $ls_format, +'format|f=s ls-external' => $ls_format, 'limit|n=i@' => ['NUM', 'limit on number of matches (default: 10000)' ], 'offset=i' => ['OFF', 'search result offset (default: 0)'], @@ -320,7 +350,7 @@ my %CONFIG_KEYS = ( 'leistore.dir' => 'top-level storage location', ); -my @WQ_KEYS = qw(lxs l2m imp mrr); # internal workers +my @WQ_KEYS = qw(lxs l2m imp mrr cnv p2q mark); # internal workers # pronounced "exit": x_it(1 << 8) => exit(1); x_it(13) => SIGPIPE sub x_it ($$) { @@ -336,8 +366,9 @@ sub x_it ($$) { my $wq = delete $self->{$f} or next; $wq->DESTROY; } - # cleanup anything that has tempfiles - delete @$self{qw(ovv dedupe)}; + # cleanup anything that has tempfiles or open file handles + %PATH2CFG = (); + delete @$self{qw(ovv dedupe sto cfg)}; if (my $signum = ($code & 127)) { # usually SIGPIPE (13) $SIG{PIPE} = 'DEFAULT'; # $SIG{$signum} doesn't work kill $signum, $$; @@ -368,7 +399,7 @@ sub fail_handler ($;$$) { $wq->wq_wait_old(undef, $lei) if $wq->wq_kill_old; # lei-daemon } close($io) if $io; # needed to avoid warnings on SIGPIPE - $lei->x_it($code // (1 >> 8)); + x_it($lei, $code // (1 << 8)); } sub sigpipe_handler { # handles SIGPIPE from @WQ_KEYS workers @@ -394,7 +425,7 @@ sub out ($;@) { my $self = shift; return if print { $self->{1} // return } @_; # likely return note_sigpipe($self, 1) if $! == EPIPE; - my $err = "error writing to stdout: $!"; + my $err = "error writing to output: $!"; delete $self->{1}; fail($self, $err); } @@ -419,18 +450,23 @@ sub note_sigpipe { # triggers sigpipe_handler x_it($self, 13); } -sub lei_atfork_child { +sub _lei_atfork_child { my ($self, $persist) = @_; # we need to explicitly close things which are on stack if ($persist) { - my @io = delete @$self{0,1,2}; + chdir '/' or die "chdir(/): $!"; + my @io = delete @$self{qw(0 1 2 sock)}; unless ($self->{oneshot}) { close($_) for @io; } - } else { + if (my $cfg = $self->{cfg}) { + delete $cfg->{-lei_store}; + } + } else { # worker, Net::NNTP (Net::Cmd) uses STDERR directly + open STDERR, '+>&='.fileno($self->{2}) or warn "open $!"; delete $self->{0}; } - for (delete @$self{qw(3 sock old_1 au_done)}) { + for (delete @$self{qw(3 old_1 au_done)}) { close($_) if defined($_); } if (my $op_c = delete $self->{pkt_op_c}) { @@ -447,6 +483,44 @@ sub lei_atfork_child { $current_lei = $persist ? undef : $self; # for SIG{__WARN__} } +sub _delete_pkt_op { # OnDestroy callback to prevent leaks on die + my ($self) = @_; + if (my $op = delete $self->{pkt_op_c}) { # in case of die + $op->close; # PublicInbox::PktOp::close + } + my $unclosed_after_die = delete($self->{pkt_op_p}) or return; + close $unclosed_after_die; +} + +sub pkt_op_pair { + my ($self, $ops) = @_; + require PublicInbox::OnDestroy; + require PublicInbox::PktOp; + my $end = PublicInbox::OnDestroy->new($$, \&_delete_pkt_op, $self); + @$self{qw(pkt_op_c pkt_op_p)} = PublicInbox::PktOp->pair($ops); + $end; +} + +sub workers_start { + my ($lei, $wq, $ident, $jobs, $ops) = @_; + $ops = { + '!' => [ \&fail_handler, $lei ], + '|' => [ \&sigpipe_handler, $lei ], + 'x_it' => [ \&x_it, $lei ], + 'child_error' => [ \&child_error, $lei ], + ($ops ? %$ops : ()), + }; + $ops->{''} //= [ \&dclose, $lei ]; + my $end = $lei->pkt_op_pair($ops); + $wq->wq_workers_start($ident, $jobs, $lei->oldset, { lei => $lei }); + delete $lei->{pkt_op_p}; + my $op = delete $lei->{pkt_op_c}; + @$end = (); + $lei->event_step_init; + # oneshot needs $op, daemon-mode uses DS->EventLoop to handle $op + $lei->{oneshot} ? $op : undef; +} + sub _help { require PublicInbox::LeiHelp; PublicInbox::LeiHelp::call($_[0], $_[1], \%CMD, \%OPTDESC); @@ -457,7 +531,7 @@ sub optparse ($$$) { # allow _complete --help to complete, not show help return 1 if substr($cmd, 0, 1) eq '_'; $self->{cmd} = $cmd; - $OPT = $self->{opt} = {}; + $OPT = $self->{opt} //= {}; my $info = $CMD{$cmd} // [ '[...]' ]; my ($proto, undef, @spec) = @$info; my $glp = ref($spec[-1]) eq ref($GLP) ? pop(@spec) : $GLP; @@ -521,20 +595,80 @@ sub optparse ($$$) { $err ? fail($self, "usage: lei $cmd $proto\nE: $err") : 1; } +sub _tmp_cfg { # for lei -c = ... + my ($self) = @_; + my $cfg = _lei_cfg($self, 1); + require File::Temp; + my $ft = File::Temp->new(TEMPLATE => 'lei_cfg-XXXX', TMPDIR => 1); + my $tmp = { '-f' => $ft->filename, -tmp => $ft }; + $ft->autoflush(1); + print $ft <{-f}: $!"); +[include] + path = $cfg->{-f} +EOM + $tmp = $self->{cfg} = bless { %$cfg, %$tmp }, ref($cfg); + for (@{$self->{opt}->{c}}) { + /\A([^=\.]+\.[^=]+)(?:=(.*))?\z/ or return fail($self, <=' +EOM + my $name = $1; + my $value = $2 // 1; + _config($self, '--add', $name, $value); + if (defined(my $v = $tmp->{$name})) { + if (ref($v) eq 'ARRAY') { + push @$v, $value; + } else { + $tmp->{$name} = [ $v, $value ]; + } + } else { + $tmp->{$name} = $value; + } + } +} + +sub lazy_cb ($$$) { + my ($self, $cmd, $pfx) = @_; + my $ucmd = $cmd; + $ucmd =~ tr/-/_/; + my $cb; + $cb = $self->can($pfx.$ucmd) and return $cb; + my $base = $ucmd; + $base =~ s/_([a-z])/\u$1/g; + my $pkg = "PublicInbox::Lei\u$base"; + ($INC{"PublicInbox/Lei\u$base.pm"} // eval("require $pkg")) ? + $pkg->can($pfx.$ucmd) : undef; +} + sub dispatch { my ($self, $cmd, @argv) = @_; local $current_lei = $self; # for __WARN__ dump_and_clear_log("from previous run\n"); return _help($self, 'no command given') unless defined($cmd); - my $func = "lei_$cmd"; - $func =~ tr/-/_/; - if (my $cb = __PACKAGE__->can($func)) { + # do not support Getopt bundling for this + while ($cmd eq '-C' || $cmd eq '-c') { + my $v = shift(@argv) // return fail($self, $cmd eq '-C' ? + '-C DIRECTORY' : '-c ='); + push @{$self->{opt}->{substr($cmd, 1, 1)}}, $v; + $cmd = shift(@argv) // return _help($self, 'no command given'); + } + if (my $cb = lazy_cb(__PACKAGE__, $cmd, 'lei_')) { optparse($self, $cmd, \@argv) or return; + $self->{opt}->{c} and (_tmp_cfg($self) // return); + if (my $chdir = $self->{opt}->{C}) { + for my $d (@$chdir) { + next if $d eq ''; # same as git(1) + chdir $d or return fail($self, "cd $d: $!"); + } + if (delete $self->{3}) { # update cwd for rel2abs + opendir my $dh, '.' or + return fail($self, "opendir . $!"); + $self->{3} = $dh; + } + } $cb->($self, @argv); } elsif (grep(/\A-/, $cmd, @argv)) { # --help or -h only - my $opt = {}; - $GLP->getoptionsfromarray([$cmd, @argv], $opt, qw(help|h)) or - return _help($self, 'bad arguments or options'); + $GLP->getoptionsfromarray([$cmd, @argv], {}, qw(help|h C=s@)) + or return _help($self, 'bad arguments or options'); _help($self); } else { fail($self, "`$cmd' is not an lei command"); @@ -543,27 +677,42 @@ sub dispatch { sub _lei_cfg ($;$) { my ($self, $creat) = @_; + return $self->{cfg} if $self->{cfg}; my $f = _config_path($self); my @st = stat($f); my $cur_st = @st ? pack('dd', $st[10], $st[7]) : ''; # 10:ctime, 7:size + my ($sto, $sto_dir); if (my $cfg = $PATH2CFG{$f}) { # reuse existing object in common case return ($self->{cfg} = $cfg) if $cur_st eq $cfg->{-st}; + ($sto, $sto_dir) = @$cfg{qw(-lei_store leistore.dir)}; } if (!@st) { unless ($creat) { delete $self->{cfg}; - return; + return bless {}, 'PublicInbox::Config'; } my (undef, $cfg_dir, undef) = File::Spec->splitpath($f); -d $cfg_dir or mkpath($cfg_dir) or die "mkpath($cfg_dir): $!\n"; open my $fh, '>>', $f or die "open($f): $!\n"; @st = stat($fh) or die "fstat($f): $!\n"; $cur_st = pack('dd', $st[10], $st[7]); - qerr($self, "I: $f created") if $self->{cmd} ne 'config'; + qerr($self, "# $f created") if $self->{cmd} ne 'config'; } my $cfg = PublicInbox::Config::git_config_dump($f); + bless $cfg, 'PublicInbox::Config'; $cfg->{-st} = $cur_st; $cfg->{'-f'} = $f; + if ($sto && File::Spec->canonpath($sto_dir // store_path($self)) + eq File::Spec->canonpath($cfg->{'leistore.dir'} // + store_path($self))) { + $cfg->{-lei_store} = $sto; + } + if (scalar(keys %PATH2CFG) > 5) { + # FIXME: use inotify/EVFILT_VNODE to detect unlinked configs + for my $k (keys %PATH2CFG) { + delete($PATH2CFG{$k}) unless -f $k + } + } $self->{cfg} = $PATH2CFG{$f} = $cfg; } @@ -572,8 +721,8 @@ sub _lei_store ($;$) { my $cfg = _lei_cfg($self, $creat); $cfg->{-lei_store} //= do { require PublicInbox::LeiStore; - my $dir = $cfg->{'leistore.dir'}; - $dir //= $creat ? _store_path($self) : return; + my $dir = $cfg->{'leistore.dir'} // store_path($self); + return unless $creat || -d $dir; PublicInbox::LeiStore->new($dir, { creat => $creat }); }; } @@ -582,19 +731,13 @@ sub lei_show { my ($self, @argv) = @_; } -sub lei_mark { - my ($self, @argv) = @_; -} - sub _config { my ($self, @argv) = @_; - my $env = $self->{env}; - delete local $env->{GIT_CONFIG}; - delete local $ENV{GIT_CONFIG}; + my %env = (%{$self->{env}}, GIT_CONFIG => undef); my $cfg = _lei_cfg($self, 1); my $cmd = [ qw(git config -f), $cfg->{'-f'}, @argv ]; my %rdr = map { $_ => $self->{$_} } (0..2); - waitpid(spawn($cmd, $env, \%rdr), 0); + waitpid(spawn($cmd, \%env, \%rdr), 0); } sub lei_config { @@ -605,21 +748,16 @@ sub lei_config { x_it($self, $?) if $?; } -sub lei_import { - require PublicInbox::LeiImport; - PublicInbox::LeiImport->call(@_); -} - sub lei_init { my ($self, $dir) = @_; my $cfg = _lei_cfg($self, 1); my $cur = $cfg->{'leistore.dir'}; - $dir //= _store_path($self); + $dir //= store_path($self); $dir = rel2abs($self, $dir); my @cur = stat($cur) if defined($cur); $cur = File::Spec->canonpath($cur // $dir); my @dir = stat($dir); - my $exists = "I: leistore.dir=$cur already initialized" if @dir; + my $exists = "# leistore.dir=$cur already initialized" if @dir; if (@cur) { if ($cur eq $dir) { _lei_store($self, 1)->done; @@ -638,7 +776,7 @@ E: leistore.dir=$cur already initialized and it is not $dir } lei_config($self, 'leistore.dir', $dir); _lei_store($self, 1)->done; - $exists //= "I: leistore.dir=$dir newly initialized"; + $exists //= "# leistore.dir=$dir newly initialized"; return qerr($self, $exists); } @@ -658,7 +796,7 @@ sub lei_help { _help($_[0]) } sub lei__complete { my ($self, @argv) = @_; # argv = qw(lei and any other args...) shift @argv; # ignore "lei", the entire command is sent - @argv or return puts $self, grep(!/^_/, keys %CMD), qw(--help -h); + @argv or return puts $self, grep(!/^_/, keys %CMD), qw(--help -h -C); my $cmd = shift @argv; my $info = $CMD{$cmd} // do { # filter matching commands @argv or puts $self, grep(/\A\Q$cmd\E/, keys %CMD); @@ -667,7 +805,7 @@ sub lei__complete { my ($proto, undef, @spec) = @$info; my $cur = pop @argv; my $re = defined($cur) ? qr/\A\Q$cur\E/ : qr/./; - if (substr($cur // '-', 0, 1) eq '-') { # --switches + if (substr(my $_cur = $cur // '-', 0, 1) eq '-') { # --switches # gross special case since the only git-config options # Consider moving to a table if we need more special cases # we use Getopt::Long for are the ones we reject, so these @@ -682,7 +820,7 @@ sub lei__complete { # fall-through } # generate short/long names from Getopt::Long specs - puts $self, grep(/$re/, qw(--help -h), map { + puts $self, grep(/$re/, qw(--help -h -C), map { if (s/[:=].+\z//) { # req/optional args, e.g output|o=i } elsif (s/\+\z//) { # verbose|v+ } elsif (s/!\z//) { @@ -691,9 +829,9 @@ sub lei__complete { } map { my $x = length > 1 ? "--$_" : "-$_"; - $x eq $cur ? () : $x; + $x eq $_cur ? () : $x; } grep(!/_/, split(/\|/, $_, -1)) # help|h - } grep { $OPTDESC{"$cmd\t$_"} || $OPTDESC{$_} } @spec); + } grep { $OPTDESC{"$_\t$cmd"} || $OPTDESC{$_} } @spec); } elsif ($cmd eq 'config' && !@argv && !$CONFIG_KEYS{$cur}) { puts $self, grep(/$re/, keys %CONFIG_KEYS); } @@ -706,13 +844,12 @@ sub lei__complete { my @v = ref($v) ? split(/\|/, $v->[0]) : (); # get rid of ALL CAPS placeholder (e.g "OUT") # (TODO: completion for external paths) - shift(@v) if uc($v[0]) eq $v[0]; + shift(@v) if scalar(@v) && uc($v[0]) eq $v[0]; @v; - } grep(/\A(?:$cmd\t|)(?:[\w-]+\|)*$opt\b/, keys %OPTDESC); + } grep(/\A(?:[\w-]+\|)*$opt\b.*?(?:\t$cmd)?\z/, keys %OPTDESC); } - $cmd =~ tr/-/_/; - if (my $sub = $self->can("_complete_$cmd")) { - puts $self, $sub->($self, @argv, $cur); + if (my $cb = lazy_cb($self, $cmd, '_complete_')) { + puts $self, $cb->($self, @argv, $cur ? ($cur) : ()); } # TODO: URLs, pathnames, OIDs, MIDs, etc... See optparse() for # proto parsing. @@ -754,6 +891,13 @@ sub start_mua { delete $self->{opt}->{verbose}; } +sub send_exec_cmd { # tell script/lei to execute a command + my ($self, $io, $cmd, $env) = @_; + my $sock = $self->{sock} // die 'lei client gone'; + my $fds = [ map { fileno($_) } @$io ]; + $send_cmd->($sock, $fds, exec_buf($cmd, $env), MSG_EOR); +} + sub poke_mua { # forces terminal MUAs to wake up and hopefully notice new mail my ($self) = @_; my $alerts = $self->{opt}->{alert} // return; @@ -784,11 +928,26 @@ sub poke_mua { # forces terminal MUAs to wake up and hopefully notice new mail } } +my %path_to_fd = ('/dev/stdin' => 0, '/dev/stdout' => 1, '/dev/stderr' => 2); +$path_to_fd{"/dev/fd/$_"} = $path_to_fd{"/proc/self/fd/$_"} for (0..2); +sub fopen { + my ($self, $mode, $path) = @_; + rel2abs($self, $path); + $path =~ tr!/!/!s; + if (defined(my $fd = $path_to_fd{$path})) { + return $self->{$fd}; + } + if ($path =~ m!\A/(?:dev|proc/self)/fd/[0-9]+\z!) { + return fail($self, "cannot open $path from daemon"); + } + open my $fh, $mode, $path or return; + $fh; +} + # caller needs to "-t $self->{1}" to check if tty sub start_pager { my ($self) = @_; - my $env = $self->{env}; - my $fh = popen_rd([qw(git var GIT_PAGER)], $env); + my $fh = popen_rd([qw(git var GIT_PAGER)]); chomp(my $pager = <$fh> // ''); close($fh) or warn "`git var PAGER' error: \$?=$?"; return if $pager eq 'cat' || $pager eq ''; @@ -797,10 +956,10 @@ sub start_pager { pipe(my ($r, $wpager)) or return warn "pipe: $!"; my $rdr = { 0 => $r, 1 => $self->{1}, 2 => $self->{2} }; my $pgr = [ undef, @$rdr{1, 2} ]; - if (my $sock = $self->{sock}) { # lei(1) process runs it + my $env = $self->{env}; + if ($self->{sock}) { # lei(1) process runs it delete @$new_env{keys %$env}; # only set iff unset - my $fds = [ map { fileno($_) } @$rdr{0..2} ]; - $send_cmd->($sock, $fds, exec_buf([$pager], $new_env), MSG_EOR); + send_exec_cmd($self, [ @$rdr{0..2} ], [$pager], $new_env); } elsif ($self->{oneshot}) { my $cmd = [$pager]; $self->{"pid.$self.$$"}->{spawn($cmd, $new_env, $rdr)} = $cmd; @@ -830,17 +989,16 @@ sub accept_dispatch { # Listener {post_accept} callback return send($sock, 'timed out waiting to recv FDs', MSG_EOR); # (4096 * 33) >MAX_ARG_STRLEN my @fds = $recv_cmd->($sock, my $buf, 4096 * 33) or return; # EOF - if (scalar(@fds) == 4) { - for my $i (0..3) { - my $fd = shift(@fds); - open($self->{$i}, '+<&=', $fd) and next; - send($sock, "open(+<&=$fd) (FD=$i): $!", MSG_EOR); - } - } elsif (!defined($fds[0])) { + if (!defined($fds[0])) { warn(my $msg = "recv_cmd failed: $!"); return send($sock, $msg, MSG_EOR); } else { - return; + my $i = 0; + for my $fd (@fds) { + open($self->{$i++}, '+<&=', $fd) and next; + send($sock, "open(+<&=$fd) (FD=$i): $!", MSG_EOR); + } + return if scalar(@fds) != 4; } $self->{2}->autoflush(1); # keep stdout buffered until x_it|DESTROY # $ENV_STR = join('', map { "\0$_=$ENV{$_}" } keys %ENV); @@ -872,7 +1030,10 @@ sub dclose { } } close(delete $self->{1}) if $self->{1}; # may reap_compress - $self->close if $self->{sock}; # PublicInbox::DS::close + if (my $sto = delete $self->{sto}) { + $sto->ipc_do('done'); + } + $self->close if $self->{-event_init_done}; # PublicInbox::DS::close } # for long-running results @@ -904,6 +1065,7 @@ sub event_step { sub event_step_init { my ($self) = @_; + return if $self->{-event_init_done}++; if (my $sock = $self->{sock}) { # using DS->EventLoop $self->SUPER::new($sock, EPOLLIN|EPOLLET); } @@ -911,7 +1073,7 @@ sub event_step_init { sub noop {} -our $oldset; sub oldset { $oldset } +sub oldset { $oldset } sub dump_and_clear_log { if (defined($errors_log) && -s STDIN && seek(STDIN, 0, SEEK_SET)) { @@ -1048,6 +1210,8 @@ sub lazy_start { exit($exit_code // 0); } +sub busy { 1 } # prevent daemon-shutdown if client is connected + # for users w/o Socket::Msghdr installed or Inline::C enabled sub oneshot { my ($main_pkg) = @_; @@ -1072,8 +1236,10 @@ sub DESTROY { my ($self) = @_; $self->{1}->autoflush(1) if $self->{1}; stop_pager($self); + my $err = $?; my $oneshot_pids = delete $self->{"pid.$self.$$"} or return; waitpid($_, 0) for keys %$oneshot_pids; + $? = $err if $err; # preserve ->fail or ->x_it code } 1;