From 8eeb9abe83ac275c90a81208d8f74a83deb15c34 Mon Sep 17 00:00:00 2001
From: Jesse Bannon <jbann1994@gmail.com>
Date: Wed, 4 Oct 2023 10:39:42 -0700
Subject: [PATCH] [FEATURE] Multiple subscription indents on same line

---
 .../subscriptions/subscription_validators.py  | 10 ++--
 tests/unit/config/test_subscription.py        | 56 +++++++++++++++++++
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/ytdl_sub/subscriptions/subscription_validators.py b/src/ytdl_sub/subscriptions/subscription_validators.py
index 93390183..242ab4a8 100644
--- a/src/ytdl_sub/subscriptions/subscription_validators.py
+++ b/src/ytdl_sub/subscriptions/subscription_validators.py
@@ -36,15 +36,15 @@ def subscription_value_variable_name() -> str:
     return "subscription_value"
 
 
-def maybe_indent_override_value(value: str) -> Optional[str]:
+def maybe_indent_override_values(value: str) -> List[str]:
     """
     Returns
     -------
     Value if it is an overide [Value]. None otherwise.
     """
     if value.startswith("[") and value.endswith("]"):
-        return value[1:-1]
-    return None
+        return value[1:-1].split("][")
+    return []
 
 
 class SubscriptionOutput(Validator, ABC):
@@ -179,14 +179,14 @@ class SubscriptionValidator(SubscriptionOutput):
                             subscription_value=subscription_value,
                         )
                     )
-                elif override_value := maybe_indent_override_value(key):
+                elif override_values := maybe_indent_override_values(key):
                     self._children.append(
                         SubscriptionValidator(
                             name=obj_name,
                             value=obj,
                             config=config,
                             presets=presets,
-                            indent_overrides=indent_overrides + [override_value],
+                            indent_overrides=indent_overrides + override_values,
                             subscription_value=subscription_value,
                         )
                     )
diff --git a/tests/unit/config/test_subscription.py b/tests/unit/config/test_subscription.py
index f5aed89d..c613d05a 100644
--- a/tests/unit/config/test_subscription.py
+++ b/tests/unit/config/test_subscription.py
@@ -109,6 +109,25 @@ def preset_with_subscription_value_nested_presets_and_indent_variables(
     )
 
 
+@pytest.fixture
+def preset_with_subscription_value_nested_presets_and_indent_variables_same_line(
+    preset_with_subscription_value: Dict,
+):
+    return dict(
+        preset_with_subscription_value,
+        **{
+            "parent_preset_2": {
+                "[INDENT_1]": {
+                    "parent_preset_1": {"test_2_1": "is_2_1_overwritten"},
+                    "[INDENT_2][INDENT_3]": {
+                        "test_1": "is_1_overwritten",
+                    },
+                }
+            }
+        },
+    )
+
+
 def test_subscription_file_preset_applies(config_file: ConfigFile, preset_with_file_preset: Dict):
     with mock_load_yaml(preset_dict=preset_with_file_preset):
         subs = Subscription.from_file_path(config=config_file, subscription_path="mocked")
@@ -239,6 +258,43 @@ def test_subscription_file_value_applies_from_config_and_nested_and_indent_varia
     assert sub_2_1.get("subscription_indent_2") == "original_2"
 
 
+def test_subscription_file_value_applies_from_config_and_nested_and_indent_variables_same_line(
+    config_file_with_subscription_value: ConfigFile,
+    preset_with_subscription_value_nested_presets_and_indent_variables_same_line: Dict,
+):
+    with mock_load_yaml(
+        preset_dict=preset_with_subscription_value_nested_presets_and_indent_variables_same_line
+    ):
+        subs = Subscription.from_file_path(
+            config=config_file_with_subscription_value, subscription_path="mocked"
+        )
+    assert len(subs) == 4
+
+    # Test __value__ worked correctly from the config
+    sub_test_value = [sub for sub in subs if sub.name == "test_value"][
+        0
+    ].overrides.dict_with_format_strings
+    sub_1 = [sub for sub in subs if sub.name == "test_1"][0].overrides.dict_with_format_strings
+    sub_2_1 = [sub for sub in subs if sub.name == "test_2_1"][0].overrides.dict_with_format_strings
+
+    assert sub_test_value.get("subscription_indent_1") == "original_1"
+    assert sub_test_value.get("subscription_indent_2") == "original_2"
+
+    assert sub_1.get("test_config_subscription_value") == "is_1_overwritten"
+    assert sub_1.get("subscription_name") == "test_1"
+    assert sub_1.get("subscription_value") == "is_1_overwritten"
+    assert sub_1.get("subscription_indent_1") == "INDENT_1"
+    assert sub_1.get("subscription_indent_2") == "INDENT_2"
+    assert sub_1.get("subscription_indent_3") == "INDENT_3"
+
+    assert sub_2_1.get("test_config_subscription_value") == "is_2_1_overwritten"
+    assert sub_2_1.get("subscription_name") == "test_2_1"
+    assert sub_2_1.get("subscription_value") == "is_2_1_overwritten"
+    assert sub_2_1.get("subscription_indent_1") == "INDENT_1"
+    assert sub_2_1.get("subscription_indent_2") == "original_2"
+    assert "subscription_indent_3" not in sub_2_1
+
+
 def test_subscription_file_bad_value(config_file: ConfigFile):
     with mock_load_yaml(preset_dict={"__value__": {"should be": "string"}}), pytest.raises(
         ValidationException,