about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-09-16 20:56:43 -0500
committerEric Wong <e@80x24.org>2021-09-17 04:41:06 +0000
commita6b2025c0ac0e9619dbe164c1b28a35bf25576a3 (patch)
tree8b967e20866a0e4c84584b24e2860095349fb585
parent76d110573f75d577228217eab44477dcc691116e (diff)
downloadpublic-inbox-a6b2025c0ac0e9619dbe164c1b28a35bf25576a3.tar.gz
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.
-rw-r--r--lib/PublicInbox/LeiInput.pm11
-rw-r--r--lib/PublicInbox/LeiRefreshMailSync.pm5
-rw-r--r--t/lei-refresh-mail-sync.t10
3 files changed, 25 insertions, 1 deletions
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;