alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

store: update to use Message; big cleanup

Browse Source 
Remove much of the message processing from the store
This commit is contained in:
Dirk-Jan C. Binnema
2022-04-28 22:59:03 +03:00
parent 459f6db476
commit 525fef479a
4 changed files with 257 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
lib/tests/test-mu-store.cc
View File

@ -52,31 +52,178 @@ test_store_ctor_dtor()
static void
test_store_add_count_remove()
{
TempDir tempdir;
Mu::Store store{tempdir.path(), MuTestMaildir, {}, {}};
TempDir tempdir{false};
const auto id1 = store.add_message(MuTestMaildir + "/cur/1283599333.1840_11.cthulhu!2,");
Mu::Store store{tempdir.path() + "/xapian", MuTestMaildir, {}, {}};
const auto msgpath{MuTestMaildir + "/cur/1283599333.1840_11.cthulhu!2,"};
const auto id1 = store.add_message(msgpath);
assert_valid_result(id1);
store.commit();
g_assert_cmpuint(store.size(), ==, 1);
g_assert_true(store.contains_message(MuTestMaildir + "/cur/1283599333.1840_11.cthulhu!2,"));
g_assert_true(store.contains_message(msgpath));
g_assert_true(store.contains_message(msgpath));
const auto id2 = store.add_message(MuTestMaildir2 + "/bar/cur/mail3");
assert_valid_result(id2);
g_assert_false(!!id2); // wrong maildir.
store.commit();
const auto msg3path{MuTestMaildir + "/cur/1252168370_3.14675.cthulhu!2,S"};
const auto id3 = store.add_message(msg3path);
assert_valid_result(id3);
g_assert_cmpuint(store.size(), ==, 2);
g_assert_true(store.contains_message(MuTestMaildir2 + "/bar/cur/mail3"));
g_assert_true(store.contains_message(msg3path));
store.remove_message(id1.value());
g_assert_cmpuint(store.size(), ==, 1);
g_assert_false(
store.contains_message(MuTestMaildir + "/cur/1283599333.1840_11.cthulhu!2,"));
store.remove_message(MuTestMaildir2 + "/bar/cur/mail3");
store.remove_message(msg3path);
g_assert_true(store.empty());
g_assert_false(store.contains_message(MuTestMaildir2 + "/bar/cur/mail3"));
g_assert_false(store.contains_message(msg3path));
}
static void
test_message_mailing_list()
{
constexpr const char *test_message_1 =
R"(Return-Path: <sqlite-dev-bounces@sqlite.org>
X-Original-To: xxxx@localhost
Delivered-To: xxxx@localhost
Received: from mindcrime (localhost [127.0.0.1])
by mail.xxxxsoftware.nl (Postfix) with ESMTP id 32F276963F
for <xxxx@localhost>; Mon, 4 Aug 2008 21:49:34 +0300 (EEST)
Message-Id: <83B5AF40-DBFA-4578-A043-04C80276E195@sqlabs.net>
From: anon@example.com
To: sqlite-dev@sqlite.org
Mime-Version: 1.0 (Apple Message framework v926)
Date: Mon, 4 Aug 2008 11:40:49 +0200
X-Mailer: Apple Mail (2.926)
Subject: Capybaras United
Precedence: list
Reply-To: sqlite-dev@sqlite.org
List-Id: <sqlite-dev.sqlite.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: sqlite-dev-bounces@sqlite.org
Content-Length: 639
Inside sqlite3VdbeExec there is a very big switch statement.
In order to increase performance with few modifications to the
original code, why not use this technique ?
http://docs.freebsd.org/info/gcc/gcc.info.Labels_as_Values.html
With a properly defined "instructions" array, instead of the switch
statement you can use something like:
goto * instructions[pOp->opcode];
)";
TempDir tempdir;
Mu::Store store{tempdir.path(), "/home/test/Maildir", {}, {}};
const auto msgpath{"/home/test/Maildir/inbox/cur/1649279256.107710_1.evergrey:2,S"};
auto message{Message::make_from_text(test_message_1, msgpath)};
assert_valid_result(message);
const auto docid = store.add_message(*message);
assert_valid_result(docid);
g_assert_cmpuint(store.size(),==, 1);
auto msg2{store.find_message(*docid)};
g_assert_true(!!msg2);
assert_equal(message->path(), msg2->path());
g_assert_true(store.contains_message(message->path()));
const auto qr = store.run_query("to:sqlite-dev@sqlite.org");
g_assert_true(!!qr);
g_assert_cmpuint(qr->size(), ==, 1);
}
static void
test_message_attachments(void)
{
constexpr const char* msg_text =
R"(Return-Path: <foo@example.com>
Received: from pop.gmail.com [256.85.129.309]
by evergrey with POP3 (fetchmail-6.4.29)
for <djcb@localhost> (single-drop); Thu, 24 Mar 2022 20:12:40 +0200 (EET)
Sender: "Foo, Example" <foo@example.com>
User-agent: mu4e 1.7.11; emacs 29.0.50
From: "Foo Example" <foo@example.com>
To: bar@example.com
Subject: =?utf-8?B?w6R0dMOkY2htZcOxdHM=?=
Date: Thu, 24 Mar 2022 20:04:39 +0200
Organization: ACME Inc.
Message-Id: <3144HPOJ0VC77.3H1XTAG2AMTLH@"@WILSONB.COM>
MIME-Version: 1.0
X-label: @NextActions operation:mindcrime Queensrÿche
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain
Hello,
--=-=-=
Content-Type: image/jpeg
Content-Disposition: attachment; filename=file-01.bin
Content-Transfer-Encoding: base64
AAECAw==
--=-=-=
Content-Type: audio/ogg
Content-Disposition: inline; filename=/tmp/file-02.bin
Content-Transfer-Encoding: base64
BAUGBw==
--=-=-=
Content-Type: message/rfc822
Content-Disposition: attachment;
filename="message.eml"
From: "Fnorb" <fnorb@example.com>
To: Bob <bob@example.com>
Subject: news for you
Date: Mon, 28 Mar 2022 22:53:26 +0300
Attached message!
--=-=-=
Content-Type: text/plain
World!
--=-=-=--
)";
TempDir tempdir;
Mu::Store store{tempdir.path(), "/home/test/Maildir", {}, {}};
auto message{Message::make_from_text(
msg_text,
"/home/test/Maildir/inbox/cur/1649279256.abcde_1.evergrey:2,S")};
assert_valid_result(message);
const auto docid = store.add_message(*message);
assert_valid_result(docid);
store.commit();
auto msg2{store.find_message(*docid)};
g_assert_true(!!msg2);
assert_equal(message->path(), msg2->path());
g_assert_true(store.contains_message(message->path()));
// for (auto&& term = msg2->document().xapian_document().termlist_begin();
// term != msg2->document().xapian_document().termlist_end(); ++term)
// g_message(">>> %s", (*term).c_str());
}
int
main(int argc, char* argv[])
{
@ -85,11 +232,10 @@ main(int argc, char* argv[])
/* mu_runtime_init/uninit */
g_test_add_func("/store/ctor-dtor", test_store_ctor_dtor);
g_test_add_func("/store/add-count-remove", test_store_add_count_remove);
// if (!g_test_verbose())
// g_log_set_handler (NULL,
// G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION,
// (GLogFunc)black_hole, NULL);
g_test_add_func("/store/message/mailing-list",
test_message_mailing_list);
g_test_add_func("/store/message/attachments",
test_message_attachments);
return g_test_run();
}