X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiToMail.pm;h=90db30e53089942be3c512033e23f17147089e39;hb=97a9139a75729c41bb91acd711e8b088e6379600;hp=76e103c7c2351638902bac42cd6290488e9e761d;hpb=a1733d3406dfbde52d1468e671edd1d76893f546;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 76e103c7..90db30e5 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -12,6 +12,7 @@ use PublicInbox::Spawn qw(spawn);
 use Symbol qw(gensym);
 use IO::Handle; # ->autoflush
 use Fcntl qw(SEEK_SET SEEK_END O_CREAT O_EXCL O_WRONLY);
+use PublicInbox::Syscall qw(rename_noreplace);
 
 my %kw2char = ( # Maildir characters
 	draft => 'D',
@@ -132,9 +133,10 @@ sub eml2mboxcl2 {
 
 sub git_to_mail { # git->cat_async callback
 	my ($bref, $oid, $type, $size, $arg) = @_;
+	$type // return; # called by git->async_abort
 	my ($write_cb, $smsg) = @$arg;
-	if ($type eq 'missing' && $smsg->{-lms_ro}) {
-		if ($bref = $smsg->{-lms_ro}->local_blob($oid, 1)) {
+	if ($type eq 'missing' && $smsg->{-lms_rw}) {
+		if ($bref = $smsg->{-lms_rw}->local_blob($oid, 1)) {
 			$type = 'blob';
 			$size = length($$bref);
 		}
@@ -261,10 +263,8 @@ sub _buf2maildir ($$$$) {
 		$rand = '';
 		do {
 			$base = $rand.$common.':2,'.kw2suffix($kw);
-		} while (!($ok = link($tmp, $dst.$base)) && $!{EEXIST} &&
-			($rand = _rand.','));
-		die "link($tmp, $dst$base): $!" unless $ok;
-		unlink($tmp) or warn "W: failed to unlink $tmp: $!\n";
+		} while (!($ok = rename_noreplace($tmp, $dst.$base)) &&
+			$!{EEXIST} && ($rand = _rand.','));
 		\$base;
 	} else {
 		my $err = "Error writing $smsg->{blob} to $dst: $!\n";
@@ -280,8 +280,9 @@ 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->abs_path($dst) : undef;
+	my $lms = $self->{-lms_rw};
+	my $out = $lms ? 'maildir:'.$lei->abs_path($dst) : undef;
+	$lms->lms_write_prepare if $lms;
 
 	# Favor cur/ and only write to new/ when augmenting.  This
 	# saves MUAs from having to do a mass rename when the initial
@@ -296,7 +297,7 @@ sub _maildir_write_cb ($$) {
 		$lse->xsmsg_vmd($smsg) if $lse;
 		my $n = _buf2maildir($dst, $bref // \($eml->as_string),
 					$smsg, $dir);
-		$sto->wq_do('set_sync_info', $smsg->{blob}, $out, $n) if $sto;
+		$lms->set_src($smsg->oidbin, $out, $n) if $lms;
 		++$lei->{-nr_write};
 	}
 }
@@ -311,7 +312,8 @@ sub _imap_write_cb ($$) {
 	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;
+	my $lms = $self->{-lms_rw};
+	$lms->lms_write_prepare if $lms;
 	sub { # for git_to_mail
 		my ($bref, $smsg, $eml) = @_;
 		$mic // return $lei->fail; # mic may be undef-ed in last run
@@ -325,9 +327,8 @@ sub _imap_write_cb ($$) {
 			die $err;
 		}
 		# imap_append returns UID if IMAP server has UIDPLUS extension
-		($sto && $uid =~ /\A[0-9]+\z/) and
-			$sto->wq_do('set_sync_info',
-					$smsg->{blob}, $$uri, $uid + 0);
+		($lms && $uid =~ /\A[0-9]+\z/) and
+			$lms->set_src($smsg->oidbin, $$uri, $uid + 0);
 		++$lei->{-nr_write};
 	}
 }
@@ -414,11 +415,13 @@ sub new {
 		require PublicInbox::LeiViewText;
 		$lei->{lvt} = PublicInbox::LeiViewText->new($lei, $fmt);
 		$self->{base_type} = 'text';
+		$self->{-wq_nr_workers} = 1; # for pager
 		@conflict = qw(mua save);
 	} elsif ($fmt eq 'v2') {
 		die "--dedupe=oid and v2 are incompatible\n" if
 			($lei->{opt}->{dedupe}//'') eq 'oid';
 		$self->{base_type} = 'v2';
+		$self->{-wq_nr_workers} = 1; # v2 has shards
 		$lei->{opt}->{save} = \1;
 		$dst = $lei->{ovv}->{dst} = $lei->abs_path($dst);
 		@conflict = qw(mua sort);
@@ -751,9 +754,6 @@ 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;
@@ -775,7 +775,7 @@ sub poke_dst {
 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};
+	$smsg->{-lms_rw} = $self->{-lms_rw};
 	$self->{lei}->{ale}->git->cat_async($smsg->{blob}, \&git_to_mail,
 				[$self->{wcb}, $smsg]);
 }