diff options
Diffstat (limited to 'src/ninep/tree.zig')
| -rw-r--r-- | src/ninep/tree.zig | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/ninep/tree.zig b/src/ninep/tree.zig index 690d1d1f..707ce40a 100644 --- a/src/ninep/tree.zig +++ b/src/ninep/tree.zig @@ -260,6 +260,10 @@ pub const TopFile = enum(u5) { kbdin, /// devmouse's mousein: `m col row buttons`, the mouse as it now is. mousein, + /// The dumps the state file keeps (src/Db.zig), a line each, the newest + /// first: `<label> <date> <size> <panes>`; `Restore <label>` brings one + /// back. + dumps, pub fn fileName(f: TopFile) []const u8 { return if (f == .root) "/" else @tagName(f); @@ -269,7 +273,7 @@ pub const TopFile = enum(u5) { return switch (f) { .root, .pane, .col => 0o755, .look, .exec, .log, .focus, .ctl, .tag, .tagexec, .pager => 0o666, - .README, .index, .status, .screen, .listeners, .new, .commands, .layout, .recent, .sessions => 0o444, + .README, .index, .status, .screen, .listeners, .new, .commands, .layout, .recent, .dumps, .sessions => 0o444, .kbdin, .mousein => 0o222, }; } @@ -670,7 +674,7 @@ fn topSize(p: *Pardes, f: TopFile) u64 { // frame, /pane/new until an open has a pane to name, and the index, // layout, recent list and listeners, which a stat would otherwise // have to build to count. - .root, .pane, .col, .screen, .new, .layout, .index, .recent, .listeners, .sessions, .kbdin, .mousein => 0, + .root, .pane, .col, .screen, .new, .layout, .index, .recent, .dumps, .listeners, .sessions, .kbdin, .mousein => 0, .tag => cols.headerText(p, null).?.len, .README => fs.help.len, .status => ctl.statusText(p).len, @@ -754,7 +758,7 @@ fn readdir(p: *Pardes, req: Req, target: Target) Reply { .root => { // The guide, then what describes the session, then the // files that act, then the directories. - inline for (.{ TopFile.README, TopFile.index, TopFile.status, TopFile.focus, TopFile.ctl, TopFile.commands, TopFile.recent, TopFile.look, TopFile.exec, TopFile.pager, TopFile.log, TopFile.screen, TopFile.listeners, TopFile.sessions, TopFile.layout, TopFile.tag, TopFile.tagexec, TopFile.kbdin, TopFile.mousein, TopFile.pane, TopFile.col }) |t| { + inline for (.{ TopFile.README, TopFile.index, TopFile.status, TopFile.focus, TopFile.ctl, TopFile.commands, TopFile.recent, TopFile.dumps, TopFile.look, TopFile.exec, TopFile.pager, TopFile.log, TopFile.screen, TopFile.listeners, TopFile.sessions, TopFile.layout, TopFile.tag, TopFile.tagexec, TopFile.kbdin, TopFile.mousein, TopFile.pane, TopFile.col }) |t| { if (skip > 0) skip -= 1 else stageDirent(out, p.gpa, @backingInt(t), t.dir(), t.fileName()); } if (skip > 0) skip -= 1 else stageDirent(out, p.gpa, fs.os_root, true, "os"); @@ -842,7 +846,7 @@ fn open(p: *Pardes, req: Req, target: Target) Reply { }, .screen => .{ .snapshot = null }, .log => .{ .log = .{} }, - .index, .layout, .recent, .commands, .status, .listeners, .sessions => .{ .frozen = &.{} }, + .index, .layout, .recent, .dumps, .commands, .status, .listeners, .sessions => .{ .frozen = &.{} }, // The root's ctl opened only to read: its settings, frozen. .ctl => if (linesOpen(target, req)) .lines else .{ .frozen = &.{} }, else => if (linesOpen(target, req)) .lines else return .{ .tag = req.tag }, @@ -1102,6 +1106,16 @@ fn readFile(p: *Pardes, req: Req, target: Target) Reply { pardes.panes.Output.recentText(p, &text.writer, false) catch break :recent Reply.fail(req.tag, E.NOMEM); break :recent window(p, req, text.written()); }, + .dumps => dumps: { + // The state file read now, unless a step is out mid-syscall + // (its database is the step's): then none. + var text: std.Io.Writer.Allocating = .init(p.scratch.allocator()); + if (pardes.turn.out == 0) p.db.listDumps(p, &text.writer) catch |err| switch (err) { + error.OutOfMemory, error.WriteFailed => break :dumps Reply.fail(req.tag, E.NOMEM), + else => break :dumps Reply.fail(req.tag, E.IO), + }; + break :dumps window(p, req, text.written()); + }, .layout => layout: { var text: std.Io.Writer.Allocating = .init(p.scratch.allocator()); cols.writeLayout(p, &text.writer) catch break :layout Reply.fail(req.tag, E.NOMEM); @@ -1522,13 +1536,13 @@ test "readdir lists the root and a pane directory without creating anything" { @memcpy(top_bytes[0..top_reply.bytes.len], top_reply.bytes); const top = th.dirents(top_bytes[0..top_reply.bytes.len], &buf); try testing.expect(top.len >= 10); - for ([_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "recent", "look", "exec", "pager", "log", "screen", "listeners", "sessions", "layout", "tag", "tagexec", "kbdin", "mousein", "pane", "col", "os" }, 0..) |name, i| { + for ([_][]const u8{ "README", "index", "status", "focus", "ctl", "commands", "recent", "dumps", "look", "exec", "pager", "log", "screen", "listeners", "sessions", "layout", "tag", "tagexec", "kbdin", "mousein", "pane", "col", "os" }, 0..) |name, i| { try testing.expectEqualStrings(name, top[i].name); - try testing.expectEqual(i >= 19, top[i].dir); + try testing.expectEqual(i >= 20, top[i].dir); } - try testing.expectEqual(@backingInt(TopFile.pane), top[19].node); - try testing.expectEqual(@backingInt(TopFile.col), top[20].node); - try testing.expectEqual(fs.os_root, top[21].node); + try testing.expectEqual(@backingInt(TopFile.pane), top[20].node); + try testing.expectEqual(@backingInt(TopFile.col), top[21].node); + try testing.expectEqual(fs.os_root, top[22].node); var idbuf: [16]u8 = undefined; try testing.expect(th.nameAt(top, try std.fmt.bufPrint(&idbuf, "{d}", .{serial})) == null); try testing.expect(th.nameAt(top, "self") == null); |
