diff --git a/src/ArchiveBuilderHelper.cpp b/src/ArchiveBuilderHelper.cpp index 638a652..2c19e34 100644 --- a/src/ArchiveBuilderHelper.cpp +++ b/src/ArchiveBuilderHelper.cpp @@ -7,7 +7,6 @@ #include -using std::filesystem::is_directory; using std::filesystem::path; using std::filesystem::directory_entry; using std::filesystem::directory_iterator; @@ -25,7 +24,9 @@ namespace BsaPacker { uint32_t count = 0; for(auto& p : recursive_directory_iterator(rootDirectory)) { - count++; + if (p.is_regular_file()) { + count++; + } } return count; } @@ -42,7 +43,6 @@ namespace BsaPacker bool ArchiveBuilderHelper::isFileIgnorable(const path& filepath, const std::vector& rootDirFilenames) const { return this->doesPathContainFiles(filepath, rootDirFilenames) || // ignore files within mod directory - is_directory(filepath) || // ignore directories this->isExtensionBlacklisted(filepath); // ignore user blacklisted file types } diff --git a/src/GeneralArchiveBuilder.cpp b/src/GeneralArchiveBuilder.cpp index f32f374..cbdc177 100644 --- a/src/GeneralArchiveBuilder.cpp +++ b/src/GeneralArchiveBuilder.cpp @@ -25,7 +25,7 @@ namespace BsaPacker const auto& rootDirFiles = this->m_ArchiveBuilderHelper->getRootDirectoryFilenames(dirString); qDebug() << "root is: " << m_RootDirectory.path() + '/'; - QDirIterator iterator(this->m_RootDirectory, QDirIterator::Subdirectories); + QDirIterator iterator(this->m_RootDirectory.absolutePath(), QDir::Files, QDirIterator::Subdirectories); while (iterator.hasNext()) { QApplication::processEvents(); diff --git a/src/TextureArchiveBuilder.cpp b/src/TextureArchiveBuilder.cpp index 479afad..a05232e 100644 --- a/src/TextureArchiveBuilder.cpp +++ b/src/TextureArchiveBuilder.cpp @@ -26,7 +26,7 @@ namespace BsaPacker const auto& rootDirFiles = this->m_ArchiveBuilderHelper->getRootDirectoryFilenames(dirString); qDebug() << "root is: " << m_RootDirectory.path() + '/'; - QDirIterator iterator(this->m_RootDirectory, QDirIterator::Subdirectories); + QDirIterator iterator(this->m_RootDirectory.absolutePath(), QDir::Files, QDirIterator::Subdirectories); while (iterator.hasNext()) { QApplication::processEvents(); diff --git a/src/TexturelessArchiveBuilder.cpp b/src/TexturelessArchiveBuilder.cpp index 5f5d8a0..a4fff0c 100644 --- a/src/TexturelessArchiveBuilder.cpp +++ b/src/TexturelessArchiveBuilder.cpp @@ -25,7 +25,7 @@ namespace BsaPacker const auto& rootDirFiles = this->m_ArchiveBuilderHelper->getRootDirectoryFilenames(dirString); qDebug() << "root is: " << m_RootDirectory.path() + '/'; - QDirIterator iterator(this->m_RootDirectory, QDirIterator::Subdirectories); + QDirIterator iterator(this->m_RootDirectory.absolutePath(), QDir::Files, QDirIterator::Subdirectories); while (iterator.hasNext()) { QApplication::processEvents();