* [PATCH 3/3] www: make coderepo URL generation more consistent
2023-01-04 10:34 7% [PATCH 0/3] www: cleanup URL generation around coderepos Eric Wong
@ 2023-01-04 10:34 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2023-01-04 10:34 UTC (permalink / raw)
To: meta
WwwStream and WwwText basically show the same thing, except the
latter relies on Linkify to create links.
---
lib/PublicInbox/WwwStream.pm | 18 ++++++++----------
lib/PublicInbox/WwwText.pm | 20 +++++++-------------
2 files changed, 15 insertions(+), 23 deletions(-)
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 ($$) {
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] www: cleanup URL generation around coderepos
@ 2023-01-04 10:34 7% Eric Wong
2023-01-04 10:34 7% ` [PATCH 3/3] www: make coderepo URL generation more consistent Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2023-01-04 10:34 UTC (permalink / raw)
To: meta
This fixes coderepo URL generation and gives reasonable defaults
based on the project.list nickname. It also accounts properly
for `mount' directives in the PSGI file using
Plack::App::URLMap to give an entire instance a URL prefix
(as I do with yhbt.net/lore)
Eric Wong (3):
git: fix non-empty SCRIPT_NAME handling for PSGI mounts
git: pub_urls shows base_url default
www: make coderepo URL generation more consistent
lib/PublicInbox/Git.pm | 9 +++++----
lib/PublicInbox/WwwStream.pm | 18 ++++++++----------
lib/PublicInbox/WwwText.pm | 20 +++++++-------------
3 files changed, 20 insertions(+), 27 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-01-04 10:34 7% [PATCH 0/3] www: cleanup URL generation around coderepos Eric Wong
2023-01-04 10:34 7% ` [PATCH 3/3] www: make coderepo URL generation more consistent Eric Wong
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).