aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThurloat <thurloat@gmail.com>2018-08-28 20:04:26 -0300
committerThurloat <thurloat@gmail.com>2018-08-28 20:04:26 -0300
commit9fc20ed5720bccb77289ce3d6eb9bc3a69ceeb8a (patch)
tree497bd49cf14441f881cbd37b0563d2205849d30f /lib
parentdad39b24a1bca0341d5cf47cc4a32ea66219c654 (diff)
downloadpleroma-9fc20ed5720bccb77289ce3d6eb9bc3a69ceeb8a.tar.gz
works now, tested with profile photo upload on local backend.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/upload.ex15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 16149d4dd..b70758dc7 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -1,6 +1,5 @@
defmodule Pleroma.Upload do
alias Ecto.UUID
- import Logger
@storage_backend Application.get_env(:pleroma, Pleroma.Upload)
|> Keyword.fetch!(:uploader)
@@ -28,19 +27,15 @@ defmodule Pleroma.Upload do
}
end
- # XXX: does this code actually work? i am skeptical. --kaniini
def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
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()
- # create temp local storage, like plug upload provides for us.
-
- Logger.info(tmp_path)
-
content_type = get_content_type(tmp_path)
strip_exif_data(content_type, tmp_path)
@@ -66,9 +61,11 @@ defmodule Pleroma.Upload do
}
end
- def mkupload_for_image(data) do
+ def tempfile_for_image(data) do
{: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
end