X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=a430cd5ccd2106d886bd7d8feda0b72acb8e7904;hb=2bc26fececd03705c68c1968f95a2d199bafec29;hp=26ac298eddb86f2256c4618d7abef920f7a4b95d;hpb=1d1498c6c5d42733bd63bd109076882c5d6e8a2a;p=public-inbox.git diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 26ac298e..a430cd5c 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # # Used throughout the project for reading configuration @@ -12,23 +12,31 @@ use strict; use v5.10.1; use PublicInbox::Inbox; use PublicInbox::Spawn qw(popen_rd); +our $LD_PRELOAD = $ENV{LD_PRELOAD}; # only valid at startup +our $DEDUPE; # set to {} to dedupe or clear cache sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] } # returns key-value pairs of config directives in a hash # if keys may be multi-value, the value is an array ref containing all values sub new { - my ($class, $file) = @_; + my ($class, $file, $errfh) = @_; $file //= default_file(); my $self; + my $set_dedupe; if (ref($file) eq 'SCALAR') { # used by some tests open my $fh, '<', $file or die; # PerlIO::scalar $self = config_fh_parse($fh, "\n", '='); + bless $self, $class; } else { - $self = git_config_dump($file); + if (-f $file && $DEDUPE) { + $file = rel2abs_collapsed($file); + $self = $DEDUPE->{$file} and return $self; + $set_dedupe = 1; + } + $self = git_config_dump($class, $file, $errfh); $self->{'-f'} = $file; } - bless $self, $class; # caches $self->{-by_addr} = {}; $self->{-by_list_id} = {}; @@ -38,7 +46,6 @@ sub new { $self->{-no_obfuscate} = {}; $self->{-limiters} = {}; $self->{-code_repos} = {}; # nick => PublicInbox::Git object - $self->{-cgitrc_unparsed} = $self->{'publicinbox.cgitrc'}; if (my $no = delete $self->{'publicinbox.noobfuscate'}) { $no = _array($no); @@ -61,7 +68,7 @@ sub new { if (my $css = delete $self->{'publicinbox.css'}) { $self->{css} = _array($css); } - + $DEDUPE->{$file} = $self if $set_dedupe; $self; } @@ -96,6 +103,11 @@ sub lookup_ei { $self->{-ei_by_name}->{$name} //= _fill_ei($self, $name); } +sub lookup_eidx_key { + my ($self, $eidx_key) = @_; + _lookup_fill($self, '-by_eidx_key', $eidx_key); +} + # special case for [extindex "all"] sub ALL { lookup_ei($_[0], 'all') } @@ -158,13 +170,13 @@ sub config_fh_parse ($$$) { } sub git_config_dump { - my ($file) = @_; - return {} unless -e $file; + my ($class, $file, $errfh) = @_; + return bless {}, $class unless -e $file; my $cmd = [ qw(git config -z -l --includes), "--file=$file" ]; - my $fh = popen_rd($cmd); + my $fh = popen_rd($cmd, undef, { 2 => $errfh // 2 }); my $rv = config_fh_parse($fh, "\0", "\n"); - close $fh or die "failed to close (@$cmd) pipe: $?"; - $rv; + close $fh or die "@$cmd failed: \$?=$?\n"; + bless $rv, $class; } sub valid_foo_name ($;$) { @@ -264,6 +276,7 @@ sub scan_projects_coderepo ($$$) { sub parse_cgitrc { my ($self, $cgitrc, $nesting) = @_; + $cgitrc //= $self->{'publicinbox.cgitrc'}; if ($nesting == 0) { # defaults: my %s = map { $_ => 1 } qw(/cgit.css /cgit.png @@ -312,42 +325,27 @@ sub parse_cgitrc { } elsif (m!\A(?:css|favicon|logo|repo\.logo)=(/.+)\z!) { # absolute paths for static files via PublicInbox::Cgit $self->{-cgit_static}->{$1} = 1; + } elsif (s!\Asnapshots=\s*!!) { + $self->{'coderepo.snapshots'} = $_; } } cgit_repo_merge($self, $repo->{dir}, $repo) if $repo; } -# parse a code repo -# Only git is supported at the moment, but SVN and Hg are possibilities -sub _fill_code_repo { +# parse a code repo, only git is supported at the moment +sub fill_code_repo { my ($self, $nick) = @_; my $pfx = "coderepo.$nick"; - - my $dir = $self->{"$pfx.dir"}; # aka "GIT_DIR" - unless (defined $dir) { + my $dir = $self->{"$pfx.dir"} // do { # aka "GIT_DIR" warn "$pfx.dir unset\n"; return; - } - + }; my $git = PublicInbox::Git->new($dir); - foreach my $t (qw(blob commit tree tag)) { - $git->{$t.'_url_format'} = - _array($self->{lc("$pfx.${t}UrlFormat")}); - } - if (defined(my $cgits = $self->{"$pfx.cgiturl"})) { $git->{cgit_url} = $cgits = _array($cgits); $self->{"$pfx.cgiturl"} = $cgits; - - # cgit supports "/blob/?id=%s", but it's only a plain-text - # display and requires an unabbreviated id= - foreach my $t (qw(blob commit tag)) { - $git->{$t.'_url_format'} //= map { - "$_/$t/?id=%s" - } @$cgits; - } } - + $git->{nick} = $nick; $git; } @@ -378,18 +376,18 @@ sub rel2abs_collapsed { Cwd::abs_path($p); } -sub _one_val { - my ($self, $pfx, $k) = @_; - my $v = $self->{"$pfx.$k"} // return; +sub get_1 { + my ($self, $key) = @_; + my $v = $self->{$key}; return $v if !ref($v); - warn "W: $pfx.$k has multiple values, only using `$v->[-1]'\n"; + warn "W: $key has multiple values, only using `$v->[-1]'\n"; $v->[-1]; } sub repo_objs { my ($self, $ibxish) = @_; - my $ibx_code_repos = $ibxish->{coderepo} or return; - $ibxish->{-repo_objs} //= do { + my $ibx_code_repos = $ibxish->{coderepo} // return; + $ibxish->{-repo_objs} // do { my $code_repos = $self->{-code_repos}; my @repo_objs; for my $nick (@$ibx_code_repos) { @@ -402,14 +400,13 @@ sub repo_objs { next; } my $repo = $code_repos->{$nick} //= - _fill_code_repo($self, $nick); + fill_code_repo($self, $nick); push @repo_objs, $repo if $repo; } if (scalar @repo_objs) { - \@repo_objs; + $ibxish->{-repo_objs} = \@repo_objs; } else { delete $ibxish->{coderepo}; - undef; } } } @@ -418,13 +415,13 @@ sub _fill_ibx { my ($self, $name) = @_; my $pfx = "publicinbox.$name"; my $ibx = {}; - for my $k (qw(watch nntpserver)) { + for my $k (qw(watch)) { my $v = $self->{"$pfx.$k"}; $ibx->{$k} = $v if defined $v; } for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax - indexlevel indexsequentialshard)) { - my $v = _one_val($self, $pfx, $k) // next; + indexlevel indexsequentialshard boost)) { + my $v = get_1($self, "$pfx.$k") // next; $ibx->{$k} = $v; } @@ -444,8 +441,10 @@ sub _fill_ibx { } # TODO: more arrays, we should support multi-value for # more things to encourage decentralization - for my $k (qw(address altid nntpmirror coderepo hide listid url - infourl watchheader)) { + for my $k (qw(address altid nntpmirror imapmirror + coderepo hide listid url + infourl watchheader + nntpserver imapserver pop3server)) { my $v = $self->{"$pfx.$k"} // next; $ibx->{$k} = _array($v); } @@ -516,10 +515,10 @@ sub _fill_ei ($$) { } my $es = PublicInbox::ExtSearch->new($d); for my $k (qw(indexlevel indexsequentialshard)) { - my $v = _one_val($self, $pfx, $k) // next; + my $v = get_1($self, "$pfx.$k") // next; $es->{$k} = $v; } - for my $k (qw(altid coderepo hide url infourl)) { + for my $k (qw(coderepo hide url infourl)) { my $v = $self->{"$pfx.$k"} // next; $es->{$k} = _array($v); } @@ -559,4 +558,13 @@ sub json { }; } +sub squote_maybe ($) { + my ($val) = @_; + if ($val =~ m{([^\w@\./,\%\+\-])}) { + $val =~ s/(['!])/'\\$1'/g; # '!' for csh + return "'$val'"; + } + $val; +} + 1;