works now, tested with profile photo upload on local backend.

This commit is contained in:
Thurloat 2018-08-28 20:04:26 -03:00
parent dad39b24a1
commit 9fc20ed572

View file

@ -1,6 +1,5 @@
defmodule Pleroma.Upload do defmodule Pleroma.Upload do
alias Ecto.UUID alias Ecto.UUID
import Logger
@storage_backend Application.get_env(:pleroma, Pleroma.Upload) @storage_backend Application.get_env(:pleroma, Pleroma.Upload)
|> Keyword.fetch!(:uploader) |> Keyword.fetch!(:uploader)
@ -28,19 +27,15 @@ defmodule Pleroma.Upload do
} }
end end
# XXX: does this code actually work? i am skeptical. --kaniini
def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data) parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
data = Base.decode64!(parsed["data"], ignore: :whitespace) data = Base.decode64!(parsed["data"], ignore: :whitespace)
tmp_path = mkupload_for_image(data) # create temp local storage, like plug upload provides.
tmp_path = tempfile_for_image(data)
uuid = UUID.generate() uuid = UUID.generate()
# create temp local storage, like plug upload provides for us.
Logger.info(tmp_path)
content_type = get_content_type(tmp_path) content_type = get_content_type(tmp_path)
strip_exif_data(content_type, tmp_path) strip_exif_data(content_type, tmp_path)
@ -66,9 +61,11 @@ defmodule Pleroma.Upload do
} }
end end
def mkupload_for_image(data) do def tempfile_for_image(data) do
{:ok, tmp_path} = Plug.Upload.random_file("profile_pics") {:ok, tmp_path} = Plug.Upload.random_file("profile_pics")
:file.write_file(tmp_path, data, [:write, :raw, :exclusive, :binary]) {:ok, tmp_file} = File.open(tmp_path, [:write, :raw, :binary])
IO.binwrite(tmp_file, data)
tmp_path tmp_path
end end