Skip to content

Update following move of IFileTree glob() and walk() to free function. #144

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

Merged
Holt59 merged 1 commit into from
Jul 8, 2025
Merged

Update following move of IFileTree glob() and walk() to free function. #144

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions src/mobase/wrappers/pyfiletree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,11 @@ namespace mo2::python {
.value("SKIP", IFileTree::WalkReturn::SKIP)
.export_values();

py::enum_<IFileTree::GlobPatternType>(iFileTreeClass, "GlobPatternType")
.value("GLOB", IFileTree::GlobPatternType::GLOB)
.value("REGEX", IFileTree::GlobPatternType::REGEX)
// in C++ this is not an inner enum due to the conditional feature of glob(),
// but in Python this makes more sense as a inner enum
py::enum_<GlobPatternType>(iFileTreeClass, "GlobPatternType")
.value("GLOB", GlobPatternType::GLOB)
.value("REGEX", GlobPatternType::REGEX)
.export_values();

// Non-mutable operations:
Expand All @@ -187,17 +189,21 @@ namespace mo2::python {
QString>(&IFileTree::walk, py::const_),
py::arg("callback"), py::arg("sep") = "\\");

iFileTreeClass.def("walk", [](IFileTree const* tree) {
return make_generator(tree->walk());
// the walk() and glob() generator version are free functions in C++ due to the
// conditional nature, but in Python, it makes more sense to have them as method
// of IFileTree directly

iFileTreeClass.def("walk", [](std::shared_ptr<const IFileTree> tree) {
return make_generator(walk(tree));
});

iFileTreeClass.def(
"glob", // &IFileTree::glob,
[](IFileTree const* tree, QString pattern,
IFileTree::GlobPatternType patternType) {
return make_generator(tree->glob(pattern, patternType));
"glob",
[](std::shared_ptr<const IFileTree> tree, QString pattern,
GlobPatternType patternType) {
return make_generator(glob(tree, pattern, patternType));
},
py::arg("pattern"), py::arg("type") = IFileTree::GlobPatternType::GLOB);
py::arg("pattern"), py::arg("type") = GlobPatternType::GLOB);

// Kind-of-static operations:
iFileTreeClass.def("createOrphanTree", &IFileTree::createOrphanTree,
Expand Down