Skip to content

Get rid of io module. #119

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

Merged
merged 1 commit into from
May 15, 2020
Merged

Get rid of io module. #119

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
28 changes: 22 additions & 6 deletions http/router/fs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ local mime_types = require('http.mime_types')
local response = require('http.router.response')

local json = require('json')
local fio = require('fio')

local function type_by_format(fmt)
if fmt == nil then
Expand Down Expand Up @@ -62,14 +63,19 @@ local function static_file(self, request, format)
}
end

local s, fh = pcall(io.input, file)
local fh, err = fio.open(file, {'O_RDONLY'})

if not s then
if err ~= nil then
return { status = 404 }
end

local body = fh:read('*a')
io.close(fh)
local body
body, err = fh:read()
if err ~= nil then
utils.errorf("Can not return static file for '%s': '%s'", request:path(), err)
end

fh:close()

if self.options.cache_static then
self.cache.static[ file ] = body
Expand Down Expand Up @@ -158,8 +164,18 @@ local function load_template(self, r, format)


local tpl = catfile(self.options.app_dir, 'templates', file)
local fh = io.input(tpl)
local template = fh:read('*a')
local fh, err = fio.open(tpl)
if err ~= nil then
utils.errorf("Can not load template for '%s': '%s'", r.path, err)
end

local template
template, err = fh:read()

if err ~= nil then
utils.errorf("Can not load template for '%s': '%s'", r.path, err)
end

fh:close()

if self.options.cache_templates then
Expand Down