Rename ReleaseGroup to ReleaseGroupSearchResult
This commit is contained in:
@@ -11,7 +11,7 @@ defmodule MusicBrainz.APIImpl do
|
|||||||
|
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
alias MusicBrainz.ReleaseGroup
|
alias MusicBrainz.ReleaseGroupSearchResult
|
||||||
|
|
||||||
@doc """
|
@doc """
|
||||||
Uses the [lookup](https://musicbrainz.org/doc/MusicBrainz_API#Lookups) endpoint with the release group id and include the
|
Uses the [lookup](https://musicbrainz.org/doc/MusicBrainz_API#Lookups) endpoint with the release group id and include the
|
||||||
@@ -420,7 +420,7 @@ defmodule MusicBrainz.APIImpl do
|
|||||||
@base_url <> "/release-group?#{URI.encode_query(qs)}"
|
@base_url <> "/release-group?#{URI.encode_query(qs)}"
|
||||||
|
|
||||||
with {:ok, result} <- json_get(url, config) do
|
with {:ok, result} <- json_get(url, config) do
|
||||||
{:ok, Enum.map(result["release-groups"], &ReleaseGroup.from_api_response/1)}
|
{:ok, Enum.map(result["release-groups"], &ReleaseGroupSearchResult.from_api_response/1)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
defmodule MusicBrainz.ReleaseGroup do
|
defmodule MusicBrainz.ReleaseGroupSearchResult do
|
||||||
@enforce_keys [:id, :type, :title, :artists, :release]
|
@enforce_keys [:id, :type, :title, :artists, :release]
|
||||||
defstruct [:id, :type, :title, :artists, :release]
|
defstruct [:id, :type, :title, :artists, :release]
|
||||||
|
|
||||||
@@ -3,7 +3,7 @@ defmodule MusicLibrary.Records.MusicbrainzData do
|
|||||||
musicbrainz_data
|
musicbrainz_data
|
||||||
|> get_release_groups()
|
|> get_release_groups()
|
||||||
|> Enum.map(fn relation ->
|
|> Enum.map(fn relation ->
|
||||||
MusicBrainz.ReleaseGroup.from_api_response(relation["release_group"])
|
MusicBrainz.ReleaseGroupSearchResult.from_api_response(relation["release_group"])
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ defmodule MusicLibraryWeb.RecordComponents do
|
|||||||
{gettext("Show")}
|
{gettext("Show")}
|
||||||
</.link>
|
</.link>
|
||||||
<a
|
<a
|
||||||
href={MusicBrainz.ReleaseGroup.url(record.musicbrainz_id)}
|
href={MusicBrainz.ReleaseGroupSearchResult.url(record.musicbrainz_id)}
|
||||||
target=".blank"
|
target=".blank"
|
||||||
class="block px-3 py-1 text-sm leading-6 text-zinc-900 dark:text-zinc-400 hover:bg-zinc-50 dark:hover:text-zinc-300 dark:hover:bg-zinc-700"
|
class="block px-3 py-1 text-sm leading-6 text-zinc-900 dark:text-zinc-400 hover:bg-zinc-50 dark:hover:text-zinc-300 dark:hover:bg-zinc-700"
|
||||||
role="menuitem"
|
role="menuitem"
|
||||||
|
|||||||
@@ -179,7 +179,7 @@
|
|||||||
{gettext("MusicBrainz ID")}
|
{gettext("MusicBrainz ID")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd class="mt-1 text-xs md:text-sm flex justify-between leading-6 text-zinc-700 dark:text-zinc-300 sm:col-span-2 sm:mt-0">
|
<dd class="mt-1 text-xs md:text-sm flex justify-between leading-6 text-zinc-700 dark:text-zinc-300 sm:col-span-2 sm:mt-0">
|
||||||
<a href={MusicBrainz.ReleaseGroup.url(@record.musicbrainz_id)}>
|
<a href={MusicBrainz.ReleaseGroupSearchResult.url(@record.musicbrainz_id)}>
|
||||||
<code id={"mb-#{@record.musicbrainz_id}"}>{@record.musicbrainz_id}</code>
|
<code id={"mb-#{@record.musicbrainz_id}"}>{@record.musicbrainz_id}</code>
|
||||||
</a>
|
</a>
|
||||||
<button phx-click={
|
<button phx-click={
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ defmodule MusicLibraryWeb.RecordLive.ImportComponent do
|
|||||||
|
|
||||||
attr :id, :string, required: true
|
attr :id, :string, required: true
|
||||||
attr :icon_name, :string, required: true
|
attr :icon_name, :string, required: true
|
||||||
attr :release_group, MusicBrainz.ReleaseGroup, required: true
|
attr :release_group, MusicBrainz.ReleaseGroupSearchResult, required: true
|
||||||
|
|
||||||
defp result(assigns) do
|
defp result(assigns) do
|
||||||
~H"""
|
~H"""
|
||||||
|
|||||||
@@ -199,7 +199,7 @@
|
|||||||
{gettext("MusicBrainz ID")}
|
{gettext("MusicBrainz ID")}
|
||||||
</dt>
|
</dt>
|
||||||
<dd class="mt-1 text-xs md:text-sm flex justify-between leading-6 text-zinc-700 dark:text-zinc-300 sm:col-span-2 sm:mt-0">
|
<dd class="mt-1 text-xs md:text-sm flex justify-between leading-6 text-zinc-700 dark:text-zinc-300 sm:col-span-2 sm:mt-0">
|
||||||
<a href={MusicBrainz.ReleaseGroup.url(@record.musicbrainz_id)}>
|
<a href={MusicBrainz.ReleaseGroupSearchResult.url(@record.musicbrainz_id)}>
|
||||||
<code id={"mb-#{@record.musicbrainz_id}"}>{@record.musicbrainz_id}</code>
|
<code id={"mb-#{@record.musicbrainz_id}"}>{@record.musicbrainz_id}</code>
|
||||||
</a>
|
</a>
|
||||||
<button phx-click={
|
<button phx-click={
|
||||||
|
|||||||
@@ -50,28 +50,28 @@ defmodule MusicLibrary.Records.RecordTest do
|
|||||||
|> Ecto.Changeset.apply_changes()
|
|> Ecto.Changeset.apply_changes()
|
||||||
|
|
||||||
assert Record.included_release_groups(record) == [
|
assert Record.included_release_groups(record) == [
|
||||||
%MusicBrainz.ReleaseGroup{
|
%MusicBrainz.ReleaseGroupSearchResult{
|
||||||
id: "749c07b5-4900-404b-bea9-bb6b16fa991e",
|
id: "749c07b5-4900-404b-bea9-bb6b16fa991e",
|
||||||
type: :other,
|
type: :other,
|
||||||
title: "Claustrophobic Universe",
|
title: "Claustrophobic Universe",
|
||||||
release: "2021-04-23",
|
release: "2021-04-23",
|
||||||
artists: "Mariusz Duda"
|
artists: "Mariusz Duda"
|
||||||
},
|
},
|
||||||
%MusicBrainz.ReleaseGroup{
|
%MusicBrainz.ReleaseGroupSearchResult{
|
||||||
id: "61077431-0057-4119-8f06-0df1098d21e5",
|
id: "61077431-0057-4119-8f06-0df1098d21e5",
|
||||||
type: :other,
|
type: :other,
|
||||||
title: "Interior Drawings",
|
title: "Interior Drawings",
|
||||||
release: "2021-12-10",
|
release: "2021-12-10",
|
||||||
artists: "Mariusz Duda"
|
artists: "Mariusz Duda"
|
||||||
},
|
},
|
||||||
%MusicBrainz.ReleaseGroup{
|
%MusicBrainz.ReleaseGroupSearchResult{
|
||||||
id: "c36123e3-8899-48a5-8196-9dbb72421d69",
|
id: "c36123e3-8899-48a5-8196-9dbb72421d69",
|
||||||
type: :other,
|
type: :other,
|
||||||
title: "Let’s Meet Outside",
|
title: "Let’s Meet Outside",
|
||||||
release: "2022-05-20",
|
release: "2022-05-20",
|
||||||
artists: "Mariusz Duda"
|
artists: "Mariusz Duda"
|
||||||
},
|
},
|
||||||
%MusicBrainz.ReleaseGroup{
|
%MusicBrainz.ReleaseGroupSearchResult{
|
||||||
id: "d463f2b1-d254-4baf-a957-fb78c6e5b956",
|
id: "d463f2b1-d254-4baf-a957-fb78c6e5b956",
|
||||||
type: :other,
|
type: :other,
|
||||||
title: "Lockdown Spaces",
|
title: "Lockdown Spaces",
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
defmodule MusicLibrary.ReleaseGroupsFixtures do
|
defmodule MusicLibrary.ReleaseGroupsFixtures do
|
||||||
@fixtures_folder Path.join([File.cwd!(), "test/support/fixtures"])
|
@fixtures_folder Path.join([File.cwd!(), "test/support/fixtures"])
|
||||||
|
|
||||||
alias MusicBrainz.ReleaseGroup
|
alias MusicBrainz.ReleaseGroupSearchResult
|
||||||
|
|
||||||
def release_group_search_results do
|
def release_group_search_results do
|
||||||
[
|
[
|
||||||
%ReleaseGroup{
|
%ReleaseGroupSearchResult{
|
||||||
id: "20790e26-98e4-3ad3-a67f-b674758b942d",
|
id: "20790e26-98e4-3ad3-a67f-b674758b942d",
|
||||||
type: :album,
|
type: :album,
|
||||||
title: "Marbles",
|
title: "Marbles",
|
||||||
artists: "Marillion",
|
artists: "Marillion",
|
||||||
release: "2004-05-03"
|
release: "2004-05-03"
|
||||||
},
|
},
|
||||||
%ReleaseGroup{
|
%ReleaseGroupSearchResult{
|
||||||
id: "bf20ac32-a793-3bb4-beff-f7b9bffaca38",
|
id: "bf20ac32-a793-3bb4-beff-f7b9bffaca38",
|
||||||
type: :album,
|
type: :album,
|
||||||
title: "Marbles Live",
|
title: "Marbles Live",
|
||||||
|
|||||||
Reference in New Issue
Block a user