squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep args construction within video/image scopes instead of mangling down in fifo town

Browse Source
This commit is contained in:
Mark Felder 2020-08-27 16:33:37 -05:00
parent dd1de994d5
commit 3a5231ec8f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/helpers/media_helper.ex
View File

@ -16,6 +16,7 @@ defmodule Pleroma.Helpers.MediaHelper do
{:ok, env} <- Pleroma.HTTP.get(url), {:ok, env} <- Pleroma.HTTP.get(url),
{:ok, fifo_path} <- mkfifo() {:ok, fifo_path} <- mkfifo()
do do
args = List.flatten([fifo_path, args])
run_fifo(fifo_path, env, executable, args) run_fifo(fifo_path, env, executable, args)
else else
nil -> {:error, {:convert, :command_not_found}} nil -> {:error, {:convert, :command_not_found}}
@ -58,12 +59,6 @@ defmodule Pleroma.Helpers.MediaHelper do
end end
defp run_fifo(fifo_path, env, executable, args) do defp run_fifo(fifo_path, env, executable, args) do
args =
if _executable = System.find_executable("convert") do
List.flatten([fifo_path, args])
else
args
end
pid = Port.open({:spawn_executable, executable}, [:use_stdio, :stream, :exit_status, :binary, args: args]) pid = Port.open({:spawn_executable, executable}, [:use_stdio, :stream, :exit_status, :binary, args: args])
fifo = Port.open(to_charlist(fifo_path), [:eof, :binary, :stream, :out]) fifo = Port.open(to_charlist(fifo_path), [:eof, :binary, :stream, :out])
true = Port.command(fifo, env.body) true = Port.command(fifo, env.body)