LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-02-18 04:20:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adapt generator to new subpackage path

Browse Source
This commit is contained in:
Lonami Exo 2021-09-12 12:35:48 +02:00
parent d48649602b
commit 28956496fc
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@ -56,7 +56,7 @@ FRIENDLY_IN = GENERATOR_DIR / 'data/friendly.csv'
TLOBJECT_IN_TLS = [Path(x) for x in GENERATOR_DIR.glob('data/*.tl')] TLOBJECT_IN_TLS = [Path(x) for x in GENERATOR_DIR.glob('data/*.tl')]
TLOBJECT_OUT = LIBRARY_DIR / '_tl' TLOBJECT_OUT = LIBRARY_DIR / '_tl'
IMPORT_DEPTH = 2 TLOBJECT_MOD = 'telethon._tl'
DOCS_IN_RES = GENERATOR_DIR / 'data/html' DOCS_IN_RES = GENERATOR_DIR / 'data/html'
DOCS_OUT = Path('docs') DOCS_OUT = Path('docs')
@ -94,7 +94,7 @@ def generate(which, action='gen'):
if clean: if clean:
clean_tlobjects(TLOBJECT_OUT) clean_tlobjects(TLOBJECT_OUT)
else: else:
generate_tlobjects(tlobjects, layer, IMPORT_DEPTH, TLOBJECT_OUT) generate_tlobjects(tlobjects, layer, TLOBJECT_MOD, TLOBJECT_OUT)
if 'errors' in which: if 'errors' in which:
which.remove('errors') which.remove('errors')

25
telethon_generator/generators/tlobject.py
View File

@ -52,7 +52,7 @@ BASE_TYPES = ('string', 'bytes', 'int', 'long', 'int128',
def _write_modules( def _write_modules(
out_dir, depth, kind, namespace_tlobjects, type_constructors): out_dir, in_mod, kind, namespace_tlobjects, type_constructors):
# namespace_tlobjects: {'namespace', [TLObject]} # namespace_tlobjects: {'namespace', [TLObject]}
out_dir.mkdir(parents=True, exist_ok=True) out_dir.mkdir(parents=True, exist_ok=True)
for ns, tlobjects in namespace_tlobjects.items(): for ns, tlobjects in namespace_tlobjects.items():
@ -60,10 +60,11 @@ def _write_modules(
with file.open('w') as f, SourceBuilder(f) as builder: with file.open('w') as f, SourceBuilder(f) as builder:
builder.writeln(AUTO_GEN_NOTICE) builder.writeln(AUTO_GEN_NOTICE)
builder.writeln('from {}.tl.tlobject import TLObject', '.' * depth) if kind == 'TLObject':
if kind != 'TLObject': builder.writeln('from .tlobject import TLObject, TLRequest')
builder.writeln( builder.writeln('from . import fn')
'from {}.tl.tlobject import {}', '.' * depth, kind) else:
builder.writeln('from .. import TLObject, TLRequest')
builder.writeln('from typing import Optional, List, ' builder.writeln('from typing import Optional, List, '
'Union, TYPE_CHECKING') 'Union, TYPE_CHECKING')
@ -124,7 +125,11 @@ def _write_modules(
if not name or name in primitives: if not name or name in primitives:
continue continue
import_space = '{}.tl.types'.format('.' * depth) if kind == 'TLObject':
import_space = '.'
else:
import_space = '..'
if '.' in name: if '.' in name:
namespace = name.split('.')[0] namespace = name.split('.')[0]
name = name.split('.')[1] name = name.split('.')[1]
@ -681,7 +686,7 @@ def _write_all_tlobjects(tlobjects, layer, builder):
builder.writeln('}') builder.writeln('}')
def generate_tlobjects(tlobjects, layer, import_depth, output_dir): def generate_tlobjects(tlobjects, layer, input_mod, output_dir):
# Group everything by {namespace: [tlobjects]} to generate __init__.py # Group everything by {namespace: [tlobjects]} to generate __init__.py
namespace_functions = defaultdict(list) namespace_functions = defaultdict(list)
namespace_types = defaultdict(list) namespace_types = defaultdict(list)
@ -695,10 +700,10 @@ def generate_tlobjects(tlobjects, layer, import_depth, output_dir):
namespace_types[tlobject.namespace].append(tlobject) namespace_types[tlobject.namespace].append(tlobject)
type_constructors[tlobject.result].append(tlobject) type_constructors[tlobject.result].append(tlobject)
_write_modules(output_dir / 'fn', import_depth, 'TLRequest', _write_modules(output_dir, input_mod, 'TLObject',
namespace_functions, type_constructors)
_write_modules(output_dir, import_depth - 1, 'TLObject',
namespace_types, type_constructors) namespace_types, type_constructors)
_write_modules(output_dir / 'fn', input_mod + '.fn', 'TLRequest',
namespace_functions, type_constructors)
filename = output_dir / 'alltlobjects.py' filename = output_dir / 'alltlobjects.py'
with filename.open('w') as file: with filename.open('w') as file: