$title

X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=8c40096afbdcc80f126fde73346f64e724a69745;hb=eea4b03f08b40647b7cf6016838d18ae26d98a08;hp=ab006c40509dc336a4c6bfa2a12fa5136a0131fd;hpb=22dd13c407be75d2a5cad178593e78db8735d3bc;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index ab006c40..8c40096a 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -18,7 +18,7 @@ https://public-inbox.org/public-inbox.git) ]; sub base_url ($) { my $ctx = shift; - my $base_url = $ctx->{ibx}->base_url($ctx->{env}); + my $base_url = ($ctx->{ibx} // $ctx->{git})->base_url($ctx->{env}); chop $base_url; # no trailing slash for clone $base_url; } @@ -27,6 +27,9 @@ sub init { my ($ctx, $cb) = @_; $ctx->{cb} = $cb; $ctx->{base_url} = base_url($ctx); + $ctx->{-res_hdr} = [ 'Content-Type' => 'text/html; charset=UTF-8' ]; + $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($ctx->{-res_hdr}, + $ctx->{env}); bless $ctx, __PACKAGE__; } @@ -35,9 +38,60 @@ sub async_eml { # for async_blob_cb $ctx->write($ctx->{cb}->($ctx, $eml)); } +sub html_repo_top ($) { + my ($ctx) = @_; + my $git = $ctx->{git}; + my $desc = ascii_html($git->description); + my $title = delete($ctx->{-title_html}) // $desc; + my $upfx = $ctx->{-upfx} // ''; + my $atom = $ctx->{-atom} // (substr($upfx, -1) eq '/' ? + "${upfx}atom/" : "$upfx/atom/"); + my $top = ascii_html($git->{nick}); + $top = qq($top) if length($upfx); + $top .= <about / heads / tags +$desc +EOM + my @url = PublicInbox::ViewVCS::ibx_url_for($ctx); + if (@url) { + $ctx->{-has_srch} = 1; + my $base_url = base_url($ctx); + my ($pfx, $sfx) = ($base_url =~ m!\A(https?://[^/]+/)(.*)\z!i); + my $iupfx = '../' x (($sfx =~ tr!/!/!) + 1); + $pfx = ascii_html($pfx); + $pfx = qr/\A\Q$pfx\E/i; + my $tmp = $top; + $top = ''; + my ($s, $u, $same_host); + my $q_val = delete($ctx->{-q_value_html}) // ''; + $q_val = qq(\nvalue="$q_val") if $q_val ne ''; + for (@url) { + $u = $s = ascii_html($_); + substr($u, 0, 0, $iupfx) if $u !~ m!://!; + $s =~ s!$pfx!!; + $s =~ s!/\z!!; + $top .= qq{

