From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id B65711FC11 for ; Sun, 19 Sep 2021 12:50:36 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 10/16] net_reader: fix single NNTP article fetch, test ranges Date: Sun, 19 Sep 2021 12:50:29 +0000 Message-Id: <20210919125035.6331-11-e@80x24.org> In-Reply-To: <20210919125035.6331-1-e@80x24.org> References: <20210919125035.6331-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: While NNTP ranges was already working, fetching a single message was broken. We'll also simplify the code a bit and ensure incremental synchronization is ignored when ranges are specified. --- lib/PublicInbox/NetReader.pm | 15 +++++++++------ t/lei-import-nntp.t | 26 ++++++++++++++++++++++++++ t/uri_nntps.t | 3 +++ 3 files changed, 38 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 30b8f810..236e824c 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -725,21 +725,24 @@ sub _nntp_fetch_all ($$$) { my $msg = ndump($nn->message); return "E: GROUP $group <$sec> $msg"; } + (defined($num_a) && defined($num_b) && $num_a > $num_b) and + return "E: $uri: backwards range: $num_a > $num_b"; # IMAPTracker is also used for tracking NNTP, UID == article number # LIST.ACTIVE can get the equivalent of UIDVALIDITY, but that's # expensive. So we assume newsgroups don't change: my ($itrk, $l_art) = itrk_last($self, $uri); - # allow users to specify articles to refetch - # cf. https://tools.ietf.org/id/draft-gilman-news-url-01.txt - # nntp://example.com/inbox.foo/$num_a-$num_b - $beg = $num_a if defined($num_a) && $num_a < $beg; - $end = $num_b if defined($num_b) && $num_b < $end; - if (defined $l_art) { + if (defined($l_art) && !defined($num_a)) { return if $l_art >= $end; # nothing to do $beg = $l_art + 1; } + # allow users to specify articles to refetch + # cf. https://tools.ietf.org/id/draft-gilman-news-url-01.txt + # nntp://example.com/inbox.foo/$num_a-$num_b + $beg = $num_a if defined($num_a) && $num_a > $beg && $num_a <= $end; + $end = $num_b if defined($num_b) && $num_b >= $beg && $num_b < $end; + $end = $beg if defined($num_a) && !defined($num_b); my ($err, $art, $last_art, $kw); # kw stays undef, no keywords in NNTP unless ($self->{quiet}) { warn "# $uri fetching ARTICLE $beg..$end\n"; diff --git a/t/lei-import-nntp.t b/t/lei-import-nntp.t index f2c35406..1eb41e0e 100644 --- a/t/lei-import-nntp.t +++ b/t/lei-import-nntp.t @@ -37,5 +37,31 @@ test_lei({ tmpdir => $tmpdir }, sub { ok(-s $f, 'mail_sync exists tracked for redundant imports'); lei_ok 'ls-mail-sync'; like($lei_out, qr!\A\Q$url\E\n\z!, 'ls-mail-sync output as-expected'); + + ok(!lei(qw(import), "$url/12-1"), 'backwards range rejected'); + + # new home + local $ENV{HOME} = "$tmpdir/h2"; + lei_ok(qw(ls-mail-source -l), $url); + my $ls = json_utf8->decode($lei_out); + my ($high, $low) = @{$ls->[0]}{qw(high low)}; + ok($high > $low, 'high > low'); + + my $end = $high - 1; + lei_ok qw(import), "$url/$high"; + lei_ok qw(q z:0..); my $one = json_utf8->decode($lei_out); + pop @$one; # trailing null + is(scalar(@$one), 1, 'only 1 result'); + + local $ENV{HOME} = "$tmpdir/h3"; + lei_ok qw(import), "$url/$low-$end"; + lei_ok qw(q z:0..); my $start = json_utf8->decode($lei_out); + pop @$start; # trailing null + is(scalar(@$start), scalar(map { $_ } ($low..$end)), + 'range worked as expected'); + my %seen; + for (@$start, @$one) { + is($seen{$_->{blob}}++, 0, "blob $_->{blob} seen once"); + } }); done_testing; diff --git a/t/uri_nntps.t b/t/uri_nntps.t index babd8088..6b123a9b 100644 --- a/t/uri_nntps.t +++ b/t/uri_nntps.t @@ -37,4 +37,7 @@ is(PublicInbox::URInntps->new('nntps://0:563/')->canonical->as_string, $uri = PublicInbox::URInntps->new('nntps://NSA:Hunter2@0/inbox'); is($uri->userinfo, 'NSA:Hunter2', 'userinfo accepted w/ pass'); +$uri = PublicInbox::URInntps->new('nntps://NSA:Hunter2@0/inbox.test/9-10'); +is_deeply([$uri->group], [ 'inbox.test', 9, 10 ], 'ranges work'); + done_testing;