From 876c915db7b7d7f74393d8cedfc0bb6705481975 Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Wed, 31 Dec 2025 11:47:44 -0800
Subject: [PATCH] fixed some tests, need to make sure url2, etc work and update
 collection

---
 .../config/validators/variable_validation.py  |  3 ++
 .../prebuilt_presets/helpers/url.yaml         |  1 +
 .../helpers/url_categorized.yaml              |  5 +--
 tests/unit/config/test_subscription.py        | 39 ++++++++-----------
 4 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/ytdl_sub/config/validators/variable_validation.py b/src/ytdl_sub/config/validators/variable_validation.py
index bb8ea705..82069d7c 100644
--- a/src/ytdl_sub/config/validators/variable_validation.py
+++ b/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)
 
diff --git a/src/ytdl_sub/prebuilt_presets/helpers/url.yaml b/src/ytdl_sub/prebuilt_presets/helpers/url.yaml
index 5236f3b6..99b1e12c 100644
--- a/src/ytdl_sub/prebuilt_presets/helpers/url.yaml
+++ b/src/ytdl_sub/prebuilt_presets/helpers/url.yaml
@@ -27,6 +27,7 @@ presets:
             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}"
diff --git a/src/ytdl_sub/prebuilt_presets/helpers/url_categorized.yaml b/src/ytdl_sub/prebuilt_presets/helpers/url_categorized.yaml
index c5aec965..80e041a7 100644
--- a/src/ytdl_sub/prebuilt_presets/helpers/url_categorized.yaml
+++ b/src/ytdl_sub/prebuilt_presets/helpers/url_categorized.yaml
@@ -108,7 +108,4 @@ presets:
         }
 
       subscription_map: "{ {} }"
-      urls: >-
-        {[
-          %get_url_i(1), %get_url_i(2), %get_url_i(3), %get_url_i(4)
-        ]}
\ No newline at end of file
+      urls: "{ %array_apply(%range(100, 1), %get_url_i) }"
\ No newline at end of file
diff --git a/tests/unit/config/test_subscription.py b/tests/unit/config/test_subscription.py
index 7e14fe05..c48f4f0e 100644
--- a/tests/unit/config/test_subscription.py
+++ b/tests/unit/config/test_subscription.py
@@ -1,4 +1,3 @@
-import json
 import re
 from contextlib import contextmanager
 from pathlib import Path
@@ -473,23 +472,19 @@ def test_advanced_tv_show_subscriptions(
     overrides = subs[5].overrides
 
     assert overrides.script.get("subscription_name").native == "Gardening with Ciscoe"
-    assert (
-        overrides.apply_formatter(overrides.dict["url"])
-        == "https://www.youtube.com/@gardeningwithciscoe4430"
-    )
-    assert (
-        overrides.apply_formatter(overrides.dict["url2"])
-        == "https://www.youtube.com/playlist?list=PLi8V8UemxeG6lo5if5H5g5EbsteELcb0_"
-    )
 
-    assert overrides.apply_formatter(overrides.dict["subscription_array"]) == json.dumps(
-        [
-            "https://www.youtube.com/@gardeningwithciscoe4430",
-            "https://www.youtube.com/playlist?list=PLi8V8UemxeG6lo5if5H5g5EbsteELcb0_",
-            "https://www.youtube.com/playlist?list=PLsJlQSR-KjmaQqqJ9jq18cF6XXXAR4kyn",
-            "https://www.youtube.com/watch?v=2vq-vPubS5I",
-        ]
-    )
+    assert overrides.apply_overrides_formatter_to_native(overrides.dict["subscription_array"]) == [
+        "https://www.youtube.com/@gardeningwithciscoe4430",
+        "https://www.youtube.com/playlist?list=PLi8V8UemxeG6lo5if5H5g5EbsteELcb0_",
+        "https://www.youtube.com/playlist?list=PLsJlQSR-KjmaQqqJ9jq18cF6XXXAR4kyn",
+        "https://www.youtube.com/watch?v=2vq-vPubS5I",
+    ]
+    assert overrides.apply_overrides_formatter_to_native(overrides.dict["urls"]) == [
+        "https://www.youtube.com/@gardeningwithciscoe4430",
+        "https://www.youtube.com/playlist?list=PLi8V8UemxeG6lo5if5H5g5EbsteELcb0_",
+        "https://www.youtube.com/playlist?list=PLsJlQSR-KjmaQqqJ9jq18cF6XXXAR4kyn",
+        "https://www.youtube.com/watch?v=2vq-vPubS5I",
+    ]
 
 
 def test_music_subscriptions(default_config: ConfigFile, music_subscriptions_path: Path):
@@ -525,7 +520,7 @@ def test_music_video_subscriptions(default_config: ConfigFile, music_video_subsc
     )
     assert jackson.get("subscription_indent_1").native == "Pop"
     assert (
-        jackson.get("url").native
+        jackson.get("urls").native[0]
         == "https://www.youtube.com/playlist?list=OLAK5uy_mnY03zP6abNWH929q2XhGzWD_2uKJ_n8E"
     )
 
@@ -533,12 +528,10 @@ def test_music_video_subscriptions(default_config: ConfigFile, music_video_subsc
     gnr = subs[3].overrides.script
 
     assert gnr.get("subscription_name").native == "Guns N' Roses"
-    assert (
-        gnr.get("url").native
-        == "https://www.youtube.com/playlist?list=PLOTK54q5K4INNXaHKtmXYr6J7CajWjqeJ"
-    )
+    gnr_urls = gnr.get("urls").native
+    assert gnr_urls[0] == "https://www.youtube.com/playlist?list=PLOTK54q5K4INNXaHKtmXYr6J7CajWjqeJ"
     assert gnr.get("subscription_indent_1").native == "Rock"
-    assert gnr.get("url2").native == "https://www.youtube.com/watch?v=OldpIhHPsbs"
+    assert gnr_urls[1] == "https://www.youtube.com/watch?v=OldpIhHPsbs"
 
 
 def test_default_docker_config_and_subscriptions(