projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A hobbldey-working swift client.
[akkoma]
/
lib
/
pleroma
/
uploaders
/
local.ex
diff --git
a/lib/pleroma/uploaders/local.ex
b/lib/pleroma/uploaders/local.ex
index 7e5d7a59bf746d1c278522b0c0288ec7ed9370bf..39dca49c9ade14819942dbed86aea8de5f41b02b 100644
(file)
--- a/
lib/pleroma/uploaders/local.ex
+++ b/
lib/pleroma/uploaders/local.ex
@@
-1,7
+1,10
@@
defmodule Pleroma.Uploaders.Local do
defmodule Pleroma.Uploaders.Local do
- def put_file(name, uuid, file, content_type) do
+ @behaviour Pleroma.Uploaders.Uploader
- upload_path = get_upload_path(uuid, should_dedupe)
+ alias Pleroma.Web
+
+ def put_file(name, uuid, tmpfile, _content_type, should_dedupe) do
+ upload_folder = get_upload_path(uuid, should_dedupe)
url_path = get_url(name, uuid, should_dedupe)
File.mkdir_p!(upload_folder)
url_path = get_url(name, uuid, should_dedupe)
File.mkdir_p!(upload_folder)
@@
-9,9
+12,9
@@
defmodule Pleroma.Uploaders.Local do
result_file = Path.join(upload_folder, name)
if File.exists?(result_file) do
result_file = Path.join(upload_folder, name)
if File.exists?(result_file) do
- File.rm!(
file.path
)
+ File.rm!(
tmpfile
)
else
else
- File.cp!(
file.path
, result_file)
+ File.cp!(
tmpfile
, result_file)
end
url_path
end
url_path