diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | lib/PublicInbox/LEI.pm | 4 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiInput.pm | 8 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiRmWatch.pm | 31 | ||||
| -rw-r--r-- | t/lei-watch.t | 18 |
5 files changed, 57 insertions, 5 deletions
@@ -233,6 +233,7 @@ lib/PublicInbox/LeiQuery.pm lib/PublicInbox/LeiRediff.pm lib/PublicInbox/LeiRemote.pm lib/PublicInbox/LeiRm.pm +lib/PublicInbox/LeiRmWatch.pm lib/PublicInbox/LeiSavedSearch.pm lib/PublicInbox/LeiSearch.pm lib/PublicInbox/LeiSelfSocket.pm diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 52c551cf..191a0790 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -232,8 +232,10 @@ our %CMD = ( # sorted in order of importance/use: 'remove imported messages from IMAP, Maildirs, and MH', qw(exact! all jobs:i indexed), @c_opt ], -'add-watch' => [ 'LOCATION', 'watch for new messages and flag changes', +'add-watch' => [ 'LOCATION...', 'watch for new messages and flag changes', qw(poll-interval=s state=s recursive|r), @c_opt ], +'rm-watch' => [ 'LOCATION...', 'remove specified watch(es)', + qw(recursive|r), @c_opt ], 'ls-watch' => [ '[FILTER...]', 'list active watches with numbers and status', qw(l z|0), @c_opt ], 'pause-watch' => [ '[WATCH_NUMBER_OR_FILTER]', qw(all local remote), @c_opt ], diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm index fa330df5..88889f45 100644 --- a/lib/PublicInbox/LeiInput.pm +++ b/lib/PublicInbox/LeiInput.pm @@ -270,6 +270,10 @@ sub prepare_inputs { # returns undef on error $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:'. + $lei->abs_path($input_path); } else { return $lei->fail("Unable to handle $input"); } @@ -305,6 +309,10 @@ $input is `eml', not --in-format=$in_fmt push @{$sync->{ok}}, $input; } push @md, $input; + } elsif ($self->{missing_ok} && !-e $input) { + # for lei rm-watch + $sync and $input = 'maildir:'. + $lei->abs_path($input); } else { return $lei->fail("Unable to handle $input") } diff --git a/lib/PublicInbox/LeiRmWatch.pm b/lib/PublicInbox/LeiRmWatch.pm new file mode 100644 index 00000000..c0f336f0 --- /dev/null +++ b/lib/PublicInbox/LeiRmWatch.pm @@ -0,0 +1,31 @@ +# Copyright all contributors <meta@public-inbox.org> +# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> + +# "lei rm-watch" command +package PublicInbox::LeiRmWatch; +use strict; +use v5.10.1; +use parent qw(PublicInbox::LeiInput); + +sub lei_rm_watch { + my ($lei, @argv) = @_; + my $cfg = $lei->_lei_cfg(1); + $lei->{opt}->{'mail-sync'} = 1; # for prepare_inputs + my $self = bless { missing_ok => 1 }, __PACKAGE__; + $self->prepare_inputs($lei, \@argv) or return; + for my $w (@{$self->{inputs}}) { + $lei->_config('--remove-section', "watch.$w"); + } + delete $lei->{cfg}; # force reload + $lei->refresh_watches; +} + +sub _complete_rm_watch { + my ($lei, @argv) = @_; + my $cfg = $lei->_lei_cfg or return; + my $match_cb = $lei->complete_url_prepare(\@argv); + my @w = (join("\n", keys %$cfg) =~ m/^watch\.(.+?)\.state$/sgm); + map { $match_cb->($_) } @w; +} + +1; diff --git a/t/lei-watch.t b/t/lei-watch.t index 492f6c1d..9a3bfd80 100644 --- a/t/lei-watch.t +++ b/t/lei-watch.t @@ -2,7 +2,7 @@ # Copyright all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> use strict; use v5.10.1; use PublicInbox::TestCommon; -use File::Path qw(make_path); +use File::Path qw(make_path remove_tree); require_mods('lei'); my $have_fast_inotify = eval { require Linux::Inotify2 } || eval { require IO::KQueue }; @@ -71,9 +71,19 @@ test_lei(sub { 'inotify has Maildir watches'); } - is(xsys(qw(git config -f), $cfg_f, - '--remove-section', "watch.maildir:$md"), - 0, 'unset config state'); + lei_ok 'rm-watch', $md; + lei_ok 'ls-watch', \'refresh watches'; + is($lei_out, '', 'no watches left'); + + lei_ok 'add-watch', $md2; + remove_tree($md2); + lei_ok 'rm-watch', "maildir:".$md2, \'with maildir: prefix'; + lei_ok 'ls-watch', \'refresh watches'; + is($lei_out, '', 'no watches left'); + + lei_ok 'add-watch', $md; + remove_tree($md); + lei_ok 'rm-watch', $md, \'absolute path w/ missing dir'; lei_ok 'ls-watch', \'refresh watches'; is($lei_out, '', 'no watches left'); |