lib/PublicInbox/ExtSearch.pm | 4 +++- lib/PublicInbox/Inbox.pm | 2 ++ lib/PublicInbox/WwwStream.pm | 16 ++++++++-------- lib/PublicInbox/WwwText.pm | 12 ++---------- diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm index 2460d74f5bdbda074be7cdea059c4025993b43ab..3eb864a2074e5ac8686091908df60a571db371f2 100644 --- a/lib/PublicInbox/ExtSearch.pm +++ b/lib/PublicInbox/ExtSearch.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # Read-only external (detached) index for cross inbox search. @@ -116,6 +116,8 @@ sub search { PublicInbox::Inbox::_cleanup_later($_[0]); $_[0]; } + +sub thing_type { 'external index' } no warnings 'once'; *base_url = \&PublicInbox::Inbox::base_url; diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 1f7f982da783fee8e847e98294828ace331832ab..acd7f33843a7654b6895f70bfbd1ea9bdd441dea 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -431,4 +431,6 @@ (defined($imap_slice) ? sprintf('-%x', $imap_slice) : '') . sprintf('-%x', uidvalidity($self) // 0) } +sub thing_type { 'public inbox' } + 1; diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index aee78170c713df91ea1186264080fb32a7e2dbfa..0416db0b474200dc9f534d4797276159d0e15a80 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # # HTML body stream for which yields getline+close methods for @@ -86,17 +86,17 @@ my ($ctx) = @_; my $cr = $ctx->{ibx}->{coderepo} // return (); my $cfg = $ctx->{www}->{pi_cfg}; my $upfx = ($ctx->{-upfx} // ''). '../'; - my @ret; + my $pfx = $ctx->{base_url} //= $ctx->base_url; + my $up = $upfx =~ tr!/!/!; + $pfx =~ s!/[^/]+\z!/! for (1..$up); + my @ret = ('' . + 'Code repositories for project(s) associated with this '. + $ctx->{ibx}->thing_type . "\n"); 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.$_; + my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $pfx.$_; $u = ascii_html(prurl($ctx->{env}, $u)); $ret[0] .= qq(\n\t$u); } diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm index 581a19f34c4d9f0787e8716476d616362fc86f01..c6957e813229c01c5c217f5a0c65bb0025afe8f0 100644 --- a/lib/PublicInbox/WwwText.pm +++ b/lib/PublicInbox/WwwText.pm @@ -246,20 +246,12 @@ sub coderepos_raw ($$) { my ($ctx, $top_url) = @_; my $cr = $ctx->{ibx}->{coderepo} // return (); my $cfg = $ctx->{www}->{pi_cfg}; - my @ret; + my @ret = ('Code repositories for project(s) associated with this '. + $ctx->{ibx}->thing_type . "\n"); for my $cr_name (@$cr) { - $ret[0] //= do { - my $thing = $ctx->{ibx}->can('cloneurl') ? - 'public inbox' : 'external index'; - <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\+]+:)?//!i ? $_ : $top_url.$_; $ret[0] .= "\n\t" . prurl($ctx->{env}, $u);