about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-05-01 19:29:05 +0000
committerEric Wong <e@80x24.org>2021-05-01 23:12:40 +0000
commit0d00fb2ee87d714ede9f8937dde9bae8d778804d (patch)
tree5b2753a48cf4b8e7808de2ddd9e64f8226497c13
parentcb0e9d42b799c7489c3b8328cfcae1e1500bc7a0 (diff)
downloadpublic-inbox-0d00fb2ee87d714ede9f8937dde9bae8d778804d.tar.gz
"lei inspect" also shows "mail-sync" as a field name
-rw-r--r--lib/PublicInbox/LeiInput.pm8
-rw-r--r--lib/PublicInbox/LeiInspect.pm2
-rw-r--r--t/lei-import-imap.t4
-rw-r--r--t/lei-import-maildir.t2
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 86f300c3..9bcc86e1 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -204,7 +204,7 @@ sub prepare_http_input ($$$) {
 sub prepare_inputs { # returns undef on error
         my ($self, $lei, $inputs) = @_;
         my $in_fmt = $lei->{opt}->{'in-format'};
-        my $sync = $lei->{opt}->{sync} ? {} : undef; # using LeiMailSync
+        my $sync = $lei->{opt}->{'mail-sync'} ? {} : undef; # using LeiMailSync
         if ($lei->{opt}->{stdin}) {
                 @$inputs and return
                         $lei->fail("--stdin and @$inputs do not mix");
@@ -286,11 +286,11 @@ $input is `eml', not --in-format=$in_fmt
         }
         if ($sync && $sync->{no}) {
                 return $lei->fail(<<"") if !$sync->{ok};
---sync specified but no inputs support it
+--mail-sync specified but no inputs support it
 
                 # non-fatal if some inputs support support sync
-                $lei->err("# --sync will only be used for @{$sync->{ok}}");
-                $lei->err("# --sync is not supported for: @{$sync->{no}}");
+                $lei->err("# --mail-sync will only be used for @{$sync->{ok}}");
+                $lei->err("# --mail-sync is not supported for: @{$sync->{no}}");
         }
         if ($net) {
                 $net->{-can_die} = 1;
diff --git a/lib/PublicInbox/LeiInspect.pm b/lib/PublicInbox/LeiInspect.pm
index 6cfc8083..714d2526 100644
--- a/lib/PublicInbox/LeiInspect.pm
+++ b/lib/PublicInbox/LeiInspect.pm
@@ -18,7 +18,7 @@ sub inspect_blob ($$) {
                 $ent->{'lei/store'} = \@docids if @docids;
                 my $lms = $lse->lms;
                 if (my $loc = $lms ? $lms->locations_for($oidhex) : undef) {
-                        $ent->{sync} = $loc;
+                        $ent->{'mail-sync'} = $loc;
                 }
         }
         $ent;
diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t
index 3a1fff4c..fd15ef4f 100644
--- a/t/lei-import-imap.t
+++ b/t/lei-import-imap.t
@@ -54,8 +54,8 @@ test_lei({ tmpdir => $tmpdir }, sub {
         lei_ok('inspect', "blob:$out->[5]->{blob}");
         my $x = json_utf8->decode($lei_out);
         is(ref($x->{'lei/store'}), 'ARRAY', 'lei/store in inspect');
-        is(ref($x->{sync}), 'HASH', 'sync in inspect');
-        is(ref($x->{sync}->{$k[0]}), 'ARRAY', 'UID arrays in inspect');
+        is(ref($x->{'mail-sync'}), 'HASH', 'sync in inspect');
+        is(ref($x->{'mail-sync'}->{$k[0]}), 'ARRAY', 'UID arrays in inspect');
 
         my $psgi_attach = 'cfa3622cbeffc9bd6b0fc66c4d60d420ba74f60d';
         lei_ok('blob', $psgi_attach);
diff --git a/t/lei-import-maildir.t b/t/lei-import-maildir.t
index 02fe43e1..b85d3026 100644
--- a/t/lei-import-maildir.t
+++ b/t/lei-import-maildir.t
@@ -37,7 +37,7 @@ test_lei(sub {
         lei_ok('inspect', "blob:$res->[0]->{blob}");
         $inspect = json_utf8->decode($lei_out);
         is(ref(delete $inspect->{"lei/store"}), 'ARRAY', 'lei/store IDs');
-        is_deeply($inspect, { sync => { "maildir:$md" => [ 'x:2,S' ] } },
+        is_deeply($inspect, { 'mail-sync' => { "maildir:$md" => [ 'x:2,S' ] } },
                 'maildir sync info as expected');
 
         lei_ok qw(ls-mail-sync);