lei q: make --save the default

Since "lei up" is more often useful than not and incurs neglible
overhead; enable --save by default and allow --no-save to work.

This also fixes a long-standing when overwriting --output
destinations with saved searches:  dedupe data from previous
searches are reset and no longer influences the new (changed)
search, so results no longer go missing if two sequential
invocations of "lei q --save" point to the same --output.

4 files changed, 18 insertions, 15 deletions

diff --git a/t/lei-q-kw.t b/t/lei-q-kw.t
index 2e6be1f0..4edee72a 100644
--- a/t/lei-q-kw.t
+++ b/t/lei-q-kw.t
@@ -28,7 +28,8 @@ ok(!glob("$o/cur/*"), 'last result cleared after augment-import');
 
 lei_ok(qw(q -o), "maildir:$o", qw(m:qp@example.com));
 @fn = glob("$o/cur/*:2,S");
-is(scalar(@fn), 1, "`seen' flag set on Maildir file");
+is(scalar(@fn), 1, "`seen' flag set on Maildir file") or
+        diag "$o contents: ", explain([glob("$o/*/*")]);
 
 # ensure --no-import-before works
 my $n = $fn[0];
diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index eada2dd4..7aa9b84e 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -25,7 +25,7 @@ test_lei(sub {
         my $home = $ENV{HOME};
         my $in = $doc1->as_string;
         lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
-        lei_ok qw(q -q --save z:0.. d:last.week..), '-o', "MAILDIR:$home/md/";
+        lei_ok qw(q -q z:0.. d:last.week..), '-o', "MAILDIR:$home/md/";
         my %before = map { $_ => 1 } glob("$home/md/cur/*");
         my $f = (keys %before)[0] or xbail({before => \%before});
         is_deeply(eml_load($f), $doc1, 'doc1 matches');
@@ -52,8 +52,8 @@ test_lei(sub {
         is_deeply(eml_load($f), $doc2, 'doc2 matches');
 
         # check stdin
-        lei_ok [qw(q --save - -o), "mboxcl2:mbcl2" ],
-                undef, { -C => $home, %$lei_opt, 0 => \'d:last.week..'};
+        lei_ok [qw(q - -o), "mboxcl2:mbcl2" ], undef,
+                { -C => $home, %$lei_opt, 0 => \'d:last.week..'};
         @s = glob("$home/.local/share/lei/saved-searches/mbcl2-*");
         $cfg = PublicInbox::Config->new("$s[0]/lei.saved-search");
         is_deeply $cfg->{'lei.q'}, 'd:last.week..',
@@ -68,7 +68,11 @@ test_lei(sub {
         lei_ok([qw(up mbcl2)], undef, { -C => $home, %$lei_opt });
         ok(-s "$home/mbcl2" > $size, 'size increased after up');
 
-        ok(!lei(qw(up -q), $home), 'up fails w/o --save');
+        ok(!lei(qw(up -q), $home), 'up fails on unknown dir');
+        like($lei_err, qr/--save was not used/, 'error noted --save');
+
+        lei_ok(qw(q --no-save d:last.week.. -q -o), "$home/no-save");
+        ok(!lei(qw(up -q), "$home/no-save"), 'up fails on --no-save');
         like($lei_err, qr/--save was not used/, 'error noted --save');
 
         lei_ok qw(ls-search); my @d = split(/\n/, $lei_out);
@@ -94,7 +98,7 @@ test_lei(sub {
         open my $mb, '>', "$home/mbrd" or xbail "open $!";
         print $mb $pre_existing;
         close $mb or xbail "close: $!";
-        lei_ok(qw(q --save -o mboxrd:mbrd m:qp@example.com -C), $home);
+        lei_ok(qw(q -o mboxrd:mbrd m:qp@example.com -C), $home);
         open $mb, '<', "$home/mbrd" or xbail "open $!";
         is_deeply([grep(/pre-existing/, <$mb>)], [],
                 'pre-existing messsage gone w/o augment');
@@ -107,7 +111,7 @@ test_lei(sub {
         open $mb, '>', "$home/mbrd-aug" or xbail "open $!";
         print $mb $pre_existing;
         close $mb or xbail "close: $!";
-        lei_ok(qw(q -a --save -o mboxrd:mbrd-aug m:qp@example.com -C), $home);
+        lei_ok(qw(q -a -o mboxrd:mbrd-aug m:qp@example.com -C), $home);
         open $mb, '<', "$home/mbrd-aug" or xbail "open $!";
         $mb = do { local $/; <$mb> };
         like($mb, qr/pre-existing/, 'pre-existing message preserved w/ -a');
@@ -133,7 +137,7 @@ test_lei(sub {
         my $o = "$home/dd-mid";
         $in = $doc2->as_string . "\n-------\nappended list sig\n";
         lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
-        lei_ok(qw(q --dedupe=mid --save m:testmessage@example.com -o), $o);
+        lei_ok(qw(q --dedupe=mid m:testmessage@example.com -o), $o);
         my @m = glob("$o/cur/*");
         is(scalar(@m), 1, '--dedupe=mid w/ --save');
         $in = $doc2->as_string . "\n-------\nanother list sig\n";
@@ -143,8 +147,7 @@ test_lei(sub {
 
         for my $dd (qw(content)) {
                 $o = "$home/dd-$dd";
-                lei_ok(qw(q --save m:testmessage@example.com -o), $o,
-                                "--dedupe=$dd");
+                lei_ok(qw(q m:testmessage@example.com -o), $o, "--dedupe=$dd");
                 @m = glob("$o/cur/*");
                 is(scalar(@m), 3, 'all 3 matches with dedupe='.$dd);
         }
@@ -153,7 +156,7 @@ test_lei(sub {
         $o = "$home/dd-oid";
         my $ibx = create_inbox 'ibx', indexlevel => 'medium',
                         tmpdir => "$home/v1", sub {};
-        lei_ok(qw(q --save --dedupe=oid m:qp@example.com -o), $o,
+        lei_ok(qw(q --dedupe=oid m:qp@example.com -o), $o,
                 '-I', $ibx->{inboxdir});
         @m = glob("$o/cur/*");
         is(scalar(@m), 1, 'got first result');
@@ -203,8 +206,7 @@ test_lei(sub {
         lei_ok([qw(edit-search), $v2s], { VISUAL => 'cat', EDITOR => 'cat' });
         like($lei_out, qr/^\[lei/sm, 'edit-search can cat');
 
-        lei_ok('-C', "$home/v2s",
-                qw(q -q --save -o ../s m:testmessage@example.com));
+        lei_ok('-C', "$home/v2s", qw(q -q -o ../s m:testmessage@example.com));
         lei_ok qw(ls-search);
         unlike $lei_out, qr{/\.\./s$}sm, 'relative path not in ls-search';
         like $lei_out, qr{^\Q$home\E/s$}sm,
diff --git a/t/lei.t b/t/lei.t
index 8211c01d..dfbcb1f3 100644
--- a/t/lei.t
+++ b/t/lei.t
@@ -114,7 +114,7 @@ my $test_completion = sub {
         %out = map { $_ => 1 } split(/\s+/s, $lei_out);
         for my $sw (qw(-f --format -o --output --mfolder --augment -a
                         --mua --no-local --local --verbose -v
-                        --save --no-remote --remote --torsocks
+                        --save --no-save --no-remote --remote --torsocks
                         --reverse -r )) {
                 ok($out{$sw}, "$sw offered as `lei q' completion");
         }
diff --git a/t/lei_to_mail.t b/t/lei_to_mail.t
index 35904706..e8958c64 100644
--- a/t/lei_to_mail.t
+++ b/t/lei_to_mail.t
@@ -75,7 +75,7 @@ for my $mbox (@MBOX) {
 my ($tmpdir, $for_destroy) = tmpdir();
 local $ENV{TMPDIR} = $tmpdir;
 open my $err, '>>', "$tmpdir/lei.err" or BAIL_OUT $!;
-my $lei = bless { 2 => $err }, 'PublicInbox::LEI';
+my $lei = bless { 2 => $err, cmd => 'test' }, 'PublicInbox::LEI';
 my $commit = sub {
         $_[0] = undef; # wcb
         delete $lei->{1};