From e95cf5c7b6a08eb560763d5167fbddc1c2117bcc Mon Sep 17 00:00:00 2001 From: Nathan Reiner Date: Mon, 17 Nov 2025 09:57:09 +0100 Subject: add file uploading and multi-threading --- src/storage/image-manager/image.zig | 73 ++++++++++++++++++++++++++++++++++++ src/storage/image-manager/root.zig | 66 ++++++++++++++++++++++++++++++++ src/storage/image.zig | 39 ------------------- src/storage/root.zig | 8 +++- src/storage/session-manager/root.zig | 21 ++++++++++- src/storage/user.zig | 9 +++-- 6 files changed, 172 insertions(+), 44 deletions(-) create mode 100644 src/storage/image-manager/image.zig create mode 100644 src/storage/image-manager/root.zig delete mode 100644 src/storage/image.zig (limited to 'src/storage') diff --git a/src/storage/image-manager/image.zig b/src/storage/image-manager/image.zig new file mode 100644 index 0000000..91a094e --- /dev/null +++ b/src/storage/image-manager/image.zig @@ -0,0 +1,73 @@ +const std = @import("std"); +const Storage = @import("../root.zig"); + +const id_size = 32; + +const log = std.log.scoped(.image); + +fn new_id() [id_size]u8 { + var buffer: [id_size]u8 = undefined; + var raw_buffer: [id_size / 2]u8 = undefined; + std.crypto.random.bytes(&raw_buffer); + + var writer = std.Io.Writer.fixed(buffer[0..]); + writer.print("{x}", .{raw_buffer}) catch unreachable; + + return buffer[0..].*; +} + +const Self = @This(); + +id: []const u8, + +pub fn new( + storage: *Storage, + reader: *std.Io.Reader, + size: usize, +) !Self { + var dir = try storage.dir.openDir("image", .{}); + defer dir.close(); + + var file_name: [id_size+4]u8 = undefined; + const self: Self = .{ .id = &new_id() }; + @memcpy(file_name[0..id_size], self.id); + @memcpy(file_name[id_size..], ".jpg"); + + var image_file = try dir.createFile(&file_name, .{}); + defer image_file.close(); + + var buffer: [1024]u8 = undefined; + var file_writer = image_file.writer(&buffer); + + try reader.streamExact(&file_writer.interface, size); + + try file_writer.interface.flush(); + + log.info("uploaded {s} [{} bytes]", .{self.id, size}); + + return self; +} + +pub fn init(allocator: std.mem.Allocator, id: []const u8) !Self { + return .{ + .id = try allocator.dupe(u8, id), + }; +} + +pub fn file(self: *Self, storage: *Storage) !std.fs.File { + var dir = storage.dir.openDir("image", .{}) catch blk: { + try storage.dir.makeDir("image"); + break :blk try storage.dir.openDir("image", .{}); + }; + defer dir.close(); + + var file_name: [id_size+4]u8 = undefined; + @memcpy(file_name[0..id_size], self.id); + @memcpy(file_name[id_size..], ".jpg"); + + return dir.openFile(&file_name, .{}); +} + +pub fn deinit(self: *Self, allocator: std.mem.Allocator) void { + allocator.free(self.id); +} diff --git a/src/storage/image-manager/root.zig b/src/storage/image-manager/root.zig new file mode 100644 index 0000000..7742df2 --- /dev/null +++ b/src/storage/image-manager/root.zig @@ -0,0 +1,66 @@ +const std = @import("std"); + +const Storage = @import("../root.zig"); +pub const Image = @import("image.zig"); + +const Self = @This(); + +pub const empty: Self = .{}; + +items: std.ArrayList(Image) = .empty, +rw_lock: std.Thread.RwLock = .{}, + +pub const LockedImages = struct { + images: []Image, + rw_lock: *std.Thread.RwLock, + + pub fn deinit(self: *const @This()) void { + self.rw_lock.unlockShared(); + } +}; + +pub fn init( + self: *Self, + storage: *Storage, +) !void { + var dir = storage.dir.openDir("image", .{ .iterate = true }) catch blk: { + try storage.dir.makeDir("image"); + break :blk try storage.dir.openDir("image", .{ .iterate = true }); + }; + defer dir.close(); + + var iterator = dir.iterate(); + + errdefer self.items.deinit(storage.allocator); + + while (try iterator.next()) |entry| { + if (entry.kind == .file and std.mem.endsWith(u8, entry.name, ".jpg")) { + try self.items.append( + storage.allocator, + try .init(storage.allocator, entry.name[0..entry.name.len - 4]) + ); + } + } +} + +pub fn add( + self: *Self, + storage: *Storage, + reader: *std.Io.Reader, + size: usize, +) !void { + self.rw_lock.lock(); + defer self.rw_lock.unlock(); + + try self.items.append( + storage.allocator, + try Image.new(storage, reader, size), + ); +} + +pub fn list(self: *Self) LockedImages { + return .{ + .images = self.items.items, + .rw_lock = &self.rw_lock, + }; +} diff --git a/src/storage/image.zig b/src/storage/image.zig deleted file mode 100644 index 73bca84..0000000 --- a/src/storage/image.zig +++ /dev/null @@ -1,39 +0,0 @@ -const std = @import("std"); -const Storage = @import("root.zig"); - -const id_size = 32; - -fn new_id() [id_size]u8 { - var buffer: [id_size]u8 = undefined; - var raw_buffer: [id_size / 2]u8 = undefined; - std.crypto.random.bytes(&raw_buffer); - - var writer = std.Io.Writer.fixed(buffer[0..]); - writer.print("{x}", .{raw_buffer}) catch unreachable; - - return buffer[0..].*; -} - -pub fn new( - storage: *Storage, - reader: *std.Io.Reader, - size: usize, -) !void { - var dir = storage.dir.openDir("image", .{}) catch blk: { - try storage.dir.makeDir("image"); - break :blk try storage.dir.openDir("image", .{}); - }; - defer dir.close(); - - var file_name: [id_size+4]u8 = undefined; - @memcpy(file_name[0..id_size], &new_id()); - @memcpy(file_name[id_size..], ".jpg"); - - var file = try dir.createFile(&file_name, .{}); - defer file.close(); - - var buffer: [1024]u8 = undefined; - var file_writer = file.writer(&buffer); - - try reader.streamExact(&file_writer.interface, size); -} diff --git a/src/storage/root.zig b/src/storage/root.zig index c121ca9..381dc45 100644 --- a/src/storage/root.zig +++ b/src/storage/root.zig @@ -3,7 +3,10 @@ const config = @import("../config.zig"); const prompt = @import("../prompt.zig"); pub const User = @import("user.zig"); -pub const Image = @import("image.zig"); + +pub const ImageManager = @import("image-manager/root.zig"); +pub const Image = ImageManager.Image; + pub const SessionManager = @import("session-manager/root.zig"); pub const Session = SessionManager.Session; @@ -11,6 +14,7 @@ const Self = @This(); dir: std.fs.Dir, sessions: SessionManager = .empty, +images: ImageManager = .empty, allocator: std.mem.Allocator, pub fn init(allocator: std.mem.Allocator) !Self { @@ -56,6 +60,8 @@ pub fn init(allocator: std.mem.Allocator) !Self { else => return err, }; + try self.images.init(&self); + return self; } diff --git a/src/storage/session-manager/root.zig b/src/storage/session-manager/root.zig index 7f44bf0..d0e1441 100644 --- a/src/storage/session-manager/root.zig +++ b/src/storage/session-manager/root.zig @@ -11,8 +11,12 @@ pub const empty: Self = .{ }; cache: std.StringHashMapUnmanaged(Session), +rw_lock: std.Thread.RwLock = .{}, pub fn add(self: *Self, storage: *Storage, info: Storage.User.Info) !*Session { + self.rw_lock.lock(); + defer self.rw_lock.unlock(); + const session = try Session.init(storage.allocator, info); errdefer session.deinit(storage.allocator); try self.cache.put(storage.allocator, session.fingerprint, session); @@ -20,7 +24,12 @@ pub fn add(self: *Self, storage: *Storage, info: Storage.User.Info) !*Session { } pub fn renew(self: *Self, storage: *Storage, fingerprint: []const u8) !*Session { + self.rw_lock.lockShared(); if (self.cache.get(fingerprint)) |s| { + self.rw_lock.unlockShared(); + self.rw_lock.lock(); + defer self.rw_lock.unlock(); + var session = s; try session.reset(); @@ -29,24 +38,34 @@ pub fn renew(self: *Self, storage: *Storage, fingerprint: []const u8) !*Session _ = self.cache.remove(fingerprint); return self.cache.getPtr(session.fingerprint) orelse unreachable; + } else { + self.rw_lock.unlockShared(); } return error.SessionNotFound; } pub fn remove(self: *Self, storage: *Storage, fingerprint: []const u8) void { + self.rw_lock.lockShared(); if (self.cache.getPtr(fingerprint)) |session| { + self.rw_lock.unlockShared(); + self.rw_lock.lock(); + defer self.rw_lock.unlock(); + session.deinit(storage.allocator); _ = self.cache.remove(fingerprint); + } else { + self.rw_lock.unlockShared(); } } pub fn get(self: *Self, storage: *Storage, fingerprint: []const u8) ?*Session { + self.rw_lock.lockShared(); + defer self.rw_lock.unlockShared(); if (self.cache.getPtr(fingerprint)) |session| { const now = std.time.Instant.now() catch return null; const since = now.since(session.age); if (since > config.session_expires_after) { - std.debug.print("here\n", .{}); session.deinit(storage.allocator); _ = self.cache.remove(fingerprint); return null; diff --git a/src/storage/user.zig b/src/storage/user.zig index 4170fd1..d5260fe 100644 --- a/src/storage/user.zig +++ b/src/storage/user.zig @@ -58,7 +58,7 @@ pub fn open( var dir = try user_dir.openDir(name, .{}); errdefer dir.close(); - const file = try dir.openFile("info.json", .{}); + const file = try dir.openFile("info.json", .{ .lock = .shared }); defer file.close(); const content = try file.readToEndAlloc(allocator, std.math.maxInt(usize)); @@ -91,7 +91,7 @@ pub fn new( var dir = try user_dir.openDir(name, .{}); errdefer dir.close(); - var file = try dir.createFile("info.json", .{}); + var file = try dir.createFile("info.json", .{ .lock = .exclusive }); file.close(); const hash_buf = try allocator.alloc(u8, 256); @@ -124,7 +124,10 @@ pub fn new( } pub fn sync(self: *Self) !void { - const file = try self.dir.openFile("info.json", .{ .mode = .write_only }); + const file = try self.dir.openFile("info.json", .{ + .mode = .write_only, + .lock = .exclusive, + }); defer file.close(); var buffer: [1024]u8 = undefined; -- cgit v1.2.3-70-g09d2