projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into stable
[akkoma]
/
lib
/
pleroma
/
upload
/
filter
/
exiftool.ex
diff --git
a/lib/pleroma/upload/filter/exiftool.ex
b/lib/pleroma/upload/filter/exiftool.ex
index 1fd0cfdaa7204e7dd3096f6e3604d0a8895e16ce..4d3a5f551d12837c4f3eff520b7babdf9fa80408 100644
(file)
--- a/
lib/pleroma/upload/filter/exiftool.ex
+++ b/
lib/pleroma/upload/filter/exiftool.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload.Filter.Exiftool do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Upload.Filter.Exiftool do
@@
-9,10
+9,13
@@
defmodule Pleroma.Upload.Filter.Exiftool do
"""
@behaviour Pleroma.Upload.Filter
"""
@behaviour Pleroma.Upload.Filter
- @spec filter(Pleroma.Upload.t()) :: {:ok,
any()
} | {:error, String.t()}
+ @spec filter(Pleroma.Upload.t()) :: {:ok,
:noop} | {:ok, :filtered
} | {:error, String.t()}
- # webp is not compatible with exiftool at this time
+ # Formats not compatible with exiftool at this time
+ def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
+ def filter(%Pleroma.Upload{content_type: "image/svg+xml"}), do: {:ok, :noop}
+ def filter(%Pleroma.Upload{content_type: "image/jxl"}), do: {:ok, :noop}
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
try do
def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
try do
@@
-21,8
+24,8
@@
defmodule Pleroma.Upload.Filter.Exiftool do
{error, 1} -> {:error, error}
end
rescue
{error, 1} -> {:error, error}
end
rescue
-
_
e in ErlangError ->
- {:error, "
exiftool command not found
"}
+ e in ErlangError ->
+ {:error, "
#{__MODULE__}: #{inspect(e)}
"}
end
end
end
end