summaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-09-26 19:32:16 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-09-26 19:32:16 +0300
commit4e4f77108207157a49a627edb03951e2f15b62f1 (patch)
tree91a56c8b539d4336170572d13fece25171f62b7f /lib/pleroma/application.ex
parent7cd662f18c202ee2b099305e990d15a01370d6f9 (diff)
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex18
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 00ec79a2a..d7d8e423e 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -268,7 +268,8 @@ defmodule Pleroma.Application do
with true <- filter in filters,
false <- Pleroma.Utils.command_available?(command_required) do
Logger.error(
- "#{filter} is specified in list of Pleroma.Upload filters, but the #{command_required} command is not found"
+ "#{filter} is specified in list of Pleroma.Upload filters, but the " <>
+ "#{command_required} command is not found"
)
end
end
@@ -276,5 +277,20 @@ defmodule Pleroma.Application do
check_filter.(Pleroma.Upload.Filters.Exiftool, "exiftool")
check_filter.(Pleroma.Upload.Filters.Mogrify, "mogrify")
check_filter.(Pleroma.Upload.Filters.Mogrifun, "mogrify")
+
+ with true <- Config.get([:media_preview_proxy, :enabled]),
+ missing_graphics_tools = Pleroma.Helpers.MediaHelper.missing_dependencies(),
+ [] <- missing_graphics_tools do
+ :noop
+ else
+ false ->
+ :noop
+
+ missing_graphics_tools ->
+ Logger.error(
+ "The following dependencies required by Media preview proxy " <>
+ "(which is currently enabled) are not installed: #{inspect(missing_graphics_tools)}"
+ )
+ end
end
end