godzil/nodemcu-httpserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix example server-side scripts to work on new nodemcu-firmware. Specifically, call coroutine.yield() after each connection:send() except the last one, since we can no longer queue sends.

Browse Source
This commit is contained in:
Marcos Kirsch
2016-02-15 14:20:28 -06:00
parent 4ff7b2b78d
commit 4d4442318d
4 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
http/file_list.lua
View File

@@ -1,30 +1,27 @@
return function (connection, args)
connection:send("HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nCache-Control: private, no-store\r\n\r\n")
connection:send('<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><title>Server File Listing</title></head>')
connection:send('<body>')
dofile("httpserver-header.lc")(connection, 200, 'html')
connection:send([===[
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><title>Server File Listing</title></head>
<body>
<h1>Server File Listing</h1>
]===])
coroutine.yield()
connection:send('<h1>Server File Listing</h1>')
local remaining, used, total=file.fsinfo()
connection:send("<b>Total size: </b> " .. total .. " bytes<br/>\n")
connection:send("<b>In Use: </b> " .. used .. " bytes<br/>\n")
connection:send("<b>Free: </b> " .. remaining .. " bytes<br/>\n")
connection:send("<p>\n")
connection:send("<b>Files:</b><br/>\n")
connection:send("<ul>\n")
connection:send("<b>Total size: </b> " .. total .. " bytes<br/>\n" ..
"<b>In Use: </b> " .. used .. " bytes<br/>\n" ..
"<b>Free: </b> " .. remaining .. " bytes<br/>\n" ..
"<p>\n<b>Files:</b><br/>\n<ul>\n")
coroutine.yield()
for name, size in pairs(file.list()) do
local isHttpFile = string.match(name, "(http/)") ~= nil
if isHttpFile then
local url = string.match(name, ".*/(.*)")
connection:send(' <li><a href="' .. url .. '">' .. url .. "</a> (" .. size .. " bytes)</li>\n")
-- this list could be very long, so we'll yield in order to avoid overflowing the send buffer.
coroutine.yield()
end
end
connection:send("</ul>\n")
connection:send("</p>\n")
connection:send('</body></html>')
connection:send("</ul>\n</p>\n</body></html>")
end