diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-26 19:32:16 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-26 19:32:16 +0300 |
| commit | 4e4f77108207157a49a627edb03951e2f15b62f1 (patch) | |
| tree | 91a56c8b539d4336170572d13fece25171f62b7f /lib/pleroma/helpers | |
| parent | 7cd662f18c202ee2b099305e990d15a01370d6f9 (diff) | |
| download | pleroma-4e4f77108207157a49a627edb03951e2f15b62f1.tar.gz | |
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/helpers')
| -rw-r--r-- | lib/pleroma/helpers/media_helper.ex | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex index b6f35a24b..6b799173e 100644 --- a/lib/pleroma/helpers/media_helper.ex +++ b/lib/pleroma/helpers/media_helper.ex @@ -9,6 +9,18 @@ defmodule Pleroma.Helpers.MediaHelper do alias Pleroma.HTTP + require Logger + + def missing_dependencies do + Enum.reduce([imagemagick: "convert", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc -> + if Pleroma.Utils.command_available?(executable) do + acc + else + [sym | acc] + end + end) + end + def image_resize(url, options) do with executable when is_binary(executable) <- System.find_executable("convert"), {:ok, args} <- prepare_image_resize_args(options), |