sub refresh_groups {
my ($self, $sig) = @_;
my $pi_config = $sig ? PublicInbox::Config->new : $self->{pi_config};
- my $new = {};
- my @list;
+ my $groups = $pi_config->{-by_newsgroup}; # filled during each_inbox
$pi_config->each_inbox(sub {
- my ($ng) = @_;
- my $ngname = $ng->{newsgroup} or return;
+ my ($ibx) = @_;
+ my $ngname = $ibx->{newsgroup} or return;
if (ref $ngname) {
warn 'multiple newsgroups not supported: '.
join(', ', @$ngname). "\n";
# '|', '<', '>', ';', '#', '$', '&',
} elsif ($ngname =~ m![^A-Za-z0-9/_\.\-\~\@\+\=:]!) {
warn "newsgroup name invalid: `$ngname'\n";
- } elsif ($ng->nntp_usable) {
+ delete $groups->{$ngname};
+ } elsif ($ibx->nntp_usable) {
# Only valid if msgmap and search works
- $new->{$ngname} = $ng;
- push @list, $ng;
# preload to avoid fragmentation:
- $ng->description;
- $ng->base_url;
+ $ibx->description;
+ $ibx->base_url;
+ } else {
+ delete $groups->{$ngname};
}
});
- @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
- $self->{grouplist} = \@list;
+ $self->{grouplist} = [ map { $groups->{$_} } sort(keys %$groups) ];
$self->{pi_config} = $pi_config;
# this will destroy old groups that got deleted
- %{$self->{groups}} = %$new;
+ $self->{groups} = $groups;
}
sub idler_start {