www_stream: note existence of IMAP and NNTP URLs

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

diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 88889f45cbd1ca964c0a1bc6da45db1125530617..8ce445c80d07b3748c8828e63f1d55db8aefb28d 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 {
@@ -225,6 +225,7 @@ sub prepare_inputs { # returns undef on error
        my ($self, $lei, $inputs) = @_;
        my $in_fmt = $lei->{opt}->{'in-format'};
        my $sync = $lei->{opt}->{'mail-sync'} ? {} : undef; # using LeiMailSync
+       my $may_sync = $sync || $self->{-mail_sync};
        if ($lei->{opt}->{stdin}) {
                @$inputs and return
                        $lei->fail("--stdin and @$inputs do not mix");
@@ -267,15 +268,18 @@ sub prepare_inputs { # returns undef on error
                        } elsif (-d $input_path) {
                                $ifmt eq 'maildir' or return
                                        $lei->fail("$ifmt not supported");
-                               $sync and $input = 'maildir:'.
+                               $may_sync and $input = 'maildir:'.
                                                $lei->abs_path($input_path);
                                push @md, $input;
                        } elsif ($self->{missing_ok} && !-e _) {
                                # for "lei rm-watch" on missing Maildir
-                               $sync and $input = 'maildir:'.
+                               $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(<<"");
@@ -294,7 +298,7 @@ $input is `eml', not --in-format=$in_fmt
 
                        if ($sync) {
                                $input = $lei->abs_path($mdir) . "/$nc/$bn";
-                               push @{$sync->{ok}}, $input;
+                               push @{$sync->{ok}}, $input if $sync;
                        }
                        require PublicInbox::MdirReader;
                } else {
@@ -303,15 +307,15 @@ $input is `eml', not --in-format=$in_fmt
                                push @{$sync->{no}}, $input if $sync;
                                push @f, $input;
                        } elsif (-d "$input/new" && -d "$input/cur") {
-                               if ($sync) {
+                               if ($may_sync) {
                                        $input = 'maildir:'.
                                                $lei->abs_path($input);
-                                       push @{$sync->{ok}}, $input;
+                                       push @{$sync->{ok}}, $input if $sync;
                                }
                                push @md, $input;
                        } elsif ($self->{missing_ok} && !-e $input) {
                                # for lei rm-watch
-                               $sync and $input = 'maildir:'.
+                               $may_sync and $input = 'maildir:'.
                                                $lei->abs_path($input);
                        } else {
                                return $lei->fail("Unable to handle $input")
@@ -343,6 +347,13 @@ $input is `eml', not --in-format=$in_fmt
                        require PublicInbox::LeiPmdir;
                        $self->{pmd} = PublicInbox::LeiPmdir->new($lei, $self);
                }
+
+               # 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->refresh_watches;
+               }
        }
        $self->{inputs} = $inputs;
 }