lei: attempt to canonicalize away "/../" pathnames

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

diff --git a/lib/PublicInbox/LeiLcat.pm b/lib/PublicInbox/LeiLcat.pm
index 81ab1e368ca8756e1ef048d44c2ed4141d403f7d..4a0c24a96bdb9f480163222ab28b4ef08e11f27c 100644 (file)
--- a/lib/PublicInbox/LeiLcat.pm
+++ b/lib/PublicInbox/LeiLcat.pm
@@ -11,10 +11,26 @@ use PublicInbox::LeiViewText;
 use URI::Escape qw(uri_unescape);
 use PublicInbox::MID qw($MID_EXTRACT);
 
+sub lcat_folder ($$$) {
+       my ($lei, $lms, $folder) = @_;
+       $lms //= $lei->{lse}->lms // return;
+       my $folders = [ $folder];
+       my $err = $lms->arg2folder($lei, $folders);
+       $lei->qerr(@{$err->{qerr}}) if $err && $err->{qerr};
+       if ($err && $err->{fail}) {
+               $lei->child_error(1 << 8, "# unknown folder: $folder");
+       } else {
+               for my $f (@$folders) {
+                       my $fid = $lms->fid_for($f);
+                       push @{$lei->{lcat_fid}}, $fid;
+               }
+       }
+}
+
 sub lcat_imap_uri ($$) {
        my ($lei, $uri) = @_;
        my $lms = $lei->{lse}->lms or return;
-       # cf. LeiToMail->wq_atexit_child
+       # cf. LeiXsearch->lcat_dump
        if (defined $uri->uid) {
                my $oidhex = $lms->imap_oid($lei, $uri);
                if (ref(my $err = $oidhex)) { # art2folder error
@@ -24,7 +40,7 @@ sub lcat_imap_uri ($$) {
        } elsif (defined(my $fid = $lms->fid_for($$uri))) {
                push @{$lei->{lcat_fid}}, $fid;
        } else {
-               $lei->child_error(1 << 8, "# unknown folder: $uri");
+               lcat_folder($lei, $lms, $$uri);
        }
 }
 
@@ -34,7 +50,10 @@ sub extract_1 ($$) {
                my $u = $1;
                require PublicInbox::URIimap;
                lcat_imap_uri($lei, PublicInbox::URIimap->new($u));
-               '""'; # blank query, using {lcat_blob} or {lcat
+               '""'; # blank query, using {lcat_blob} or {lcat_fid}
+       } elsif ($x =~ m!\b(maildir:.+)!i) {
+               lcat_folder($lei, undef, $1);
+               '""'; # blank query, using {lcat_blob} or {lcat_fid}
        } elsif ($x =~ m!\b([a-z]+?://\S+)!i) {
                my $u = $1;
                $u =~ s/[\>\]\)\,\.\;]+\z//;
@@ -109,7 +128,7 @@ sub _stdin { # PublicInbox::InputPipe::consume callback for --stdin
 sub lei_lcat {
        my ($lei, @argv) = @_;
        my $lxs = $lei->lxs_prepare or return;
-       $lei->ale->refresh_externals($lxs);
+       $lei->ale->refresh_externals($lxs, $lei);
        my $sto = $lei->_lei_store(1);
        $lei->{lse} = $sto->search;
        my $opt = $lei->{opt};
@@ -137,7 +156,7 @@ sub _complete_lcat {
        my $sto = $lei->_lei_store or return;
        my $lms = $sto->search->lms or return;
        my $match_cb = $lei->complete_url_prepare(\@argv);
-       grep(m!\A[a-z]+://!, map { $match_cb->($_) } $lms->folders);
+       map { $match_cb->($_) } $lms->folders;
 }
 
 1;