ytdl-sub 2025.12.31.post4__py3-none-any.whl → 2026.1.6__py3-none-any.whl

ytdl_sub/__init__.py

@@ -1 +1 @@
-__pypi_version__ = "2025.12.31.post4";__local_version__ = "2025.12.31+c46de04"
+__pypi_version__ = "2026.01.06";__local_version__ = "2026.01.06+6b99c31"

ytdl_sub/config/overrides.py

@@ -238,20 +238,25 @@ class Overrides(UnstructuredDictFormatterValidator, Scriptable):
     def apply_overrides_formatter_to_native(
         self,
         formatter: OverridesStringFormatterValidator,
+        function_overrides: Optional[Dict[str, str]] = None,
     ) -> Any:
         """
         Parameters
         ----------
         formatter
             Overrides formatter to apply
+        function_overrides
+            Optional. Explicit values to override the overrides themselves and source variables
 
         Returns
         -------
         The native python form of the resolved variable
         """
-        return self._apply_to_resolvable(
-            formatter=formatter, entry=None, function_overrides=None
-        ).native
+        return formatter.post_process_native(
+            self._apply_to_resolvable(
+                formatter=formatter, entry=None, function_overrides=function_overrides
+            ).native
+        )
 
     def evaluate_boolean(
         self, formatter: StringFormatterValidator, entry: Optional[Entry] = None

ytdl_sub/config/validators/variable_validation.py

@@ -84,6 +84,9 @@ class VariableValidation:
         )
         resolved_subscription["download"] = []
         for url_output in raw_download_output["download"]:
+            if isinstance(url_output["url"], list):
+                url_output["url"] = [url for url in url_output["url"] if bool(url)]
+
             if url_output["url"]:
                 resolved_subscription["download"].append(url_output)
 

ytdl_sub/downloaders/url/downloader.py

@@ -52,12 +52,12 @@ class UrlDownloaderBasePluginExtension(SourcePluginExtension[MultiUrlValidator])
 
         if 0 <= input_url_idx < len(self.plugin_options.urls.list):
             validator = self.plugin_options.urls.list[input_url_idx]
-            if self.overrides.apply_formatter(validator.url) == entry_input_url:
+            if entry_input_url in self.overrides.apply_overrides_formatter_to_native(validator.url):
                 return validator
 
         # Match the first validator based on the URL, if one exists
         for validator in self.plugin_options.urls.list:
-            if self.overrides.apply_formatter(validator.url) == entry_input_url:
+            if entry_input_url in self.overrides.apply_overrides_formatter_to_native(validator.url):
                 return validator
 
         # Return the first validator if none exist
@@ -487,19 +487,27 @@ class MultiUrlDownloader(SourcePlugin[MultiUrlValidator]):
         # download the bottom-most urls first since they are top-priority
         for idx, url_validator in reversed(list(enumerate(self.collection.urls.list))):
             # URLs can be empty. If they are, then skip
-            if not (url := self.overrides.apply_formatter(url_validator.url)):
+            if not (urls := self.overrides.apply_overrides_formatter_to_native(url_validator.url)):
                 continue
 
-            for entry in self._download_metadata(url=url, validator=url_validator):
-                entry.initialize_script(self.overrides).add(
-                    {
-                        v.ytdl_sub_input_url: url,
-                        v.ytdl_sub_input_url_index: idx,
-                        v.ytdl_sub_input_url_count: len(self.collection.urls.list),
-                    }
-                )
+            assert isinstance(urls, list)
+
+            for url in reversed(urls):
+                assert isinstance(url, str)
+
+                if not url:
+                    continue
+
+                for entry in self._download_metadata(url=url, validator=url_validator):
+                    entry.initialize_script(self.overrides).add(
+                        {
+                            v.ytdl_sub_input_url: url,
+                            v.ytdl_sub_input_url_index: idx,
+                            v.ytdl_sub_input_url_count: len(self.collection.urls.list),
+                        }
+                    )
 
-                yield entry
+                    yield entry
 
     def download(self, entry: Entry) -> Optional[Entry]:
         """

ytdl_sub/downloaders/url/validators.py

@@ -43,6 +43,19 @@ class UrlThumbnailListValidator(ListValidator[UrlThumbnailValidator]):
     _inner_list_type = UrlThumbnailValidator
 
 
+class OverridesOneOrManyUrlValidator(OverridesStringFormatterValidator):
+    def post_process_native(self, resolved: Any) -> Any:
+        if isinstance(resolved, str):
+            return [resolved]
+        if isinstance(resolved, list):
+            for value in resolved:
+                if not isinstance(value, str):
+                    raise self._validation_exception("Must be a string or an array of strings.")
+            return resolved
+
+        raise self._validation_exception("Must be a string or an array of strings.")
+
+
 class UrlValidator(StrictDictValidator):
     _required_keys = {"url"}
     _optional_keys = {
@@ -68,7 +81,7 @@ class UrlValidator(StrictDictValidator):
         super().__init__(name, value)
 
         # TODO: url validate using yt-dlp IE
-        self._url = self._validate_key(key="url", validator=OverridesStringFormatterValidator)
+        self._url = self._validate_key(key="url", validator=OverridesOneOrManyUrlValidator)
         self._variables = self._validate_key_if_present(
             key="variables", validator=DictFormatterValidator, default={}
         )