mod: bump to version 0.0.4

Accessing resources which are not available, the invalid page will be
rendered instead. The original attempt for access will be logged.

build.zig

@@ -7,7 +7,7 @@ pub fn build(b: *std.Build) void {
     const zlog = b.dependency("zlog", .{
         .target = target,
         .optimize = optimize,
-        .timestamp = false,
+        .timestamp = true,
         .stderr = false,
         .file = "log",
     });

build.zig.zon

@@ -1,13 +1,13 @@
 .{
     .name = .tui_website,
     // This is a [Semantic Version](https://semver.org/).
-    .version = "0.0.2",
+    .version = "0.0.4",
     .fingerprint = 0x93d98a4d9d000e9c, // Changing this has security and trust implications.
     .minimum_zig_version = "0.16.0-dev.463+f624191f9",
     .dependencies = .{
         .zterm = .{
-            .url = "git+https://gitea.yves-biener.de/yves-biener/zterm#b3dc8096d76d6e246d48f9034a65997c0047c3c6",
-            .hash = "zterm-0.3.0-1xmmENP4GwBw65udohsoaxc9Kp4Yo7kORt4okY5pLslr",
+            .url = "git+https://gitea.yves-biener.de/yves-biener/zterm#ad32e46bc9fd6d1d9b7a3615979a3b80877c9300",
+            .hash = "zterm-0.3.0-1xmmEO8PHABP4tE6BnEZllJTh6Hpza_5C9wS8s2vjwou",
         },
         .zlog = .{
             .url = "git+https://gitea.yves-biener.de/yves-biener/zlog#f43034cea9a0863e618c3d0a43706ce38c8791cf",

src/content.zig

@@ -3,10 +3,10 @@ pub fn Content(App: type) type {
         allocator: Allocator,
         document: *const App.Model.Document,
 
-        pub fn init(allocator: Allocator) @This() {
+        pub fn init(allocator: Allocator, document: *const App.Model.Document) @This() {
             return .{
                 .allocator = allocator,
-                .document = undefined,
+                .document = document,
             };
         }
 
@@ -28,7 +28,7 @@ pub fn Content(App: type) type {
             var new_size: zterm.Point = .{ .x = size.x };
 
             for (0..text.len) |_| rows: {
-                for (0..size.x) |_| {
+                for (0..size.x - 1) |_| { // assume that there is one cell reserved for the scrollbar
                     if (index == text.len) break :rows;
                     const cp = text[index];
                     index += 1;
@@ -57,10 +57,16 @@ pub fn Content(App: type) type {
                 },
                 .blog => |path| {
                     model.page.deinit(this.allocator);
+                    model.document.deinit(this.allocator);
+                    errdefer {
+                        if (path) |p| this.allocator.free(p);
+                        model.document = .invalidPage;
+                        model.page = .{ .blog = null };
+                    }
+
+                    model.document = .init(try std.fs.cwd().readFileAlloc(if (path) |p| p else "./doc/blog.md", this.allocator, .unlimited));
                     model.page = .{ .blog = path };
 
-                    model.document.deinit(this.allocator);
-                    model.document = .init(try std.fs.cwd().readFileAlloc(if (path) |p| p else "./doc/blog.md", this.allocator, .unlimited));
                     this.document = &model.document;
                 },
                 else => {},

src/main.zig

@@ -1,3 +1,11 @@
+// TODO
+// - should the path containing the contents of the tui-website reside in the
+//   hardcode `./doc` directory or shall this become a compilation argument to
+//   allow for custom directory locations?
+
+// usage: tui_website <location>
+// <location>: partial path to the document without the file extension and the beginning `./doc` path
+//             ending `/` (as used from the web-world) are trimmed automatically
 pub fn main() !void {
     errdefer |err| log.err("Application Error: {any}", .{err});
 
@@ -6,6 +14,12 @@ pub fn main() !void {
 
     const allocator = gpa.allocator();
 
+    var arg_it = try std.process.argsWithAllocator(allocator);
+    errdefer arg_it.deinit();
+
+    // skip own executable name
+    _ = arg_it.skip();
+
     var app: App = .init(.{
         .page = .about,
         .document = .init(try std.fs.cwd().readFileAlloc("./doc/about.md", allocator, .unlimited)),
@@ -66,10 +80,10 @@ pub fn main() !void {
     }
     // main actual tui_website page content
     {
-        var content: Content = .init(allocator);
+        var content: Content = .init(allocator, &app.model.document);
         content_container = try .init(allocator, .{}, content.element());
 
-        var scrollable: App.Scrollable = .init(content_container, .enabled(.green));
+        var scrollable: App.Scrollable = .init(content_container, .enabled(.green, false));
         // intermediate container for *padding* containing the scrollable `Content`
         var scrollable_container: App.Container = try .init(allocator, .{
             .layout = .{ .padding = .horizontal(2) },
@@ -92,33 +106,60 @@ pub fn main() !void {
     try app.start();
     defer app.stop() catch |err| log.err("Failed to stop application: {any}", .{err});
 
+    if (arg_it.next()) |path| {
+        // TODO check path is only pointing to allowed files?
+        // - only *markdown* files (file extension `.md`)
+        // - only in a specific path / directory?
+        //   -> enforce a specific structure?
+        // -> in case an invalid path is provided the 404 error page shall be shown
+        // -> reporte an corresponding error! (such that I can see that in the log)
+        var blog = path[0..path.len];
+        blog = std.mem.trimStart(u8, blog, "./");
+        blog = std.mem.trimEnd(u8, blog, ".md");
+        blog = std.mem.trimEnd(u8, blog, "/");
+        app.postEvent(.{ .blog = try std.fmt.allocPrint(allocator, "./doc/{s}.md", .{blog}) });
+    }
+    arg_it.deinit();
+
     // event loop
-    while (true) {
+    loop: while (true) {
+        // batch events since last iteration
+        const len = blk: {
+            app.queue.poll();
+            app.queue.lock();
+            defer app.queue.unlock();
+            break :blk app.queue.len();
+        };
+
         // handle events
-        const event = app.nextEvent();
+        for (0..len) |_| {
+            const event = app.queue.pop();
 
-        // pre event handling
-        switch (event) {
-            .key => |key| {
-                if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } })) app.quit();
-                // test if the event handling is working correctly
-                if (key.eql(.{ .cp = zterm.input.Space })) app.postEvent(.{ .blog = allocator.dupe(u8, "./doc/test.md") catch unreachable });
-            },
-            .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
-            else => {},
-        }
+            // pre event handling
+            switch (event) {
+                .key => |key| {
+                    if (key.eql(.{ .cp = 'c', .mod = .{ .ctrl = true } }) or key.eql(.{ .cp = 'q' })) app.quit();
+                    // test if the event handling is working correctly
+                    if (key.eql(.{ .cp = zterm.input.Space })) app.postEvent(.{ .blog = allocator.dupe(u8, "./doc/test.md") catch unreachable });
+                },
+                .about => log.info(ResourceRequestFormat, .{"./doc/about.md"}),
+                .blog => |path| log.info(ResourceRequestFormat, .{if (path) |p| p else "./doc/blog.md"}),
+                .err => |err| log.err("Received {s} with message: {s}", .{ @errorName(err.err), err.msg }),
+                else => {},
+            }
 
-        container.handle(&app.model, event) catch |err| app.postEvent(.{
-            .err = .{
-                .err = err,
-                .msg = "Container Event handling failed",
-            },
-        });
+            container.handle(&app.model, event) catch |err| app.postEvent(.{
+                .err = .{
+                    .err = err,
+                    .msg = "Container Event handling failed",
+                },
+            });
 
-        // post event handling
-        switch (event) {
-            .quit => break,
-            else => {},
+            // post event handling
+            switch (event) {
+                .quit => break :loop,
+                else => {},
+            }
         }
 
         container.resize(try renderer.resize());
@@ -133,6 +174,8 @@ pub const panic = App.panic_handler;
 pub const std_options = zlog.std_options;
 const log = std.log.scoped(.default);
 
+const ResourceRequestFormat = "Requesting resource: `{s}`";
+
 const std = @import("std");
 const assert = std.debug.assert;
 const zlog = @import("zlog");

src/model.zig

@@ -33,6 +33,12 @@ pub const Document = struct {
         date,
     };
 
+    pub const invalidPage: @This() = .{
+        .title = "Page not found",
+        .content = "Requested page does not exist",
+        .ptr = undefined,
+    };
+
     pub fn init(content: []const u8) @This() {
         if (std.mem.startsWith(u8, content, "---\n")) {
             var document: @This() = .{ .ptr = content };