- foreach my $k (keys %$pi_config) {
- $k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
- my $g = $1;
- my $git_dir = $pi_config->{$k};
- my $addr = $pi_config->{"publicinbox.$g.address"};
- my $ngname = $pi_config->{"publicinbox.$g.newsgroup"};
- my $url = $pi_config->{"publicinbox.$g.url"};
- if (defined $ngname) {
- next if ($ngname eq ''); # disabled
- $g = $ngname;
- }
- my $ng = PublicInbox::NewsGroup->new($g, $git_dir, $addr, $url);
- my $old_ng = $self->{groups}->{$g};
-
- # Reuse the old one if possible since it can hold
- # references to valid mm and gcf objects
- if ($old_ng) {
- $old_ng->update($ng);
- $ng = $old_ng;
- }
-
- # Only valid if msgmap and search works
- if ($ng->usable) {
- $new->{$g} = $ng;
+ $pi_config->each_inbox(sub {
+ my ($ng) = @_;
+ my $ngname = $ng->{newsgroup} or return;
+ if (ref $ngname) {
+ warn 'multiple newsgroups not supported: '.
+ join(', ', @$ngname). "\n";
+ } elsif ($ng->nntp_usable) {
+ # Only valid if msgmap and search works
+ $new->{$ngname} = $ng;