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

Add more information to scrobbles views and refactor artists view

Browse source
This commit is contained in:
mitteneer 2025-04-28 23:06:21 -04:00
parent 8138e5ccf2
commit 78e416eeaf
4 changed files with 129 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/app/views/scrobbles.zig
View file

@ -5,31 +5,42 @@ const zeit = @import("zeit");
pub fn index(request: *jetzig.Request) !jetzig.View {
var root = try request.data(.object);
var scrobbles_view = try root.put("scrobbles", .array);
//const query = jetzig.database.Query(.Scrobble)
// .select(.{ .id, .date })
// .include(.song, .{ .select = .{ .id, .name } })
// .include(.album, .{ .select = .{ .id, .name } })
// .include(.scrobbleartists, .{ .select = .{.artist_id} })
// .orderBy(.{ .date = .desc });
//const scrobbles = try request.repo.all(query);
const query =
\\SELECT songs.name, songs.id, albums.name, albums.id, scrobbles.datetime
\\SELECT songs.name, songs.id, albums.name, albums.id, artists.name, artists.id, scrobbles.id, scrobbles.datetime
\\FROM albumsongs
\\INNER JOIN songs ON songs.id = albumsongs.song_id
\\INNER JOIN albums ON albums.id = albumsongs.album_id
\\INNER JOIN scrobbles ON scrobbles.albumsong = albumsongs.id
\\INNER JOIN albumsongsartists ON albumsongsartists.albumsong_id = albumsongs.id
\\INNER JOIN artists ON artists.id = albumsongsartists.artist_id
\\ORDER BY scrobbles.datetime ASC
;
var scrobbles_js_result = try request.repo.executeSql(query, .{});
defer scrobbles_js_result.deinit();
var scrobbles_jq_result = try request.repo.executeSql(query, .{});
defer scrobbles_jq_result.deinit();
const Scrobble = struct { song_name: []const u8, song_id: i32, album_name: []const u8, album_id: i32, date: i64 };
const Scrobble = struct { song_name: []const u8, song_id: i32, album_name: []const u8, album_id: i32, artist_name: []const u8, artist_id: i32, s_id: i32, date: i64 };
while (try scrobbles_js_result.postgresql.result.next()) |scrobble_row| {
var prev_s_id: ?i32 = null;
var prev_artist_infos: ?*jetzig.zmpl.Data.Value = null;
blk: while (try scrobbles_jq_result.postgresql.result.next()) |scrobble_row| {
const scrobble = try scrobble_row.to(Scrobble, .{ .dupe = true, .allocator = request.allocator });
if (scrobble.s_id == prev_s_id) {
var artist_info = try prev_artist_infos.?.append(.object);
try artist_info.put("name", scrobble.artist_name);
try artist_info.put("url", scrobble.artist_id);
continue :blk;
}
// Not appending the scrobble directly because we don't want the unix timestamp or scrobble id
var scrobble_view = try scrobbles_view.append(.object);
var artist_infos = try scrobble_view.put("artist_info", .array);
var artist_info = try artist_infos.append(.object);
try artist_info.put("name", scrobble.artist_name);
try artist_info.put("url", scrobble.artist_id);
try scrobble_view.put("song_name", scrobble.song_name);
try scrobble_view.put("song_id", scrobble.song_id);
try scrobble_view.put("album_name", scrobble.album_name);
@ -37,28 +48,11 @@ pub fn index(request: *jetzig.Request) !jetzig.View {
var date = std.ArrayList(u8).init(request.allocator);
try (try zeit.instant(.{ .source = .{ .unix_timestamp = @divFloor(scrobble.date, 1_000) } })).time().strftime(date.writer(), "%d %b %Y, %H:%M");
try scrobble_view.put("date", date.items);
prev_artist_infos = artist_infos;
prev_s_id = scrobble.s_id;
}
//for (scrobbles) |scrobble| {
// var scrobble_view = try scrobbles_view.append(.object);
// var artist_infos = try scrobble_view.put("artist_info", .array);
// for (scrobble.scrobbleartists) |artist| {
// var artist_info = try artist_infos.append(.object);
// const artist_data = try jetzig.database.Query(.Artist)
// .find(artist.artist_id)
// .select(.{ .id, .name })
// .execute(request.repo);
// try artist_info.put("name", artist_data.?.name);
// try artist_info.put("id", artist_data.?.id);
// }
// try scrobble_view.put("song_name", scrobble.song.name);
// try scrobble_view.put("song_id", scrobble.song.id);
// try scrobble_view.put("album_name", scrobble.album.name);
// try scrobble_view.put("album_id", scrobble.album.id);
// try scrobble_view.put("date", scrobble.date);
//}
return request.render(.ok);
}