projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into oauth-token-id
[akkoma]
/
lib
/
pleroma
/
upload
/
filter
/
exiftool.ex
diff --git
a/lib/pleroma/upload/filter/exiftool.ex
b/lib/pleroma/upload/filter/exiftool.ex
index b07a671ac0b296656fdae75dc473cca7a46006b4..a2bfbbf612c92b590e70558db3329c9a2abeadf3 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
@@
-11,28
+11,21
@@
defmodule Pleroma.Upload.Filter.Exiftool do
@spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {:error, String.t()}
@spec filter(Pleroma.Upload.t()) :: {:ok, any()} | {: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{name: file, tempfile: path, content_type: "image" <> _}) do
- if Regex.match?(~r/\.(webp)$/i, file) do
- {:ok, :noop}
- else
- strip_exif(path)
- end
- end
-
- def filter(_), do: {:ok, :noop}
-
- defp strip_exif(path) do
+ def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
try do
try do
- case System.cmd("exiftool", ["-overwrite_original", "-gps:all=",
path
], parallelism: true) do
+ case System.cmd("exiftool", ["-overwrite_original", "-gps:all=",
file
], parallelism: true) do
{_response, 0} -> {:ok, :filtered}
{error, 1} -> {:error, error}
end
rescue
{_response, 0} -> {:ok, :filtered}
{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
+
+ def filter(_), do: {:ok, :noop}
end
end