lei q: remove angle brackets around Message-IDs

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

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index f0ac468417cc5ea4666bc3cbb589a310ef83957e..01556273d351410c4b49b01170ec608181901f49 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -51,18 +51,24 @@ sub detect_fmt ($$) {
 }
 
 sub new {
-       my ($class, $lei) = @_;
+       my ($class, $lei, $ofmt_key) = @_;
        my $opt = $lei->{opt};
        my $dst = $opt->{output} // '-';
        $dst = '/dev/stdout' if $dst eq '-';
+       $ofmt_key //= 'format';
 
-       my $fmt = $opt->{'format'};
+       my $fmt = $opt->{$ofmt_key};
        $fmt = lc($fmt) if defined $fmt;
-       if ($dst =~ s/\A([a-z0-9]+)://is) { # e.g. Maildir:/home/user/Mail/
+       if ($dst =~ m!\A([a-z0-9\+]+)://!is) {
+               defined($fmt) and return $lei->fail(<<"");
+--$ofmt_key=$fmt invalid with URL $dst
+
+               $fmt = lc $1;
+       } elsif ($dst =~ s/\A([a-z0-9]+)://is) { # e.g. Maildir:/home/user/Mail/
                my $ofmt = lc $1;
                $fmt //= $ofmt;
                return $lei->fail(<<"") if $fmt ne $ofmt;
---format=$fmt and --output=$ofmt conflict
+--$ofmt_key=$fmt and --output=$ofmt conflict
 
        }
        $fmt //= 'json' if $dst eq '/dev/stdout';
@@ -98,7 +104,10 @@ sub new {
                $opt->{'sort'} //= 'docid' if $dst ne '/dev/stdout';
                $lei->{l2m} = eval { PublicInbox::LeiToMail->new($lei) };
                return $lei->fail($@) if $@;
-               $lei->{early_mua} = 1 if $opt->{mua} && $lei->{l2m}->lock_free;
+               if ($opt->{mua} && $lei->{l2m}->lock_free) {
+                       $lei->{early_mua} = 1;
+                       $opt->{alert} //= [ ':WINCH,:bell' ] if -t $lei->{1};
+               }
        }
        $self;
 }
@@ -132,17 +141,16 @@ sub _unbless_smsg {
        $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate
        $smsg->{pct} = get_pct($mitem) if $mitem;
        if (my $r = delete $smsg->{references}) {
-               $smsg->{refs} = [ map { "<$_>" } ($r =~ m/$MID_EXTRACT/go) ];
+               $smsg->{refs} = [ map { $_ } ($r =~ m/$MID_EXTRACT/go) ];
        }
        if (my $m = delete($smsg->{mid})) {
-               $smsg->{'m'} = "<$m>";
+               $smsg->{'m'} = $m;
        }
        for my $f (qw(from to cc)) {
                my $v = delete $smsg->{$f} or next;
                $smsg->{substr($f, 0, 1)} = pairs($v);
        }
        $smsg->{'s'} = delete $smsg->{subject};
-       # can we be bothered to parse From/To/Cc into arrays?
        scalar { %$smsg }; # unbless
 }