Serve images from assets table
This commit is contained in:
@@ -20,4 +20,8 @@ defmodule MusicLibrary.Assets do
|
|||||||
|> Asset.image_changeset(params)
|
|> Asset.image_changeset(params)
|
||||||
|> Repo.insert()
|
|> Repo.insert()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get(hash) do
|
||||||
|
Repo.get!(Asset, hash)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
defmodule MusicLibraryWeb.CoverController do
|
defmodule MusicLibraryWeb.CoverController do
|
||||||
use MusicLibraryWeb, :controller
|
use MusicLibraryWeb, :controller
|
||||||
|
|
||||||
|
alias MusicLibrary.Assets
|
||||||
alias MusicLibrary.Records
|
alias MusicLibrary.Records
|
||||||
alias MusicLibrary.Records.Cover
|
alias MusicLibrary.Records.Cover
|
||||||
|
|
||||||
@@ -29,10 +30,12 @@ defmodule MusicLibraryWeb.CoverController do
|
|||||||
nil ->
|
nil ->
|
||||||
not_found(conn)
|
not_found(conn)
|
||||||
|
|
||||||
%{cover_data: cover_data, cover_hash: etag} ->
|
%{cover_hash: etag} ->
|
||||||
|
asset = Assets.get(etag)
|
||||||
|
|
||||||
case get_req_header(conn, "if-none-match") do
|
case get_req_header(conn, "if-none-match") do
|
||||||
[^etag] -> extend_cache(conn)
|
[^etag] -> extend_cache(conn)
|
||||||
_ -> respond_with_cache(conn, cover_data, etag)
|
_ -> respond_with_cache(conn, asset)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -49,6 +52,14 @@ defmodule MusicLibraryWeb.CoverController do
|
|||||||
|> send_resp(304, "")
|
|> send_resp(304, "")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp respond_with_cache(conn, asset) do
|
||||||
|
conn
|
||||||
|
|> put_resp_content_type(asset.format, "utf-8")
|
||||||
|
|> put_resp_header("cache-control", "public, max-age=#{@cache_duration}")
|
||||||
|
|> put_resp_header("etag", asset.hash)
|
||||||
|
|> send_resp(200, asset.content)
|
||||||
|
end
|
||||||
|
|
||||||
defp respond_with_cache(conn, cover_data, etag) do
|
defp respond_with_cache(conn, cover_data, etag) do
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("image/jpeg", "utf-8")
|
|> put_resp_content_type("image/jpeg", "utf-8")
|
||||||
|
|||||||
@@ -3,14 +3,21 @@ defmodule MusicLibraryWeb.CoverControllerTest do
|
|||||||
|
|
||||||
import MusicLibrary.Fixtures.Records
|
import MusicLibrary.Fixtures.Records
|
||||||
|
|
||||||
|
alias MusicLibrary.Assets
|
||||||
alias MusicLibrary.Records.Cover
|
alias MusicLibrary.Records.Cover
|
||||||
|
|
||||||
defp create_record(_) do
|
defp create_record(_) do
|
||||||
%{record: record()}
|
%{record: record()}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp create_asset(%{record: record}) do
|
||||||
|
{:ok, asset} = Assets.store(%{content: record.cover_data, format: "image/jpeg"})
|
||||||
|
|
||||||
|
%{asset: asset}
|
||||||
|
end
|
||||||
|
|
||||||
describe "GET /covers/:record_id" do
|
describe "GET /covers/:record_id" do
|
||||||
setup [:create_record]
|
setup [:create_record, :create_asset]
|
||||||
|
|
||||||
test "404s when record doesn't exist", %{conn: conn} do
|
test "404s when record doesn't exist", %{conn: conn} do
|
||||||
id = Ecto.UUID.generate()
|
id = Ecto.UUID.generate()
|
||||||
|
|||||||
Reference in New Issue
Block a user