X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=ae9ad8deef9e910bd89c35388278522b388e47aa;hb=08338456f0770a64abb04a8648a77b3742a06b6a;hp=2da202f99f6dd2e45729cb1a8dcca702d572c726;hpb=3c39f9c942a6975245fda878e9b957d8d3367662;p=public-inbox.git diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 2da202f9..ae9ad8de 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2019 all contributors +# Copyright (C) 2014-2020 all contributors # License: AGPL-3.0+ # # Used throughout the project for reading configuration @@ -9,8 +9,8 @@ package PublicInbox::Config; use strict; -use warnings; -require PublicInbox::Inbox; +use v5.10.1; +use PublicInbox::Inbox; use PublicInbox::Spawn qw(popen_rd); sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] } @@ -19,7 +19,7 @@ sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] } # if keys may be multi-value, the value is an array ref containing all values sub new { my ($class, $file) = @_; - $file = default_file() unless defined($file); + $file //= default_file(); my $self; if (ref($file) eq 'SCALAR') { # used by some tests open my $fh, '<', $file or die; # PerlIO::scalar @@ -63,12 +63,13 @@ sub new { $self; } -sub _fill_all ($) { each_inbox($_[0], sub {}) } +sub noop {} +sub fill_all ($) { each_inbox($_[0], \&noop) } sub _lookup_fill ($$$) { my ($self, $cache, $key) = @_; $self->{$cache}->{$key} // do { - _fill_all($self); + fill_all($self); $self->{$cache}->{$key}; } } @@ -89,16 +90,33 @@ sub lookup_name ($$) { } sub each_inbox { - my ($self, $cb) = @_; + my ($self, $cb, $arg) = @_; # may auto-vivify if config file is non-existent: foreach my $section (@{$self->{-section_order}}) { next if $section !~ m!\Apublicinbox\.([^/]+)\z!; - defined($self->{"publicinbox.$1.inboxdir"}) or next; my $ibx = lookup_name($self, $1) or next; - $cb->($ibx); + $cb->($ibx, $arg); } } +sub iterate_start { + my ($self, $cb, $arg) = @_; + my $i = 0; + $self->{-iter} = [ \$i, $cb, $arg ]; +} + +# for PublicInbox::DS::next_tick, we only call this is if +# PublicInbox::DS is already loaded +sub event_step { + my ($self) = @_; + my ($i, $cb, $arg) = @{$self->{-iter}}; + my $section = $self->{-section_order}->[$$i++]; + delete($self->{-iter}) unless defined($section); + eval { $cb->($self, $section, $arg) }; + warn "E: $@ in ${self}::event_step" if $@; + PublicInbox::DS::requeue($self) if defined($section); +} + sub lookup_newsgroup { my ($self, $ng) = @_; _lookup_fill($self, '-by_newsgroup', lc($ng)); @@ -118,9 +136,7 @@ sub limiter { sub config_dir { $ENV{PI_DIR} // "$ENV{HOME}/.public-inbox" } sub default_file { - my $f = $ENV{PI_CONFIG}; - return $f if defined $f; - config_dir() . '/config'; + $ENV{PI_CONFIG} // (config_dir() . '/config'); } sub config_fh_parse ($$$) { @@ -156,9 +172,9 @@ sub config_fh_parse ($$$) { sub git_config_dump { my ($file) = @_; return {} unless -e $file; - my @cmd = (qw/git config -z -l/, "--file=$file"); + my @cmd = (qw/git config -z -l --includes/, "--file=$file"); my $cmd = join(' ', @cmd); - my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n"; + my $fh = popen_rd(\@cmd); my $rv = config_fh_parse($fh, "\0", "\n"); close $fh or die "failed to close ($cmd) pipe: $?"; $rv; @@ -190,6 +206,9 @@ sub cgit_repo_merge ($$$) { return unless -e "$path/$se"; } return if -e "$path/noweb"; + # this comes from the cgit config, and AFAIK cgit only allows + # repos to have one URL, but that's just the PATH_INFO component, + # not the Host: portion # $repo = { url => 'foo.git', dir => '/path/to/foo.git' } my $rel = $repo->{url}; unless (defined $rel) { @@ -207,7 +226,7 @@ sub cgit_repo_merge ($$$) { $rel =~ s!/?\.git\z!!; } $self->{"coderepo.$rel.dir"} //= $path; - $self->{"coderepo.$rel.cgiturl"} //= $rel; + $self->{"coderepo.$rel.cgiturl"} //= _array($rel); } sub is_git_dir ($) { @@ -249,7 +268,7 @@ sub scan_projects_coderepo ($$$) { warn "failed to open cgit projectlist=$list: $!\n"; return; }; - foreach (<$fh>) { + while (<$fh>) { chomp; scan_path_coderepo($self, $path, "$path/$_"); } @@ -274,7 +293,7 @@ sub parse_cgitrc { # FIXME: this doesn't support macro expansion via $VARS, yet my $repo; - foreach (<$fh>) { + while (<$fh>) { chomp; if (m!\Arepo\.url=(.+?)/*\z!) { my $nick = $1; @@ -332,8 +351,9 @@ sub _fill_code_repo { _array($self->{lc("$pfx.${t}UrlFormat")}); } - if (my $cgits = $self->{lc("$pfx.cgitUrl")}) { + 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= @@ -347,8 +367,8 @@ sub _fill_code_repo { $git; } -sub _git_config_bool ($) { - my ($val) = @_; +sub git_bool { + my ($val) = $_[-1]; # $_[0] may be $self, or $val if ($val =~ /\A(?:false|no|off|[\-\+]?(?:0x)?0+)\z/i) { 0; } elsif ($val =~ /\A(?:true|yes|on|[\-\+]?(?:0x)?[0-9]+)\z/i) { @@ -362,20 +382,24 @@ sub _fill { my ($self, $pfx) = @_; my $ibx = {}; - foreach my $k (qw(inboxdir filter url newsgroup - infourl watch watchheader httpbackendmax - replyto feedmax nntpserver indexlevel)) { + foreach my $k (qw(inboxdir filter newsgroup + watch httpbackendmax + replyto feedmax nntpserver + indexlevel indexsequentialshard)) { my $v = $self->{"$pfx.$k"}; $ibx->{$k} = $v if defined $v; } # backwards compatibility: $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"}; - + if (($ibx->{inboxdir} // '') =~ /\n/s) { + warn "E: `$ibx->{inboxdir}' must not contain `\\n'\n"; + return; + } foreach my $k (qw(obfuscate)) { my $v = $self->{"$pfx.$k"}; defined $v or next; - if (defined(my $bval = _git_config_bool($v))) { + if (defined(my $bval = git_bool($v))) { $ibx->{$k} = $bval; } else { warn "Ignoring $pfx.$k=$v in config, not boolean\n"; @@ -383,13 +407,14 @@ sub _fill { } # TODO: more arrays, we should support multi-value for # more things to encourage decentralization - foreach my $k (qw(address altid nntpmirror coderepo hide listid)) { + foreach my $k (qw(address altid nntpmirror coderepo hide listid url + infourl watchheader)) { if (defined(my $v = $self->{"$pfx.$k"})) { $ibx->{$k} = _array($v); } } - return unless $ibx->{inboxdir}; + return unless defined($ibx->{inboxdir}); my $name = $pfx; $name =~ s/\Apublicinbox\.//; @@ -418,7 +443,7 @@ sub _fill { if ($ibx->{obfuscate}) { $ibx->{-no_obfuscate} = $self->{-no_obfuscate}; $ibx->{-no_obfuscate_re} = $self->{-no_obfuscate_re}; - _fill_all($self); # noop to populate -no_obfuscate + fill_all($self); # noop to populate -no_obfuscate } if (my $ibx_code_repos = $ibx->{coderepo}) { @@ -439,4 +464,23 @@ sub _fill { $ibx } +sub urlmatch { + my ($self, $key, $url) = @_; + state $urlmatch_broken; # requires git 1.8.5 + return if $urlmatch_broken; + my $file = default_file(); + my $cmd = [qw/git config -z --includes --get-urlmatch/, + "--file=$file", $key, $url ]; + my $fh = popen_rd($cmd); + local $/ = "\0"; + my $val = <$fh>; + if (close($fh)) { + chomp($val); + $val; + } else { + $urlmatch_broken = 1 if (($? >> 8) != 1); + undef; + } +} + 1;