do not prefix filenames with slash if in archive directory is empty
This commit is contained in:
@@ -80,11 +80,17 @@ 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();
|
||||||
AddFile(sDirName.c_str(), inArchiveDirName.c_str());
|
const std::string prefix = inArchiveDirName.empty() ? "" : inArchiveDirName + "/";
|
||||||
|
if (!inArchiveDirName.empty())
|
||||||
|
{
|
||||||
|
AddFile(sDirName.c_str(), inArchiveDirName.c_str());
|
||||||
|
}
|
||||||
|
std::string fPath;
|
||||||
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();
|
fPath.clear();
|
||||||
|
fPath = prefix + entry.path().filename().string();
|
||||||
if (entry.is_directory()) AddFiles(entry, fPath);
|
if (entry.is_directory()) AddFiles(entry, fPath);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user