ui/logic/data: refreshing only source files that have been updated

This change adds the refresh component that allows for refreshing the source code via UI or shortcut. If automatic
refreshing is activated via the UI, the code is refreshed anytime the window gets focus. The contents of all the
updated source files get removed from Storage, before reparsing them. File dependencies are not respected yet.

src/lib/Application.cpp

@@ -46,7 +46,7 @@ void Application::loadProject(const std::string& projectSettingsFilePath)
 	m_project = Project::create(m_graphAccessProxy.get(), m_locationAccessProxy.get());
 
 	m_project->loadProjectSettings(projectSettingsFilePath);
-	m_project->parseCode();
+	m_project->parseCode(false);
 }
 
 void Application::loadSource(const std::string& sourceDirectoryPath)
@@ -55,13 +55,12 @@ void Application::loadSource(const std::string& sourceDirectoryPath)
 
 	m_project->clearProjectSettings();
 	m_project->setSourceDirectoryPath(sourceDirectoryPath);
-	m_project->parseCode();
+	m_project->parseCode(false);
 }
 
 void Application::reloadProject()
 {
-	m_project->clearStorage();
-	m_project->parseCode();
+	m_project->parseCode(true);
 }
 
 void Application::saveProject(const std::string& projectSettingsFilePath)

src/lib/CMakeLists.txt

@@ -32,6 +32,8 @@ add_files(
 	component/controller/GraphController.h
 	component/controller/GraphLayouter.cpp
 	component/controller/GraphLayouter.h
+	component/controller/RefreshController.cpp
+	component/controller/RefreshController.h
 	component/controller/SearchController.cpp
 	component/controller/SearchController.h
 	component/controller/StatusBarController.cpp
@@ -50,6 +52,8 @@ add_files(
 	component/view/GraphView.h
 	component/view/MainView.cpp
 	component/view/MainView.h
+	component/view/RefreshView.cpp
+	component/view/RefreshView.h
 	component/view/SearchView.cpp
 	component/view/SearchView.h
 	component/view/StatusBarView.cpp
@@ -204,6 +208,7 @@ add_files(
 
 	utility/messaging/type/MessageActivateTokenLocation.h
 	utility/messaging/type/MessageActivateTokens.h
+	utility/messaging/type/MessageAutoRefreshChanged.h
 	utility/messaging/type/MessageError.h
 	utility/messaging/type/MessageFind.h
 	utility/messaging/type/MessageFinishedParsing.h
@@ -219,6 +224,7 @@ add_files(
 	utility/messaging/type/MessageStatus.h
 	utility/messaging/type/MessageRedo.h
 	utility/messaging/type/MessageUndo.h
+	utility/messaging/type/MessageWindowFocus.h
 
 	utility/messaging/Message.h
 	utility/messaging/MessageBase.h

src/lib/Project.cpp

@@ -77,7 +77,7 @@ void Project::clearStorage()
 	Token::resetNextId();
 }
 
-void Project::parseCode()
+void Project::parseCode(bool refresh)
 {
 	std::string sourcePath = ProjectSettings::getInstance()->getSourcePath();
 	if (sourcePath.size())
@@ -92,11 +92,33 @@ void Project::parseCode()
 		std::vector<std::string> headerSearchPaths = ProjectSettings::getInstance()->getHeaderSearchPaths();
 		headerSearchPaths.push_back(sourcePath);
 
-		CxxParser parser(m_storage.get());
+		std::vector<std::string> filePaths;
+		if (refresh)
+		{
+			filePaths = FileSystem::getFileNamesFromDirectoryUpdatedAfter(sourcePath, extensions, m_lastParseTimeString);
+		}
+		else
+		{
+			filePaths = FileSystem::getFileNamesFromDirectory(sourcePath, extensions);
+		}
 
+		if (!filePaths.size())
+		{
+			MessageFinishedParsing(0, 0, m_storage->getErrorCount()).dispatch();
+			return;
+		}
+
+		m_lastParseTimeString = FileSystem::getTimeStringNow();
+
+		if (refresh)
+		{
+			m_storage->clearFileData(filePaths);
+		}
+
+		CxxParser parser(m_storage.get());
 		clock_t time = clock();
 		parser.parseFiles(
-			FileSystem::getSourceFilesFromDirectory(sourcePath, extensions),
+			filePaths,
 			ApplicationSettings::getInstance()->getHeaderSearchPaths(),
 			headerSearchPaths
 		);
@@ -108,7 +130,7 @@ void Project::parseCode()
 		double parseTime = (double)(time) / CLOCKS_PER_SEC;
 		LOG_INFO_STREAM(<< "parse time: " << parseTime);
 
-		MessageFinishedParsing(parseTime, m_storage->getErrorCount()).dispatch();
+		MessageFinishedParsing(filePaths.size(), parseTime, m_storage->getErrorCount()).dispatch();
 	}
 }
 

src/lib/Project.h

@@ -23,7 +23,7 @@ public:
 	bool setSourceDirectoryPath(const std::string& sourceDirectoryPath);
 
 	void clearStorage();
-	void parseCode();
+	void parseCode(bool refresh);
 
 private:
 	Project(GraphAccessProxy* graphAccessProxy, LocationAccessProxy* locationAccessProxy);
@@ -36,6 +36,8 @@ private:
 	LocationAccessProxy* const m_locationAccessProxy;
 
 	std::shared_ptr<Storage> m_storage;
+
+	std::string m_lastParseTimeString;
 };
 
 #endif // PROJECT_H

src/lib/component/ComponentFactory.cpp

@@ -3,11 +3,13 @@
 #include "component/Component.h"
 #include "component/controller/CodeController.h"
 #include "component/controller/GraphController.h"
+#include "component/controller/RefreshController.h"
 #include "component/controller/SearchController.h"
 #include "component/controller/StatusBarController.h"
 #include "component/controller/UndoRedoController.h"
 #include "component/view/CodeView.h"
 #include "component/view/GraphView.h"
+#include "component/view/RefreshView.h"
 #include "component/view/SearchView.h"
 #include "component/view/StatusBarView.h"
 #include "component/view/UndoRedoView.h"
@@ -47,6 +49,15 @@ std::shared_ptr<Component> ComponentFactory::createGraphComponent()
 	return component;
 }
 
