Skip to content

Add filetree definitions #4

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

Open
wants to merge 4 commits into
base: cpp
Choose a base branch
from
Open

Add filetree definitions #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba13620
Add filetree
mochidaz Jan 27, 2022
6afbaf8
Fix dependencies, cleanup, and add a file test
andraantariksa Jan 27, 2022
4b51824
Some changes to filetree and implement the FileTree constructor
mochidaz Jan 28, 2022
21caf9a
Implement FileTree constructor
native-m Jan 28, 2022
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
35 changes: 31 additions & 4 deletions editor/src/filesystem/filetree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,41 @@
#include <tempeh/common/typedefs.hpp>
#include <cassert>
#include <system_error>
#include <list>

namespace TempehEditor::FileSystem {

FileTree::FileTree(std::string& path_str)
namespace fs = std::filesystem;

FileTree::FileTree(const fs::path &path_str)
{
std::filesystem::path path(path_str);
std::error_code err;
assert(std::filesystem::exists(path, err) && "Path did not exists");
std::list<FileTreeMap::iterator> list;
Copy link
Member

@andraantariksa andraantariksa Jan 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not use list.
https://dzone.com/articles/c-benchmark-%E2%80%93-stdvector-vs


auto [iter, _] = hashmap.insert_or_assign(path_str.string(),
nullptr);

list.push_back(iter);

while (!list.empty()) {
auto current_entry = list.front();
list.pop_front();
for (const auto & entry : fs::directory_iterator(current_entry->first)) {

fs::path p = entry.path();

std::shared_ptr<FileTree> tree;

if (fs::path(p).filename() == ".git") {
Copy link
Member

@andraantariksa andraantariksa Jan 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make a std::vector of excluded directory name and compare using it, rather than just a string

Copy link
Member Author

@mochidaz mochidaz Jan 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably by putting the excluded directories inside the config file after config parser is done and then pushing the directories into an std::vector

continue;
}
if (fs::is_directory(p)) {
tree = std::make_shared<FileTree>(p);
}

auto [i, _] = hashmap.insert_or_assign(p.string(), tree);
list.push_back(i);
}
}
}

// TODO
Expand Down
11 changes: 5 additions & 6 deletions editor/src/filesystem/filetree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@ namespace TempehEditor::FileSystem
class FileTree
{
private:
class FileTreeInternal
{
std::map<std::string, std::shared_ptr<FileTree>> hashmap;
};
std::unique_ptr<FileTreeInternal> root;
using FileTreeMap = std::map<std::string, std::shared_ptr<FileTree>>;
FileTreeMap hashmap;
public:
FileTree(std::string& path);
FileTree(const std::filesystem::path &path_str);



// Implemented as BFS
void traversal(std::function<void(FileMetaData)> f);
Expand Down
Empty file added test/dummy-dir/1.txt
View file
Open in desktop
Empty file.
Empty file added test/dummy-dir/2.txt
View file
Open in desktop
Empty file.
Empty file added test/dummy-dir/dummy-dir-2/3.txt
View file
Open in desktop
Empty file.
Empty file added test/dummy-dir/dummy-dir-2/4.txt
View file
Open in desktop
Empty file.
25 changes: 14 additions & 11 deletions test/editor/filesystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,20 @@

TEST(FileSystem, FileTree_ObjectCreation)
{
ASSERT_DEATH({
TempehEditor::FileSystem::FileTree test_obj(std::string("/blah"));
}, "Path did not exists");
// For debugging purpose
TempehEditor::FileSystem::FileTree test_obj("/home/rahman/Projects/tempeh-engine/test/dummy-dir");

#ifdef BOOST_OS_WINDOWS
ASSERT_NO_FATAL_FAILURE({
// Uhhh... is C:\\ is not a `standard`?
TempehEditor::FileSystem::FileTree test_obj(std::string("C:\\Windows"));
});
#elif BOOST_OS_LINUX
// TODO linux
#endif
// ASSERT_DEATH({
// TempehEditor::FileSystem::FileTree test_obj(std::string("/blah"));
// }, "Path did not exists");
//
//#ifdef BOOST_OS_WINDOWS
// ASSERT_NO_FATAL_FAILURE({
// // Uhhh... is C:\\ is not a `standard`?
// TempehEditor::FileSystem::FileTree test_obj(std::string("C:\\Windows"));
// });
//#elif BOOST_OS_LINUX
// // TODO linux
//#endif

}