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

Compare commits

base: mitteneer:2d7d2835fd7f4d026fea9863b39d6b60150c89c8
Branches Tags
mitteneer:main
mitteneer:rawsql
mitteneer:hijack-jsonParse
..
compare: mitteneer:36873053bca53dc5d39f3d0578701805c966f4a9
Branches Tags
mitteneer:rawsql
mitteneer:hijack-jsonParse
mitteneer:main

No commits in common. "2d7d2835fd7f4d026fea9863b39d6b60150c89c8" and "36873053bca53dc5d39f3d0578701805c966f4a9" have entirely different histories.
2d7d2835fd ... 36873053bc

2 changed files with 7 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,9 @@ const std = @import("std");
const jetzig = @import("jetzig");
const jetquery = @import("jetzig").jetquery;
const TableRow = @import("../../types.zig").TableRow;
//const dateFmt = @import("../../date_fmt.zig").dateFmt;
//const ordinalFmt = @import("../../ordinal_fmt.zig").ordinalFmt;
const dateFmt = @import("../../date_fmt.zig").dateFmt;
const ordinalFmt = @import("../../ordinal_fmt.zig").ordinalFmt;
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);
@ -17,45 +16,21 @@ 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 artist = try jetzig.database.Query(.Artist).find(rdr_id).execute(request.repo);
if (artist == null) break :blk error.InvalidCharacter;
var name = std.ArrayList(u8).init(request.allocator);
try name.appendSlice("http://127.0.0.1:8080/artists/");
try name.appendSlice(artist.?.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 artists = try jetzig.database.Query(.Artist).where(.{ .name = rn }).all(request.repo);
if (artists.len == 0) return request.fail(.not_found);
if (artists.len > 1) return request.redirect("http://127.0.0.1:8080", .found);
break :blk artists[0].id;
},
else => unreachable,
};
var root = try request.data(.object);
const artist = try queries.entityQueryResult(request, queries.loadQuery(.artist, .entity_info), .{id_int});
const artist = try queries.entityQueryResult(request, queries.loadQuery(.artist, .entity_info), .{id});
try root.put("artist", artist);
const albums = try queries.entityQueryResult(request, queries.loadQuery(.artist, .get_albums), .{id_int});
const albums = try queries.entityQueryResult(request, queries.loadQuery(.artist, .get_albums), .{id});
try root.put("albums", albums);
const appears = try queries.entityQueryResult(request, queries.loadQuery(.artist, .appears), .{id_int});
const appears = try queries.entityQueryResult(request, queries.loadQuery(.artist, .appears), .{id});
try root.put("appears", appears);
const firstlast = try queries.entityQueryResult(request, queries.loadQuery(.artist, .firstlast), .{id_int});
const firstlast = try queries.entityQueryResult(request, queries.loadQuery(.artist, .firstlast), .{id});
try root.put("firstlast", firstlast);
const timescale = try queries.entityQueryResult(request, queries.loadQuery(.artist, .timescale), .{id_int});
const timescale = try queries.entityQueryResult(request, queries.loadQuery(.artist, .timescale), .{id});
try root.put("yearly", timescale);
return request.render(.ok);

17
src/date_fmt.zig
View file

@ -33,20 +33,3 @@ pub fn scrobbleToRow(allocator: std.mem.Allocator, scrobble: Data.Scrobble) !Dat
.date = try dateFmt(allocator, scrobble.date),
};
}
pub fn urlDecode(allocator: std.mem.Allocator, str: []const u8) ![]const u8 {
var decoded = std.ArrayList(u8).init(allocator);
var i: usize = 0;
while (i < str.len) : (i += 1) {
const v = str[i];
if (v == '%') {
if (i + 2 < str.len) {
const hex = str[i + 1 .. i + 3];
const char = try std.fmt.parseInt(u8, hex, 16);
try decoded.append(char);
i += 2;
} else return error.InvalidInput;
} else try decoded.append(v);
}
return decoded.toOwnedSlice();
}