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

Compare commits

base: mitteneer:b7e625dd9844e455496b729ddb9433a4560dcdc3
Branches Tags
mitteneer:main
mitteneer:rawsql
mitteneer:hijack-jsonParse
..
compare: mitteneer:77a9c24dab83a576263e706e0fa5e6d2566cfdbd
Branches Tags
mitteneer:rawsql
mitteneer:hijack-jsonParse
mitteneer:main

No commits in common. "b7e625dd9844e455496b729ddb9433a4560dcdc3" and "77a9c24dab83a576263e706e0fa5e6d2566cfdbd" have entirely different histories.
b7e625dd98 ... 77a9c24dab

5 changed files with 8 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/app/views/artists.zig
View file

@ -38,6 +38,7 @@ pub fn get(id: []const u8, request: *jetzig.Request) !jetzig.View {
if (artists.len > 1) return request.redirect("http://127.0.0.1:8080", .found); if (artists.len > 1) return request.redirect("http://127.0.0.1:8080", .found);
break :blk artists[0].id; break :blk artists[0].id;
}, },
else => unreachable,
}; };
var root = try request.data(.object); var root = try request.data(.object);

12
src/app/views/ratings/songs.zig
View file

@ -1,12 +0,0 @@
const std = @import("std");
const jetzig = @import("jetzig");
pub fn post(request: *jetzig.Request) !jetzig.View {
var root = try request.data(.object);
const params = try request.params();
const id = params.getT(.integer, "song_id");
const review = params.getT(.string, "review");
try root.put("song_id", id);
try root.put("review", review);
return request.render(.created);
}

2
src/app/views/ratings/songs/post.zmpl
View file

@ -1,2 +0,0 @@
{{.song_id}}
{{.review}}

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

@ -1,7 +1,6 @@
const std = @import("std"); const std = @import("std");
const jetzig = @import("jetzig"); const jetzig = @import("jetzig");
const queries = @import("../../queries.zig"); const queries = @import("../../queries.zig");
const decode = @import("../../date_fmt.zig").urlDecode;
pub fn index(request: *jetzig.Request) !jetzig.View { pub fn index(request: *jetzig.Request) !jetzig.View {
var root = try request.data(.object); var root = try request.data(.object);
@ -21,43 +20,21 @@ pub fn index(request: *jetzig.Request) !jetzig.View {
} }
pub fn get(id: []const u8, 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); var root = try request.data(.object);
const song = try queries.entityQueryResult(request, queries.loadQuery(.song, .entity_info), .{id_int}); const song = try queries.entityQueryResult(request, queries.loadQuery(.song, .entity_info), .{id});
try root.put("song", song); try root.put("song", song);
const scrobbles = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_scrobbles), .{id_int}); const scrobbles = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_scrobbles), .{id});
try root.put("scrobbles", scrobbles); try root.put("scrobbles", scrobbles);
const albums = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_albums), .{id_int}); const albums = try queries.entityQueryResult(request, queries.loadQuery(.song, .get_albums), .{id});
try root.put("albums", albums); try root.put("albums", albums);
const firstlast = try queries.entityQueryResult(request, queries.loadQuery(.song, .firstlast), .{id_int}); const firstlast = try queries.entityQueryResult(request, queries.loadQuery(.song, .firstlast), .{id});
try root.put("firstlast", firstlast); try root.put("firstlast", firstlast);
const timescale = try queries.entityQueryResult(request, queries.loadQuery(.song, .timescale), .{id_int}); const timescale = try queries.entityQueryResult(request, queries.loadQuery(.song, .timescale), .{id});
try root.put("yearly", timescale); try root.put("yearly", timescale);
return request.render(.ok); return request.render(.ok);
} }

9
src/app/views/songs/get.zmpl
View file

@ -5,7 +5,6 @@
<html> <html>
<head> <head>
<script src="https://cdn.jsdelivr.net/npm/htmx.org@2.0.5/dist/htmx.min.js" integrity="sha384-t4DxZSyQK+0Uv4jzy5B0QyHyWQD2GFURUmxKMBVww9+e2EJ0ei/vCvv7+79z0fkr" crossorigin="anonymous"></script>
<meta charset="UTF-8"> <meta charset="UTF-8">
</head> </head>
<body> <body>
@ -25,13 +24,9 @@
</div> </div>
<div style="display:flex;flex-direction:column;align-self:right"> <div style="display:flex;flex-direction:column;align-self:right">
<h2>Rating</h2> <h2>Rating</h2>
<form> <input type="text">
<input type="number" name="score" id="score" style="width:50px;height:30px"> <input type="button">
<textarea name="review" id="review" style="width:350px;height:100px"></textarea>
<button hx-post="/ratings/songs" hx-vals='{"song_id":"{{.song.song_id}}"}' hx-target="#review-container" style="width:50px;height:30px">Post</button>
</form>
</div> </div>
<div id="review-container">No reviews</div>
</div> </div>
</body> </body>
</html> </html>