pop3: reduce memory use while generating the mailbox cache

[public-inbox.git] / lib / PublicInbox / LeiExternal.pm

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 5a54cc19281ea51f970ce769809c2a0b4bc131ef..30bb1a4579c74d8245d1eec7b66b9687bd526e71 100644 (file)
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -50,7 +50,7 @@ my %re_map = ( '*' => '[^/]*?', '?' => '[^/]',
                '[' => '[', ']' => ']', ',' => ',' );
 
 sub glob2re {
-       my $re = $_[-1];
+       my $re = $_[-1]; # $_[0] may be $lei
        my $p = '';
        my $in_bracket = 0;
        my $qm = 0;
@@ -101,35 +101,20 @@ sub get_externals {
                return (ext_canonicalize($loc));
        }
        if (scalar(@m) == 0) {
-               $self->fail("`$loc' is unknown");
+               die "`$loc' is unknown\n";
        } else {
-               $self->fail("`$loc' is ambiguous:\n", map { "\t$_\n" } @m);
+               die("`$loc' is ambiguous:\n", map { "\t$_\n" } @m, "\n");
        }
-       ();
 }
 
-# TODO: does this need JSON output?
-sub lei_ls_external {
-       my ($self, $filter) = @_;
-       my $opt = $self->{opt};
-       my $do_glob = !$opt->{globoff}; # glob by default
-       my ($OFS, $ORS) = $opt->{z} ? ("\0", "\0\0") : (" ", "\n");
-       $filter //= '*';
-       my $re = $do_glob ? glob2re($filter) : undef;
-       $re //= index($filter, '/') < 0 ?
-                       qr!/\Q$filter\E/?\z! : # exact basename match
-                       qr/\Q$filter\E/; # grep -F semantics
-       my @ext = externals_each($self, my $boost = {});
-       @ext = $opt->{'invert-match'} ? grep(!/$re/, @ext)
-                                       : grep(/$re/, @ext);
-       if ($opt->{'local'} && !$opt->{remote}) {
-               @ext = grep(!m!\A[a-z\+]+://!, @ext);
-       } elsif ($opt->{remote} && !$opt->{'local'}) {
-               @ext = grep(m!\A[a-z\+]+://!, @ext);
-       }
-       for my $loc (@ext) {
-               $self->out($loc, $OFS, 'boost=', $boost->{$loc}, $ORS);
+sub canonicalize_excludes {
+       my ($lei, $excludes) = @_;
+       my %x;
+       for my $loc (@$excludes) {
+               my @l = get_externals($lei, $loc, 1);
+               $x{$_} = 1 for @l;
        }
+       \%x;
 }
 
 # returns an anonymous sub which returns an array of potential results