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-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 5FE1C1FFA1 for ; Thu, 31 Dec 2020 13:51:56 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 16/36] lei_store: add ->set_eml, ->add_eml can return smsg Date: Thu, 31 Dec 2020 13:51:34 +0000 Message-Id: <20201231135154.6070-17-e@80x24.org> In-Reply-To: <20201231135154.6070-1-e@80x24.org> References: <20201231135154.6070-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Add a ->set_eml method which can be a useful fire-and-forget way of either adding new files to store OR setting keywords on them. When seeing brand-new messages, add_eml can afford to return more information in the smsg instead of just the OID. --- lib/PublicInbox/LeiStore.pm | 8 +++++++- t/lei_store.t | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index 2745c560..43fddf6d 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -199,6 +199,7 @@ sub add_eml { $idx->shard_add_eidx_info($docid, '.', $eml); # List-Id $idx->shard_add_keywords($docid, @kw) if @kw; } + \@docids; } else { $smsg->{num} = $oidx->adj_counter('eidx_docid', '+'); $oidx->add_overview($eml, $smsg); @@ -206,8 +207,13 @@ sub add_eml { my $idx = $eidx->idx_shard($smsg->{num}); $idx->index_raw($msgref, $eml, $smsg); $idx->shard_add_keywords($smsg->{num}, @kw) if @kw; + $smsg; } - $smsg->{blob} +} + +sub set_eml { + my ($self, $eml, @kw) = @_; + add_eml($self, $eml, @kw) // set_eml_keywords($self, $eml, @kw); } sub done { diff --git a/t/lei_store.t b/t/lei_store.t index a189f897..bc0d66c2 100644 --- a/t/lei_store.t +++ b/t/lei_store.t @@ -14,8 +14,8 @@ my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') }; my $store_dir = "$home/lst"; my $lst = PublicInbox::LeiStore->new($store_dir, { creat => 1 }); ok($lst, '->new'); -my $oid = $lst->add_eml(eml_load('t/data/0001.patch')); -like($oid, qr/\A[0-9a-f]+\z/, 'add returned OID'); +my $smsg = $lst->add_eml(eml_load('t/data/0001.patch')); +like($smsg->{blob}, qr/\A[0-9a-f]+\z/, 'add returned OID'); my $eml = eml_load('t/data/0001.patch'); is($lst->add_eml($eml), undef, 'idempotent'); $lst->done; @@ -37,7 +37,7 @@ is_deeply([$lst->maildir_keywords('/foo:2,RSZ')], ['answered', 'seen'], my $es = $lst->search; my $msgs = $es->over->query_xover(0, 1000); is(scalar(@$msgs), 1, 'one message'); - is($msgs->[0]->{blob}, $oid, 'blob matches'); + is($msgs->[0]->{blob}, $smsg->{blob}, 'blob matches'); my $mset = $es->mset("mid:$msgs->[0]->{mid}"); is($mset->size, 1, 'search works'); is_deeply($es->mset_to_artnums($mset), [ $msgs->[0]->{num} ], @@ -83,6 +83,18 @@ for my $parallel (0, 1) { $lst->done; @kw = $lst->search->msg_keywords($docids->[0]); is_deeply(\@kw, [], 'set clobbers all'); + + my $set = eml_load('t/plack-qp.eml'); + $set->header_set('Message-ID', ""); + my $ret = $lst->set_eml($set, 'seen'); + is(ref $ret, 'PublicInbox::Smsg', 'initial returns smsg'); + my $ids = $lst->set_eml($set, qw(seen)); + is_deeply($ids, [ $ret->{num} ], 'set_eml idempotent'); + $ids = $lst->set_eml($set, qw(seen answered)); + is_deeply($ids, [ $ret->{num} ], 'set_eml to change kw'); + $lst->done; + @kw = $lst->search->msg_keywords($ids->[0]); + is_deeply(\@kw, [qw(answered seen)], 'set changed kw'); } SKIP: {