Merge branch 'mgord9518:main' into main

mgord9518 · Jul 1, 2024 · 474b653 · 474b653
2 parents e422d11 + 2ac5894
commit 474b653
Show file tree

Hide file tree

Showing 6 changed files with 420 additions and 531 deletions.
diff --git a/permissions/sockets.json b/permissions/sockets.json
diff --git a/zig/build.zig.zon b/zig/build.zig.zon
@@ -1,6 +1,6 @@
 .{
     .name = "aisap",
-    .version = "0.10.11-alpha",
+    .version = "0.10.1-alpha",
     .paths = [][]const u8 {""},
     .dependencies = .{
         .squashfuse = .{
@@ -12,8 +12,8 @@
             .hash = "12205592f7dc4b4c7256abd657a50bd9784459a0e9b8bfe8b0d1bbcc153a6d0f650a",
         },
         .known_folders = .{
-            .url = "https://github.com/ziglibs/known-folders/archive/0ad514dcfb7525e32ae349b9acc0a53976f3a9fa.tar.gz",
-            .hash = "12209cde192558f8b3dc098ac2330fc2a14fdd211c5433afd33085af75caa9183147",
+            .url = "https://github.com/ziglibs/known-folders/archive/cdcc6137ed2e92096b27d394db917d1861f156b3.tar.gz",
+            .hash = "1220863f0fc3e97cfd47a8edb28c7a3d109c42143235042fb513207b5c5a032fb93f",
         },
     },
 }
diff --git a/zig/examples/build.zig b/zig/examples/build.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const aisap = @import("aisap/zig/build.zig");
+//const aisap = @import("aisap/zig/build.zig");
 
 pub fn build(b: *std.Build) void {
     // Standard target options allows the person running `zig build` to choose

diff --git a/zig/examples/src/main.zig b/zig/examples/src/main.zig
@@ -62,7 +62,7 @@ pub fn main() !void {
 
     var md5_buf: [33]u8 = undefined;
 
-    const permissions = try ai.permissions(
+    var permissions = try ai.permissions(
         allocator,
     ) orelse {
         std.debug.print("no permissions found\n", .{});
@@ -85,6 +85,9 @@ pub fn main() !void {
         std.debug.print("[]\n", .{});
     }
 
+    permissions.level = 3;
+    try AppImage.SocketPermissions.initDatabase(allocator);
+
     std.debug.print("{s}\n", .{ai.name});
     std.debug.print("desktop: {s}\n", .{ai.desktop_entry});
     std.debug.print("type: {}\n", .{ai.kind});
@@ -93,12 +96,14 @@ pub fn main() !void {
         try ai.md5(&md5_buf),
     });
 
-    try ai.mount(.{});
+    try ai.mount(.{
+        .foreground = false,
+    });
 
-    const wrapArgs = try ai.wrapArgs(allocator);
-    printWrapArgs(wrapArgs);
+    //const wrapArgs = try ai.wrapArgs(allocator, permissions);
+    //printWrapArgs(wrapArgs);
 
-    try ai.sandbox(.{
+    try ai.sandbox(permissions, .{
         //.args = &[_][]const u8{"build"},
     });
 }