Skip to content

fix: PackFile::getBakeOutputDir unable to recognize parent directory of original file with backslash #57

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

Merged
merged 1 commit into from
Jan 27, 2025
Merged

fix: PackFile::getBakeOutputDir unable to recognize parent directory of original file with backslash #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/vpkpp/PackFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ void fixFilePathForWindows(std::string& path) {
} // namespace

PackFile::PackFile(std::string fullFilePath_)
: fullFilePath(std::move(fullFilePath_)) {}
: fullFilePath(std::move(fullFilePath_)) {
string::normalizeSlashes(this->fullFilePath);
}

std::unique_ptr<PackFile> PackFile::open(const std::string& path, const EntryCallback& callback) {
auto extension = std::filesystem::path{path}.extension().string();
Expand Down Expand Up @@ -583,7 +585,7 @@ std::string_view PackFile::getFilepath() const {
}

std::string PackFile::getTruncatedFilepath() const {
return (std::filesystem::path{this->fullFilePath}.parent_path() / this->getTruncatedFilestem()).string();
return std::filesystem::path{this->fullFilePath}.parent_path().string() + '/' + this->getTruncatedFilestem();
}

std::string PackFile::getFilename() const {
Expand Down
Loading