mitteneer/zuletzt
1
0
Fork 0
Code Issues 14 Pull requests Projects Releases Packages Wiki Activity Actions

Add more information to artists view, songs view, and format dates correctly in scrobbles view

Browse source
This commit is contained in:
mitteneer 2025-04-27 23:58:50 -04:00
parent 01fe10f045
commit 65136a44d6
9 changed files with 82 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/app/views/songs.zig
View file

@ -12,25 +12,45 @@ pub fn index(request: *jetzig.Request) !jetzig.View {
// .all(request.repo);
const query =
\\SELECT songs.name, songs.id, COUNT(scrobbles) AS scrobbles
\\SELECT songs.name, songs.id, artists.name, artists.id, COUNT(scrobbles) AS scrobbles
\\FROM albumsongs
\\INNER JOIN songs ON albumsongs.song_id = songs.id
\\INNER JOIN scrobbles ON scrobbles.albumsong = albumsongs.id
\\GROUP BY songs.id
\\ORDER BY scrobbles DESC
\\INNER JOIN albumsongsartists ON albumsongsartists.albumsong_id = albumsongs.id
\\INNER JOIN artists ON artists.id = albumsongsartists.artist_id
\\GROUP BY songs.id, artists.id
\\ORDER BY scrobbles DESC, songs.name ASC
;
var songs_js_result = try request.repo.executeSql(query, .{});
defer songs_js_result.deinit();
const Song = struct { name: []const u8, id: i32, scrobbles: i64 };
const Song = struct { name: []const u8, id: i32, artist_name: []const u8, artist_id: i32, scrobbles: i64 };
while (try songs_js_result.postgresql.result.next()) |song_row| {
var prev_song_id: ?i32 = null;
var prev_artist_infos: ?*jetzig.zmpl.Data.Value = null;
blk: while (try songs_js_result.postgresql.result.next()) |song_row| {
const song = try song_row.to(Song, .{ .dupe = true, .allocator = request.allocator });
if (song.id == prev_song_id) {
var artist_info = try prev_artist_infos.?.append(.object);
try artist_info.put("name", song.artist_name);
try artist_info.put("url", song.artist_id);
continue :blk;
}
var song_view = try songs_view.append(.object);
var artist_infos = try song_view.put("artist_info", .array);
var artist_info = try artist_infos.append(.object);
try artist_info.put("name", song.artist_name);
try artist_info.put("url", song.artist_id);
try song_view.put("name", song.name);
try song_view.put("url", song.id);
try song_view.put("scrobbles", song.scrobbles);
prev_artist_infos = artist_infos;
prev_song_id = song.id;
}
//for (songs) |song| {