<.tabbed_layout>
<:tab title="Attributes">
+ <%= if media_file_exists?(@media_item) do %>
+
Preview
+ <.media_preview media_item={@media_item} />
+ <% end %>
+
Attributes
Source:
diff --git a/lib/pinchflat_web/router.ex b/lib/pinchflat_web/router.ex
index e68e799..eae7109 100644
--- a/lib/pinchflat_web/router.ex
+++ b/lib/pinchflat_web/router.ex
@@ -28,10 +28,14 @@ defmodule PinchflatWeb.Router do
end
end
- # Other scopes may use custom stacks.
- # scope "/api", PinchflatWeb do
- # pipe_through :api
- # end
+ # Routes in here are NOT protected by basic auth. This is necessary for
+ # media streaming to work for RSS podcast feeds.
+ #
+ # TODO: consider putting the basic auth here behind a config flag
+ # so people that want RSS feeds to work can enable it.
+ scope "/", PinchflatWeb do
+ get "/media/:id/stream", MediaItems.MediaItemController, :stream
+ end
# Enable LiveDashboard and Swoosh mailbox preview in development
if Application.compile_env(:pinchflat, :dev_routes) do
diff --git a/priv/repo/migrations/20240323165649_add_uuid_to_source_and_media.exs b/priv/repo/migrations/20240323165649_add_uuid_to_source_and_media.exs
new file mode 100644
index 0000000..40b69db
--- /dev/null
+++ b/priv/repo/migrations/20240323165649_add_uuid_to_source_and_media.exs
@@ -0,0 +1,13 @@
+defmodule Pinchflat.Repo.Migrations.AddUuidToSourceAndMedia do
+ use Ecto.Migration
+
+ def change do
+ alter table(:sources) do
+ add :uuid, :uuid
+ end
+
+ alter table(:media_items) do
+ add :uuid, :uuid
+ end
+ end
+end
diff --git a/test/pinchflat/media_test.exs b/test/pinchflat/media_test.exs
index 21cdf2c..40e338c 100644
--- a/test/pinchflat/media_test.exs
+++ b/test/pinchflat/media_test.exs
@@ -398,6 +398,37 @@ defmodule Pinchflat.MediaTest do
assert media_item.media_filepath == valid_attrs.media_filepath
end
+ test "automatically sets the UUID" do
+ valid_attrs = %{
+ media_id: Faker.String.base64(12),
+ title: Faker.Commerce.product_name(),
+ media_filepath: "/video/#{Faker.File.file_name(:video)}",
+ source_id: source_fixture().id,
+ original_url: "https://www.youtube.com/channel/#{Faker.String.base64(12)}",
+ upload_date: Date.utc_today()
+ }
+
+ assert {:ok, %MediaItem{} = media_item} = Media.create_media_item(valid_attrs)
+
+ assert String.length(media_item.uuid) == 36
+ end
+
+ test "UUID is not writable by the user" do
+ valid_attrs = %{
+ media_id: Faker.String.base64(12),
+ title: Faker.Commerce.product_name(),
+ media_filepath: "/video/#{Faker.File.file_name(:video)}",
+ source_id: source_fixture().id,
+ original_url: "https://www.youtube.com/channel/#{Faker.String.base64(12)}",
+ upload_date: Date.utc_today(),
+ uuid: "some-uuid"
+ }
+
+ assert {:ok, %MediaItem{} = media_item} = Media.create_media_item(valid_attrs)
+
+ assert String.length(media_item.uuid) == 36
+ end
+
test "creating with invalid data returns error changeset" do
assert {:error, %Ecto.Changeset{}} = Media.create_media_item(@invalid_attrs)
end
diff --git a/test/pinchflat/sources_test.exs b/test/pinchflat/sources_test.exs
index ce247a2..392cc2f 100644
--- a/test/pinchflat/sources_test.exs
+++ b/test/pinchflat/sources_test.exs
@@ -59,6 +59,31 @@ defmodule Pinchflat.SourcesTest do
end
describe "create_source/2" do
+ test "automatically sets the UUID" do
+ expect(YtDlpRunnerMock, :run, &channel_mock/3)
+
+ valid_attrs = %{
+ media_profile_id: media_profile_fixture().id,
+ original_url: "https://www.youtube.com/channel/abc123"
+ }
+
+ assert {:ok, %Source{} = source} = Sources.create_source(valid_attrs)
+ assert String.length(source.uuid) == 36
+ end
+
+ test "UUID is not writable by the user" do
+ expect(YtDlpRunnerMock, :run, &channel_mock/3)
+
+ valid_attrs = %{
+ media_profile_id: media_profile_fixture().id,
+ original_url: "https://www.youtube.com/channel/abc123",
+ uuid: "some_uuid"
+ }
+
+ assert {:ok, %Source{} = source} = Sources.create_source(valid_attrs)
+ assert String.length(source.uuid) == 36
+ end
+
test "creates a source and adds name + ID from runner response for channels" do
expect(YtDlpRunnerMock, :run, &channel_mock/3)
diff --git a/test/pinchflat_web/controllers/media_item_controller_test.exs b/test/pinchflat_web/controllers/media_item_controller_test.exs
index 1f50462..428d337 100644
--- a/test/pinchflat_web/controllers/media_item_controller_test.exs
+++ b/test/pinchflat_web/controllers/media_item_controller_test.exs
@@ -66,6 +66,147 @@ defmodule PinchflatWeb.MediaItemControllerTest do
end
end
+ describe "streaming media" do
+ test "returns 404 if the media isn't found", %{conn: conn} do
+ media_item = media_item_fixture()
+ conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.status == 404
+ end
+
+ test "automatically sets the content type", %{conn: conn} do
+ media_item = media_item_with_attachments()
+ conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
+
+ assert {"content-type", "video/mp4; charset=utf-8"} in conn.resp_headers
+ end
+
+ test "sets the content length", %{conn: conn} do
+ media_item = media_item_with_attachments()
+ filesize = File.stat!(media_item.media_filepath).size
+
+ conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
+
+ assert {"content-length", to_string(filesize)} in conn.resp_headers
+ end
+ end
+
+ describe "streaming media when range is valid" do
+ setup do
+ media_item = media_item_with_attachments()
+
+ %{media_item: media_item}
+ end
+
+ test "sets the correct status and headers", %{conn: conn, media_item: media_item} do
+ filesize = File.stat!(media_item.media_filepath).size
+
+ conn =
+ conn
+ |> put_req_header("range", "bytes=0-100")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.status == 206
+ assert {"content-range", "bytes 0-100/#{filesize}"} in conn.resp_headers
+ assert {"content-length", "101"} in conn.resp_headers
+ end
+
+ test "streams the specified range", %{conn: conn, media_item: media_item} do
+ conn =
+ conn
+ |> put_req_header("range", "bytes=0-100")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert byte_size(conn.resp_body) == 101
+ end
+
+ test "supports range offsets", %{conn: conn, media_item: media_item} do
+ contents = File.read!(media_item.media_filepath)
+ expected = String.slice(contents, 100..200)
+
+ conn =
+ conn
+ |> put_req_header("range", "bytes=100-200")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.resp_body == expected
+ end
+
+ test "returns as expected if the requested range is larger than the file", %{conn: conn, media_item: media_item} do
+ contents = File.read!(media_item.media_filepath)
+ filesize = File.stat!(media_item.media_filepath).size
+
+ conn =
+ conn
+ |> put_req_header("range", "bytes=0-#{filesize * 10}")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.resp_body == contents
+ assert {"content-range", "bytes 0-#{filesize - 1}/#{filesize}"} in conn.resp_headers
+ assert {"content-length", to_string(filesize)} in conn.resp_headers
+ end
+
+ test "supports endless ranges", %{conn: conn, media_item: media_item} do
+ contents = File.read!(media_item.media_filepath)
+
+ conn =
+ conn
+ |> put_req_header("range", "bytes=0-")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.resp_body == contents
+ end
+
+ test "supports endless ranges with offsets", %{conn: conn, media_item: media_item} do
+ contents = File.read!(media_item.media_filepath)
+ {_, expected} = String.split_at(contents, 100)
+
+ conn =
+ conn
+ |> put_req_header("range", "bytes=100-")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.resp_body == expected
+ end
+ end
+
+ describe "streaming media when range is invalid or not present" do
+ setup do
+ media_item = media_item_with_attachments()
+
+ %{media_item: media_item}
+ end
+
+ test "sets the correct status and headers", %{conn: conn, media_item: media_item} do
+ filesize = File.stat!(media_item.media_filepath).size
+
+ conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.status == 200
+ assert {"content-length", to_string(filesize)} in conn.resp_headers
+ end
+
+ test "streams the entire file", %{conn: conn, media_item: media_item} do
+ contents = File.read!(media_item.media_filepath)
+
+ conn = get(conn, ~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.resp_body == contents
+ end
+
+ test "doesn't blow up if the range header is invalid", %{conn: conn, media_item: media_item} do
+ contents = File.read!(media_item.media_filepath)
+
+ conn =
+ conn
+ |> put_req_header("range", "bytes=-")
+ |> get(~p"/media/#{media_item.uuid}/stream")
+
+ assert conn.status == 200
+ assert conn.resp_body == contents
+ end
+ end
+
defp create_media_item(_) do
media_item = media_item_fixture()
%{media_item: media_item}
diff --git a/test/support/fixtures/media_fixtures.ex b/test/support/fixtures/media_fixtures.ex
index ce0a3a7..a9cf75d 100644
--- a/test/support/fixtures/media_fixtures.ex
+++ b/test/support/fixtures/media_fixtures.ex
@@ -49,7 +49,7 @@ defmodule Pinchflat.MediaFixtures do
Path.join([
Application.get_env(:pinchflat, :media_directory),
"#{:rand.uniform(1_000_000)}",
- "#{:rand.uniform(1_000_000)}_media.mkv"
+ "#{:rand.uniform(1_000_000)}_media.mp4"
])
fixture_media_filepath =