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

Fix album artist parsing in process_scrobbles

Browse source
This commit is contained in:
mitteneer 2025-04-27 14:28:39 -04:00
parent 9df8f9ea12
commit 5e58e81ca7
2 changed files with 60 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/app/jobs/process_rule.zig
View file

@ -4,9 +4,6 @@ const Data = @import("../../types.zig");
pub fn run(allocator: std.mem.Allocator, params: *jetzig.data.Value, env: jetzig.jobs.JobEnv) !void { pub fn run(allocator: std.mem.Allocator, params: *jetzig.data.Value, env: jetzig.jobs.JobEnv) !void {
_ = env; _ = env;
//_ = params;
std.log.debug("{s}", .{try params.toJson()});
const rule = try std.json.parseFromSliceLeaky(Data.Rule, allocator, try params.toJson(), .{ .ignore_unknown_fields = true }); const rule = try std.json.parseFromSliceLeaky(Data.Rule, allocator, try params.toJson(), .{ .ignore_unknown_fields = true });

187
src/app/jobs/process_scrobbles.zig
View file

@ -18,179 +18,110 @@ pub fn run(allocator: std.mem.Allocator, params: *jetzig.data.Value, env: jetzig
//_ = env; //_ = env;
if (params.getT(.array, "scrobbles")) |scrobbles| { if (params.getT(.array, "scrobbles")) |scrobbles| {
for (scrobbles.items()) |item| { for (scrobbles.items()) |item| {
var track_artists_al = std.ArrayList([]const u8).init(allocator); const track_artist_count = item.getT(.array, "artists_track").?.count();
var album_artists_al = std.ArrayList([]const u8).init(allocator); const album_artist_count = item.getT(.array, "artists_album").?.count();
var track_artist_name_buffer = try allocator.alloc([]const u8, track_artist_count);
var album_artist_name_buffer = try allocator.alloc([]const u8, album_artist_count);
var track_artist_id_buffer = try allocator.alloc(i32, track_artist_count);
var album_artist_id_buffer = try allocator.alloc(i32, album_artist_count);
for (item.getT(.array, "artists_track").?.items()) |artist| { for (item.getT(.array, "artists_track").?.items(), 0..track_artist_count) |artist, i| {
try track_artists_al.append(try artist.coerce([]const u8)); const artist_name = try artist.coerce([]const u8);
track_artist_name_buffer[i] = artist_name;
track_artist_id_buffer[i] = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(artist_name)));
} }
for (item.getT(.array, "artists_album").?.items()) |artist| { for (item.getT(.array, "artists_album").?.items(), 0..album_artist_count) |artist, i| {
try album_artists_al.append(try artist.coerce([]const u8)); const artist_name = try artist.coerce([]const u8);
album_artist_name_buffer[i] = artist_name;
album_artist_id_buffer[i] = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(artist_name)));
} }
const scrobble: Data.Scrobble = .{ const scrobble: Data.Scrobble = .{
.track = item.getT(.string, "track").?, .track = item.getT(.string, "track").?,
.artists_track = track_artists_al.items, .artists_track = track_artist_name_buffer,
.album = item.getT(.string, "album") orelse "", .album = item.getT(.string, "album") orelse "",
.artists_album = album_artists_al.items, .artists_album = album_artist_name_buffer,
.date = @as(u64, @bitCast(@as(i64, @truncate(item.getT(.integer, "date").? * 1000)))), .date = @as(u64, @bitCast(@as(i64, @truncate(item.getT(.integer, "date").? * 1000)))),
}; };
// Probably want to include artist name here, but not sure how to yet
var id_prehash = std.ArrayList(u8).init(allocator); var id_prehash = std.ArrayList(u8).init(allocator);
var alartist = std.ArrayList(struct { name: []const u8, id: i32 }).init(allocator);
for (scrobble.artists_track) |artist| {
try alartist.append(.{ .name = artist, .id = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(artist))) });
}
//const artist_id = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(id_prehash.items)));
try id_prehash.appendSlice(scrobble.album); try id_prehash.appendSlice(scrobble.album);
const album_id = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(id_prehash.items))); const album_id = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(id_prehash.items)));
try id_prehash.appendSlice(scrobble.track); try id_prehash.appendSlice(scrobble.track);
const song_id = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(id_prehash.items))); const song_id = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(id_prehash.items)));
// Make IDs
// Song: Song hash XOR artist hash XOR album hash
// This way, if two songs share a name, then
// the IDs also depend on the hash of the album
// they're on, as well as the artist name. As far
// as I can tell, this is only as issue for Sufjan
// Steven's `Songs for Christmas`. (In practice.
// In reality, there are albums with several untitled
// songs (Selected Ambient Works Vol. II by Aphex Twin,
// ( ) by Sigur Ros, ...) that have working titles
// in their place.)
// Album: If the album is not self-titled, then
// album hash XOR artist hash. This way, if two
// artists have an album of the same name, then
// the IDs also depend on the hash of the artist
// name. As far as I can tell, this is only an
// issue for Weezer and Peter Gabriel, but their
// albums go by unique names anyways.
// Artist: Artist hash. If two artists have the same name,
// then a disambiguating string can be provided to
// differentiate after the fact, or in a rule.
//var album_id: i32 = @as(i32, @bitCast(std.hash.Fnv1a_32.hash(formed)));
//const song_id = (song_hash ^ artist_hash ^ album_hash);
var albumsong = try jetzig.database.Query(.Albumsong) var albumsong = try jetzig.database.Query(.Albumsong)
.findBy(.{ .findBy(.{ .album_id = album_id, .song_id = song_id })
.album_id = album_id, .select(.{.id}).execute(env.repo);
.song_id = song_id,
})
.select(.{.id})
.execute(env.repo);
var ins_album = try jetzig.database.Query(.Album) var ins_album = try jetzig.database.Query(.Album)
.find(album_id) .find(album_id)
.select(.{.id}) .select(.{.id}).execute(env.repo);
.execute(env.repo);
for (alartist.items) |artist| { for (track_artist_name_buffer, track_artist_id_buffer) |artist_name, artist_id| {
var ins_artist = try jetzig.database.Query(.Artist) var ins_artist = try jetzig.database.Query(.Artist)
.find(artist.id) .find(artist_id)
.select(.{.id}) .select(.{.id}).execute(env.repo);
.execute(env.repo);
if (ins_artist == null) ins_artist = try jetzig.database.Query(.Artist) if (ins_artist == null)
.insert(.{ ins_artist = try jetzig.database.Query(.Artist)
.id = artist.id, .insert(.{ .id = artist_id, .name = artist_name, .disambiguation = null })
.name = artist.name, .returning(.{.id}).execute(env.repo);
.disambiguation = null,
})
.returning(.{.id})
.execute(env.repo);
if (albumsong == null) { if (albumsong == null) {
var ins_song = try jetzig.database.Query(.Song) var ins_song = try jetzig.database.Query(.Song)
.find(song_id) .find(song_id)
.select(.{.id}) .select(.{.id}).execute(env.repo);
.execute(env.repo);
if (ins_song == null) ins_song = try jetzig.database.Query(.Song) if (ins_song == null)
.insert(.{ ins_song = try jetzig.database.Query(.Song)
.id = song_id, .insert(.{ .id = song_id, .name = scrobble.track, .length = null, .hidden = false })
.name = scrobble.track, .returning(.{.id}).execute(env.repo);
.length = null,
.hidden = false,
})
.returning(.{.id})
.execute(env.repo);
if (ins_album == null) { if (ins_album == null)
ins_album = try jetzig.database.Query(.Album) ins_album = try jetzig.database.Query(.Album)
.insert(.{ .insert(.{ .id = album_id, .name = scrobble.album, .length = null })
.id = album_id, .returning(.{.id}).execute(env.repo);
.name = scrobble.album,
.length = null,
})
.returning(.{.id})
.execute(env.repo);
// I think there's still technically a bug here when you have a different artist but I'm not sure
try jetzig.database.Query(.Artistalbum)
.insert(.{
.artist_id = ins_artist.?.id,
.album_id = ins_album.?.id,
})
.execute(env.repo);
}
albumsong = try jetzig.database.Query(.Albumsong) albumsong = try jetzig.database.Query(.Albumsong)
.insert(.{ .insert(.{ .song_id = ins_song.?.id, .album_id = ins_album.?.id })
.song_id = ins_song.?.id, .returning(.{.id}).execute(env.repo);
.album_id = ins_album.?.id,
})
.returning(.{.id})
.execute(env.repo);
try jetzig.database.Query(.Albumsongsartist) try jetzig.database.Query(.Albumsongsartist)
.insert(.{ .insert(.{ .albumsong_id = albumsong.?.id, .artist_id = ins_artist.?.id }).execute(env.repo);
.albumsong_id = albumsong.?.id,
.artist_id = ins_artist.?.id,
})
.execute(env.repo);
} else { } else {
const ins_albumsongartist = try jetzig.database.Query(.Albumsongsartist) const ins_albumsongartist = try jetzig.database.Query(.Albumsongsartist)
.findBy(.{ .findBy(.{ .albumsong_id = albumsong.?.id, .artist_id = ins_artist.?.id })
.albumsong_id = albumsong.?.id, .select(.{.id}).execute(env.repo);
.artist_id = ins_artist.?.id,
})
.select(.{.id})
.execute(env.repo);
if (ins_albumsongartist == null) try jetzig.database.Query(.Albumsongsartist)
.insert(.{
.albumsong_id = albumsong.?.id,
.artist_id = ins_artist.?.id,
})
.execute(env.repo);
if (ins_albumsongartist == null)
try jetzig.database.Query(.Albumsongsartist)
.insert(.{ .albumsong_id = albumsong.?.id, .artist_id = ins_artist.?.id }).execute(env.repo);
}
}
for (album_artist_name_buffer, album_artist_id_buffer) |artist_name, artist_id| {
const ins_artistalbum = try jetzig.database.Query(.Artistalbum) const ins_artistalbum = try jetzig.database.Query(.Artistalbum)
.findBy(.{ .findBy(.{ .album_id = ins_album.?.id, .artist_id = artist_id })
.album_id = ins_album.?.id, .select(.{.id}).execute(env.repo);
.artist_id = ins_artist.?.id,
})
.select(.{.id})
.execute(env.repo);
if (ins_artistalbum == null) try jetzig.database.Query(.Artistalbum) if (ins_artistalbum == null) {
.insert(.{ var ins_artist = try jetzig.database.Query(.Artist)
.album_id = ins_album.?.id, .find(artist_id)
.artist_id = ins_artist.?.id, .select(.{.id}).execute(env.repo);
}) if (ins_artist == null)
.execute(env.repo); ins_artist = try jetzig.database.Query(.Artist)
.insert(.{ .id = artist_id, .name = artist_name, .disambiguation = null })
.returning(.{.id}).execute(env.repo);
try jetzig.database.Query(.Artistalbum)
.insert(.{ .album_id = ins_album.?.id, .artist_id = ins_artist.?.id }).execute(env.repo);
} }
} }
try jetzig.database.Query(.Scrobble) try jetzig.database.Query(.Scrobble)
.insert(.{ .insert(.{ .albumsong = albumsong.?.id, .datetime = scrobble.date }).execute(env.repo);
.albumsong = albumsong.?.id,
.datetime = scrobble.date,
})
.execute(env.repo);
} }
} }
} }