From 7b20e5135238a2780ac3df3198a02e9fbda4ba18 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 27 Nov 2020 09:52:46 +0000 Subject: nntp: use grep operation for wildmat matching Based on experiences with the IMAP server, this ought to be significantly faster (as to be demonstrated in the next commit). --- lib/PublicInbox/NNTP.pm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'lib/PublicInbox/NNTP.pm') diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm index b641bd23..68222196 100644 --- a/lib/PublicInbox/NNTP.pm +++ b/lib/PublicInbox/NNTP.pm @@ -136,29 +136,29 @@ sub list_headers ($;$) { sub list_active ($;$) { my ($self, $wildmat) = @_; wildmat2re($wildmat); - foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - $ng->{newsgroup} =~ $wildmat or next; - group_line($self, $ng); + my $groups = $self->{nntpd}->{groups}; + for my $ngname (grep(/$wildmat/, @{$self->{nntpd}->{groupnames}})) { + group_line($self, $groups->{$ngname}); } } sub list_active_times ($;$) { my ($self, $wildmat) = @_; wildmat2re($wildmat); - foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - $ng->{newsgroup} =~ $wildmat or next; - my $c = eval { $ng->uidvalidity } // time; - more($self, "$ng->{newsgroup} $c $ng->{-primary_address}"); + my $groups = $self->{nntpd}->{groups}; + for my $ngname (grep(/$wildmat/, @{$self->{nntpd}->{groupnames}})) { + my $ibx = $groups->{$ngname}; + my $c = eval { $ibx->uidvalidity } // time; + more($self, "$ngname $c $ibx->{-primary_address}"); } } sub list_newsgroups ($;$) { my ($self, $wildmat) = @_; wildmat2re($wildmat); - foreach my $ng (@{$self->{nntpd}->{grouplist}}) { - $ng->{newsgroup} =~ $wildmat or next; - my $d = $ng->description; - more($self, "$ng->{newsgroup} $d"); + my $groups = $self->{nntpd}->{groups}; + for my $ngname (grep(/$wildmat/, @{$self->{nntpd}->{groupnames}})) { + more($self, "$ngname ".$groups->{$ngname}->description); } } -- cgit v1.2.3-24-ge0c7