From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 1/5] net_reader: nntp_each: pass keywords as `undef' Date: Tue, 23 Mar 2021 11:48:04 +0000 [thread overview] Message-ID: <20210323114808.7605-2-e@80x24.org> (raw) In-Reply-To: <20210323114808.7605-1-e@80x24.org> 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);
next prev parent reply other threads:[~2021-03-23 11:48 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-23 11:48 [PATCH 0/5] lei: more input + worker-related stuff Eric Wong 2021-03-23 11:48 ` Eric Wong [this message] 2021-03-23 11:48 ` [PATCH 2/5] test_common: check lei/errors.log Eric Wong 2021-03-23 11:48 ` [PATCH 3/5] lei: persistent workers (lei_store) run in / Eric Wong 2021-03-23 11:48 ` [PATCH 4/5] lei_input: more common code between <mark|convert|import> Eric Wong 2021-03-23 11:48 ` [PATCH 5/5] lei: improve management around short-lived workers 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=20210323114808.7605-2-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH 1/5] net_reader: nntp_each: pass keywords as `undef'\''' \ /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
Code repositories for project(s) associated with this 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).