Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

config: Allow config includes to use subfolder globs #6375

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

config: Allow config includes to use subfolder globs #6375

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62feda5
config: Allow config includes to use subfolder globs
bdistin Oct 25, 2023
2e3657f
docs: Update documentation to show subdirectory wildcard support
bdistin Oct 26, 2023
4cc2d06
config: Recursive globs only added in python version 3.5 and above
bdistin Nov 13, 2023
51e4a56
Merge branch 'Klipper3d:master' into patch-1
bdistin Nov 13, 2023
1a12d54
Merge branch 'Klipper3d:master' into patch-1
bdistin Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/Config_Reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@ aliases_<name>:

Include file support. One may include additional config file from the
main printer config file. Wildcards may also be used (eg,
"configs/*.cfg").
"configs/\*.cfg", "configs/\*\*/\*.cfg").

```
[include my_other_config.cfg]
Expand Down
2 changes: 1 addition & 1 deletion klippy/configfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def _resolve_include(self, source_filename, include_spec, fileconfig,
dirname = os.path.dirname(source_filename)
include_spec = include_spec.strip()
include_glob = os.path.join(dirname, include_spec)
include_filenames = glob.glob(include_glob)
include_filenames = glob.glob(include_glob, recursive=True)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The recursive argument for glob.glob() was added in Python 3.5. AFAIK Klipper still supports running on Python 2.7, so this would be a breaking change.

if not include_filenames and not glob.has_magic(include_glob):
# Empty set is OK if wildcard but not for direct file reference
raise error("Include file '%s' does not exist" % (include_glob,))
Expand Down