data: refreshing with DB

* database stores modification time of files.
* FileManager updates internal state based on database info.
* reimplemented FileManager's check if a file is in project.
* implemented clearing data of updated or removed files before reparsing the updated and added files.

src/lib/utility/file/FileManager.cpp

@@ -4,8 +4,10 @@
 #include <set>
 
 #include "utility/file/FileSystem.h"
+#include "utility/utility.h"
 
-FileManager::FileManager()
+FileManager::FileManager(StorageAccessProxy* storageAccessProxy)
+	: m_storageAccessProxy(storageAccessProxy)
 {
 }
 
@@ -35,58 +37,42 @@ void FileManager::setPaths(
 	m_includeExtensions = includeExtensions;
 }
 
-void FileManager::reset()
-{
-	m_files.clear();
-	m_addedFiles.clear();
-	m_updatedFiles.clear();
-	m_removedFiles.clear();
-}
-
 void FileManager::fetchFilePaths()
 {
+	std::map<FilePath, FileInfo> files;
+	for (FileInfo oldFileInfo: m_storageAccessProxy->getInfoOnAllFiles())
+	{
+		files[oldFileInfo.path] = oldFileInfo;
+	}
+
 	m_addedFiles.clear();
 	m_updatedFiles.clear();
 	m_removedFiles.clear();
 
-	for (std::map<FilePath, FileInfo>::iterator it = m_files.begin(); it != m_files.end(); it++)
+	for (std::map<FilePath, FileInfo>::iterator it = files.begin(); it != files.end(); it++)
 	{
 		m_removedFiles.insert(it->first);
 	}
 
-	std::vector<std::pair<std::vector<FilePath>, std::vector<std::string>>> pathsExtensionsPairs;
-	pathsExtensionsPairs.push_back(std::make_pair(m_includePaths, m_includeExtensions));
-	pathsExtensionsPairs.push_back(std::make_pair(m_sourcePaths, m_sourceExtensions));
-
-	for (size_t i = 0; i < pathsExtensionsPairs.size(); i++)
+	std::vector<FileInfo> fileInfos = getFileInfosInProject();
+	for (FileInfo fileInfo: fileInfos)
 	{
-		std::vector<FileInfo> fileInfos =
-			FileSystem::getFileInfosFromPaths(pathsExtensionsPairs[i].first, pathsExtensionsPairs[i].second);
-
-		for (FileInfo fileInfo: fileInfos)
+		const FilePath& filePath = fileInfo.path;
+		std::map<FilePath, FileInfo>::iterator it = files.find(filePath);
+		if (it != files.end())
 		{
-			const FilePath& filePath = fileInfo.path;
-			std::map<FilePath, FileInfo>::iterator it = m_files.find(filePath);
-			if (it != m_files.end())
+			m_removedFiles.erase(filePath);
+			if (fileInfo.lastWriteTime > it->second.lastWriteTime)
 			{
-				m_removedFiles.erase(filePath);
-				if (fileInfo.lastWriteTime > it->second.lastWriteTime)
-				{
-					it->second.lastWriteTime = fileInfo.lastWriteTime;
-					m_updatedFiles.insert(fileInfo.path);
-				}
-			}
-			else
-			{
-				m_files.insert(std::pair<FilePath, FileInfo>(filePath, fileInfo));
-				m_addedFiles.insert(filePath);
+				it->second.lastWriteTime = fileInfo.lastWriteTime;
+				m_updatedFiles.insert(fileInfo.path);
 			}
 		}
-	}
-
-	for (const FilePath& filePath : m_removedFiles)
-	{
-		m_files.erase(filePath);
+		else
+		{
+			files.insert(std::pair<FilePath, FileInfo>(filePath, fileInfo));
+			m_addedFiles.insert(filePath);
+		}
 	}
 }
 
@@ -107,7 +93,16 @@ std::set<FilePath> FileManager::getRemovedFilePaths() const
 
 bool FileManager::hasFilePath(const FilePath& filePath) const
 {
-	return (m_files.find(filePath) != m_files.end());
+	std::vector<FileInfo> fileInfos = getFileInfosInProject();
+	for (size_t i = 0; i < fileInfos.size(); i++)
+	{
+		if (fileInfos[i].path == filePath)
+		{
+			return true;
+		}
+	}
+
+	return false;
 }
 
 bool FileManager::hasSourceExtension(const FilePath& filePath) const
@@ -119,3 +114,22 @@ bool FileManager::hasIncludeExtension(const FilePath& filePath) const
 {
 	return filePath.hasExtension(m_includeExtensions);
 }
+
+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_includePaths, m_includeExtensions));
+	pathsExtensionsPairs.push_back(std::make_pair(m_sourcePaths, m_sourceExtensions));
+
+	for (size_t i = 0; i < pathsExtensionsPairs.size(); i++)
+	{
+		utility::append(
+			fileInfos,
+			FileSystem::getFileInfosFromPaths(pathsExtensionsPairs[i].first, pathsExtensionsPairs[i].second)
+		);
+	}
+
+	return fileInfos;
+}