use strict;
use v5.10.1;
use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
-
-# JMAP RFC 8621 4.1.1
-my @KW = (qw(seen answered flagged draft), # system
- qw(forwarded phishing junk notjunk)); # reserved
-# note: RFC 8621 states "Users may add arbitrary keywords to an Email",
-# but is it good idea? Stick to the system and reserved ones, for now.
-# The "system" ones map to Maildir flags and mbox Status/X-Status headers.
-my %KW = map { $_ => 1 } @KW;
-my $L_MAX = 244; # Xapian term limit - length('L')
-
-# RFC 8621, sec 2 (Mailboxes) a "label" for us is a JMAP Mailbox "name"
-# "Servers MAY reject names that violate server policy"
-my %ERR = (
- L => sub {
- my ($label) = @_;
- length($label) >= $L_MAX and
- return "`$label' too long (must be <= $L_MAX)";
- $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z}i ?
- undef : "`$label' is invalid";
- },
- kw => sub {
- my ($kw) = @_;
- $KW{$kw} ? undef : <<EOM;
-`$kw' is not one of: `seen', `flagged', `answered', `draft'
-`junk', `notjunk', `phishing' or `forwarded'
-EOM
- }
-);
-
-# like Getopt::Long, but for +kw:FOO and -kw:FOO to prepare
-# for update_xvmd -> update_vmd
-sub vmd_mod_extract {
- my $argv = $_[-1];
- my $vmd_mod = {};
- my @new_argv;
- for my $x (@$argv) {
- if ($x =~ /\A(\+|\-)(kw|L):(.+)\z/) {
- my ($op, $pfx, $val) = ($1, $2, $3);
- if (my $err = $ERR{$pfx}->($val)) {
- push @{$vmd_mod->{err}}, $err;
- } else { # set "+kw", "+L", "-L", "-kw"
- push @{$vmd_mod->{$op.$pfx}}, $val;
- }
- } else {
- push @new_argv, $x;
- }
- }
- @$argv = @new_argv;
- $vmd_mod;
-}
+use PublicInbox::InboxWritable qw(eml_from_path);
sub input_eml_cb { # used by PublicInbox::LeiInput::input_fh
my ($self, $eml) = @_;
- if (my $xoids = $self->{lei}->{ale}->xoids_for($eml)) {
- $self->{lei}->{sto}->ipc_do('update_xvmd', $xoids, $eml,
+ if (my $xoids = $self->{lse}->xoids_for($eml) // # tries LeiMailSync
+ $self->{lei}->{ale}->xoids_for($eml)) {
+ $self->{lei}->{sto}->wq_do('update_xvmd', $xoids, $eml,
$self->{vmd_mod});
} else {
- ++$self->{missing};
- }
-}
-
-sub input_mbox_cb { input_eml_cb($_[1], $_[0]) }
-
-sub tag_done_wait { # dwaitpid callback
- my ($arg, $pid) = @_;
- my ($tag, $lei) = @$arg;
- $lei->child_error($?, 'non-fatal errors during tag') if $?;
- my $sto = delete $lei->{sto};
- my $wait = $sto->ipc_do('done') if $sto; # PublicInbox::LeiStore::done
- $lei->dclose;
-}
-
-sub tag_done { # EOF callback for main daemon
- my ($lei) = @_;
- my $tag = delete $lei->{tag} or return;
- $tag->wq_wait_old(\&tag_done_wait, $lei);
-}
-
-sub net_merge_complete { # callback used by LeiAuth
- my ($self) = @_;
- for my $input (@{$self->{inputs}}) {
- $self->wq_io_do('input_path_url', [], $input);
+ ++$self->{unimported};
}
- $self->wq_close(1);
}
-sub input_maildir_cb { # maildir_each_eml cb
- my ($f, $kw, $eml, $self) = @_;
- input_eml_cb($self, $eml);
-}
-
-sub input_net_cb { # imap_each, nntp_each cb
- my ($url, $uid, $kw, $eml, $self) = @_;
+sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn
+ my ($self, $f) = @_;
+ my $eml = eml_from_path($f) or return;
input_eml_cb($self, $eml);
}
my ($lei, @argv) = @_;
my $sto = $lei->_lei_store(1);
$sto->write_prepare($lei);
- my $self = bless { missing => 0 }, __PACKAGE__;
+ my $self = bless {}, __PACKAGE__;
$lei->ale; # refresh and prepare
- my $vmd_mod = vmd_mod_extract(\@argv);
+ my $vmd_mod = $self->vmd_mod_extract(\@argv);
return $lei->fail(join("\n", @{$vmd_mod->{err}})) if $vmd_mod->{err};
+ $self->{vmd_mod} = $vmd_mod; # before LeiPmdir->new in prepare_inputs
$self->prepare_inputs($lei, \@argv) or return;
grep(defined, @$vmd_mod{qw(+kw +L -L -kw)}) or
return $lei->fail('no keywords or labels specified');
- my $ops = { '' => [ \&tag_done, $lei ] };
- $lei->{auth}->op_merge($ops, $self) if $lei->{auth};
- $self->{vmd_mod} = $vmd_mod;
- (my $op_c, $ops) = $lei->workers_start($self, 'lei_tag', 1, $ops);
- $lei->{tag} = $self;
- net_merge_complete($self) unless $lei->{auth};
- $op_c->op_wait_event($ops);
+ my $ops = {};
+ $lei->{auth}->op_merge($ops, $self, $lei) if $lei->{auth};
+ (my $op_c, $ops) = $lei->workers_start($self, 1, $ops);
+ $lei->{wq1} = $self;
+ $lei->{-err_type} = 'non-fatal';
+ net_merge_all_done($self) unless $lei->{auth};
+ $lei->wait_wq_events($op_c, $ops);
}
-sub note_missing {
+sub note_unimported {
my ($self) = @_;
- $self->{lei}->child_error(1 << 8) if $self->{missing};
+ my $n = $self->{unimported} or return;
+ $self->{lei}->{pkt_op_p}->pkt_do('incr', 'unimported', $n);
}
sub ipc_atfork_child {
my ($self) = @_;
PublicInbox::LeiInput::input_only_atfork_child($self);
+ $self->{lse} = $self->{lei}->{sto}->search;
# this goes out-of-scope at worker process exit:
- PublicInbox::OnDestroy->new($$, \¬e_missing, $self);
+ PublicInbox::OnDestroy->new($$, \¬e_unimported, $self);
}
# Workaround bash word-splitting s to ['kw', ':', 'keyword' ...]
# Maybe there's a better way to go about this in
# contrib/completion/lei-completion.bash
-sub _complete_mark_common ($) {
+sub _complete_tag_common ($) {
my ($argv) = @_;
# Workaround bash word-splitting URLs to ['https', ':', '//' ...]
# Maybe there's a better way to go about this in
# FIXME: same problems as _complete_forget_external and similar
sub _complete_tag {
my ($self, @argv) = @_;
+ require PublicInbox::LeiImport;
+ my @in = PublicInbox::LeiImport::_complete_import(@_);
my @L = eval { $self->_lei_store->search->all_terms('L') };
- my @all = ((map { ("+kw:$_", "-kw:$_") } @KW),
+ my @kwL = ((map { ("+kw:$_", "-kw:$_") } @PublicInbox::LeiInput::KW),
(map { ("+L:$_", "-L:$_") } @L));
- return @all if !@argv;
- my ($cur, $re) = _complete_mark_common(\@argv);
- map {
+ my ($cur, $re) = _complete_tag_common(\@argv);
+ my @m = map {
# only return the part specified on the CLI
# don't duplicate if already 100% completed
/\A$re(\Q$cur\E.*)/ ? ($cur eq $1 ? () : $1) : ();
- } grep(/$re\Q$cur/, @all);
+ } grep(/$re\Q$cur/, @kwL);
+ (@in, (@m ? @m : @kwL));
}
+no warnings 'once'; # the following works even when LeiAuth is lazy-loaded
+*net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done;
+
1;