ytdl-sub 2025.12.31.post1__tar.gz → 2025.12.31.post3__tar.gz

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2025.12.31.post3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytdl-sub
-Version: 2025.12.31.post1
+Version: 2025.12.31.post3
 Summary: Automate downloading metadata generation with YoutubeDL
 Author: Jesse Bannon
 License:                     GNU GENERAL PUBLIC LICENSE

ytdl_sub-2025.12.31.post3/src/ytdl_sub/__init__.py

@@ -0,0 +1 @@
+__pypi_version__ = "2025.12.31.post3";__local_version__ = "2025.12.31+869fc0b"

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2025.12.31.post3}/src/ytdl_sub/script/script.py

@@ -66,6 +66,22 @@ class Script:
                 deps=deps + [dep.name],
             )
 
+        for custom_func in variable_dependency.custom_function_dependencies(
+            custom_function_definitions=self._functions
+        ):
+            for dep in self._functions[custom_func.name].variables:
+                self._ensure_no_cycle(
+                    name=variable_name,
+                    dep=dep.name,
+                    deps=deps + [custom_func.definition_name()],
+                    definitions=self._variables,
+                )
+                self._traverse_variable_dependencies(
+                    variable_name=variable_name,
+                    variable_dependency=self._variables[dep.name],
+                    deps=deps + [custom_func.definition_name(), dep.name],
+                )
+
     def _ensure_no_variable_cycles(self, variables: Dict[str, SyntaxTree]):
         for variable_name, variable_definition in variables.items():
             self._traverse_variable_dependencies(
@@ -288,6 +304,14 @@ class Script:
                 unresolvable=unresolvable,
             )
 
+        for lambda_func in current_var.lambdas:
+            if lambda_func.value in self._functions:
+                subset_to_resolve |= self._recursive_get_unresolved_output_filter_variables(
+                    current_var=self._functions[lambda_func.value],
+                    subset_to_resolve=subset_to_resolve,
+                    unresolvable=unresolvable,
+                )
+
         return subset_to_resolve
 
     def _get_unresolved_output_filter(

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2025.12.31.post3}/src/ytdl_sub/script/types/resolvable.py

@@ -193,6 +193,14 @@ class NamedCustomFunction(NamedArgument, ABC):
 class ParsedCustomFunction(NamedCustomFunction):
     num_input_args: int
 
+    def definition_name(self) -> str:
+        """
+        Returns
+        -------
+        The function definition name, including the %
+        """
+        return f"%{self.name}"
+
 
 @dataclass(frozen=True)
 class FunctionType(NamedArgument, ABC):

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2025.12.31.post3}/src/ytdl_sub/script/types/variable_dependency.py

@@ -114,7 +114,6 @@ class VariableDependency(ABC):
                 output.add(ParsedCustomFunction(name=arg.name, num_input_args=len(arg.args)))
             if isinstance(arg, VariableDependency):
                 output.update(arg.custom_functions)
-            # if isinstance(arg, Lambda)
 
         return output
 
@@ -160,6 +159,31 @@ class VariableDependency(ABC):
 
         raise UNREACHABLE
 
+    @final
+    def custom_function_dependencies(
+        self, custom_function_definitions: Dict[str, "VariableDependency"]
+    ) -> Set[ParsedCustomFunction]:
+        """
+        Parameters
+        ----------
+        custom_function_definitions
+            Definition of all currently existing custom functions. Needed to check whether
+            a lambda function's input function is custom or not.
+
+        Returns
+        -------
+        All custom function dependencies
+        """
+        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
     def is_subset_of(
         self,
@@ -171,7 +195,8 @@ class VariableDependency(ABC):
         -------
         True if it contains all input variables as a dependency. False otherwise.
         """
-        for custom_function in self.custom_functions:
+        # If there are lambdas, see if they are custom functions. If so, check them
+        for custom_function in self.custom_function_dependencies(custom_function_definitions):
             if not custom_function_definitions[custom_function.name].is_subset_of(
                 variables=variables, custom_function_definitions=custom_function_definitions
             ):
@@ -191,16 +216,7 @@ class VariableDependency(ABC):
         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
-        custom_functions_to_check = self.custom_functions
-        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:
+        for custom_function in self.custom_function_dependencies(custom_function_definitions):
             if custom_function_definitions[custom_function.name].contains(
                 variables=variables, custom_function_definitions=custom_function_definitions
             ):

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2025.12.31.post3}/src/ytdl_sub/validators/string_formatter_validators.py

@@ -241,6 +241,11 @@ def _validate_formatter(
     variable_names = {var.name for var in parsed.variables}
     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:
+        if lambda_func in mock_script.function_names:
+            custom_function_names.add(lambda_func.value)
+
     if not variable_names.issubset(mock_script.variable_names):
         raise StringFormattingVariableNotFoundException(
             "contains the following variables that do not exist: "

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2025.12.31.post3}/src/ytdl_sub.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytdl-sub
-Version: 2025.12.31.post1
+Version: 2025.12.31.post3
 Summary: Automate downloading metadata generation with YoutubeDL
 Author: Jesse Bannon
 License:                     GNU GENERAL PUBLIC LICENSE

ytdl_sub-2025.12.31.post1/src/ytdl_sub/__init__.py

@@ -1 +0,0 @@
-__pypi_version__ = "2025.12.31.post1";__local_version__ = "2025.12.31+d373935"