ytdl-sub 2025.11.27__py3-none-any.whl → 2025.11.28__py3-none-any.whl

ytdl_sub/__init__.py

@@ -1 +1 @@
-__pypi_version__ = "2025.11.27";__local_version__ = "2025.11.27+24e71ce"
+__pypi_version__ = "2025.11.28";__local_version__ = "2025.11.28+19f47cd"

ytdl_sub/config/overrides.py

@@ -158,10 +158,15 @@ class Overrides(UnstructuredDictFormatterValidator, Scriptable):
             script = entry.script
             unresolvable = entry.unresolvable
 
+        # Update the script internally so long as we are not supplying overrides
+        # that could alter the script with one-off state
+        update = function_overrides is None
+
         try:
             return script.resolve_once(
                 dict({"tmp_var": formatter.format_string}, **(function_overrides or {})),
                 unresolvable=unresolvable,
+                update=update,
             )["tmp_var"]
         except ScriptVariableNotResolved as exc:
             raise StringFormattingException(

ytdl_sub/script/parser.py

@@ -605,7 +605,7 @@ def parse(
         name=name,
         custom_function_names=custom_function_names,
         variable_names=variable_names,
-    ).ast
+    ).ast.maybe_resolvable_casted()
 
 
 # pylint: enable=invalid-name

ytdl_sub/script/script.py

@@ -10,6 +10,7 @@ from ytdl_sub.script.script_output import ScriptOutput
 from ytdl_sub.script.types.resolvable import BuiltInFunctionType
 from ytdl_sub.script.types.resolvable import Lambda
 from ytdl_sub.script.types.resolvable import Resolvable
+from ytdl_sub.script.types.syntax_tree import ResolvedSyntaxTree
 from ytdl_sub.script.types.syntax_tree import SyntaxTree
 from ytdl_sub.script.types.variable import FunctionArgument
 from ytdl_sub.script.types.variable import Variable
@@ -273,7 +274,7 @@ class Script:
 
     def _update_internally(self, resolved_variables: Dict[str, Resolvable]) -> None:
         for variable_name, resolved in resolved_variables.items():
