From: Eric Wong <e@80x24.org>
Date: Wed, 4 Jan 2023 10:34:05 +0000 (+0000)
Subject: www: make coderepo URL generation more consistent
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=0aa46753c3b033aee1b4de5f358c33b912febe07

www: make coderepo URL generation more consistent

WwwStream and WwwText basically show the same thing, except the
latter relies on Linkify to create links.
---

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index f5b4df9f..59edad5d 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -90,24 +90,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 {
diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 224fed5c..c31a7f86 100644
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -250,21 +250,15 @@ sub coderepos_raw ($$) {
 	my ($ctx, $top_url) = @_;
 	my $cr = $ctx->{ibx}->{coderepo} // return ();
 	my $cfg = $ctx->{www}->{pi_cfg};
-	my @ret = ('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\+]+:)?//!i ? $_ :
-					$top_url.$_;
-				$ret[0] .= "\n\t" . prurl($ctx->{env}, $u);
-			}
-		} else {
-			$ret[0] .= qq[\n\t$cr_name.git (no URL configured)];
+	my $buf = 'Code repositories for project(s) associated with this '.
+		$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 ? $_ : $top_url.$_;
+			$buf .= "\n\t" . prurl($ctx->{env}, $u);
 		}
 	}
-	@ret; # may be empty, this sub is called as an arg for join()
+	($buf);
 }
 
 sub _add_non_http_urls ($$) {