danvics/ytdl-sub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[BUGFIX] Fix overrides failing validation in datetime vars (#209)

Browse source
This commit is contained in:
Jesse Bannon 2022-09-02 14:41:51 -07:00 committed by GitHub
parent 2f4a2a4726
commit 3e801c56eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ytdl_sub/validators/string_datetime.py
View file

@ -22,7 +22,7 @@ class StringDatetimeValidator(OverridesStringFormatterValidator):
def apply_formatter(self, variable_dict: Dict[str, str]) -> str: def apply_formatter(self, variable_dict: Dict[str, str]) -> str:
output = super().apply_formatter(variable_dict) output = super().apply_formatter(variable_dict)
try: try:
_ = datetime_from_str(self._value) _ = datetime_from_str(output)
except Exception as exc: except Exception as exc:
raise self._validation_exception(f"Invalid datetime string: {str(exc)}") raise self._validation_exception(f"Invalid datetime string: {str(exc)}")
return output return output

18
tests/unit/config/test_preset.py
View file

@ -135,6 +135,24 @@ class TestPreset:
"key-3": "this-preset", "key-3": "this-preset",
} }
def test_preset_datetime_with_override(self, config_file, youtube_video, output_options):
preset = Preset(
config=config_file,
name="test",
value={
"youtube": youtube_video,
"output_options": dict(
output_options,
**{"maintain_download_archive": True, "keep_files_after": "today-{ttl}"}
),
"overrides": {"ttl": "2months"},
},
)
assert (
preset.overrides.apply_formatter(formatter=preset.output_options.keep_files_after)
== "today-2months"
)
@pytest.mark.parametrize( @pytest.mark.parametrize(
"parent_preset", ["preset_self_loop", "preset_loop_0", "preset_loop_1"] "parent_preset", ["preset_self_loop", "preset_loop_0", "preset_loop_1"]
) )