AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 178 Pull requests 25 Projects 2 Releases 14 Packages Wiki Activity

Use magick command from ImageMagick #854

Open
nil wants to merge 1 commit from nil/akkoma:develop into develop
pull from: nil/akkoma:develop
merge into: AkkomaGang:develop
Conversation 2 Commits 1 Files changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/application_requirements.ex
View file

@ -166,10 +166,10 @@ defp check_system_commands!(:ok) do
filter_commands_statuses = [ filter_commands_statuses = [
check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"), check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),
check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"), check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"), check_filter(Pleroma.Upload.Filter.Mogrify, "magick"),
check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"), check_filter(Pleroma.Upload.Filter.Mogrifun, "magick"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"), check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"), check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe") check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "ffprobe")
] ]

4
lib/pleroma/helpers/media_helper.ex
View file

@ -12,7 +12,7 @@ defmodule Pleroma.Helpers.MediaHelper do
require Logger require Logger
def missing_dependencies do def missing_dependencies do
Enum.reduce([imagemagick: "convert", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc -> Enum.reduce([imagemagick: "magick", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->
if Pleroma.Utils.command_available?(executable) do if Pleroma.Utils.command_available?(executable) do
acc acc
else else
@ -22,7 +22,7 @@ def missing_dependencies do
end end
def image_resize(url, options) do def image_resize(url, options) do
with executable when is_binary(executable) <- System.find_executable("convert"), with executable when is_binary(executable) <- System.find_executable("magick"),
{:ok, args} <- prepare_image_resize_args(options), {:ok, args} <- prepare_image_resize_args(options),
{:ok, env} <- HTTP.get(url, [], []), {:ok, env} <- HTTP.get(url, [], []),
{:ok, fifo_path} <- mkfifo() do {:ok, fifo_path} <- mkfifo() do