From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 02/10] cgit: use Perl 5.10-isms, optimize, and golf
Date: Tue, 4 Oct 2022 19:12:32 +0000 [thread overview]
Message-ID: <20221004191240.1056304-3-e@80x24.org> (raw)
In-Reply-To: <20221004191240.1056304-1-e@80x24.org>
We can reduce variable assignments in a few places and filter
keys more quickly using the `grep' Perl op rather than relying on
`m// or next' inside a loop. Similar changes to the NNTP and IMAP
(e.g. b700fce60f25038e (nntp: NEWNEWS: speed up filtering, 2020-11-27))
yielded good improvements.
---
lib/PublicInbox/Cgit.pm | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index cc729aa2..a63f8902 100644
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-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>
# wrapper for cgit(1) and git-http-backend(1) for browsing and
@@ -6,7 +6,7 @@
# directive to be set in the public-inbox config file.
package PublicInbox::Cgit;
-use strict;
+use v5.12;
use PublicInbox::GitHTTPBackend;
use PublicInbox::Git;
# not bothering with Exporter for a one-off
@@ -40,10 +40,9 @@ sub locate_cgit ($) {
if (defined($cgit_bin) && $cgit_bin =~ m!\A(.+?)/[^/]+\z!) {
unshift @dirs, $1 if -d $1;
}
- foreach my $d (@dirs) {
- my $f = "$d/cgit.css";
- next unless -f $f;
- $cgit_data = $d;
+ for (@dirs) {
+ next unless -f "$_/cgit.css";
+ $cgit_data = $_;
last;
}
}
@@ -65,17 +64,15 @@ sub new {
# some cgit repos may not be mapped to inboxes, so ensure those exist:
my $code_repos = $pi_cfg->{-code_repos};
- foreach my $k (keys %$pi_cfg) {
- $k =~ /\Acoderepo\.(.+)\.dir\z/ or next;
- my $dir = $pi_cfg->{$k};
- $code_repos->{$1} ||= $pi_cfg->fill_code_repo($1);
+ for my $k (grep(/\Acoderepo\.(?:.+)\.dir\z/, keys %$pi_cfg)) {
+ $k = substr($k, length('coderepo.'), -length('.dir'));
+ $code_repos->{$k} //= $pi_cfg->fill_code_repo($k);
}
while (my ($nick, $repo) = each %$code_repos) {
$self->{"\0$nick"} = $repo;
}
- my $cgit_static = $pi_cfg->{-cgit_static};
- my $static = join('|', map { quotemeta $_ } keys %$cgit_static);
- $self->{static} = qr/\A($static)\z/;
+ my $s = join('|', map { quotemeta } keys %{$pi_cfg->{-cgit_static}});
+ $self->{static} = qr/\A($s)\z/;
$self;
}
@@ -114,7 +111,7 @@ sub call {
my $cgi_env = { PATH_INFO => $path_info };
foreach (@PASS_ENV) {
- defined(my $v = $env->{$_}) or next;
+ my $v = $env->{$_} // next;
$cgi_env->{$_} = $v;
}
$cgi_env->{'HTTPS'} = 'on' if $env->{'psgi.url_scheme'} eq 'https';
next prev parent reply other threads:[~2022-10-04 19:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 19:12 [PATCH 00/10] www_coderepo: git viewer w/ search planned Eric Wong
2022-10-04 19:12 ` [PATCH 01/10] tests: use test_httpd consistently Eric Wong
2022-10-04 19:12 ` Eric Wong [this message]
2022-10-04 19:12 ` [PATCH 03/10] git: hoist out description Eric Wong
2022-10-04 19:12 ` [PATCH 04/10] git: move cloneurl + description reading here Eric Wong
2022-10-04 19:12 ` [PATCH 05/10] www_coderepo: an alternative to cgit Eric Wong
2022-10-04 19:12 ` [PATCH 06/10] www_coderepo: wire up /$CODEREPO/$OID/s/ endpoint Eric Wong
2022-10-04 19:12 ` [PATCH 07/10] git: allow ->local_nick to return undef Eric Wong
2022-10-04 19:12 ` [PATCH 08/10] www_coderepo: wire up snapshot support Eric Wong
2022-10-04 19:12 ` [PATCH 09/10] www_stream: use git->pub_urls for coderepo links Eric Wong
2022-10-04 23:01 ` [PATCH 11/10] www_stream: pass $env to git->pub_urls Eric Wong
2022-10-04 19:12 ` [PATCH 10/10] www_coderepo: start a top nav bar in summary view 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=20221004191240.1056304-3-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).