Skip to content

add option for default index file to static middleware #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nihildeb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add option for default index file to static middleware #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions libs/weblit-static.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ local jsonStringify = require('json').stringify

local makeChroot = require('hybrid-fs')

return function (path)
return function (path, options)

options = options or {}

local fs = makeChroot(path)

Expand All @@ -26,8 +28,21 @@ return function (path)
if path:byte(1) == 47 then
path = path:sub(2)
end

local stat = fs.stat(path)
if not stat then return go() end

local index_appended = false
if options.index and stat.type == "directory" then
local path_with_index = path .. options.index
local stat_with_index = fs.stat(path_with_index)
if not stat_with_index then return go() end
if stat_with_index.type ~= 'file' then return go() end
path = path_with_index
stat = stat_with_index
index_appended = true
end

if stat.type == "directory" then
if req.path:byte(-1) ~= 47 then
res.code = 301
Expand All @@ -46,7 +61,7 @@ return function (path)
return
end
if stat.type == "file" then
if req.path:byte(-1) == 47 then
if req.path:byte(-1) == 47 and not index_appended then
res.code = 301
res.headers.Location = req.path:match("^(.*[^/])/+$")
return
Expand Down