Merge branch 'master' into zig-0.14

This commit is contained in:
CJ van den Berg 2025-02-09 21:49:45 +01:00
commit 43b14d9147
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
5 changed files with 77 additions and 5 deletions

View file

@ -56,6 +56,8 @@ pub fn main() anyerror!void {
;
pub const descriptions = .{
.project = "Set project directory (default: cwd)",
.no_persist = "Do not persist new projects",
.frame_rate = "Set target frame rate (default: 60)",
.debug_wait = "Wait for key press before starting UI",
.debug_dump_on_error = "Dump stack traces on errors",
@ -78,6 +80,8 @@ pub fn main() anyerror!void {
pub const formats = .{ .frame_rate = "num", .trace_level = "num", .exec = "cmds" };
pub const switches = .{
.project = 'p',
.no_persist = 'N',
.frame_rate = 'f',
.trace_level = 't',
.language = 'l',
@ -86,6 +90,8 @@ pub fn main() anyerror!void {
.version = 'v',
};
project: ?[]const u8,
no_persist: bool,
frame_rate: ?usize,
debug_wait: bool,
debug_dump_on_error: bool,
@ -203,6 +209,7 @@ pub fn main() anyerror!void {
log.set_std_log_pid(log_proc.ref());
defer log.set_std_log_pid(null);
env.set("no-persist", args.no_persist);
env.set("restore-session", args.restore_session);
env.set("no-alternate", args.no_alternate);
env.set("show-input", args.show_input);
@ -271,11 +278,15 @@ pub fn main() anyerror!void {
var have_project = false;
var files = std.ArrayList(Dest).init(a);
defer files.deinit();
if (args.project) |project| {
try tui_proc.send(.{ "cmd", "open_project_dir", .{project} });
have_project = true;
}
for (dests.items) |dest| {
if (dest.file.len == 0) continue;
if (is_directory(dest.file)) {
if (have_project) {
std.debug.print("more than one directory is not allowed\n", .{});
std.debug.print("more than one project directory is not allowed\n", .{});
exit(1);
}
try tui_proc.send(.{ "cmd", "open_project_dir", .{dest.file} });