diff options
author | lain <lain@soykaf.club> | 2020-08-06 15:22:20 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-06 15:22:20 +0200 |
commit | bf95dfb240cff8c5a2f8a0930e5309a09ca00ba1 (patch) | |
tree | 3a0c81155e7ae38e27008a7c066e8bc03fb1b410 /lib/pleroma/application.ex | |
parent | 532d6f94aea5d4f53e846b8b77296f80a9ae68a0 (diff) | |
parent | 10b0e55acffeeff5842421c12b3b26feb35336de (diff) | |
download | pleroma-bf95dfb240cff8c5a2f8a0930e5309a09ca00ba1.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r-- | lib/pleroma/application.ex | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 0ffb55358..c0b5db9f1 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -47,6 +47,7 @@ defmodule Pleroma.Application do Pleroma.ApplicationRequirements.verify!() setup_instrumenters() load_custom_modules() + check_system_commands() Pleroma.Docs.JSON.compile() adapter = Application.get_env(:tesla, :adapter) @@ -249,4 +250,21 @@ defmodule Pleroma.Application do end defp http_children(_, _), do: [] + + defp check_system_commands do + filters = Config.get([Pleroma.Upload, :filters]) + + check_filter = fn filter, command_required -> + 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" + ) + end + end + + check_filter.(Pleroma.Upload.Filters.Exiftool, "exiftool") + check_filter.(Pleroma.Upload.Filters.Mogrify, "mogrify") + check_filter.(Pleroma.Upload.Filters.Mogrifun, "mogrify") + end end |