From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 5/7] nntp: implement OVER from RFC 3977
Date: Tue, 22 Sep 2015 10:09:46 +0000 [thread overview]
Message-ID: <20150922100948.8160-6-e@80x24.org> (raw)
In-Reply-To: <20150922100948.8160-1-e@80x24.org>
This is just like the XOVER command, but allows a single Message-ID
to be given.
---
lib/PublicInbox/NNTP.pm | 34 ++++++++++++++++++++++++++++------
1 file changed, 28 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/NNTP.pm b/lib/PublicInbox/NNTP.pm
index e5bb683..1286b70 100644
--- a/lib/PublicInbox/NNTP.pm
+++ b/lib/PublicInbox/NNTP.pm
@@ -383,7 +383,7 @@ found:
# must be last
$s->body_set('') if ($set_headers == 2);
}
- [ $n, $mid, $s, $bytes, $lines ];
+ [ $n, $mid, $s, $bytes, $lines, $ng ];
}
sub simple_body_write ($$) {
@@ -701,6 +701,32 @@ sub cmd_xrover ($;$) {
});
}
+sub over_line {
+ my ($self, $r) = @_;
+
+ more($self, join("\t", $r->[0], map {
+ my $h = xhdr($r, $_);
+ defined $h ? $h : '';
+ } @OVERVIEW ));
+}
+
+sub cmd_over ($;$) {
+ my ($self, $range) = @_;
+ if ($range && $range =~ /\A<.+>\z/) {
+ my $r = $self->art_lookup($range, 2);
+ return '430 No article with that message-id' unless ref $r;
+ more($self, '224 Overview information follows (multi-line)');
+
+ # Only set article number column if it's the current group
+ my $ng = $self->{ng};
+ $r->[0] = 0 if (!$ng || $ng ne $r->[5]);
+ over_line($self, $r);
+ '.';
+ } else {
+ cmd_xover($self, $range);
+ }
+}
+
sub cmd_xover ($;$) {
my ($self, $range) = @_;
$range = $self->{article} unless defined $range;
@@ -712,11 +738,7 @@ sub cmd_xover ($;$) {
my ($i) = @_;
my $r = $self->art_lookup($$i, 2);
return unless ref $r;
- more($self, join("\t", $r->[0],
- map {
- my $h = xhdr($r, $_);
- defined $h ? $h : '';
- } @OVERVIEW ));
+ over_line($self, $r);
});
}
--
EW
next prev parent reply other threads:[~2015-09-22 10:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-22 10:09 [PATCH 0/7] nntp: another round of updates Eric Wong
2015-09-22 10:09 ` [PATCH 1/7] t/nntpd.t: fix fcntl test to ensure no failures Eric Wong
2015-09-22 10:09 ` [PATCH 2/7] nntp: support YYYYMMDD dates for commands Eric Wong
2015-09-22 10:09 ` [PATCH 3/7] nntp: ensure body lines end with CRLF Eric Wong
2015-09-22 10:09 ` [PATCH 4/7] nntp: avoid setting Bytes and Lines headers Eric Wong
2015-09-22 10:09 ` Eric Wong [this message]
2015-09-22 10:09 ` [PATCH 6/7] nntp: XHDR fixes for Message-ID lookups Eric Wong
2015-09-22 10:09 ` [PATCH 7/7] nntp: XHDR lookups by Message-ID may cross groups Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150922100948.8160-6-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).