Skip to content

core: make findFilePath more robust #751

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

core: make findFilePath more robust #751

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
14 changes: 11 additions & 3 deletions rwcore/platform/FileIndex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,20 @@ void FileIndex::indexTree(const std::filesystem::path &path) {
}

const FileIndex::IndexedData *FileIndex::getIndexedDataAt(const std::string &filePath) const {
auto normPath = normalizeFilePath(filePath);
return &indexedData_.at(normPath);
std::string normPath = normalizeFilePath(filePath);
try {
return &indexedData_.at(normPath);
} catch (...) {
RW_ERROR("Missing file: " << normPath);
return nullptr;
}
}

std::filesystem::path FileIndex::findFilePath(const std::string &filePath) const {
return getIndexedDataAt(filePath)->path;
auto idxData = getIndexedDataAt(filePath);
if (!idxData) return filePath;

return idxData->path;
}

FileContentsInfo FileIndex::openFileRaw(const std::string &filePath) const {
Expand Down