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

Normalize top artist and top album counts

Browse Source 
- Make sure joins don't discard tracks
- Make sure we group by names as MB ids can be empty
This commit is contained in:
Claudio Ortolina
2026-02-15 20:35:23 +00:00
parent d19f2062c5
commit 583789850c
2 changed files with 134 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/music_library/scrobble_activity.ex
+8 -18
View File
@@ -352,26 +352,21 @@ defmodule MusicLibrary.ScrobbleActivity do
@doc """
Gets the top artists by scrobble count across all time.
Returns a list of maps with artist information and play counts.
For a lot of artists, Last.fm doesn't have the correct artist musicbrainz_id
(often it's a ""), which makes this query not work as expected at the JOIN
level. To fix that, we need to update the data via Scrobble Rules.
"""
def get_top_artists(opts) do
limit = Keyword.get(opts, :limit, 10)
query =
from t in Track,
join: ai in Artists.ArtistInfo,
left_join: ai in Artists.ArtistInfo,
on: ai.id == fragment("json_extract(?, '$.musicbrainz_id')", t.artist),
group_by: [
fragment("json_extract(artist, '$.name')"),
fragment("json_extract(artist, '$.musicbrainz_id')")
fragment("json_extract(artist, '$.name')")
],
select: %{
name: fragment("json_extract(artist, '$.name')"),
musicbrainz_id: fragment("json_extract(artist, '$.musicbrainz_id')"),
image_hash: ai.image_data_hash,
musicbrainz_id: max(fragment("json_extract(artist, '$.musicbrainz_id')")),
image_hash: max(ai.image_data_hash),
play_count: count(t.scrobbled_at_uts, :distinct)
},
order_by: [desc: count(t.scrobbled_at_uts, :distinct)],
@@ -383,10 +378,6 @@ defmodule MusicLibrary.ScrobbleActivity do
@doc """
Gets the top artists by scrobble count for the given number of days.
Returns a list of maps with artist information and play counts.
For a lot of artists, Last.fm doesn't have the correct artist musicbrainz_id
(often it's a ""), which makes this query not work as expected at the JOIN
level. To fix that, we need to update the data via Scrobble Rules.
"""
def get_top_artists_by_days(days, opts) do
limit = Keyword.get(opts, :limit, 10)
@@ -402,17 +393,16 @@ defmodule MusicLibrary.ScrobbleActivity do
query =
from t in Track,
join: ai in Artists.ArtistInfo,
left_join: ai in Artists.ArtistInfo,
on: ai.id == fragment("json_extract(?, '$.musicbrainz_id')", t.artist),
where: t.scrobbled_at_uts >= ^cutoff_timestamp,
group_by: [
fragment("json_extract(artist, '$.name')"),
fragment("json_extract(artist, '$.musicbrainz_id')")
fragment("json_extract(artist, '$.name')")
],
select: %{
name: fragment("json_extract(artist, '$.name')"),
musicbrainz_id: fragment("json_extract(artist, '$.musicbrainz_id')"),
image_hash: ai.image_data_hash,
musicbrainz_id: max(fragment("json_extract(artist, '$.musicbrainz_id')")),
image_hash: max(ai.image_data_hash),
play_count: count(t.scrobbled_at_uts, :distinct)
},
order_by: [desc: count(t.scrobbled_at_uts, :distinct)],