Merge branch '2077-fix-bogus-webfinger-ids' into 'develop'

[akkoma] / lib / pleroma / upload / filter / exiftool.ex

diff --git a/lib/pleroma/upload/filter/exiftool.ex b/lib/pleroma/upload/filter/exiftool.ex
index 94622acd0910084017b7174ba102ec6be4f4a012..ea8798fe39ef4d15549843b42aa963ec6ce219cf 100644 (file)
--- a/lib/pleroma/upload/filter/exiftool.ex
+++ b/lib/pleroma/upload/filter/exiftool.ex
@@ -9,16 +9,17 @@ defmodule Pleroma.Upload.Filter.Exiftool do
   """
   @behaviour Pleroma.Upload.Filter
 
-  require Logger
-
+  @spec filter(Pleroma.Upload.t()) :: :ok | {:error, String.t()}
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
-    if Pleroma.Utils.command_available?("exiftool") do
-      System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true)
-    else
-      Logger.warn("exiftool is not available, filter #{__MODULE__} skipped")
+    try do
+      case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true) do
+        {_response, 0} -> :ok
+        {error, 1} -> {:error, error}
+      end
+    rescue
+      _e in ErlangError ->
+        {:error, "exiftool command not found"}
     end
-
-    :ok
   end
 
   def filter(_), do: :ok