srctree

Gregory Mullen parent 25bd01d4 28652ae6
simplify the api a bit more

src/server.zig added: 14, removed: 17, total 0

@@ -11,7 +11,6 @@ pub const zWSGI = @import("zwsgi.zig");

pub const Http = @import("http.zig");

alloc: Allocator,

//config: Config,

router: Router,

//runmode: RunMode,

interface: union(RunMode) {

src/template.zig added: 14, removed: 17, total 0

@@ -9,6 +9,9 @@ pub const Structs = @import("comptime_structs");

pub const Directive = @import("template/directive.zig");

pub const DOM = @import("dom.zig");

pub const HTML = @import("html.zig");

const Pages = @import("template/page.zig");

pub const Page = Pages.Page;

pub const PageRuntime = Pages.PageRuntime;

src/verse.zig added: 14, removed: 17, total 0

@@ -4,23 +4,16 @@ const splitScalar = std.mem.splitScalar;

const log = std.log.scoped(.Verse);

pub const Server = @import("server.zig");

pub const zWSGI = Server.zWSGI;

pub const zWSGIRequest = zWSGI.zWSGIRequest;

pub const Request = @import("request.zig");

pub const Response = @import("response.zig");

pub const RequestData = @import("request_data.zig");

pub const Template = @import("template.zig");

pub const HTML = @import("html.zig");

pub const DOM = @import("dom.zig");

pub const Router = @import("router.zig");

pub const UriIter = Router.UriIter;

pub const Auth = @import("auth.zig");

pub const Ini = @import("ini.zig");

pub const Config = Ini.Config;

const Error = @import("errors.zig").Error;

pub const Verse = @This();

@@ -30,7 +23,6 @@ request: Request,

response: Response,

reqdata: RequestData,

uri: UriIter,

cfg: ?Config,

// TODO fix this unstable API

auth: Auth,

@@ -41,7 +33,7 @@ const VarPair = struct {

[]const u8,

};

pub fn init(a: Allocator, cfg: ?Config, req: Request, res: Response, reqdata: RequestData) !Verse {

pub fn init(a: Allocator, req: Request, res: Response, reqdata: RequestData) !Verse {

std.debug.assert(req.uri[0] == '/');

return .{

.alloc = a,

@@ -49,7 +41,6 @@ pub fn init(a: Allocator, cfg: ?Config, req: Request, res: Response, reqdata: Re

.response = res,

.reqdata = reqdata,

.uri = splitScalar(u8, req.uri[1..], '/'),

.cfg = cfg,

.auth = Auth{},

};

}

src/zwsgi.zig added: 14, removed: 17, total 0

@@ -15,7 +15,11 @@ alloc: Allocator,

unix_file: []const u8,

router: Router,

pub fn init(a: Allocator, file: []const u8, router: Router) zWSGI {

pub fn init(

a: Allocator,

file: []const u8,

router: Router,

) zWSGI {

return .{

.alloc = a,

.unix_file = file,

@@ -238,7 +242,7 @@ pub fn buildVerse(a: Allocator, request: *Request) !Verse {

}

const response = try Response.init(a, request);

return Verse.init(a, null, request.*, response, reqdata);

return Verse.init(a, request.*, response, reqdata);

}

fn readuWSGIHeader(a: Allocator, acpt: net.Server.Connection) !Request {