X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2FPublicInbox%2FViewVCS.pm;h=e0fdf63999c20aaf7e3ce58442d1a12b3b3d15f2;hb=16f317f32bd5306d852b7d079b20cd0e4f2b4ff9;hp=7ac719bcaaa8d9e6e147f9c90bb52cdfc405ade1;hpb=d95ddf03cd437d6f5038f2ff21a9ef7efe93b056;p=public-inbox.git diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 7ac719bc..e0fdf639 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).''; @@ -369,10 +370,18 @@ sub show_tree_result ($$) { my @ent = split(/\0/, $$bref); my $qp = delete $ctx->{qp}; my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new; - my $pfx = $qp->{b}; + my $pfx = $ctx->{-path} // $qp->{b}; # {-path} is from RepoTree $$bref = "
tree $ctx->{tree_oid}"; + # $REPO/tree/$path already sets {-upfx} + my $upfx = $ctx->{-upfx} //= '../../'; if (defined $pfx) { - if ($pfx eq '') { + $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'}) { @@ -519,10 +531,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, "$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, @@ -484,16 +493,19 @@ 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 $paths = $ctx->{-paths} //= do { + my $path = to_filename($di->{path_b}//$hints->{path_b}//'blob'); + my $raw_more = qq[(raw)]; + [ $path, $raw_more ]; + }; + 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); @@ -538,7 +550,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': |