better code for getDirectoryEntries
This commit is contained in:
parent
1ced777f20
commit
e35efb55a2
|
@ -1,4 +1,5 @@
|
||||||
#include "common/fs_file.h"
|
#include "common/fs_file.h"
|
||||||
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
|
||||||
namespace Common::FS {
|
namespace Common::FS {
|
||||||
|
@ -66,17 +67,16 @@ std::vector<DirEntry> File::getDirectoryEntries(const std::string& path) {
|
||||||
std::vector<DirEntry> files;
|
std::vector<DirEntry> files;
|
||||||
|
|
||||||
for (const auto& entry : std::filesystem::directory_iterator(curpath)) {
|
for (const auto& entry : std::filesystem::directory_iterator(curpath)) {
|
||||||
if (std::filesystem::is_regular_file( entry.path().string())) {
|
|
||||||
DirEntry e = {};
|
DirEntry e = {};
|
||||||
|
if (std::filesystem::is_regular_file(entry.path().string())) {
|
||||||
e.name = entry.path().filename().string();
|
e.name = entry.path().filename().string();
|
||||||
e.isFile = true;
|
e.isFile = true;
|
||||||
files.push_back(e);
|
|
||||||
} else {
|
} else {
|
||||||
DirEntry e = {};
|
DirEntry e = {};
|
||||||
e.name = entry.path().filename().string() + "/"; //hmmm not sure if it has to be like this...
|
e.name = entry.path().filename().string() + "/"; // hmmm not sure if it has to be like this...
|
||||||
e.isFile = false;
|
e.isFile = false;
|
||||||
files.push_back(e);
|
|
||||||
}
|
}
|
||||||
|
files.push_back(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return files;
|
return files;
|
||||||
|
|
Loading…
Reference in New Issue