# 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
}
sub each_inbox {
- my ($self, $cb, $arg) = @_;
+ 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!;
my $ibx = lookup_name($self, $1) or next;
- $cb->($ibx, $arg);
+ $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));
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 ($$$) {