diff --git a/lib/music_brainz/external_link.ex b/lib/music_brainz/external_link.ex new file mode 100644 index 00000000..882a0ebd --- /dev/null +++ b/lib/music_brainz/external_link.ex @@ -0,0 +1,28 @@ +defmodule MusicBrainz.ExternalLink do + defstruct [:name, :url] + + def external_links(musicbrainz_data, patterns) when is_map(patterns) do + Enum.reduce(patterns, [], fn {name, pattern}, acc -> + case external_links(musicbrainz_data, pattern) do + [] -> + acc + + [url | _rest] -> + [%__MODULE__{name: name, url: url} | acc] + end + end) + end + + def external_links(musicbrainz_data, pattern) do + case get_in(musicbrainz_data, ["relations", Access.all(), "url", "resource"]) do + nil -> [] + urls -> filter_urls(urls, pattern) + end + end + + defp filter_urls(urls, nil), do: urls + + defp filter_urls(urls, pattern) do + Enum.filter(urls, fn url -> String.contains?(url, pattern) end) + end +end diff --git a/lib/music_library/artists.ex b/lib/music_library/artists.ex index 3628ac99..1708b8c1 100644 --- a/lib/music_library/artists.ex +++ b/lib/music_library/artists.ex @@ -162,23 +162,6 @@ defmodule MusicLibrary.Artists do |> Repo.update() end - @external_link_patterns %{ - "ProgArchives" => "progarchives.com" - } - - def external_links(artist_info) do - Enum.reduce(@external_link_patterns, [], fn {name, pattern}, acc -> - case ArtistInfo.relation_urls(artist_info, pattern) do - [] -> - acc - - [url | _rest] -> - [%{name: name, url: url} | acc] - end - end) - end - - defp get_collected_artist_ids do q = from ar in ArtistRecord, diff --git a/lib/music_library/artists/artist_info.ex b/lib/music_library/artists/artist_info.ex index bc637017..b13bff89 100644 --- a/lib/music_library/artists/artist_info.ex +++ b/lib/music_library/artists/artist_info.ex @@ -3,6 +3,8 @@ defmodule MusicLibrary.Artists.ArtistInfo do import Ecto.Changeset + alias MusicBrainz.ExternalLink + @primary_key {:id, :binary_id, autogenerate: true} schema "artist_infos" do field :musicbrainz_data, :map, default: %{} @@ -63,16 +65,10 @@ defmodule MusicLibrary.Artists.ArtistInfo do end) end - def relation_urls(artist_info, pattern \\ nil) do - case get_in(artist_info.musicbrainz_data, ["relations", Access.all(), "url", "resource"]) do - nil -> [] - urls -> filter_urls(urls, pattern) - end - end + @external_link_patterns %{ + "ProgArchives" => "progarchives.com" + } - defp filter_urls(urls, nil), do: urls - - defp filter_urls(urls, pattern) do - Enum.filter(urls, fn url -> String.contains?(url, pattern) end) - end + def external_links(artist_info), + do: ExternalLink.external_links(artist_info.musicbrainz_data, @external_link_patterns) end diff --git a/lib/music_library_web/live/artist_live/show.ex b/lib/music_library_web/live/artist_live/show.ex index 36bde294..f20e455d 100644 --- a/lib/music_library_web/live/artist_live/show.ex +++ b/lib/music_library_web/live/artist_live/show.ex @@ -205,7 +205,7 @@ defmodule MusicLibraryWeb.ArtistLive.Show do |> assign(:current_section, :artists) |> assign(:artist, artist) |> assign(:artist_info, artist_info) - |> assign(:external_links, Artists.external_links(artist_info)) + |> assign(:external_links, ArtistInfo.external_links(artist_info)) |> assign(:country, ArtistInfo.country(artist_info)) |> assign_async(:lastfm_artist_info, fn -> with {:ok, lastfm_artist_info} <- LastFm.get_artist_info(artist.musicbrainz_id, artist.name) do