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

Show record status markers in scrobbled tracks index

Browse Source
This commit is contained in:
Claudio Ortolina
2025-09-29 11:04:35 +03:00
parent 9608884173
commit 621fe385e3
6 changed files with 138 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/music_library/scrobble_activity.ex
+23 -5
View File
@@ -382,7 +382,25 @@ defmodule MusicLibrary.ScrobbleActivity do
page_size = Map.get(params, :page_size, 200)
order = Map.get(params, :order, :scrobbled_at)
base_query = from(t in Track)
all_artists_query =
from ar in ArtistRecord,
distinct: true
base_query =
from t in Track,
left_join: cr in subquery(Collection.collected_releases_query()),
on: cr.release_id == fragment("? ->> '$.musicbrainz_id'", t.album),
left_join: wr in subquery(Wishlist.wishlisted_releases_query()),
on: wr.release_id == fragment("? ->> '$.musicbrainz_id'", t.album),
left_join: ar in subquery(all_artists_query),
on: wr.record_id == ar.record_id or cr.record_id == ar.record_id,
select: %{
track: t,
collected_record_id: cr.record_id,
wishlisted_record_id: wr.record_id,
artist_id: ar.musicbrainz_id,
cover_hash: coalesce(cr.cover_hash, wr.cover_hash)
}
search_query =
if query == "" do
@@ -393,8 +411,8 @@ defmodule MusicLibrary.ScrobbleActivity do
from t in base_query,
where:
like(fragment("lower(?)", t.title), ^query_term) or
like(fragment("lower(json_extract(artist, '$.name'))"), ^query_term) or
like(fragment("lower(json_extract(album, '$.title'))"), ^query_term)
like(fragment("lower(json_extract(?, '$.name'))", t.artist), ^query_term) or
like(fragment("lower(json_extract(?, '$.title'))", t.album), ^query_term)
end
ordered_query =
@@ -406,10 +424,10 @@ defmodule MusicLibrary.ScrobbleActivity do
from t in search_query, order_by: [asc: t.title]
:artist ->
from t in search_query, order_by: [asc: fragment("json_extract(artist, '$.name')")]
from t in search_query, order_by: [asc: fragment("json_extract(?, '$.name')", t.artist)]
:album ->
from t in search_query, order_by: [asc: fragment("json_extract(album, '$.title')")]
from t in search_query, order_by: [asc: fragment("json_extract(?, '$.title')", t.album)]
end
offset = (page - 1) * page_size
lib/music_library_web/live/scrobbled_tracks_live/index.ex
+22 -2
View File
@@ -2,10 +2,12 @@ defmodule MusicLibraryWeb.ScrobbledTracksLive.Index do
use MusicLibraryWeb, :live_view
import MusicLibraryWeb.Components.Pagination
import MusicLibraryWeb.RecordComponents, only: [format_label: 1]
import MusicLibraryWeb.ScrobbleComponents, only: [refresh_lastfm_feed_button: 1]
alias LastFm.Track
alias MusicLibrary.ScrobbleActivity
alias MusicLibrary.Assets.Transform
alias MusicLibrary.{Records, ScrobbleActivity}
@default_tracks_list_params %{
query: "",
@@ -19,7 +21,9 @@ defmodule MusicLibraryWeb.ScrobbledTracksLive.Index do
socket =
socket
|> assign(:current_section, :scrobble_activity)
|> stream_configure(:tracks, dom_id: fn %Track{scrobbled_at_uts: id} -> "tracks-#{id}" end)
|> stream_configure(:tracks,
dom_id: fn %{track: %Track{scrobbled_at_uts: id}} -> "tracks-#{id}" end
)
if connected?(socket) do
LastFm.subscribe_to_feed()
@@ -174,4 +178,20 @@ defmodule MusicLibraryWeb.ScrobbledTracksLive.Index do
~p"/scrobbled-tracks?#{qs}"
end
defp track_cover_url(track, nil) do
track.cover_url
end
defp track_cover_url(track, cover_hash) do
if LastFm.fallback_cover?(track.cover_url) do
payload =
Transform.new(hash: cover_hash, width: 96)
|> Transform.encode!()
~p"/assets/#{payload}"
else
track.cover_url
end
end
end
lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
+64 -10
View File
@@ -76,24 +76,28 @@
</li>
<li
:for={{id, track} <- @streams.tracks}
: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.tracks
}
id={id}
class="flex justify-between gap-x-6 py-5 hover:bg-zinc-50 dark:hover:bg-zinc-800 px-2 -mx-2 md:px-4 md:-mx-4 cursor-pointer"
>
<div class="flex items-center space-x-4 flex-1 min-w-0">
<div :if={track.cover_url && track.cover_url != ""} class="flex-shrink-0">
<div class="flex-shrink-0">
<img
class="w-12 h-12 rounded-md object-cover"
src={track.cover_url}
alt={"Cover for " <> track.album.title}
class="h-12 w-12 rounded-md shadow-sm"
src={track_cover_url(track, cover_hash)}
alt={track.title}
onerror={"this.src = '" <> ~p"/images/cover-not-found.png" <> "';"}
/>
</div>
<div :if={!track.cover_url || track.cover_url == ""} class="flex-shrink-0">
<div class="w-12 h-12 bg-zinc-200 dark:bg-zinc-600 rounded-md flex items-center justify-center">
<.icon name="hero-musical-note" class="h-6 w-6 text-zinc-400" />
</div>
</div>
<div class="min-w-0 flex-1">
<p class="text-sm font-medium text-zinc-900 dark:text-zinc-100 truncate">
@@ -112,6 +116,56 @@
</div>
<div class="flex items-center">
<div class="flex gap-1 flex-col text-right">
<.badge :if={track.album.musicbrainz_id == ""}>
{gettext("No MB ID")}
</.badge>
<.link
:if={collected_record_id}
navigate={~p"/collection/#{collected_record_id}"}
>
<.badge color="success">{gettext("Collected")}</.badge>
</.link>
<.link
:if={wishlisted_record_id}
navigate={~p"/wishlist/#{wishlisted_record_id}"}
>
<.badge color="warning">{gettext("Wishlisted")}</.badge>
</.link>
</div>
<.dropdown
:if={
track.album.musicbrainz_id !== "" and !collected_record_id and
!wishlisted_record_id
}
id={"actions-#{track.scrobbled_at_uts}-tracks"}
placement="bottom-end"
>
<:toggle>
<span class="sr-only">{gettext("Choose which format to import")}</span>
<.icon
name="hero-star"
class="-mt-1 h-5 w-5 text-zinc-500 dark:text-zinc-400 cursor-pointer"
aria-hidden="true"
data-slot="icon"
/>
</:toggle>
<.focus_wrap id={"actions-#{track.scrobbled_at_uts}-tracks-focus-wrap"}>
<.dropdown_link
:for={format <- Records.Record.formats()}
id={"actions-#{track.scrobbled_at_uts}-#{format}-import"}
phx-click={
JS.push("import",
value: %{id: track.album.musicbrainz_id, format: format},
page_loading: true
)
}
>
{format_label(format)}
</.dropdown_link>
</.focus_wrap>
</.dropdown>
<.dropdown id={"actions-#{track.scrobbled_at_uts}"} placement="bottom-end">
<:toggle>
<div>
priv/gettext/default.pot
+4
View File
@@ -258,18 +258,21 @@ msgid "Scrobble activity"
msgstr ""
#: lib/music_library_web/components/add_record.ex
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "Choose which format to import"
msgstr ""
#: lib/music_library_web/components/barcode_scanner.ex
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "Collected"
msgstr ""
#: lib/music_library_web/components/barcode_scanner.ex
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "Wishlisted"
@@ -314,6 +317,7 @@ msgstr ""
msgid "Error refreshing cover"
msgstr ""
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "No MB ID"
priv/gettext/en/LC_MESSAGES/default.po
+4
View File
@@ -258,18 +258,21 @@ msgid "Scrobble activity"
msgstr ""
#: lib/music_library_web/components/add_record.ex
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "Choose which format to import"
msgstr ""
#: lib/music_library_web/components/barcode_scanner.ex
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "Collected"
msgstr ""
#: lib/music_library_web/components/barcode_scanner.ex
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "Wishlisted"
@@ -314,6 +317,7 @@ msgstr ""
msgid "Error refreshing cover"
msgstr ""
#: lib/music_library_web/live/scrobbled_tracks_live/index.html.heex
#: lib/music_library_web/live/stats_live/index.html.heex
#, elixir-autogen, elixir-format
msgid "No MB ID"
test/music_library/scrobble_activity_test.exs
+21 -11
View File
@@ -11,7 +11,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
_track1 = track_fixture(%{title: "First Track"})
_track2 = track_fixture(%{title: "Second Track"})
tracks = ScrobbleActivity.list_tracks()
tracks = list_tracks()
assert length(tracks) == 2
track_titles = Enum.map(tracks, & &1.title)
@@ -32,7 +32,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
scrobbled_at_uts: System.system_time(:second)
})
tracks = ScrobbleActivity.list_tracks(%{order: :scrobbled_at})
tracks = list_tracks(%{order: :scrobbled_at})
assert length(tracks) == 2
# Should be ordered by scrobbled_at_uts descending (newest first)
@@ -44,7 +44,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
track_fixture(%{title: "Zebra Track"})
track_fixture(%{title: "Alpha Track"})
tracks = ScrobbleActivity.list_tracks(%{order: :title})
tracks = list_tracks(%{order: :title})
assert length(tracks) == 2
assert List.first(tracks).title == "Alpha Track"
@@ -55,7 +55,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
track_fixture(%{artist_name: "Zebra Artist", title: "Track 1"})
track_fixture(%{artist_name: "Alpha Artist", title: "Track 2"})
tracks = ScrobbleActivity.list_tracks(%{order: :artist})
tracks = list_tracks(%{order: :artist})
assert length(tracks) == 2
assert List.first(tracks).artist.name == "Alpha Artist"
@@ -66,7 +66,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
track_fixture(%{album_title: "Zebra Album", title: "Track 1"})
track_fixture(%{album_title: "Alpha Album", title: "Track 2"})
tracks = ScrobbleActivity.list_tracks(%{order: :album})
tracks = list_tracks(%{order: :album})
assert length(tracks) == 2
assert List.first(tracks).album.title == "Alpha Album"
@@ -77,7 +77,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
track_fixture(%{title: "Special Track"})
track_fixture(%{title: "Regular Track"})
tracks = ScrobbleActivity.list_tracks(%{query: "Special"})
tracks = list_tracks(%{query: "Special"})
assert length(tracks) == 1
assert List.first(tracks).title == "Special Track"
@@ -87,7 +87,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
track_fixture(%{artist_name: "Special Artist", title: "Track 1"})
track_fixture(%{artist_name: "Regular Artist", title: "Track 2"})
tracks = ScrobbleActivity.list_tracks(%{query: "Special Artist"})
tracks = list_tracks(%{query: "Special Artist"})
assert length(tracks) == 1
assert List.first(tracks).artist.name == "Special Artist"
@@ -97,7 +97,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
track_fixture(%{album_title: "Special Album", title: "Track 1"})
track_fixture(%{album_title: "Regular Album", title: "Track 2"})
tracks = ScrobbleActivity.list_tracks(%{query: "Special Album"})
tracks = list_tracks(%{query: "Special Album"})
assert length(tracks) == 1
assert List.first(tracks).album.title == "Special Album"
@@ -107,11 +107,11 @@ defmodule MusicLibrary.ScrobbleActivityTest do
create_test_tracks(5)
# Get first 2 tracks
tracks_page_1 = ScrobbleActivity.list_tracks(%{page: 1, page_size: 2})
tracks_page_1 = list_tracks(%{page: 1, page_size: 2})
assert length(tracks_page_1) == 2
# Get next 2 tracks
tracks_page_2 = ScrobbleActivity.list_tracks(%{page: 2, page_size: 2})
tracks_page_2 = list_tracks(%{page: 2, page_size: 2})
assert length(tracks_page_2) == 2
# Ensure they're different tracks
@@ -123,7 +123,7 @@ defmodule MusicLibrary.ScrobbleActivityTest do
test "returns empty list when query matches no tracks" do
track_fixture(%{title: "Test Track"})
tracks = ScrobbleActivity.list_tracks(%{query: "NonexistentTrack"})
tracks = list_tracks(%{query: "NonexistentTrack"})
assert tracks == []
end
@@ -282,4 +282,14 @@ defmodule MusicLibrary.ScrobbleActivityTest do
assert new_count == initial_count + 3
end
end
defp list_tracks do
ScrobbleActivity.list_tracks()
|> Enum.map(fn r -> r.track end)
end
defp list_tracks(params) do
ScrobbleActivity.list_tracks(params)
|> Enum.map(fn r -> r.track end)
end
end