lei export-kw: don't recreate deleted IMAP folders

[public-inbox.git] / lib / PublicInbox / LeiExportKw.pm

diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm
index 0b65c27626336ac679c2bab3ce815240d1e73986..12c8f4067e9e348b430ee3327add7b066c302593 100644 (file)
--- a/lib/PublicInbox/LeiExportKw.pm
+++ b/lib/PublicInbox/LeiExportKw.pm
@@ -7,6 +7,7 @@ use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC PublicInbox::LeiInput);
 use Errno qw(EEXIST ENOENT);
+use PublicInbox::Syscall qw(rename_noreplace);
 
 sub export_kw_md { # LeiMailSync->each_src callback
        my ($oidbin, $id, $self, $mdir) = @_;
@@ -30,30 +31,22 @@ sub export_kw_md { # LeiMailSync->each_src callback
        my $lei = $self->{lei};
        for my $d (@try) {
                my $src = "$mdir/$d/$$id";
-
-               # we use link(2) + unlink(2) since rename(2) may
-               # inadvertently clobber if the "uniquefilename" part wasn't
-               # actually unique.
-               if (link($src, $dst)) { # success
-                       # unlink(2) may ENOENT from parallel invocation,
-                       # ignore it, but not other serious errors
-                       if (!unlink($src) and $! != ENOENT) {
-                               $lei->child_error(1, "E: unlink($src): $!");
-                       }
+               if (rename_noreplace($src, $dst)) { # success
                        $self->{lms}->mv_src("maildir:$mdir",
                                                $oidbin, $id, $bn);
-                       return; # success anyways if link(2) worked
+                       return; # success
                } elsif ($! == EEXIST) { # lost race with lei/store?
                        return;
                } elsif ($! != ENOENT) {
-                       $lei->child_error(1, "E: link($src -> $dst): $!");
+                       $lei->child_error(1,
+                               "E: rename_noreplace($src -> $dst): $!");
                } # else loop @try
        }
        my $e = $!;
        # both tries failed
        my $oidhex = unpack('H*', $oidbin);
        my $src = "$mdir/{".join(',', @try)."}/$$id";
-       $lei->child_error(1, "link($src -> $dst) ($oidhex): $e");
+       $lei->child_error(1, "rename_noreplace($src -> $dst) ($oidhex): $e");
        for (@try) { return if -e "$mdir/$_/$$id" }
        $self->{lms}->clear_src("maildir:$mdir", $id);
 }
@@ -74,9 +67,13 @@ sub input_path_url {
                $self->{lms}->each_src($input, \&export_kw_md, $self, $mdir);
        } elsif ($input =~ m!\Aimaps?://!i) {
                my $uri = PublicInbox::URIimap->new($input);
-               my $mic = $self->{nwr}->mic_for_folder($uri);
-               $self->{lms}->each_src($$uri, \&export_kw_imap, $self, $mic);
-               $mic->expunge;
+               if (my $mic = $self->{nwr}->mic_for_folder($uri)) {
+                       $self->{lms}->each_src($$uri, \&export_kw_imap,
+                                               $self, $mic);
+                       $mic->expunge;
+               } else {
+                       $self->{lei}->child_error(0, "$input unavailable: $@");
+               }
        } else { die "BUG: $input not supported" }
 }
 
@@ -115,6 +112,7 @@ EOM
                $self->{nwr} = bless $net, 'PublicInbox::NetWriter';
                $self->{imap_mod_kw} = $net->can($self->{-merge_kw} ?
                                        'imap_add_kw' : 'imap_set_kw');
+               $self->{nwr}->{-skip_creat} = 1;
        }
        my $ops = {};
        $lei->{auth}->op_merge($ops, $self) if $lei->{auth};