ytdl-sub 2025.12.31.post1__tar.gz → 2026.1.11__tar.gz

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2026.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytdl-sub
-Version: 2025.12.31.post1
+Version: 2026.1.11
 Summary: Automate downloading metadata generation with YoutubeDL
 Author: Jesse Bannon
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -703,7 +703,7 @@ Requires-Dist: black==24.10.0; extra == "lint"
 Requires-Dist: isort==7.0.0; extra == "lint"
 Requires-Dist: pylint==4.0.1; extra == "lint"
 Provides-Extra: docs
-Requires-Dist: sphinx<9,>=7; extra == "docs"
+Requires-Dist: sphinx<10,>=7; extra == "docs"
 Requires-Dist: sphinx-rtd-theme<4,>=2; extra == "docs"
 Requires-Dist: sphinx-book-theme~=1.0; extra == "docs"
 Requires-Dist: sphinx-copybutton~=0.5; extra == "docs"

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2026.1.11}/pyproject.toml

@@ -52,7 +52,7 @@ lint = [
     "pylint==4.0.1",
 ]
 docs = [
-    "sphinx>=7,<9",
+    "sphinx>=7,<10",
     "sphinx-rtd-theme>=2,<4",
     "sphinx-book-theme~=1.0",
     "sphinx-copybutton~=0.5",

ytdl_sub-2026.1.11/src/ytdl_sub/__init__.py

@@ -0,0 +1 @@
+__pypi_version__ = "2026.01.11";__local_version__ = "2026.01.11+41a5bf6"

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2026.1.11}/src/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-2025.12.31.post1 → ytdl_sub-2026.1.11}/src/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-2025.12.31.post1 → ytdl_sub-2026.1.11}/src/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-2025.12.31.post1 → ytdl_sub-2026.1.11}/src/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={}
         )

{ytdl_sub-2025.12.31.post1 → ytdl_sub-2026.1.11}/src/ytdl_sub/entries/script/variable_types.py

