ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

utility: added FilePath abstraction and rewrote data management to use it

Browse Source 
The utility class FilePath wraps an instance of boost::filesystem::path. Using FilePath allows for easy comparision of
file paths on different platforms using absolute or relative paths. Whereever file paths are compared, this wrapper
should be used.
This commit is contained in:
Eberhard Graether
2015-03-09 01:51:32 +01:00
parent 7014c8ac4c
commit df888e4151
37 changed files with 387 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/CodeController.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ std::vector<CodeView::CodeSnippetParams> CodeController::getSnippetsForActiveTok
for (CodeView::CodeSnippetParams& params : fileSnippets)
{
params.locationFile = m_locationAccess->getTokenLocationsForLinesInFile(
file->getFilePath(), params.startLineNumber, params.endLineNumber);
file->getFilePath().str(), params.startLineNumber, params.endLineNumber);
}
if (declarationId != 0)
@@ -144,7 +144,7 @@ std::vector<CodeView::CodeSnippetParams> CodeController::getSnippetsForActiveTok
std::vector<CodeView::CodeSnippetParams> CodeController::getSnippetsForFile(const TokenLocationFile* file) const
{
std::shared_ptr<TextAccess> textAccess = TextAccess::createFromFile(file->getFilePath());
std::shared_ptr<TextAccess> textAccess = TextAccess::createFromFile(file->getFilePath().str());
std::vector<std::pair<uint, uint>> ranges = getSnippetRangesForFile(file);
std::vector<CodeView::CodeSnippetParams> snippets;
src/lib/component/view/CodeView.cpp
+7 -7
View File
@@ -40,21 +40,21 @@ bool CodeView::CodeSnippetParams::sort(const CodeSnippetParams& a, const CodeSni
return false;
}
const FilePath& aFilePath = a.locationFile.getFilePath();
const FilePath& bFilePath = b.locationFile.getFilePath();
// different files
if (a.locationFile.getFilePath() != b.locationFile.getFilePath())
if (aFilePath != bFilePath)
{
// first header
if (FileSystem::filePathWithoutExtension(a.locationFile.getFilePath()) ==
FileSystem::filePathWithoutExtension(b.locationFile.getFilePath()))
if (aFilePath.withoutExtension() == bFilePath.withoutExtension())
{
return FileSystem::extension(a.locationFile.getFilePath()) >
FileSystem::extension(b.locationFile.getFilePath());
return aFilePath.extension() > bFilePath.extension();
}
// alphabetical filepath without extension
else
{
return FileSystem::filePathWithoutExtension(a.locationFile.getFilePath())
< FileSystem::filePathWithoutExtension(b.locationFile.getFilePath());
return aFilePath.withoutExtension() < bFilePath.withoutExtension();
}
}