lei_mail_sync: rely on flock(2), avoid IPC

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

diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 1b28f36f68c57136c90823d0abf0004bab5fc2bc..fe736981ba6565d111871f6778b11838d1ecf83d 100644 (file)
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -63,7 +63,7 @@ sub input_fh {
        my ($self, $ifmt, $fh, $name, @args) = @_;
        if ($ifmt eq 'eml') {
                my $buf = do { local $/; <$fh> } //
-                       return $self->{lei}->child_error(1 << 8, <<"");
+                       return $self->{lei}->child_error(0, <<"");
 error reading $name: $!
 
                # mutt pipes single RFC822 messages with a "From " line,
@@ -104,7 +104,7 @@ sub handle_http_input ($$@) {
        my $err = $@;
        waitpid($pid, 0);
        $? || $err and
-               $lei->child_error($? || 1, "@$cmd failed".$err ? " $err" : '');
+               $lei->child_error($?, "@$cmd failed".$err ? " $err" : '');
 }
 
 sub input_path_url {
@@ -124,7 +124,11 @@ sub input_path_url {
                handle_http_input($self, $input, @args);
                return;
        }
+
+       # local-only below
+       my $ifmt_pfx = '';
        if ($input =~ s!\A([a-z0-9]+):!!i) {
+               $ifmt_pfx = "$1:";
                $ifmt = lc($1);
        } elsif ($input =~ /\.(?:patch|eml)\z/i) {
                $ifmt = 'eml';
@@ -172,11 +176,16 @@ EOM
                                                $self->can('input_maildir_cb'),
                                                $self, @args);
                }
+       } elsif ($self->{missing_ok} && !-e $input) { # don't ->fail
+               $self->folder_missing("$ifmt:$input");
        } else {
-               $lei->fail("$input unsupported (TODO)");
+               $lei->fail("$ifmt_pfx$input unsupported (TODO)");
        }
 }
 
+# subclasses should overrride this (see LeiRefreshMailSync)
+sub folder_missing { die "BUG: ->folder_missing undefined for $_[0]" }
+
 sub bad_http ($$;$) {
        my ($lei, $url, $alt) = @_;
        my $x = $alt ? "did you mean <$alt>?" : 'download and import manually';
@@ -276,7 +285,10 @@ sub prepare_inputs { # returns undef on error
                                $may_sync and $input = 'maildir:'.
                                                $lei->abs_path($input_path);
                        } else {
-                               return $lei->fail("Unable to handle $input");
+                               my $m = "Unable to handle $input";
+                               $input =~ /\A(?:L|kw):/ and
+                                       $m .= ", did you mean +$input?";
+                               return $lei->fail($m);
                        }
                } elsif ($input =~ /\.(?:eml|patch)\z/i && -f $input) {
                        lc($in_fmt//'eml') eq 'eml' or return $lei->fail(<<"");
@@ -348,7 +360,7 @@ $input is `eml', not --in-format=$in_fmt
                # start watching Maildirs ASAP
                if ($may_sync && $lei->{sto}) {
                        grep(!m!\Amaildir:/!i, @md) and die "BUG: @md (no pfx)";
-                       my $wait = $lei->{sto}->ipc_do('add_sync_folders', @md);
+                       $lei->lms(1)->lms_write_prepare->add_folders(@md);
                        $lei->refresh_watches;
                }
        }