vyn/mirai
1
Fork 0
mirror of https://codeberg.org/vyn/mirai.git synced 2025-07-12 05:43:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert classes and files to snake_case

Browse source
This commit is contained in:
Vyn 2025-07-01 21:42:59 +02:00
parent 686d86df6f
commit 6fa94b279c
Signed by: vyn
GPG key ID: E1B2BE34E7A971E7
26 changed files with 272 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.cpp
View file

@ -5,7 +5,7 @@
*/
#include "evalyte-cpp-common/evalyte.h"
#include "mirai-core/Mirai.h"
#include "mirai-core/core.h"
#include "ui.h"
#include "windows/AppWindow/AppWindow.h"
#include <cstdlib>
@ -15,7 +15,7 @@ int main(int argc, char **argv)
{
evalyte::createRequiredDirectories("mirai");
const auto configFilePath = evalyte::configDirectoryPath("mirai") + "/config.json";
mirai::Mirai mirai{configFilePath};
mirai::core mirai{configFilePath};
AppWindow appWindow{&mirai};
appWindow.run();
return 0;

26
src/shared/Utils.cpp
View file

@ -21,10 +21,10 @@ void bindSlintUtils(const ui::Utils &utils)
return std::format("{:%B %d}", chronoDate);
});
auto currentDate = MiraiDateToSlintDate(mirai::Date(std::chrono::system_clock::now()));
auto currentDate = MiraiDateToSlintDate(mirai::date(std::chrono::system_clock::now()));
utils.set_current_date(currentDate);
auto currentTime = MiraiTimeToSlintTime(mirai::Time(std::chrono::system_clock::now()));
auto currentTime = MiraiTimeToSlintTime(mirai::time(std::chrono::system_clock::now()));
utils.set_current_time(currentTime);
}
@ -38,10 +38,10 @@ std::string formatZeroPadding(const int number)
std::string formatDateRelative(const ui::Date &date)
{
auto todayDate = mirai::Date(std::chrono::system_clock::now());
auto todayDate = mirai::date(std::chrono::system_clock::now());
auto relativeDaysDiff = std::chrono::duration_cast<std::chrono::days>(
std::chrono::sys_days(SlintDateToMiraiDate(date).toStdChrono()) -
std::chrono::sys_days(todayDate.toStdChrono())
std::chrono::sys_days(SlintDateToMiraiDate(date).to_std_chrono())
- std::chrono::sys_days(todayDate.to_std_chrono())
)
.count();
@ -61,18 +61,18 @@ std::string capitalize(std::string str)
std::string SlintDateToStdString(const ui::Date &date)
{
return std::to_string(date.year) + "-" + formatZeroPadding(date.month) + "-" +
formatZeroPadding(date.day);
return std::to_string(date.year) + "-" + formatZeroPadding(date.month) + "-"
+ formatZeroPadding(date.day);
}
mirai::Date SlintDateToMiraiDate(const ui::Date &date)
mirai::date SlintDateToMiraiDate(const ui::Date &date)
{
return mirai::Date(
return mirai::date(
date.year, static_cast<unsigned>(date.month), static_cast<unsigned>(date.day)
);
}
ui::Date MiraiDateToSlintDate(const mirai::Date &date)
ui::Date MiraiDateToSlintDate(const mirai::date &date)
{
return {
.year = date.year,
@ -81,12 +81,12 @@ ui::Date MiraiDateToSlintDate(const mirai::Date &date)
};
}
ui::Time MiraiTimeToSlintTime(const mirai::Time &time)
ui::Time MiraiTimeToSlintTime(const mirai::time &time)
{
return {.hour = time.hour, .minute = time.minute, .second = 0};
}
mirai::Time SlintTimeToMiraiTime(const ui::Time &time)
mirai::time SlintTimeToMiraiTime(const ui::Time &time)
{
return mirai::Time{time.hour, time.minute};
return mirai::time{time.hour, time.minute};
}

10
src/shared/Utils.h
View file

@ -6,7 +6,7 @@
#pragma once
#include "mirai-core/DateTime.h"
#include "mirai-core/date.h"
#include "ui.h"
#include <string>
@ -16,7 +16,7 @@ std::string formatZeroPadding(const int number);
std::string formatDateRelative(const ui::Date &date);
std::string capitalize(std::string str);
std::string SlintDateToStdString(const ui::Date &date);
mirai::Date SlintDateToMiraiDate(const ui::Date &date);
ui::Date MiraiDateToSlintDate(const mirai::Date &date);
ui::Time MiraiTimeToSlintTime(const mirai::Time &time);
mirai::Time SlintTimeToMiraiTime(const ui::Time &time);
mirai::date SlintDateToMiraiDate(const ui::Date &date);
ui::Date MiraiDateToSlintDate(const mirai::date &date);
ui::Time MiraiTimeToSlintTime(const mirai::time &time);
mirai::time SlintTimeToMiraiTime(const ui::Time &time);

24
src/view.h
View file

@ -1,24 +0,0 @@
#include "DataProvider.h"
#include "DateTime.h"
#include <vector>
struct source_group {
int source_id;
std::vector<mirai::event_data> events;
std::vector<mirai::task_data> tasks;
};
struct day_group {
mirai::Date date;
source_group sources;
};
std::vector<day_group>
group_by_day(std::vector<mirai::event_data> events, std::vector<mirai::task_data> tasks)
{
std::vector<day_group> days;
// todo
return days;
}

56
src/windows/AppWindow/AppWindow.cpp
View file

@ -7,11 +7,11 @@
#include "AppWindow.h"
#include "../../SeleniteSetup.h"
#include "../../shared/Utils.h"
#include "mirai-core/DateTime.h"
#include "mirai-core/Event.h"
#include "mirai-core/MarkdownDataProvider.h"
#include "mirai-core/Mirai.h"
#include "mirai-core/Source.h"
#include "mirai-core/core.h"
#include "mirai-core/date.h"
#include "mirai-core/event.h"
#include "mirai-core/markdown_data_provider.h"
#include "mirai-core/source.h"
#include "selenite/palette.h"
#include "slint_color.h"
#include "slint_models.h"
@ -32,7 +32,7 @@
#include <string_view>
#include <vector>
AppWindow::AppWindow(mirai::Mirai *miraiInstance) : miraiInstance_(miraiInstance)
AppWindow::AppWindow(mirai::core *miraiInstance) : miraiInstance_(miraiInstance)
{
_sidebar_view = ui::SidebarView();
_calendar_view = ui::CalendarView();
@ -193,7 +193,7 @@ void AppWindow::setupCallbacks()
assert(source);
auto task = source->get_task_by_id(newTaskData.id);
assert(task.has_value());
const mirai::Date &date = SlintDateToMiraiDate(newTaskData.date);
const mirai::date &date = SlintDateToMiraiDate(newTaskData.date);
// const auto dayOpt = source->get_day_by_date(date);
task->set_title(std::string(newTaskData.title));
@ -204,13 +204,13 @@ void AppWindow::setupCallbacks()
});
actions().on_create_task([&](ui::NewTaskData newTaskData) {
std::optional<mirai::Date> date = std::nullopt;
std::optional<mirai::date> date = std::nullopt;
if (newTaskData.date.year != 0) {
date = SlintDateToMiraiDate(newTaskData.date);
}
auto source = miraiInstance_->getSourceById(newTaskData.sourceId);
std::optional<mirai::Event> event = std::nullopt;
std::optional<mirai::event> event = std::nullopt;
if (newTaskData.eventId >= 0) {
event = source->get_event_by_id(newTaskData.eventId);
}
@ -472,10 +472,10 @@ void AppWindow::update_sidebar_view()
models().set_sidebar_view(_sidebar_view);
}
std::vector<mirai::Event>
std::vector<mirai::event>
merge_all_events_from_sources(std::vector<std::unique_ptr<mirai::source>> &sources)
{
std::vector<mirai::Event> all_events;
std::vector<mirai::event> all_events;
for (auto &source : sources) {
const auto &events = source->get_events();
all_events.insert(all_events.end(), events.begin(), events.end());
@ -483,10 +483,10 @@ merge_all_events_from_sources(std::vector<std::unique_ptr<mirai::source>> &sourc
return all_events;
}
std::vector<mirai::Event>
get_events_for_date(const std::vector<mirai::Event> &events, const mirai::Date &date)
std::vector<mirai::event>
get_events_for_date(const std::vector<mirai::event> &events, const mirai::date &date)
{
auto filtered_events = events | std::ranges::views::filter([&](const mirai::Event &event) {
auto filtered_events = events | std::ranges::views::filter([&](const mirai::event &event) {
return event.date() == date;
});
return std::ranges::to<std::vector>(filtered_events);
@ -494,7 +494,7 @@ get_events_for_date(const std::vector<mirai::Event> &events, const mirai::Date &
void AppWindow::update_calendar_view()
{
auto today = mirai::Date(std::chrono::system_clock::now());
auto today = mirai::date(std::chrono::system_clock::now());
auto new_slint_dates = std::make_shared<slint::VectorModel<ui::CalendarViewDate>>();
auto &sources = miraiInstance_->getSources();
@ -504,11 +504,11 @@ void AppWindow::update_calendar_view()
std::chrono::year_month_day next_date =
std::chrono::floor<std::chrono::days>(std::chrono::system_clock::now())
+ std::chrono::days{day_index};
auto current_date = mirai::Date{next_date};
auto current_date = mirai::date{next_date};
auto new_slint_events = std::make_shared<slint::VectorModel<ui::CalendarViewEvent>>();
auto relative_days_diff = std::chrono::duration_cast<std::chrono::days>(
std::chrono::sys_days(current_date.toStdChrono())
- std::chrono::sys_days(today.toStdChrono())
std::chrono::sys_days(current_date.to_std_chrono())
- std::chrono::sys_days(today.to_std_chrono())
)
.count();
if (relative_days_diff < 0 || relative_days_diff >= 7) {
@ -546,15 +546,15 @@ void AppWindow::update_calendar_view()
models().set_calendar_view(_calendar_view);
}
std::vector<mirai::Task>
std::vector<mirai::task>
get_all_tasks_from_sources(std::vector<std::unique_ptr<mirai::source>> &sources)
{
std::vector<mirai::Task> all_tasks;
std::vector<mirai::task> all_tasks;
for (auto &source : sources) {
const auto &tasks = source->get_tasks();
all_tasks.insert(all_tasks.end(), tasks.begin(), tasks.end());
}
std::sort(all_tasks.begin(), all_tasks.end(), [](const mirai::Task &t1, const mirai::Task &t2) {
std::sort(all_tasks.begin(), all_tasks.end(), [](const mirai::task &t1, const mirai::task &t2) {
if (!t1.has_due_date() && !t2.has_due_date()) {
return false;
}
@ -571,15 +571,15 @@ get_all_tasks_from_sources(std::vector<std::unique_ptr<mirai::source>> &sources)
struct tasks_source_group {
int id;
std::vector<mirai::Task> tasks;
std::vector<mirai::task> tasks;
};
struct tasks_date_group {
std::optional<mirai::Date> date;
std::optional<mirai::date> date;
std::vector<tasks_source_group> sources;
};
std::vector<tasks_date_group> group_tasks_by_date(const std::vector<mirai::Task> &tasks)
std::vector<tasks_date_group> group_tasks_by_date(const std::vector<mirai::task> &tasks)
{
if (tasks.size() == 0) {
return {};
@ -588,7 +588,7 @@ std::vector<tasks_date_group> group_tasks_by_date(const std::vector<mirai::Task>
std::vector<tasks_date_group> dates_group;
int next_task_index = 0;
mirai::Task current_task = tasks.at(next_task_index);
mirai::task current_task = tasks.at(next_task_index);
while (next_task_index < tasks.size()) {
tasks_date_group date_group{.date = current_task.due_date()};
@ -615,7 +615,7 @@ std::vector<tasks_date_group> group_tasks_by_date(const std::vector<mirai::Task>
void AppWindow::update_tasks_view()
{
auto today = mirai::Date(std::chrono::system_clock::now());
auto today = mirai::date(std::chrono::system_clock::now());
auto new_slint_dates = std::make_shared<slint::VectorModel<ui::TasksViewDate>>();
auto &sources = miraiInstance_->getSources();
@ -627,8 +627,8 @@ void AppWindow::update_tasks_view()
std::optional<int> relative_days_diff = std::nullopt;
if (current_date.has_value()) {
relative_days_diff = std::chrono::duration_cast<std::chrono::days>(
std::chrono::sys_days(current_date.value().toStdChrono())
- std::chrono::sys_days(today.toStdChrono())
std::chrono::sys_days(current_date.value().to_std_chrono())
- std::chrono::sys_days(today.to_std_chrono())
)
.count();
}

8
src/windows/AppWindow/AppWindow.h
View file

@ -6,8 +6,8 @@
#pragma once
#include "mirai-core/Mirai.h"
#include "mirai-core/Source.h"
#include "mirai-core/core.h"
#include "mirai-core/source.h"
#include "slint.h"
#include "ui.h"
#include <unordered_map>
@ -17,7 +17,7 @@ class AppWindow
{
public:
AppWindow(mirai::Mirai *mirai);
AppWindow(mirai::core *mirai);
void run();
@ -52,7 +52,7 @@ class AppWindow
slint::ComponentHandle<ui::AppWindow> mainWindow_ = ui::AppWindow::create();
mirai::Mirai *miraiInstance_;
mirai::core *miraiInstance_;
std::unordered_map<int, bool> _source_filters;
bool _should_hide_completed_tasks;