ytdl-sub 2025.12.8__tar.gz → 2025.12.30__tar.gz

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/PKG-INFO

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

ytdl_sub-2025.12.30/src/ytdl_sub/__init__.py

@@ -0,0 +1 @@
+__pypi_version__ = "2025.12.30";__local_version__ = "2025.12.30+344753c"

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/src/ytdl_sub/config/overrides.py

@@ -1,5 +1,6 @@
 from typing import Any
 from typing import Dict
+from typing import Iterable
 from typing import Optional
 from typing import Set
 
@@ -88,6 +89,24 @@ class Overrides(UnstructuredDictFormatterValidator, Scriptable):
 
         return True
 
+    def ensure_variable_names_not_a_plugin(self, plugin_names: Iterable[str]) -> None:
+        """
+        Throws an error if an override variable or function has the same name as a
+        preset key. This is to avoid confusion when accidentally defining things in
+        overrides that are meant to be in the preset.
+        """
+        for name in self.keys:
+            if name.startswith("%"):
+                name = name[1:]
+
+            if name in plugin_names:
+                raise self._validation_exception(
+                    f"Override variable with name {name} cannot be used since it is"
+                    " the name of a plugin. Perhaps you meant to define it as a plugin? If so,"
+                    " indent it left to make it at the same level as overrides.",
+                    exception_class=InvalidVariableNameException,
+                )
+
     def ensure_variable_name_valid(self, name: str) -> None:
         """
         Ensures the variable name does not collide with any entry variables or built-in functions.

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/src/ytdl_sub/config/preset.py

@@ -194,6 +194,8 @@ class Preset(_PresetShell):
         self.plugins: PresetPlugins = self._validate_and_get_plugins()
         self.overrides = self._validate_key(key="overrides", validator=Overrides, default={})
 
+        self.overrides.ensure_variable_names_not_a_plugin(plugin_names=PRESET_KEYS)
+
         VariableValidation(
             downloader_options=self.downloader_options,
             output_options=self.output_options,

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/src/ytdl_sub/entries/variables/override_variables.py

@@ -11,9 +11,6 @@ from ytdl_sub.entries.script.variable_types import Variable
 from ytdl_sub.script.functions import Functions
 from ytdl_sub.script.utils.name_validation import is_valid_name
 
-# TODO: use this
-SUBSCRIPTION_ARRAY = "subscription_array"
-
 
 class SubscriptionVariables:
     @staticmethod
@@ -163,7 +160,7 @@ class OverrideHelpers:
         True if the override name itself is valid. False otherwise.
         """
         if name.startswith("%"):
-            return is_valid_name(name=name[1:])
+            name = name[1:]
 
         return is_valid_name(name=name)
 

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/src/ytdl_sub/prebuilt_presets/helpers/download_deletion_options.yaml

@@ -11,8 +11,7 @@ presets:
 
     # Set the default date_range to 2 months
     overrides:
-      date_range: "2months"  # keep for legacy-reasons
-      only_recent_date_range: "{date_range}"
+      only_recent_date_range: "2months"
 
   #############################################################################
   # Only Recent

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/src/ytdl_sub/script/script.py

@@ -307,10 +307,9 @@ class Script:
 
     def _get_unresolved_output_filter(
         self,
-        unresolved: Dict[Variable, SyntaxTree],
         output_filter: Set[str],
         unresolvable: Set[Variable],
-    ) -> Dict[Variable, SyntaxTree]:
+    ) -> Set[str]:
         """
         When an output filter is applied, only a subset of variables that the filter
         depends on need to be resolved.
@@ -331,7 +330,7 @@ class Script:
                 unresolvable=unresolvable,
             )
 
-        return {var: syntax for var, syntax in unresolved.items() if var.name in subset_to_resolve}
+        return subset_to_resolve
 
     def _resolve(
         self,
@@ -367,18 +366,21 @@ class Script:
 
         unresolvable: Set[Variable] = {Variable(name) for name in (unresolvable or {})}
         unresolved_filter = set(resolved.keys()).union(unresolvable)
-        unresolved: Dict[Variable, SyntaxTree] = {
-            Variable(name): ast
-            for name, ast in self._variables.items()
-            if Variable(name) not in unresolved_filter
-        }
 
         if output_filter:
-            unresolved = self._get_unresolved_output_filter(
-                unresolved=unresolved,
-                output_filter=output_filter,
-                unresolvable=unresolvable,
-            )
+            unresolved = {
+                Variable(name): self._variables[name]
+                for name in self._get_unresolved_output_filter(
+                    output_filter=output_filter,
+                    unresolvable=unresolvable,
+                )
+            }
+        else:
+            unresolved = {
+                Variable(name): ast
+                for name, ast in self._variables.items()
+                if Variable(name) not in unresolved_filter
+            }
 
         while unresolved:
             unresolved_count: int = len(unresolved)
@@ -556,8 +558,7 @@ class Script:
             ).output
         finally:
             for name in variable_definitions.keys():
-                if name in self._variables:
-                    del self._variables[name]
+                self._variables.pop(name, None)
 
     def get(self, variable_name: str) -> Resolvable:
         """

{ytdl_sub-2025.12.8 → ytdl_sub-2025.12.30}/src/ytdl_sub.egg-info/PKG-INFO

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

ytdl_sub-2025.12.8/src/ytdl_sub/__init__.py

@@ -1 +0,0 @@
-__pypi_version__ = "2025.12.08";__local_version__ = "2025.12.08+157a0b5"