Added options to whiledir for filename and no extension.

This commit is contained in:
Brad Arant committed 2024-10-14 15:59:43 -07:00
1 parent 426b98805c
commit 2bae00acff
3 files changed
+8 -6

No files matched your search

+6 -4
View File
@@ -11,21 +11,23 @@ namespace jet {
__whiledir::__whiledir(coreutils::ZString &in, coreutils::MString &parent, Global &global) : Tag(in, parent, global) {
if(!variableDefined("path"))
throw coreutils::Exception("whiledir tag must specify a path.");
if(!variableDefined("name"))
throw coreutils::Exception("whiledir tag requires a name tag.");
if(variableDefined("sort") && (variables["sort"] == "true")) {
std::vector<std::filesystem::directory_entry> entries;
for(auto const &entry : std::filesystem::directory_iterator(variables["path"].str()))
entries.push_back(entry);
std::sort(entries.begin(), entries.end(), [](const auto &a, const auto &b) { return a.path() < b.path(); });
for(const auto &entry : entries) {
variables[variables["name"]] = entry.path();
global.variables[variables["fullpath"]] = entry.path();
global.variables[variables["filename"]] = entry.path().filename();
global.variables[variables["filenamenoextension"]] = entry.path().stem();
processContainer(container);
container.reset();
}
} else {
for(auto const &entry : std::filesystem::directory_iterator(variables["path"].str())) {
variables[variables["name"]] = entry.path();
global.variables[variables["fullpath"]] = entry.path();
global.variables[variables["filename"]] = entry.path().filename();
global.variables[variables["filenamenoextension"]] = entry.path().stem();
processContainer(container);
container.reset();
}