lei_store: add ->set_eml, ->add_eml can return smsg

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.

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 2745c56047faa65efc3c2e210f6e9893043d4809..43fddf6deb8176e16cdc29187118b94e05d45dfc 100644 (file)
--- 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 a189f8970737ea613c0a8a75ec0f772c1095e63b..bc0d66c20823401a8b8c8c61a4f6be1fd1d9c54b 100644 (file)
--- 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', "<set\@$parallel>");
+       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: {