Include artist column for albums

I'm convinced there's a better way of doing this, but this is all I can think of right now
This commit is contained in:
mitteneer 2025-04-17 14:05:15 -04:00
parent 41ab0dc888
commit 2c4af0b378
2 changed files with 23 additions and 1 deletions

View file

@ -22,7 +22,10 @@ pub fn index(request: *jetzig.Request) !jetzig.View {
\\ORDER BY scrobbles DESC \\ORDER BY scrobbles DESC
; ;
var albums_jq_result = try request.repo.executeSql(query, .{}); var inter_conn = try request.repo.connect();
defer inter_conn.release();
var albums_jq_result = try inter_conn.executeSql(query, .{}, null, request.repo);
defer albums_jq_result.deinit(); defer albums_jq_result.deinit();
const Album = struct { name: []const u8, id: i32, scrobbles: i64 }; const Album = struct { name: []const u8, id: i32, scrobbles: i64 };
@ -30,6 +33,19 @@ pub fn index(request: *jetzig.Request) !jetzig.View {
while (try albums_jq_result.postgresql.result.next()) |album_row| { while (try albums_jq_result.postgresql.result.next()) |album_row| {
const album = try album_row.to(Album, .{ .dupe = true, .allocator = request.allocator }); const album = try album_row.to(Album, .{ .dupe = true, .allocator = request.allocator });
var album_view = try albums_view.append(.object); var album_view = try albums_view.append(.object);
var artist_infos = try album_view.put("artist_info", .array);
const artist_data = try jetzig.database.Query(.Artistalbum)
.select(.{.id})
.where(.{ .album_id = album.id })
.include(.artist, .{ .select = .{ .name, .id } })
.all(request.repo);
for (artist_data) |artist| {
var artist_info = try artist_infos.append(.object);
try artist_info.put("name", artist.artist.name);
try artist_info.put("url", artist.artist.id);
}
try album_view.put("name", album.name); try album_view.put("name", album.name);
try album_view.put("url", album.id); try album_view.put("url", album.id);
try album_view.put("scrobbles", album.scrobbles); try album_view.put("scrobbles", album.scrobbles);

View file

@ -10,6 +10,7 @@
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th>Artist(s)</th>
<th>Scrobbles</th> <th>Scrobbles</th>
</tr> </tr>
</thead> </thead>
@ -17,6 +18,11 @@
@for (.albums) |album| { @for (.albums) |album| {
<tr> <tr>
<td class=cell><a href="/albums/{{album.url}}">{{album.name}}</a></td> <td class=cell><a href="/albums/{{album.url}}">{{album.name}}</a></td>
<td class=cell>
@for (album.get("artist_info").?) |ai| {
<a href="/artists/{{ai.url}}">{{ai.name}}</a>
}
</td>
<td class=cell>{{album.scrobbles}}</td> <td class=cell>{{album.scrobbles}}</td>
</tr> </tr>
} }