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 583061F934 for ; Tue, 27 Apr 2021 11:07:53 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/5] lei: add "ls-sync" command for listing sync folders Date: Tue, 27 Apr 2021 11:07:49 +0000 Message-Id: <20210427110753.24609-2-e@80x24.org> In-Reply-To: <20210427110753.24609-1-e@80x24.org> References: <20210427110753.24609-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This will be useful, later. --- MANIFEST | 1 + lib/PublicInbox/LEI.pm | 2 ++ lib/PublicInbox/LeiExternal.pm | 2 +- lib/PublicInbox/LeiLsSync.pm | 29 +++++++++++++++++++++++++++++ t/lei-import-imap.t | 2 ++ t/lei-import-maildir.t | 3 +++ 6 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 lib/PublicInbox/LeiLsSync.pm diff --git a/MANIFEST b/MANIFEST index ce824fcf..d4e7d66f 100644 --- a/MANIFEST +++ b/MANIFEST @@ -202,6 +202,7 @@ lib/PublicInbox/LeiInput.pm lib/PublicInbox/LeiInspect.pm lib/PublicInbox/LeiLsLabel.pm lib/PublicInbox/LeiLsSearch.pm +lib/PublicInbox/LeiLsSync.pm lib/PublicInbox/LeiMailSync.pm lib/PublicInbox/LeiMirror.pm lib/PublicInbox/LeiOverview.pm diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 39278de6..c170572b 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -161,6 +161,8 @@ our %CMD = ( # sorted in order of importance/use: 'ls-external' => [ '[FILTER]', 'list publicinbox|extindex locations', qw(format|f=s z|0 globoff|g invert-match|v local remote), @c_opt ], 'ls-label' => [ '', 'list labels', qw(z|0 stats:s), @c_opt ], +'ls-sync' => [ '', 'list sync folders', + qw(z|0 z|0 globoff|g invert-match|v local remote), @c_opt ], 'forget-external' => [ 'LOCATION...|--prune', 'exclude further results from a publicinbox|extindex', qw(prune), @c_opt ], diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm index b0ebe947..3858085e 100644 --- a/lib/PublicInbox/LeiExternal.pm +++ b/lib/PublicInbox/LeiExternal.pm @@ -50,7 +50,7 @@ my %re_map = ( '*' => '[^/]*?', '?' => '[^/]', '[' => '[', ']' => ']', ',' => ',' ); sub glob2re { - my ($re) = @_; + my $re = $_[-1]; my $p = ''; my $in_bracket = 0; my $qm = 0; diff --git a/lib/PublicInbox/LeiLsSync.pm b/lib/PublicInbox/LeiLsSync.pm new file mode 100644 index 00000000..71f111a9 --- /dev/null +++ b/lib/PublicInbox/LeiLsSync.pm @@ -0,0 +1,29 @@ +# Copyright (C) 2021 all contributors +# License: AGPL-3.0+ + +# front-end for the "lei ls-sync" sub-command +package PublicInbox::LeiLsSync; +use strict; +use v5.10.1; +use PublicInbox::LeiMailSync; + +sub lei_ls_sync { + my ($lei, $filter) = @_; + my $sto = $lei->_lei_store or return; + my $lms = $sto->search->lms or return; + my $opt = $lei->{opt}; + my $re; + $re = defined($filter) ? qr/\Q$filter\E/ : qr/./ if $opt->{globoff}; + $re //= $lei->glob2re($filter // '*'); + my @f = $lms->folders; + @f = $opt->{'invert-match'} ? grep(!/$re/, @f) : grep(/$re/, @f); + if ($opt->{'local'} && !$opt->{remote}) { + @f = grep(!m!\A[a-z\+]+://!i, @f); + } elsif ($opt->{remote} && !$opt->{'local'}) { + @f = grep(m!\A[a-z\+]+://!i, @f); + } + my $ORS = $opt->{z} ? "\0" : "\n"; + $lei->out(join($ORS, @f, '')); +} + +1; diff --git a/t/lei-import-imap.t b/t/lei-import-imap.t index 4a3bd6d8..376a8b48 100644 --- a/t/lei-import-imap.t +++ b/t/lei-import-imap.t @@ -22,6 +22,8 @@ test_lei({ tmpdir => $tmpdir }, sub { is_deeply(json_utf8->decode($lei_out), {}, 'no inspect stats, yet'); lei_ok('import', $url); + lei_ok 'ls-sync'; + like($lei_out, qr!\A\Q$url\E;UIDVALIDITY=\d+\n\z!, 'ls-sync'); lei_ok('inspect', $url); my $inspect = json_utf8->decode($lei_out); diff --git a/t/lei-import-maildir.t b/t/lei-import-maildir.t index 3e3d9188..808e1a73 100644 --- a/t/lei-import-maildir.t +++ b/t/lei-import-maildir.t @@ -40,6 +40,9 @@ test_lei(sub { is_deeply($inspect, { sync => { "maildir:$md" => [ 'x:2,S' ] } }, 'maildir sync info as expected'); + lei_ok qw(ls-sync); + is($lei_out, "maildir:$md\n", 'ls-sync as expected'); + lei_ok(qw(import), $md, \'import Maildir again'); $imp_err = $lei_err; lei_ok(qw(q -d none s:boolean), \'lei q w/o dedupe');