Refactor TasksView, Mirai instance doesn't depend on it anymore

src/core/Mirai.cpp

@@ -21,13 +21,13 @@ namespace mirai
 void Mirai::loadFile(const std::string &path)
 {
 	auto tasksFile = TodoMdFormat::readFile(path);
-	files->push_back(std::move(tasksFile));
+	files.push_back(std::move(tasksFile));
 	reloadTags();
 }
 
 void Mirai::save()
 {
-	for (auto &file : *files) {
+	for (auto &file : files) {
 		if (file->isDirty()) {
 			TodoMdFormat::writeFile(*file);
 			file->setDirty(false);
@@ -38,10 +38,7 @@ void Mirai::save()
 
 void Mirai::addTask(TaskItemData taskItem)
 {
-	(*files)[0]->addTask(taskItem);
-	for (auto &view : views) {
-		view->update();
-	}
+	files[0]->addTask(taskItem);
 }
 
 void Mirai::addTask(std::string text, std::string date)
@@ -50,46 +47,33 @@ void Mirai::addTask(std::string text, std::string date)
 	/*std::tm tm = *std::localtime(&t);*/
 	/*std::stringstream ssCreationDate;*/
 	/*ssCreationDate << std::put_time(&tm, "%Y-%m-%d");*/
-	(*files)[0]->addTask(text, date);
-	for (auto &view : views) {
-		view->update();
-	}
+	files[0]->addTask(text, date);
 }
 
 void Mirai::removeTask(const TaskItem *taskItem)
 {
-	for (auto &file : *files) {
+	for (auto &file : files) {
 		file->removeTask(taskItem);
 	}
-	for (auto &view : views) {
-		view->update();
-	}
 }
 
 std::vector<std::unique_ptr<TasksFile>> &Mirai::getFiles()
 {
-	return *files.get();
+	return files;
 }
 
 std::optional<std::reference_wrapper<TasksFile>> Mirai::getFileByPath(const std::string &path)
 {
-	auto fileIterator = std::ranges::find_if(*files, [&](const std::unique_ptr<TasksFile> &file) {
+	auto fileIterator = std::ranges::find_if(files, [&](const std::unique_ptr<TasksFile> &file) {
 		return file->getPath() == path;
 	});
 
-	if (fileIterator == files->end()) {
+	if (fileIterator == files.end()) {
 		return std::nullopt;
 	}
 	return *(fileIterator->get());
 }
 
-std::weak_ptr<TasksView> Mirai::getTasks()
-{
-	auto view = std::make_shared<TasksView>(files);
-	views.push_back(view);
-	return view;
-}
-
 const std::vector<std::string> &Mirai::getTags()
 {
 	return tags;
@@ -98,7 +82,7 @@ const std::vector<std::string> &Mirai::getTags()
 void Mirai::reloadTags()
 {
 	tags.clear();
-	for (auto &file : *files) {
+	for (auto &file : files) {
 		for (auto &task : file->getTasks()) {
 			for (auto &tag : task->getTags()) {
 				if (!vectorUtils::contains(tags, tag)) {

src/core/Mirai.h

@@ -9,7 +9,6 @@
 
 #include "TaskItem.h"
 #include "TasksFile.h"
-#include "TasksView.h"
 #include "TodoMd.h"
 #include <algorithm>
 #include <functional>
@@ -33,22 +32,12 @@ class Mirai
 	std::optional<std::reference_wrapper<TasksFile>> getFileByPath(const std::string &path);
 
 	std::vector<std::unique_ptr<TasksFile>> &getFiles();
-	std::weak_ptr<TasksView> getTasks();
 	const std::vector<std::string> &getTags();
 
 	void reloadTags();
 
   private:
-	// The `TasksFile`s are shared to the views, their lifetime can outlive
-	// this (Mirai) object
-	// because we can't control if the caller will keep the main object alive.
-	std::shared_ptr<std::vector<std::unique_ptr<TasksFile>>> files =
-		std::make_shared<std::vector<std::unique_ptr<TasksFile>>>();
-
-	// We keep a vector of shared_ptr because we need the ref counting mechanism to know
-	// if we have to remove the view (not used) or tell the view to update() on
-	// some changes.
-	std::vector<std::shared_ptr<TasksView>> views;
+	std::vector<std::unique_ptr<TasksFile>> files = std::vector<std::unique_ptr<TasksFile>>();
 	std::vector<std::string> tags;
 };
 } // namespace mirai

src/core/TasksView.cpp

@@ -5,19 +5,24 @@
  */
 
 #include "TasksView.h"
+#include "core/Mirai.h"
 #include "utils.h"
 #include <algorithm>
 #include <cstddef>
 #include <iostream>
 #include <memory>
 #include <ostream>
+#include <stdexcept>
 #include <string>
 
 namespace mirai
 {
 
-TasksView::TasksView(std::shared_ptr<std::vector<std::unique_ptr<TasksFile>>> files) : files(files)
+TasksView::TasksView(Mirai *miraiInstance) : mirai(miraiInstance)
 {
+	if (!miraiInstance) {
+		throw std::runtime_error("NULL pointer passed in TasksView");
+	}
 	update();
 }
 
@@ -34,7 +39,7 @@ size_t TasksView::count() const
 void TasksView::update()
 {
 	tasksToShow.clear();
-	for (auto &file : *files) {
+	for (auto &file : mirai->getFiles()) {
 		if (filesFilter.size() > 0 && !vectorUtils::contains(filesFilter, file->getName())) {
 			continue;
 		}

src/core/TasksView.h

@@ -7,6 +7,7 @@
 #ifndef MIRAI_TASKSVIEW_H
 #define MIRAI_TASKSVIEW_H
 #include "TasksFile.h"
+#include "core/Mirai.h"
 #include "using.h"
 #include <cstddef>
 #include <memory>
@@ -19,7 +20,7 @@ class TasksView
 {
 
   public:
-	TasksView(std::shared_ptr<std::vector<std::unique_ptr<TasksFile>>> files);
+	TasksView(Mirai *mirai);
 
 	TaskItem &operator[](int index);
 
@@ -34,7 +35,7 @@ class TasksView
 	const std::vector<std::string> &getActiveFilesFilter();
 
   private:
-	std::shared_ptr<std::vector<std::unique_ptr<TasksFile>>> files;
+	Mirai *mirai;
 	std::vector<TaskItem *> tasksToShow;
 	Tags tagsFilter;
 	std::vector<std::string> filesFilter;