barant/JetCore
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work towards a clean compile on migrating set and get variables from Tag.

Browse Source
This commit is contained in:
barant committed 2025-01-08 10:27:30 -08:00
1 parent 2549220914
commit 5c27df59da
25 files changed
+178 -306
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

__whiledir.cpp
+15 -29
View File
@@ -11,43 +11,29 @@ namespace jet {
__whiledir::__whiledir(coreutils::ZString &in, coreutils::MString &parentOut, Global &global, Tag *parent, Tag *local) : Tag(in, parentOut, global, parent, this) {
if(!keywordDefined("path"))
throw coreutils::Exception("whiledir tag must specify a path.");
resolveKeyword("path");
resolveKeyword("sort");
if(keywordDefined("sort") && (keywords["sort"] == "true")) {
if(keywordDefined("sort") && (keywords[resolveKeyword("sort")] == "true")) {
std::vector<std::filesystem::directory_entry> entries;
for(auto const &entry : std::filesystem::directory_iterator(variables["path"].str()))
for(auto const &entry : std::filesystem::directory_iterator(variables[resolveKeyword("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) {
if(keywordDefined("fullpath")) {
resolveKeyword("fullpath");
global.variables[keywords["fullpath"]] = entry.path();
}
if(keywordDefined("filename")) {
resolveKeyword("filename");
global.variables[keywords["filename"]] = entry.path().filename();
}
if(keywordDefined("filenamenoextension")) {
resolveKeyword("filenamenoextension");
global.variables[keywords["filenamenoextension"]] = entry.path().stem();
}
if(keywordDefined("fullpath"))
global.variables[keywords[resolveKeyword("fullpath")]] = entry.path();
if(keywordDefined("filename"))
global.variables[keywords[resolveKeyword("filename")]] = entry.path().filename();
if(keywordDefined("filenamenoextension"))
global.variables[keywords[resolveKeyword("filenamenoextension")]] = entry.path().stem();
processContainer(container);
container.reset();
}
} else {
for(auto const &entry : std::filesystem::directory_iterator(variables["path"].str())) {
if(keywordDefined("fullpath")) {
resolveKeyword("fullpath");
global.variables[keywords["fullpath"]] = entry.path();
}
if(keywordDefined("filename")) {
resolveKeyword("filename");
global.variables[keywords["filename"]] = entry.path().filename();
}
if(keywordDefined("filenamenoextension")) {
resolveKeyword("filenamenoextension");
global.variables[keywords["filenamenoextension"]] = entry.path().stem();
}
for(auto const &entry : std::filesystem::directory_iterator(variables[resolveKeyword("path")].str())) {
if(keywordDefined("fullpath"))
global.variables[keywords[resolveKeyword("fullpath")]] = entry.path();
if(keywordDefined("filename"))
global.variables[keywords[resolveKeyword("filename")]] = entry.path().filename();
if(keywordDefined("filenamenoextension"))
global.variables[keywords[resolveKeyword("filenamenoextension")]] = entry.path().stem();
processContainer(container);
container.reset();
}