Implement uploader behaviour

run formatter <#

diff --git a/config/config.exs b/config/config.exs
index fe4bfe8a0796a3027c7ccbdfb67580a16887929a..fa36209acb3e3b9bad30fd1ad706df7fd9df0f1f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -14,11 +14,9 @@ config :pleroma, Pleroma.Upload,
   uploader: Pleroma.Uploaders.Local,
   strip_exif: false
 
-config :pleroma, Pleroma.Uploaders.Local,
-  uploads: "uploads"
+config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
 
-config :pleroma, Pleroma.Uploaders.S3,
-  s3_bucket: nil
+config :pleroma, Pleroma.Uploaders.S3, s3_bucket: nil
 
 config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"]
 

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index e3ad6757b60fb5f024dedef9b445bde4e72b1038..e786693ad9abbba9b099ff51f4be60a8167692fd 100644 (file)
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -1,17 +1,17 @@
 defmodule Pleroma.Upload do
   alias Ecto.UUID
 
-  def store(%Plug.Upload{} = file, should_dedupe) do
-    settings = Application.get_env(:pleroma, Pleroma.Upload)
-    storage_backend = Keyword.fetch!(settings, :storage_backend)
+  @storage_backend Application.get_env(:pleroma, Pleroma.Upload)
+                   |> Keyword.fetch!(:uploader)
 
+  def store(%Plug.Upload{} = file, should_dedupe) do
     content_type = get_content_type(file.path)
     uuid = get_uuid(file, should_dedupe)
     name = get_name(file, uuid, content_type, should_dedupe)
 
     strip_exif_data(content_type, file.path)
 
-    url_path = storage_backend.put_file(name, uuid, content_type)
+    url_path = @storage_backend.put_file(name, uuid, file, content_type, should_dedupe)
 
     %{
       "type" => "Document",
@@ -25,6 +25,7 @@ defmodule Pleroma.Upload do
       "name" => name
     }
   end
+
   """
   # XXX: does this code actually work?  i am skeptical.  --kaniini
   def store(%{"img" => "data:image/" <> image_data}, should_dedupe) do

diff --git a/lib/pleroma/uploaders/local.ex b/lib/pleroma/uploaders/local.ex
index 1ba68776f86a14076c1cf3e8f1e1a0a3b8a8491f..b089c8f14d8ba706f98b29a4158a2746716c4e26 100644 (file)
--- a/lib/pleroma/uploaders/local.ex
+++ b/lib/pleroma/uploaders/local.ex
@@ -1,9 +1,9 @@
 defmodule Pleroma.Uploaders.Local do
+  @behaviour Pleroma.Uploaders.Uploader
 
   alias Pleroma.Web
 
   def put_file(name, uuid, file, _content_type, should_dedupe) do
-
     upload_folder = get_upload_path(uuid, should_dedupe)
     url_path = get_url(name, uuid, should_dedupe)
 

diff --git a/lib/pleroma/uploaders/s3.ex b/lib/pleroma/uploaders/s3.ex
index ea9e49cbf45fee7e1466f19278ffaeefe1b6f28e..e18deb6b330a6253877e51dacbd12dfb3a25edd1 100644 (file)
--- a/lib/pleroma/uploaders/s3.ex
+++ b/lib/pleroma/uploaders/s3.ex
@@ -1,7 +1,7 @@
 defmodule Pleroma.Uploaders.S3 do
+  @behaviour Pleroma.Uploaders.Uploader
 
   def put_file(name, uuid, path, content_type, _should_dedupe) do
-
     settings = Application.get_env(:pleroma, Pleroma.Uploaders.S3)
     bucket = Keyword.fetch!(settings, :bucket)
     public_endpoint = Keyword.fetch!(settings, :public_endpoint)

diff --git a/lib/pleroma/uploaders/swift.ex b/lib/pleroma/uploaders/swift.ex
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/lib/pleroma/uploaders/swift.ex
+++ b/lib/pleroma/uploaders/swift.ex
@@ -0,0 +1 @@
+