GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed yamlconf dump for dicts

Browse Source
This commit is contained in:
Devaev Maxim 2019-02-09 03:45:18 +03:00
parent 444128940a
commit 649957fdc9
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kvmd/yamlconf/dumper.py
View File

@ -1,10 +1,6 @@
# pylint: skip-file import textwrap
# infinite recursion
import operator import operator
from typing import Tuple
from typing import List from typing import List
from typing import Any from typing import Any
@ -14,28 +10,34 @@ from . import Section
# ===== # =====
_INDENT = 4
def make_config_dump(config: Section) -> str: def make_config_dump(config: Section) -> str:
return "\n".join(_inner_make_dump(config)) return "\n".join(_inner_make_dump(config))
def _inner_make_dump(config: Section, _path: Tuple[str, ...]=()) -> List[str]: def _inner_make_dump(config: Section, _level: int=0) -> List[str]:
lines = [] lines = []
for (key, value) in sorted(config.items(), key=operator.itemgetter(0)): for (key, value) in sorted(config.items(), key=operator.itemgetter(0)):
indent = len(_path) * " " indent = " " * _INDENT * _level
if isinstance(value, Section): if isinstance(value, Section):
lines.append("{}{}:".format(indent, key)) lines.append("{}{}:".format(indent, key))
lines += _inner_make_dump(value, _path + (key,)) lines += _inner_make_dump(value, _level + 1)
lines.append("") lines.append("")
else: else:
default = config._get_default(key) # pylint: disable=protected-access default = config._get_default(key) # pylint: disable=protected-access
comment = config._get_help(key) # pylint: disable=protected-access comment = config._get_help(key) # pylint: disable=protected-access
if default == value: if default == value:
lines.append("{}{}: {} # {}".format(indent, key, _make_yaml(value), comment)) lines.append("{}{}: {} # {}".format(indent, key, _make_yaml(value, _level), comment))
else: else:
lines.append("{}# {}: {} # {}".format(indent, key, _make_yaml(default), comment)) lines.append("{}# {}: {} # {}".format(indent, key, _make_yaml(default, _level), comment))
lines.append("{}{}: {}".format(indent, key, _make_yaml(value))) lines.append("{}{}: {}".format(indent, key, _make_yaml(value, _level)))
return lines return lines
def _make_yaml(value: Any) -> str: def _make_yaml(value: Any, level: int) -> str:
return yaml.dump(value, allow_unicode=True).replace("\n...\n", "").strip() dump = yaml.dump(value, indent=_INDENT, allow_unicode=True).replace("\n...\n", "").strip()
if isinstance(value, dict) and dump[0] != "{" or isinstance(value, list) and dump[0] != "[":
dump = "\n" + textwrap.indent(dump, prefix=" " * _INDENT * (level + 1))
return dump