KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Test for loading image data from file

Browse Source
This commit is contained in:
Kovid Goyal 2017-09-28 14:18:54 +05:30
parent 13c4c605b3
commit dfca991173
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kitty/graphics.c
View File

@ -312,6 +312,7 @@ handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_
}
}
int fd;
static char fname[2056] = {0};
switch(tt) {
case 'd': // direct
if (g->payload_sz >= img->load_data.buf_capacity - img->load_data.buf_used) {
@ -324,15 +325,17 @@ handle_add_command(GraphicsManager *self, const GraphicsCommand *g, const uint8_
case 'f': // file
case 't': // temporary file
case 's': // POSIX shared memory
if (tt == 's') fd = shm_open((const char*)payload, O_RDONLY, 0);
else fd = open((const char*)payload, O_CLOEXEC | O_RDONLY);
if (g->payload_sz > 2048) ABRT(EINVAL, "Filename too long");
snprintf(fname, sizeof(fname)/sizeof(fname[0]), "%.*s", (int)g->payload_sz, payload);
if (tt == 's') fd = shm_open(fname, O_RDONLY, 0);
else fd = open(fname, O_CLOEXEC | O_RDONLY);
if (fd == -1) {
ABRT(EBADF, "Failed to open file for graphics transmission with error: [%d] %s", errno, strerror(errno));
ABRT(EBADF, "Failed to open file %s for graphics transmission with error: [%d] %s", fname, errno, strerror(errno));
}
img->load_data.fd = fd;
img->data_loaded = mmap_img_file(self, img);
if (tt == 't') unlink((const char*)payload);
else if (tt == 's') shm_unlink((const char*)payload);
if (tt == 't') unlink(fname);
else if (tt == 's') shm_unlink(fname);
break;
default:
ABRT(EINVAL, "Unknown transmission type: %c", g->transmission_type);

17
kitty_tests/graphics.py
View File

@ -3,6 +3,7 @@
# License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
import os
import tempfile
import zlib
from base64 import standard_b64encode
@ -45,14 +46,14 @@ class TestGraphics(BaseTest):
return res.decode('ascii').partition(';')[2].partition(':')[0].partition('\033')[0]
def sl(payload, **kw):
pc = kw.pop('payload_check', None)
if isinstance(payload, str):
payload = payload.encode('utf-8')
data = kw.pop('expecting_data', payload)
cid = kw.setdefault('i', 1)
self.ae('OK', l(payload, **kw))
img = g.image_for_client_id(cid)
self.ae(img['client_id'], cid)
self.ae(img['data'], payload if pc is None else pc)
self.ae(img['data'], data)
if 's' in kw:
self.ae((kw['s'], kw['v']), (img['width'], img['height']))
self.ae(img['is_4byte_aligned'], kw.get('f') != 24)
@ -74,4 +75,14 @@ class TestGraphics(BaseTest):
# Test compression
random_data = os.urandom(3 * 1024)
sl(zlib.compress(random_data), s=24, v=32, o='z', payload_check=random_data)
compressed_random_data = zlib.compress(random_data)
sl(compressed_random_data, s=24, v=32, o='z', expecting_data=random_data)
# Test loading from file
f = tempfile.NamedTemporaryFile()
f.write(random_data), f.flush()
sl(f.name, s=24, v=32, t='f', expecting_data=random_data)
self.assertTrue(os.path.exists(f.name))
f.seek(0), f.truncate(), f.write(compressed_random_data), f.flush()
sl(f.name, s=24, v=32, t='t', o='z', expecting_data=random_data)
self.assertRaises(FileNotFoundError, f.close) # check that file was deleted