terminal/kitty_graphics: update tests

Kitty Graphics command structures have been changed to hold decoded payloads not base64 strings.

src/terminal/kitty/graphics_command.zig

@@ -890,7 +890,7 @@ test "query command" {
     var p = CommandParser.init(alloc);
     defer p.deinit();
 
-    const input = "i=31,s=1,v=1,a=q,t=d,f=24;AAAA";
+    const input = "i=31,s=1,v=1,a=q,t=d,f=24;QUFBQQ";
     for (input) |c| try p.feed(c);
     const command = try p.complete();
     defer command.deinit(alloc);

src/terminal/kitty/graphics_image.zig

@@ -427,23 +427,6 @@ pub const Rect = struct {
     bottom_right: PageList.Pin,
 };
 
-/// Easy base64 encoding function.
-fn testB64(alloc: Allocator, data: []const u8) ![]const u8 {
-    const B64Encoder = std.base64.standard.Encoder;
-    const b64 = try alloc.alloc(u8, B64Encoder.calcSize(data.len));
-    errdefer alloc.free(b64);
-    return B64Encoder.encode(b64, data);
-}
-
-/// Easy base64 decoding function.
-fn testB64Decode(alloc: Allocator, data: []const u8) ![]const u8 {
-    const B64Decoder = std.base64.standard.Decoder;
-    const result = try alloc.alloc(u8, try B64Decoder.calcSizeForSlice(data));
-    errdefer alloc.free(result);
-    try B64Decoder.decode(result, data);
-    return result;
-}
-
 // This specifically tests we ALLOW invalid RGB data because Kitty
 // documents that this should work.
 test "image load with invalid RGB data" {
@@ -518,7 +501,7 @@ test "image load: rgb, zlib compressed, direct" {
         } },
         .data = try alloc.dupe(
             u8,
-            @embedFile("testdata/image-rgb-zlib_deflate-128x96-2147483647.data"),
+            @embedFile("testdata/image-rgb-zlib_deflate-128x96-2147483647-raw.data"),
         ),
     };
     defer cmd.deinit(alloc);
@@ -546,7 +529,7 @@ test "image load: rgb, not compressed, direct" {
         } },
         .data = try alloc.dupe(
             u8,
-            @embedFile("testdata/image-rgb-none-20x15-2147483647.data"),
+            @embedFile("testdata/image-rgb-none-20x15-2147483647-raw.data"),
         ),
     };
     defer cmd.deinit(alloc);
@@ -563,7 +546,7 @@ test "image load: rgb, zlib compressed, direct, chunked" {
     const testing = std.testing;
     const alloc = testing.allocator;
 
-    const data = @embedFile("testdata/image-rgb-zlib_deflate-128x96-2147483647.data");
+    const data = @embedFile("testdata/image-rgb-zlib_deflate-128x96-2147483647-raw.data");
 
     // Setup our initial chunk
     var cmd: command.Command = .{
@@ -600,7 +583,7 @@ test "image load: rgb, zlib compressed, direct, chunked with zero initial chunk"
     const testing = std.testing;
     const alloc = testing.allocator;
 
-    const data = @embedFile("testdata/image-rgb-zlib_deflate-128x96-2147483647.data");
+    const data = @embedFile("testdata/image-rgb-zlib_deflate-128x96-2147483647-raw.data");
 
     // Setup our initial chunk
     var cmd: command.Command = .{
@@ -638,11 +621,7 @@ test "image load: rgb, not compressed, temporary file" {
 
     var tmp_dir = try internal_os.TempDir.init();
     defer tmp_dir.deinit();
-    const data = try testB64Decode(
-        alloc,
-        @embedFile("testdata/image-rgb-none-20x15-2147483647.data"),
-    );
-    defer alloc.free(data);
+    const data = @embedFile("testdata/image-rgb-none-20x15-2147483647-raw.data");
     try tmp_dir.dir.writeFile("image.data", data);
 
     var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
@@ -657,7 +636,7 @@ test "image load: rgb, not compressed, temporary file" {
             .height = 15,
             .image_id = 31,
         } },
-        .data = try testB64(alloc, path),
+        .data = try alloc.dupe(u8, path),
     };
     defer cmd.deinit(alloc);
     var loading = try LoadingImage.init(alloc, &cmd);
@@ -676,11 +655,7 @@ test "image load: rgb, not compressed, regular file" {
 
     var tmp_dir = try internal_os.TempDir.init();
     defer tmp_dir.deinit();
-    const data = try testB64Decode(
-        alloc,
-        @embedFile("testdata/image-rgb-none-20x15-2147483647.data"),
-    );
-    defer alloc.free(data);
+    const data = @embedFile("testdata/image-rgb-none-20x15-2147483647-raw.data");
     try tmp_dir.dir.writeFile("image.data", data);
 
     var buf: [std.fs.MAX_PATH_BYTES]u8 = undefined;
@@ -695,7 +670,7 @@ test "image load: rgb, not compressed, regular file" {
             .height = 15,
             .image_id = 31,
         } },
-        .data = try testB64(alloc, path),
+        .data = try alloc.dupe(u8, path),
     };
     defer cmd.deinit(alloc);
     var loading = try LoadingImage.init(alloc, &cmd);
@@ -727,7 +702,7 @@ test "image load: png, not compressed, regular file" {
             .height = 0,
             .image_id = 31,
         } },
