diff options
author | lain <lain@soykaf.club> | 2020-08-06 08:27:10 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-06 08:27:10 +0000 |
commit | 4b47d9c5b621c7c0ef4f2e2a010b323bf362895d (patch) | |
tree | 9d59591575e9f2f0e070efc01ead632396159705 /lib/pleroma/application.ex | |
parent | 7755f49e281e4990db5317b33d6b8e0d12982e0c (diff) | |
parent | 7569f225f1d43c6435eda6b62fd5eff3cd3408e0 (diff) | |
download | pleroma-4b47d9c5b621c7c0ef4f2e2a010b323bf362895d.tar.gz |
Merge branch 'command-available-check' into 'develop'
#1939 Check command availability for exiftool and git
See merge request pleroma/pleroma!2753
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 |