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

This commit is contained in:
Vyn 2024-04-17 17:34:26 +02:00
parent d1a4858504
commit 841c87752f
7 changed files with 39 additions and 57 deletions

View file

@ -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)) {