jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-26 17:23:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: update scp integration for more robust config handling (#535)

Browse Source 
* chore: remove scp

* Squashed 'kiauh/core/submodules/simple_config_parser/' content from commit abee21c

git-subtree-dir: kiauh/core/submodules/simple_config_parser
git-subtree-split: abee21c08658be4529028844304df60650c09afa

* Squashed 'kiauh/core/submodules/simple_config_parser/' changes from abee21c..aa0302b

aa0302b fix: fix missing newline chars in raw strings

git-subtree-dir: kiauh/core/submodules/simple_config_parser
git-subtree-split: aa0302b02b56b252ed88fd2db88ee878a5bb7b5b

* Squashed 'kiauh/core/submodules/simple_config_parser/' changes from aa0302b..ef52958

ef52958 refactor: conditionally add empty line when adding new section

git-subtree-dir: kiauh/core/submodules/simple_config_parser
git-subtree-split: ef529580f469ef020135cb03e250fcd4e0d70acf

* fix: update scp integration for more robust cfg modification

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

---------

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-09-21 13:55:30 +02:00
committed by GitHub
parent b604d93d0c
commit 6b6607c5ab
58 changed files with 3103 additions and 1184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
kiauh/components/moonraker/moonraker_utils.py
View File

@@ -77,20 +77,15 @@ def create_example_moonraker_conf(
uds = instance.base.comms_dir.joinpath("klippy.sock")
scp = SimpleConfigParser()
scp.read(target)
scp.read_file(target)
trusted_clients: List[str] = [
".".join(ip),
*scp.get("authorization", "trusted_clients"),
f" {'.'.join(ip)}\n",
*scp.getval("authorization", "trusted_clients"),
]
scp.set("server", "port", str(port))
scp.set("server", "klippy_uds_address", str(uds))
scp.set(
"authorization",
"trusted_clients",
"\n".join(trusted_clients),
True,
)
scp.set_option("server", "port", str(port))
scp.set_option("server", "klippy_uds_address", str(uds))
scp.set_option("authorization", "trusted_clients", trusted_clients)
# add existing client and client configs in the update section
if clients is not None and len(clients) > 0:
@@ -105,7 +100,7 @@ def create_example_moonraker_conf(
]
scp.add_section(section=c_section)
for option in c_options:
scp.set(c_section, option[0], option[1])
scp.set_option(c_section, option[0], option[1])
# client config part
c_config = c.client_config
@@ -120,9 +115,9 @@ def create_example_moonraker_conf(
]
scp.add_section(section=c_config_section)
for option in c_config_options:
scp.set(c_config_section, option[0], option[1])
scp.set_option(c_config_section, option[0], option[1])
scp.write(target)
scp.write_file(target)
Logger.print_ok(f"Example moonraker.conf created in '{instance.base.cfg_dir}'")