cloud/music_library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve all data in one query in Scrobble Activity

Browse Source 
Aim is to avoid having to do this in multiple rounds with in-memory
operations which are harder to follow
This commit is contained in:
Claudio Ortolina
2025-09-26 12:34:47 +03:00
parent c3a0819248
commit 08bf53910b
4 changed files with 155 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/music_library_web/live/stats_live/index.ex
+26 -22
View File
@@ -6,13 +6,13 @@ defmodule MusicLibraryWeb.StatsLive.Index do
import MusicLibraryWeb.RecordComponents, only: [format_label: 1, type_label: 1]
import MusicLibraryWeb.StatsComponents
alias MusicLibrary.Assets.Transform
alias MusicLibrary.{Collection, Records, ScrobbleActivity, Wishlist}
alias MusicLibraryWeb.StatsLive.{TopAlbums, TopArtists}
def mount(_params, _session, socket) do
current_date = Date.utc_today()
latest_record = Collection.get_latest_record!()
recent_tracks = LastFm.get_scrobbled_tracks(50)
records_by_artists = Collection.count_records_by_artist(limit: 20)
records_by_genre = Collection.count_records_by_genre(limit: 20)
records_on_this_day = Collection.get_records_on_this_day(current_date)
@@ -24,14 +24,14 @@ defmodule MusicLibraryWeb.StatsLive.Index do
{:ok,
socket
|> stream_configure(:recent_tracks,
dom_id: fn track -> "track-#{track.scrobbled_at_uts}" end
dom_id: fn %{track: track} -> "track-#{track.scrobbled_at_uts}" end
)
|> stream_configure(:recent_albums,
dom_id: fn album -> "album-#{album.scrobbled_at_uts}" end
dom_id: fn %{album: album} -> "album-#{album.scrobbled_at_uts}" end
)
|> stream(:records_on_this_day, records_on_this_day, reset: true)
|> assign_counts()
|> assign_scrobble_activity(recent_tracks)
|> assign_scrobble_activity()
|> assign(
current_date: current_date,
scrobble_activity_mode: "albums",
@@ -101,11 +101,9 @@ defmodule MusicLibraryWeb.StatsLive.Index do
end
def handle_info(%{track_count: _count}, socket) do
recent_tracks = LastFm.get_scrobbled_tracks()
{:noreply,
socket
|> assign_scrobble_activity(recent_tracks)}
|> assign_scrobble_activity()}
end
defp assign_counts(socket) do
@@ -126,32 +124,24 @@ defmodule MusicLibraryWeb.StatsLive.Index do
)
end
defp assign_scrobble_activity(socket, recent_tracks) do
defp assign_scrobble_activity(socket) do
%{
localized_recent_tracks: localized_recent_tracks,
localized_recent_albums: recent_albums,
collected_releases: collected_releases,
wishlisted_releases: wishlisted_releases,
artist_ids: artist_ids
} = ScrobbleActivity.from_recent_tracks(recent_tracks, socket.assigns.timezone)
recent_tracks: recent_tracks,
recent_albums: recent_albums
} = ScrobbleActivity.recent_activity(socket.assigns.timezone)
scrobble_count = ScrobbleActivity.scrobble_count()
last_updated_uts =
if track = List.first(localized_recent_tracks) do
track.scrobbled_at_uts
if rt = List.first(recent_tracks) do
rt.track.scrobbled_at_uts
end
socket
|> assign(:last_updated_uts, last_updated_uts)
|> assign(:scrobble_count, scrobble_count)
|> stream(:recent_tracks, localized_recent_tracks, reset: true)
|> stream(:recent_tracks, recent_tracks, reset: true)
|> stream(:recent_albums, recent_albums, reset: true)
|> assign(
collected_releases: collected_releases,
wishlisted_releases: wishlisted_releases,
artist_ids: artist_ids
)
end
defp format_scrobbled_at_uts(uts) do
@@ -159,4 +149,18 @@ defmodule MusicLibraryWeb.StatsLive.Index do
|> DateTime.from_unix!()
|> DateTime.to_iso8601()
end
@last_fm_fallback_cover_url "https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png"
defp track_or_album_cover_url(track_or_album, cover_hash) do
if track_or_album.cover_url == @last_fm_fallback_cover_url do
payload =
Transform.new(hash: cover_hash, width: 96)
|> Transform.encode!()
~p"/assets/#{payload}"
else
track_or_album.cover_url
end
end
end
lib/music_library_web/live/stats_live/index.html.heex
+47 -38
View File
@@ -85,7 +85,20 @@
class="mt-5 p-6 bg-white dark:bg-zinc-800 rounded-md shadow-sm"
phx-update="stream"
>
<li :for={{id, album} <- @streams.recent_albums} id={id} class="group">
<li
:for={
{id,
%{
album: album,
artist_id: artist_id,
collected_record_id: collected_record_id,
wishlisted_record_id: wishlisted_record_id,
cover_hash: cover_hash
}} <- @streams.recent_albums
}
id={id}
class="group"
>
<div class="relative pb-4 group-last:pb-0">
<span
class="group-last:hidden absolute left-6 top-6 -ml-px h-full w-0.5 bg-zinc-200"
@@ -96,18 +109,18 @@
<div class="flex min-w-0 justify-between space-x-4 items-center">
<img
class="h-12 w-12 rounded-md shadow-sm"
src={album.cover_url}
src={track_or_album_cover_url(album, cover_hash)}
alt={album.metadata.title}
/>
<div>
<p
:if={album.artist.musicbrainz_id not in @artist_ids}
:if={!artist_id}
class="font-semibold text-sm block text-zinc-500 dark:text-zinc-400"
>
{album.artist.name}
</p>
<.link
:if={album.artist.musicbrainz_id in @artist_ids}
:if={artist_id}
class="font-semibold text-sm block text-zinc-700 hover:text-zinc-500 dark:text-zinc-400 dark:hover:text-zinc-300"
navigate={~p"/artists/#{album.artist.musicbrainz_id}"}
>
@@ -196,22 +209,16 @@
{gettext("No MB ID")}
</.badge>
<.link
:if={
record_id =
tracked_record?(@collected_releases, album.metadata.musicbrainz_id)
}
navigate={~p"/collection/#{record_id}"}
:if={collected_record_id}
navigate={~p"/collection/#{collected_record_id}"}
>
<.badge color="success">
{gettext("Collected")}
</.badge>
</.link>
<.link
:if={
record_id =
tracked_record?(@wishlisted_releases, album.metadata.musicbrainz_id)
}
navigate={~p"/wishlist/#{record_id}"}
:if={wishlisted_record_id}
navigate={~p"/wishlist/#{wishlisted_record_id}"}
>
<.badge color="warning">
{gettext("Wishlisted")}
@@ -221,11 +228,8 @@
<.dropdown
:if={
album.metadata.musicbrainz_id !== "" and
!tracked_record?(
@collected_releases ++ @wishlisted_releases,
album.metadata.musicbrainz_id
)
album.metadata.musicbrainz_id !== "" and !collected_record_id and
!wishlisted_record_id
}
id={"actions-#{album.scrobbled_at_uts}-albums"}
placement="bottom-end"
@@ -266,7 +270,20 @@
class="mt-5 p-6 bg-white dark:bg-zinc-800 rounded-md shadow-sm"
phx-update="stream"
>
<li :for={{id, track} <- @streams.recent_tracks} id={id} class="group">
<li
:for={
{id,
%{
track: track,
artist_id: artist_id,
collected_record_id: collected_record_id,
wishlisted_record_id: wishlisted_record_id,
cover_hash: cover_hash
}} <- @streams.recent_tracks
}
id={id}
class="group"
>
<div class="relative pb-4 group-last:pb-0">
<span
class="group-last:hidden absolute left-6 top-6 -ml-px h-full w-0.5 bg-zinc-200"
@@ -277,20 +294,20 @@
<div class="flex min-w-0 justify-between space-x-4 items-center">
<img
class="h-12 w-12 rounded-md shadow-sm"
src={track.cover_url}
src={track_or_album_cover_url(track, cover_hash)}
alt={track.title}
/>
<div>
<p
:if={track.artist.musicbrainz_id not in @artist_ids}
:if={!artist_id}
class="font-semibold text-sm block text-zinc-500 dark:text-zinc-400"
>
{track.artist.name}
</p>
<.link
:if={track.artist.musicbrainz_id in @artist_ids}
:if={artist_id}
class="font-semibold text-sm block text-zinc-700 hover:text-zinc-500 dark:text-zinc-400 dark:hover:text-zinc-300"
navigate={~p"/artists/#{track.artist.musicbrainz_id}"}
navigate={~p"/artists/#{artist_id}"}
>
{track.artist.name}
</.link>
@@ -407,19 +424,14 @@
{gettext("No MB ID")}
</.badge>
<.link
:if={
record_id = tracked_record?(@collected_releases, track.album.musicbrainz_id)
}
navigate={~p"/collection/#{record_id}"}
:if={collected_record_id}
navigate={~p"/collection/#{collected_record_id}"}
>
<.badge color="success">{gettext("Collected")}</.badge>
</.link>
<.link
:if={
record_id =
tracked_record?(@wishlisted_releases, track.album.musicbrainz_id)
}
navigate={~p"/wishlist/#{record_id}"}
:if={wishlisted_record_id}
navigate={~p"/wishlist/#{wishlisted_record_id}"}
>
<.badge color="warning">{gettext("Wishlisted")}</.badge>
</.link>
@@ -427,11 +439,8 @@
<.dropdown
:if={
track.album.musicbrainz_id !== "" and
!tracked_record?(
@collected_releases ++ @wishlisted_releases,
track.album.musicbrainz_id
)
track.album.musicbrainz_id !== "" and !collected_record_id and
!wishlisted_record_id
}
id={"actions-#{track.scrobbled_at_uts}-tracks"}
placement="bottom-end"