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

clean

Browse source
This commit is contained in:
Jesse Bannon 2025-12-30 23:29:57 -08:00
parent 7234c8d116
commit b8d8fa2f7e
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/ytdl_sub/script/types/variable_dependency.py
View file

@ -114,7 +114,6 @@ class VariableDependency(ABC):
output.add(ParsedCustomFunction(name=arg.name, num_input_args=len(arg.args))) output.add(ParsedCustomFunction(name=arg.name, num_input_args=len(arg.args)))
if isinstance(arg, VariableDependency): if isinstance(arg, VariableDependency):
output.update(arg.custom_functions) output.update(arg.custom_functions)
# if isinstance(arg, Lambda)
return output return output
@ -160,6 +159,20 @@ class VariableDependency(ABC):
raise UNREACHABLE raise UNREACHABLE
@final
def _custom_function_dependencies(
self, custom_function_definitions: Dict[str, "VariableDependency"]
) -> Set[ParsedCustomFunction]:
custom_functions = self.custom_functions
for lambda_func in self.lambdas:
if lambda_func.value in custom_function_definitions:
custom_functions.add(
ParsedCustomFunction(
name=lambda_func.value, num_input_args=lambda_func.num_input_args()
)
)
return custom_functions
@final @final
def is_subset_of( def is_subset_of(
self, self,
@ -172,16 +185,7 @@ class VariableDependency(ABC):
True if it contains all input variables as a dependency. False otherwise. True if it contains all input variables as a dependency. False otherwise.
""" """
# If there are lambdas, see if they are custom functions. If so, check them # If there are lambdas, see if they are custom functions. If so, check them
custom_functions_to_check = self.custom_functions for custom_function in self._custom_function_dependencies(custom_function_definitions):
for lambda_func in self.lambdas:
if lambda_func.value in custom_function_definitions:
custom_functions_to_check.add(
ParsedCustomFunction(
name=lambda_func.value, num_input_args=lambda_func.num_input_args()
)
)
for custom_function in custom_functions_to_check:
if not custom_function_definitions[custom_function.name].is_subset_of( if not custom_function_definitions[custom_function.name].is_subset_of(
variables=variables, custom_function_definitions=custom_function_definitions variables=variables, custom_function_definitions=custom_function_definitions
): ):
@ -201,16 +205,7 @@ class VariableDependency(ABC):
True if it contains any of the input variables. False otherwise. True if it contains any of the input variables. False otherwise.
""" """
# If there are lambdas, see if they are custom functions. If so, check them # If there are lambdas, see if they are custom functions. If so, check them
custom_functions_to_check = self.custom_functions for custom_function in self._custom_function_dependencies(custom_function_definitions):
for lambda_func in self.lambdas:
if lambda_func.value in custom_function_definitions:
custom_functions_to_check.add(
ParsedCustomFunction(
name=lambda_func.value, num_input_args=lambda_func.num_input_args()
)
)
for custom_function in custom_functions_to_check:
if custom_function_definitions[custom_function.name].contains( if custom_function_definitions[custom_function.name].contains(
variables=variables, custom_function_definitions=custom_function_definitions variables=variables, custom_function_definitions=custom_function_definitions
): ):

1
src/ytdl_sub/validators/string_formatter_validators.py
View file

@ -241,6 +241,7 @@ def _validate_formatter(
variable_names = {var.name for var in parsed.variables} variable_names = {var.name for var in parsed.variables}
custom_function_names = {f"%{func.name}" for func in parsed.custom_functions} custom_function_names = {f"%{func.name}" for func in parsed.custom_functions}
# Add lambda functions to custom function names, if it's custom
for lambda_func in parsed.lambdas: for lambda_func in parsed.lambdas:
if lambda_func in mock_script.function_names: if lambda_func in mock_script.function_names:
custom_function_names.add(lambda_func.value) custom_function_names.add(lambda_func.value)