Merge remote-tracking branch 'origin/danga-bundle'

[public-inbox.git] / lib / PublicInbox / ViewVCS.pm

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index f6a769427dfae230a1bd9a3261063768852af999..962dc66baccd708ca34666939a6ad306c5ad78a4 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -16,6 +16,7 @@
 package PublicInbox::ViewVCS;
 use strict;
 use warnings;
+use bytes (); # only for bytes::length
 use PublicInbox::SolverGit;
 use PublicInbox::WwwStream;
 use PublicInbox::Linkify;
@@ -61,11 +62,42 @@ sub stream_large_blob ($$$$) {
                                my $ct = 'text/plain; charset=UTF-8';
                                return [200, ['Content-Type', $ct, @cl] ];
                        }
+                       if ($r == 0) {
+                               warn "premature EOF on $oid $$logref\n";
+                               return html_page($ctx, 500, $logref);
+                       }
                        undef; # bref keeps growing
                }
        });
 }
 
+sub show_other ($$$$) {
+       my ($ctx, $res, $logref, $fn) = @_;
+       my ($git, $oid, $type, $size) = @$res;
+       if ($size > $max_size) {
+               $$logref = "$oid is too big to show\n" . $$logref;
+               return html_page($ctx, 200, $logref);
+       }
+       my $cmd = ['git', "--git-dir=$git->{git_dir}",
+               qw(show --encoding=UTF-8 --no-color --no-abbrev), $oid ];
+       my $qsp = PublicInbox::Qspawn->new($cmd);
+       my $env = $ctx->{env};
+       $qsp->psgi_qx($env, undef, sub {
+               my ($bref) = @_;
+               if (my $err = $qsp->{err}) {
+                       utf8::decode($$err);
+                       $$logref .= "git show error: $err";
+                       return html_page($ctx, 500, $logref);
+               }
+               my $l = PublicInbox::Linkify->new;
+               utf8::decode($$bref);
+               $l->linkify_1($$bref);
+               $$bref = '<pre>'. $l->linkify_2(ascii_html($$bref));
+               $$bref .= '</pre><hr>' . $$logref;
+               html_page($ctx, 200, $bref);
+       });
+}
+
 sub solve_result {
        my ($ctx, $res, $log, $hints, $fn) = @_;
 
@@ -85,6 +117,7 @@ sub solve_result {
        $ref eq 'ARRAY' or return html_page($ctx, 500, \$log);
 
        my ($git, $oid, $type, $size, $di) = @$res;
+       return show_other($ctx, $res, \$log, $fn) if $type ne 'blob';
        my $path = to_filename($di->{path_b} || $hints->{path_b} || 'blob');
        my $raw_link = "(<a\nhref=$path>raw</a>)";
        if ($size > $max_size) {
@@ -102,14 +135,14 @@ sub solve_result {
                return html_page($ctx, 500, \$log);
        }
 
-       my $binary = index($$blob, "\0") >= 0;
+       my $bin = index(substr($$blob, 0, $BIN_DETECT), "\0") >= 0;
        if (defined $fn) {
                my $h = [ 'Content-Length', $size, 'Content-Type' ];
-               push(@$h, ($binary ? 'application/octet-stream' : 'text/plain'));
+               push(@$h, ($bin ? 'application/octet-stream' : 'text/plain'));
                return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]);
        }
 
-       if ($binary) {
+       if ($bin) {
                $log = "<pre>$oid $type $size bytes (binary)" .
                        " $raw_link</pre>" . $log;
                return html_page($ctx, 200, \$log);