From: Eric Wong Date: Sat, 25 Sep 2021 08:49:45 +0000 (+0000) Subject: lei ls-external: split into separate file X-Git-Tag: v1.7.0~269 X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=40a52db17d468ab81d19d55333e390ab6e4ceedc lei ls-external: split into separate file This was written before we had auto-loading and rarely used. --- diff --git a/MANIFEST b/MANIFEST index 8db9cdc7..3e942855 100644 --- a/MANIFEST +++ b/MANIFEST @@ -230,6 +230,7 @@ lib/PublicInbox/LeiInit.pm lib/PublicInbox/LeiInput.pm lib/PublicInbox/LeiInspect.pm lib/PublicInbox/LeiLcat.pm +lib/PublicInbox/LeiLsExternal.pm lib/PublicInbox/LeiLsLabel.pm lib/PublicInbox/LeiLsMailSource.pm lib/PublicInbox/LeiLsMailSync.pm diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm index 5a54cc19..701d1ad5 100644 --- 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; @@ -108,30 +108,6 @@ sub get_externals { (); } -# 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); - } -} - # returns an anonymous sub which returns an array of potential results sub complete_url_prepare { my $argv = $_[-1]; # $_[0] may be $lei diff --git a/lib/PublicInbox/LeiLsExternal.pm b/lib/PublicInbox/LeiLsExternal.pm new file mode 100644 index 00000000..dd2eb2e7 --- /dev/null +++ b/lib/PublicInbox/LeiLsExternal.pm @@ -0,0 +1,32 @@ +# Copyright (C) all contributors +# License: AGPL-3.0+ + +# "lei ls-external" command +package PublicInbox::LeiLsExternal; +use strict; +use v5.10.1; + +# TODO: does this need JSON output? +sub lei_ls_external { + my ($lei, $filter) = @_; + my $do_glob = !$lei->{opt}->{globoff}; # glob by default + my ($OFS, $ORS) = $lei->{opt}->{z} ? ("\0", "\0\0") : (" ", "\n"); + $filter //= '*'; + my $re = $do_glob ? $lei->glob2re($filter) : undef; + $re //= index($filter, '/') < 0 ? + qr!/\Q$filter\E/?\z! : # exact basename match + qr/\Q$filter\E/; # grep -F semantics + my @ext = $lei->externals_each(my $boost = {}); + @ext = $lei->{opt}->{'invert-match'} ? grep(!/$re/, @ext) + : grep(/$re/, @ext); + if ($lei->{opt}->{'local'} && !$lei->{opt}->{remote}) { + @ext = grep(!m!\A[a-z\+]+://!, @ext); + } elsif ($lei->{opt}->{remote} && !$lei->{opt}->{'local'}) { + @ext = grep(m!\A[a-z\+]+://!, @ext); + } + for my $loc (@ext) { + $lei->out($loc, $OFS, 'boost=', $boost->{$loc}, $ORS); + } +} + +1;