yuzucchii/jetzig
1
0
Fork 0
mirror of https://github.com/jetzig-framework/jetzig.git synced 2025-05-14 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from jetzig-framework/fix-routes-windows-paths

Browse Source 
Fix Windows paths again
This commit is contained in:
bobf 2024-03-10 17:19:49 +00:00 committed by GitHub
commit 4d7bd71324
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/GenerateRoutes.zig
View File

@ -186,12 +186,16 @@ fn writeRoute(self: *Self, writer: std.ArrayList(u8).Writer, route: Function) !v
try params_writer.writeAll(".{}"); try params_writer.writeAll(".{}");
} }
const module_path = try self.allocator.dupe(u8, route.path);
defer self.allocator.free(module_path);
std.mem.replaceScalar(u8, module_path, '\\', '/');
const output = try std.fmt.allocPrint(self.allocator, output_template, .{ const output = try std.fmt.allocPrint(self.allocator, output_template, .{
full_name, full_name,
route.name, route.name,
uri_path, uri_path,
full_name, full_name,
route.path, module_path,
route.name, route.name,
params_buf.items, params_buf.items,
}); });
@ -437,12 +441,9 @@ fn parseFunction(
} }
} }
const full_path = try std.fs.path.join(self.allocator, &[_][]const u8{ "src", "app", "views", path });
defer self.allocator.free(full_path);
return .{ return .{
.name = function_name, .name = function_name,
.path = try escapeString(self.allocator, full_path), .path = try std.fs.path.join(self.allocator, &[_][]const u8{ "src", "app", "views", path }),
.args = try self.allocator.dupe(Arg, args.items), .args = try self.allocator.dupe(Arg, args.items),
.source = try self.allocator.dupe(u8, source), .source = try self.allocator.dupe(u8, source),
.params = std.ArrayList([]const u8).init(self.allocator), .params = std.ArrayList([]const u8).init(self.allocator),
@ -487,13 +488,3 @@ fn isActionFunctionName(name: []const u8) bool {
return false; return false;
} }
fn escapeString(allocator: std.mem.Allocator, input: []const u8) ![]const u8 {
var buf = std.ArrayList(u8).init(allocator);
defer buf.deinit();
const writer = buf.writer();
try std.zig.stringEscape(input, "", .{}, writer);
return try allocator.dupe(u8, buf.items);
}