From f292368947279e6d208505848602931378668cd8 Mon Sep 17 00:00:00 2001 From: mitteneer Date: Mon, 23 Jun 2025 10:15:17 -0400 Subject: [PATCH] Song name in url string --- src/app/views/songs.zig | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/app/views/songs.zig b/src/app/views/songs.zig index b634534..00ec085 100644 --- a/src/app/views/songs.zig +++ b/src/app/views/songs.zig @@ -1,6 +1,7 @@ const std = @import("std"); const jetzig = @import("jetzig"); const queries = @import("../../queries.zig"); +const decode = @import("../../date_fmt.zig").urlDecode; pub fn index(request: *jetzig.Request) !jetzig.View { var root = try request.data(.object); @@ -20,21 +21,43 @@ pub fn index(request: *jetzig.Request) !jetzig.View { } pub fn get(id: []const u8, request: *jetzig.Request) !jetzig.View { + const parse_err = blk: { + const rdr_id = std.fmt.parseInt(i64, id, 10) catch |err| break :blk err; + const song = try jetzig.database.Query(.Song).find(rdr_id).execute(request.repo); + if (song == null) break :blk error.InvalidCharacter; + var name = std.ArrayList(u8).init(request.allocator); + try name.appendSlice("http://127.0.0.1:8080/songs/"); + try name.appendSlice(song.?.name); + return request.redirect(try name.toOwnedSlice(), .found); + }; + + const id_int = switch (parse_err) { + error.Overflow => return request.fail(.not_found), + error.InvalidCharacter => blk: { + const rn = try decode(request.allocator, id); + std.log.debug("{s}", .{rn}); + const songs = try jetzig.database.Query(.Song).where(.{ .name = rn }).all(request.repo); + + if (songs.len == 0) return request.fail(.not_found); + if (songs.len > 1) return request.redirect("http://127.0.0.1:8080", .found); + break :blk songs[0].id; + }, + }; var root = try request.data(.object); - const song = try queries.entityQueryResult(request, queries.loadQuery(.song, .entity_info), .{id}); + const song = try queries.entityQueryResult(request, queries.loadQuery(.song, .entity_info), .{id_int}); try root.put("song", song); - const scrobbles = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_scrobbles), .{id}); + const scrobbles = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_scrobbles), .{id_int}); try root.put("scrobbles", scrobbles); - const albums = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_albums), .{id}); + const albums = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_albums), .{id_int}); try root.put("albums", albums); - const firstlast = try queries.entityQueryResult(request, queries.loadQuery(.song, .firstlast), .{id}); + const firstlast = try queries.entityQueryResult(request, queries.loadQuery(.song, .firstlast), .{id_int}); try root.put("firstlast", firstlast); - const timescale = try queries.entityQueryResult(request, queries.loadQuery(.song, .timescale), .{id}); + const timescale = try queries.entityQueryResult(request, queries.loadQuery(.song, .timescale), .{id_int}); try root.put("yearly", timescale); return request.render(.ok); }