* [PATCH 2/3] lei_input: set and prepare watches early
2021-09-02 10:17 6% [PATCH 0/3] lei: auto keyword propagation to Maildirs Eric Wong
@ 2021-09-02 10:17 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-09-02 10:17 UTC (permalink / raw)
To: meta
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;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] lei: auto keyword propagation to Maildirs
@ 2021-09-02 10:17 6% Eric Wong
2021-09-02 10:17 7% ` [PATCH 2/3] lei_input: set and prepare watches early Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-09-02 10:17 UTC (permalink / raw)
To: meta
At least the tests pass, and getting t/lei-export-kw.t to pass
after 3/3 was no small feat, but I believe everything is more
correct now (especially after the 10-patch series posted
yesterday-ish).
Patches 1 and 2 were developed while fixing 3/3, since the stuff
in t/lei-auto-watch.t happened to work right away while
preserving the behavior of t/lei-export-kw.t (unchanged) proved
extremely challenging in my current mental state.
Eric Wong (3):
lei_mail_sync: do not use transactions
lei_input: set and prepare watches early
lei: propagate keyword changes from lei/store
MANIFEST | 1 +
lib/PublicInbox/LeiExportKw.pm | 24 +++----
lib/PublicInbox/LeiInput.pm | 20 ++++--
lib/PublicInbox/LeiMailSync.pm | 14 +---
lib/PublicInbox/LeiNoteEvent.pm | 14 ++--
lib/PublicInbox/LeiStore.pm | 122 +++++++++++++++++++++++++++++---
t/lei-auto-watch.t | 45 ++++++++++++
t/lei_mail_sync.t | 18 ++---
8 files changed, 196 insertions(+), 62 deletions(-)
create mode 100644 t/lei-auto-watch.t
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-09-02 10:17 6% [PATCH 0/3] lei: auto keyword propagation to Maildirs Eric Wong
2021-09-02 10:17 7% ` [PATCH 2/3] lei_input: set and prepare watches early 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).