user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] www: use absolute URLs for coderepo URLs
Date: Sat, 20 Aug 2022 08:01:34 +0000	[thread overview]
Message-ID: <20220820080135.58439-5-e@80x24.org> (raw)
In-Reply-To: <20220820080135.58439-1-e@80x24.org>

Showing "../../foo.git" looks awkward and isn't conducive to
users who want to "git clone" a URL.
---
 lib/PublicInbox/ExtSearch.pm |  4 +++-
 lib/PublicInbox/Inbox.pm     |  2 ++
 lib/PublicInbox/WwwStream.pm | 16 ++++++++--------
 lib/PublicInbox/WwwText.pm   | 12 ++----------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/lib/PublicInbox/ExtSearch.pm b/lib/PublicInbox/ExtSearch.pm
index 2460d74f..3eb864a2 100644
--- a/lib/PublicInbox/ExtSearch.pm
+++ b/lib/PublicInbox/ExtSearch.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Read-only external (detached) index for cross inbox search.
@@ -117,6 +117,8 @@ sub search {
 	$_[0];
 }
 
+sub thing_type { 'external index' }
+
 no warnings 'once';
 *base_url = \&PublicInbox::Inbox::base_url;
 *smsg_eml = \&PublicInbox::Inbox::smsg_eml;
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 1f7f982d..acd7f338 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -431,4 +431,6 @@ sub mailboxid { # rfc 8474, 8620, 8621
 		sprintf('-%x', uidvalidity($self) // 0)
 }
 
+sub thing_type { 'public inbox' }
+
 1;
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index aee78170..0416db0b 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # HTML body stream for which yields getline+close methods for
@@ -86,17 +86,17 @@ sub coderepos ($) {
 	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 = ('<a id=code>' .
+		'Code repositories for project(s) associated with this '.
+		$ctx->{ibx}->thing_type . "\n");
 	for my $cr_name (@$cr) {
-		$ret[0] //= <<EOF;
-<a id=code>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<a\nhref="$u">$u</a>);
 			}
diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 581a19f3..c6957e81 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';
-			<<EOF;
-Code repositories for project(s) associated with this $thing
-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\+]+:)?//!i ? $_ :
 					$top_url.$_;
 				$ret[0] .= "\n\t" . prurl($ctx->{env}, $u);

  parent reply	other threads:[~2022-08-20  8:01 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-20  8:01 [PATCH 0/5] various minor annoyance fixups Eric Wong
2022-08-20  8:01 ` [PATCH 1/5] import: take advantage of some Perl 5.10.x features Eric Wong
2022-08-20  8:01 ` [PATCH 2/5] imap: remove some intermediate arrays Eric Wong
2022-08-20  8:01 ` [PATCH 3/5] view: do not show pagination footer for small inboxes Eric Wong
2022-08-20  8:01 ` Eric Wong [this message]
2022-08-20  8:01 ` [PATCH 5/5] www: mbox* drop unneeded {base_url} memoizations Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220820080135.58439-5-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).