diff options
Diffstat (limited to 'lib/PublicInbox/LeiOverview.pm')
| -rw-r--r-- | lib/PublicInbox/LeiOverview.pm | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm index 223db222..0529bbe4 100644 --- a/lib/PublicInbox/LeiOverview.pm +++ b/lib/PublicInbox/LeiOverview.pm @@ -21,7 +21,7 @@ use PublicInbox::LeiToMail; # cf. https://en.wikipedia.org/wiki/JSON_streaming my $JSONL = 'ldjson|ndjson|jsonl'; # 3 names for the same thing -sub _iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) } +sub iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) } # we open this in the parent process before ->wq_io_do handoff sub ovv_out_lk_init ($) { @@ -37,16 +37,16 @@ sub ovv_out_lk_cancel ($) { unlink($lock_path); } -sub detect_fmt ($$) { - my ($lei, $dst) = @_; +sub detect_fmt ($) { + my ($dst) = @_; if ($dst =~ m!\A([:/]+://)!) { - $lei->fail("$1 support not implemented, yet\n"); - } elsif (!-e $dst || -d _) { - 'maildir'; # the default TODO: MH? + die "$1 support not implemented, yet\n"; + } elsif (!-e $dst || -d _) { # maildir is the default TODO: MH + -e "$dst/inbox.lock" ? 'v2' : 'maildir'; } elsif (-f _ || -p _) { - $lei->fail("unable to determine mbox family of $dst\n"); + die "unable to determine mbox family of $dst\n"; } else { - $lei->fail("unable to determine format of $dst\n"); + die "unable to determine format of $dst\n"; } } @@ -60,20 +60,19 @@ sub new { my $fmt = $opt->{$ofmt_key}; $fmt = lc($fmt) if defined $fmt; if ($dst =~ m!\A([a-z0-9\+]+)://!is) { - defined($fmt) and return $lei->fail(<<""); + defined($fmt) and die <<""; --$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; + die <<"" if $fmt ne $ofmt; --$ofmt_key=$fmt and --output=$ofmt conflict } - my $devfd = $lei->path_to_fd($dst) // return; - $fmt //= $devfd >= 0 ? 'json' : (detect_fmt($lei, $dst) or return); + $fmt //= $devfd >= 0 ? 'json' : detect_fmt($dst); if (index($dst, '://') < 0) { # not a URL, so assume path $dst = $lei->canonpath_harder($dst); @@ -90,7 +89,7 @@ sub new { $opt->{pretty} //= $isatty; if (!$isatty && -f _) { my $fl = fcntl($lei->{$devfd}, F_GETFL, 0) // - return $lei->fail("fcntl(stdout): $!"); + die("fcntl(/dev/fd/$devfd): $!\n"); ovv_out_lk_init($self) unless ($fl & O_APPEND); } else { ovv_out_lk_init($self); @@ -101,14 +100,13 @@ sub new { if ($json) { $lei->{dedupe} //= PublicInbox::LeiDedupe->new($lei); } else { - $lei->{l2m} = eval { PublicInbox::LeiToMail->new($lei) }; - return $lei->fail($@) if $@; + $lei->{l2m} = PublicInbox::LeiToMail->new($lei); if ($opt->{mua} && $lei->{l2m}->lock_free) { $lei->{early_mua} = 1; $opt->{alert} //= [ ':WINCH,:bell' ] if -t $lei->{1}; } } - return $lei->fail('--shared is only for v2 inbox output') if + die("--shared is only for v2 inbox output\n") if $self->{fmt} ne 'v2' && $lei->{opt}->{shared}; $self; } @@ -141,11 +139,11 @@ sub _unbless_smsg { # num/tid are nonsensical with multi-inbox search, # lines/bytes are not generally useful delete @$smsg{qw(num tid lines bytes)}; - $smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt - $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate + $smsg->{rt} = iso8601(delete $smsg->{ts}); # JMAP receivedAt + $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}} = ($r =~ m/$MID_EXTRACT/go); } if (my $m = delete($smsg->{mid})) { $smsg->{'m'} = $m; @@ -214,7 +212,8 @@ sub ovv_each_smsg_cb { # runs in wq worker usually sub { my ($smsg, $mitem, $eml) = @_; $smsg->{pct} = get_pct($mitem) if $mitem; - $l2m->wq_io_do('write_mail', [], $smsg, $eml); + eval { $l2m->wq_io_do('write_mail', [], $smsg, $eml) }; + $lei->fail($@) if $@ && !$!{ECONNRESET} && !$!{EPIPE}; } } elsif ($self->{fmt} =~ /\A(concat)?json\z/ && $lei->{opt}->{pretty}) { my $EOR = ($1//'') eq 'concat' ? "\n}" : "\n},"; |