From ae85f94ddb80c17dbe998ca2a6f46500d726422e Mon Sep 17 00:00:00 2001 From: mitteneer Date: Mon, 28 Apr 2025 23:01:34 -0400 Subject: [PATCH] Switch dates from u64 to i64 PostgreSQL only uses signed ints, so this makes things much easier --- src/app/jobs/process_scrobbles.zig | 2 +- src/app/views/upload.zig | 2 +- src/types.zig | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/jobs/process_scrobbles.zig b/src/app/jobs/process_scrobbles.zig index 8a9dadc..c6b25b1 100644 --- a/src/app/jobs/process_scrobbles.zig +++ b/src/app/jobs/process_scrobbles.zig @@ -33,7 +33,7 @@ pub fn run(allocator: std.mem.Allocator, params: *jetzig.data.Value, env: jetzig .artists_track = track_artist_name_buffer, .album = item.getT(.string, "album") orelse "", .artists_album = album_artist_name_buffer, - .date = @as(u64, @bitCast(@as(i64, @truncate(item.getT(.integer, "date").?)))), + .date = @as(i64, @truncate(item.getT(.integer, "date").?)), }; var id_prehash = std.ArrayList(u8).init(allocator); diff --git a/src/app/views/upload.zig b/src/app/views/upload.zig index 1e69e94..59442a8 100644 --- a/src/app/views/upload.zig +++ b/src/app/views/upload.zig @@ -111,7 +111,7 @@ pub fn post(request: *jetzig.Request) !jetzig.View { .track = scrobble.master_metadata_track_name.?, .album = scrobble.master_metadata_album_album_name.?, .artist = scrobble.master_metadata_album_artist_name.?, - .date = @as(u64, @bitCast((try zeit.instant(.{ .source = .{ .iso8601 = scrobble.ts } })).unixTimestamp() * 1000)), + .date = (try zeit.instant(.{ .source = .{ .iso8601 = scrobble.ts } })).unixTimestamp() * 1000, }; const formatted_scrobble = if (rule_list) |rl| diff --git a/src/types.zig b/src/types.zig index 09d87c7..704adc0 100644 --- a/src/types.zig +++ b/src/types.zig @@ -2,7 +2,7 @@ pub const ImportedScrobble = struct { track: []const u8, artist: []const u8, album: []const u8 = "", - date: u64, + date: i64, }; pub const Scrobble = struct { @@ -10,7 +10,7 @@ pub const Scrobble = struct { artists_track: []const []const u8, album: []const u8 = "", artists_album: []const []const u8, - date: u64, + date: i64, }; // From lastfmstats.com