* [PATCH v2 0/6] lei refresh-mail-sync: another try...
@ 2021-09-17 1:56 7% Eric Wong
2021-09-17 1:56 5% ` [PATCH v2 5/6] lei refresh-mail-sync: implicitly remove missing folders Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-09-17 1:56 UTC (permalink / raw)
To: meta
OK, so a bunch of things were broken/annoying in my initial
patch @ <20210916094116.11457-3-e@80x24.org>
2/6 was only exposed in real-world usage with giant folders;
and a testcase is still pending for that...
Eric Wong (6):
lei refresh-mail-sync: replace prune-mail-sync
lei_mail_sync: don't hold statement handle into callback
lei refresh-mail-sync: remove "gone" notices
lei refresh-mail-sync: drop unused {verify} code path
lei refresh-mail-sync: implicitly remove missing folders
lei refresh-mail-sync: drop old IMAP folder info
MANIFEST | 3 +-
lib/PublicInbox/LEI.pm | 3 +-
lib/PublicInbox/LeiInput.pm | 11 +-
lib/PublicInbox/LeiMailSync.pm | 41 ++++--
...PruneMailSync.pm => LeiRefreshMailSync.pm} | 79 +++++-----
lib/PublicInbox/LeiStore.pm | 5 +
t/lei-export-kw.t | 1 -
t/lei-refresh-mail-sync.t | 137 ++++++++++++++++++
8 files changed, 231 insertions(+), 49 deletions(-)
rename lib/PublicInbox/{LeiPruneMailSync.pm => LeiRefreshMailSync.pm} (52%)
create mode 100644 t/lei-refresh-mail-sync.t
^ permalink raw reply [relevance 7%]
* [PATCH v2 5/6] lei refresh-mail-sync: implicitly remove missing folders
2021-09-17 1:56 7% [PATCH v2 0/6] lei refresh-mail-sync: another try Eric Wong
@ 2021-09-17 1:56 5% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-09-17 1:56 UTC (permalink / raw)
To: meta
There's no point in keeping mail_sync.sqlite3 entries around
if the folder is gone. We do keep saved-search configs around,
however, since somebody may decide to blow away a search and
start over.
---
lib/PublicInbox/LeiInput.pm | 11 ++++++++++-
lib/PublicInbox/LeiRefreshMailSync.pm | 5 +++++
t/lei-refresh-mail-sync.t | 10 ++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 8ce445c8..372e0fe1 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -124,7 +124,11 @@ sub input_path_url {
handle_http_input($self, $input, @args);
return;
}
+
+ # local-only below
+ my $ifmt_pfx = '';
if ($input =~ s!\A([a-z0-9]+):!!i) {
+ $ifmt_pfx = "$1:";
$ifmt = lc($1);
} elsif ($input =~ /\.(?:patch|eml)\z/i) {
$ifmt = 'eml';
@@ -172,11 +176,16 @@ EOM
$self->can('input_maildir_cb'),
$self, @args);
}
+ } elsif ($self->{missing_ok} && !-e $input) { # don't ->fail
+ $self->folder_missing("$ifmt:$input");
} else {
- $lei->fail("$input unsupported (TODO)");
+ $lei->fail("$ifmt_pfx$input unsupported (TODO)");
}
}
+# subclasses should overrride this (see LeiRefreshMailSync)
+sub folder_missing { die "BUG: ->folder_missing undefined for $_[0]" }
+
sub bad_http ($$;$) {
my ($lei, $url, $alt) = @_;
my $x = $alt ? "did you mean <$alt>?" : 'download and import manually';
diff --git a/lib/PublicInbox/LeiRefreshMailSync.pm b/lib/PublicInbox/LeiRefreshMailSync.pm
index 4cae1536..19f64b58 100644
--- a/lib/PublicInbox/LeiRefreshMailSync.pm
+++ b/lib/PublicInbox/LeiRefreshMailSync.pm
@@ -11,6 +11,11 @@ use PublicInbox::LeiExportKw;
use PublicInbox::InboxWritable qw(eml_from_path);
use PublicInbox::Import;
+sub folder_missing {
+ my ($self, $folder) = @_;
+ $self->{lei}->{sto}->ipc_do('lms_forget_folders', $folder);
+}
+
sub prune_mdir { # lms->each_src callback
my ($oidbin, $id, $self, $mdir) = @_;
my @try = $$id =~ /:2,[a-zA-Z]*\z/ ? qw(cur new) : qw(new cur);
diff --git a/t/lei-refresh-mail-sync.t b/t/lei-refresh-mail-sync.t
index ff558277..d3438011 100644
--- a/t/lei-refresh-mail-sync.t
+++ b/t/lei-refresh-mail-sync.t
@@ -3,6 +3,7 @@
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict; use v5.10.1; use PublicInbox::TestCommon;
require_mods(qw(lei));
+use File::Path qw(remove_tree);
my $stop_daemon = sub { # needed since we don't have inotify
lei_ok qw(daemon-pid);
@@ -62,6 +63,15 @@ test_lei({ daemon_only => 1 }, sub {
lei_ok 'inspect', "blob:$oid";
is_deeply(json_utf8->decode($lei_out), $exp1,
'replaced file noted again');
+
+ $stop_daemon->();
+
+ remove_tree($d);
+ lei_ok 'refresh-mail-sync', '--all';
+ lei_ok 'inspect', "blob:$oid";
+ is($lei_out, '{}', 'no known locations after "removal"');
+ lei_ok 'ls-mail-sync';
+ is($lei_out, '', 'no sync left when folder is gone');
});
done_testing;
^ permalink raw reply related [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-09-17 1:56 7% [PATCH v2 0/6] lei refresh-mail-sync: another try Eric Wong
2021-09-17 1:56 5% ` [PATCH v2 5/6] lei refresh-mail-sync: implicitly remove missing folders 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).