Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-25 15:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

General tidy-up in Spheniscidae class

Browse Source
This commit is contained in:
Ben 2019-10-09 01:21:00 +01:00
parent 357c8be83a
commit ca6671aa25
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
houdini/spheniscidae.py
View File

@ -5,6 +5,7 @@ from asyncio import IncompleteReadError, CancelledError
import defusedxml.cElementTree as Et import defusedxml.cElementTree as Et
from xml.etree.cElementTree import Element, SubElement, tostring from xml.etree.cElementTree import Element, SubElement, tostring
from houdini.constants import ClientType
from houdini.handlers import AuthorityError, DummyEventPacket from houdini.handlers import AuthorityError, DummyEventPacket
from houdini.converters import ChecklistError from houdini.converters import ChecklistError
from houdini.cooldown import CooldownError from houdini.cooldown import CooldownError
@ -49,20 +50,15 @@ class Spheniscidae:
await self.send_xt('e', error, *args) await self.send_xt('e', error, *args)
async def send_policy_file(self): async def send_policy_file(self):
await self.send_line('<cross-domain-policy><allow-access-from domain="*" to-ports="{}" /></cross-domain-policy>' await self.send_line(f'<cross-domain-policy><allow-access-from domain="*" to-ports="'
.format(self.server.server_config['Port'])) f'{self.server.server_config["Port"]}" /></cross-domain-policy>')
await self.close() await self.close()
async def send_xt(self, *data): async def send_xt(self, handler_id, *data):
data = list(data)
handler_id = data.pop(0)
internal_id = -1 internal_id = -1
mapped_data = map(str, data) xt_data = '%'.join(str(d) for d in data)
line = f'%xt%{handler_id}%{internal_id}%{xt_data}%'
xt_data = '%'.join(mapped_data)
line = '%xt%{0}%{1}%{2}%'.format(handler_id, internal_id, xt_data)
await self.send_line(line) await self.send_line(line)
async def send_xml(self, xml_dict): async def send_xml(self, xml_dict):
@ -151,7 +147,7 @@ class Spheniscidae:
for listener in dummy_event_listeners: for listener in dummy_event_listeners:
await listener(self) await listener(self)
except ChecklistError: except ChecklistError:
self.logger.debug('{} sent a packet without meeting checklist requirements'.format(self)) self.logger.debug(f'{self} sent a packet without meeting checklist requirements')
async def _client_disconnected(self): async def _client_disconnected(self):
del self.server.peers_by_ip[self.peer_name] del self.server.peers_by_ip[self.peer_name]
@ -164,7 +160,7 @@ class Spheniscidae:
for listener in dummy_event_listeners: for listener in dummy_event_listeners:
await listener(self) await listener(self)
except ChecklistError: except ChecklistError:
self.logger.debug('{} sent a packet without meeting checklist requirements'.format(self)) self.logger.debug(f'{self} sent a packet without meeting checklist requirements')
async def __data_received(self, data): async def __data_received(self, data):
data = data.decode()[:-1] data = data.decode()[:-1]
@ -174,11 +170,11 @@ class Spheniscidae:
else: else:
await self.__handle_xt_data(data) await self.__handle_xt_data(data)
except AuthorityError: except AuthorityError:
self.logger.debug('{} tried to send game packet before authentication'.format(self)) self.logger.debug(f'{self} tried to send game packet before authentication')
except CooldownError: except CooldownError:
self.logger.debug('{} tried to send a packet during a cooldown'.format(self)) self.logger.debug(f'{self} tried to send a packet during a cooldown')
except ChecklistError: except ChecklistError:
self.logger.debug('{} sent a packet without meeting checklist requirements'.format(self)) self.logger.debug(f'{self} sent a packet without meeting checklist requirements')
async def run(self): async def run(self):
await self._client_connected() await self._client_connected()
@ -203,4 +199,4 @@ class Spheniscidae:
await self._client_disconnected() await self._client_disconnected()
def __repr__(self): def __repr__(self):
return '<Spheniscidae {}>'.format(self.peer_name) return f'<Spheniscidae {self.peer_name}>'