RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-07 08:03:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

message code generation tidying

Browse Source
This commit is contained in:
Eric Froemling 2021-09-09 13:01:48 -05:00
parent cdb602b921
commit fdce8ed968
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/efro/message.py
View File

@ -261,39 +261,40 @@ class MessageProtocol:
def _get_module_header(self, part: str) -> str: def _get_module_header(self, part: str) -> str:
"""Return common parts of generated modules.""" """Return common parts of generated modules."""
imports: Dict[str, List[str]] = {} imports: Dict[str, List[str]] = {}
for msgtype in self.message_ids_by_type: for msgtype in list(self.message_ids_by_type) + [Message]:
imports.setdefault(msgtype.__module__, []).append(msgtype.__name__) imports.setdefault(msgtype.__module__, []).append(msgtype.__name__)
importlines = '' for rsp_tp in list(self.response_ids_by_type) + [Response]:
# Skip these as they don't actually show up in code.
if rsp_tp is EmptyResponse or rsp_tp is ErrorResponse:
continue
imports.setdefault(rsp_tp.__module__, []).append(rsp_tp.__name__)
importlines2 = ''
for module, names in sorted(imports.items()): for module, names in sorted(imports.items()):
jnames = ', '.join(names) jnames = ', '.join(names)
line = f'from {module} import {jnames}' line = f'from {module} import {jnames}'
if len(line) > 79: if len(line) > 79:
# Recreate in a wrapping-friendly form. # Recreate in a wrapping-friendly form.
line = f'from {module} import ({jnames})' line = f'from {module} import ({jnames})'
importlines += f'{line}\n' importlines2 += f' {line}\n'
if part == 'sender': if part == 'sender':
importlines = ( importlines1 = 'from efro.message import MessageSender'
f'from efro.message import MessageSender\n{importlines}')
tpimports = 'from efro.message import Message, Response'
else: else:
importlines = ( importlines1 = 'from efro.message import MessageReceiver'
f'from efro.message import MessageReceiver\n{importlines}')
tpimports = 'from efro.message import Message, Response'
out = ('# Released under the MIT License. See LICENSE for details.\n' out = ('# Released under the MIT License. See LICENSE for details.\n'
f'#\n' f'#\n'
f'"""Auto-generated {part} module."""\n' f'"""Auto-generated {part} module. Do not edit by hand."""\n'
f'\n' f'\n'
f'from __future__ import annotations\n' f'from __future__ import annotations\n'
f'\n' f'\n'
f'from typing import TYPE_CHECKING, overload\n' f'from typing import TYPE_CHECKING, overload\n'
f'\n' f'\n'
f'{importlines}' f'{importlines1}\n'
f'\n' f'\n'
f'if TYPE_CHECKING:\n' f'if TYPE_CHECKING:\n'
f' from typing import Union\n' f' from typing import Union, Any, Optional\n'
f' {tpimports}\n' f'{importlines2}'
f'\n' f'\n'
f'\n') f'\n')
return out return out

14
tools/efrotools/code.py
View File

@ -189,11 +189,15 @@ def format_yapf(projroot: Path, full: bool) -> None:
flush=True) flush=True)
def format_yapf_text(projroot: Path, code: str) -> str: def format_yapf_str(projroot: Path, code: str) -> str:
"""Run yapf formatting on the provided code.""" """Run yapf formatting on the provided inline code."""
del projroot # Unused. from efrotools import PYVER
print('WOULD DO YAPF') out = subprocess.run([f'python{PYVER}', '-m', 'yapf'],
return code capture_output=True,
check=True,
input=code.encode(),
cwd=projroot)
return out.stdout.decode()
def _should_include_script(fnamefull: str) -> bool: def _should_include_script(fnamefull: str) -> bool: