X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiBlob.pm;h=004b156c3396acde3e419bbe723e7cd144ebcf4d;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=ad885306beaa20c17ac6bb31e3bb4dc65bbca76e;hpb=775e160375fb5c15f3b5ade3a1165f7ce5df9eb4;p=public-inbox.git diff --git a/lib/PublicInbox/LeiBlob.pm b/lib/PublicInbox/LeiBlob.pm index ad885306..004b156c 100644 --- a/lib/PublicInbox/LeiBlob.pm +++ b/lib/PublicInbox/LeiBlob.pm @@ -10,19 +10,6 @@ use parent qw(PublicInbox::IPC); 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 ($lei, $d) = @_; return $d if -d "$d/objects" && -d "$d/refs" && -e "$d/HEAD"; @@ -45,7 +32,7 @@ sub solver_user_cb { # called by solver when done my $lei = $self->{lei}; my $log_buf = delete $lei->{'log_buf'}; $$log_buf =~ s/^/# /sgm; - ref($res) eq 'ARRAY' or return $lei->child_error(1 << 8, $$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}; @@ -53,7 +40,7 @@ sub solver_user_cb { # called by solver when done # 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} }; @@ -86,35 +73,75 @@ sub do_solve_blob { # via wq_do # -cur_di, -qsp, -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(<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)) { if (grep(defined, @$opt{qw(include only)})) { $lxs = $lei->lxs_prepare; - $lei->ale->refresh_externals($lxs); + $lei->ale->refresh_externals($lxs, $lei); } - my $rdr = { 1 => $lei->{1} }; + my $rdr = {}; if ($opt->{mail}) { - $rdr->{2} = $lei->{2}; + 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; - return $lei->child_error($?) if $opt->{mail}; + 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 @@ -126,7 +153,7 @@ sub lei_blob { return $lei->fail('no --git-dir to try') unless @$git_dirs; unless ($lxs) { $lxs = $lei->lxs_prepare or return; - $lei->ale->refresh_externals($lxs); + $lei->ale->refresh_externals($lxs, $lei); } if ($lxs->remotes) { require PublicInbox::LeiRemote; @@ -136,18 +163,16 @@ sub lei_blob { } require PublicInbox::SolverGit; my $self = bless { lxs => $lxs, oid_b => $blob }, __PACKAGE__; - 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; }