hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-09-05 16:16:35 +03:00
commit c3b02341bf
4 changed files with 51 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/helpers/media_helper.ex
View file

@ -7,12 +7,14 @@ defmodule Pleroma.Helpers.MediaHelper do
Handles common media-related operations.
"""
alias Pleroma.HTTP
@tmp_base "/tmp/pleroma-media_preview-pipe"
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} <- Pleroma.HTTP.get(url, [], [adapter: [pool: :preview]]),
{:ok, env} <- HTTP.get(url, [], adapter: [pool: :preview]),
{:ok, fifo_path} <- mkfifo() do
args = List.flatten([fifo_path, args])
run_fifo(fifo_path, env, executable, args)
@ -60,7 +62,7 @@ defmodule Pleroma.Helpers.MediaHelper do
def video_framegrab(url) do
with executable when is_binary(executable) <- System.find_executable("ffmpeg"),
{:ok, env} <- Pleroma.HTTP.get(url, [], [adapter: [pool: :preview]]),
{:ok, env} <- HTTP.get(url, [], adapter: [pool: :preview]),
{:ok, fifo_path} <- mkfifo(),
args = [
"-y",