lib/PublicInbox/ViewVCS.pm | 21 ++++++++++++++++----- diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index f740591d1bd1a94d8b26ad05d5503e4169682627..915cf2c5debe9e730ccc7bcd5329bc1bd11aefc9 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -413,11 +413,21 @@
Too big to show, download available blob $oid $size bytes $raw_linkEOM } + @{$ctx->{-paths}} = ($path, $raw_link); + $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; + } +} - my $blob = $git->cat_file($oid); - if (!$blob) { # WTF? +sub show_blob { # git->cat_async callback + my ($blob, $oid, $type, $size, $ctx) = @_; + if (!$blob) { my $e = "Failed to retrieve generated blob ($oid)"; - warn "$e ($git->{git_dir})"; + warn "$e ($ctx->{git}->{git_dir}) type=$type"; return html_page($ctx, 500, "
$e".dbg_log($ctx)) } @@ -428,6 +438,7 @@ push(@$h, ($bin ? 'application/octet-stream' : 'text/plain')); return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]); } + my ($path, $raw_link) = @{delete $ctx->{-paths}}; $bin and return html_page($ctx, 200, "
blob $oid $size bytes (binary)" . " $raw_link".dbg_log($ctx)); @@ -445,14 +456,14 @@ } else { $$blob = ascii_html($$blob); } + # using some of the same CSS class names and ids as cgit my $x = "
blob $oid $size bytes $raw_link" . "
";
+ # scratchpad in this loop is faster here than `printf $zfh':
$x .= sprintf("% ${pad}u\n", $_) for (1..$nl);
$x .= ' | |