From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: Re: [PATCH 2/3] git: pub_urls shows base_url default
Date: Thu, 5 Jan 2023 09:58:41 +0000 [thread overview]
Message-ID: <20230105095841.M468667@dcvr> (raw)
In-Reply-To: <20230104103405.2432349-3-e@80x24.org>
Eric Wong <e@80x24.org> wrote:
> Since we have native coderepo viewing support without cgit,
> configuring coderepo.$FOO.cgitUrl shouldn't be necessary anymore
> and we can infer the public name based on the project nickname
> (or whatever's in the generated project.list)
> ---
> lib/PublicInbox/Git.pm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
> index 68f72052..f6abe185 100644
> --- a/lib/PublicInbox/Git.pm
> +++ b/lib/PublicInbox/Git.pm
> @@ -480,9 +480,10 @@ sub isrch {} # TODO
> sub pub_urls {
> my ($self, $env) = @_;
> if (my $urls = $self->{cgit_url}) {
> - return map { host_prefix_url($env, $_) } @$urls;
> + map { host_prefix_url($env, $_) } @$urls;
> + } else {
> + (base_url($self, $env));
> }
> - (local_nick($self) // '???');
> }
>
> sub cat_async_begin {
Erm, $git->{nick} isn't guaranteed to exist, actually.
Perhaps it should and the code shouldn't have to guard against
it, but there's cases where we need this and I'll squash it in:
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index dff5813f..96627daa 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -485,10 +485,11 @@ sub host_prefix_url ($$) {
sub base_url { # for coderepos, PSGI-only
my ($self, $env) = @_; # env - PSGI env
+ my $nick = $self->{nick} // return undef;
my $url = host_prefix_url($env, '');
# for mount in Plack::Builder
$url .= '/' if substr($url, -1, 1) ne '/';
- $url . $self->{nick} . '/';
+ $url . $nick . '/';
}
sub isrch {} # TODO
@@ -498,7 +499,7 @@ sub pub_urls {
if (my $urls = $self->{cgit_url}) {
map { host_prefix_url($env, $_) } @$urls;
} else {
- (base_url($self, $env));
+ (base_url($self, $env) // '???');
}
}
next prev parent reply other threads:[~2023-01-05 9:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-04 10:34 [PATCH 0/3] www: cleanup URL generation around coderepos Eric Wong
2023-01-04 10:34 ` [PATCH 1/3] git: fix non-empty SCRIPT_NAME handling for PSGI mounts Eric Wong
2023-01-04 10:34 ` [PATCH 2/3] git: pub_urls shows base_url default Eric Wong
2023-01-05 9:58 ` Eric Wong [this message]
2023-01-04 10:34 ` [PATCH 3/3] www: make coderepo URL generation more consistent 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=20230105095841.M468667@dcvr \
--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).