nntp: speed up XHDR for the Message-ID case

[public-inbox.git] / lib / PublicInbox / NNTP.pm

diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index 7a735735ca5c6e60f44b70b8c20e43945ab4b7bc..47b03e025269ef4d53fcf331ad495eba22d6f517 100644 (file)
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -434,7 +434,7 @@ sub cmd_help ($) {
        '.'
 }
 
-sub get_range ($;$) {
+sub get_range ($$) {
        my ($self, $range) = @_;
        my $ng = $self->{ng} or return '412 no news group has been selected';
        defined $range or return '420 No article(s) selected';
@@ -505,14 +505,46 @@ sub long_response ($$$$) {
        undef;
 }
 
+sub xhdr_message_id ($$) { # optimize XHDR Message-ID [range] for slrnpull.
+       my ($self, $range) = @_;
+
+       my $mm = $self->{ng}->mm;
+       if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
+               my $n = $mm->num_for($range);
+               more($self, '221 Header follows');
+               more($self, "<$range> <$range>") if defined $n;
+               '.';
+       } else { # numeric range
+               $range = $self->{article} unless defined $range;
+               my $r = get_range($self, $range);
+               return $r unless ref $r;
+               my ($beg, $end) = @$r;
+               more($self, '221 Header follows');
+               $self->long_response($beg, $end, sub {
+                       my ($i) = @_;
+                       my $mid = $mm->mid_for($$i);
+                       more($self, "$$i <$mid>") if defined $mid;
+               });
+       }
+}
+
 sub cmd_xhdr ($$;$) {
        my ($self, $header, $range) = @_;
        defined $self->{ng} or return '412 no news group currently selected';
-       unless (defined $range) {
-               defined($range = $self->{article}) or
-                       return '420 no current article has been selected';
-       }
-       if ($range =~ /\A<(.+)>\z/) { # Message-ID
+       my $sub = $header;
+       $sub =~ tr/A-Z-/a-z_/;
+       $sub = eval {
+               no strict 'refs';
+               $sub = *{'xhdr_'.$sub}{CODE};
+       };
+       return xhdr_slow($self, $header, $range) unless defined $sub;
+       $sub->($self, $range);
+}
+
+sub xhdr_slow ($$$) {
+       my ($self, $header, $range) = @_;
+
+       if (defined $range && $range =~ /\A<(.+)>\z/) { # Message-ID
                my $r = $self->art_lookup($range, 2);
                return $r unless ref $r;
                more($self, '221 Header follows');
@@ -521,6 +553,7 @@ sub cmd_xhdr ($$;$) {
                }
                '.';
        } else { # numeric range
+               $range = $self->{article} unless defined $range;
                my $r = get_range($self, $range);
                return $r unless ref $r;
                my ($beg, $end) = @$r;
@@ -537,6 +570,7 @@ sub cmd_xhdr ($$;$) {
 
 sub cmd_xover ($;$) {
        my ($self, $range) = @_;
+       $range = $self->{article} unless defined $range;
        my $r = get_range($self, $range);
        return $r unless ref $r;
        my ($beg, $end) = @$r;