GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-02-02 11:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring merge Method into a New Class & Adding Unit Tests (#137)

Browse Source
This commit is contained in:
Adam Outler
2023-06-19 22:35:53 -04:00
committed by GitHub
parent 9879a9f05b
commit db3f622023
5 changed files with 219 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kvmd/yamlconf/loader.py
View File

@@ -22,6 +22,8 @@
import os
from .. import tools
from typing import IO
from typing import Any
@@ -30,7 +32,7 @@ import yaml.nodes
import yaml.resolver
import yaml.constructor
from .. import tools
from .merger import yaml_merge
# =====
@@ -70,9 +72,9 @@ class _YamlLoader(yaml.SafeLoader):
for child in sorted(os.listdir(inc_path)):
child_path = os.path.join(inc_path, child)
if os.path.isfile(child_path) or os.path.islink(child_path):
tools.merge(tree, (load_yaml_file(child_path) or {}))
yaml_merge(tree, (load_yaml_file(child_path) or {}), child_path)
else: # Try file
tools.merge(tree, (load_yaml_file(inc_path) or {}))
yaml_merge(tree, (load_yaml_file(inc_path) or {}), inc_path)
return tree