-            self._variables[variable_name] = SyntaxTree(ast=[resolved])
+            self._variables[variable_name] = ResolvedSyntaxTree(ast=[resolved])
 
     def _recursive_get_unresolved_output_filter_variables(
         self, current_var: SyntaxTree, subset_to_resolve: Set[str], unresolvable: Set[Variable]
@@ -398,8 +399,8 @@ class Script:
 
                 # Otherwise, if it has dependencies that are all resolved, then
                 # resolve the definition
-                elif not definition.is_subset_of(
-                    variables=resolved.keys(), custom_function_definitions=self._functions
+                elif definition.is_subset_of(
+                    variables=resolved, custom_function_definitions=self._functions
                 ):
                     resolved[variable] = unresolved[variable].resolve(
                         resolved_variables=resolved,
@@ -522,6 +523,7 @@ class Script:
         variable_definitions: Dict[str, str],
         resolved: Optional[Dict[str, Resolvable]] = None,
         unresolvable: Optional[Set[str]] = None,
+        update: bool = False,
     ) -> Dict[str, Resolvable]:
         """
         Given a new set of variable definitions, resolve them using the Script, but do not
@@ -536,6 +538,8 @@ class Script:
         unresolvable
             Optional. Unresolvable variables that will be ignored in resolution, including all
             variables with a dependency to them.
+        update
+            Whether to update the script's state with resolved variables. Defaults to False.
 
         Returns
         -------
@@ -548,6 +552,7 @@ class Script:
                 pre_resolved=resolved,
                 unresolvable=unresolvable,
                 output_filter=set(list(variable_definitions.keys())),
+                update=update,
             ).output
         finally:
             for name in variable_definitions.keys():

ytdl_sub/script/types/function.py

@@ -1,4 +1,3 @@
-import copy
 import functools
 from abc import ABC
 from dataclasses import dataclass
@@ -58,23 +57,29 @@ class CustomFunction(Function, NamedCustomFunction):
                 # Should be validated in the Script
                 raise UNREACHABLE
 
-            resolved_variables_with_args = copy.deepcopy(resolved_variables)
+            function_args: List[FunctionArgument] = []
             for i, arg in enumerate(resolved_args):
                 function_arg = FunctionArgument.from_idx(idx=i, custom_function_name=self.name)
 
-                if function_arg in resolved_variables_with_args:
+                if function_arg in resolved_variables:
                     # function args should always be unique since they are only defined once
                     # in the custom function as %custom_function_name___idx
                     # and returned as a set from each custom function.
                     raise UNREACHABLE
 
-                resolved_variables_with_args[function_arg] = arg
+                resolved_variables[function_arg] = arg
+                function_args.append(function_arg)
 
-            return custom_functions[self.name].resolve(
-                resolved_variables=resolved_variables_with_args,
+            out = custom_functions[self.name].resolve(
+                resolved_variables=resolved_variables,
                 custom_functions=custom_functions,
             )
 
+            for function_arg in function_args:
+                del resolved_variables[function_arg]
+
+            return out
+
         # Implies the custom function does not exist. This should have
         # been checked in the parser with
         raise UNREACHABLE

ytdl_sub/script/types/syntax_tree.py

@@ -47,6 +47,32 @@ class SyntaxTree(VariableDependency):
         -------
         A resolvable if the AST contains a single type that is resolvable. None otherwise.
         """
-        if len(self.ast) == 1 and isinstance(self.ast[0], Resolvable):
-            return self.ast[0]
         return None
+
+    def maybe_resolvable_casted(self) -> "SyntaxTree":
+        """
+        Returns
+        -------
+        Optimized SyntaxTree if its deemed resolvable
+        """
+        if len(self.ast) == 1 and isinstance(self.ast[0], Resolvable):
+            return ResolvedSyntaxTree(self.ast)
+        return self
+
+
+@dataclass(frozen=True)
+class ResolvedSyntaxTree(SyntaxTree):
+    """
+    SyntaxTree with optimized helper functions if it's known to be resolved.
+    """
+
+    def resolve(
+        self,
+        resolved_variables: Dict[Variable, Resolvable],
+        custom_functions: Dict[str, VariableDependency],
+    ) -> Resolvable:
+        return self.ast[0]
+
+    @property
+    def maybe_resolvable(self) -> Optional[Resolvable]:
+        return self.ast[0]

ytdl_sub/script/types/variable_dependency.py

@@ -162,7 +162,7 @@ class VariableDependency(ABC):
     @final
     def is_subset_of(
         self,
-        variables: Iterable[Variable],
+        variables: Dict[Variable, Resolvable],
         custom_function_definitions: Dict[str, "VariableDependency"],
     ) -> bool:
         """
@@ -171,12 +171,12 @@ class VariableDependency(ABC):
         True if it contains all input variables as a dependency. False otherwise.
         """
         for custom_function in self.custom_functions:
-            if 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
             ):
-                return True
+                return False
 
-        return not self.variables.issubset(variables)
+        return all(var in variables for var in self.variables)
 
     @final
     def contains(

ytdl_sub/validators/string_formatter_validators.py

@@ -246,6 +246,7 @@ def _validate_formatter(
                 )
             },
             unresolvable=unresolvable,
+            update=True,
         )
     except RuntimeException as exc:
         if isinstance(exc, ScriptVariableNotResolved) and is_static_formatter:

{ytdl_sub-2025.11.27.dist-info → ytdl_sub-2025.11.28.dist-info}/METADATA

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

