From efb5e889b3dbb91fb0d8830c03bb586ed8e99adc Mon Sep 17 00:00:00 2001 From: Jesse Bannon Date: Fri, 26 Dec 2025 14:43:37 -0800 Subject: [PATCH] lint --- src/ytdl_sub/config/overrides.py | 8 +++++++- src/ytdl_sub/config/preset.py | 4 +--- tests/unit/config/test_preset.py | 6 ++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ytdl_sub/config/overrides.py b/src/ytdl_sub/config/overrides.py index adbd6574..c3b791b7 100644 --- a/src/ytdl_sub/config/overrides.py +++ b/src/ytdl_sub/config/overrides.py @@ -1,5 +1,6 @@ -from typing import Any, List, Iterable +from typing import Any from typing import Dict +from typing import Iterable from typing import Optional from typing import Set @@ -89,6 +90,11 @@ class Overrides(UnstructuredDictFormatterValidator, Scriptable): return True def ensure_variable_names_not_a_plugin(self, plugin_names: Iterable[str]) -> None: + """ + Throws an error if an override variable or function has the same name as a + preset key. This is to avoid confusion when accidentally defining things in + overrides that are meant to be in the preset. + """ for name in self.keys: if name.startswith("%"): name = name[1:] diff --git a/src/ytdl_sub/config/preset.py b/src/ytdl_sub/config/preset.py index 20ab2dfa..31ac34a8 100644 --- a/src/ytdl_sub/config/preset.py +++ b/src/ytdl_sub/config/preset.py @@ -194,9 +194,7 @@ class Preset(_PresetShell): self.plugins: PresetPlugins = self._validate_and_get_plugins() self.overrides = self._validate_key(key="overrides", validator=Overrides, default={}) - self.overrides.ensure_variable_names_not_a_plugin( - plugin_names=PRESET_KEYS - ) + self.overrides.ensure_variable_names_not_a_plugin(plugin_names=PRESET_KEYS) VariableValidation( downloader_options=self.downloader_options, diff --git a/tests/unit/config/test_preset.py b/tests/unit/config/test_preset.py index 5f913266..8e9b4c89 100644 --- a/tests/unit/config/test_preset.py +++ b/tests/unit/config/test_preset.py @@ -456,8 +456,6 @@ class TestPreset: "embed_subtitles": True, }, "output_options": {"output_directory": "dir", "file_name": "acjk"}, - "overrides": { - "throttle_protection": "nope" - } + "overrides": {"throttle_protection": "nope"}, }, - ) \ No newline at end of file + )