diff options
Diffstat (limited to 'lib/PublicInbox/WwwStream.pm')
-rw-r--r-- | lib/PublicInbox/WwwStream.pm | 81 |
1 files changed, 66 insertions, 15 deletions
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index f5b4df9f..8d32074f 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -17,8 +17,9 @@ http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/public-inb https://public-inbox.org/public-inbox.git) ]; sub base_url ($) { - my $ctx = shift; - my $base_url = ($ctx->{ibx} // $ctx->{git})->base_url($ctx->{env}); + my ($ctx) = @_; + my $thing = $ctx->{ibx} // $ctx->{git} // return; + my $base_url = $thing->base_url($ctx->{env}); chop $base_url; # no trailing slash for clone $base_url; } @@ -38,9 +39,60 @@ sub async_eml { # for async_blob_cb $ctx->write($ctx->{cb}->($ctx, $eml)); } +sub html_repo_top ($) { + my ($ctx) = @_; + my $git = $ctx->{git} // return $ctx->html_top_fallback; + 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(<a\nhref="$upfx">$top</a>) if length($upfx); + $top .= <<EOM; + <a href='$upfx#readme'>about</a> / <a +href='$upfx#heads'>heads</a> / <a +href='$upfx#tags'>tags</a> +<b>$desc</b> +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); + 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{<form\naction="$u"><pre>$tmp} . + qq{<input\nname=q type=text$q_val />} . + qq{<input type=submit\n} . + qq{value="search mail in `$s'"/>} . + q{</pre></form>}; + $tmp = ''; + } + } else { + $top = "<pre>$top</pre>"; + } + "<html><head><title>$title</title>" . + qq(<link\nrel=alternate\ntitle="Atom feed"\n). + qq(href="$atom"\ntype="application/atom+xml"/>) . + $ctx->{www}->style($upfx) . + '</head><body>'.$top; +} + sub html_top ($) { my ($ctx) = @_; - my $ibx = $ctx->{ibx} // $ctx->{git}; + 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} || ''; @@ -62,6 +114,7 @@ sub html_top ($) { qq(<a\nid=mirror) . qq(\nhref="${upfx}_/text/mirror/">mirror</a>$code / ). qq(<a\nhref="$atom">Atom feed</a>); + $links .= delete($ctx->{-html_more_links}) if $ctx->{-html_more_links}; if ($ibx->isrch) { my $q_val = delete($ctx->{-q_value_html}) // ''; $q_val = qq(\nvalue="$q_val") if $q_val ne ''; @@ -90,24 +143,22 @@ 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 = ('<a id=code>' . + $pfx .= '/' if substr($pfx, -1, 1) ne '/'; + my $buf = '<a id=code>' . 'Code repositories for project(s) associated with this '. - $ctx->{ibx}->thing_type . "\n"); - my $objs = $cfg->repo_objs($ctx->{ibx}); - for my $git (@$objs) { - my @urls = $git->pub_urls($ctx->{env}); - for (@urls) { - my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $pfx.$_; + $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)); - $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>); + $buf .= qq(\n\t<a\nhref="$u">$u</a>); } } - @ret; # may be empty, this sub is called as an arg for join() + ($buf); } sub _html_end { @@ -215,11 +266,11 @@ sub aresponse { } sub html_init { - my ($ctx) = @_; + my $ctx = $_[-1]; $ctx->{base_url} = base_url($ctx); 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__; + bless $ctx, @_ > 1 ? $_[0] : __PACKAGE__; print { $ctx->zfh } html_top($ctx); } |