From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 8BDAF1F61A for ; Sat, 20 Aug 2022 08:01:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1660982496; bh=QJVLffqVuRC0TdugUgUmdPmRNnzCQPQlrft0wGbFJy0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=xszeTW02Bv9pIQvKD3Kt3juiHxRR5Fx4qcN9Z+G/QztACKYyzDx+vEu2r2whKtfGA sw3UoazVqsAu7CC6g5nSvIHhy98XeegKjUAuNSLP2aZEBiM4AOoXQC/PkGmS9IgYfG bBD1nYEo29JO66kkBkVLyW6gonUGKIOiZWbgF2D8= From: Eric Wong 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 Message-Id: <20220820080135.58439-5-e@80x24.org> In-Reply-To: <20220820080135.58439-1-e@80x24.org> References: <20220820080135.58439-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 +# Copyright (C) all contributors # License: AGPL-3.0+ # 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 +# Copyright (C) all contributors # License: AGPL-3.0+ # # 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 = ('' . + '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 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'; - <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);