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
/
helpers
/
media_helper.ex
diff --git
a/lib/pleroma/helpers/media_helper.ex
b/lib/pleroma/helpers/media_helper.ex
index a1205e10d2b7b959be714cef7412b511c2521f72..cb95d0e68c45dee9c5aa4a02919c4485ddd3f70e 100644
(file)
--- a/
lib/pleroma/helpers/media_helper.ex
+++ b/
lib/pleroma/helpers/media_helper.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.Helpers.MediaHelper do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Helpers.MediaHelper do
@@
-9,12
+9,22
@@
defmodule Pleroma.Helpers.MediaHelper do
alias Pleroma.HTTP
alias Pleroma.HTTP
- @tmp_base "/tmp/pleroma-media_preview-pipe"
+ require Logger
+
+ def missing_dependencies do
+ Enum.reduce([imagemagick: "convert", ffmpeg: "ffmpeg"], [], fn {sym, executable}, acc ->
+ if Pleroma.Utils.command_available?(executable) do
+ acc
+ else
+ [sym | acc]
+ end
+ end)
+ end
def image_resize(url, options) do
with executable when is_binary(executable) <- System.find_executable("convert"),
{:ok, args} <- prepare_image_resize_args(options),
def image_resize(url, options) do
with executable when is_binary(executable) <- System.find_executable("convert"),
{:ok, args} <- prepare_image_resize_args(options),
- {:ok, env} <- HTTP.get(url, [],
adapter: [pool: :media
]),
+ {:ok, env} <- HTTP.get(url, [],
[
]),
{:ok, fifo_path} <- mkfifo() do
args = List.flatten([fifo_path, args])
run_fifo(fifo_path, env, executable, args)
{:ok, fifo_path} <- mkfifo() do
args = List.flatten([fifo_path, args])
run_fifo(fifo_path, env, executable, args)
@@
-60,9
+70,10
@@
defmodule Pleroma.Helpers.MediaHelper do
defp prepare_image_resize_args(_), do: {:error, :missing_options}
defp prepare_image_resize_args(_), do: {:error, :missing_options}
+ # Note: video thumbnail is intentionally not resized (always has original dimensions)
def video_framegrab(url) do
with executable when is_binary(executable) <- System.find_executable("ffmpeg"),
def video_framegrab(url) do
with executable when is_binary(executable) <- System.find_executable("ffmpeg"),
- {:ok, env} <- HTTP.get(url, [],
adapter: [pool: :media
]),
+ {:ok, env} <- HTTP.get(url, [],
[
]),
{:ok, fifo_path} <- mkfifo(),
args = [
"-y",
{:ok, fifo_path} <- mkfifo(),
args = [
"-y",
@@
-93,17
+104,17
@@
defmodule Pleroma.Helpers.MediaHelper do
args: args
])
args: args
])
- fifo =
Port.open(to_charlist(fifo_path), [:eof, :binary, :stream, :out
])
+ fifo =
File.open!(fifo_path, [:append, :binary
])
fix = Pleroma.Helpers.QtFastStart.fix(env.body)
fix = Pleroma.Helpers.QtFastStart.fix(env.body)
-
true = Port.command
(fifo, fix)
-
:erlang.port_
close(fifo)
+
IO.binwrite
(fifo, fix)
+
File.
close(fifo)
loop_recv(pid)
after
File.rm(fifo_path)
end
defp mkfifo do
loop_recv(pid)
after
File.rm(fifo_path)
end
defp mkfifo do
- path =
"#{@tmp_base}#{to_charlist(:erlang.phash2(self()))}"
+ path =
Path.join(System.tmp_dir!(), "pleroma-media-preview-pipe-#{Ecto.UUID.generate()}")
case System.cmd("mkfifo", [path]) do
{_, 0} ->
case System.cmd("mkfifo", [path]) do
{_, 0} ->