neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

feat: restore buffer manager state on restart

Browse source
This commit is contained in:
CJ van den Berg 2025-08-05 20:08:29 +02:00
parent 1babf86ce4
commit 991c47f3b3
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
6 changed files with 121 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tui/editor.zig
View file

@ -371,6 +371,14 @@ pub const Editor = struct {
const Meta = command.Metadata;
const Result = command.Result;
pub fn update_meta(self: *const Self) void {
var meta = std.ArrayListUnmanaged(u8).empty;
defer meta.deinit(self.allocator);
if (self.buffer) |_| self.write_state(meta.writer(self.allocator)) catch {};
if (self.buffer) |_| self.write_state(meta.writer(self.allocator)) catch {};
if (self.buffer) |p| p.set_meta(meta.items) catch {};
}
pub fn write_state(self: *const Self, writer: Buffer.MetaWriter) !void {
try cbor.writeArrayHeader(writer, 12);
try cbor.writeValue(writer, self.file_path orelse "");
@ -401,9 +409,7 @@ pub const Editor = struct {
};
}
pub fn extract_state(self: *Self, buf: []const u8, comptime op: enum { none, open_file }) !void {
tp.trace(tp.channel.debug, .{ "extract_state", self.file_path });
tp.trace(tp.channel.debug, tp.message{ .buf = buf });
pub fn extract_state(self: *Self, iter: *[]const u8, comptime op: Buffer.ExtractStateOperation) !void {
self.restored_state = true;
var file_path: []const u8 = undefined;
var view_cbor: []const u8 = undefined;
@ -411,7 +417,7 @@ pub const Editor = struct {
var clipboard: []const u8 = undefined;
var last_find_query: []const u8 = undefined;
var find_history: []const u8 = undefined;
if (!try cbor.match(buf, .{
if (!try cbor.matchValue(iter, .{
tp.extract(&file_path),
tp.extract(&clipboard),
tp.extract(&last_find_query),
@ -440,11 +446,11 @@ pub const Editor = struct {
if (cursels_cbor.len > 0)
self.clear_all_cursors();
var iter = cursels_cbor;
var len = cbor.decodeArrayHeader(&iter) catch return error.RestoreCurSels;
var cursels_iter = cursels_cbor;
var len = cbor.decodeArrayHeader(&cursels_iter) catch return error.RestoreCurSels;
while (len > 0) : (len -= 1) {
var cursel: CurSel = .{};
if (!(cursel.extract(&iter) catch false)) break;
if (!(cursel.extract(&cursels_iter) catch false)) break;
(try self.cursels.addOne(self.allocator)).* = cursel;
}
@ -659,7 +665,8 @@ pub const Editor = struct {
if (buffer_meta) |meta| {
const frame_ = tracy.initZone(@src(), .{ .name = "extract_state" });
defer frame_.deinit();
try self.extract_state(meta, .none);
var iter = meta;
try self.extract_state(&iter, .none);
}
try self.send_editor_open(file_path, new_buf.file_exists, ftn, fti, ftc);
}

21
src/tui/mainview.zig
View file

@ -1288,11 +1288,18 @@ fn create_home_split(self: *Self) !void {
}
pub fn write_restore_info(self: *Self) void {
const editor = self.get_active_editor() orelse return;
var sfa = std.heap.stackFallback(512, self.allocator);
const a = sfa.get();
var meta = std.ArrayListUnmanaged(u8).empty;
editor.write_state(meta.writer(a)) catch return;
const writer = meta.writer(a);
const editor = self.get_active_editor() orelse return;
cbor.writeValue(writer, editor.file_path) catch return;
editor.update_meta();
const buffer_manager = tui.get_buffer_manager() orelse @panic("tabs no buffer manager");
buffer_manager.write_state(writer) catch return;
const file_name = root.get_restore_file_name() catch return;
var file = std.fs.createFileAbsolute(file_name, .{ .truncate = true }) catch return;
defer file.close();
@ -1300,7 +1307,6 @@ pub fn write_restore_info(self: *Self) void {
}
fn read_restore_info(self: *Self) !void {
const editor = self.get_active_editor() orelse return;
const file_name = try root.get_restore_file_name();
const file = try std.fs.cwd().openFile(file_name, .{ .mode = .read_only });
defer file.close();
@ -1308,7 +1314,14 @@ fn read_restore_info(self: *Self) !void {
var buf = try self.allocator.alloc(u8, @intCast(stat.size));
defer self.allocator.free(buf);
const size = try file.readAll(buf);
try editor.extract_state(buf[0..size], .open_file);
var iter: []const u8 = buf[0..size];
tp.trace(tp.channel.debug, .{ "mainview", "extract" });
var editor_file_path: []const u8 = undefined;
if (!try cbor.matchValue(&iter, cbor.extract(&editor_file_path))) return error.Stop;
try self.buffer_manager.extract_state(&iter);
try tp.self_pid().send(.{ "cmd", "navigate", .{ .file = editor_file_path } });
}
fn get_next_mru_buffer(self: *Self) ?[]const u8 {