From 8c94bcf6caf0ae88b3a67d0a73389a7e60810e1c Mon Sep 17 00:00:00 2001 From: jesopo Date: Sat, 23 Feb 2019 21:33:04 +0000 Subject: Move utils.irc.IRCParsedLine to IRCLine.ParsedLine, improve truncation mechanism, don't convert sent line from ParsedLine to text to ParsedLine for line_handler handling --- src/IRCSocket.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/IRCSocket.py') diff --git a/src/IRCSocket.py b/src/IRCSocket.py index af1c3a5e..9ba677f4 100644 --- a/src/IRCSocket.py +++ b/src/IRCSocket.py @@ -120,15 +120,14 @@ class Socket(IRCObject.Object): def send(self, line: IRCLine.Line): self._queued_lines.append(line) - def _send(self) -> typing.List[str]: - decoded_sent = [] + def _send(self) -> typing.List[IRCLine.ParsedLine]: + sent_lines = [] throttle_space = self.throttle_space() if throttle_space: to_buffer = self._queued_lines[:throttle_space] self._queued_lines = self._queued_lines[throttle_space:] for line in to_buffer: - decoded_data = line.decoded_data() - decoded_sent.append(decoded_data) + sent_lines.append(line.parsed_line) self._write_buffer += line.data() self._buffered_lines.append(line) @@ -147,7 +146,7 @@ class Socket(IRCObject.Object): self._recent_sends.append(now) self.last_send = now - return decoded_sent + return sent_lines def waiting_send(self) -> bool: return bool(len(self._write_buffer)) or bool(len(self._queued_lines)) -- cgit v1.3.1-10-gc9f91