+std::shared_ptr<Component> ComponentFactory::createRefreshComponent()
+{
+	std::shared_ptr<View> view = m_viewFactory->createRefreshView(m_viewLayout);
+	std::shared_ptr<RefreshController> controller = std::make_shared<RefreshController>();
+
+	std::shared_ptr<Component> component = std::make_shared<Component>(view, controller);
+	return component;
+}
+
 std::shared_ptr<Component> ComponentFactory::createSearchComponent()
 {
 	std::shared_ptr<SearchView> view = m_viewFactory->createSearchView(m_viewLayout);

src/lib/component/ComponentFactory.h

@@ -21,6 +21,7 @@ public:
 
 	std::shared_ptr<Component> createCodeComponent();
 	std::shared_ptr<Component> createGraphComponent();
+	std::shared_ptr<Component> createRefreshComponent();
 	std::shared_ptr<Component> createSearchComponent();
 	std::shared_ptr<Component> createStatusBarComponent();
 	std::shared_ptr<Component> createUndoRedoComponent();

src/lib/component/ComponentManager.cpp

@@ -24,14 +24,17 @@ void ComponentManager::setup()
 	std::shared_ptr<Component> codeComponent = m_componentFactory->createCodeComponent();
 	m_components.push_back(codeComponent);
 
+	std::shared_ptr<Component> undoRedoComponent = m_componentFactory->createUndoRedoComponent();
+	m_components.push_back(undoRedoComponent);
+
+	std::shared_ptr<Component> refreshComponent = m_componentFactory->createRefreshComponent();
+	m_components.push_back(refreshComponent);
+
 	std::shared_ptr<Component> searchComponent = m_componentFactory->createSearchComponent();
 	m_components.push_back(searchComponent);
 
 	std::shared_ptr<Component> statusBarComponent = m_componentFactory->createStatusBarComponent();
 	m_components.push_back(statusBarComponent);
-
-	std::shared_ptr<Component> undoRedoComponent = m_componentFactory->createUndoRedoComponent();
-	m_components.push_back(undoRedoComponent);
 }
 
 ComponentManager::ComponentManager()

src/lib/component/controller/RefreshController.cpp

@@ -0,0 +1,35 @@
+#include "component/controller/RefreshController.h"
+
+#include "component/view/RefreshView.h"
+
+RefreshController::RefreshController()
+	: m_autoRefreshEnabled(false)
+{
+}
+
+RefreshController::~RefreshController()
+{
+}
+
+void RefreshController::handleMessage(MessageAutoRefreshChanged* message)
+{
+	m_autoRefreshEnabled = message->enabled;
+}
+
+void RefreshController::handleMessage(MessageRefresh* message)
+{
+	getView()->refreshView();
+}
+
+void RefreshController::handleMessage(MessageWindowFocus* message)
+{
+	if (m_autoRefreshEnabled)
+	{
+		MessageRefresh().dispatch();
+	}
+}
+
+RefreshView* RefreshController::getView()
+{
+	return Controller::getView<RefreshView>();
+}

src/lib/component/controller/RefreshController.h

