Serve covers from assets

lib/music_library/assets.ex

@@ -22,6 +22,10 @@ defmodule MusicLibrary.Assets do
   end
 
   def get(hash) do
+    Repo.get(Asset, hash)
+  end
+
+  def get!(hash) do
     Repo.get!(Asset, hash)
   end
 end

lib/music_library_web/controllers/cover_controller.ex

@@ -2,20 +2,19 @@ defmodule MusicLibraryWeb.CoverController do
   use MusicLibraryWeb, :controller
 
   alias MusicLibrary.Assets
-  alias MusicLibrary.Records
   alias MusicLibrary.Records.Cover
 
   # 1 year in seconds
   @cache_duration 60 * 60 * 24 * 365
 
-  def show(conn, %{"record_id" => record_id, "size" => size}) do
-    case Records.get_cover(record_id) do
+  def show(conn, %{"hash" => hash, "size" => size}) do
+    case Assets.get(hash) do
       nil ->
         not_found(conn)
 
-      %{cover_data: cover_data} ->
+      %{content: content} ->
         # TODO: find a way to cache computation, or pre-compute thumb and store it
-        {:ok, thumb_data} = Cover.resize(cover_data, String.to_integer(size))
+        {:ok, thumb_data} = Cover.resize(content, String.to_integer(size))
         hash = Cover.hash(thumb_data)
 
         case get_req_header(conn, "if-none-match") do
@@ -25,16 +24,14 @@ defmodule MusicLibraryWeb.CoverController do
     end
   end
 
-  def show(conn, %{"record_id" => record_id}) do
-    case Records.get_cover(record_id) do
+  def show(conn, %{"hash" => hash}) do
+    case Assets.get(hash) do
       nil ->
         not_found(conn)
 
-      %{cover_hash: etag} ->
-        asset = Assets.get(etag)
-
+      asset ->
         case get_req_header(conn, "if-none-match") do
-          [^etag] -> extend_cache(conn)
+          [^hash] -> extend_cache(conn)
           _ -> respond_with_cache(conn, asset)
         end
     end

lib/music_library_web/router.ex

@@ -36,7 +36,7 @@ defmodule MusicLibraryWeb.Router do
 
       get "/backup", ArchiveController, :backup
 
-      get "/covers/:record_id", CoverController, :show
+      get "/covers/:hash", CoverController, :show
       get "/artists/:musicbrainz_id/image", ArtistController, :image
 
       live_session :default,
@@ -79,7 +79,7 @@ defmodule MusicLibraryWeb.Router do
     get "/collection/latest", CollectionController, :latest
     get "/collection/random", CollectionController, :random
     get "/collection", CollectionController, :index
-    get "/covers/:record_id", CoverController, :show
+    get "/covers/:hash", CoverController, :show
     get "/backup", ArchiveController, :backup
   end