* [PATCH 1/5] net_reader: nntp_each: pass keywords as `undef'
2021-03-23 11:48 6% [PATCH 0/5] lei: more input + worker-related stuff Eric Wong
@ 2021-03-23 11:48 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-03-23 11:48 UTC (permalink / raw)
To: meta
We'll use `undef' to denote keywords are unknown/unsupported,
instead of an empty arrayref.
This will let callers use the same callback and args for
imap_each. Passing an empty arrayref to set_eml in LeiStore
causes keywords to be cleared completely, which is not desired
behavior when "lei import" is importing already-seen messages
from NNTP.
---
lib/PublicInbox/NetReader.pm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index bc211029..6a52b479 100644
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -554,11 +554,10 @@ sub _nntp_fetch_all ($$$) {
return if $l_art >= $end; # nothing to do
$beg = $l_art + 1;
}
- my ($err, $art);
+ my ($err, $art, $last_art, $kw); # kw stays undef, no keywords in NNTP
unless ($self->{quiet}) {
warn "# $uri fetching ARTICLE $beg..$end\n";
}
- my $last_art;
my $n = $self->{max_batch};
for ($beg..$end) {
last if $self->{quit};
@@ -582,7 +581,7 @@ sub _nntp_fetch_all ($$$) {
$raw = join('', @$raw);
$raw =~ s/\r\n/\n/sg;
my ($eml_cb, @args) = @{$self->{eml_each}};
- $eml_cb->($uri, $art, [], PublicInbox::Eml->new(\$raw), @args);
+ $eml_cb->($uri, $art, $kw, PublicInbox::Eml->new(\$raw), @args);
$last_art = $art;
}
run_commit_cb($self);
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] lei: more input + worker-related stuff
@ 2021-03-23 11:48 6% Eric Wong
2021-03-23 11:48 7% ` [PATCH 1/5] net_reader: nntp_each: pass keywords as `undef' Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-03-23 11:48 UTC (permalink / raw)
To: meta
Drop a bunch of redundant code, yay!
Eric Wong (5):
net_reader: nntp_each: pass keywords as `undef'
test_common: check lei/errors.log
lei: persistent workers (lei_store) run in /
lei_input: more common code between <mark|convert|import>
lei: improve management around short-lived workers
lib/PublicInbox/LEI.pm | 2 +-
lib/PublicInbox/LeiConvert.pm | 50 +++++-------------
lib/PublicInbox/LeiExternal.pm | 3 +-
lib/PublicInbox/LeiImport.pm | 94 +++++++++-------------------------
lib/PublicInbox/LeiInput.pm | 45 ++++++++++++++--
lib/PublicInbox/LeiMark.pm | 59 ++++-----------------
lib/PublicInbox/LeiMirror.pm | 2 +-
lib/PublicInbox/LeiP2q.pm | 5 +-
lib/PublicInbox/LeiQuery.pm | 2 +-
lib/PublicInbox/NetReader.pm | 5 +-
lib/PublicInbox/TestCommon.pm | 13 +++--
11 files changed, 109 insertions(+), 171 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-03-23 11:48 6% [PATCH 0/5] lei: more input + worker-related stuff Eric Wong
2021-03-23 11:48 7% ` [PATCH 1/5] net_reader: nntp_each: pass keywords as `undef' Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).