danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimize

Browse source
This commit is contained in:
Jesse Bannon 2023-12-08 01:22:11 -08:00
parent 69b1157c13
commit fb8c65b653
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/ytdl_sub/script/script.py
View file

@ -77,8 +77,8 @@ class Script:
deps=deps + [dep.name],
)
def _ensure_no_variable_cycles(self):
for variable_name, variable_definition in self._variables.items():
def _ensure_no_variable_cycles(self, variables: Dict[str, SyntaxTree]):
for variable_name, variable_definition in variables.items():
self._traverse_variable_dependencies(
variable_name=variable_name,
variable_dependency=variable_definition,
@ -193,15 +193,24 @@ class Script:
f"receive {lambda_type.num_input_args()}."
)
def _validate(self) -> None:
self._ensure_no_custom_function_cycles()
self._ensure_custom_function_arguments_valid()
self._ensure_no_variable_cycles()
def _validate(self, added_variables: Optional[Set[str]] = None) -> None:
variables = self._variables
if added_variables is not None:
variables = {
name: ast for name, ast in self._variables.items() if name in added_variables
}
for prefix, definitions in (
("Variable ", self._variables),
("Custom function %", self._functions),
):
if added_variables is None:
self._ensure_no_custom_function_cycles()
self._ensure_custom_function_arguments_valid()
self._ensure_no_variable_cycles(variables)
to_validate = [("Variable ", variables)]
if added_variables is None:
to_validate.append(("Custom function %", self._functions))
for prefix, definitions in to_validate:
self._ensure_custom_function_usage_num_input_arguments_valid(
prefix=prefix, definitions=definitions
)
@ -348,11 +357,10 @@ class Script:
custom_function_names=set(self._functions.keys()),
variable_names=set(self._variables.keys()).union(variables.keys()),
)
all_resolvable |= self._variables[variable_name].resolvable is not None
all_resolvable &= self._variables[variable_name].resolvable is not None
if not all_resolvable:
# TODO: is this ever possible?
self._validate()
self._validate(added_variables=set(list(variables.keys())))
return self

6
tests/unit/prebuilt_presets/test_prebuilt_presets.py
View file

@ -153,9 +153,6 @@ class TestPrebuiltTVShowPresets:
is_youtube_channel: bool,
is_many_urls: bool,
):
# yappi.set_clock_type("wall") # Use set_clock_type("wall") for wall time
# yappi.start()
expected_summary_name = "unit/{}/{}/is_yt_{}{}".format(
media_player_preset,
tv_show_structure_preset,
@ -183,6 +180,9 @@ class TestPrebuiltTVShowPresets:
preset_dict=preset_dict,
)
# yappi.set_clock_type("wall") # Use set_clock_type("wall") for wall time
# yappi.start()
with mock_download_collection_entries(
is_youtube_channel=is_youtube_channel, num_urls=2 if is_many_urls else 1
):