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);
}
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};
}
}
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 {
$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
$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};
}
}
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 _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);
}
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;
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]);
}
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);