X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewVCS.pm;h=51a7bcbcb43b81dd2062c662394972b2be3d2d1b;hb=ca8cb3b274e017cdc40f69585ecba40fcfa33f8e;hp=02e98768602ae0d9529f9140a0dbdf20cf81e581;hpb=771ec3e170aebcb9c0f3aa29a9b62040ba50f050;p=public-inbox.git diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 02e98768..51a7bcbc 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -49,7 +49,7 @@ my %GIT_MODE = ( sub html_page ($$;@) { my ($ctx, $code) = @_[0, 1]; my $wcb = delete $ctx->{-wcb}; - $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/" + $ctx->{-upfx} //= '../../'; # from "/$INBOX/$OID/s/" my $res = html_oneshot($ctx, $code, @_[2..$#_]); $wcb ? $wcb->($res) : $res; } @@ -65,6 +65,7 @@ sub dbg_log ($) { warn "readline(log): $!"; return '
debug log read error'; }; + return '' if $log eq ''; $ctx->{-linkify} //= PublicInbox::Linkify->new; "
debug log:\n\n". $ctx->{-linkify}->to_html($log).''; @@ -100,11 +101,11 @@ sub stream_large_blob ($$) { my $cmd = ['git', "--git-dir=$git->{git_dir}", 'cat-file', $type, $oid]; my $qsp = PublicInbox::Qspawn->new($cmd); my $env = $ctx->{env}; - $env->{'qspawn.wcb'} = delete $ctx->{-wcb}; + $env->{'qspawn.wcb'} = $ctx->{-wcb}; $qsp->psgi_return($env, undef, \&stream_blob_parse_hdr, $ctx); } -sub show_other_result ($$) { # tag +sub show_other_result ($$) { # future-proofing my ($bref, $ctx) = @_; if (my $qsp_err = delete $ctx->{-qsp_err}) { return html_page($ctx, 500, dbg_log($ctx) . @@ -124,6 +125,27 @@ sub cmt_title { # git->cat_async callback cmt_finalize($ctx); } +sub do_cat_async { + my ($ctx, $cb, @req) = @_; + # favor git(1) over Gcf2 (libgit2) for SHA-256 support + $ctx->{git}->cat_async($_, $cb, $ctx) for @req; + if ($ctx->{env}->{'pi-httpd.async'}) { + PublicInbox::GitAsyncCat::watch_cat($ctx->{git}); + } else { # synchronous, generic PSGI + $ctx->{git}->cat_async_wait; + } +} + +sub do_check_async { + my ($ctx, $cb, @req) = @_; + if ($ctx->{env}->{'pi-httpd.async'}) { + async_check($ctx, $_, $cb, $ctx) for @req; + } else { # synchronous, generic PSGI + $ctx->{git}->check_async($_, $cb, $ctx) for @req; + $ctx->{git}->check_async_wait; + } +} + sub show_commit_start { # ->psgi_qx callback my ($bref, $ctx) = @_; if (my $qsp_err = delete $ctx->{-qsp_err}) { @@ -141,35 +163,34 @@ sub show_commit_start { # ->psgi_qx callback return cmt_finalize($ctx) if !$P; @{$ctx->{-cmt_P}} = split(/ /, $P); @{$ctx->{-cmt_p}} = split(/ /, $p); # abbreviated - if ($ctx->{env}->{'pi-httpd.async'}) { - for (@{$ctx->{-cmt_P}}) { - ibx_async_cat($ctx, $_, \&cmt_title, $ctx); - } - } else { # synchronous - for (@{$ctx->{-cmt_P}}) { - $ctx->{git}->cat_async($_, \&cmt_title, $ctx); - } - $ctx->{git}->cat_async_wait; - } + do_cat_async($ctx, \&cmt_title, @{$ctx->{-cmt_P}}); } sub ibx_url_for { my ($ctx) = @_; - $ctx->{ibx} and return; # just fall back to $upfx - $ctx->{git} or return; # /$CODEREPO/$OID/s/ to (eidx|ibx) + $ctx->{ibx} and return; # fall back to $upfx + $ctx->{git} or die 'BUG: no {git}'; if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) { - $ALL->base_url // $ALL->base_url($ctx->{env}); - } elsif (my $ibxs = $ctx->{git}->{-ibxs}) { - for my $ibx (@$ibxs) { - if ($ibx->isrch) { - return defined($ibx->{url}) ? - prurl($ctx->{env}, $ibx->{url}) : - "../../../$ibx->{name}/"; - } + if (defined(my $u = $ALL->base_url($ctx->{env}))) { + return wantarray ? ($u) : $u; + } + } + my @ret; + if (my $ibx_names = $ctx->{git}->{ibx_names}) { + my $by_name = $ctx->{www}->{pi_cfg}->{-by_name}; + for my $name (@$ibx_names) { + my $ibx = $by_name->{$name} // do { + warn "inbox `$name' no longer exists\n"; + next; + }; + $ibx->isrch // next; + my $u = defined($ibx->{url}) ? + prurl($ctx->{env}, $ibx->{url}) : $name; + $u .= '/' if substr($u, -1) ne '/'; + push @ret, $u; } - } else { - undef; } + wantarray ? (@ret) : $ret[0]; } sub cmt_finalize { @@ -212,7 +233,7 @@ href="$f.patch">patch)\n parent $P->[0]}; my $zfh = $ctx->zfh; print $zfh <
tree $ctx->{tree_oid}"; + # $REPO/tree/$path already sets {-upfx} + my $upfx = $ctx->{-upfx} //= '../../'; if (defined $pfx) { - my $x = ascii_html($pfx); - $pfx .= '/'; - $$bref .= qq( path: $x\n); + $pfx =~ s!/+\z!!s; + if (my $t = $ctx->{-obj}) { + my $t = ascii_html($t); + $$bref .= <+blob $oid $size bytes $paths->[1] EOM } - @{$ctx->{-paths}} = ($path, $raw_link); bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY $ctx->{git} = $git; - if ($ctx->{env}->{'pi-httpd.async'}) { - ibx_async_cat($ctx, $oid, \&show_blob, $ctx); - } else { # synchronous - $git->cat_async($oid, \&show_blob, $ctx); - $git->cat_async_wait; - } + do_cat_async($ctx, \&show_blob, $oid); } sub show_blob { # git->cat_async callback @@ -505,10 +542,10 @@ sub show_blob { # git->cat_async callback return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]); } - my ($path, $raw_link) = @{delete $ctx->{-paths}}; + my ($path, $raw_more) = @{delete $ctx->{-paths}}; $bin and return html_page($ctx, 200, "path: $x\n); + } } else { $pfx = ''; $$bref .= qq[ (path unknown)\n]; @@ -386,7 +421,7 @@ sub show_tree_result ($$) { if ($m eq 'd') { $n .= '/' } elsif ($m eq 'x') { $n = "$n" } elsif ($m eq 'l') { $n = "$n" } - $$bref .= qq(\n$m\t$sz\t$n); + $$bref .= qq(\n$m\t$sz\t$n); } $$bref .= dbg_log($ctx); $$bref .= < $MAX_SIZE and return html_page($ctx, 200, @@ -450,12 +485,7 @@ sub show_tag ($$) { my ($ctx, $res) = @_; my ($git, $oid) = @$res; $ctx->{git} = $git; - if ($ctx->{env}->{'pi-httpd.async'}) { - ibx_async_cat($ctx, $oid, \&show_tag_result, $ctx); - } else { # synchronous (generic PSGI) - $git->cat_async($oid, \&show_tag_result, $ctx); - $git->cat_async_wait; - } + do_cat_async($ctx, \&show_tag_result, $oid); } # user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg) @@ -470,24 +500,31 @@ sub solve_result { return show_tree($ctx, $res) if $type eq 'tree'; return show_tag($ctx, $res) if $type eq 'tag'; return show_other($ctx, $res) if $type ne 'blob'; - my $path = to_filename($di->{path_b} // $hints->{path_b} // 'blob'); - my $raw_link = "(raw)"; + my $fn = $di->{path_b} // $hints->{path_b}; + my $paths = $ctx->{-paths} //= do { + my $path = to_filename($fn // 'blob'); + my $raw_more = qq[(raw)]; + + # XXX not sure if this is the correct wording + defined($fn) and $raw_more .= +"\nname: ${\ascii_html($fn)} \t # note: path name is non-authoritative"; + [ $path, $raw_more ]; + }; + $ctx->{-q_value_html} //= do { + my $s = defined($fn) ? 'dfn:'.ascii_html($fn).' ' : ''; + $s.'dfpost:'.substr($oid, 0, 7); + }; + if ($size > $MAX_SIZE) { return stream_large_blob($ctx, $res) if defined $ctx->{fn}; return html_page($ctx, 200, < Too big to show, download available -blob $oid $size bytes $raw_link
blob $oid $size bytes (binary)" . - " $raw_link".dbg_log($ctx)); + " $raw_more".dbg_log($ctx)); # TODO: detect + convert to ensure validity utf8::decode($$blob); @@ -524,7 +561,7 @@ sub show_blob { # git->cat_async callback } # using some of the same CSS class names and ids as cgit - my $x = "
blob $oid $size bytes $raw_link" . + my $x = "
blob $oid $size bytes $raw_more" . "
"; # scratchpad in this loop is faster here than `printf $zfh': |