diff options
| -rw-r--r-- | logfiles-model.lua | 19 | ||||
| -rw-r--r-- | logfiles-status-html.lsp | 10 |
2 files changed, 12 insertions, 17 deletions
diff --git a/logfiles-model.lua b/logfiles-model.lua index df35f0c..b5b08cf 100644 --- a/logfiles-model.lua +++ b/logfiles-model.lua @@ -137,20 +137,15 @@ mymodule.tail = function(self, clientdata) end mymodule.get = function () - -- Loop through each file and present its info - local listed_files = {} + local retval = {} for i,file in pairs(list_files()) do - -- Get info on this specific file and put it in a table - local st = posix.stat(file) - local filename = cfe({ value=file, label="File name" }) - local size = cfe({ value=st.size, label="File size" }) - local mtime = cfe({ value=st.mtime, label="File date" }) - local inuse = cfe({ type="boolean", value=is_file_in_use(file), label="File in use" }) - table.insert ( listed_files , cfe({ type="group", value={filename=filename, size=size, mtime=mtime, - inuse=inuse, label="File details"} }) ) + local details = posix.stat(file) + details.filename = file + details.inuse = is_file_in_use(file) + table.insert(retval, details) end - table.sort(listed_files, function (a,b) return (a.value.filename.value < b.value.filename.value) end ) - return cfe({ type="list", value=listed_files, label="Log Files" }) + table.sort(retval, function(a,b) return a.filename < b.filename end) + return cfe({ type="structure", value=retval, label="Log Files" }) end mymodule.get_delete = function() diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp index 688d975..bf80391 100644 --- a/logfiles-status-html.lsp +++ b/logfiles-status-html.lsp @@ -43,11 +43,11 @@ </thead><tbody> <% local viewtype = cfe({type="hidden", value="stream"}) %> <% for i,file in ipairs(view.value) do %> - <% local filename = cfe({type="hidden", value=file.value.filename.value}) %> + <% local filename = cfe({type="hidden", value=file.filename}) %> <tr> <% if viewlibrary.check_permission("delete") then %> <td> - <% if file.value.inuse.value then %> + <% if file.inuse then %> in use <% else htmlviewfunctions.displayitem(cfe({type="form", value={filename=filename}, label="", option="Delete", action="delete" }), page_info, -1) @@ -57,9 +57,9 @@ <td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="View", action="view" }), page_info, -1) %></td> <td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename}, label="", option="Tail", action="tail" }), page_info, -1) %></td> <td><% htmlviewfunctions.displayitem(cfe({type="link", value={filename=filename, viewtype=viewtype}, label="", option="Download", action="download" }), page_info, -1) %></td> - <td><span class="hide"><%= html.html_escape(file.value.size.value) %>b</span><%= format.formatfilesize(file.value.size.value) %></td> - <td><%= format.formattime(file.value.mtime.value) %></td> - <td><%= html.html_escape(file.value.filename.value) %></td> + <td><span class="hide"><%= html.html_escape(file.size) %>b</span><%= format.formatfilesize(file.size) %></td> + <td><%= format.formattime(file.mtime) %></td> + <td><%= html.html_escape(file.filename) %></td> </tr> <% end %> </tbody></table> |