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

[BUGFIX] Fix preset ordering (#226)

Browse source
This commit is contained in:
Jesse Bannon 2022-09-08 15:43:09 -07:00 committed by GitHub
parent 2c86d640a4
commit d0cbd57a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ytdl_sub/config/preset.py
View file

@ -278,8 +278,9 @@ class Preset(StrictDictValidator):
if parent_preset_validator is None: if parent_preset_validator is None:
return return
presets_to_merge: List[Dict] = []
for parent_preset in [preset.value for preset in parent_preset_validator.list]: for parent_preset in [preset.value for preset in parent_preset_validator.list]:
parent_presets = set() sub_parent_presets: Dict[str, Dict] = {}
while parent_preset: while parent_preset:
# Make sure the parent preset actually exists # Make sure the parent preset actually exists
@ -290,20 +291,25 @@ class Preset(StrictDictValidator):
) )
# Make sure we do not hit an infinite loop # Make sure we do not hit an infinite loop
if parent_preset in parent_presets: if parent_preset in sub_parent_presets:
raise self._validation_exception( raise self._validation_exception(
f"preset loop detected with the preset '{parent_preset}'" f"preset loop detected with the preset '{parent_preset}'"
) )
parent_preset_dict = copy.deepcopy(config.presets.dict[parent_preset]) parent_preset_dict = copy.deepcopy(config.presets.dict[parent_preset])
parent_presets.add(parent_preset) sub_parent_presets[parent_preset] = parent_preset_dict
parent_preset = parent_preset_dict.get("preset") parent_preset = parent_preset_dict.get("preset")
# Override the parent preset with the contents of this preset # Extend reversed, so top-most parents are first
self._value = mergedeep.merge( if sub_parent_presets:
parent_preset_dict, self._value, strategy=mergedeep.Strategy.REPLACE presets_to_merge.extend(reversed(sub_parent_presets.values()))
)
# Append this preset (the subscription) last
presets_to_merge.append(copy.deepcopy(self._value))
# Merge all of the presets
self._value = mergedeep.merge({}, *presets_to_merge, strategy=mergedeep.Strategy.REPLACE)
def __init__(self, config: ConfigFile, name: str, value: Any): def __init__(self, config: ConfigFile, name: str, value: Any):
super().__init__(name=name, value=value) super().__init__(name=name, value=value)

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

@ -133,7 +133,7 @@ class TestPreset:
assert tags_string_dict == { assert tags_string_dict == {
"key-1": "preset_0", "key-1": "preset_0",
"key-2": "preset_1", "key-2": "preset_2",
"key-3": "this-preset", "key-3": "this-preset",
} }