* [PATCH 3/4] lei lcat: support maildir: paths, too
2021-05-30 6:33 7% [PATCH 0/4] lei lcat usability things Eric Wong
@ 2021-05-30 6:33 6% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-05-30 6:33 UTC (permalink / raw)
To: meta
This could be helpful in case when a Maildir is on a slow
or unmounted filesystem and lei/store is on fast storage.
---
lib/PublicInbox/LeiLcat.pm | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/lib/PublicInbox/LeiLcat.pm b/lib/PublicInbox/LeiLcat.pm
index 5bd20c1f..cb5eb5b4 100644
--- 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,17 +40,7 @@ sub lcat_imap_uri ($$) {
} elsif (defined(my $fid = $lms->fid_for($$uri))) {
push @{$lei->{lcat_fid}}, $fid;
} else {
- my $folders = [ $$uri ];
- 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: $uri");
- } else {
- for my $f (@$folders) {
- my $fid = $lms->fid_for($f);
- push @{$lei->{lcat_fid}}, $fid;
- }
- }
+ lcat_folder($lei, $lms, $$uri);
}
}
@@ -44,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//;
@@ -147,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;
^ permalink raw reply related [relevance 6%]
* [PATCH 0/4] lei lcat usability things
@ 2021-05-30 6:33 7% Eric Wong
2021-05-30 6:33 6% ` [PATCH 3/4] lei lcat: support maildir: paths, too Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-05-30 6:33 UTC (permalink / raw)
To: meta
Nothing major, just some things to make lcat nicer for the
inevitable network outages to come
Eric Wong (4):
lei lcat+inspect: start wiring up completion
lei lcat: allow IMAP folder URLs w/o UIDVALIDITY
lei lcat: support maildir:... paths, too
lei: support implicit stdin by default
lib/PublicInbox/LEI.pm | 12 ++++++++++--
lib/PublicInbox/LeiInspect.pm | 8 ++++++++
lib/PublicInbox/LeiLcat.pm | 33 ++++++++++++++++++++++++++++++---
lib/PublicInbox/LeiRediff.pm | 1 -
lib/PublicInbox/LeiRm.pm | 1 -
t/lei-import-imap.t | 3 +++
t/lei-p2q.t | 4 ++++
7 files changed, 55 insertions(+), 7 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-05-30 6:33 7% [PATCH 0/4] lei lcat usability things Eric Wong
2021-05-30 6:33 6% ` [PATCH 3/4] lei lcat: support maildir: paths, too Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).