AkkomaGang/akkoma
AkkomaGang/akkoma
17
70
Fork 112
Code Issues 151 Pull requests 20 Projects 2 Releases 21 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 3 Commits 1 Files changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c48f5d57b6 - Show all commits

Use magick command from ImageMagick
Some checks are pending
ci/woodpecker/pr/build-amd64 Pipeline is pending approval
Details
ci/woodpecker/pr/build-arm64 Pipeline is pending approval
Details
ci/woodpecker/pr/docs Pipeline is pending approval
Details
ci/woodpecker/pr/lint Pipeline is pending approval
Details
ci/woodpecker/pr/test Pipeline is pending approval
Details

Prev Next 
With ImageMagick version 7 the convert command has been deprecated in
favour of magick. Calling convert instead results in the logs being
spammed with warning messages.

The mogrify Elixir wrapper also runs magick with the mogrify argument
in current releases.
Mikael 2024-11-19 20:47:27 +01:00
commit c48f5d57b6
Signed by: nil
SSH key fingerprint: SHA256:21QyD2Meiot7jOUVitIR5YkGB/XuXdCvLW1hE6dsri0

8
lib/pleroma/application_requirements.ex
View file

@ -166,10 +166,10 @@ defmodule Pleroma.ApplicationRequirements do
filter_commands_statuses = [
check_filter(Pleroma.Upload.Filter.Exiftool.StripMetadata, "exiftool"),
check_filter(Pleroma.Upload.Filter.Exiftool.ReadDescription, "exiftool"),
check_filter(Pleroma.Upload.Filter.Mogrify, "mogrify"),
check_filter(Pleroma.Upload.Filter.Mogrifun, "mogrify"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "mogrify"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "convert"),
check_filter(Pleroma.Upload.Filter.Mogrify, "magick"),
check_filter(Pleroma.Upload.Filter.Mogrifun, "magick"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
check_filter(Pleroma.Upload.Filter.AnalyzeMetadata, "magick"),
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
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
acc
else
@ -22,7 +22,7 @@ defmodule Pleroma.Helpers.MediaHelper do
end
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, env} <- HTTP.get(url, [], []),
{:ok, fifo_path} <- mkfifo() do