Merge branch 'fix/debian-install-libmagic-typo' 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 eb199709ae3f3bdae0c8ef945841fd3d33b8e2b2..1fd0cfdaa7204e7dd3096f6e3604d0a8895e16ce 100644 (file)
--- a/lib/pleroma/upload/filter/exiftool.ex
+++ b/lib/pleroma/upload/filter/exiftool.ex
@@ -9,13 +9,22 @@ defmodule Pleroma.Upload.Filter.Exiftool do
   """
   @behaviour Pleroma.Upload.Filter
 
-  @type conversion :: action :: String.t() | {action :: String.t(), opts :: String.t()}
-  @type conversions :: conversion() | [conversion()]
+  @spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()}
+
+  # webp is not compatible with exiftool at this time
+  def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
 
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
-    System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true)
-    :ok
+    try do
+      case System.cmd("exiftool", ["-overwrite_original", "-gps:all=", file], parallelism: true) do
+        {_response, 0} -> {:ok, :filtered}
+        {error, 1} -> {:error, error}
+      end
+    rescue
+      _e in ErlangError ->
+        {:error, "exiftool command not found"}
+    end
   end
 
-  def filter(_), do: :ok
+  def filter(_), do: {:ok, :noop}
 end