X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiTag.pm;h=8ce96a102a8013b8280bf608ed2b5311d37cf546;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=f019202f4ae216a9d25058c2a04d13d9abfcdff1;hpb=6b3ba59d4bfdf20507fd890df6ff1454a93435e4;p=public-inbox.git diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm index f019202f..8ce96a10 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -6,131 +6,59 @@ package PublicInbox::LeiTag; use strict; use v5.10.1; use parent qw(PublicInbox::IPC PublicInbox::LeiInput); - -# JMAP RFC 8621 4.1.1 -# https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml -my @KW = (qw(seen answered flagged draft), # widely-compatible - qw(forwarded phishing junk notjunk)); # rarely supported -# 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 widely-compatible ones map to IMAP system flags, 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 : < 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}; + ++$self->{unimported}; } } -sub input_mbox_cb { input_eml_cb($_[1], $_[0]) } - -sub tag_done { # EOF callback for main daemon - my ($lei) = @_; - my $tag = delete $lei->{tag} or return; - $tag->wq_wait_old($lei->can('wq_done_wait'), $lei, 'non-fatal'); -} - -sub net_merge_complete { # callback used by LeiAuth - my ($self) = @_; - $self->wq_io_do('process_inputs'); - $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); } sub lei_tag { # the "lei tag" method my ($lei, @argv) = @_; - my $sto = $lei->_lei_store(1); - $sto->write_prepare($lei); - my $self = bless { missing => 0 }, __PACKAGE__; + $lei->{opt}->{'in-format'} //= 'eml' if $lei->{opt}->{stdin}; + my $sto = $lei->_lei_store(1)->write_prepare($lei); + 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 $j = $self->{-wq_nr_workers} = 1; # locked for now - (my $op_c, $ops) = $lei->workers_start($self, 'lei_tag', $j, $ops); - $lei->{tag} = $self; - net_merge_complete($self) unless $lei->{auth}; - $op_c->op_wait_event($ops); + $lei->{-err_type} = 'non-fatal'; + $lei->wq1_start($self); } -sub note_missing { +sub note_unimported { my ($self) = @_; - my $n = $self->{missing} or return; - $self->{lei}->child_error(1 << 8, "$n missed messages"); + 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 @@ -160,19 +88,21 @@ sub _complete_mark_common ($) { # 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 = \&PublicInbox::LeiAuth::net_merge_all; +*net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; 1;