@@ -0,0 +1,32 @@
+#ifndef REFRESH_CONTROLLER_H
+#define REFRESH_CONTROLLER_H
+
+#include "component/controller/Controller.h"
+#include "utility/messaging/MessageListener.h"
+#include "utility/messaging/type/MessageAutoRefreshChanged.h"
+#include "utility/messaging/type/MessageRefresh.h"
+#include "utility/messaging/type/MessageWindowFocus.h"
+
+class RefreshView;
+
+class RefreshController
+	: public Controller
+	, public MessageListener<MessageAutoRefreshChanged>
+	, public MessageListener<MessageRefresh>
+	, public MessageListener<MessageWindowFocus>
+{
+public:
+	RefreshController();
+	virtual ~RefreshController();
+
+private:
+	virtual void handleMessage(MessageAutoRefreshChanged* message);
+	virtual void handleMessage(MessageRefresh* message);
+	virtual void handleMessage(MessageWindowFocus* message);
+
+	RefreshView* getView();
+
+	bool m_autoRefreshEnabled;
+};
+
+#endif // REFRESH_CONTROLLER_H

src/lib/component/controller/StatusBarController.cpp

@@ -28,6 +28,7 @@ void StatusBarController::handleMessage(MessageFinishedParsing* message)
 {
 	std::stringstream ss;
 	ss << "Parsing Finished: ";
+	ss << message->fileCount << " files, ";
 	ss << std::setprecision(2) << message->parseTime << " seconds, ";
 	ss << message->errorCount << " error(s)";
 

src/lib/component/view/RefreshView.cpp

@@ -0,0 +1,22 @@
+#include "component/view/RefreshView.h"
+
+#include "component/controller/RefreshController.h"
+
+RefreshView::RefreshView(ViewLayout* viewLayout)
+	: View(viewLayout, Vec2i(100, 100))
+{
+}
+
+RefreshView::~RefreshView()
+{
+}
+
+std::string RefreshView::getName() const
+{
+	return "RefreshView";
+}
+
+RefreshController* RefreshView::getController()
+{
+	return View::getController<RefreshController>();
+}

src/lib/component/view/RefreshView.h

@@ -0,0 +1,21 @@
+#ifndef REFRESH_VIEW_H
+#define REFRESH_VIEW_H
+
+#include "component/view/View.h"
+
+class RefreshController;
+
+class RefreshView
+	: public View
+{
+public:
+	RefreshView(ViewLayout* viewLayout);
+	virtual ~RefreshView();
+
+	virtual std::string getName() const;
+
+private:
+	RefreshController* getController();
+};
+
+#endif // REFRESH_VIEW_H

src/lib/component/view/ViewFactory.h

@@ -6,6 +6,7 @@
 class CodeView;
 class GraphView;
 class MainView;
+class RefreshView;
 class SearchView;
 class StatusBarView;
 class UndoRedoView;
@@ -20,6 +21,7 @@ public:
 	virtual std::shared_ptr<MainView> createMainView() const = 0;
 	virtual std::shared_ptr<CodeView> createCodeView(ViewLayout* viewLayout) const = 0;
 	virtual std::shared_ptr<GraphView> createGraphView(ViewLayout* viewLayout) const = 0;
+	virtual std::shared_ptr<RefreshView> createRefreshView(ViewLayout* viewLayout) const = 0;
 	virtual std::shared_ptr<SearchView> createSearchView(ViewLayout* viewLayout) const = 0;
 	virtual std::shared_ptr<StatusBarView> createStatusBarView(ViewLayout* viewLayout) const = 0;
 	virtual std::shared_ptr<UndoRedoView> createUndoRedoView(ViewLayout* viewLayout) const = 0;

src/lib/data/Storage.cpp

@@ -1,7 +1,5 @@
 #include "data/Storage.h"
 
-#include <iostream>
-
 #include "utility/logging/logging.h"
 #include "utility/utilityString.h"
 
@@ -38,6 +36,66 @@ void Storage::clear()
 	m_graph.clear();
 	m_locationCollection.clear();
 	m_tokenIndex.clear();
+
+	m_errorMessages.clear();
+	m_errorLocationCollection.clear();
+}
+
+void Storage::clearFileData(const std::vector<std::string>& filePaths)
+{
+	for (const std::string& filePath : filePaths)
+	{
+		TokenLocationFile* errorFile = m_errorLocationCollection.findTokenLocationFileByPath(filePath);
+		if (errorFile)
+		{
+			m_errorLocationCollection.removeTokenLocationFile(errorFile);
+		}
+
+		TokenLocationFile* file = m_locationCollection.findTokenLocationFileByPath(filePath);
+		if (!file)
+		{
+			continue;
+		}
+
+		file->forEachTokenLocation(
+			[&](TokenLocation* location)
+			{
+				if (location->isEndTokenLocation())
+				{
+					return;
+				}
+
+				Token* token = m_graph.getTokenById(location->getTokenId());
+				if (!token)
+				{
+					return;
+				}
+
+				token->removeLocationId(location->getId());
+				if (token->getLocationIds().size())
+				{
+					return;
+				}
+
+				if (token->isEdge())
+				{
+					Edge* edge = dynamic_cast<Edge*>(token);
+					Node* from = edge->getFrom();
+					Node* to = edge->getTo();
+
+					m_graph.removeEdge(edge);
+					removeNodeIfUnreferenced(from);
+					removeNodeIfUnreferenced(to);
+				}
+				else
+				{
+					removeNodeIfUnreferenced(dynamic_cast<Node*>(token));
+				}
+			}
+		);
+
+		m_locationCollection.removeTokenLocationFile(file);
+	}
 }
 
 void Storage::logGraph() const
