ab/furumusic
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Activity

Improved artist page
Build and Publish / Build and Publish Docker Image (push) Successful in 2m37s
Details

Browse Source
This commit is contained in:
Ultradesu
2026-06-09 17:18:55 +01:00
parent 0ac59eb0ca
commit 71d6556ba8
5 changed files with 118 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/i18n/phrases.rs
+1
View File
@@ -373,6 +373,7 @@ translations! {
player_repeat: "Repeat" , "Повтор";
player_volume: "Volume" , "Громкость";
player_appears_on: "Appears on" , "Участвует в";
player_top_tracks: "Popular tracks" , "Популярные треки";
player_albums: "Albums" , "Альбомы";
player_eps: "EPs" , "EP";
player_singles: "Singles" , "Синглы";
src/player/mod.rs
+38 -34
View File
@@ -3201,40 +3201,44 @@ async fn artist_detail_handler(
.collect();
let top_tracks = sqlx::query_as::<_, PlaylistTrackRow>(
r#"SELECT t.id, t.title::text as title, t.track_number, t.disc_number,
t.duration_seconds, t.cover_file_id,
r.cover_file_id as release_cover_file_id,
r.id as release_id,
r.title::text as release_title,
r.year as release_year,
COALESCE(mf.uploader_name, 'UFO')::text AS uploader_name,
mf.audio_format,
mf.audio_bitrate,
mf.audio_sample_rate,
mf.audio_bit_depth,
mf.file_size_bytes,
t.lastfm_listeners,
t.lastfm_playcount,
t.lastfm_rating,
t.lastfm_updated_at
FROM furumusic__track t
JOIN furumusic__release r ON r.id = t.release_id
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
WHERE t.is_hidden = false
AND r.is_hidden = false
AND EXISTS (
SELECT 1
FROM furumusic__track_artist ta
WHERE ta.track_id = t.id
AND ta.artist_id = $1
AND ta.role <> 'featuring'
)
ORDER BY COALESCE(t.lastfm_rating, 0) DESC,
COALESCE(t.lastfm_playcount, 0) DESC,
COALESCE(t.lastfm_listeners, 0) DESC,
r.year DESC NULLS LAST,
t.track_number NULLS LAST,
t.id
r#"SELECT * FROM (
SELECT DISTINCT ON (lower(t.title::text))
t.id, t.title::text as title, t.track_number, t.disc_number,
t.duration_seconds, t.cover_file_id,
r.cover_file_id as release_cover_file_id,
r.id as release_id,
r.title::text as release_title,
r.year as release_year,
COALESCE(mf.uploader_name, 'UFO')::text AS uploader_name,
mf.audio_format,
mf.audio_bitrate,
mf.audio_sample_rate,
mf.audio_bit_depth,
mf.file_size_bytes,
t.lastfm_listeners,
t.lastfm_playcount,
t.lastfm_rating,
t.lastfm_updated_at
FROM furumusic__track t
JOIN furumusic__release r ON r.id = t.release_id
LEFT JOIN furumusic__media_file mf ON mf.id = t.audio_file_id
WHERE t.is_hidden = false
AND r.is_hidden = false
AND EXISTS (
SELECT 1
FROM furumusic__track_artist ta
WHERE ta.track_id = t.id
AND ta.artist_id = $1
AND ta.role <> 'featuring'
)
ORDER BY lower(t.title::text), COALESCE(t.lastfm_rating, 0) DESC
) deduped
ORDER BY COALESCE(lastfm_rating, 0) DESC,
COALESCE(lastfm_playcount, 0) DESC,
COALESCE(lastfm_listeners, 0) DESC,
release_year DESC NULLS LAST,
track_number NULLS LAST,
id
LIMIT 50"#,
)
.bind(artist_id)