mirror of
https://github.com/lxsang/antd-web-apps
synced 2024-11-20 02:18:20 +01:00
add local image support
This commit is contained in:
lxsang
parent
c757bd253b
commit
77d5267443
@ -1,12 +1,27 @@
|
||||
BaseController:subclass("DocController")
|
||||
|
||||
local getpath = function(vfspath, controller)
|
||||
return vfspath:gsub(controller.path_map.vfs_path, controller.path_map.local_path)
|
||||
return vfspath:gsub(controller.path_map.vfs_path,
|
||||
controller.path_map.local_path)
|
||||
end
|
||||
|
||||
local pre_process_md = function(str, obj)
|
||||
local content = str
|
||||
for capture in str:gmatch("(%[%[@book:image:.*%]%])") do
|
||||
local apath = capture:match("%[%[@book:image:(.*)%]%]")
|
||||
local pattern = capture:gsub("%[", "%%["):gsub("%]", "%%]")
|
||||
if apath then
|
||||
content = str:gsub(pattern,
|
||||
"![](" .. HTTP_ROOT .. "/" .. obj.name ..
|
||||
"/asset/" .. apath .. ")")
|
||||
end
|
||||
end
|
||||
return content
|
||||
end
|
||||
|
||||
function DocController:loadTOC()
|
||||
local path = self.path_map.local_path.."/meta.json"
|
||||
local result = { error = false}
|
||||
local path = self.path_map.local_path .. "/meta.json"
|
||||
local result = {error = false}
|
||||
if ulib.exists(path) then
|
||||
local bmeta = JSON.decodeFile(path)
|
||||
if bmeta == nil then
|
||||
@ -15,39 +30,40 @@ function DocController:loadTOC()
|
||||
else
|
||||
result.data = {
|
||||
name = bmeta.name,
|
||||
path = self.path_map.vfs_path.."/INTRO.md",
|
||||
path = self.path_map.vfs_path .. "/INTRO.md",
|
||||
entries = {},
|
||||
parent = nil
|
||||
}
|
||||
-- read all the entries
|
||||
for kc,vc in pairs(bmeta.entries) do
|
||||
local cpath = getpath(vc.path, self).."/meta.json"
|
||||
for kc, vc in pairs(bmeta.entries) do
|
||||
local cpath = getpath(vc.path, self) .. "/meta.json"
|
||||
if ulib.exists(cpath) then
|
||||
local cmeta = JSON.decodeFile(cpath)
|
||||
if cmeta then
|
||||
local chapter = {
|
||||
name = cmeta.name,
|
||||
path = vc.path.."/INTRO.md",
|
||||
path = vc.path .. "/INTRO.md",
|
||||
tpath = vc.path,
|
||||
entries = {},
|
||||
parent = result.data,
|
||||
id = kc
|
||||
}
|
||||
-- read all sections
|
||||
for ks,vs in pairs(cmeta.entries) do
|
||||
local spath = getpath(vs.path, self).."/meta.json"
|
||||
for ks, vs in pairs(cmeta.entries) do
|
||||
local spath = getpath(vs.path, self) .. "/meta.json"
|
||||
local smeta = JSON.decodeFile(spath)
|
||||
if smeta then
|
||||
local section = {
|
||||
name = smeta.name,
|
||||
path = vs.path.."/INTRO.md",
|
||||
tpath = vs.path,
|
||||
entries = {},
|
||||
parent = chapter,
|
||||
id = ks
|
||||
}
|
||||
local section =
|
||||
{
|
||||
name = smeta.name,
|
||||
path = vs.path .. "/INTRO.md",
|
||||
tpath = vs.path,
|
||||
entries = {},
|
||||
parent = chapter,
|
||||
id = ks
|
||||
}
|
||||
-- read all files
|
||||
for kf,vf in pairs(smeta.entries) do
|
||||
for kf, vf in pairs(smeta.entries) do
|
||||
local fpath = getpath(vf.path, self)
|
||||
if ulib.exists(fpath) then
|
||||
local file = io.open(fpath, "r")
|
||||
@ -55,21 +71,23 @@ function DocController:loadTOC()
|
||||
local line = io.read()
|
||||
io.close()
|
||||
if line then
|
||||
local file = {
|
||||
name = std.trim(std.trim(line, "#"), " "),
|
||||
path = vf.path,
|
||||
tpath = vf.path,
|
||||
parent = section,
|
||||
id = kf
|
||||
}
|
||||
table.insert( section.entries, file)
|
||||
local file =
|
||||
{
|
||||
name = std.trim(
|
||||
std.trim(line, "#"), " "),
|
||||
path = vf.path,
|
||||
tpath = vf.path,
|
||||
parent = section,
|
||||
id = kf
|
||||
}
|
||||
table.insert(section.entries, file)
|
||||
end
|
||||
end
|
||||
end
|
||||
table.insert( chapter.entries, section)
|
||||
table.insert(chapter.entries, section)
|
||||
end
|
||||
end
|
||||
table.insert( result.data.entries, chapter)
|
||||
table.insert(result.data.entries, chapter)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -101,12 +119,15 @@ function DocController:index(...)
|
||||
end
|
||||
else
|
||||
toc.cpath = self.path_map.vfs_path
|
||||
path = self.path_map.local_path.."/INTRO.md"
|
||||
path = self.path_map.local_path .. "/INTRO.md"
|
||||
end
|
||||
if path and ulib.exists(path) then
|
||||
local file = io.open(path, "r")
|
||||
local content = file:read("*a")
|
||||
file.close()
|
||||
-- replace some display plugins
|
||||
content = pre_process_md(content, self)
|
||||
|
||||
self.template:setView("index", "index")
|
||||
self.template:set("data", content)
|
||||
else
|
||||
@ -122,11 +143,11 @@ function DocController:search(...)
|
||||
local cmd = "grep -ri --include=\\*.md "
|
||||
local arr = explode(query, " ")
|
||||
local patterns = {}
|
||||
for k,v in ipairs(arr) do
|
||||
for k, v in ipairs(arr) do
|
||||
local world = std.trim(v, " ")
|
||||
if v and v ~= "" then
|
||||
cmd = cmd.." -e '"..v.."' "
|
||||
table.insert( patterns,v:lower())
|
||||
cmd = cmd .. " -e '" .. v .. "' "
|
||||
table.insert(patterns, v:lower())
|
||||
end
|
||||
end
|
||||
if #patterns > 0 then
|
||||
@ -134,7 +155,7 @@ function DocController:search(...)
|
||||
toc.controller = self.name
|
||||
self.template:set("toc", toc)
|
||||
self.template:setView("search", "index")
|
||||
cmd = cmd..self.path_map.local_path
|
||||
cmd = cmd .. self.path_map.local_path
|
||||
local handle = io.popen(cmd)
|
||||
local result = {}
|
||||
for line in handle:lines() do
|
||||
@ -143,11 +164,13 @@ function DocController:search(...)
|
||||
if not result[file] then
|
||||
result[file] = {}
|
||||
end
|
||||
local content = line:gsub("^[^:]*:",""):lower()
|
||||
for k,p in ipairs(patterns) do
|
||||
content = content:gsub(p, "<span class='pattern'>"..p.."</span>")
|
||||
local content = line:gsub("^[^:]*:", ""):lower()
|
||||
for k, p in ipairs(patterns) do
|
||||
content = content:gsub(p,
|
||||
"<span class='pattern'>" .. p ..
|
||||
"</span>")
|
||||
end
|
||||
table.insert(result[file],content)
|
||||
table.insert(result[file], content)
|
||||
end
|
||||
end
|
||||
handle:close()
|
||||
@ -165,26 +188,43 @@ function DocController:search(...)
|
||||
return true
|
||||
end
|
||||
|
||||
function DocController:asset(...)
|
||||
local args = {...}
|
||||
if #args == 0 then return self:actionnotfound(table.unpack(args)) end
|
||||
|
||||
local path = self.path_map.local_path .. "/" .. implode(args, DIR_SEP)
|
||||
|
||||
if self.registry.fileaccess and ulib.exists(path) then
|
||||
local mime = std.mimeOf(path)
|
||||
print(mime)
|
||||
if POLICY.mimes[mime] then
|
||||
std.sendFile(path)
|
||||
else
|
||||
self:error("Access forbidden: " .. path)
|
||||
end
|
||||
else
|
||||
self:error("Asset file not found or access forbidden: " .. path)
|
||||
end
|
||||
return false
|
||||
end
|
||||
function DocController:api(...)
|
||||
local args = {...}
|
||||
if not self.path_map.api_path then
|
||||
return self:actionnotfound(table.unpack(args))
|
||||
end
|
||||
local rpath = "index.html"
|
||||
if #args ~= 0 then
|
||||
rpath = implode(args,"/")
|
||||
end
|
||||
local path = self.path_map.api_path.."/"..rpath
|
||||
if #args ~= 0 then rpath = implode(args, "/") end
|
||||
local path = self.path_map.api_path .. "/" .. rpath
|
||||
|
||||
if ulib.exists(path) then
|
||||
local mime = std.mimeOf(path)
|
||||
if POLICY.mimes[mime] then
|
||||
std.sendFile(path)
|
||||
else
|
||||
self:error("Access forbidden: "..path)
|
||||
self:error("Access forbidden: " .. path)
|
||||
end
|
||||
else
|
||||
self:error("File not found or access forbidden: "..path)
|
||||
self:error("File not found or access forbidden: " .. path)
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user