X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fhelpers%2Fmedia_helper.ex;h=6b799173ed0defd9a503be989db13c3f6424ef1f;hb=9e96c9ae48182d3ae1d00e9475bf0af50cad9f93;hp=bb93d49158db1ac30d96362ebf607eafa3210f60;hpb=c3b02341bf4ab610e9425d6811dca057e9f811a4;p=akkoma

diff --git a/lib/pleroma/helpers/media_helper.ex b/lib/pleroma/helpers/media_helper.ex
index bb93d4915..6b799173e 100644
--- a/lib/pleroma/helpers/media_helper.ex
+++ b/lib/pleroma/helpers/media_helper.ex
@@ -9,12 +9,22 @@ defmodule Pleroma.Helpers.MediaHelper do
 
   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),
-         {:ok, env} <- HTTP.get(url, [], adapter: [pool: :preview]),
+         {:ok, env} <- HTTP.get(url, [], pool: :media),
          {: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}
 
+  # 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"),
-         {:ok, env} <- HTTP.get(url, [], adapter: [pool: :preview]),
+         {:ok, env} <- HTTP.get(url, [], pool: :media),
          {:ok, fifo_path} <- mkfifo(),
          args = [
            "-y",
@@ -103,7 +114,7 @@ defmodule Pleroma.Helpers.MediaHelper do
   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} ->