@@ -22,7 +22,6 @@ VariableT = TypeVar("VariableT", bound="Variable")
 
 
 def _get(
-    cast: str,
     metadata_variable_name: str,
     metadata_key: str,
     variable_name: Optional[str],
@@ -47,7 +46,7 @@ def _get(
     return as_type(
         variable_name=variable_name or metadata_key,
         metadata_key=metadata_key,
-        definition=f"{{ %legacy_bracket_safety(%{cast}({out})) }}",
+        definition=f"{{ {out} }}",
     )
 
 
@@ -182,7 +181,6 @@ class MapMetadataVariable(MetadataVariable, MapVariable):
         Creates a map variable from entry metadata
         """
         return _get(
-            "map",
             metadata_variable_name=ENTRY_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,
@@ -204,7 +202,6 @@ class ArrayMetadataVariable(MetadataVariable, ArrayVariable):
         Creates an array variable from entry metadata
         """
         return _get(
-            "array",
             metadata_variable_name=ENTRY_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,
@@ -226,7 +223,6 @@ class StringMetadataVariable(MetadataVariable, StringVariable):
         Creates a string variable from entry metadata
         """
         return _get(
-            "string",
             metadata_variable_name=ENTRY_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,
@@ -245,7 +241,6 @@ class StringMetadataVariable(MetadataVariable, StringVariable):
         Creates a string variable from playlist metadata
         """
         return _get(
-            "string",
             metadata_variable_name=PLAYLIST_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,
@@ -264,7 +259,6 @@ class StringMetadataVariable(MetadataVariable, StringVariable):
         Creates a string variable from source metadata
         """
         return _get(
-            "string",
             metadata_variable_name=SOURCE_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,
@@ -301,7 +295,6 @@ class IntegerMetadataVariable(MetadataVariable, IntegerVariable):
         Creates an int variable from entry metadata
         """
         return _get(
-            "int",
             metadata_variable_name=ENTRY_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,
@@ -320,7 +313,6 @@ class IntegerMetadataVariable(MetadataVariable, IntegerVariable):
         Creates an int variable from playlist metadata
         """
         return _get(
-            "int",
             metadata_variable_name=PLAYLIST_METADATA_VARIABLE_NAME,
             metadata_key=metadata_key,
             variable_name=variable_name,

ytdl_sub-2026.1.11/src/ytdl_sub/prebuilt_presets/helpers/url.yaml

@@ -0,0 +1,177 @@
+presets:
+
+##################################################################################
+# Multi urls in the form of
+#
+#   "Subscription Name":
+#     - "url"
+#     - "url2"
+# or
+#
+#   "Subscription Name": "url"
+#
+# where the first url tries to grab channel avatar + banner
+#
+  _multi_url:
+    download:
+      - url: "{ %array_at(urls, 0) }"
+        playlist_thumbnails:
+          - name: "{avatar_uncropped_thumbnail_file_name}"
+            uid: "avatar_uncropped"
+          - name: "{banner_uncropped_thumbnail_file_name}"
+            uid: "banner_uncropped"
+        source_thumbnails:
+          - name: "{avatar_uncropped_thumbnail_file_name}"
+            uid: "avatar_uncropped"
+          - name: "{banner_uncropped_thumbnail_file_name}"
+            uid: "banner_uncropped"
+        include_sibling_metadata: "{include_sibling_metadata}"
+        webpage_url: "{modified_webpage_url}"
+
+      - url: "{ %array_slice(urls, 1) }"
+        include_sibling_metadata: "{include_sibling_metadata}"
+        webpage_url: "{modified_webpage_url}"
+    overrides:
+      avatar_uncropped_thumbnail_file_name: ""
+      banner_uncropped_thumbnail_file_name: ""
+      include_sibling_metadata: False
+      modified_webpage_url: "{webpage_url}"
+
+      subscription_array: >-
+        {
+          [
+            url, url2, url3, url4, url5, url6, url7, url8, url9, url10,
+            url11, url12, url13, url14, url15, url16, url17, url18, url19, url20,
+            url21, url22, url23, url24, url25, url26, url27, url28, url29, url30,
+            url31, url32, url33, url34, url35, url36, url37, url38, url39, url40,
+            url41, url42, url43, url44, url45, url46, url47, url48, url49, url50,
+            url51, url52, url53, url54, url55, url56, url57, url58, url59, url60,
+            url61, url62, url63, url64, url65, url66, url67, url68, url69, url70,
+            url71, url72, url73, url74, url75, url76, url77, url78, url79, url80,
+            url81, url82, url83, url84, url85, url86, url87, url88, url89, url90,
+            url91, url92, url93, url94, url95, url96, url97, url98, url99, url100
+          ]
+        }
+      urls: "{subscription_array}"
+
+      subscription_value: ""
+      url: "{subscription_value}"
+      url2: ""
+      url3: ""
+      url4: ""
+      url5: ""
+      url6: ""
+      url7: ""
+      url8: ""
+      url9: ""
+      url10: ""
+      url11: ""
+      url12: ""
+      url13: ""
+      url14: ""
+      url15: ""
+      url16: ""
+      url17: ""
+      url18: ""
+      url19: ""
+      url20: ""
+      url21: ""
+      url22: ""
+      url23: ""
+      url24: ""
+      url25: ""
+      url26: ""
+      url27: ""
+      url28: ""
+      url29: ""
+      url30: ""
+      url31: ""
+      url32: ""
+      url33: ""
+      url34: ""
+      url35: ""
+      url36: ""
+      url37: ""
+      url38: ""
+      url39: ""
+      url40: ""
+      url41: ""
+      url42: ""
+      url43: ""
+      url44: ""
+      url45: ""
+      url46: ""
+      url47: ""
+      url48: ""
+      url49: ""
+      url50: ""
+      url51: ""
+      url52: ""
+      url53: ""
+      url54: ""
+      url55: ""
+      url56: ""
+      url57: ""
+      url58: ""
+      url59: ""
+      url60: ""
+      url61: ""
+      url62: ""
+      url63: ""
+      url64: ""
+      url65: ""
+      url66: ""
+      url67: ""
+      url68: ""
+      url69: ""
+      url70: ""
+      url71: ""
+      url72: ""
+      url73: ""
+      url74: ""
+      url75: ""
+      url76: ""
+      url77: ""
+      url78: ""
+      url79: ""
+      url80: ""
+      url81: ""
+      url82: ""
+      url83: ""
+      url84: ""
+      url85: ""
+      url86: ""
+      url87: ""
+      url88: ""
+      url89: ""
+      url90: ""
+      url91: ""
+      url92: ""
+      url93: ""
+      url94: ""
+      url95: ""
+      url96: ""
+      url97: ""
+      url98: ""
+      url99: ""
+      url100: ""
+
+
+  # multi-url with bilateral scraping built into it via
+  # inspection of the URL and conditionally adding another
+  # ytdl-sub url download with the scraping and download reversed
+  _multi_url_bilateral_inner:
+    preset:
+      - "_url_bilateral_overrides"
+
+    download:
+      - url: "{ %array_apply(urls, %bilateral_url) }"
+        download_reverse: False
+        ytdl_options:
+          playlist_items: "-1:0:-1"
+        webpage_url: "{modified_webpage_url}"
+
+  _multi_url_bilateral:
+    preset:
+      - "_multi_url_bilateral_inner"
+      - "_multi_url"

ytdl_sub-2026.1.11/src/ytdl_sub/prebuilt_presets/helpers/url_categorized.yaml

@@ -0,0 +1,111 @@
+presets:
+  # Preset for categorizing URls like so
+  #
+  # subscription_name:
+  #   category_1:
+  #     - https://...1
+  #     - https://...2
+  #   category_2:
+  #     - url: https://...1
+  #       metadata_field_1: 2011
+  #       metadata_field_2: 'abc"
+  #   ...
+  #
+  # Metadata field of `url` must exist, other ones can be anything.
+  # Only supports a single level of nesting.
+  _url_categorized:
+    preset:
+      - "_multi_url_bilateral"
+
+    overrides:
+      # Parameters:
+      #   $0: url string or map containing url + metadata fields
+      #   $1: category key
+      #
+      # Output:
+      #  Map containing { url: ..., category: ..., metadata_field_1: ... }
+      "%flat_array__url_to_map_format": >-
+        {
+          %elif(
+            %is_map($0),
+            %map_extend( $0, { "category": $1 } ),
+            %is_string($0),
+            { "url": $0, "category": $1 },
+            %throw("If using album categories, each URL must be either a string or map with metadata fields")
+          )
+        }
+
+      # Parameters:
+      #  $0: category key
+      #  $1: array of URLs in either string or map form
+      #
+      # Output:
+      #   Array containing [{ url: ..., category: ... }, ... ]
+      "%flat_array__category_to_map_format": >-
+        { 
+          %array_apply_fixed(
+            %assert_then(
+              %is_array( $1 ),
+              $1,
+              "If using album categories, each category must map to an array"
+            ),
+            $0,
+            %flat_array__url_to_map_format 
+          )
+        }
+
+      # Parameters:
+      #  $0: map containing fields { url: <url_value>, category: ... }
+      #
+      # Output:
+      #  Nested map containing { <url_value>: { url: <url_value>, category: ... } }
+      "%flat_array__url_keyed_map_format": >-
+        { { %map_get($0, "url"): $0 } }
+
+      # Creates an array in the form of [ { url: ..., category: ..., metadata_field_1: ... }, ... ]
+      category_url_array: >-
+        { %array_flatten( %map_apply( subscription_map, %flat_array__category_to_map_format ) ) }
+
+      # Creates a map in the form of { <url value>: { category: ..., metadata_field_1: ... }, ... }
+      category_url_map: >-
+        {
+          %array_reduce(
+            %array_apply( category_url_array, %flat_array__url_keyed_map_format ),
+            %map_extend
+          )
+        }
+
+      # Parameters:
+      #   $0: metadata field to fetch for the current url
+      #   $1: default value
+      #
+      # Output:
+      #   Metadata field value if it exists. Otherwise, return default value
+      "%get_url_field": >-
+        { %map_get( %map( %map_get( category_url_map, ytdl_sub_input_url, {} ) ), $0, $1 ) }
+
+      # Parameters:
+      #   $0: metadata field to fetch for the current url
+      #
+      # Output:
+      #   True if field is specified. False otherwise.
+      "%contains_url_field": >-
+        { %not( %is_null( %get_url_field( $0, null ) ) ) }
+        
+
+      # Parameters:
+      #  $0: integer to fetch the i'th url using 1-based indexing
+      #
+      # Output:
+      #   i'th url in the category map
+      "%get_url_i": >-
+        { 
+          %map_get(
+            %map( %array_at( category_url_array, %int( %sub($0, 1) ), {} ) ),
+            "url",
+            %array_at(subscription_array, %int( %sub($0, 1) ), null)
+          )
+        }
+
+      subscription_map: "{ {} }"
+      urls: "{ %array_apply(%range(100, 1), %get_url_i) }"