hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add backend failure handling with :ok | :error so the uploader can handle it.

Browse source 
defaulting to :ok, since that's the currently level of error handling.
This commit is contained in:
Thurloat 2018-08-29 22:07:28 -03:00
commit af01f0196a
6 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/upload.ex
View file

@ -12,7 +12,8 @@ defmodule Pleroma.Upload do
strip_exif_data(content_type, file.path)
url_path = @storage_backend.put_file(name, uuid, file.path, content_type, should_dedupe)
{:ok, url_path} =
@storage_backend.put_file(name, uuid, file.path, content_type, should_dedupe)
%{
"type" => "Document",
@ -31,7 +32,6 @@ defmodule Pleroma.Upload do
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
data = Base.decode64!(parsed["data"], ignore: :whitespace)
# create temp local storage, like plug upload provides.
tmp_path = tempfile_for_image(data)
uuid = UUID.generate()
@ -46,7 +46,7 @@ defmodule Pleroma.Upload do
content_type
)
url_path = @storage_backend.put_file(name, uuid, tmp_path, content_type, should_dedupe)
{:ok, url_path} = @storage_backend.put_file(name, uuid, tmp_path, content_type, should_dedupe)
%{
"type" => "Image",
@ -61,6 +61,10 @@ defmodule Pleroma.Upload do
}
end
@doc """
Creates a tempfile using the Plug.Upload Genserver which cleans them up
automatically.
"""
def tempfile_for_image(data) do
{:ok, tmp_path} = Plug.Upload.random_file("profile_pics")
{:ok, tmp_file} = File.open(tmp_path, [:write, :raw, :binary])