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 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 E83571F51E for ; Tue, 4 Oct 2022 19:12:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1664910761; bh=Kn7G/iBFEAcGmAaDxH9SH0UkgPcTPhOp/Crf6xxqX8o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=yBdYh/T4Inrxk1LPcRRzATi7RMpFeQqicNKBPXEQXukemPlNvrsNWu2SKtpW55IFC PBuCxWECZWmM/7hewlxluAjXUGMf2knSsQkzndQSP1ftXUm9IvcPkaRUgRYEl0otAk sszv7X2mF1g2hTi+k+WqIt2/tVYwoXMCzCBVRa/8= From: Eric Wong 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 Message-Id: <20221004191240.1056304-3-e@80x24.org> In-Reply-To: <20221004191240.1056304-1-e@80x24.org> References: <20221004191240.1056304-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 +# Copyright (C) all contributors # License: AGPL-3.0+ # 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';