lobo/zetviel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor root.zig tests into higher level api

Browse source
This commit is contained in:
Emil Lerch 2025-04-19 15:18:51 -07:00
parent 2febea12d7
commit 474aadd498
Signed by: lobo
GPG key ID: A7B62D657EF764F8
1 changed files with 139 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

298
src/root.zig
View file

@ -3,13 +3,32 @@ const notmuch = @import("notmuch.zig");
// Thread representation for JSON serialization // Thread representation for JSON serialization
pub const Thread = struct { pub const Thread = struct {
allocator: std.mem.Allocator,
thread: *notmuch.Db.Thread, thread: *notmuch.Db.Thread,
pub fn init(t: *notmuch.Db.Thread) Thread { pub fn init(allocator: std.mem.Allocator, t: *notmuch.Db.Thread) Thread {
return .{ .thread = t }; return .{ .allocator = allocator, .thread = t };
}
pub fn deinit(self: Thread) void {
self.allocator.destroy(self.thread);
} }
pub fn jsonStringify(self: Thread, jws: anytype) !void { pub fn jsonStringify(self: Thread, jws: anytype) !void {
// Format we're looking for on api/thread/<threadid>
//[
// {
// "from": "The Washington Post <email@washingtonpost.com>",
// "to": "elerch@lerch.org",
// "cc": null,
// "bcc": null,
// "date": "Sun, 21 Jul 2024 19:23:38 +0000",
// "subject": "Biden steps aside",
// "content": "...content...",
// "content_type": "text/html",
// "attachments": [],
// "message_id": "01010190d6bfe4e1-185e2720-e415-4086-8865-9604cde886c2-000000@us-west-2.amazonses.com"
// }
//]
try jws.beginArray(); try jws.beginArray();
var mi = self.thread.getMessages() catch return error.OutOfMemory; var mi = self.thread.getMessages() catch return error.OutOfMemory;
while (mi.next()) |m| { while (mi.next()) |m| {
@ -43,29 +62,73 @@ pub const Thread = struct {
// Threads collection for JSON serialization // Threads collection for JSON serialization
pub const Threads = struct { pub const Threads = struct {
allocator: std.mem.Allocator,
iterator: *notmuch.Db.ThreadIterator, iterator: *notmuch.Db.ThreadIterator,
pub fn init(it: *notmuch.Db.ThreadIterator) Threads { pub fn init(allocator: std.mem.Allocator, it: *notmuch.Db.ThreadIterator) Threads {
return .{ return .{
.allocator = allocator,
.iterator = it, .iterator = it,
}; };
} }
pub fn deinit(self: *Threads) void {
self.iterator.deinit();
self.allocator.destroy(self.iterator);
}
pub fn next(self: *Threads) !?Thread {
const nxt = self.iterator.next();
if (nxt) |_| {
const tptr = try self.allocator.create(notmuch.Db.Thread);
tptr.* = nxt.?;
return Thread.init(self.allocator, tptr);
}
return null;
}
pub fn jsonStringify(self: Threads, jws: anytype) !void { pub fn jsonStringify(self: Threads, jws: anytype) !void {
//[ // This is the json we're looking to match on api/query/<term>
// { // [
// "from": "The Washington Post <email@washingtonpost.com>", // {
// "to": "elerch@lerch.org", // "authors": "The Washington Post",
// "cc": null, // "matched_messages": 1,
// "bcc": null, // "newest_date": 1721664948,
// "date": "Sun, 21 Jul 2024 19:23:38 +0000", // "oldest_date": 1721664948,
// "subject": "Biden steps aside", // "subject": "Biden is out. What now?",
// "content": "...content...", // "tags": [
// "content_type": "text/html", // "inbox",
// "attachments": [], // "unread"
// "message_id": "01010190d6bfe4e1-185e2720-e415-4086-8865-9604cde886c2-000000@us-west-2.amazonses.com" // ],
// } // "thread_id": "0000000000031723",
//] // "total_messages": 1
// },
// {
// "authors": "The Washington Post",
// "matched_messages": 1,
// "newest_date": 1721603115,
// "oldest_date": 1721603115,
// "subject": "Upcoming Virtual Programs",
// "tags": [
// "inbox",
// "unread"
// ],
// "thread_id": "0000000000031712",
// "total_messages": 1
// },
// {
// "authors": "The Washington Post",
// "matched_messages": 1,
// "newest_date": 1721590157,
// "oldest_date": 1721590157,
// "subject": "Biden Steps Aside",
// "tags": [
// "inbox"
// ],
// "thread_id": "000000000003170d",
// "total_messages": 1
// }
// ]
try jws.beginArray(); try jws.beginArray();
while (self.iterator.next()) |t| { while (self.iterator.next()) |t| {
defer t.deinit(); defer t.deinit();
@ -105,11 +168,12 @@ pub const NotmuchDb = struct {
self.allocator.free(self.path); self.allocator.free(self.path);
} }
pub fn searchThreads(self: *NotmuchDb, query: []const u8) !Threads { pub fn search(self: *NotmuchDb, query: []const u8) !Threads {
var query_buf: [1024:0]u8 = undefined; var query_buf: [1024:0]u8 = undefined;
const query_z = try std.fmt.bufPrintZ(&query_buf, "{s}", .{query}); const query_z = try std.fmt.bufPrintZ(&query_buf, "{s}", .{query});
var thread_iter = try self.db.searchThreads(query_z); const ti = try self.allocator.create(notmuch.Db.ThreadIterator);
return Threads.init(&thread_iter); ti.* = try self.db.searchThreads(query_z);
return Threads.init(self.allocator, ti);
} }
pub fn getThread(self: *NotmuchDb, thread_id: []const u8) !Thread { pub fn getThread(self: *NotmuchDb, thread_id: []const u8) !Thread {
@ -118,8 +182,12 @@ pub const NotmuchDb = struct {
var thread_iter = try self.db.searchThreads(query_z); var thread_iter = try self.db.searchThreads(query_z);
defer thread_iter.deinit(); defer thread_iter.deinit();
var thread = thread_iter.next(); const thread = thread_iter.next();
if (thread) |_| return Thread.init(&thread.?); if (thread) |t| {
const tptr = try self.allocator.create(notmuch.Db.Thread);
tptr.* = t;
return Thread.init(self.allocator, tptr);
}
return error.ThreadNotFound; return error.ThreadNotFound;
} }
}; };
@ -147,65 +215,6 @@ test "open database with public api" {
defer db.close(); defer db.close();
} }
// This is the json we're looking to match on api/query/<term>
// [
// {
// "authors": "The Washington Post",
// "matched_messages": 1,
// "newest_date": 1721664948,
// "oldest_date": 1721664948,
// "subject": "Biden is out. What now?",
// "tags": [
// "inbox",
// "unread"
// ],
// "thread_id": "0000000000031723",
// "total_messages": 1
// },
// {
// "authors": "The Washington Post",
// "matched_messages": 1,
// "newest_date": 1721603115,
// "oldest_date": 1721603115,
// "subject": "Upcoming Virtual Programs",
// "tags": [
// "inbox",
// "unread"
// ],
// "thread_id": "0000000000031712",
// "total_messages": 1
// },
// {
// "authors": "The Washington Post",
// "matched_messages": 1,
// "newest_date": 1721590157,
// "oldest_date": 1721590157,
// "subject": "Biden Steps Aside",
// "tags": [
// "inbox"
// ],
// "thread_id": "000000000003170d",
// "total_messages": 1
// }
// ]
//
// And on api/thread/<threadid>
//
// [
// {
// "from": "The Washington Post <email@washingtonpost.com>",
// "to": "elerch@lerch.org",
// "cc": null,
// "bcc": null,
// "date": "Sun, 21 Jul 2024 19:23:38 +0000",
// "subject": "Biden steps aside",
// "content": "...content...",
// "content_type": "text/html",
// "attachments": [],
// "message_id": "01010190d6bfe4e1-185e2720-e415-4086-8865-9604cde886c2-000000@us-west-2.amazonses.com"
// }
// ]
test "can stringify general queries" { test "can stringify general queries" {
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
// const db_path = try std.fs.path.join( // const db_path = try std.fs.path.join(
@ -213,87 +222,58 @@ test "can stringify general queries" {
// std.fs.cwd(), // std.fs.cwd(),
// "mail", // "mail",
// ); // );
var db = try openNotmuchDb(allocator, "mail");
// Current directory under test is root of project defer db.close();
var cwd_buf: [std.fs.max_path_bytes]u8 = undefined; var threads = try db.search("Tablets");
const cwd = try std.fs.cwd().realpath(".", cwd_buf[0..]); defer threads.deinit();
var path_buf: [std.fs.max_path_bytes:0]u8 = undefined; const actual = try std.json.stringifyAlloc(allocator, threads, .{ .whitespace = .indent_2 });
var fba = std.heap.FixedBufferAllocator.init(path_buf[0..]); defer allocator.free(actual);
const db_path = try std.fs.path.joinZ(fba.allocator(), &[_][]const u8{ cwd, "mail" }); try std.testing.expectEqualStrings(
{ \\[
var status: notmuch.Status = undefined; \\ {
var db = try notmuch.Db.open(db_path, &status); \\ "authors": "Top Medications",
defer db.deinit(); \\ "matched_messages": 1,
defer db.close(); \\ "newest_date": 1721484138,
defer status.deinit(); \\ "oldest_date": 1721484138,
var al = std.ArrayList(u8).init(allocator); \\ "subject": "***SPAM*** Tablets without a prescription",
defer al.deinit(); \\ "tags": [
var ti = try db.searchThreads("Tablets"); \\ "inbox"
defer ti.deinit(); \\ ],
try std.json.stringify(Threads.init(&ti), .{ .whitespace = .indent_2 }, al.writer()); \\ "thread_id": "0000000000000001",
const actual = al.items; \\ "total_messages": 1
try std.testing.expectEqualStrings( \\ }
\\[ \\]
\\ { , actual);
\\ "authors": "Top Medications",
\\ "matched_messages": 1,
\\ "newest_date": 1721484138,
\\ "oldest_date": 1721484138,
\\ "subject": "***SPAM*** Tablets without a prescription",
\\ "tags": [
\\ "inbox"
\\ ],
\\ "thread_id": "0000000000000001",
\\ "total_messages": 1
\\ }
\\]
, actual);
}
} }
test "can stringify specific threads" { test "can stringify specific threads" {
if (true) return error.SkipZigTest;
const allocator = std.testing.allocator; const allocator = std.testing.allocator;
// const db_path = try std.fs.path.join(
// allocator,
// std.fs.cwd(),
// "mail",
// );
// Current directory under test is root of project var db = try openNotmuchDb(allocator, "mail");
var cwd_buf: [std.fs.max_path_bytes]u8 = undefined; defer db.close();
const cwd = try std.fs.cwd().realpath(".", cwd_buf[0..]); var threads = try db.search("Tablets");
var path_buf: [std.fs.max_path_bytes:0]u8 = undefined; defer threads.deinit();
var fba = std.heap.FixedBufferAllocator.init(path_buf[0..]);
const db_path = try std.fs.path.joinZ(fba.allocator(), &[_][]const u8{ cwd, "mail" }); var maybe_first_thread = try threads.next();
{ defer if (maybe_first_thread) |*t| t.deinit();
var status: notmuch.Status = undefined; try std.testing.expect(maybe_first_thread != null);
var db = try notmuch.Db.open(db_path, &status); const first_thread = maybe_first_thread.?;
defer db.deinit(); const actual = try std.json.stringifyAlloc(allocator, first_thread, .{ .whitespace = .indent_2 });
defer db.close(); defer allocator.free(actual);
defer status.deinit(); try std.testing.expectEqualStrings(
var al = std.ArrayList(u8).init(allocator); \\[
defer al.deinit(); \\ {
var ti = try db.searchThreads("Tablets"); \\ "from": "Top Medications <mail@youpharm.co>",
defer ti.deinit(); \\ "to": "emil@lerch.org",
var t = ti.next().?; \\ "cc": null,
try std.json.stringify(Thread.init(&t), .{ .whitespace = .indent_2 }, al.writer()); \\ "bcc": null,
const actual = al.items; \\ "date": "Sat, 20 Jul 2024 16:02:18 +0200",
try std.testing.expectEqualStrings( \\ "subject": "***SPAM*** Tablets without a prescription",
\\[ \\ "content": "...content...",
\\ { \\ "content_type": "text/html",
\\ "from": "Top Medications <mail@youpharm.co>", \\ "attachments": [],
\\ "to": "emil@lerch.org", \\ "message_id": "01010190d6bfe4e1-185e2720-e415-4086-8865-9604cde886c2-000000@us-west-2.amazonses.com"
\\ "cc": null, \\ }
\\ "bcc": null, \\]
\\ "date": "Sat, 20 Jul 2024 16:02:18 +0200", , actual);
\\ "subject": "***SPAM*** Tablets without a prescription",
\\ "content": "...content...",
\\ "content_type": "text/html",
\\ "attachments": [],
\\ "message_id": "01010190d6bfe4e1-185e2720-e415-4086-8865-9604cde886c2-000000@us-west-2.amazonses.com"
\\ }
\\]
, actual);
}
} }