From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id EA5D61F5AE for ; Sat, 1 May 2021 19:29:06 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 6/5] lei import: fix --mail-sync handling in LeiInput Date: Sat, 1 May 2021 19:29:05 +0000 Message-Id: <20210501192905.43639-1-e@80x24.org> In-Reply-To: <20210501062117.21617-5-e@80x24.org> References: <20210501062117.21617-5-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: "lei inspect" also shows "mail-sync" as a field name --- lib/PublicInbox/LeiInput.pm | 8 ++++---- lib/PublicInbox/LeiInspect.pm | 2 +- t/lei-import-imap.t | 4 ++-- t/lei-import-maildir.t | 2 +- 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);