cli/crash-report: make it simpler (uglier, honestly)

src/cli/crash_report.zig

@@ -1,16 +1,11 @@
 const std = @import("std");
+const Allocator = std.mem.Allocator;
 const args = @import("args.zig");
 const Action = @import("action.zig").Action;
 const Config = @import("../config.zig").Config;
-const sentry = @import("../crash/sentry.zig");
+const crash = @import("../crash/main.zig");
 
 pub const Options = struct {
-    /// View the crash report locally (unimplemented).
-    view: ?[:0]const u8 = null,
-
-    /// Send the crash report to the Ghostty community (unimplemented).
-    send: ?[:0]const u8 = null,
-
     pub fn deinit(self: Options) void {
         _ = self;
     }
@@ -22,14 +17,18 @@ pub const Options = struct {
     }
 };
 
-/// The `crash-report command is used to list/view/send crash reports.
+/// The `crash-report` command is used to inspect and send crash reports.
 ///
-/// When executed without any arguments, this will list any existing crash reports.
+/// When executed without any arguments, this will list existing crash reports.
 ///
-/// The `--view` argument can be used to inspect a particular crash report.
+/// This command currently only supports listing crash reports. Viewing
-///
+/// and sending crash reports is unimplemented and will be added in the future.
-/// The `--send` argument can be used to send a crash report to the Ghostty community.
+pub fn run(alloc_gpa: Allocator) !u8 {
-pub fn run(alloc: std.mem.Allocator) !u8 {
+    // Use an arena for the whole command to avoid manual memory management.
+    var arena = std.heap.ArenaAllocator.init(alloc_gpa);
+    defer arena.deinit();
+    const alloc = arena.allocator();
+
     var opts: Options = .{};
     defer opts.deinit();
 
@@ -39,47 +38,43 @@ pub fn run(alloc: std.mem.Allocator) !u8 {
         try args.parse(Options, alloc, &opts, &iter);
     }
 
-    const stdout = std.io.getStdOut().writer();
+    const crash_dir = try crash.defaultDir(alloc);
+    var reports = std.ArrayList(crash.Report).init(alloc);
 
-    if (opts.view) |_| {
+    var it = try crash_dir.iterator();
-        try stdout.writeAll("viewing crash reports is unimplemented\n");
+    while (try it.next()) |report| try reports.append(.{
-        return 1;
+        .name = try alloc.dupe(u8, report.name),
+        .mtime = report.mtime,
+    });
+
+    const stdout = std.io.getStdOut();
+
+    // If we have no reports, then we're done. If we have a tty then we
+    // print a message, otherwise we do nothing.
+    if (reports.items.len == 0) {
+        if (std.posix.isatty(stdout.handle)) {
+            try stdout.writeAll("No crash reports! 👻");
+        }
+        return 0;
     }
 
-    if (opts.send) |_| {
+    std.mem.sort(crash.Report, reports.items, {}, lt);
-        try stdout.writeAll("sending crash reports is unimplemented\n");
-        return 1;
-    }
 
-    if (try sentry.listCrashReports(alloc)) |reports| {
+    const writer = stdout.writer();
-        defer {
+    for (reports.items) |report| {
-            for (reports) |report| {
+        var buf: [128]u8 = undefined;
-                alloc.free(report.name);
+        const now = std.time.nanoTimestamp();
-            }
+        const diff = now - report.mtime;
-            alloc.free(reports);
+        const since = if (diff <= 0) "now" else s: {
-        }
+            const d = Config.Duration{ .duration = @intCast(diff) };
-
+            break :s try std.fmt.bufPrint(&buf, "{s} ago", .{d.round(std.time.ns_per_s)});
-        std.mem.sort(sentry.CrashReport, reports, {}, lt);
+        };
-        try stdout.print("\n       {d:} crash reports!\n\n", .{reports.len});
+        try writer.print("{s} ({s})\n", .{ report.name, since });
-
-        for (reports, 0..) |report, count| {
-            var buf: [128]u8 = undefined;
-            const now = std.time.nanoTimestamp();
-            const diff = now - report.mtime;
-            const since = if (diff < 0) "now" else s: {
-                const d = Config.Duration{ .duration = @intCast(diff) };
-                break :s try std.fmt.bufPrint(&buf, "{s} ago", .{d.round(std.time.ns_per_s)});
-            };
-            try stdout.print("{d: >4} — {s} ({s})\n", .{ count, report.name, since });
-        }
-        try stdout.writeAll("\n");
-    } else {
-        try stdout.writeAll("\n       No crash reports! 👻\n\n");
     }
 
     return 0;
 }
 
-fn lt(_: void, lhs: sentry.CrashReport, rhs: sentry.CrashReport) bool {
+fn lt(_: void, lhs: crash.Report, rhs: crash.Report) bool {
     return lhs.mtime > rhs.mtime;
 }

src/cli/list_keybinds.zig

@@ -8,6 +8,7 @@ const configpkg = @import("../config.zig");
 const Config = configpkg.Config;
 const vaxis = @import("vaxis");
 const input = @import("../input.zig");
+const tui = @import("tui.zig");
 const Binding = input.Binding;
 
 pub const Options = struct {
@@ -61,12 +62,8 @@ pub fn run(alloc: Allocator) !u8 {
 
     const stdout = std.io.getStdOut();
 
-    const can_pretty_print = switch (builtin.os.tag) {
-        .ios, .tvos, .watchos => false,
-        else => true,
-    };
     // Despite being under the posix namespace, this also works on Windows as of zig 0.13.0
-    if (can_pretty_print and !opts.plain and std.posix.isatty(stdout.handle)) {
+    if (tui.can_pretty_print and !opts.plain and std.posix.isatty(stdout.handle)) {
         return prettyPrint(alloc, config.keybind);
     } else {
         try config.keybind.formatEntryDocs(

src/cli/tui.zig

@@ -0,0 +1,6 @@
+const builtin = @import("builtin");
+
+pub const can_pretty_print = switch (builtin.os.tag) {
+    .ios, .tvos, .watchos => false,
+    else => true,
+};