From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/3] lei_input: set and prepare watches early
Date: Thu, 2 Sep 2021 10:17:57 +0000 [thread overview]
Message-ID: <20210902101758.18715-3-e@80x24.org> (raw)
In-Reply-To: <20210902101758.18715-1-e@80x24.org>
This will be needed as we track changes in real-time, especially
for "lei index" since there's no storage involved.
---
lib/PublicInbox/LeiInput.pm | 20 ++++++++++++++------
lib/PublicInbox/LeiStore.pm | 7 +++++++
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 88889f45..1b28f36f 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -225,6 +225,7 @@ sub prepare_inputs { # returns undef on error
my ($self, $lei, $inputs) = @_;
my $in_fmt = $lei->{opt}->{'in-format'};
my $sync = $lei->{opt}->{'mail-sync'} ? {} : undef; # using LeiMailSync
+ my $may_sync = $sync || $self->{-mail_sync};
if ($lei->{opt}->{stdin}) {
@$inputs and return
$lei->fail("--stdin and @$inputs do not mix");
@@ -267,12 +268,12 @@ sub prepare_inputs { # returns undef on error
} elsif (-d $input_path) {
$ifmt eq 'maildir' or return
$lei->fail("$ifmt not supported");
- $sync and $input = 'maildir:'.
+ $may_sync and $input = 'maildir:'.
$lei->abs_path($input_path);
push @md, $input;
} elsif ($self->{missing_ok} && !-e _) {
# for "lei rm-watch" on missing Maildir
- $sync and $input = 'maildir:'.
+ $may_sync and $input = 'maildir:'.
$lei->abs_path($input_path);
} else {
return $lei->fail("Unable to handle $input");
@@ -294,7 +295,7 @@ $input is `eml', not --in-format=$in_fmt
if ($sync) {
$input = $lei->abs_path($mdir) . "/$nc/$bn";
- push @{$sync->{ok}}, $input;
+ push @{$sync->{ok}}, $input if $sync;
}
require PublicInbox::MdirReader;
} else {
@@ -303,15 +304,15 @@ $input is `eml', not --in-format=$in_fmt
push @{$sync->{no}}, $input if $sync;
push @f, $input;
} elsif (-d "$input/new" && -d "$input/cur") {
- if ($sync) {
+ if ($may_sync) {
$input = 'maildir:'.
$lei->abs_path($input);
- push @{$sync->{ok}}, $input;
+ push @{$sync->{ok}}, $input if $sync;
}
push @md, $input;
} elsif ($self->{missing_ok} && !-e $input) {
# for lei rm-watch
- $sync and $input = 'maildir:'.
+ $may_sync and $input = 'maildir:'.
$lei->abs_path($input);
} else {
return $lei->fail("Unable to handle $input")
@@ -343,6 +344,13 @@ $input is `eml', not --in-format=$in_fmt
require PublicInbox::LeiPmdir;
$self->{pmd} = PublicInbox::LeiPmdir->new($lei, $self);
}
+
+ # start watching Maildirs ASAP
+ if ($may_sync && $lei->{sto}) {
+ grep(!m!\Amaildir:/!i, @md) and die "BUG: @md (no pfx)";
+ my $wait = $lei->{sto}->ipc_do('add_sync_folders', @md);
+ $lei->refresh_watches;
+ }
}
$self->{inputs} = $inputs;
}
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 6c557d99..0fa2d3c0 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -537,4 +537,11 @@ sub git_blob_id { # called via LEI->git_blob_id
git_sha(1, $eml)->hexdigest;
}
+# called by lei-daemon before lei->refresh_watches
+sub add_sync_folders {
+ my ($self, @folders) = @_;
+ my $lms = _lms_rw($self);
+ for my $f (@folders) { $lms->fid_for($f, 1) }
+}
+
1;
next prev parent reply other threads:[~2021-09-02 10:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 10:17 [PATCH 0/3] lei: auto keyword propagation to Maildirs Eric Wong
2021-09-02 10:17 ` [PATCH 1/3] lei_mail_sync: do not use transactions Eric Wong
2021-09-02 10:17 ` Eric Wong [this message]
2021-09-02 10:17 ` [PATCH 3/3] lei: propagate keyword changes from lei/store Eric Wong
2021-09-02 10:25 ` [SQUASH 4/3] t/lei-auto-watch: workaround for FreeBSD kevent Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210902101758.18715-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).