$tmp} .
+				qq{} .
+				qq{} .
+				q{

}; + $tmp = ''; + } + } else { + $top = "

$top

"; + } + "$title" . + qq() . + $ctx->{www}->style($upfx) . + ''.$top; +} + sub html_top ($) { my ($ctx) = @_; - my $ibx = $ctx->{ibx}; + my $ibx = $ctx->{ibx} // return html_repo_top($ctx); my $desc = ascii_html($ibx->description); my $title = delete($ctx->{-title_html}) // $desc; my $upfx = $ctx->{-upfx} || ''; @@ -81,38 +135,36 @@ sub html_top ($) { ''. $top . (delete($ctx->{-html_tip}) // ''); } +sub inboxes { () } # TODO + sub coderepos ($) { my ($ctx) = @_; + $ctx->{ibx} // return inboxes($ctx); my $cr = $ctx->{ibx}->{coderepo} // return (); - my $cfg = $ctx->{www}->{pi_cfg}; my $upfx = ($ctx->{-upfx} // ''). '../'; my $pfx = $ctx->{base_url} //= $ctx->base_url; my $up = $upfx =~ tr!/!/!; $pfx =~ s!/[^/]+\z!/! for (1..$up); - my @ret = ('' . + $pfx .= '/' if substr($pfx, -1, 1) ne '/'; + my $buf = '' . 'Code repositories for project(s) associated with this '. - $ctx->{ibx}->thing_type . "\n"); - for my $cr_name (@$cr) { - my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl"); - if ($urls) { - for (@$urls) { - my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $pfx.$_; - $u = ascii_html(prurl($ctx->{env}, $u)); - $ret[0] .= qq(\n\t$u); - } - } else { - $ret[0] .= qq[\n\t$cr_name.git (no URL configured)]; + $ctx->{ibx}->thing_type . "\n"; + for my $git (@{$ctx->{www}->{pi_cfg}->repo_objs($ctx->{ibx})}) { + for ($git->pub_urls($ctx->{env})) { + my $u = m!\A(?:[a-z\+]+:)?//!i ? $_ : $pfx.$_; + $u = ascii_html(prurl($ctx->{env}, $u)); + $buf .= qq(\n\t$u); } } - @ret; # may be empty, this sub is called as an arg for join() + ($buf); } sub _html_end { my ($ctx) = @_; my $upfx = $ctx->{-upfx} || ''; my $m = "${upfx}_/text/mirror/"; - my $x; - if ($ctx->{ibx}->can('cloneurl')) { + my $x = ''; + if ($ctx->{ibx} && $ctx->{ibx}->can('cloneurl')) { $x = <mirroring instructions @@ -136,12 +188,15 @@ as well as URLs for IMAP folder(s). EOM } } - } else { + } elsif ($ctx->{ibx}) { # extindex $x = <mirroring instructions on how to clone and mirror all data and code used by this external index. EOF + } elsif ($ctx->{git}) { # coderepo + $x = join('', map { "git clone $_\n" } + @{$ctx->{git}->cloneurl($ctx->{env})}); } chomp $x; '

'.join("\n\n", coderepos($ctx), $x).'

' @@ -164,18 +219,26 @@ sub getline { $ctx->zflush(_html_end($ctx)); } -sub html_oneshot ($$;$) { - my ($ctx, $code, $sref) = @_; +sub html_done ($;@) { + my $ctx = $_[0]; + my $bdy = $ctx->zflush(@_[1..$#_], _html_end($ctx)); + my $res_hdr = delete $ctx->{-res_hdr}; + push @$res_hdr, 'Content-Length', length($bdy); + [ 200, $res_hdr, [ $bdy ] ] +} + +sub html_oneshot ($$;@) { + my ($ctx, $code) = @_[0, 1]; my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8', 'Content-Length' => undef ]; bless $ctx, __PACKAGE__; $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($res_hdr, $ctx->{env}); + my @top; $ctx->{base_url} // do { - $ctx->zmore(html_top($ctx)); + @top = html_top($ctx); $ctx->{base_url} = base_url($ctx); }; - $ctx->zmore($$sref) if $sref; - my $bdy = $ctx->zflush(_html_end($ctx)); + my $bdy = $ctx->zflush(@top, @_[2..$#_], _html_end($ctx)); $res_hdr->[3] = length($bdy); [ $code, $res_hdr, [ $bdy ] ] } @@ -195,10 +258,9 @@ sub async_next ($) { } sub aresponse { - my ($ctx, $code, $cb) = @_; - my $res_hdr = [ 'Content-Type' => 'text/html; charset=UTF-8' ]; + my ($ctx, $cb) = @_; init($ctx, $cb); - $ctx->psgi_response($code, $res_hdr); + $ctx->psgi_response(200, delete $ctx->{-res_hdr}); } sub html_init { @@ -207,7 +269,12 @@ sub html_init { my $h = $ctx->{-res_hdr} = ['Content-Type', 'text/html; charset=UTF-8']; $ctx->{gz} = PublicInbox::GzipFilter::gz_or_noop($h, $ctx->{env}); bless $ctx, __PACKAGE__; - $ctx->zmore(html_top($ctx)); + print { $ctx->zfh } html_top($ctx); +} + +sub DESTROY { + my ($ctx) = @_; + $ctx->{git}->cleanup if $ctx->{git} && $ctx->{git}->{-tmp}; } 1;