diff options
| -rw-r--r-- | lib/PublicInbox/LeiQuery.pm | 2 | ||||
| -rw-r--r-- | lib/PublicInbox/LeiSavedSearch.pm | 5 | ||||
| -rw-r--r-- | t/lei-q-save.t | 25 |
3 files changed, 25 insertions, 7 deletions
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm index 7456f7f9..7ddba4cf 100644 --- a/lib/PublicInbox/LeiQuery.pm +++ b/lib/PublicInbox/LeiQuery.pm @@ -143,7 +143,7 @@ no query allowed on command-line with --stdin PublicInbox::InputPipe::consume($self->{0}, \&qstr_add, $self); return; } - $mset_opt{q_raw} = \@argv; + $mset_opt{q_raw} = [ @argv ]; # copy $mset_opt{qstr} = $self->{lse}->query_argv_to_string($self->{lse}->git, \@argv); _start_query($self); diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm index 815008fd..e79cf76a 100644 --- a/lib/PublicInbox/LeiSavedSearch.pm +++ b/lib/PublicInbox/LeiSavedSearch.pm @@ -25,12 +25,13 @@ sub new { } else { # new saved search "lei q --save" my $saved_dir = $lei->store_path . '/../saved-searches/'; my (@name) = ($lei->{ovv}->{dst} =~ m{([\w\-\.]+)/*\z}); - push @name, to_filename($lei->{mset_opt}->{qstr}); + my $q = $lei->{mset_opt}->{q_raw} // die 'BUG: {q_raw} missing'; + my $q_raw_str = ref($q) ? "@$q" : $q; + push @name, to_filename($q_raw_str); $dir = $saved_dir . join('-', @name); require File::Path; File::Path::make_path($dir); # raises on error $self->{'-f'} = "$dir/lei.saved-search"; - my $q = $lei->{mset_opt}->{q_raw}; if (ref $q) { cfg_set($self, '--add', 'lei.q', $_) for @$q; } else { diff --git a/t/lei-q-save.t b/t/lei-q-save.t index a6d579cf..6cfac20b 100644 --- a/t/lei-q-save.t +++ b/t/lei-q-save.t @@ -2,24 +2,41 @@ # Copyright (C) 2021 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 PublicInbox::Smsg; my $doc1 = eml_load('t/plack-qp.eml'); +$doc1->header_set('Date', PublicInbox::Smsg::date({ds => time - (86400 * 5)})); my $doc2 = eml_load('t/utf8.eml'); +$doc2->header_set('Date', PublicInbox::Smsg::date({ds => time - (86400 * 4)})); + test_lei(sub { my $home = $ENV{HOME}; - lei_ok qw(import -q t/plack-qp.eml); - lei_ok qw(q -q --save z:0..), '-o', "$home/md/"; + 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', "$home/md/"; my %before = map { $_ => 1 } glob("$home/md/cur/*"); is_deeply(eml_load((keys %before)[0]), $doc1, 'doc1 matches'); my @s = glob("$home/.local/share/lei/saved-searches/md-*"); is(scalar(@s), 1, 'got one saved search'); + my $cfg = PublicInbox::Config->new("$s[0]/lei.saved-search"); + is_deeply($cfg->{'lei.q'}, ['z:0..', 'd:last.week..'], + 'store relative time, not parsed (absolute) timestamp'); # ensure "lei up" works, since it compliments "lei q --save" - lei_ok qw(import t/utf8.eml); - lei_ok qw(up), $s[0]; + $in = $doc2->as_string; + lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt }; + lei_ok qw(up -q), $s[0]; my %after = map { $_ => 1 } glob("$home/md/cur/*"); is(delete $after{(keys(%before))[0]}, 1, 'original message kept'); is(scalar(keys %after), 1, 'one new message added'); is_deeply(eml_load((keys %after)[0]), $doc2, 'doc2 matches'); + + # check stdin + lei_ok [qw(q --save - -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..', + 'q --stdin stores relative time'; }); done_testing; |