{ytdl_sub-2025.11.27.dist-info → ytdl_sub-2025.11.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ytdl_sub/__init__.py,sha256=HL0ZbBhknqTueVCBTSlnKc8VUboa8vFIEliivkqhdos,73
+ytdl_sub/__init__.py,sha256=MJqqnTBKwqx_Q4TIhY-bdO9nLWwN9iCJZdwTSSHvWqU,73
 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
@@ -12,7 +12,7 @@ ytdl_sub/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/config/config_file.py,sha256=SQtVrMIUq2z3WwJVOed4y84JBMQ8aa4pbiBB0Y-YY4M,2781
 ytdl_sub/config/config_validator.py,sha256=NWPoCb6qjOom-YQamjho4UAIMSC43LRIT28W0rriXds,9424
 ytdl_sub/config/defaults.py,sha256=NTwzlKDkks1LDGNjFMxh91fw5E6T6d_zGsCwODNYJxo,1152
-ytdl_sub/config/overrides.py,sha256=WjfKnT8z5dth4uqMC53KrVzitGAPbKGaNN_25C35dUM,8704
+ytdl_sub/config/overrides.py,sha256=0L6WaVtgqGqLvSuUkn4lbll9E8IboJlA7iJteIfN4Mo,8918
 ytdl_sub/config/preset.py,sha256=cp_oCyR78pHqYIakUNvNnwuFfFUq1YzitvIav5QW3Jw,8517
 ytdl_sub/config/preset_options.py,sha256=RgwnpIQqe_17YiaqaI-qlQ12RnkVGTdawXR_e6gYhuQ,13523
 ytdl_sub/config/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -92,8 +92,8 @@ ytdl_sub/prebuilt_presets/tv_show/tv_show.yaml,sha256=qmAB3jsXY1VsqmtLnLXXte5rz_
 ytdl_sub/prebuilt_presets/tv_show/tv_show_by_date.yaml,sha256=0OgIOzxSPNVqwcZnL6qT9_azplBhDXePcf0ASNTQJ5Q,7223
 ytdl_sub/prebuilt_presets/tv_show/tv_show_collection.yaml,sha256=d76uoka4NdQhaJiBE_93hFIwgYYDPjvlWzNuzf0_dyc,37722
 ytdl_sub/script/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ytdl_sub/script/parser.py,sha256=s-tGfZ-yRjY8AscItt2g81oq--bLaNw7Vt-RpD8782Y,21872
-ytdl_sub/script/script.py,sha256=qsa3N8z8ZSSo3Yp4-GfdEdXPN0PwXu0o733BjogWohw,23860
+ytdl_sub/script/parser.py,sha256=30SOHkEFi0rxiW_IrC1w6WzPKuyIf766zYEVHDsndtg,21898
+ytdl_sub/script/script.py,sha256=cLmQ07yIffk-blomLWKdH-dTRiDroLYjgnvidc5-L80,24091
 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
@@ -109,12 +109,12 @@ ytdl_sub/script/functions/regex_functions.py,sha256=d6omjhD9FjkP0BVjUaMsJfXVt-re
 ytdl_sub/script/functions/string_functions.py,sha256=rZbOuP2V9FvoKzMG94R7vsvj-GxHK_hwgVDMa_Yeftw,6095
 ytdl_sub/script/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ytdl_sub/script/types/array.py,sha256=1yEJEWtwS6T4W8KZN2IdNAGpi3SUa1qqzCXQfjo-P2M,1711
-ytdl_sub/script/types/function.py,sha256=s4s_x6ShNXq2iD1vmSSgH-X0J0qcF_ECK_fTvPTQVDA,12230
+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/syntax_tree.py,sha256=U9Ox7g6L5VXtXoA_tvHPnUIWEGQY32NFuq-lQc5SQgw,1685
+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=hs6pDBar11cONqgCPXNbQzdJIxy7mCT0hr2en59sVPc,6259
+ytdl_sub/script/types/variable_dependency.py,sha256=wgNSdAjntziVdlwqxCT7QKwvm43XCA7qxIoFlmD_Tdg,6281
 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=D7wuYFuHlbOYMCkKoy9ILLGPCmvoDDfm7QOrs05SCHE,10600
+ytdl_sub/validators/string_formatter_validators.py,sha256=CRwZH_fnA5LabSNf973ELSMtWt2q1vQD9ZSPVGnd4Es,10625
 ytdl_sub/validators/string_select_validator.py,sha256=KFXNKWX2J80WGt08m5gVYphPMHYxhHlgfcoXAQMq6zw,1086
 ytdl_sub/validators/validators.py,sha256=X9AkECdngEXcME_C25njHaOjtqbfEJMED2eG9Qy3UPs,9352
 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.11.27.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ytdl_sub-2025.11.27.dist-info/METADATA,sha256=6gz2E3LSUIoKRcdFTShxj4TIzBaF6SwcGF0LtQg9_IY,51421
-ytdl_sub-2025.11.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ytdl_sub-2025.11.27.dist-info/entry_points.txt,sha256=K3T5235NlAI-WLmHCg5tzLZHqc33OLN5IY5fOGc9t10,48
-ytdl_sub-2025.11.27.dist-info/top_level.txt,sha256=6z-JWazl6jXspC2DNyxOnGnEqYyGzVbgcBDoXfbkUhI,9
-ytdl_sub-2025.11.27.dist-info/RECORD,,
+ytdl_sub-2025.11.28.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ytdl_sub-2025.11.28.dist-info/METADATA,sha256=R80_Nm3ywXjJ4e6s1FtFHkcsF08OLEhex7ausuia_Wc,51421
+ytdl_sub-2025.11.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ytdl_sub-2025.11.28.dist-info/entry_points.txt,sha256=K3T5235NlAI-WLmHCg5tzLZHqc33OLN5IY5fOGc9t10,48
+ytdl_sub-2025.11.28.dist-info/top_level.txt,sha256=6z-JWazl6jXspC2DNyxOnGnEqYyGzVbgcBDoXfbkUhI,9
+ytdl_sub-2025.11.28.dist-info/RECORD,,