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 9FA351F9F4 for ; Sat, 25 Sep 2021 08:49:45 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/3] lei ls-external: split into separate file Date: Sat, 25 Sep 2021 08:49:45 +0000 Message-Id: <20210925084945.15899-4-e@80x24.org> In-Reply-To: <20210925084945.15899-1-e@80x24.org> References: <20210925084945.15899-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: This was written before we had auto-loading and rarely used. --- MANIFEST | 1 + lib/PublicInbox/LeiExternal.pm | 26 +------------------------- lib/PublicInbox/LeiLsExternal.pm | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 lib/PublicInbox/LeiLsExternal.pm diff --git a/MANIFEST b/MANIFEST index 8db9cdc791bb..3e942855127f 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 5a54cc19281e..701d1ad53adf 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 000000000000..dd2eb2e7d16e --- /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;