diff options
Diffstat (limited to 'src/IRCSocket.py')
| -rw-r--r-- | src/IRCSocket.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/IRCSocket.py b/src/IRCSocket.py index 3b3395e8..886cfe4a 100644 --- a/src/IRCSocket.py +++ b/src/IRCSocket.py @@ -129,7 +129,7 @@ class Socket(IRCObject.Object): else: self._queued_lines.append(line) - def _send(self) -> typing.List[IRCLine.SentLine]: + def _fill_throttle(self): if not self._write_buffer and self._throttle_when_empty: self._throttle_when_empty = False self._write_throttling = True @@ -142,15 +142,14 @@ class Socket(IRCObject.Object): for line in to_buffer: self._immediate_buffer(line) + def _send(self) -> typing.List[IRCLine.SentLine]: bytes_written_i = self._socket.send(self._write_buffer) bytes_written = self._write_buffer[:bytes_written_i] sent_lines_count = bytes_written.count(b"\r\n") sent_lines = [] # type: typing.List[IRCLine.SentLine] for i in range(sent_lines_count): - sent_line = self._buffered_lines.pop(0) - sent_line.events.on("send").call() - sent_lines.append(sent_line) + sent_lines.append(self._buffered_lines.pop(0)) self._write_buffer = self._write_buffer[bytes_written_i:] @@ -165,8 +164,8 @@ class Socket(IRCObject.Object): def clear_send_buffer(self): self._queued_lines.clear() - def waiting_send(self) -> bool: - return bool(len(self._write_buffer)) or bool(len(self._queued_lines)) + def waiting_throttled_send(self) -> bool: + return bool(len(self._queued_lines)) def waiting_immediate_send(self) -> bool: return bool(len(self._write_buffer)) |