-        .data = try testB64(alloc, path),
+        .data = try alloc.dupe(u8, path),
     };
     defer cmd.deinit(alloc);
     var loading = try LoadingImage.init(alloc, &cmd);

src/terminal/kitty/testdata/image-rgb-none-20x15-2147483647.data

@@ -1 +0,0 @@
-DRoeCxgcCxcjEh4qDBgkCxcjChYiCxcjCRclBRMhBxIXHysvTVNRbHJwcXB2Li0zCBYXEyEiCxkaDBobChcbCBUZDxsnBBAcEBwoChYiCxcjDBgkDhwqBxUjDBccm6aqy9HP1NrYzs3UsK+2IjAxCBYXCBYXBxUWFBoaDxUVICYqIyktERcZDxUXDxUVEhgYDhUTCxIQGh8XusC4zM7FvL61q6elmZWTTVtcDBobDRscCxkaKS8vaW9vxMnOur/EiY+RaW5wICYmW2FhfYOBQEZEnqSc4ebeqauilZaOsa2rm5eVcH5/GigpChgZCBYX0NHP3d7c3tzbx8XExsTEvry8wL241dLN0tDF0tDF29nM4d/StbKpzMrAUk5DZmJXeYSGKTU3ER0fDRkb1tfVysvJ0tDPsa+tr6ytop+gmZaRqaahuritw8G2urirqKaZiYZ9paKZZmJXamZbOkZIDhocBxMVBBASxMDBtrKzqqanoZ2ejYeLeHF2eXFvhn58npePta6ml5CKgXp0W1hPaWZdZWdSYmRPFiYADR0AFCQAEyMAt7O0lJCRf3t8eHR1Zl9kY1xhYVpYbGRieXJqeHFpdW1oc2tmcG1kX1xTbW9ajY96jp55kaF8kKB7kaF8sK6rcnFtX11cXFpZW1pWWFdTXVpTXltUaGJgY11bY11da2Vla25dam1ccHtTnqmBorVtp7pypLdvobRsh4aCaGdjWFZVXFpZYWBcZ2ZiaGVeZGFaY11bYlxaV1FRZ2FhdHdmbG9egItjo66GpLdvq752rL93rsF5kpKIZ2ddWFxTW19WbnZdipJ6cnhaaW9RaGhgV1ZPY2Jga2poanFQd35dk6Vpn7B0oLFvorNxm6xqmKlnv760enpwVlpRW19Wc3til5+Hl55/k5p7iIiAcnJqd3Z0bm1rcHdWh45tipxgladrkaJglKVjkaJgkqNh09DJiYZ/YmZdY2deeYZYjJlrj51ijpxhztHClJaIdHNvdHNvanNHi5RpmaxnjKBbmqhrmadqkJ5hi5lcxsO8jImCaGtiYmZdg5Bikp9xjJpfjpxh1djJqq2eamllZ2Zid4BVmKF2kqZhh5tWlaNmlaNmjpxfjJpdw729rqiodnZ0cHBuiplij55nj6FVjJ5SzdC9t7qncW1sXlpZh45iqbCEmKllmapmmqlqnq1unaxtoK9w