projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Update elixir versions' (#512) from norm/akkoma:update-elixir...
[akkoma]
/
lib
/
pleroma
/
uploaders
/
uploader.ex
diff --git
a/lib/pleroma/uploaders/uploader.ex
b/lib/pleroma/uploaders/uploader.ex
index 9a94534e91a84497a65dc3dc5857ba713ec82ca7..deba548b7a9eeb2524e11173324435fa629e8cb8 100644
(file)
--- a/
lib/pleroma/uploaders/uploader.ex
+++ b/
lib/pleroma/uploaders/uploader.ex
@@
-1,10
+1,12
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.Uploader do
import Pleroma.Web.Gettext
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Uploaders.Uploader do
import Pleroma.Web.Gettext
+ @mix_env Mix.env()
+
@moduledoc """
Defines the contract to put and get an uploaded file to any backend.
"""
@moduledoc """
Defines the contract to put and get an uploaded file to any backend.
"""
@@
-12,7
+14,7
@@
defmodule Pleroma.Uploaders.Uploader do
@doc """
Instructs how to get the file from the backend.
@doc """
Instructs how to get the file from the backend.
- Used by `Pleroma.Plugs.UploadedMedia`.
+ Used by `Pleroma.
Web.
Plugs.UploadedMedia`.
"""
@type get_method :: {:static_dir, directory :: String.t()} | {:url, url :: String.t()}
@callback get_file(file :: String.t()) :: {:ok, get_method()}
"""
@type get_method :: {:static_dir, directory :: String.t()} | {:url, url :: String.t()}
@callback get_file(file :: String.t()) :: {:ok, get_method()}
@@
-33,7
+35,7
@@
defmodule Pleroma.Uploaders.Uploader do
"""
@type file_spec :: {:file | :url, String.t()}
"""
@type file_spec :: {:file | :url, String.t()}
- @callback put_file(
Pleroma.Upload.
t()) ::
+ @callback put_file(
upload :: struc
t()) ::
:ok | {:ok, file_spec()} | {:error, String.t()} | :wait_callback
@callback delete_file(file :: String.t()) :: :ok | {:error, String.t()}
:ok | {:ok, file_spec()} | {:error, String.t()} | :wait_callback
@callback delete_file(file :: String.t()) :: :ok | {:error, String.t()}
@@
-44,7
+46,7
@@
defmodule Pleroma.Uploaders.Uploader do
| {:error, Plug.Conn.t(), String.t()}
@optional_callbacks http_callback: 2
| {:error, Plug.Conn.t(), String.t()}
@optional_callbacks http_callback: 2
- @spec put_file(module(),
Pleroma.Upload.
t()) :: {:ok, file_spec()} | {:error, String.t()}
+ @spec put_file(module(),
upload :: struc
t()) :: {:ok, file_spec()} | {:error, String.t()}
def put_file(uploader, upload) do
case uploader.put_file(upload) do
:ok -> {:ok, {:file, upload.path}}
def put_file(uploader, upload) do
case uploader.put_file(upload) do
:ok -> {:ok, {:file, upload.path}}
@@
-74,7
+76,7
@@
defmodule Pleroma.Uploaders.Uploader do
end
defp callback_timeout do
end
defp callback_timeout do
- case
Mix.env()
do
+ case
@mix_env
do
:test -> 1_000
_ -> 30_000
end
:test -> 1_000
_ -> 30_000
end