Extend import to support choosing format

This commit is contained in:
Claudio Ortolina
2024-09-28 20:23:22 +01:00
parent 82e5962c74
commit 64ea8fe3fa
4 changed files with 25 additions and 8 deletions
+6 -4
View File
@@ -60,17 +60,18 @@ defmodule MusicLibrary.Records do
MusicBrainz.search_release_group(query, limit: limit, offset: offset) MusicBrainz.search_release_group(query, limit: limit, offset: offset)
end end
def import_from_musicbrainz(musicbrainz_id) do def import_from_musicbrainz(musicbrainz_id, opts \\ []) do
with {:ok, release_group} <- MusicBrainz.get_release_group(musicbrainz_id), with format = Keyword.get(opts, :format, "cd"),
{:ok, release_group} <- MusicBrainz.get_release_group(musicbrainz_id),
{:ok, image_data} <- MusicBrainz.get_cover_art(musicbrainz_id), {:ok, image_data} <- MusicBrainz.get_cover_art(musicbrainz_id),
record_params = build_record_params(release_group, image_data) do record_params = build_record_params(release_group, image_data, format) do
create_record(record_params) create_record(record_params)
else else
error -> error error -> error
end end
end end
defp build_record_params(release_group, image_data) do defp build_record_params(release_group, image_data, format) do
musicbrainz_id = release_group["id"] musicbrainz_id = release_group["id"]
artists_attrs = artists_attrs =
@@ -91,6 +92,7 @@ defmodule MusicLibrary.Records do
"artists" => artists_attrs, "artists" => artists_attrs,
"year" => parse_year(release_group["first-release-date"]), "year" => parse_year(release_group["first-release-date"]),
"type" => parse_subtype(release_group["primary-type"]), "type" => parse_subtype(release_group["primary-type"]),
"format" => format,
"genres" => Enum.map(release_group["genres"], fn g -> g["name"] end), "genres" => Enum.map(release_group["genres"], fn g -> g["name"] end),
"image_url" => "https://coverartarchive.org/release-group/#{musicbrainz_id}/front", "image_url" => "https://coverartarchive.org/release-group/#{musicbrainz_id}/front",
"image_data" => image_data "image_data" => image_data
+5 -1
View File
@@ -2,11 +2,13 @@ defmodule MusicLibrary.Records.Record do
use Ecto.Schema use Ecto.Schema
import Ecto.Changeset import Ecto.Changeset
@formats [:cd, :vinyl, :blu_ray, :dvd, :multi]
@primary_key {:id, :binary_id, autogenerate: true} @primary_key {:id, :binary_id, autogenerate: true}
@foreign_key_type :binary_id @foreign_key_type :binary_id
schema "records" do schema "records" do
field :type, Ecto.Enum, values: [:album, :ep, :live, :compilation, :single, :other] field :type, Ecto.Enum, values: [:album, :ep, :live, :compilation, :single, :other]
field :format, Ecto.Enum, values: [:cd, :vinyl, :blu_ray, :dvd, :multi] field :format, Ecto.Enum, values: @formats
field :title, :string field :title, :string
field :image_url, :string field :image_url, :string
field :image_data, :binary field :image_data, :binary
@@ -58,6 +60,8 @@ defmodule MusicLibrary.Records.Record do
change(record, image_data: image_data) change(record, image_data: image_data)
end end
def formats, do: @formats
def format_short_label(:cd), do: "CD" def format_short_label(:cd), do: "CD"
def format_short_label(:vinyl), do: "V" def format_short_label(:vinyl), do: "V"
def format_short_label(:blu_ray), do: "BR" def format_short_label(:blu_ray), do: "BR"
@@ -38,6 +38,7 @@ defmodule MusicLibraryWeb.RecordLive.ImportComponent do
<div class="flex min-w-0 gap-x-4"> <div class="flex min-w-0 gap-x-4">
<div class="min-w-0 flex-auto"> <div class="min-w-0 flex-auto">
<p class="text-sm font-semibold leading-6 text-gray-900"> <p class="text-sm font-semibold leading-6 text-gray-900">
<.type_badge type={@release_group.type} />
<%= @release_group.title %> <%= @release_group.title %>
<span class="mt-1 text-xs leading-5 text-gray-500"> <span class="mt-1 text-xs leading-5 text-gray-500">
@@ -47,8 +48,18 @@ defmodule MusicLibraryWeb.RecordLive.ImportComponent do
<p class="mt-1 truncate text-xs leading-5 text-gray-500"><%= @release_group.artists %></p> <p class="mt-1 truncate text-xs leading-5 text-gray-500"><%= @release_group.artists %></p>
</div> </div>
</div> </div>
<div class="hidden shrink-0 sm:flex sm:flex-col sm:items-end"> <div class="hidden shrink-0 sm:flex sm:flex-col sm:items-end">
<.type_badge type={@release_group.type} /> <span class="isolate inline-flex rounded-md shadow-sm">
<button
:for={format <- Records.Record.formats()}
phx-click={JS.push("import", value: %{id: @release_group.id, format: format})}
type="button"
class="relative -ml-px inline-flex items-center first:rounded-l-md last:rounded-r-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-10"
>
<%= Records.Record.format_short_label(format) %>
</button>
</span>
</div> </div>
</li> </li>
""" """
@@ -95,8 +95,8 @@ defmodule MusicLibraryWeb.RecordLive.Index do
{:noreply, push_patch(socket, to: ~s"/records?#{qs}")} {:noreply, push_patch(socket, to: ~s"/records?#{qs}")}
end end
def handle_event("import", %{"id" => musicbrainz_id}, socket) do def handle_event("import", %{"id" => musicbrainz_id, "format" => format}, socket) do
case Records.import_from_musicbrainz(musicbrainz_id) do case Records.import_from_musicbrainz(musicbrainz_id, format: format) do
{:ok, record} -> {:ok, record} ->
notify_parent({:saved, record}) notify_parent({:saved, record})