X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiToMail.pm;h=f3c039699cc26bdd5c539fe6b3acc8ed5a4c70d7;hb=ec6d2dc31406378f77aa681017083fe8e98b4df9;hp=7adbffe7ac3aba411d132131cb00a0c13a762820;hpb=c2216fcd14454c937e50e89711c6955ddd4101a7;p=public-inbox.git diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index 7adbffe7..f3c03969 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -9,7 +9,6 @@ use parent qw(PublicInbox::IPC); use PublicInbox::Eml; use PublicInbox::ProcessPipe; use PublicInbox::Spawn qw(spawn); -use PublicInbox::LeiDedupe; use PublicInbox::PktOp qw(pkt_do); use Symbol qw(gensym); use IO::Handle; # ->autoflush @@ -39,7 +38,7 @@ sub _mbox_hdr_buf ($$$) { if (my $ent = $kw2status{$k}) { push @{$hdr{$ent->[0]}}, $ent->[1]; } else { # X-Label? - warn "TODO: keyword `$k' not supported for mbox\n"; + warn "# keyword `$k' not supported for mbox\n"; } } # Messages are always 'O' (non-\Recent in IMAP), it saves @@ -138,9 +137,15 @@ sub eml2mboxcl2 { sub git_to_mail { # git->cat_async callback my ($bref, $oid, $type, $size, $arg) = @_; + my ($write_cb, $smsg) = @$arg; + if ($type eq 'missing' && $smsg->{-lms_ro}) { + if ($bref = $smsg->{-lms_ro}->local_blob($oid, 1)) { + $type = 'blob'; + $size = length($$bref); + } + } return warn("W: $oid is $type (!= blob)\n") if $type ne 'blob'; return warn("E: $oid is empty\n") unless $size; - my ($write_cb, $smsg) = @$arg; die "BUG: expected=$smsg->{blob} got=$oid" if $smsg->{blob} ne $oid; $write_cb->($bref, $smsg); } @@ -197,9 +202,13 @@ sub _mbox_write_cb ($$) { return if $dedupe->is_dup($eml, $smsg); $lse->xsmsg_vmd($smsg) if $lse; $buf = $eml2mbox->($eml, $smsg); - return atomic_append($lei, $buf) if $atomic_append; - my $lk = $ovv->lock_for_scope; - $lei->out($$buf); + if ($atomic_append) { + atomic_append($lei, $buf); + } else { + my $lk = $ovv->lock_for_scope; + $lei->out($$buf); + } + ++$lei->{-nr_write}; } } @@ -234,12 +243,16 @@ sub _rand () { sprintf('%x,%x,%x,%x', rand(0xffffffff), time, $$, ++$seq); } +sub kw2suffix ($;@) { + my $kw = shift; + join('', sort(map { $kw2char{$_} // () } @$kw, @_)); +} + sub _buf2maildir { my ($dst, $buf, $smsg) = @_; my $kw = $smsg->{kw} // []; - my $sfx = join('', sort(map { $kw2char{$_} // () } @$kw)); my $rand = ''; # chosen by die roll :P - my ($tmp, $fh, $final, $ok); + my ($tmp, $fh, $base, $ok); my $common = $smsg->{blob} // _rand; if (defined(my $pct = $smsg->{pct})) { $common .= "=$pct" } do { @@ -254,11 +267,12 @@ sub _buf2maildir { $dst .= 'cur/'; $rand = ''; do { - $final = $dst.$rand.$common.':2,'.$sfx; - } while (!($ok = link($tmp, $final)) && $!{EEXIST} && + $base = $rand.$common.':2,'.kw2suffix($kw); + } while (!($ok = link($tmp, $dst.$base)) && $!{EEXIST} && ($rand = _rand.',')); - die "link($tmp, $final): $!" unless $ok; + die "link($tmp, $dst$base): $!" unless $ok; unlink($tmp) or warn "W: failed to unlink $tmp: $!\n"; + \$base; } else { my $err = "Error writing $smsg->{blob} to $dst: $!\n"; $_[0] = undef; # clobber dst @@ -273,16 +287,18 @@ sub _maildir_write_cb ($$) { $dedupe->prepare_dedupe if $dedupe; my $dst = $lei->{ovv}->{dst}; my $lse = $lei->{lse}; # may be undef + my $sto = $lei->{opt}->{'mail-sync'} ? $lei->{sto} : undef; + my $out = $sto ? 'maildir:'.$lei->rel2abs($dst) : undef; sub { # for git_to_mail - my ($buf, $smsg, $eml) = @_; + my ($bref, $smsg, $eml) = @_; $dst // return $lei->fail; # dst may be undef-ed in last run - $buf //= \($eml->as_string); + return if $dedupe && $dedupe->is_dup($eml // + PublicInbox::Eml->new($$bref), + $smsg); $lse->xsmsg_vmd($smsg) if $lse; - return _buf2maildir($dst, $buf, $smsg) if !$dedupe; - $eml //= PublicInbox::Eml->new($$buf); # copy buf - return if $dedupe->is_dup($eml, $smsg); - undef $eml; - _buf2maildir($dst, $buf, $smsg); + my $n = _buf2maildir($dst, $bref // \($eml->as_string), $smsg); + $sto->ipc_do('set_sync_info', $smsg->{blob}, $out, $n) if $sto; + ++$lei->{-nr_write}; } } @@ -290,23 +306,50 @@ sub _imap_write_cb ($$) { my ($self, $lei) = @_; my $dedupe = $lei->{dedupe}; $dedupe->prepare_dedupe if $dedupe; - my $imap_append = $lei->{net}->can('imap_append'); - my $mic = $lei->{net}->mic_get($self->{uri}); - my $folder = $self->{uri}->mailbox; + my $append = $lei->{net}->can('imap_append'); + my $uri = $self->{uri}; + my $mic = $lei->{net}->mic_get($uri); + my $folder = $uri->mailbox; + $uri->uidvalidity($mic->uidvalidity($folder)); my $lse = $lei->{lse}; # may be undef + my $sto = $lei->{opt}->{'mail-sync'} ? $lei->{sto} : undef; sub { # for git_to_mail my ($bref, $smsg, $eml) = @_; $mic // return $lei->fail; # mic may be undef-ed in last run - if ($dedupe) { - $eml //= PublicInbox::Eml->new($$bref); # copy bref - return if $dedupe->is_dup($eml, $smsg); - } + return if $dedupe && $dedupe->is_dup($eml // + PublicInbox::Eml->new($$bref), + $smsg); $lse->xsmsg_vmd($smsg) if $lse; - eval { $imap_append->($mic, $folder, $bref, $smsg, $eml) }; + my $uid = eval { $append->($mic, $folder, $bref, $smsg, $eml) }; if (my $err = $@) { undef $mic; die $err; } + # imap_append returns UID if IMAP server has UIDPLUS extension + ($sto && $uid =~ /\A[0-9]+\z/) and + $sto->ipc_do('set_sync_info', + $smsg->{blob}, $$uri, $uid + 0); + ++$lei->{-nr_write}; + } +} + +sub _text_write_cb ($$) { + my ($self, $lei) = @_; + my $dedupe = $lei->{dedupe}; + $dedupe->prepare_dedupe if $dedupe; + my $lvt = $lei->{lvt}; + my $ovv = $lei->{ovv}; + $lei->{1} // die "no stdout ($ovv->{dst})"; # redirected earlier + $lei->{1}->autoflush(1); + binmode $lei->{1}, ':utf8'; + my $lse = $lei->{lse}; # may be undef + sub { # for git_to_mail + my ($bref, $smsg, $eml) = @_; + $lse->xsmsg_vmd($smsg) if $lse; + $eml //= PublicInbox::Eml->new($bref); # copy bref + return if $dedupe && $dedupe->is_dup($eml, $smsg); + my $lk = $ovv->lock_for_scope; + $lei->out(${$lvt->eml_to_text($smsg, $eml)}, "\n"); } } @@ -330,27 +373,47 @@ sub new { $lei->{ovv}->{dst} = $dst .= '/' if substr($dst, -1) ne '/'; } elsif (substr($fmt, 0, 4) eq 'mbox') { require PublicInbox::MboxReader; - (-d $dst || (-e _ && !-w _)) and die - "$dst exists and is not a writable file\n"; $self->can("eml2$fmt") or die "bad mbox format: $fmt\n"; $self->{base_type} = 'mbox'; - } elsif ($fmt =~ /\Aimaps?\z/) { # TODO .onion support + } elsif ($fmt =~ /\Aimaps?\z/) { require PublicInbox::NetWriter; + require PublicInbox::URIimap; my $net = PublicInbox::NetWriter->new; - $net->add_url($dst); $net->{quiet} = $lei->{opt}->{quiet}; - my $err = $net->errors($dst); + my $uri = PublicInbox::URIimap->new($dst)->canonical; + $net->add_url($uri); + my $err = $net->errors($lei); return $lei->fail($err) if $err; - require PublicInbox::URIimap; # TODO: URI cast early - $self->{uri} = PublicInbox::URIimap->new($dst); - $self->{uri}->mailbox or die "No mailbox: $dst"; + $uri->mailbox or return $lei->fail("No mailbox: $dst"); + $self->{uri} = $uri; + $dst = $lei->{ovv}->{dst} = $$uri; # canonicalized $lei->{net} = $net; $self->{base_type} = 'imap'; + } elsif ($fmt eq 'text') { + require PublicInbox::LeiViewText; + $lei->{lvt} = PublicInbox::LeiViewText->new($lei); + $self->{base_type} = 'text'; } else { die "bad mail --format=$fmt\n"; } + if ($self->{base_type} =~ /\A(?:text|mbox)\z/) { + (-d $dst || (-e _ && !-w _)) and die + "$dst exists and is not a writable file\n"; + } + if ($self->{base_type} eq 'text') { + my @err = map { + defined($lei->{opt}->{$_}) ? "--$_" : (); + } (qw(mua save)); + die "@err incompatible with $fmt\n" if @err; + } $self->{dst} = $dst; - $lei->{dedupe} = PublicInbox::LeiDedupe->new($lei); + $lei->{dedupe} = $lei->{lss} // do { + my $dd_cls = 'PublicInbox::'. + ($lei->{opt}->{save} ? 'LeiSavedSearch' : 'LeiDedupe'); + eval "require $dd_cls"; + die "$dd_cls: $@" if $@; + $dd_cls->new($lei); + }; $self; } @@ -364,10 +427,13 @@ sub _pre_augment_maildir { File::Path::mkpath($d); -d $d or die "$d is not a directory"; } + # for utime, so no opendir + open $self->{poke_dh}, '<', "${dst}cur" or die "open ${dst}cur: $!"; } sub _do_augment_maildir { my ($self, $lei) = @_; + return if ($lei->{opt}->{save} // 0) < 0; my $dst = $lei->{ovv}->{dst}; my $lse = $lei->{opt}->{'import-before'} ? $lei->{lse} : undef; my $mdr = PublicInbox::MdirReader->new; @@ -387,10 +453,10 @@ sub _do_augment_maildir { } sub _imap_augment_or_delete { # PublicInbox::NetReader::imap_each cb - my ($url, $uid, $kw, $eml, $lei, $lse, $delete_mic) = @_; + my ($uri, $uid, $kw, $eml, $lei, $lse, $delete_mic) = @_; update_kw_maybe($lei, $lse, $eml, $kw); if ($delete_mic) { - $lei->{net}->imap_delete_1($url, $uid, $delete_mic); + $lei->{net}->imap_delete_1($uri, $uid, $delete_mic); } else { _augment($eml, $lei); } @@ -398,6 +464,7 @@ sub _imap_augment_or_delete { # PublicInbox::NetReader::imap_each cb sub _do_augment_imap { my ($self, $lei) = @_; + return if ($lei->{opt}->{save} // 0) < 0; my $net = $lei->{net}; my $lse = $lei->{opt}->{'import-before'} ? $lei->{lse} : undef; if ($lei->{opt}->{augment}) { @@ -418,6 +485,29 @@ sub _do_augment_imap { } } +sub _pre_augment_text { + my ($self, $lei) = @_; + my $dst = $lei->{ovv}->{dst}; + my $out; + my $devfd = $lei->path_to_fd($dst) // die "bad $dst"; + if ($devfd >= 0) { + $out = $lei->{$devfd}; + } else { # normal-looking path + if (-p $dst) { + open $out, '>', $dst or die "open($dst): $!"; + } elsif (-f _ || !-e _) { + # text allows augment, HTML/Atom won't + my $mode = $lei->{opt}->{augment} ? '>>' : '>'; + open $out, $mode, $dst or die "open($mode, $dst): $!"; + } else { + die "$dst is not a file or FIFO\n"; + } + } + $lei->{ovv}->ovv_out_lk_init if !$lei->{ovv}->{lock_path}; + $lei->{1} = $out; + undef; +} + sub _pre_augment_mbox { my ($self, $lei) = @_; my $dst = $lei->{ovv}->{dst}; @@ -468,6 +558,7 @@ sub _do_augment_mbox { my ($self, $lei) = @_; return unless $self->{seekable}; my $opt = $lei->{opt}; + return if ($opt->{save} // 0) < 0; my $out = $lei->{1}; my ($fmt, $dst) = @{$lei->{ovv}}{qw(fmt dst)}; return unless -s $out; @@ -511,8 +602,8 @@ sub pre_augment { # fast (1 disk seek), runs in same process as post_augment sub do_augment { # slow, runs in wq worker my ($self, $lei) = @_; # _do_augment_maildir, _do_augment_mbox, or _do_augment_imap - my $m = "_do_augment_$self->{base_type}"; - $self->$m($lei); + my $m = $self->can("_do_augment_$self->{base_type}") or return; + $m->($self, $lei); } # fast (spawn compressor or mkdir), runs in same process as pre_augment @@ -564,6 +655,9 @@ sub ipc_atfork_child { my ($self) = @_; my $lei = $self->{lei}; $lei->_lei_atfork_child; + if (my $lse = $lei->{lse}) { + $self->{-lms_ro} = $lse->{-lms_ro} //= $lse->lms; + } $lei->{auth}->do_auth_atfork($self) if $lei->{auth}; $SIG{__WARN__} = PublicInbox::Eml::warn_ignore_cb(); $self->SUPER::ipc_atfork_child; @@ -578,13 +672,14 @@ sub poke_dst { my ($self) = @_; if ($self->{base_type} eq 'maildir') { my $t = time + 1; - utime($t, $t, $self->{dst} . 'cur'); + utime($t, $t, $self->{poke_dh}) or warn "futimes: $!"; } } sub write_mail { # via ->wq_io_do my ($self, $smsg, $eml) = @_; return $self->{wcb}->(undef, $smsg, $eml) if $eml; + $smsg->{-lms_ro} = $self->{-lms_ro}; $self->{lei}->{ale}->git->cat_async($smsg->{blob}, \&git_to_mail, [$self->{wcb}, $smsg]); } @@ -592,11 +687,16 @@ sub write_mail { # via ->wq_io_do sub wq_atexit_child { my ($self) = @_; delete $self->{wcb}; - $self->{lei}->{ale}->git->async_wait_all; + my $lei = $self->{lei}; + $lei->{ale}->git->async_wait_all; + my $nr = delete($lei->{-nr_write}) or return; + return if $lei->{early_mua} || !$lei->{-progress} || !$lei->{pkt_op_p}; + require PublicInbox::PktOp; + PublicInbox::PktOp::pkt_do($lei->{pkt_op_p}, 'l2m_progress', $nr); } # called in top-level lei-daemon when LeiAuth is done -sub net_merge_complete { +sub net_merge_all_done { my ($self) = @_; $self->wq_broadcast('do_post_auth'); $self->wq_close(1);