From 54da988cfb049ea2ffcc7abeaa3d026224656516 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 30 Mar 2021 09:39:27 +0000 Subject: lei tag: rename from "lei mark" I've decided "tag" is a better verb since it seems more widely-used term for associating metadata with data. Not only is it analogous to the "notmuch tag" command, but also makes sense when compared to tooling for manipulating metadata for non-mail data (e.g. audio metadata tags). There's even a Wikipedia entry for it: https://en.wikipedia.org/wiki/Tag_(metadata) whereas "mark" is used in the description, but has no entry of its own with regards to metadata. --- t/lei-mark.t | 91 ------------------------------------------------------------ t/lei-tag.t | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 t/lei-mark.t create mode 100644 t/lei-tag.t (limited to 't') diff --git a/t/lei-mark.t b/t/lei-mark.t deleted file mode 100644 index 98652c85..00000000 --- a/t/lei-mark.t +++ /dev/null @@ -1,91 +0,0 @@ -#!perl -w -# Copyright (C) 2021 all contributors -# License: AGPL-3.0+ -use strict; use v5.10.1; use PublicInbox::TestCommon; -require_git 2.6; -require_mods(qw(json DBD::SQLite Search::Xapian)); -my ($ro_home, $cfg_path) = setup_public_inboxes; -my $check_kw = sub { - my ($exp, %opt) = @_; - my $args = $opt{args} // []; - my $mid = $opt{mid} // 'testmessage@example.com'; - lei_ok('q', "m:$mid", @$args); - my $res = json_utf8->decode($lei_out); - is($res->[1], undef, 'only got one result'); - my $msg = $opt{msg} ? " $opt{msg}" : ''; - ($exp ? is_deeply($res->[0]->{kw}, $exp, "got @$exp$msg") - : is($res->[0]->{kw}, undef, "got undef$msg")) or - diag explain($res); - if (exists $opt{L}) { - $exp = $opt{L}; - ($exp ? is_deeply($res->[0]->{L}, $exp, "got @$exp$msg") - : is($res->[0]->{L}, undef, "got undef$msg")) or - diag explain($res); - } -}; - -test_lei(sub { - lei_ok(qw(ls-label)); is($lei_out, '', 'no labels, yet'); - lei_ok(qw(import t/utf8.eml)); - lei_ok(qw(mark t/utf8.eml +kw:flagged +L:urgent)); - $check_kw->(['flagged'], L => ['urgent']); - lei_ok(qw(ls-label)); is($lei_out, "urgent\n", 'label found'); - ok(!lei(qw(mark -F eml t/utf8.eml +kw:seeen)), 'bad kw rejected'); - like($lei_err, qr/`seeen' is not one of/, 'got helpful error'); - ok(!lei(qw(mark -F eml t/utf8.eml +k:seen)), 'bad prefix rejected'); - ok(!lei(qw(mark -F eml t/utf8.eml)), 'no keywords'); - my $mb = "$ENV{HOME}/mb"; - my $md = "$ENV{HOME}/md"; - lei_ok(qw(q m:testmessage@example.com -o), "mboxrd:$mb"); - ok(-s $mb, 'wrote mbox result'); - lei_ok(qw(q m:testmessage@example.com -o), $md); - my @fn = glob("$md/cur/*"); - scalar(@fn) == 1 or xbail $lei_err, 'no mail', \@fn; - rename($fn[0], "$fn[0]S") or BAIL_OUT "rename $!"; - $check_kw->(['flagged'], msg => 'after bad request'); - lei_ok(qw(mark -F eml t/utf8.eml -kw:flagged)); - $check_kw->(undef, msg => 'keyword cleared'); - lei_ok(qw(mark -F mboxrd +kw:seen), $mb); - $check_kw->(['seen'], msg => 'mbox Status ignored'); - lei_ok(qw(mark -kw:seen +kw:answered), $md); - $check_kw->(['answered'], msg => 'Maildir Status ignored'); - - open my $in, '<', 't/utf8.eml' or BAIL_OUT $!; - lei_ok([qw(mark -F eml - +kw:seen +L:nope)], - undef, { %$lei_opt, 0 => $in }); - $check_kw->(['answered', 'seen'], msg => 'stdin works'); - lei_ok(qw(q L:urgent)); - my $res = json_utf8->decode($lei_out); - is($res->[0]->{'m'}, 'testmessage@example.com', 'L: query works'); - lei_ok(qw(q kw:seen)); - my $r2 = json_utf8->decode($lei_out); - is_deeply($r2, $res, 'kw: query works, too') or - diag explain([$r2, $res]); - - lei_ok(qw(_complete lei mark)); - my %c = map { $_ => 1 } split(/\s+/, $lei_out); - ok($c{'+L:urgent'} && $c{'-L:urgent'} && - $c{'+L:nope'} && $c{'-L:nope'}, 'completed with labels'); - - my $mid = 'qp@example.com'; - lei_ok qw(q -f mboxrd --only), "$ro_home/t2", "mid:$mid"; - $in = $lei_out; - lei_ok [qw(mark -F mboxrd --stdin +kw:seen +L:qp)], - undef, { %$lei_opt, 0 => \$in }; - $check_kw->(['seen'], L => ['qp'], mid => $mid, - args => [ '--only', "$ro_home/t2" ], - msg => 'external-only message'); - lei_ok(qw(ls-label)); - is($lei_out, "nope\nqp\nurgent\n", 'ls-label shows qp'); - - lei_ok qw(mark -F eml t/utf8.eml +L:INBOX +L:x); diag $lei_err; - lei_ok qw(q m:testmessage@example.com); - $check_kw->([qw(answered seen)], L => [qw(INBOX nope urgent x)]); - lei_ok(qw(ls-label)); - is($lei_out, "INBOX\nnope\nqp\nurgent\nx\n", 'ls-label shows qp'); - - if (0) { # TODO label+kw search w/ externals - lei_ok(qw(q L:qp), "mid:$mid", '--only', "$ro_home/t2"); - } -}); -done_testing; diff --git a/t/lei-tag.t b/t/lei-tag.t new file mode 100644 index 00000000..5cb6d9ce --- /dev/null +++ b/t/lei-tag.t @@ -0,0 +1,91 @@ +#!perl -w +# Copyright (C) 2021 all contributors +# License: AGPL-3.0+ +use strict; use v5.10.1; use PublicInbox::TestCommon; +require_git 2.6; +require_mods(qw(json DBD::SQLite Search::Xapian)); +my ($ro_home, $cfg_path) = setup_public_inboxes; +my $check_kw = sub { + my ($exp, %opt) = @_; + my $args = $opt{args} // []; + my $mid = $opt{mid} // 'testmessage@example.com'; + lei_ok('q', "m:$mid", @$args); + my $res = json_utf8->decode($lei_out); + is($res->[1], undef, 'only got one result'); + my $msg = $opt{msg} ? " $opt{msg}" : ''; + ($exp ? is_deeply($res->[0]->{kw}, $exp, "got @$exp$msg") + : is($res->[0]->{kw}, undef, "got undef$msg")) or + diag explain($res); + if (exists $opt{L}) { + $exp = $opt{L}; + ($exp ? is_deeply($res->[0]->{L}, $exp, "got @$exp$msg") + : is($res->[0]->{L}, undef, "got undef$msg")) or + diag explain($res); + } +}; + +test_lei(sub { + lei_ok(qw(ls-label)); is($lei_out, '', 'no labels, yet'); + lei_ok(qw(import t/utf8.eml)); + lei_ok(qw(tag t/utf8.eml +kw:flagged +L:urgent)); + $check_kw->(['flagged'], L => ['urgent']); + lei_ok(qw(ls-label)); is($lei_out, "urgent\n", 'label found'); + ok(!lei(qw(tag -F eml t/utf8.eml +kw:seeen)), 'bad kw rejected'); + like($lei_err, qr/`seeen' is not one of/, 'got helpful error'); + ok(!lei(qw(tag -F eml t/utf8.eml +k:seen)), 'bad prefix rejected'); + ok(!lei(qw(tag -F eml t/utf8.eml)), 'no keywords'); + my $mb = "$ENV{HOME}/mb"; + my $md = "$ENV{HOME}/md"; + lei_ok(qw(q m:testmessage@example.com -o), "mboxrd:$mb"); + ok(-s $mb, 'wrote mbox result'); + lei_ok(qw(q m:testmessage@example.com -o), $md); + my @fn = glob("$md/cur/*"); + scalar(@fn) == 1 or xbail $lei_err, 'no mail', \@fn; + rename($fn[0], "$fn[0]S") or BAIL_OUT "rename $!"; + $check_kw->(['flagged'], msg => 'after bad request'); + lei_ok(qw(tag -F eml t/utf8.eml -kw:flagged)); + $check_kw->(undef, msg => 'keyword cleared'); + lei_ok(qw(tag -F mboxrd +kw:seen), $mb); + $check_kw->(['seen'], msg => 'mbox Status ignored'); + lei_ok(qw(tag -kw:seen +kw:answered), $md); + $check_kw->(['answered'], msg => 'Maildir Status ignored'); + + open my $in, '<', 't/utf8.eml' or BAIL_OUT $!; + lei_ok([qw(tag -F eml - +kw:seen +L:nope)], + undef, { %$lei_opt, 0 => $in }); + $check_kw->(['answered', 'seen'], msg => 'stdin works'); + lei_ok(qw(q L:urgent)); + my $res = json_utf8->decode($lei_out); + is($res->[0]->{'m'}, 'testmessage@example.com', 'L: query works'); + lei_ok(qw(q kw:seen)); + my $r2 = json_utf8->decode($lei_out); + is_deeply($r2, $res, 'kw: query works, too') or + diag explain([$r2, $res]); + + lei_ok(qw(_complete lei tag)); + my %c = map { $_ => 1 } split(/\s+/, $lei_out); + ok($c{'+L:urgent'} && $c{'-L:urgent'} && + $c{'+L:nope'} && $c{'-L:nope'}, 'completed with labels'); + + my $mid = 'qp@example.com'; + lei_ok qw(q -f mboxrd --only), "$ro_home/t2", "mid:$mid"; + $in = $lei_out; + lei_ok [qw(tag -F mboxrd --stdin +kw:seen +L:qp)], + undef, { %$lei_opt, 0 => \$in }; + $check_kw->(['seen'], L => ['qp'], mid => $mid, + args => [ '--only', "$ro_home/t2" ], + msg => 'external-only message'); + lei_ok(qw(ls-label)); + is($lei_out, "nope\nqp\nurgent\n", 'ls-label shows qp'); + + lei_ok qw(tag -F eml t/utf8.eml +L:INBOX +L:x); diag $lei_err; + lei_ok qw(q m:testmessage@example.com); + $check_kw->([qw(answered seen)], L => [qw(INBOX nope urgent x)]); + lei_ok(qw(ls-label)); + is($lei_out, "INBOX\nnope\nqp\nurgent\nx\n", 'ls-label shows qp'); + + if (0) { # TODO label+kw search w/ externals + lei_ok(qw(q L:qp), "mid:$mid", '--only', "$ro_home/t2"); + } +}); +done_testing; -- cgit v1.2.3-24-ge0c7