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

logic: Changed include files being analyzed solely by path

Browse Source 
* removed header extensions
* added source extensions to source path setup screen
* added caching to hasFilePath check
* don't show header list in CDB setup
* removed TestSettings.xml
This commit is contained in:
Eberhard Graether
2016-05-19 21:47:09 +02:00
parent 5295267513
commit 86d1ff2905
26 changed files with 236 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/file/FileManager.cpp
+33 -33
View File
@@ -23,13 +23,11 @@ const std::vector<FilePath>& FileManager::getSourcePaths() const
void FileManager::setPaths(
std::vector<FilePath> sourcePaths,
std::vector<FilePath> headerPaths,
std::vector<std::string> sourceExtensions,
std::vector<std::string> includeExtensions
std::vector<std::string> sourceExtensions
){
m_sourcePaths = sourcePaths;
m_headerPaths = headerPaths;
m_sourceExtensions = sourceExtensions;
m_includeExtensions = includeExtensions;
}
void FileManager::fetchFilePaths(const std::vector<FileInfo>& oldFileInfos)
@@ -46,10 +44,24 @@ void FileManager::fetchFilePaths(const std::vector<FileInfo>& oldFileInfos)
for (std::map<FilePath, FileInfo>::iterator it = m_files.begin(); it != m_files.end(); it++)
{
m_removedFiles.insert(it->first);
const FilePath& filePath = it->first;
if (filePath.exists() && !hasSourceExtension(filePath))
{
FileInfo fileInfo = FileSystem::getFileInfoForPath(filePath);
if (fileInfo.lastWriteTime > it->second.lastWriteTime)
{
it->second.lastWriteTime = fileInfo.lastWriteTime;
m_updatedFiles.insert(filePath);
}
}
else
{
m_removedFiles.insert(filePath);
}
}
std::vector<FileInfo> fileInfos = getFileInfosInProject();
std::vector<FileInfo> fileInfos = FileSystem::getFileInfosFromPaths(m_sourcePaths, m_sourceExtensions);
for (FileInfo fileInfo: fileInfos)
{
const FilePath& filePath = fileInfo.path;
@@ -60,7 +72,7 @@ void FileManager::fetchFilePaths(const std::vector<FileInfo>& oldFileInfos)
if (fileInfo.lastWriteTime > it->second.lastWriteTime)
{
it->second.lastWriteTime = fileInfo.lastWriteTime;
m_updatedFiles.insert(fileInfo.path);
m_updatedFiles.insert(filePath);
}
}
else
@@ -93,7 +105,20 @@ std::set<FilePath> FileManager::getRemovedFilePaths() const
bool FileManager::hasFilePath(const FilePath& filePath) const
{
return (m_files.find(filePath) != m_files.end());
if (m_files.find(filePath) != m_files.end())
{
return true;
}
for (FilePath path : m_headerPaths)
{
if (path == filePath || path.contains(filePath))
{
return true;
}
}
return false;
}
bool FileManager::hasSourceExtension(const FilePath& filePath) const
@@ -101,39 +126,14 @@ bool FileManager::hasSourceExtension(const FilePath& filePath) const
return filePath.hasExtension(m_sourceExtensions);
}
bool FileManager::hasIncludeExtension(const FilePath& filePath) const
{
return filePath.hasExtension(m_includeExtensions);
}
const FileInfo FileManager::getFileInfo(const FilePath& filePath) const
{
std::map<FilePath, FileInfo>::const_iterator it = m_files.find(filePath);
if (it == m_files.end())
{
LOG_ERROR("No FileInfo found for file: " + filePath.str());
return FileSystem::getFileInfoForPath(filePath);
}
return it->second;
}
std::vector<FileInfo> FileManager::getFileInfosInProject() const
{
std::vector<FileInfo> fileInfos;
std::vector<std::pair<std::vector<FilePath>, std::vector<std::string>>> pathsExtensionsPairs;
pathsExtensionsPairs.push_back(std::make_pair(m_sourcePaths, m_includeExtensions));
pathsExtensionsPairs.push_back(std::make_pair(m_sourcePaths, m_sourceExtensions));
pathsExtensionsPairs.push_back(std::make_pair(m_headerPaths, m_includeExtensions));
for (size_t i = 0; i < pathsExtensionsPairs.size(); i++)
{
utility::append(
fileInfos,
FileSystem::getFileInfosFromPaths(pathsExtensionsPairs[i].first, pathsExtensionsPairs[i].second)
);
}
return fileInfos;
}