zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-11-19 19:52:06 +00:00
Code Activity

feat: include user files in iwd

Browse Source
This commit is contained in:
Jan Laupetin
2025-11-18 21:13:56 +00:00
parent 304091c93d
commit 74ef6118b6
5 changed files with 157 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ObjCommon/SearchPath/ISearchPath.h
View File

@@ -15,7 +15,7 @@ public:
std::unique_ptr<std::istream> m_stream;
int64_t m_length;
_NODISCARD bool IsOpen() const;
[[nodiscard]] bool IsOpen() const;
SearchPathOpenFile();
SearchPathOpenFile(std::unique_ptr<std::istream> stream, int64_t length);

84
src/ObjCommon/SearchPath/SearchPathFilesystem.cpp
View File

@@ -3,13 +3,42 @@
#include "Utils/Logging/Log.h"
#include "Utils/ObjFileStream.h"
#include <algorithm>
#include <filesystem>
#include <format>
#include <fstream>
#include <iostream>
namespace fs = std::filesystem;
namespace
{
bool CheckOptionsPrefix(std::string& prefix, std::string& path)
{
if (prefix.empty())
return true;
const auto combinedPath = fs::path(path) / prefix;
if (fs::status(combinedPath).type() == std::filesystem::file_type::directory)
{
prefix = std::string();
path = combinedPath.string();
return true;
}
const auto parentDir = combinedPath.parent_path();
if (!parentDir.empty())
{
if (fs::status(parentDir).type() != std::filesystem::file_type::directory)
return false;
path = parentDir.string();
prefix = combinedPath.filename().string();
}
return true;
}
} // namespace
SearchPathFilesystem::SearchPathFilesystem(std::string path)
: m_path(std::move(path))
{
@@ -33,28 +62,65 @@ SearchPathOpenFile SearchPathFilesystem::Open(const std::string& fileName)
void SearchPathFilesystem::Find(const SearchPathSearchOptions& options, const std::function<void(const std::string&)>& callback)
{
std::string prefix = options.m_prefix;
std::string path = m_path;
if (!CheckOptionsPrefix(prefix, path))
return;
try
{
if (options.m_should_include_subdirectories)
{
std::filesystem::recursive_directory_iterator iterator(m_path);
std::filesystem::recursive_directory_iterator iterator(path);
for (const auto entry = begin(iterator); iterator != end(iterator); ++iterator)
{
auto path = entry->path();
if (options.m_filter_extensions && path.extension().string() != options.m_extension)
if (!entry->is_regular_file())
continue;
callback(options.m_absolute_paths ? absolute(path).string() : path.string());
auto entryPath = entry->path();
if (!prefix.empty() && !entryPath.filename().string().starts_with(prefix))
continue;
if (options.m_filter_extensions && entryPath.extension().string() != options.m_extension)
continue;
const auto absolutePath = absolute(entryPath);
if (options.m_absolute_paths)
{
callback(absolutePath.string());
}
else
{
const auto relativePath = fs::relative(entryPath, m_path);
callback(relativePath.string());
}
}
}
else
{
std::filesystem::directory_iterator iterator(m_path);
std::filesystem::directory_iterator iterator(path);
for (const auto entry = begin(iterator); iterator != end(iterator); ++iterator)
{
auto path = entry->path();
if (options.m_filter_extensions && path.extension().string() != options.m_extension)
if (!entry->is_regular_file())
continue;
callback(options.m_absolute_paths ? absolute(path).string() : path.string());
auto entryPath = entry->path();
if (!prefix.empty() && !entryPath.filename().string().starts_with(prefix))
continue;
if (options.m_filter_extensions && entryPath.extension().string() != options.m_extension)
continue;
const auto absolutePath = absolute(entryPath);
if (options.m_absolute_paths)
{
callback(absolutePath.string());
}
else
{
const auto relativePath = fs::relative(absolutePath, m_path);
callback(relativePath.string());
}
}
}
}

7
src/ObjCommon/SearchPath/SearchPathSearchOptions.cpp
View File

@@ -39,3 +39,10 @@ SearchPathSearchOptions& SearchPathSearchOptions::FilterExtensions(std::string e
return *this;
}
SearchPathSearchOptions& SearchPathSearchOptions::FilterPrefix(std::string prefix)
{
m_prefix = std::move(prefix);
return *this;
}

16
src/ObjCommon/SearchPath/SearchPathSearchOptions.h
View File

@@ -5,17 +5,19 @@
class SearchPathSearchOptions
{
public:
bool m_should_include_subdirectories;
bool m_disk_files_only;
bool m_absolute_paths;
bool m_filter_extensions;
std::string m_extension;
SearchPathSearchOptions();
SearchPathSearchOptions& IncludeSubdirectories(bool value);
SearchPathSearchOptions& OnlyDiskFiles(bool value);
SearchPathSearchOptions& AbsolutePaths(bool value);
SearchPathSearchOptions& FilterExtensions(std::string extension);
SearchPathSearchOptions& FilterPrefix(std::string prefix);
bool m_should_include_subdirectories;
bool m_disk_files_only;
bool m_absolute_paths;
bool m_filter_extensions;
std::string m_extension;
std::string m_prefix;
};