Merge branch 'fix/missing-file-extension' into 'develop'

Add missing file extension if file does not have one

See merge request pleroma/pleroma!222
This commit is contained in:
lambda 2018-06-14 19:11:30 +00:00
commit de20c8d620
2 changed files with 37 additions and 5 deletions

View File

@ -86,10 +86,15 @@ def upload_path do
end end
defp create_name(uuid, ext, type) do defp create_name(uuid, ext, type) do
if type == "application/octet-stream" do case type do
String.downcase(Enum.join([uuid, ext], ".")) "application/octet-stream" ->
else String.downcase(Enum.join([uuid, ext], "."))
String.downcase(Enum.join([uuid, List.last(String.split(type, "/"))], "."))
"audio/mpeg" ->
String.downcase(Enum.join([uuid, "mp3"], "."))
_ ->
String.downcase(Enum.join([uuid, List.last(String.split(type, "/"))], "."))
end end
end end
@ -105,7 +110,21 @@ defp get_name(file, uuid, type, should_dedupe) do
if should_dedupe do if should_dedupe do
create_name(uuid, List.last(String.split(file.filename, ".")), type) create_name(uuid, List.last(String.split(file.filename, ".")), type)
else else
file.filename unless String.contains?(file.filename, ".") do
case type do
"image/png" -> file.filename <> ".png"
"image/jpeg" -> file.filename <> ".jpg"
"image/gif" -> file.filename <> ".gif"
"video/webm" -> file.filename <> ".webm"
"video/mp4" -> file.filename <> ".mp4"
"audio/mpeg" -> file.filename <> ".mp3"
"audio/ogg" -> file.filename <> ".ogg"
"audio/wav" -> file.filename <> ".wav"
_ -> file.filename
end
else
file.filename
end
end end
end end

View File

@ -43,5 +43,18 @@ test "fixes incorrect content type" do
data = Upload.store(file, true) data = Upload.store(file, true)
assert hd(data["url"])["mediaType"] == "image/jpeg" assert hd(data["url"])["mediaType"] == "image/jpeg"
end end
test "adds missing extension" do
File.cp!("test/fixtures/image.jpg", "test/fixtures/image_tmp.jpg")
file = %Plug.Upload{
content_type: "image/jpg",
path: Path.absname("test/fixtures/image_tmp.jpg"),
filename: "an [image"
}
data = Upload.store(file, false)
assert data["name"] == "an [image.jpg"
end
end end
end end