optionally resolve entry formatters

src/ytdl_sub/config/validators/variable_validation.py

@@ -108,7 +108,7 @@ class VariableValidation:
 
         self.unresolved_runtime_variables -= added_variables | modified_variables
 
-    def ensure_proper_usage(self) -> Dict:
+    def ensure_proper_usage(self, partial_resolve_formatters: bool = False) -> Dict:
         """
         Validate variables resolve as plugins are executed, and return
         a mock script which contains actualized added variables from the plugins
@@ -141,6 +141,7 @@ class VariableValidation:
                 unresolved_variables=self.unresolved_variables,
                 unresolved_runtime_variables=self.unresolved_runtime_variables,
                 validator=plugin_options,
+                partial_resolve_formatters=partial_resolve_formatters,
             )
 
         resolved_subscription |= validate_formatters(
@@ -148,6 +149,7 @@ class VariableValidation:
             unresolved_variables=self.unresolved_variables,
             unresolved_runtime_variables=self.unresolved_runtime_variables,
             validator=self.output_options,
+            partial_resolve_formatters=partial_resolve_formatters,
         )
 
         # TODO: make this a function
@@ -156,6 +158,7 @@ class VariableValidation:
             unresolved_variables=self.unresolved_variables,
             unresolved_runtime_variables=self.unresolved_runtime_variables,
             validator=self.downloader_options.urls,
+            partial_resolve_formatters=partial_resolve_formatters,
         )
         resolved_subscription["download"] = []
         for url_output in raw_download_output["download"]:

src/ytdl_sub/subscriptions/base_subscription.py

@@ -272,5 +272,5 @@ class BaseSubscription(ABC):
             output_options=self.output_options,
             plugins=self.plugins,
             resolution_level=resolution_level,
-        ).ensure_proper_usage()
+        ).ensure_proper_usage(partial_resolve_formatters=True)
         return dump_yaml(out)

src/ytdl_sub/validators/string_formatter_validators.py

@@ -13,7 +13,6 @@ from ytdl_sub.script.utils.exceptions import ScriptVariableNotResolved
 from ytdl_sub.script.utils.exceptions import UserException
 from ytdl_sub.script.utils.exceptions import UserThrownRuntimeError
 from ytdl_sub.utils.exceptions import StringFormattingVariableNotFoundException
-from ytdl_sub.utils.file_handler import get_md5_hash
 from ytdl_sub.utils.script import ScriptUtils
 from ytdl_sub.validators.validators import DictValidator
 from ytdl_sub.validators.validators import ListValidator
@@ -240,7 +239,7 @@ def _validate_formatter(
     unresolved_variables: Set[str],
     unresolved_runtime_variables: Set[str],
     formatter_validator: Union[StringFormatterValidator, OverridesStringFormatterValidator],
-    resolve_partial: bool = True,
+    partial_resolve_entry_formatters: bool,
 ) -> str:
     parsed = formatter_validator.parsed
     if resolved := parsed.maybe_resolvable:
@@ -272,13 +271,11 @@ def _validate_formatter(
             f"formatter: {', '.join(sorted(unresolved))}"
         )
 
-    if resolve_partial and not is_static_formatter:
-        formatter_hash = get_md5_hash(formatter_validator.format_string)
-
+    if partial_resolve_entry_formatters and not is_static_formatter:
         parsed = mock_script.resolve_partial_once(
-            variable_definitions={formatter_hash: formatter_validator.parsed},
+            variable_definitions={"tmp_var": formatter_validator.parsed},
             unresolvable=unresolved_variables,
-        )[formatter_hash]
+        )["tmp_var"]
 
     try:
         if is_static_formatter:
@@ -309,6 +306,7 @@ def validate_formatters(
     unresolved_variables: Set[str],
     unresolved_runtime_variables: Set[str],
     validator: Validator,
+    partial_resolve_formatters: bool,
 ) -> Dict:
     """
     Ensure all OverridesStringFormatterValidator's only contain variables from the overrides
@@ -326,6 +324,7 @@ def validate_formatters(
                 unresolved_variables=unresolved_variables,
                 unresolved_runtime_variables=unresolved_runtime_variables,
                 validator=validator_value,
+                partial_resolve_formatters=partial_resolve_formatters,
             )
     elif isinstance(validator, ListValidator):
         resolved_dict[validator.leaf_name] = []
@@ -335,6 +334,7 @@ def validate_formatters(
                 unresolved_variables=unresolved_variables,
                 unresolved_runtime_variables=unresolved_runtime_variables,
                 validator=list_value,
+                partial_resolve_formatters=partial_resolve_formatters,
             )
             assert len(list_output) == 1
             resolved_dict[validator.leaf_name].append(list(list_output.values())[0])
@@ -344,6 +344,7 @@ def validate_formatters(
             unresolved_variables=unresolved_variables,
             unresolved_runtime_variables=unresolved_runtime_variables,
             formatter_validator=validator,
+            partial_resolve_entry_formatters=partial_resolve_formatters,
         )
     elif isinstance(validator, (DictFormatterValidator, OverridesDictFormatterValidator)):
         resolved_dict[validator.leaf_name] = {}
@@ -353,6 +354,7 @@ def validate_formatters(
                 unresolved_variables=unresolved_variables,
                 unresolved_runtime_variables=unresolved_runtime_variables,
                 formatter_validator=validator_value,
+                partial_resolve_entry_formatters=partial_resolve_formatters,
             )
     else:
         resolved_dict[validator.leaf_name] = validator._value

tests/unit/config/test_subscription_resolution.py

@@ -23,7 +23,7 @@ def _ensure_resolved_yaml(
 
     if resolution_level > ResolutionLevel.ORIGINAL:
         expected_out["output_options"]["output_directory"] = FilePathTruncater.to_native_filepath(
-            expected_out["output_options"]["output_directory"]
+            str(Path(output_directory) / sub.name)
         )
 
     if "tv_show_directory" in expected_out["overrides"]: