feat(config): Added data path.

fixtures/default_config.json

@@ -1,8 +1,9 @@
 {
+  "db_path": "~/.envr/data.age",
   "keys": [
     {
-      "private": "/home/spencer/.ssh/id_ed25519",
-      "public": "/home/spencer/.ssh/id_ed25519.pub"
+      "private": "~/.ssh/id_ed25519",
+      "public": "~/.ssh/id_ed25519.pub"
     }
   ],
   "scan": {
@@ -17,4 +18,4 @@
       "~"
     ]
   }
-}
+}

src/Config.zig

@@ -1,22 +1,27 @@
 const std = @import("std");
 
+db_path: []const u8 = "~/.envr/data.age",
+
 /// 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
 scan: ScanConfig = .default,
 
+// TODO: Allow incomplete pairs
 pub const SSHKeyPair = struct {
     private: []const u8,
     public: []const u8,
 
     /// Caller owns the returned memory
     pub fn from_path(gpa: std.mem.Allocator, path: []const u8) !SSHKeyPair {
-        if (std.mem.eql(u8, std.fs.path.extension(path), ".pub")){
+        if (std.mem.eql(u8, std.fs.path.extension(path), ".pub")) {
             return from_pub_path(path);
         } else {
             return .{
-                .public = try std.mem.concat(gpa, u8, &.{path, ".pub"}),
+                .public = try std.mem.concat(gpa, u8, &.{ path, ".pub" }),
                 .private = path,
             };
         }
@@ -27,7 +32,7 @@ pub const SSHKeyPair = struct {
 
         return .{
             .public = path,
-            .private = path[0..path.len - 4],
+            .private = path[0 .. path.len - 4],
         };
     }
 };
@@ -117,11 +122,7 @@ test "loading the default config from disk matches expected values" {
 test "saving to a new file upserts the file" {
     const io = std.testing.io;
 
-    var cfg: @This() = .{
-        .keys = &.{
-          .from_pub_path("~/.ssh/id_ed25519.pub"),
-        },
-    };
+    var cfg: @This() = .{};
 
     var tmp = std.testing.tmpDir(.{});
     defer tmp.cleanup();
@@ -145,6 +146,7 @@ test "saving to a new file upserts the file" {
 
     const want =
         \\{
+        \\  "db_path": "~/.envr/data.age",
         \\  "keys": [
         \\    {
         \\      "private": "~/.ssh/id_ed25519",
@@ -172,11 +174,7 @@ test "saving to a new file upserts the file" {
 test "saving to an existing file updates the file" {
     const io = std.testing.io;
 
-    var cfg: @This() = .{
-        .keys = &.{
-            .from_pub_path("~/.ssh/id_ed25519.pub"),
-        },
-    };
+    var cfg: @This() = .{};
 
     var tmp = std.testing.tmpDir(.{});
     defer tmp.cleanup();
@@ -198,6 +196,7 @@ test "saving to an existing file updates the file" {
 
     const want =
         \\{
+        \\  "db_path": "~/.envr/data.age",
         \\  "keys": [
         \\    {
         \\      "private": "~/.ssh/id_ed25519",

src/Db.zig

@@ -4,6 +4,10 @@ const std = @import("std");
 const sqlite = @import("sqlite");
 
 const age = @import("age.zig");
+const Config = @import("Config.zig");
+
+/// controls the keys and filepaths used for saving
+config: Config,
 
 /// The underlying data store.
 sql_db: sqlite.Db,
@@ -17,25 +21,36 @@ changed: bool = false,
 pub fn open(
     io: std.Io,
     gpa: std.mem.Allocator,
-    /// The path to the home directory
-    home: []const u8,
-    /// The path to the /tmp directory
-    tmp: []const u8,
+    opts: OpenOptions,
 ) !@This() {
-    const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" });
+    // FIXME: cheating here
+    const db_path = try std.fs.path.join(gpa, &.{
+        opts.home,
+        opts.config.db_path[2..],
+    });
     defer gpa.free(db_path);
 
-    var db = try new();
+    var db = try new(opts.config);
 
     if (db_exists(io, db_path)) {
         // const tmp_dir = try std.Io.Dir.cwd().openDir(io, tmp, .{});
         // 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);
 
+        // TODO: Use std.MultiArrayList? Had json issues
+        var private_keys: std.ArrayList([]const u8) = try .initCapacity(
+            gpa,
+            opts.config.keys.len,
+        );
+
+        for (opts.config.keys) |key| {
+            private_keys.appendAssumeCapacity(key.private);
+        }
+
         // TODO: Pass key(s) from Config
-        try age.decrypt(io, gpa, &.{"~/.ssh/id_ed25519"}, db_path, tmp_db_path);
+        try age.decrypt(io, gpa, private_keys.items, db_path, tmp_db_path);
 
         try db.restore(tmp_db_path);
         try std.Io.Dir.cwd().deleteFile(io, tmp_db_path);
@@ -46,8 +61,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
-fn new() !@This() {
+fn new(config: Config) !@This() {
     var db = try sqlite.Db.init(.{
         .mode = .Memory,
         .open_flags = .{ .write = true, .create = true },
@@ -63,7 +88,10 @@ fn new() !@This() {
         \\)
     , .{}, .{});
 
-    return .{ .sql_db = db };
+    return .{
+        .sql_db = db,
+        .config = config,
+    };
 }
 
 /// Returns true if a file exists at ~/.envr/data.age
@@ -112,22 +140,30 @@ pub fn close(
     self: *@This(),
     io: std.Io,
     gpa: std.mem.Allocator,
-    home: []const u8,
-    tmp: []const u8,
+    opts: OpenOptions,
 ) !void {
     defer self.sql_db.deinit();
 
     if (self.changed) {
-        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);
 
         try self.sql_db.exec("VACUUM INTO ?", .{}, .{tmp_db_path});
 
-        const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" });
+        const db_path = try std.fs.path.join(gpa, &.{ opts.home, ".envr", "data.age" });
         defer gpa.free(db_path);
 
-        // FIXME: Use real key
-        try age.encrypt(io, gpa, &.{"~/.ssh/id_ed25519.pub"}, tmp_db_path, db_path);
+        // TODO: Use std.MultiArrayList? Had json issues
+        var public_keys: std.ArrayList([]const u8) = try .initCapacity(
+            gpa,
+            opts.config.keys.len,
+        );
+
+        for (opts.config.keys) |key| {
+            public_keys.appendAssumeCapacity(key.private);
+        }
+
+        try age.encrypt(io, gpa, public_keys.items, tmp_db_path, db_path);
 
         self.changed = false;
     }
@@ -224,8 +260,10 @@ test "Closing a fresh database does not create a file" {
     const tmp = try std.fs.path.join(gpa, &.{ tmp_dir_path, "tmp" });
     defer gpa.free(tmp);
 
-    var db: @This() = try .open(io, gpa, home, tmp);
+    // TODO: Pass testing keys
+    var db: @This() = try .open(io, gpa, .{ .home = home, .tmp = tmp });
 
+    // TODO: Get rid of direct access
     const db_path = try std.fs.path.join(gpa, &.{ home, ".envr", "data.age" });
     defer gpa.free(db_path);
 
@@ -234,7 +272,7 @@ test "Closing a fresh database does not create a file" {
         tmp_dir.dir.access(io, db_path, .{ .read = true }),
     );
 
-    try db.close(io, gpa, home, tmp);
+    try db.close(io, gpa, .{ .home = home, .tmp = tmp });
 
     try std.testing.expectError(
         error.FileNotFound,
@@ -242,6 +280,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" {}