Skip to content

Commit 2cbd1dd

Browse files
committed
buffer: New .len() method; fix redirect_messages()
1 parent 3f9a506 commit 2cbd1dd

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

buffer.pxd

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,18 @@ cdef class ReadBuffer:
9191
ssize_t _current_message_len_unread
9292
bint _current_message_ready
9393

94+
cdef inline len(self):
95+
return self._length
96+
97+
cdef inline char get_message_type(self):
98+
return self._current_message_type
99+
100+
cdef inline int32_t get_message_length(self):
101+
return self._current_message_len
102+
103+
cdef inline read_utf8(self):
104+
return self.read_cstr().decode('utf-8')
105+
94106
cdef feed_data(self, data)
95107
cdef inline _ensure_first_buf(self)
96108
cdef _switch_to_next_buf(self)
@@ -113,11 +125,5 @@ cdef class ReadBuffer:
113125
cdef finish_message(self)
114126
cdef inline _finish_message(self)
115127

116-
cdef inline char get_message_type(self):
117-
return self._current_message_type
118-
119-
cdef inline int32_t get_message_length(self):
120-
return self._current_message_len
121-
122128
@staticmethod
123129
cdef ReadBuffer new_message_parser(object data)

buffer.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ cdef class ReadBuffer:
590590
else:
591591
buf.write_bytes(self.consume_message())
592592

593-
if not self.has_message() or self._current_message_type != mtype:
593+
if not self.take_message_type(mtype):
594594
break
595595

596596
return buf

0 commit comments

Comments
 (0)