From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 280A61F47F for ; Wed, 4 Jan 2023 10:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1672828452; bh=8rWi+szpEoGAquYms2Pup3Ck5H5UG+BZ99hld5mvSWo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=DvMrCVS/wUOQLcmsfTqaSxeHepMMEGgef38GSa2fuqm3ZscuUGcRHsJMnQ4VW5hOz x1h7ZD4+njrg8UQZK4mAMAVchrtLYhTWM/7ZhDH7n5i0ZO6No+6iJHzbicFyfsPVO0 0EwpDdMFnu0VnFEIimfw0mRHsBxUJsh7iVKt/Cmw= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/3] www: make coderepo URL generation more consistent Date: Wed, 4 Jan 2023 10:34:05 +0000 Message-Id: <20230104103405.2432349-4-e@80x24.org> In-Reply-To: <20230104103405.2432349-1-e@80x24.org> References: <20230104103405.2432349-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 = ('' . + $pfx .= '/' if substr($pfx, -1, 1) ne '/'; + my $buf = '' . '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$u); + $buf .= qq(\n\t$u); } } - @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 ($$) {