aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/upload.ex
diff options
context:
space:
mode:
authorThurloat <thurloat@gmail.com>2018-08-29 22:07:28 -0300
committerThurloat <thurloat@gmail.com>2018-08-29 22:07:28 -0300
commitaf01f0196a43454728f6e0ca8b9b8be208743251 (patch)
tree69b055a949545e75c6fe7e2a08d1185ea4d46b14 /lib/pleroma/upload.ex
parentd424e9fa5f3d0d1ff9e416f6bf548e0e8bb02361 (diff)
downloadpleroma-af01f0196a43454728f6e0ca8b9b8be208743251.tar.gz
Add backend failure handling with :ok | :error so the uploader can handle it.
defaulting to :ok, since that's the currently level of error handling.
Diffstat (limited to 'lib/pleroma/upload.ex')
-rw-r--r--lib/pleroma/upload.ex10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 7d3b36287..f188a5f32 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -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])