@@ -52,7 +110,7 @@ void Storage::logLocations() const
 
 size_t Storage::getErrorCount() const
 {
-	return m_errorMessages.size();
+	return m_errorLocationCollection.getTokenLocationCount();
 }
 
 void Storage::onError(const ParseLocation& location, const std::string& message)
@@ -64,15 +122,38 @@ void Storage::onError(const ParseLocation& location, const std::string& message)
 		return;
 	}
 
-	Id errorId = m_errorMessages.size();
+	bool duplicate = false;
+	std::string filePath = location.filePath;
+	TokenLocationFile* file = m_errorLocationCollection.findTokenLocationFileByPath(filePath);
 
-	TokenLocation* loc = m_errorLocationCollection.addTokenLocation(
-		errorId, location.filePath,
-		location.startLineNumber, location.startColumnNumber,
-		location.endLineNumber, location.endColumnNumber
-	);
+	if (file)
+	{
+		file->forEachTokenLocation(
+			[&](TokenLocation* loc)
+			{
+				if (loc->isStartTokenLocation() &&
+					loc->getLineNumber() == location.startLineNumber &&
+					loc->getColumnNumber() == location.startColumnNumber &&
+					m_errorMessages[loc->getTokenId()] == message)
+				{
+					duplicate = true;
+				}
+			}
+		);
+	}
 
