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

fixed the whiledir tag.

Browse Source
This commit is contained in:
barant 2025-01-09 08:02:38 -08:00
parent 4a17002d22
commit b65d8d4396
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__read.cpp
View File

@ -13,10 +13,10 @@ namespace jet {
throw coreutils::Exception("name keyword must be specified."); throw coreutils::Exception("name keyword must be specified.");
if(hasContainer) if(hasContainer)
throw coreutils::Exception("read tag does not have a container."); throw coreutils::Exception("read tag does not have a container.");
fd = open(keywords[resolveKeyword("file")].c_str(), O_RDONLY); fd = open(resolveKeyword("file").c_str(), O_RDONLY);
if(fd < 0) if(fd < 0)
throw coreutils::Exception("file name is not found."); throw coreutils::Exception("file name is not found.");
global.variables[keywords[resolveKeyword("name")]].read(fd); global.variables[resolveKeyword("name")].read(fd);
close(fd); close(fd);
} }

16
__whiledir.cpp
View File

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