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

Ignore undecodeable bytes in pagerhist

Browse Source 
Also add API to get pagerhist as bytes
This commit is contained in:
Kovid Goyal 2020-09-22 09:33:48 +05:30
parent 0d665495b8
commit e4d353b105
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/fast_data_types.pyi
View File

@ -946,6 +946,9 @@ class HistoryBuf:
def pagerhist_as_text(self) -> str: def pagerhist_as_text(self) -> str:
pass pass
def pagerhist_as_bytes(self) -> bytes:
pass
class LineBuf: class LineBuf:

26
kitty/history.c
View File

@ -415,25 +415,34 @@ pagerhist_write(HistoryBuf *self, PyObject *what) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyObject * static PyObject*
pagerhist_as_text(HistoryBuf *self, PyObject *args UNUSED) { pagerhist_as_bytes(HistoryBuf *self, PyObject *args UNUSED) {
PagerHistoryBuf *ph = self->pagerhist; PagerHistoryBuf *ph = self->pagerhist;
if (!ph || !ph->length) return PyUnicode_FromString(""); if (!ph || !ph->length) return PyBytes_FromStringAndSize("", 0);
pagerhist_ensure_start_is_valid_utf8(ph); pagerhist_ensure_start_is_valid_utf8(ph);
if (ph->rewrap_needed) pagerhist_rewrap_to(self, self->xnum); if (ph->rewrap_needed) pagerhist_rewrap_to(self, self->xnum);
Line l = {.xnum=self->xnum}; get_line(self, 0, &l); Line l = {.xnum=self->xnum}; get_line(self, 0, &l);
size_t sz = ph->length; size_t sz = ph->length;
if (!l.continued) sz += 1; if (!l.continued) sz += 1;
uint8_t *buf = PyMem_Malloc(sz); PyObject *ans = PyBytes_FromStringAndSize(NULL, sz);
if (!buf) return PyErr_NoMemory(); if (!ans) return NULL;
uint8_t *buf = (uint8_t*)PyBytes_AS_STRING(ans);
size_t copied = MIN(ph->length, ph->buffer_size - ph->start); size_t copied = MIN(ph->length, ph->buffer_size - ph->start);
if (copied) memcpy(buf, ph->buffer + ph->start, copied); if (copied) memcpy(buf, ph->buffer + ph->start, copied);
if (copied < ph->length) memcpy(buf + copied, ph->buffer, (ph->length - copied)); if (copied < ph->length) memcpy(buf + copied, ph->buffer, (ph->length - copied));
if (!l.continued) buf[sz-1] = '\n'; if (!l.continued) buf[sz-1] = '\n';
PyObject *ans = PyUnicode_FromStringAndSize((const char*)buf, sz); return ans;
PyMem_Free(buf); }
static PyObject *
pagerhist_as_text(HistoryBuf *self, PyObject *args) {
PyObject *ans = NULL;
PyObject *bytes = pagerhist_as_bytes(self, args);
if (bytes) {
ans = PyUnicode_DecodeUTF8(PyBytes_AS_STRING(bytes), PyBytes_GET_SIZE(bytes), "ignore");
Py_DECREF(bytes);
}
return ans; return ans;
} }
@ -491,6 +500,7 @@ static PyMethodDef methods[] = {
METHODB(pagerhist_write, METH_O), METHODB(pagerhist_write, METH_O),
METHODB(pagerhist_rewrap, METH_O), METHODB(pagerhist_rewrap, METH_O),
METHODB(pagerhist_as_text, METH_NOARGS), METHODB(pagerhist_as_text, METH_NOARGS),
METHODB(pagerhist_as_bytes, METH_NOARGS),
METHODB(as_text, METH_VARARGS), METHODB(as_text, METH_VARARGS),
METHOD(dirty_lines, METH_NOARGS) METHOD(dirty_lines, METH_NOARGS)
METHOD(push, METH_VARARGS) METHOD(push, METH_VARARGS)