Mercurial > prosody-modules
diff mod_http_upload/mod_http_upload.lua @ 2691:92ddfc548ce8
mod_http_upload: Store filename and directory separately
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 15 Apr 2017 15:55:39 +0200 |
| parents | 43ad92c5b91a |
| children | 785465f8af3d |
line wrap: on
line diff
--- a/mod_http_upload/mod_http_upload.lua Sat Apr 15 15:53:46 2017 +0200 +++ b/mod_http_upload/mod_http_upload.lua Sat Apr 15 15:55:39 2017 +0200 @@ -81,13 +81,17 @@ local expiry = os.time() - max_age; local upload_window = os.time() - 900; uploads:filter(function (item) + local filename = item.filename; + if item.dir then + filename = join_path(storage_path, item.dir, item.filename); + end if item.time < expiry then - local deleted, whynot = os.remove(item.filename); + local deleted, whynot = os.remove(filename); if not deleted then - module:log("warn", "Could not delete expired upload %s: %s", item.filename, whynot or "delete failed"); + module:log("warn", "Could not delete expired upload %s: %s", filename, whynot or "delete failed"); end return false; - elseif item.time < upload_window and not lfs.attributes(item.filename) then + elseif item.time < upload_window and not lfs.attributes(filename) then return false; -- File was not uploaded or has been deleted since end return true; @@ -161,7 +165,8 @@ or not lfs.attributes(join_path(storage_path, random_dir, filename)) local ok = datamanager.list_append(username, host, module.name, { - filename = join_path(storage_path, random_dir, filename), size = filesize, time = os.time() }); + filename = filename, dir = random_dir, size = filesize, time = os.time() }); + if not ok then origin.send(st.error_reply(stanza, "wait", "internal-server-failure")); return true;