Bladeren bron

[Minor] Lua_mime: Flatten headers array

tags/3.2
Vsevolod Stakhov 2 jaren geleden
bovenliggende
commit
af23c1f678
1 gewijzigde bestanden met toevoegingen van 15 en 2 verwijderingen
  1. 15
    2
      lualib/lua_mime.lua

+ 15
- 2
lualib/lua_mime.lua Bestand weergeven

@@ -579,13 +579,26 @@ end
exports.message_to_ucl = function(task, stringify_content)
local E = {}

local function flatten_headers(hdrs)
local res = {}

for _,e in ipairs(hdrs) do
if type(e) == 'table' and e[1] then
for _,h in ipairs(e) do table.insert(res, h) end
else
table.insert(res, e)
end
end

return res
end
local maybe_stringify_f = stringify_content and
tostring or function(t) return t end
local result = {
size = task:get_size(),
digest = task:get_digest(),
newlines = task:get_newlines_type(),
headers = task:get_headers(true) or E
headers = flatten_headers(task:get_headers(true) or E)
}

-- Utility to convert ip addr to a string or nil if invalid/absent
@@ -617,7 +630,7 @@ exports.message_to_ucl = function(task, stringify_content)
detected_type = string.format('%s/%s', part:get_detected_type()),
filename = part:get_filename(),
content = maybe_stringify_f(part:get_content()),
headers = part:get_headers(true) or E,
headers = flatten_headers(part:get_headers(true) or E),
boundary = part:get_enclosing_boundary()
}
table.insert(result.parts, p)

Laden…
Annuleren
Opslaan