ytdl-sub 2025.12.31.post1__py3-none-any.whl → 2025.12.31.post3__py3-none-any.whl

ytdl_sub/__init__.py

@@ -1 +1 @@
-__pypi_version__ = "2025.12.31.post1";__local_version__ = "2025.12.31+d373935"
+__pypi_version__ = "2025.12.31.post3";__local_version__ = "2025.12.31+869fc0b"

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/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/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/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.dist-info → ytdl_sub-2025.12.31.post3.dist-info}/METADATA

@@ -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.dist-info → ytdl_sub-2025.12.31.post3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ytdl_sub/__init__.py,sha256=WrW7vK-7xEGvZMFgyjkq_NA4CjXzPSZv3q1IzcatKCI,79
+ytdl_sub/__init__.py,sha256=lHu_dXH2FOotkLTpWoLxrGAi9eMsD4C43OWFwUAHL18,79
 ytdl_sub/main.py,sha256=4Rf9wXxSKW7IPnWqG5YtTZ814PjP1n9WtoFDivaainE,1004
 ytdl_sub/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/cli/entrypoint.py,sha256=XXjUH4HiOP_BB2ZA_bNcyt5-o6YLAdZmj0EP3xtOtD8,9496
@@ -93,7 +93,7 @@ ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml,sha256=0OgIOzxSPNVqwcZnL6
 ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml,sha256=XCtt4i4-zAgyfh-p4SXSGd0FI56lWCrPOMmB6mdf-AE,238393
 ytdl_sub/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/script/parser.py,sha256=LUvmUIxg346njE8-uDx06nOW6ZDX5QS6aUtp4lsgwpk,22115
-ytdl_sub/script/script.py,sha256=4fP5leu1GQdbbOQLzrWGEo_zaIUeZwGY0btFqdpQmpI,26582
+ytdl_sub/script/script.py,sha256=ufW-Zr0amTh0vkdW63oOca6MndojgaTaXxpOFk25U48,27688
 ytdl_sub/script/script_output.py,sha256=5SIamnI-1D3xMA0qQzjf9xrIy8j6BVhGCKrl_Q1d2M8,1381
 ytdl_sub/script/functions/__init__.py,sha256=rzl6O5G0IEqFYHQECIM9bRvcuQj-ytC_p-Xl2TTa6j0,2932
 ytdl_sub/script/functions/array_functions.py,sha256=yg9rcZP67-aVzhu4oZZzUu3-AHiHltbQDWEs8GW1DJ4,7193
@@ -111,10 +111,10 @@ ytdl_sub/script/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 ytdl_sub/script/types/array.py,sha256=1yEJEWtwS6T4W8KZN2IdNAGpi3SUa1qqzCXQfjo-P2M,1711
 ytdl_sub/script/types/function.py,sha256=rnKb5L8frQ6sG95lMFj_AS6qQw7tt88z26tyWrCWPhY,12341
 ytdl_sub/script/types/map.py,sha256=Y3zlm__IHcnycGFv0xbU_P7wgiQgtgddatPLQypjCvU,2254
-ytdl_sub/script/types/resolvable.py,sha256=OinvpfKsVjgU_mnE0uYONQftUxNLa1zY2jA74bywwBQ,5302
+ytdl_sub/script/types/resolvable.py,sha256=YeMEhPTRTDSr5AVmK4NRpUbqxh1YQT6a2dGUIPKoFkI,5482
 ytdl_sub/script/types/syntax_tree.py,sha256=4xWluTMPJqA6yYuQ4XCcncSFt5cDZ9ZIT2AIOOH4bT0,2336
 ytdl_sub/script/types/variable.py,sha256=aVJ3ocUr3WpDoolOq6y3NV71b3EQQYPAGrIT0FtIqc4,813
-ytdl_sub/script/types/variable_dependency.py,sha256=J9XzVVrkyt-Ae2acHbb6xFnl6NIeOcL6wLOH9SvzKcA,6796
+ytdl_sub/script/types/variable_dependency.py,sha256=w0NrgSoom9joLaLMWHbma0zekmljYVXdhYW-k_g1n0I,7419
 ytdl_sub/script/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/script/utils/exception_formatters.py,sha256=hZDX2w90vU4lY2xiEM-qxQofQz2dmqPwhkSeWaJRsQ4,4645
 ytdl_sub/script/utils/exceptions.py,sha256=cag5ZLM6as1w-RsrOwO-oe4YFpwlFu_8U0QNGv_jQ68,2774
@@ -153,14 +153,14 @@ ytdl_sub/validators/regex_validator.py,sha256=jS8No927eg3zcpYEOv5g0gykePV0DCZaIr
 ytdl_sub/validators/source_variable_validator.py,sha256=ziG4PVIyzj5ky-Okle0FB2d2P5DWs3-jYF81hMvBTEQ,922
 ytdl_sub/validators/strict_dict_validator.py,sha256=RduK_3pOEbEQQuugAUeKKqM0Tv5x2vxSSb7vROyo2vQ,1661
 ytdl_sub/validators/string_datetime.py,sha256=GpbBiZH1FHTMeo0Zk134-uMdTMk2JD3Re3TnvuPx2OU,1125
-ytdl_sub/validators/string_formatter_validators.py,sha256=dQ_8l1wl101vPkaOlfJuXprYI5EnfHQ6jLWjGk92raA,11858
+ytdl_sub/validators/string_formatter_validators.py,sha256=q_3Bn0y5id5Y8mcV1MlVrMHpQEDXOdqRLQ4i46_lvJc,12077
 ytdl_sub/validators/string_select_validator.py,sha256=KFXNKWX2J80WGt08m5gVYphPMHYxhHlgfcoXAQMq6zw,1086
 ytdl_sub/validators/validators.py,sha256=JC3-c9fSrozFADUY5jqZEhXpM2q3sfserlooQxT2DK8,9133
 ytdl_sub/ytdl_additions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/ytdl_additions/enhanced_download_archive.py,sha256=Lsc0wjHdx9d8dYJCskZYAUGDAQ_QzQ-_xbQlyrBSzfk,24884
-ytdl_sub-2025.12.31.post1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ytdl_sub-2025.12.31.post1.dist-info/METADATA,sha256=aCbLYK2DK2szieUQ05O-SzJc0r5erfgVXBjnTGKrW0k,51426
-ytdl_sub-2025.12.31.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ytdl_sub-2025.12.31.post1.dist-info/entry_points.txt,sha256=K3T5235NlAI-WLmHCg5tzLZHqc33OLN5IY5fOGc9t10,48
-ytdl_sub-2025.12.31.post1.dist-info/top_level.txt,sha256=6z-JWazl6jXspC2DNyxOnGnEqYyGzVbgcBDoXfbkUhI,9
-ytdl_sub-2025.12.31.post1.dist-info/RECORD,,
+ytdl_sub-2025.12.31.post3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ytdl_sub-2025.12.31.post3.dist-info/METADATA,sha256=VpMBojwuKGjYrA1tfA4Sn4o6w3E1WqKA0-qUC53KGMw,51426
+ytdl_sub-2025.12.31.post3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ytdl_sub-2025.12.31.post3.dist-info/entry_points.txt,sha256=K3T5235NlAI-WLmHCg5tzLZHqc33OLN5IY5fOGc9t10,48
+ytdl_sub-2025.12.31.post3.dist-info/top_level.txt,sha256=6z-JWazl6jXspC2DNyxOnGnEqYyGzVbgcBDoXfbkUhI,9
+ytdl_sub-2025.12.31.post3.dist-info/RECORD,,