sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Check if mogrify available before calling it

This commit is contained in:
Roman Chvanikov 2020-07-11 18:22:03 +03:00
parent 523f1b93a4
commit 3116a75e80
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pleroma/upload/filter/mogrifun.ex
View File

@ -35,9 +35,12 @@ defmodule Pleroma.Upload.Filter.Mogrifun do
]
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
Filter.Mogrify.do_filter(file, [Enum.random(@filters)])
:ok
if Pleroma.Utils.command_available?("mogrify") do
Filter.Mogrify.do_filter(file, [Enum.random(@filters)])
:ok
else
{:error, "mogrify command not found"}
end
end
def filter(_), do: :ok

10
lib/pleroma/upload/filter/mogrify.ex
View File

@ -9,10 +9,14 @@ defmodule Pleroma.Upload.Filter.Mogrify do
@type conversions :: conversion() | [conversion()]
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
filters = Pleroma.Config.get!([__MODULE__, :args])
if Pleroma.Utils.command_available?("mogrify") do
filters = Pleroma.Config.get!([__MODULE__, :args])
do_filter(file, filters)
:ok
do_filter(file, filters)
:ok
else
{:error, "mogrify command not found"}
end
end
def filter(_), do: :ok