aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-08-10 18:46:26 +0000
committerkaniini <ariadne@dereferenced.org>2019-08-10 18:46:26 +0000
commit5aa62b8581b1fb13a1d799906d6a7fe8e68c35ba (patch)
tree07bbb6db310e80947896bc72ce67e89e75500793 /lib
parent390329a303dd6d6a91d0bafa7dff0f7d63a8dad5 (diff)
parent11d08c2de0226caed8119bb3a45a8e0ab8791fbe (diff)
downloadpleroma-5aa62b8581b1fb13a1d799906d6a7fe8e68c35ba.tar.gz
Merge branch 'test/pleroma_uploaders' into 'develop'
tests for Pleroma.Uploaders See merge request pleroma/pleroma!1543
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/uploaders/local.ex4
-rw-r--r--lib/pleroma/uploaders/mdii.ex2
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/uploaders/local.ex b/lib/pleroma/uploaders/local.ex
index fc533da23..36b3c35ec 100644
--- a/lib/pleroma/uploaders/local.ex
+++ b/lib/pleroma/uploaders/local.ex
@@ -11,7 +11,7 @@ defmodule Pleroma.Uploaders.Local do
def put_file(upload) do
{local_path, file} =
- case Enum.reverse(String.split(upload.path, "/", trim: true)) do
+ case Enum.reverse(Path.split(upload.path)) do
[file] ->
{upload_path(), file}
@@ -23,7 +23,7 @@ defmodule Pleroma.Uploaders.Local do
result_file = Path.join(local_path, file)
- unless File.exists?(result_file) do
+ if not File.exists?(result_file) do
File.cp!(upload.tempfile, result_file)
end
diff --git a/lib/pleroma/uploaders/mdii.ex b/lib/pleroma/uploaders/mdii.ex
index 237544337..c36f3d61d 100644
--- a/lib/pleroma/uploaders/mdii.ex
+++ b/lib/pleroma/uploaders/mdii.ex
@@ -3,6 +3,8 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.MDII do
+ @moduledoc "Represents uploader for https://github.com/hakaba-hitoyo/minimal-digital-image-infrastructure"
+
alias Pleroma.Config
alias Pleroma.HTTP