From 9048ddfeb4df5cd3a4a8373de48c7137aed55b29 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 9 Jun 2021 07:47:50 +0000 Subject: lei_mail_sync: hoist out --all handling from export-kw We'll be reusing it in other commands, too. --- lib/PublicInbox/LeiExportKw.pm | 32 ++------------------------------ lib/PublicInbox/LeiMailSync.pm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm index f8579221..671a84df 100644 --- a/lib/PublicInbox/LeiExportKw.pm +++ b/lib/PublicInbox/LeiExportKw.pm @@ -94,36 +94,8 @@ EOM lei mail_sync uninitialized, see lei-import(1) EOM my $opt = $lei->{opt}; - my $all = $opt->{all}; - if (defined $all) { # --all= - my %x = map { $_ => $_ } split(/,/, $all); - my @ok = grep(defined, delete(@x{qw(local remote), ''})); - my @no = keys %x; - if (@no) { - @no = (join(',', @no)); - return $lei->fail(<folders; - for my $ok (@ok) { - if ($ok eq 'local') { - @inc = grep(!m!\A[a-z0-9\+]+://!i, @all); - } elsif ($ok eq 'remote') { - @inc = grep(m!\A[a-z0-9\+]+://!i, @all); - } elsif ($ok ne '') { - return $lei->fail("--all=$all not understood"); - } else { - @inc = @all; - } - for (@inc) { - push(@folders, $_) unless $seen{$_}++; - } - } - return $lei->fail(<{all})) { # --all= + $lms->group2folders($lei, $all, \@folders) or return; } else { my $err = $lms->arg2folder($lei, \@folders); $lei->qerr(@{$err->{qerr}}) if $err->{qerr}; diff --git a/lib/PublicInbox/LeiMailSync.pm b/lib/PublicInbox/LeiMailSync.pm index 558988f3..49e521da 100644 --- a/lib/PublicInbox/LeiMailSync.pm +++ b/lib/PublicInbox/LeiMailSync.pm @@ -315,6 +315,42 @@ sub match_imap_url { "E: `$url' is ambiguous:\n\t".join("\n\t", @match)."\n"; } +# returns undef on failure, number on success +sub group2folders { + my ($self, $lei, $all, $folders) = @_; + return $lei->fail(< $_ } split(/,/, $all); + my @ok = grep(defined, delete(@x{qw(local remote), ''})); + my @no = keys %x; + if (@no) { + @no = (join(',', @no)); + return $lei->fail(<folders; + for my $ok (@ok) { + if ($ok eq 'local') { + @inc = grep(!m!\A[a-z0-9\+]+://!i, @all); + } elsif ($ok eq 'remote') { + @inc = grep(m!\A[a-z0-9\+]+://!i, @all); + } elsif ($ok ne '') { + return $lei->fail("--all=$all not understood"); + } else { + @inc = @all; + } + for (@inc) { + push(@$folders, $_) unless $seen{$_}++; + } + } + scalar(@$folders) || $lei->fail(<