X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=adcb5fe24314305c436e07048983c6dbaf8d9401;hb=5c8909925072804901e9c3b45bbf25446d379e7b;hp=e27da8c2ed0f0b6bf359ac10760857032b6ebab3;hpb=4e60d74e6cab0a134c0c62785c766b5fa02ac360;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index e27da8c2..adcb5fe2 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2020 all contributors +# Copyright (C) 2016-2021 all contributors # License: AGPL-3.0+ # # HTML body stream for which yields getline+close methods for @@ -7,16 +7,17 @@ # See PublicInbox::GzipFilter parent class for more info. package PublicInbox::WwwStream; use strict; +use v5.10.1; use parent qw(Exporter PublicInbox::GzipFilter); our @EXPORT_OK = qw(html_oneshot); -use bytes (); # length use PublicInbox::Hval qw(ascii_html prurl ts2str); our $TOR_URL = 'https://www.torproject.org/'; -our $CODE_URL = 'https://public-inbox.org/public-inbox.git'; +our $CODE_URL = [ qw(http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/public-inbox.git + https://public-inbox.org/public-inbox.git) ]; sub base_url ($) { my $ctx = shift; - my $base_url = $ctx->{-inbox}->base_url($ctx->{env}); + my $base_url = $ctx->{ibx}->base_url($ctx->{env}); chop $base_url; # no trailing slash for clone $base_url; } @@ -35,12 +36,12 @@ sub async_eml { # for async_blob_cb sub html_top ($) { my ($ctx) = @_; - my $ibx = $ctx->{-inbox}; + my $ibx = $ctx->{ibx}; my $desc = ascii_html($ibx->description); my $title = delete($ctx->{-title_html}) // $desc; my $upfx = $ctx->{-upfx} || ''; - my $help = $upfx.'_/text/help'; - my $color = $upfx.'_/text/color'; + my $help = $upfx.'_/text/help/'; + my $color = $upfx.'_/text/color/'; my $atom = $ctx->{-atom} || $upfx.'new.atom'; my $top = "$desc"; if (my $t_max = $ctx->{-t_max}) { @@ -50,11 +51,12 @@ sub html_top ($) { } elsif ($ctx->{qp}->{t}) { $top = qq($top); } + my $code = $ibx->{coderepo} ? qq( / code) : ''; my $links = qq(help / ). qq(color / ). - qq(mirror / ). + qq(mirror$code / ). qq(Atom feed); - if ($ibx->search) { + if ($ibx->isrch) { my $q_val = delete($ctx->{-q_value_html}) // ''; $q_val = qq(\nvalue="$q_val") if $q_val ne ''; # XXX gross, for SearchView.pm @@ -76,6 +78,32 @@ sub html_top ($) { ''. $top . (delete($ctx->{-html_tip}) // ''); } +sub coderepos ($) { + my ($ctx) = @_; + my $cr = $ctx->{ibx}->{coderepo} // return (); + my $cfg = $ctx->{www}->{pi_cfg}; + my $upfx = ($ctx->{-upfx} // ''). '../'; + my @ret; + for my $cr_name (@$cr) { + $ret[0] //= <code repositories for project(s) associated with this inbox: +EOF + my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl"); + if ($urls) { + for (@$urls) { + # relative or absolute URL?, prefix relative + # "foo.git" with appropriate number of "../" + my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_; + $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)]; + } + } + @ret; # may be empty, this sub is called as an arg for join() +} + sub code_footer ($) { my ($env) = @_; my $u = prurl($env, $CODE_URL); @@ -89,7 +117,7 @@ sub _html_end { id=mirror>This inbox may be cloned and mirrored by anyone: EOF - my $ibx = $ctx->{-inbox}; + my $ibx = $ctx->{ibx}; my $desc = ascii_html($ibx->description); my @urls; @@ -122,23 +150,19 @@ EOF push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; } - $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls); - if (defined $max) { - my $addrs = $ibx->{address}; + $urls .= "\n" . join('', map { "\tgit clone --mirror $_\n" } @urls); + if (my $addrs = $ibx->{address}) { $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY'; - $urls .= <{name} $dir/ $http \\ + public-inbox-init $v $ibx->{name} $dir/ $http \\ $addrs public-inbox-index $dir EOF - } else { # v1 - $urls .= "\n"; } - my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw'; $urls .= <

'.join("\n\n",
 		$desc,
 		$urls,
+		coderepos($ctx),
 		code_footer($ctx->{env})
 	).'

'; } @@ -168,7 +193,7 @@ sub getline { my $cb = $ctx->{cb} or return; while (defined(my $x = $cb->($ctx))) { # x = smsg or scalar non-ref if (ref($x)) { # smsg - my $eml = $ctx->{-inbox}->smsg_eml($x) or next; + my $eml = $ctx->{ibx}->smsg_eml($x) or next; $ctx->{smsg} = $x; return $ctx->translate($cb->($ctx, $eml)); } else { # scalar @@ -191,7 +216,7 @@ sub html_oneshot ($$;$) { }; $ctx->zmore($$sref) if $sref; my $bdy = $ctx->zflush(_html_end($ctx)); - $res_hdr->[3] = bytes::length($bdy); + $res_hdr->[3] = length($bdy); [ $code, $res_hdr, [ $bdy ] ] }