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 44BC81F934 for ; Tue, 20 Apr 2021 07:16:55 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] lei forget-search: new command to forget saved searches Date: Tue, 20 Apr 2021 07:16:54 +0000 Message-Id: <20210420071655.22700-2-e@80x24.org> In-Reply-To: <20210420071655.22700-1-e@80x24.org> References: <20210420071655.22700-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Readers may lose interest in subscription topics. This lets them avoid clutter by forgetting a saved search. This does not and will not destroy the contents of an --output mailbox. In other words, this is similar to unsubscribing from an Atom/RSS feed or NNTP group. I've also decided we won't support 'mv-search', since it'll probably be rarely used and "lei convert" can be used, instead. --- MANIFEST | 1 + lib/PublicInbox/LEI.pm | 4 ++-- lib/PublicInbox/LeiForgetSearch.pm | 32 ++++++++++++++++++++++++++++++ t/lei-q-save.t | 11 ++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 lib/PublicInbox/LeiForgetSearch.pm diff --git a/MANIFEST b/MANIFEST index f35c514c..d4055af4 100644 --- a/MANIFEST +++ b/MANIFEST @@ -191,6 +191,7 @@ lib/PublicInbox/LeiConvert.pm lib/PublicInbox/LeiCurl.pm lib/PublicInbox/LeiDedupe.pm lib/PublicInbox/LeiExternal.pm +lib/PublicInbox/LeiForgetSearch.pm lib/PublicInbox/LeiHelp.pm lib/PublicInbox/LeiImport.pm lib/PublicInbox/LeiInit.pm diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index c0385eb5..c3c79631 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -160,8 +160,8 @@ our %CMD = ( # sorted in order of importance/use: 'ls-search' => [ '[PREFIX]', 'list saved search queries', qw(format|f=s pretty l ascii z|0), @c_opt ], -'rm-query' => [ 'QUERY_NAME', 'remove a saved search', @c_opt ], -'mv-query' => [ qw(OLD_NAME NEW_NAME), 'rename a saved search', @c_opt ], +'forget-search' => [ 'OUTPUT', 'forget a saved search', + qw(verbose|v+), @c_opt ], 'plonk' => [ '--threads|--from=IDENT', 'exclude mail matching From: or threads from non-Message-ID searches', diff --git a/lib/PublicInbox/LeiForgetSearch.pm b/lib/PublicInbox/LeiForgetSearch.pm new file mode 100644 index 00000000..b5fe5fb1 --- /dev/null +++ b/lib/PublicInbox/LeiForgetSearch.pm @@ -0,0 +1,32 @@ +# Copyright (C) 2021 all contributors +# License: AGPL-3.0+ + +# "lei forget-search" forget/remove a saved search "lei q --save" +package PublicInbox::LeiForgetSearch; +use strict; +use v5.10.1; +use PublicInbox::LeiSavedSearch; +use PublicInbox::LeiUp; +use File::Path (); +use SelectSaver; + +sub lei_forget_search { + my ($lei, $out) = @_; + my $d = PublicInbox::LeiSavedSearch::lss_dir_for($lei, \$out); + if (-e $d) { + my $save; + my $opt = { safe => 1 }; + if ($lei->{opt}->{verbose}) { + $opt->{verbose} = 1; + $save = SelectSaver->new($lei->{2}); + } + File::Path::remove_tree($d, $opt); + } else { + $lei->fail("--save was not used with $out cwd=". + $lei->rel2abs('.')); + } +} + +*_complete_forget_search = \&PublicInbox::LeiUp::_complete_up; + +1; diff --git a/t/lei-q-save.t b/t/lei-q-save.t index 58342171..5a2f7fff 100644 --- a/t/lei-q-save.t +++ b/t/lei-q-save.t @@ -110,5 +110,16 @@ test_lei(sub { like($mb, qr//, 'new result written w/ -a'); lei_ok(qw(up --all=local)); + + ok(!lei(qw(forget-search), "$home/bogus"), 'bogus forget'); + lei_ok qw(_complete lei forget-search); + like($lei_out, qr/mbrd-aug/, 'forget-search completion'); + lei_ok(qw(forget-search -v), "$home/mbrd-aug"); + is($lei_out, '', 'no output'); + like($lei_err, qr/\bmbrd-aug\b/, '-v (verbose) reported unlinks'); + lei_ok qw(_complete lei forget-search); + unlike($lei_out, qr/mbrd-aug/, + 'forget-search completion cleared after forget'); + ok(!lei('up', "$home/mbrd-aug"), 'lei up fails after forget'); }); done_testing;