DGNum/ircrobots
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

parse tokens in wait_for - waity things expect state change

Browse source
This commit is contained in:
jesopo 2021-05-22 08:43:11 +00:00
parent f22471993a
commit dd41b0dbde
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ircrobots/server.py
View file

@ -65,7 +65,7 @@ class Server(IServer):
self.desired_caps: Set[ICapability] = set([]) self.desired_caps: Set[ICapability] = set([])
self._read_queue: Deque[Line] = deque() self._read_queue: Deque[Line] = deque()
self._process_queue: Deque[Line] = deque() self._process_queue: Deque[Tuple[Line, Optional[Emit]]] = deque()
self._ping_sent = False self._ping_sent = False
self._read_lguard = RLock() self._read_lguard = RLock()
@ -298,7 +298,9 @@ class Server(IServer):
for done in dones: for done in dones:
if isinstance(done.result(), Line): if isinstance(done.result(), Line):
self._ping_sent = False self._ping_sent = False
self._process_queue.append(done.result()) line = done.result()
emit = self.parse_tokens(line)
self._process_queue.append((line, emit))
elif done.result() is None: elif done.result() is None:
if not self._ping_sent: if not self._ping_sent:
await self.send(build("PING", ["hello"])) await self.send(build("PING", ["hello"]))
@ -310,8 +312,7 @@ class Server(IServer):
notdone.cancel() notdone.cancel()
else: else:
line = self._process_queue.popleft() line, emit = self._process_queue.popleft()
emit = self.parse_tokens(line)
await self._on_read(line, emit) await self._on_read(line, emit)
async def wait_for(self, async def wait_for(self,
@ -334,7 +335,8 @@ class Server(IServer):
line = await self._read_line(timeout) line = await self._read_line(timeout)
if line: if line:
self._ping_sent = False self._ping_sent = False
self._process_queue.append(line) emit = self.parse_tokens(line)
self._process_queue.append((line, emit))
if response_obj.match(self, line): if response_obj.match(self, line):
return line return line