-	m_errorMessages.push_back(message);
+	if (!duplicate)
+	{
+		Id errorId = m_errorMessages.size();
+
+		TokenLocation* loc = m_errorLocationCollection.addTokenLocation(
+			errorId, filePath,
+			location.startLineNumber, location.startColumnNumber,
+			location.endLineNumber, location.endColumnNumber
+		);
+
+		m_errorMessages.push_back(message);
+	}
 }
 
 Id Storage::onTypedefParsed(
@@ -1030,6 +1111,20 @@ bool Storage::getSubQuerySearchResults(
 	return true;
 }
 
+void Storage::removeNodeIfUnreferenced(Node* node)
+{
+	Id tokenId = node->getId();
+	SearchNode* searchNode = m_tokenIndex.getNode(node->getTokenComponentName()->getSearchNode());
+
+	bool removed = m_graph.removeNodeIfUnreferencedRecursive(node);
+
+	if (removed && searchNode)
+	{
+		searchNode->removeTokenId(tokenId);
+		m_tokenIndex.removeNodeIfUnreferencedRecursive(searchNode);
+	}
+}
+
 void Storage::log(std::string type, std::string str, const ParseLocation& location) const
 {
 	LOG_INFO_STREAM(

src/lib/data/Storage.h

@@ -23,6 +23,7 @@ public:
 	virtual ~Storage();
 
 	void clear();
+	void clearFileData(const std::vector<std::string>& filePaths);
 
 	void logGraph() const;
 	void logLocations() const;
@@ -125,7 +126,6 @@ protected:
 	const SearchIndex& getSearchIndex() const;
 
 private:
-
 	Node* addNodeHierarchy(Node::NodeType type, std::vector<std::string> nameHierarchy);
 	Node* addNodeHierarchyWithDistinctSignature(Node::NodeType type, const ParseFunction& function);
 
@@ -141,6 +141,8 @@ private:
 	bool getSubQuerySearchResults(
 		const std::string& query, const std::string& word, SearchResults* results) const;
 
+	void removeNodeIfUnreferenced(Node* node);
+
 	void log(std::string type, std::string str, const ParseLocation& location) const;
 
 	StorageGraph m_graph;

src/lib/data/graph/Graph.cpp

@@ -114,13 +114,16 @@ void Graph::removeNode(Node* node)
 		return;
 	}
 
-	node->forEachEdgeOfType(Edge::EDGE_MEMBER, [this, node](Edge* e)
-	{
-		if (node == e->getFrom())
+	node->forEachEdgeOfType(
+		Edge::EDGE_MEMBER,
+		[this, node](Edge* e)
 		{
-			this->removeNode(e->getTo());
+			if (node == e->getFrom())
+			{
+				this->removeNode(e->getTo());
+			}
 		}
-	});
+	);
 
 	node->forEachEdge(
 		[this](Edge* e)
@@ -131,7 +134,7 @@ void Graph::removeNode(Node* node)
 
 	if (node->getEdges().size())
 	{
-		LOG_ERROR("Node has still edges.");
+		LOG_ERROR("Node still has edges.");
 	}
 
 	m_nodes.erase(it);
@@ -154,6 +157,25 @@ void Graph::removeEdge(Edge* edge)
 	m_edges.erase(it);
 }
 
+bool Graph::removeNodeIfUnreferencedRecursive(Node* node)
+{
+	if (!node->hasReferences())
+	{
+		Node* parent = node->getParentNode();
+
+		removeNode(node);
+
+		if (parent)
+		{
+			removeNodeIfUnreferencedRecursive(parent);
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
 Node* Graph::findNode(std::function<bool(Node*)> func) const
 {
 	std::map<Id, std::shared_ptr<Node>>::const_iterator it = find_if(m_nodes.begin(), m_nodes.end(),

src/lib/data/graph/Graph.h

@@ -40,6 +40,7 @@ public:
 
 	void removeNode(Node* node);
 	void removeEdge(Edge* edge);
+	bool removeNodeIfUnreferencedRecursive(Node* node);
 
 	Node* findNode(std::function<bool(Node*)> func) const;
 	Edge* findEdge(std::function<bool(Edge*)> func) const;

src/lib/data/graph/Node.cpp

@@ -203,6 +203,37 @@ void Node::forEachChildNode(std::function<void(Node*)> func) const
 	);
 }
 
+bool Node::hasReferences() const
+{
+	if (getLocationIds().size() > 0)
+	{
+		return true;
+	}
+
+	bool hasChildrenWithReferences = false;
+	size_t childNodeCount = 0;
+
+	forEachEdgeOfType(
+		Edge::EDGE_MEMBER,
+		[&](Edge* edge)
+		{
+			childNodeCount++;
+
+			if (!hasChildrenWithReferences && edge->getTo() != this && edge->getTo()->hasReferences())
+			{
+				hasChildrenWithReferences = true;
+			}
+		}
+	);
+
+	if (hasChildrenWithReferences || getEdges().size() > childNodeCount)
+	{
+		return true;
+	}
+
+	return false;
+}
+
 bool Node::isNode() const
 {
 	return true;

src/lib/data/graph/Node.h

@@ -68,6 +68,8 @@ public:
 	void forEachEdgeOfType(Edge::EdgeType type, std::function<void(Edge*)> func) const;
 	void forEachChildNode(std::function<void(Node*)> func) const;
 
+	bool hasReferences() const;
+
 	// Token implementation.
 	virtual bool isNode() const;
 	virtual bool isEdge() const;

src/lib/data/location/TokenLocationCollection.cpp

@@ -1,9 +1,13 @@
 #include "data/location/TokenLocationCollection.h"
 
+#include <algorithm>
+
+#include "utility/FileSystem.h"
+#include "utility/logging/logging.h"
+
 #include "data/location/TokenLocation.h"
 #include "data/location/TokenLocationFile.h"
 #include "data/location/TokenLocationLine.h"
-#include "utility/logging/logging.h"
 
 TokenLocationCollection::TokenLocationCollection()
 {
@@ -85,7 +89,13 @@ TokenLocation* TokenLocationCollection::findTokenLocationById(Id id) const
 
 TokenLocationFile* TokenLocationCollection::findTokenLocationFileByPath(const std::string& filePath) const
 {
-	std::map<std::string, std::shared_ptr<TokenLocationFile> >::const_iterator it = m_files.find(filePath);
+	std::map<std::string, std::shared_ptr<TokenLocationFile>>::const_iterator it =
+		find_if(m_files.begin(), m_files.end(),
+			[&](const std::pair<std::string, std::shared_ptr<TokenLocationFile>>& p)
+			{
+				return FileSystem::equivalent(p.first, filePath);
+			}
+		);
 
 	if (it != m_files.end())
 	{
@@ -119,6 +129,18 @@ void TokenLocationCollection::forEachTokenLocation(std::function<void(TokenLocat
 	}
 }
 
+void TokenLocationCollection::removeTokenLocationFile(TokenLocationFile* file)
+{
+	file->forEachTokenLocation(
+		[&](TokenLocation* location)
+		{
+			m_locations.erase(location->getId());
+		}
+	);
+
+	m_files.erase(file->getFilePath());
+}
+
 TokenLocation* TokenLocationCollection::addTokenLocationAsPlainCopy(const TokenLocation* location)
 {
 	const std::string& filePath = location->getTokenLocationLine()->getTokenLocationFile()->getFilePath();

src/lib/data/location/TokenLocationCollection.h

@@ -41,6 +41,8 @@ public:
 	void forEachTokenLocationLine(std::function<void(TokenLocationLine*)> func) const;
 	void forEachTokenLocation(std::function<void(TokenLocation*)> func) const;
 
+	void removeTokenLocationFile(TokenLocationFile* file);
+
 	TokenLocation* addTokenLocationAsPlainCopy(const TokenLocation* location);
 
 	void clear();

src/lib/data/search/SearchIndex.cpp

@@ -3,6 +3,8 @@
 #include <algorithm>
 #include <cctype>
 
+#include "utility/logging/logging.h"
+
 #include "data/search/SearchMatch.h"
 
 std::vector<SearchMatch> SearchIndex::getMatches(
@@ -34,6 +36,11 @@ void SearchIndex::clear()
 	m_root.m_nodes.clear();
 }
 
+size_t SearchIndex::getNodeCount() const
+{
+	return m_root.getNodeCount() - 1;
+}
+
 Id SearchIndex::getWordId(const std::string& word)
 {
 	return m_dictionary.getWordId(word);
@@ -71,6 +78,50 @@ SearchNode* SearchIndex::getNode(const std::string& fullName) const
 	return nullptr;
 }
 
+SearchNode* SearchIndex::getNode(const SearchNode* searchNode) const
+{
+	std::deque<Id> nameIds = searchNode->getNameIdsRecursive();
+
+	if (nameIds.size())
+	{
+		return m_root.getNodeRecursive(&nameIds).get();
+	}
+
+	return nullptr;
+}
+
+void SearchIndex::removeNode(SearchNode* searchNode)
+{
+	SearchNode* parent = searchNode->getParent();
+
+	if (!parent)
+	{
+		LOG_ERROR_STREAM(<< "SearchNode to be removed has no parent: " << searchNode->getFullName());
+		return;
+	}
+
+	parent->removeSearchNode(searchNode);
+}
+
+bool SearchIndex::removeNodeIfUnreferencedRecursive(SearchNode* searchNode)
+{
+	if (!searchNode->hasTokenIdsRecursive())
+	{
+		SearchNode* parent = searchNode->getParent();
+
+		removeNode(searchNode);
+
+		if (parent && parent != &m_root)
+		{
+			removeNodeIfUnreferencedRecursive(parent);
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
 SearchResults SearchIndex::runFuzzySearch(const std::string& query) const
 {
 	return m_root.runFuzzySearch(query);

src/lib/data/search/SearchIndex.h

@@ -20,11 +20,17 @@ public:
 
 	void clear();
 
+	size_t getNodeCount() const;
+
 	Id getWordId(const std::string& word);
 	const std::string& getWord(Id wordId) const;
 
 	SearchNode* addNode(std::vector<std::string> nameHierarchy);
 	SearchNode* getNode(const std::string& fullName) const;
+	SearchNode* getNode(const SearchNode* searchNode) const;
+
+	void removeNode(SearchNode* searchNode);
+	bool removeNodeIfUnreferencedRecursive(SearchNode* searchNode);
 
 	SearchResults runFuzzySearch(const std::string& query) const;
 	std::vector<SearchMatch> runFuzzySearchAndGetMatches(const std::string& query) const;

src/lib/data/search/SearchNode.cpp

@@ -19,6 +19,18 @@ SearchNode::~SearchNode()
 {
 }
 
+size_t SearchNode::getNodeCount() const
+{
+	size_t count = 1;
+
+	for (std::shared_ptr<SearchNode> n: m_nodes)
+	{
+		count += n->getNodeCount();
+	}
+
+	return count;
+}
+
 const std::string& SearchNode::getName() const
 {
 	return m_name;
@@ -28,7 +40,7 @@ std::vector<std::string> SearchNode::getNameHierarchy() const
 {
 	std::vector<std::string> nameHierarchy;
 	const SearchNode* parent = getParent();
-	if (parent)
+	if (parent && parent->m_nameId)
 	{
 		nameHierarchy = parent->getNameHierarchy();
 	}
@@ -53,6 +65,22 @@ Id SearchNode::getNameId() const
 	return m_nameId;
 }
 
+std::deque<Id> SearchNode::getNameIdsRecursive() const
+{
+	std::deque<Id> ids;
+
+	ids.push_front(m_nameId);
+
+	SearchNode* parent = m_parent;
+	while (parent && parent->m_nameId)
+	{
+		ids.push_front(parent->getNameId());
+		parent = parent->getParent();
+	}
+
+	return ids;
+}
+
 Id SearchNode::getFirstTokenId() const
 {
 	if (m_tokenIds.size())
@@ -68,14 +96,37 @@ const std::set<Id>& SearchNode::getTokenIds() const
 	return m_tokenIds;
 }
 
+bool SearchNode::hasTokenIdsRecursive() const
+{
+	if (m_tokenIds.size())
+	{
+		return true;
+	}
+
+	for (std::shared_ptr<SearchNode> n: m_nodes)
+	{
+		if (n->hasTokenIdsRecursive())
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void SearchNode::addTokenId(Id tokenId)
 {
 	m_tokenIds.insert(tokenId);
 }
 
+void SearchNode::removeTokenId(Id tokenId)
+{
+	m_tokenIds.erase(tokenId);
+}
+
 SearchNode* SearchNode::getParent() const
 {
-	if (m_parent && m_parent->m_nameId)
+	if (m_parent)
 	{
 		return m_parent;
 	}
@@ -183,6 +234,18 @@ std::shared_ptr<SearchNode> SearchNode::getNodeRecursive(std::deque<Id>* nameIds
 	return nullptr;
 }
 
+void SearchNode::removeSearchNode(SearchNode* node)
+{
+	for (std::set<std::shared_ptr<SearchNode>>::iterator it = m_nodes.begin(); it != m_nodes.end(); it++)
+	{
+		if ((*it)->m_nameId == node->m_nameId)
+		{
+			m_nodes.erase(it);
+			return;
+		}
+	}
+}
+
 SearchMatch SearchNode::fuzzyMatchData(const std::string& query, const SearchNode* parent) const
 {
 	SearchMatch data;

src/lib/data/search/SearchNode.h

@@ -22,15 +22,21 @@ public:
 	SearchNode(SearchNode* parent, const std::string& name, Id nameId);
 	~SearchNode();
 
+	size_t getNodeCount() const;
+
 	const std::string& getName() const;
 	std::vector<std::string> getNameHierarchy() const;
 	std::string getFullName() const;
 
 	Id getNameId() const;
+	std::deque<Id> getNameIdsRecursive() const;
 
 	Id getFirstTokenId() const;
 	const std::set<Id>& getTokenIds() const;
+	bool hasTokenIdsRecursive() const;
+
 	void addTokenId(Id tokenId);
+	void removeTokenId(Id tokenId);
 
 	SearchNode* getParent() const;
 	std::deque<SearchNode*> getParentsWithoutTokenId();
@@ -46,11 +52,12 @@ private:
 	typedef std::multimap<size_t, const SearchNode*> FuzzyMap;
 	typedef FuzzyMap::const_iterator FuzzyMapIterator;
 
-
 	// Accessed by SearchIndex
 	std::shared_ptr<SearchNode> addNodeRecursive(std::deque<Id>* nameIds, const Dictionary& dictionary);
 	std::shared_ptr<SearchNode> getNodeRecursive(std::deque<Id>* nameIds) const;
 
+	void removeSearchNode(SearchNode* node);
+
 	SearchMatch fuzzyMatchData(const std::string& query, const SearchNode* parent) const;
 
 	friend class SearchIndex;

src/lib/utility/FileSystem.cpp

@@ -1,12 +1,12 @@
 #include "utility/FileSystem.h"
 
+#include "boost/date_time.hpp"
 #include "boost/filesystem.hpp"
 
-#include "utility/logging/logging.h"
-
-std::vector<std::string> FileSystem::getSourceFilesFromDirectory(
+std::vector<std::string> FileSystem::getFileNamesFromDirectory(
 	const std::string& path, const std::vector<std::string>& extensions
-){
+)
+{
 	std::vector<std::string> files;
 
 	if (boost::filesystem::is_directory(path))
@@ -25,25 +25,37 @@ std::vector<std::string> FileSystem::getSourceFilesFromDirectory(
 	return files;
 }
 
-std::vector<std::string> FileSystem::getFileNamesFromDirectory(
-	const std::string& path, const std::vector<std::string>& extensions
-)
-{
-	return getSourceFilesFromDirectory(path, extensions);
-}
+std::vector<std::string> FileSystem::getFileNamesFromDirectoryUpdatedAfter(
+	const std::string& path, const std::vector<std::string>& extensions, const std::string& timeString
+){
+	std::vector<std::string> files;
 
-bool FileSystem::isValidExtension(const std::string& filepath, const std::vector<std::string>& extensions)
-{
-	boost::filesystem::path path(filepath);
+	const boost::posix_time::ptime time = boost::posix_time::from_iso_string(timeString);
 
-	for (std::string extension : extensions)
+	if (boost::filesystem::is_directory(path))
 	{
-		if (path.extension() == extension)
+		boost::filesystem::recursive_directory_iterator it(path);
+		boost::filesystem::recursive_directory_iterator endit;
+		while (it != endit)
 		{
-			return true;
+			if (boost::filesystem::is_regular_file(*it) && isValidExtension(it->path().string(), extensions))
+			{
+				std::time_t t = boost::filesystem::last_write_time(*it);
+				boost::posix_time::ptime lastWriteTime = boost::posix_time::from_time_t(t);
+				if (lastWriteTime >= time)
+				{
+					files.push_back(it->path().generic_string());
+				}
+			}
+			++it;
 		}
 	}
-	return false;
+	return files;
+}
+
+std::string FileSystem::getTimeStringNow()
+{
+	return boost::posix_time::to_iso_string(boost::posix_time::second_clock::universal_time());
 }
 
 bool FileSystem::exists(const std::string& path)
@@ -64,4 +76,33 @@ std::string FileSystem::extension(const std::string& path)
 std::string FileSystem::filePathWithoutExtension(const std::string& path)
 {
 	return boost::filesystem::path(path).replace_extension().generic_string();
-}
+}
+
+std::string FileSystem::absoluteFilePath(const std::string& path)
+{
+	return boost::filesystem::absolute(boost::filesystem::path(path)).generic_string();
+}
+
+bool FileSystem::equivalent(const std::string& pathA, const std::string& pathB)
+{
+	if (exists(pathA) && exists(pathB))
+	{
+		return boost::filesystem::equivalent(boost::filesystem::path(pathA), boost::filesystem::path(pathB));
+	}
+
+	return boost::filesystem::path(pathA).compare(boost::filesystem::path(pathB)) == 0;
+}
+
+bool FileSystem::isValidExtension(const std::string& filepath, const std::vector<std::string>& extensions)
+{
+	boost::filesystem::path path(filepath);
+
+	for (std::string extension : extensions)
+	{
+		if (path.extension() == extension)
+		{
+			return true;
+		}
+	}
+	return false;
+}

src/lib/utility/FileSystem.h

@@ -7,18 +7,20 @@
 class FileSystem
 {
 public:
-	static std::vector<std::string> getSourceFilesFromDirectory( // TODO: Replace this with getFileNamesFromDirectory.
-		const std::string& path, const std::vector<std::string>& extensions
-	);
-
 	static std::vector<std::string> getFileNamesFromDirectory(
-		const std::string& path, const std::vector<std::string>& extensions
-	);
+		const std::string& path, const std::vector<std::string>& extensions);
+	static std::vector<std::string> getFileNamesFromDirectoryUpdatedAfter(
+		const std::string& path, const std::vector<std::string>& extensions, const std::string& timeString);
+
+	static std::string getTimeStringNow();
 
 	static bool exists(const std::string& path);
 	static std::string fileName(const std::string& path);
 	static std::string extension(const std::string& path);
 	static std::string filePathWithoutExtension(const std::string& path);
+	static std::string absoluteFilePath(const std::string& path);
+
+	static bool equivalent(const std::string& pathA, const std::string& pathB);
 
 private:
 	static bool isValidExtension(const std::string& filepath, const std::vector<std::string>& extensions);

src/lib/utility/messaging/type/MessageAutoRefreshChanged.h

@@ -0,0 +1,22 @@
+#ifndef MESSAGE_AUTO_REFRESH_CHANGED_H
+#define MESSAGE_AUTO_REFRESH_CHANGED_H
+
+#include "utility/messaging/Message.h"
+
+class MessageAutoRefreshChanged: public Message<MessageAutoRefreshChanged>
+{
+public:
+	MessageAutoRefreshChanged(bool enabled)
+		: enabled(enabled)
+	{
+	}
+
+	static const std::string getStaticType()
+	{
+		return "MessageAutoRefreshChanged";
+	}
+
+	bool enabled;
+};
+
+#endif // MESSAGE_AUTO_REFRESH_CHANGED_H

src/lib/utility/messaging/type/MessageFinishedParsing.h

@@ -6,8 +6,9 @@
 class MessageFinishedParsing: public Message<MessageFinishedParsing>
 {
 public:
-	MessageFinishedParsing(float parseTime, size_t errorCount)
-		: parseTime(parseTime)
+	MessageFinishedParsing(size_t fileCount, float parseTime, size_t errorCount)
+		: fileCount(fileCount)
+		, parseTime(parseTime)
 		, errorCount(errorCount)
 	{
 	}
@@ -17,6 +18,7 @@ public:
 		return "MessageFinishedParsing";
 	}
 
+	size_t fileCount;
 	float parseTime;
 	size_t errorCount;
 };

src/lib/utility/messaging/type/MessageRefresh.h

@@ -2,7 +2,6 @@
 #define MESSAGE_REFRESH_H
 
 #include "utility/messaging/Message.h"
-#include "utility/types.h"
 
 class MessageRefresh: public Message<MessageRefresh>
 {

src/lib/utility/messaging/type/MessageWindowFocus.h

@@ -0,0 +1,19 @@
+#ifndef MESSAGE_WINDOW_FOCUS_H
+#define MESSAGE_WINDOW_FOCUS_H
+
+#include "utility/messaging/Message.h"
+
+class MessageWindowFocus: public Message<MessageWindowFocus>
+{
+public:
+	MessageWindowFocus()
+	{
+	}
+
+	static const std::string getStaticType()
+	{
+		return "MessageWindowFocus";
+	}
+};
+
+#endif // MESSAGE_WINDOW_FOCUS_H