1 Commits

Author SHA1 Message Date
0fd0968fee wip: feat: accept config in Db 2026-04-30 22:37:34 -04:00
2 changed files with 33 additions and 16 deletions

View File

@@ -1,7 +1,9 @@
const std = @import("std"); const std = @import("std");
/// Keys that are available for encryption /// Keys that are available for encryption
keys: []const SSHKeyPair, keys: []const SSHKeyPair = &.{
.from_pub_path("~/.ssh/id_ed25519.pub"),
},
/// Rules for how to match the scan command /// Rules for how to match the scan command
scan: ScanConfig = .default, scan: ScanConfig = .default,

View File

@@ -4,6 +4,10 @@ const std = @import("std");
const sqlite = @import("sqlite"); const sqlite = @import("sqlite");
const age = @import("age.zig"); const age = @import("age.zig");
const Config = @import("Config.zig");
/// controls the keys and filepaths used for saving
config: Config,
/// The underlying data store. /// The underlying data store.
sql_db: sqlite.Db, sql_db: sqlite.Db,
@@ -17,21 +21,19 @@ changed: bool = false,
pub fn open( pub fn open(
io: std.Io, io: std.Io,
gpa: std.mem.Allocator, gpa: std.mem.Allocator,
/// The path to the home directory opts: OpenOptions,
home: []const u8,
/// The path to the /tmp directory
tmp: []const u8,
) !@This() { ) !@This() {
const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" }); // TODO: Read from config?
const db_path = try std.fs.path.join(gpa, &.{ opts.home, ".envr", "data.age" });
defer gpa.free(db_path); defer gpa.free(db_path);
var db = try new(); var db = try new(opts.config);
if (db_exists(io, db_path)) { if (db_exists(io, db_path)) {
// const tmp_dir = try std.Io.Dir.cwd().openDir(io, tmp, .{}); // const tmp_dir = try std.Io.Dir.cwd().openDir(io, tmp, .{});
// defer tmp_dir.deleteFile(io, "envr.db"); // defer tmp_dir.deleteFile(io, "envr.db");
const tmp_db_path = try std.fs.path.join(gpa, &.{ tmp, "envr.db" }); const tmp_db_path = try std.fs.path.join(gpa, &.{ opts.tmp, "envr.db" });
defer gpa.free(tmp_db_path); defer gpa.free(tmp_db_path);
// TODO: Pass key(s) from Config // TODO: Pass key(s) from Config
@@ -46,8 +48,18 @@ pub fn open(
} }
} }
const OpenOptions = struct {
config: Config = .{},
/// The path to the home directory
home: []const u8 = "~/",
/// The path to the /tmp directory
// FIXME: Support windows
tmp: []const u8 = "/tmp",
};
/// Create a new instance of the database in-memory /// Create a new instance of the database in-memory
fn new() !@This() { fn new(config: Config) !@This() {
var db = try sqlite.Db.init(.{ var db = try sqlite.Db.init(.{
.mode = .Memory, .mode = .Memory,
.open_flags = .{ .write = true, .create = true }, .open_flags = .{ .write = true, .create = true },
@@ -63,7 +75,10 @@ fn new() !@This() {
\\) \\)
, .{}, .{}); , .{}, .{});
return .{ .sql_db = db }; return .{
.sql_db = db,
.config = config,
};
} }
/// Returns true if a file exists at ~/.envr/data.age /// Returns true if a file exists at ~/.envr/data.age
@@ -224,7 +239,7 @@ test "Closing a fresh database does not create a file" {
const tmp = try std.fs.path.join(gpa, &.{ tmp_dir_path, "tmp" }); const tmp = try std.fs.path.join(gpa, &.{ tmp_dir_path, "tmp" });
defer gpa.free(tmp); defer gpa.free(tmp);
var db: @This() = try .open(io, gpa, home, tmp); var db: @This() = try .open(io, gpa, .{ .home = home, .tmp = tmp });
const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" }); const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" });
defer gpa.free(db_path); defer gpa.free(db_path);
@@ -242,6 +257,6 @@ test "Closing a fresh database does not create a file" {
); );
} }
// test "Closing an unmodified database does not create a file" {} // test "Closing an unmodified database does not update the file" {}
// test "Closing a modified database does create a file" {} // test "Closing a modified database does create a file" {}