GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Do not prefix filenames with slash if in archive directory is empty' (#200) from misc2 into master

Browse Source 
Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/200
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>
This commit is contained in:
Oleksii_Hyzha
2025-02-18 12:11:29 +01:00
parent b644a200ce 21c49ee91d
commit cd58d638d3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openVulkanoCpp/IO/Archive/IArchiveWriter.hpp
View File

@@ -80,15 +80,19 @@ namespace OpenVulkano
bool AddFiles(const std::filesystem::path& dirName, const std::string& inArchiveDirName) bool AddFiles(const std::filesystem::path& dirName, const std::string& inArchiveDirName)
{ {
std::string sDirName = dirName.string(); const std::string sDirName = dirName.string();
const std::string prefix = inArchiveDirName.empty() ? "" : inArchiveDirName + "/";
if (!inArchiveDirName.empty())
{
AddFile(sDirName.c_str(), inArchiveDirName.c_str()); AddFile(sDirName.c_str(), inArchiveDirName.c_str());
}
for(const auto& entry : std::filesystem::directory_iterator(dirName)) for(const auto& entry : std::filesystem::directory_iterator(dirName))
{ {
std::string fPath = inArchiveDirName + "/" + entry.path().filename().string(); const std::string fPath = prefix + entry.path().filename().string();
if (entry.is_directory()) AddFiles(entry, fPath); if (entry.is_directory()) AddFiles(entry, fPath);
else else
{ {
std::string entryName = entry.path().string(); const std::string entryName = entry.path().string();
AddFile(entryName.c_str(), fPath.c_str()); AddFile(entryName.c_str(), fPath.c_str());
} }
} }