fix video path being incorrect in prod

breunigs · Jan 12, 2025 · 1bd3871 · 1bd3871
1 parent e05367c
commit 1bd3871
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/config/settings.exs b/config/settings.exs
@@ -144,7 +144,6 @@ config :veloroute, Settings, %{
 
   # various video related paths
   video_dir_rel: "videos",
-  video_dir_abs: Path.join(File.cwd!(), "videos"),
-  video_source_dir_abs: Path.join(Path.join(File.cwd!(), "videos"), "source"),
-  video_target_dir_abs: Path.join(Path.join(File.cwd!(), "videos"), "rendered")
+  video_source_dir_rel: Path.join("videos", "source"),
+  video_target_dir_rel: Path.join("videos", "rendered")
 }
diff --git a/lib/mix/tasks/deploy.ex b/lib/mix/tasks/deploy.ex
@@ -163,6 +163,7 @@ defmodule Mix.Tasks.Deploy do
             /assets/app.js
             /assets/app.css
             /suche?search_query=foobar
+            /images/thumbnails/936d92c42595877d0925a822fdb40837/0
             /map/___static/9.988434,53.548873,9/720x493
           ),
           &report_status_200?/1

diff --git a/lib/settings.ex b/lib/settings.ex
@@ -5,5 +5,9 @@ defmodule Settings do
     end
   end
 
+  def r(:video_dir_abs), do: Path.join(File.cwd!(), r(:video_dir_rel))
+  def r(:video_source_dir_abs), do: Path.join(File.cwd!(), r(:video_source_dir_rel))
+  def r(:video_target_dir_abs), do: Path.join(File.cwd!(), r(:video_target_dir_rel))
+
   def r(key), do: Application.fetch_env!(:veloroute, Settings) |> Map.fetch!(key)
 end
diff --git a/lib/video/serve_plug.ex b/lib/video/serve_plug.ex
@@ -6,7 +6,7 @@ defmodule Video.ServePlug do
 
   plug Plug.Static,
     at: "/#{@serve_path}",
-    from: Settings.c(:video_target_dir_abs),
+    from: Settings.c(:video_target_dir_rel),
     gzip: false,
     brotli: false,
     headers: %{