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

Merge commit '64de883b3f40322c5048745af0a5eef5be570616' into feat/obico-for-v6

Browse Source
This commit is contained in:
dw-0
2024-06-21 15:52:08 +02:00
parent 81bbbb5630 64de883b3f
commit dbea2f4def
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kiauh/core/submodules/simple_config_parser/src/simple_config_parser/simple_config_parser.py
View File

@@ -85,7 +85,7 @@ class DuplicateOptionError(Exception):
class SimpleConfigParser: class SimpleConfigParser:
"""A customized config parser targeted at handling Klipper style config files""" """A customized config parser targeted at handling Klipper style config files"""
_SECTION_RE = re.compile(r"\s*\[(\w+\s?[\w\-]+)]\s*([#;].*)?$") _SECTION_RE = re.compile(r"\s*\[(\w+\s?.+)]\s*([#;].*)?$")
_OPTION_RE = re.compile(r"^\s*(\w+)\s*[:=]\s*([^=:].*)\s*([#;].*)?$") _OPTION_RE = re.compile(r"^\s*(\w+)\s*[:=]\s*([^=:].*)\s*([#;].*)?$")
_MLOPTION_RE = re.compile(r"^\s*(\w+)\s*[:=]\s*([#;].*)?$") _MLOPTION_RE = re.compile(r"^\s*(\w+)\s*[:=]\s*([#;].*)?$")
_COMMENT_RE = re.compile(r"^\s*([#;].*)?$") _COMMENT_RE = re.compile(r"^\s*([#;].*)?$")

5
kiauh/core/submodules/simple_config_parser/tests/features/line_parsing/data/case_parse_option.py
View File

@@ -8,6 +8,11 @@ testcases = [
("option: value\n", "option", "value"), ("option: value\n", "option", "value"),
("option: value # inline comment", "option", "value"), ("option: value # inline comment", "option", "value"),
("option: value # inline comment\n", "option", "value"), ("option: value # inline comment\n", "option", "value"),
(
"description: Helper: park toolhead used in PAUSE and CANCEL_PRINT",
"description",
"Helper: park toolhead used in PAUSE and CANCEL_PRINT",
),
("description: homing!", "description", "homing!"), ("description: homing!", "description", "homing!"),
("description: inline macro :-)", "description", "inline macro :-)"), ("description: inline macro :-)", "description", "inline macro :-)"),
("path: %GCODES_DIR%", "path", "%GCODES_DIR%"), ("path: %GCODES_DIR%", "path", "%GCODES_DIR%"),

2
kiauh/core/submodules/simple_config_parser/tests/features/line_parsing/data/case_parse_section.py
View File

@@ -3,4 +3,6 @@ testcases = [
("[test_section two]", "test_section two"), ("[test_section two]", "test_section two"),
("[section1] # inline comment", "section1"), ("[section1] # inline comment", "section1"),
("[section2] ; second comment", "section2"), ("[section2] ; second comment", "section2"),
("[include moonraker-obico-update.cfg]", "include moonraker-obico-update.cfg"),
("[include moonraker_obico_macros.cfg]", "include moonraker_obico_macros.cfg"),
] ]

5
kiauh/core/submodules/simple_config_parser/tests/features/line_type_detection/data/case_line_is_section.py
View File

@@ -1,6 +1,11 @@
testcases = [ testcases = [
("[example_section]", True), ("[example_section]", True),
("[gcode_macro CANCEL_PRINT]", True),
("[gcode_macro SET_PAUSE_NEXT_LAYER]", True),
("[gcode_macro _TOOLHEAD_PARK_PAUSE_CANCEL]", True),
("[update_manager moonraker-obico]", True), ("[update_manager moonraker-obico]", True),
("[include moonraker_obico_macros.cfg]", True),
("[include moonraker-obico-update.cfg]", True),
("[example_section two]", True), ("[example_section two]", True),
("not_a_valid_section", False), ("not_a_valid_section", False),
("section: invalid", False), ("section: invalid", False),