potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Improve local uploader

Browse source 
Check that destination file is not here and temporary file is still here

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2020-10-26 10:53:56 +01:00
parent 974620b3b3
commit 37402ece68
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/web/upload/uploader/local.ex
View file

@ -11,6 +11,7 @@ defmodule Mobilizon.Web.Upload.Uploader.Local do
@behaviour Mobilizon.Web.Upload.Uploader @behaviour Mobilizon.Web.Upload.Uploader
alias Mobilizon.Config alias Mobilizon.Config
alias Mobilizon.Web.Upload
@impl true @impl true
def get_file(_) do def get_file(_) do
@ -18,15 +19,21 @@ defmodule Mobilizon.Web.Upload.Uploader.Local do
end end
@impl true @impl true
def put_file(upload) do def put_file(%Upload{path: path, tempfile: tempfile}) do
{path, file} = local_path(upload.path) {path, file} = local_path(path)
result_file = Path.join(path, file) result_file = Path.join(path, file)
unless File.exists?(result_file) do with {:result_exists, false} <- {:result_exists, File.exists?(result_file)},
File.cp!(upload.tempfile, result_file) {:temp_file_exists, true} <- {:temp_file_exists, File.exists?(tempfile)} do
end File.cp!(tempfile, result_file)
else
{:result_exists, _} ->
# If the resulting file already exists, it's because of the Dedupe filter
:ok
:ok {:temp_file_exists, _} ->
{:error, "Temporary file no longer exists"}
end
end end
@impl true @impl true