about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-10-19 09:33:45 +0000
committerEric Wong <e@80x24.org>2021-10-19 17:29:22 +0000
commit05ba3513ab45618956739731e11c6e9cd8924bdc (patch)
tree63984d4c886f1edfb206f07662bc64470bd99315
parent1f887bd51d92b0d4fea4d8e3c36f4328c6b0ae76 (diff)
downloadpublic-inbox-05ba3513ab45618956739731e11c6e9cd8924bdc.tar.gz
While inspect is intended for debugging, the Unix epoch in
seconds requires extra steps for human consumption; just
steal what we used for "lei q -f json" output.
-rw-r--r--lib/PublicInbox/LeiInspect.pm5
-rw-r--r--lib/PublicInbox/LeiOverview.pm6
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm
index 38ef3ad9..5ea32ccb 100644
--- a/lib/PublicInbox/LeiInspect.pm
+++ b/lib/PublicInbox/LeiInspect.pm
@@ -12,10 +12,15 @@ use parent qw(PublicInbox::IPC);
 use PublicInbox::Config;
 use PublicInbox::MID qw(mids);
 use PublicInbox::NetReader qw(imap_uri nntp_uri);
+use POSIX qw(strftime);
+use PublicInbox::LeiOverview;
+*iso8601 = \&PublicInbox::LeiOverview::iso8601;
 
 sub _json_prep ($) {
         my ($smsg) = @_;
         $smsg->{$_} += 0 for qw(bytes lines); # integerize
+        $smsg->{dt} = iso8601($smsg->{ds}) if defined($smsg->{ds});
+        $smsg->{rt} = iso8601($smsg->{ts}) if defined($smsg->{ts});
         +{ %$smsg } # unbless and scalarize
 }
 
diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 1b9dc970..2d3db9f4 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 ($) {
@@ -139,8 +139,8 @@ 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) ];