From 319cf1a3bbf370d282c1f7e9c14e85b1551c2bee Mon Sep 17 00:00:00 2001
From: jbannon <jbann1994@gmail.com>
Date: Sun, 3 Apr 2022 08:28:38 +0000
Subject: [PATCH] force separate dict validator usage

---
 .../validators/base/dict_validator.py         | 38 ++++++-------------
 .../validators/config/preset_validator.py     |  1 -
 .../config/sources/source_validator.py        |  7 +---
 3 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/ytdl_subscribe/validators/base/dict_validator.py b/ytdl_subscribe/validators/base/dict_validator.py
index bb6b8f7a..2ea63f02 100644
--- a/ytdl_subscribe/validators/base/dict_validator.py
+++ b/ytdl_subscribe/validators/base/dict_validator.py
@@ -1,4 +1,5 @@
 from typing import Any
+from typing import Dict
 from typing import Optional
 from typing import Set
 from typing import Type
@@ -17,15 +18,13 @@ class DictValidator(Validator):
 
     required_fields: Set[str] = set()
     optional_fields: Set[str] = set()
-    allow_extra_fields = False
 
-    def __validate_required_fields_are_present(self):
-        """
-        Raises
-        -------
-        ValidationException
-            If the required fields are not present in the dict
-        """
+    _allow_extra_fields = False
+
+    def __init__(self, name, value):
+        super().__init__(name, value)
+
+        # Ensure all required keys are present
         for required_key in self.required_fields:
             if required_key not in self.value:
                 error_msg = (
@@ -33,30 +32,17 @@ class DictValidator(Validator):
                 )
                 raise ValidationException(error_msg)
 
-    def __validate_extra_fields(self):
-        """
-        Raises
-        -------
-        ValidationException
-            If allow_extra_fields=False and non-required/options fields are present
-        """
-        if not self.allow_extra_fields:
+        # If no extra fields are allowed, ensure all fields are either
+        # required or optional fields
+        if not self._allow_extra_fields:
             for object_key in self.object_keys:
-                if (
-                    object_key not in self.required_fields
-                    and object_key not in self.optional_fields
-                ):
+                if object_key not in self.allowed_fields:
                     error_msg = (
                         f"'{self.name}' contains the field '{object_key}' which is not allowed. "
                         f"Allowed fields: {', '.join(self.allowed_fields)}"
                     )
                     raise ValidationException(error_msg)
 
-    def __init__(self, name, value):
-        super().__init__(name, value)
-        self.__validate_required_fields_are_present()
-        self.__validate_extra_fields()
-
     def validate_dict_value(
         self, dict_value_name: str, validator: Type[T], default: Optional[Any] = None
     ) -> T:
@@ -92,4 +78,4 @@ class DictValidator(Validator):
 
 
 class DictWithExtraFieldsValidator(DictValidator):
-    allow_extra_fields = True
+    _allow_extra_fields = True
diff --git a/ytdl_subscribe/validators/config/preset_validator.py b/ytdl_subscribe/validators/config/preset_validator.py
index 8ecd3f56..aedb19b6 100644
--- a/ytdl_subscribe/validators/config/preset_validator.py
+++ b/ytdl_subscribe/validators/config/preset_validator.py
@@ -21,7 +21,6 @@ class PresetValidator(DictValidator):
         "overrides",
         *SubscriptionSourceName.all(),
     }
-    allow_extra_fields = False
 
     def __init__(self, name: str, value: Any):
         super().__init__(name=name, value=value)
diff --git a/ytdl_subscribe/validators/config/sources/source_validator.py b/ytdl_subscribe/validators/config/sources/source_validator.py
index 2d183ee5..4afe3ba2 100644
--- a/ytdl_subscribe/validators/config/sources/source_validator.py
+++ b/ytdl_subscribe/validators/config/sources/source_validator.py
@@ -4,6 +4,7 @@ from typing import Dict
 from typing import Type
 
 from ytdl_subscribe.validators.base.dict_validator import DictValidator
+from ytdl_subscribe.validators.base.dict_validator import DictWithExtraFieldsValidator
 from ytdl_subscribe.validators.base.string_validator import StringValidator
 
 
@@ -11,14 +12,10 @@ class DownloadStrategyValidator(DictValidator):
     pass
 
 
-class SourceValidator(DictValidator):
+class SourceValidator(DictWithExtraFieldsValidator):
     # All media sources must define a download strategy
     required_fields = {"download_strategy"}
 
-    # We allow extra fields at this level, once the download strategy is chosen,
-    # all fields in the dict should be required.
-    allow_extra_fields = True
-
     download_strategy_validator_mapping: Dict[str, Type[DownloadStrategyValidator]] = {}
 
     def __init__(self, name: str, value: Any):