diff options
author | href <href@random.sh> | 2018-11-29 21:11:45 +0100 |
---|---|---|
committer | href <href@random.sh> | 2018-11-30 18:02:37 +0100 |
commit | 02d3dc6869f388388ea744ea4ee3b54279d55e86 (patch) | |
tree | 45febb27f539a0516c9ab29c5801055352ebb4f5 /lib/pleroma/uploaders/swift/uploader.ex | |
parent | 97b00d366f5d0bdf80efa2c425ccc8fb16681256 (diff) | |
download | pleroma-02d3dc6869f388388ea744ea4ee3b54279d55e86.tar.gz |
Uploads fun, part. 2
Diffstat (limited to 'lib/pleroma/uploaders/swift/uploader.ex')
-rw-r--r-- | lib/pleroma/uploaders/swift/uploader.ex | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/pleroma/uploaders/swift/uploader.ex b/lib/pleroma/uploaders/swift/uploader.ex index 5db35fe50..b35b9807b 100644 --- a/lib/pleroma/uploaders/swift/uploader.ex +++ b/lib/pleroma/uploaders/swift/uploader.ex @@ -5,10 +5,11 @@ defmodule Pleroma.Uploaders.Swift do {:ok, {:url, Path.join([Pleroma.Config.get!([__MODULE__, :object_url]), name])}} end - def put_file(name, uuid, tmp_path, content_type, _opts) do - {:ok, file_data} = File.read(tmp_path) - remote_name = "#{uuid}/#{name}" - - Pleroma.Uploaders.Swift.Client.upload_file(remote_name, file_data, content_type) + def put_file(upload) do + Pleroma.Uploaders.Swift.Client.upload_file( + upload.path, + File.read!(upload.tmpfile), + upload.content_type + ) end end |