diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-05 16:16:35 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-05 16:16:35 +0300 |
| commit | c3b02341bf4ab610e9425d6811dca057e9f811a4 (patch) | |
| tree | bd579cec98b2ca7a2111687e299211a8dbe1515f /lib/pleroma/helpers | |
| parent | f25b0e87f3dd73e02c954c5baab3c52becdd9c9e (diff) | |
| download | pleroma-c3b02341bf4ab610e9425d6811dca057e9f811a4.tar.gz | |
[#2497] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
Diffstat (limited to 'lib/pleroma/helpers')
| -rw-r--r-- | lib/pleroma/helpers/media_helper.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex index cfb091f82..bb93d4915 100644 --- a/lib/pleroma/helpers/media_helper.ex +++ b/lib/pleroma/helpers/media_helper.ex @@ -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", |