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

only validate non-resolvable added variables

Browse source
This commit is contained in:
Jesse Bannon 2023-12-08 13:27:35 -08:00
parent a0ccefbb03
commit 9d4398ed7a
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -280,15 +280,9 @@ class Script:
------- -------
Dict of resolved values Dict of resolved values
""" """
# include all current variables that are resolvable
resolved: Dict[Variable, Resolvable] = { resolved: Dict[Variable, Resolvable] = {
Variable(name): ast.maybe_resolvable Variable(name): value for name, value in (pre_resolved or {}).items()
for name, ast in self._variables.items()
if ast.maybe_resolvable is not None
} }
mergedeep.merge(
resolved, {Variable(name): value for name, value in (pre_resolved or {}).items()}
)
unresolvable: Set[Variable] = {Variable(name) for name in (unresolvable or {})} unresolvable: Set[Variable] = {Variable(name) for name in (unresolvable or {})}
unresolved_filter = set(resolved.keys()).union(unresolvable) unresolved_filter = set(resolved.keys()).union(unresolvable)
@ -304,9 +298,14 @@ class Script:
for variable in list(unresolved.keys()): for variable in list(unresolved.keys()):
definition = unresolved[variable] definition = unresolved[variable]
# If the definition is already a resolvable, mark it as such
if resolvable := definition.maybe_resolvable:
resolved[variable] = resolvable
del unresolved[variable]
# If the variable's variable dependencies contain an unresolvable variable, # If the variable's variable dependencies contain an unresolvable variable,
# declare it as unresolvable and continue # declare it as unresolvable and continue
if definition.contains(unresolvable): elif definition.contains(unresolvable):
unresolvable.add(variable) unresolvable.add(variable)
del unresolved[variable] del unresolved[variable]
@ -356,7 +355,7 @@ class Script:
) )
def add(self, variables: Dict[str, str]) -> "Script": def add(self, variables: Dict[str, str]) -> "Script":
all_resolvable: bool = True added_variables_to_validate: Set[str] = set()
for variable_name, variable_definition in variables.items(): for variable_name, variable_definition in variables.items():
self._variables[variable_name] = parse( self._variables[variable_name] = parse(
text=variable_definition, text=variable_definition,
@ -364,10 +363,12 @@ class Script:
custom_function_names=set(self._functions.keys()), custom_function_names=set(self._functions.keys()),
variable_names=set(self._variables.keys()).union(variables.keys()), variable_names=set(self._variables.keys()).union(variables.keys()),
) )
all_resolvable &= self._variables[variable_name].maybe_resolvable is not None
if not all_resolvable: if self._variables[variable_name].maybe_resolvable is None:
self._validate(added_variables=set(list(variables.keys()))) added_variables_to_validate.add(variable_name)
if added_variables_to_validate:
self._validate(added_variables=added_variables_to_validate)
return self return self

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

@ -153,8 +153,8 @@ class TestPrebuiltTVShowPresets:
is_youtube_channel: bool, is_youtube_channel: bool,
is_many_urls: bool, is_many_urls: bool,
): ):
# yappi.set_clock_type("wall") # Use set_clock_type("wall") for wall time yappi.set_clock_type("wall") # Use set_clock_type("wall") for wall time
# yappi.start() yappi.start()
expected_summary_name = "unit/{}/{}/is_yt_{}{}".format( expected_summary_name = "unit/{}/{}/is_yt_{}{}".format(
media_player_preset, media_player_preset,
@ -225,7 +225,7 @@ class TestPrebuiltTVShowPresets:
) )
reformatted_transaction_log = reformatted_subscription.update_with_info_json(dry_run=False) reformatted_transaction_log = reformatted_subscription.update_with_info_json(dry_run=False)
# yappi.get_func_stats().print_all() yappi.get_func_stats().print_all()
assert_transaction_log_matches( assert_transaction_log_matches(
output_directory=output_directory, output_directory=output_directory,