From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F3BFE1FB07 for ; Fri, 17 Sep 2021 01:56:44 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH v2 5/6] lei refresh-mail-sync: implicitly remove missing folders Date: Thu, 16 Sep 2021 20:56:43 -0500 Message-Id: <20210917015644.32746-6-e@80x24.org> In-Reply-To: <20210917015644.32746-1-e@80x24.org> References: <20210917015644.32746-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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+ 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;