-# 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>
# "lei blob $OID" command
use PublicInbox::Spawn qw(spawn popen_rd which);
use PublicInbox::DS;
-sub sol_done_wait { # dwaitpid callback
- my ($arg, $pid) = @_;
- my (undef, $lei) = @$arg;
- $lei->child_error($?) if $?;
- $lei->dclose;
-}
-
-sub sol_done { # EOF callback for main daemon
- my ($lei) = @_;
- my $sol = delete $lei->{sol} // return $lei->dclose; # already failed
- $sol->wq_wait_old(\&sol_done_wait, $lei);
-}
-
-sub get_git_dir ($) {
- my ($d) = @_;
+sub get_git_dir ($$) {
+ my ($lei, $d) = @_;
return $d if -d "$d/objects" && -d "$d/refs" && -e "$d/HEAD";
my $cmd = [ qw(git rev-parse --git-dir) ];
- my ($r, $pid) = popen_rd($cmd, {GIT_DIR => undef}, { '-C' => $d });
+ my $opt = { '-C' => $d };
+ if (defined($lei->{opt}->{cwd})) { # --cwd used, report errors
+ $opt->{2} = $lei->{2};
+ } else { # implicit --cwd, quiet errors
+ open $opt->{2}, '>', '/dev/null' or die "open /dev/null: $!";
+ }
+ my ($r, $pid) = popen_rd($cmd, {GIT_DIR => undef}, $opt);
chomp(my $gd = do { local $/; <$r> });
waitpid($pid, 0) == $pid or die "BUG: waitpid @$cmd ($!)";
$? == 0 ? $gd : undef;
my $lei = $self->{lei};
my $log_buf = delete $lei->{'log_buf'};
$$log_buf =~ s/^/# /sgm;
- ref($res) eq 'ARRAY' or return $lei->fail($$log_buf);
+ ref($res) eq 'ARRAY' or return $lei->child_error(0, $$log_buf);
$lei->qerr($$log_buf);
my ($git, $oid, $type, $size, $di) = @$res;
my $gd = $git->{git_dir};
# don't try to support all the git-show(1) options for non-blob,
# this is just a convenience:
$type ne 'blob' and
- $lei->err("# $oid is a $type of $size bytes in:\n#\t$gd");
+ warn "# $oid is a $type of $size bytes in:\n#\t$gd\n";
my $cmd = [ 'git', "--git-dir=$gd", 'show', $oid ];
my $rdr = { 1 => $lei->{1}, 2 => $lei->{2} };
} @$git_dirs ],
user_cb => \&solver_user_cb,
uarg => $self,
- # -cur_di, -qsp, -msg => temporary fields for Qspawn callbacks
+ # -cur_di, -msg => temporary fields for Qspawn callbacks
inboxes => [ $self->{lxs}->locals, @rmt ],
}, 'PublicInbox::SolverGit';
- $lei->{env}->{'psgi.errors'} = $lei->{2}; # ugh...
local $PublicInbox::DS::in_loop = 0; # waitpid synchronously
$solver->solve($lei->{env}, $log, $self->{oid_b}, $hints);
}
+sub cat_attach_i { # Eml->each_part callback
+ my ($part, $depth, $idx) = @{$_[0]};
+ my $lei = $_[1];
+ my $want = $lei->{-attach_idx} // return;
+ return if $idx ne $want; # [0-9]+(?:\.[0-9]+)+
+ delete $lei->{-attach_idx};
+ $lei->out($part->body);
+}
+
+sub extract_attach ($$$) {
+ my ($lei, $blob, $bref) = @_;
+ my $eml = PublicInbox::Eml->new($bref);
+ $eml->each_part(\&cat_attach_i, $lei, 1);
+ my $idx = delete $lei->{-attach_idx};
+ defined($idx) and return $lei->fail(<<EOM);
+E: attachment $idx not found in $blob
+EOM
+}
+
sub lei_blob {
my ($lei, $blob) = @_;
$lei->start_pager if -t $lei->{1};
my $opt = $lei->{opt};
my $has_hints = grep(defined, @$opt{qw(oid-a path-a path-b)});
+ my $lxs;
+ if ($blob =~ s/:([0-9\.]+)\z//) {
+ $lei->{-attach_idx} = $1;
+ $opt->{mail} = 1;
+ }
# first, see if it's a blob returned by "lei q" JSON output:k
if ($opt->{mail} // ($has_hints ? 0 : 1)) {
- my $rdr = { 1 => $lei->{1} };
- open $rdr->{2}, '>', '/dev/null' or die "open: $!";
+ if (grep(defined, @$opt{qw(include only)})) {
+ $lxs = $lei->lxs_prepare;
+ $lei->ale->refresh_externals($lxs, $lei);
+ }
+ my $rdr = {};
+ if ($opt->{mail}) {
+ open $rdr->{2}, '+>', undef or die "open: $!";
+ } else {
+ open $rdr->{2}, '>', '/dev/null' or die "open: $!";
+ }
my $cmd = [ 'git', '--git-dir='.$lei->ale->git->{git_dir},
'cat-file', 'blob', $blob ];
- waitpid(spawn($cmd, $lei->{env}, $rdr), 0);
- return if $? == 0;
+ if (defined $lei->{-attach_idx}) {
+ my $fh = popen_rd($cmd, $lei->{env}, $rdr);
+ require PublicInbox::Eml;
+ my $buf = do { local $/; <$fh> };
+ return extract_attach($lei, $blob, \$buf) if close($fh);
+ } else {
+ $rdr->{1} = $lei->{1};
+ waitpid(spawn($cmd, $lei->{env}, $rdr), 0);
+ }
+ my $ce = $?;
+ return if $ce == 0;
+ my $lms = $lei->lms;
+ if (my $bref = $lms ? $lms->local_blob($blob, 1) : undef) {
+ defined($lei->{-attach_idx}) and
+ return extract_attach($lei, $blob, $bref);
+ return $lei->out($$bref);
+ } elsif ($opt->{mail}) {
+ my $eh = $rdr->{2};
+ seek($eh, 0, 0);
+ return $lei->child_error($ce, do { local $/; <$eh> });
+ } # else: fall through to solver below
}
# maybe it's a non-email (code) blob from a coderepo
my $git_dirs = $opt->{'git-dir'} //= [];
if ($opt->{'cwd'} // 1) {
- my $cgd = get_git_dir('.');
+ my $cgd = get_git_dir($lei, '.');
unshift(@$git_dirs, $cgd) if defined $cgd;
}
return $lei->fail('no --git-dir to try') unless @$git_dirs;
- my $lxs = $lei->lxs_prepare or return;
+ unless ($lxs) {
+ $lxs = $lei->lxs_prepare or return;
+ $lei->ale->refresh_externals($lxs, $lei);
+ }
if ($lxs->remotes) {
require PublicInbox::LeiRemote;
$lei->{curl} //= which('curl') or return
}
require PublicInbox::SolverGit;
my $self = bless { lxs => $lxs, oid_b => $blob }, __PACKAGE__;
- $lei->ale;
- my ($op_c, $ops) = $lei->workers_start($self, 'lei_solve', 1,
- { '' => [ \&sol_done, $lei ] });
- $lei->{sol} = $self;
+ my ($op_c, $ops) = $lei->workers_start($self, 1);
+ $lei->{wq1} = $self;
$self->wq_io_do('do_solve_blob', []);
- $self->wq_close(1);
- $op_c->op_wait_event($ops);
+ $self->wq_close;
+ $lei->wait_wq_events($op_c, $ops);
}
sub ipc_atfork_child {
my ($self) = @_;
$self->{lei}->_lei_atfork_child;
- $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb();
$self->SUPER::ipc_atfork_child;
}