output mode log-file defaults

last-arg · Jan 14, 2021 · da4820e · da4820e
1 parent 9d73a65
commit da4820e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/src/main.zig b/src/main.zig
@@ -71,8 +71,8 @@ pub fn main() anyerror!void {
     const path_fmt = "/v5/videos/{s}/comments?content_offset_seconds={d:.2}";
 
     var output_mode: ui.UiMode = .stdout;
-    // output_mode = .notcurses;
-    var opt_log_file: []const u8 = "stdout";
+    output_mode = .notcurses;
+    var opt_log_file: ?[]const u8 = null;
     var socket_path: []const u8 = "/tmp/mpv-twitch-socket";
     var comments_delay: f32 = 0.0;
 
@@ -117,21 +117,20 @@ pub fn main() anyerror!void {
                 warn("Option '-log-file' requires path or `stdout` ", .{});
                 return;
             };
-            if (std.mem.eql(u8, "stdout", value)) {
-                log_file_path = null;
-            } else {
-                log_file_path = value;
-            }
+            opt_log_file = value;
         } else if (std.mem.eql(u8, "-help", arg) or std.mem.eql(u8, "-h", arg)) {
             const help_text =
                 \\mpv-vod-chat [options]
                 \\
                 \\Options:
                 \\  -h, -help        Print help text
-                \\  -socket-path     Default: '/tmp/mpv-twitch-socket'. Set mpv players socket path
+                \\  -socket-path     Default: '/tmp/mpv-twitch-socket'.
+                \\                   Set mpv players socket path
                 \\  -comments-delay  When comments are displayed compared to video time
-                \\  -output-mode     Default: stdout. Can enter one three: stdout, direct, notcurses.
-                \\  -log-file        Default: stdout. Can output application log messages to stdout, a file or tty.
+                \\  -output-mode     Default: stdout. Can enter one of three: stdout, direct, notcurses.
+                \\  -log-file        Default(output mode: stdout, direct): stdout.
+                \\  -log-file        Default(output mode: notcurses): '/tmp/mpv-twitch-chat.log'.
+                \\                   Can output application log messages to stdout, a file or tty.
                 \\
             ;
 
@@ -140,6 +139,20 @@ pub fn main() anyerror!void {
         }
     }
 
+    // Set log output place: stdout, file, tty
+    if (opt_log_file) |file| {
+        if (std.mem.eql(u8, "stdout", file)) {
+            log_file_path = null;
+        } else {
+            log_file_path = file;
+        }
+    } else {
+        switch (output_mode) {
+            .stdout, .direct => log_file_path = null,
+            .notcurses => log_file_path = "/tmp/mpv-twitch-chat.log",
+        }
+    }
+
     var mpv = Mpv.init(allocator, socket_path) catch |err| {
         warn("Failed to find mpv socket path: {s}\n", .{socket_path});
         return err;

diff --git a/src/ui.zig b/src/ui.zig
@@ -96,6 +96,7 @@ pub const UiNotCurses = struct {
     }
 
     pub fn sleepLoop(ui: *Ui, ns: u64) !void {
+        errdefer ui.deinit();
         var self = @fieldParentPtr(Self, "ui", ui);
         const input_inactive_ns = time.ns_per_ms * 120;
         const input_active_ns = time.ns_per_ms * 60;

diff --git a/todo.md b/todo.md
@@ -6,6 +6,7 @@ Improve:
 
 Bugs:
 [ ] Ui (NotCurses) on unexpected crash cant see cursor after
+[ ] When screen isn't filled with text scrolling works by moving text to bottom or top
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,6 +6,7 @@ Improve:

		Bugs:
		[ ] Ui (NotCurses) on unexpected crash cant see cursor after
		[ ] When screen isn't filled with text scrolling works by moving text to bottom or top



Expand Down