mirror of
https://codeberg.org/vyn/mirai.git
synced 2025-07-04 18:53:19 +00:00
[WIP] convert to snake_case
This commit is contained in:
parent
4bca7fac3e
commit
9de3972630
GPG key ID:
E1B2BE34E7A971E7
17 changed files with 335 additions and 336 deletions
|
|
@ -14,33 +14,33 @@
|
|||
namespace mirai
|
||||
{
|
||||
|
||||
struct DayData {
|
||||
struct day_data {
|
||||
int id;
|
||||
Date date;
|
||||
};
|
||||
|
||||
struct UpdatableDayData {
|
||||
struct updatable_day_data {
|
||||
std::optional<Date> date;
|
||||
};
|
||||
|
||||
enum TaskState { TODO, DONE };
|
||||
enum task_state { TODO, DONE };
|
||||
|
||||
struct TaskData {
|
||||
struct task_data {
|
||||
int id;
|
||||
std::string title;
|
||||
TaskState state;
|
||||
task_state state;
|
||||
std::optional<int> dayId;
|
||||
std::optional<int> eventId;
|
||||
};
|
||||
|
||||
struct UpdatableTaskData {
|
||||
struct updatable_task_data {
|
||||
std::optional<std::string> title = std::nullopt;
|
||||
std::optional<TaskState> state = std::nullopt;
|
||||
std::optional<task_state> state = std::nullopt;
|
||||
std::optional<std::optional<int>> dayId = std::nullopt;
|
||||
std::optional<std::optional<int>> eventId = std::nullopt;
|
||||
};
|
||||
|
||||
struct EventData {
|
||||
struct event_data {
|
||||
int id;
|
||||
int dayId;
|
||||
std::string title;
|
||||
|
|
@ -48,69 +48,69 @@ struct EventData {
|
|||
Time endsAt;
|
||||
};
|
||||
|
||||
struct UpdatableEventData {
|
||||
struct updatable_event_data {
|
||||
std::optional<int> dayId;
|
||||
std::optional<std::string> title;
|
||||
std::optional<Time> startsAt;
|
||||
std::optional<Time> endsAt;
|
||||
};
|
||||
|
||||
class DataProvider
|
||||
class data_provider
|
||||
{
|
||||
|
||||
public:
|
||||
DataProvider() {};
|
||||
DataProvider(DataProvider &) = delete;
|
||||
DataProvider(DataProvider &&) = delete;
|
||||
data_provider() {};
|
||||
data_provider(data_provider &) = delete;
|
||||
data_provider(data_provider &&) = delete;
|
||||
|
||||
virtual ~DataProvider() = default;
|
||||
virtual ~data_provider() = default;
|
||||
virtual void save() = 0;
|
||||
virtual void load() = 0;
|
||||
|
||||
virtual std::string name() const = 0;
|
||||
|
||||
// Tasks
|
||||
virtual TaskData insertTask(const TaskData &task) = 0;
|
||||
virtual void removeTaskById(int taskId) = 0;
|
||||
virtual std::optional<TaskData> getTaskById(int taskId) = 0;
|
||||
virtual std::vector<TaskData> getTasksByEventId(int eventId) = 0;
|
||||
virtual std::vector<TaskData> getTasksByDayId(int dayId) = 0;
|
||||
virtual std::vector<TaskData> getTasksByDate(Date date) = 0;
|
||||
virtual std::vector<TaskData> getTasksWithoutDate() = 0;
|
||||
virtual std::vector<TaskData> getTasks() = 0;
|
||||
virtual void updateTask(int taskId, UpdatableTaskData updateData) = 0;
|
||||
virtual task_data insert_task(const task_data &task) = 0;
|
||||
virtual void remove_task_by_id(int taskId) = 0;
|
||||
virtual std::optional<task_data> get_task_by_id(int taskId) = 0;
|
||||
virtual std::vector<task_data> get_tasks_by_event_id(int eventId) = 0;
|
||||
virtual std::vector<task_data> get_tasks_by_day_id(int dayId) = 0;
|
||||
virtual std::vector<task_data> get_tasks_by_date(Date date) = 0;
|
||||
virtual std::vector<task_data> get_tasks_without_date() = 0;
|
||||
virtual std::vector<task_data> get_tasks() = 0;
|
||||
virtual void update_task(int taskId, updatable_task_data updateData) = 0;
|
||||
|
||||
// Events
|
||||
virtual EventData insertEvent(const EventData &task) = 0;
|
||||
virtual void removeEventById(int eventId) = 0;
|
||||
virtual std::optional<EventData> getEventById(int eventId) = 0;
|
||||
virtual std::vector<EventData> getEvents() = 0;
|
||||
virtual std::vector<EventData> getEventsByDate(Date date) = 0;
|
||||
virtual void updateEvent(int eventId, UpdatableEventData updateData) = 0;
|
||||
virtual event_data insertEvent(const event_data &task) = 0;
|
||||
virtual void remove_event_by_id(int eventId) = 0;
|
||||
virtual std::optional<event_data> get_event_by_id(int eventId) = 0;
|
||||
virtual std::vector<event_data> get_events() = 0;
|
||||
virtual std::vector<event_data> get_events_by_date(Date date) = 0;
|
||||
virtual void update_event(int eventId, updatable_event_data updateData) = 0;
|
||||
|
||||
// Days
|
||||
virtual DayData insertDay(const DayData &day) = 0;
|
||||
virtual void removeDayById(int dayId) = 0;
|
||||
virtual std::vector<DayData> getDays() = 0;
|
||||
virtual std::optional<DayData> getDayByDate(const Date &date) = 0;
|
||||
virtual void updateDay(int dayId, UpdatableDayData updateData) = 0;
|
||||
virtual day_data insert_day(const day_data &day) = 0;
|
||||
virtual void remove_day_by_id(int dayId) = 0;
|
||||
virtual std::vector<day_data> get_days() = 0;
|
||||
virtual std::optional<day_data> get_day_by_date(const Date &date) = 0;
|
||||
virtual void update_day(int dayId, updatable_day_data updateData) = 0;
|
||||
|
||||
const int id = DataProvider::generateNextId();
|
||||
const int id = data_provider::generate_next_id();
|
||||
|
||||
void setDirty(bool dirty)
|
||||
void set_dirty(bool dirty)
|
||||
{
|
||||
isDirty_ = dirty;
|
||||
_is_dirty = dirty;
|
||||
};
|
||||
|
||||
bool isDirty() const
|
||||
bool is_dirty() const
|
||||
{
|
||||
return isDirty_;
|
||||
return _is_dirty;
|
||||
};
|
||||
|
||||
private:
|
||||
bool isDirty_ = false;
|
||||
bool _is_dirty = false;
|
||||
|
||||
static int generateNextId()
|
||||
static int generate_next_id()
|
||||
{
|
||||
static int nextId = 0;
|
||||
return nextId++;
|
||||
|
|
|
|||
6
external/mirai-core/include/mirai-core/Day.h
vendored
6
external/mirai-core/include/mirai-core/Day.h
vendored
|
|
@ -19,7 +19,7 @@ class Day
|
|||
{
|
||||
|
||||
public:
|
||||
Day(DataProvider *data, DayData day) : data_(data), dayData_(day) {};
|
||||
Day(data_provider *data, day_data day) : data_(data), dayData_(day) {};
|
||||
|
||||
Date date() const;
|
||||
std::vector<Task> tasks();
|
||||
|
|
@ -31,8 +31,8 @@ class Day
|
|||
int sourceId() const;
|
||||
|
||||
private:
|
||||
DayData dayData_;
|
||||
DataProvider *data_;
|
||||
day_data dayData_;
|
||||
data_provider *data_;
|
||||
};
|
||||
|
||||
} // namespace mirai
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class Event
|
|||
{
|
||||
|
||||
public:
|
||||
Event(DataProvider *data, EventData eventData) : data_(data), eventData_(eventData) {};
|
||||
Event(data_provider *data, event_data eventData) : data_(data), eventData_(eventData) {};
|
||||
|
||||
std::string title() const;
|
||||
Time startsAt() const;
|
||||
|
|
@ -37,8 +37,8 @@ class Event
|
|||
int sourceId() const;
|
||||
|
||||
private:
|
||||
EventData eventData_;
|
||||
DataProvider *data_;
|
||||
event_data eventData_;
|
||||
data_provider *data_;
|
||||
};
|
||||
|
||||
} // namespace mirai
|
||||
|
|
|
|||
|
|
@ -19,22 +19,22 @@
|
|||
namespace mirai
|
||||
{
|
||||
|
||||
struct MarkdownData {
|
||||
struct markdown_data {
|
||||
std::string name;
|
||||
std::vector<TaskData> tasks;
|
||||
std::vector<DayData> days;
|
||||
std::vector<EventData> events;
|
||||
std::vector<task_data> tasks;
|
||||
std::vector<day_data> days;
|
||||
std::vector<event_data> events;
|
||||
};
|
||||
|
||||
class MarkdownDataProvider : public DataProvider
|
||||
class markdown_data_provider : public data_provider
|
||||
{
|
||||
public:
|
||||
MarkdownDataProvider(const std::string &filePath) : filePath_(filePath), DataProvider()
|
||||
markdown_data_provider(const std::string &file_path) : _file_path(file_path), data_provider()
|
||||
{
|
||||
}
|
||||
|
||||
std::string toMarkdown();
|
||||
MarkdownData parseMarkdown(const std::string &content);
|
||||
std::string to_markdown();
|
||||
markdown_data parse_markdown(const std::string &content);
|
||||
|
||||
std::string path() const;
|
||||
|
||||
|
|
@ -44,35 +44,35 @@ class MarkdownDataProvider : public DataProvider
|
|||
std::string name() const override;
|
||||
|
||||
// Tasks
|
||||
TaskData insertTask(const TaskData &task) override;
|
||||
void removeTaskById(int taskId) override;
|
||||
std::optional<TaskData> getTaskById(int taskId) override;
|
||||
std::vector<TaskData> getTasksByEventId(int eventId) override;
|
||||
std::vector<TaskData> getTasksByDayId(int dayId) override;
|
||||
std::vector<TaskData> getTasksByDate(Date date) override;
|
||||
std::vector<TaskData> getTasksWithoutDate() override;
|
||||
std::vector<TaskData> getTasks() override;
|
||||
void updateTask(int taskId, UpdatableTaskData updateData) override;
|
||||
task_data insert_task(const task_data &task) override;
|
||||
void remove_task_by_id(int taskId) override;
|
||||
std::optional<task_data> get_task_by_id(int taskId) override;
|
||||
std::vector<task_data> get_tasks_by_event_id(int eventId) override;
|
||||
std::vector<task_data> get_tasks_by_day_id(int dayId) override;
|
||||
std::vector<task_data> get_tasks_by_date(Date date) override;
|
||||
std::vector<task_data> get_tasks_without_date() override;
|
||||
std::vector<task_data> get_tasks() override;
|
||||
void update_task(int taskId, updatable_task_data updateData) override;
|
||||
|
||||
// Events
|
||||
EventData insertEvent(const EventData &task) override;
|
||||
void removeEventById(int eventId) override;
|
||||
std::optional<EventData> getEventById(int eventId) override;
|
||||
std::vector<EventData> getEvents() override;
|
||||
std::vector<EventData> getEventsByDate(Date date) override;
|
||||
void updateEvent(int eventId, UpdatableEventData updateData) override;
|
||||
event_data insertEvent(const event_data &task) override;
|
||||
void remove_event_by_id(int eventId) override;
|
||||
std::optional<event_data> get_event_by_id(int eventId) override;
|
||||
std::vector<event_data> get_events() override;
|
||||
std::vector<event_data> get_events_by_date(Date date) override;
|
||||
void update_event(int eventId, updatable_event_data updateData) override;
|
||||
|
||||
// Days
|
||||
DayData insertDay(const DayData &day) override;
|
||||
void removeDayById(int dayId) override;
|
||||
std::vector<DayData> getDays() override;
|
||||
std::optional<DayData> getDayByDate(const Date &date) override;
|
||||
void updateDay(int dayId, UpdatableDayData updateData) override;
|
||||
day_data insert_day(const day_data &day) override;
|
||||
void remove_day_by_id(int dayId) override;
|
||||
std::vector<day_data> get_days() override;
|
||||
std::optional<day_data> get_day_by_date(const Date &date) override;
|
||||
void update_day(int dayId, updatable_day_data updateData) override;
|
||||
|
||||
private:
|
||||
std::string name_;
|
||||
std::string filePath_;
|
||||
MarkdownData data;
|
||||
std::string _name;
|
||||
std::string _file_path;
|
||||
markdown_data _data;
|
||||
};
|
||||
|
||||
} // namespace mirai
|
||||
|
|
|
|||
18
external/mirai-core/include/mirai-core/Mirai.h
vendored
18
external/mirai-core/include/mirai-core/Mirai.h
vendored
|
|
@ -22,7 +22,7 @@ class Mirai
|
|||
public:
|
||||
Mirai(const std::string &configFilePath);
|
||||
void addSource(
|
||||
const std::string &name, const std::string &type, std::unique_ptr<DataProvider> &&source
|
||||
const std::string &name, const std::string &type, std::unique_ptr<data_provider> &&source
|
||||
);
|
||||
void
|
||||
editSource(int id, const std::string &name, const std::string &color, const std::string &path);
|
||||
|
|
@ -30,25 +30,25 @@ class Mirai
|
|||
void unloadAllSources();
|
||||
void save();
|
||||
|
||||
std::vector<std::unique_ptr<Source>> &getSources();
|
||||
std::vector<std::unique_ptr<source>> &getSources();
|
||||
const std::vector<std::string> &getTags();
|
||||
|
||||
// Returns a non owning pointer to the requested resource or nullptr if not found.
|
||||
Source *getSourceById(int id);
|
||||
Source *getSourceByName(const std::string &name);
|
||||
source *getSourceById(int id);
|
||||
source *getSourceByName(const std::string &name);
|
||||
|
||||
void onSourceAdded(std::function<void(Source *)> f);
|
||||
void onSourceEdited(std::function<void(Source *)> f);
|
||||
void onSourceAdded(std::function<void(source *)> f);
|
||||
void onSourceEdited(std::function<void(source *)> f);
|
||||
void onSourceDeleted(std::function<void(int)> f);
|
||||
|
||||
private:
|
||||
void loadConfig(const std::string &path);
|
||||
void saveConfig();
|
||||
std::vector<std::unique_ptr<Source>> sources_;
|
||||
std::vector<std::unique_ptr<source>> sources_;
|
||||
std::string configPath_;
|
||||
|
||||
EventEmitter<Source *> sourceAdded;
|
||||
EventEmitter<Source *> sourceEdited;
|
||||
EventEmitter<source *> sourceAdded;
|
||||
EventEmitter<source *> sourceEdited;
|
||||
EventEmitter<int> sourceDeleted;
|
||||
};
|
||||
} // namespace mirai
|
||||
|
|
|
|||
68
external/mirai-core/include/mirai-core/Source.h
vendored
68
external/mirai-core/include/mirai-core/Source.h
vendored
|
|
@ -33,24 +33,24 @@ struct createEventParams {
|
|||
struct SourceConstructor {
|
||||
std::string name;
|
||||
std::string color;
|
||||
DataProvider *sourceDataProvider;
|
||||
data_provider *sourceDataProvider;
|
||||
};
|
||||
|
||||
class Source
|
||||
class source
|
||||
{
|
||||
public:
|
||||
Source(SourceConstructor params)
|
||||
: data(params.sourceDataProvider), name_(params.name), color_(params.color),
|
||||
type_("FileSystemMarkdown")
|
||||
source(SourceConstructor params)
|
||||
: data(params.sourceDataProvider), _name(params.name), _color(params.color),
|
||||
_type("FileSystemMarkdown")
|
||||
{
|
||||
}
|
||||
|
||||
Source(Source &) = delete;
|
||||
Source(Source &&) = delete;
|
||||
Source operator=(Source &) = delete;
|
||||
Source operator=(Source &&) = delete;
|
||||
source(source &) = delete;
|
||||
source(source &&) = delete;
|
||||
source operator=(source &) = delete;
|
||||
source operator=(source &&) = delete;
|
||||
|
||||
~Source() = default;
|
||||
~source() = default;
|
||||
|
||||
void init();
|
||||
void save();
|
||||
|
|
@ -59,44 +59,44 @@ class Source
|
|||
std::string name() const;
|
||||
std::string type() const;
|
||||
std::string color() const;
|
||||
DataProvider *dataProvider();
|
||||
class data_provider *data_provider();
|
||||
|
||||
void setName(const std::string &name);
|
||||
void setColor(const std::string &color);
|
||||
void set_name(const std::string &name);
|
||||
void set_color(const std::string &color);
|
||||
|
||||
void createTask(const createTaskParams &task);
|
||||
void removeTask(const Task &task);
|
||||
std::optional<Task> getTaskById(int taskId);
|
||||
std::vector<Task> getTasksByDate(Date date);
|
||||
std::vector<Task> getUnscheduledTasks();
|
||||
std::vector<Task> getTasks();
|
||||
void create_task(const createTaskParams &task);
|
||||
void remove_task(const Task &task);
|
||||
std::optional<Task> get_task_by_id(int taskId);
|
||||
std::vector<Task> get_tasks_by_date(Date date);
|
||||
std::vector<Task> get_unscheduled_tasks();
|
||||
std::vector<Task> get_tasks();
|
||||
|
||||
void createEvent(const createEventParams &eventToCreate);
|
||||
void removeEvent(const Event &event);
|
||||
std::vector<Event> getEvents();
|
||||
std::optional<Event> getEventById(int eventId);
|
||||
std::vector<Event> getEventsByDate(Date date);
|
||||
void create_event(const createEventParams &eventToCreate);
|
||||
void remove_event(const Event &event);
|
||||
std::vector<Event> get_events();
|
||||
std::optional<Event> get_event_by_id(int eventId);
|
||||
std::vector<Event> get_events_by_date(Date date);
|
||||
|
||||
std::vector<Day> getDays();
|
||||
std::optional<Day> getDayByDate(Date date);
|
||||
std::vector<Day> get_days();
|
||||
std::optional<Day> get_day_by_date(Date date);
|
||||
|
||||
const int id = Source::generateNextId();
|
||||
const int id = source::generate_next_id();
|
||||
|
||||
bool isDirty() const
|
||||
bool is_dirty() const
|
||||
{
|
||||
return data->isDirty();
|
||||
return data->is_dirty();
|
||||
};
|
||||
|
||||
private:
|
||||
static int generateNextId()
|
||||
static int generate_next_id()
|
||||
{
|
||||
static int nextId = 0;
|
||||
return nextId++;
|
||||
}
|
||||
|
||||
std::string name_;
|
||||
std::string type_;
|
||||
std::string color_;
|
||||
DataProvider *data;
|
||||
std::string _name;
|
||||
std::string _type;
|
||||
std::string _color;
|
||||
class data_provider *data;
|
||||
};
|
||||
} // namespace mirai
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ class Task
|
|||
{
|
||||
|
||||
public:
|
||||
Task(DataProvider *data, TaskData task) : data_(data), task_(task) {};
|
||||
Task(data_provider *data, task_data task) : data_(data), task_(task) {};
|
||||
|
||||
std::string title() const;
|
||||
mirai::TaskState state() const;
|
||||
mirai::task_state state() const;
|
||||
bool checked() const;
|
||||
bool hasEvent() const;
|
||||
bool hasDate() const;
|
||||
|
|
@ -38,8 +38,8 @@ class Task
|
|||
int sourceId() const;
|
||||
|
||||
private:
|
||||
TaskData task_;
|
||||
DataProvider *data_;
|
||||
task_data task_;
|
||||
data_provider *data_;
|
||||
};
|
||||
|
||||
} // namespace mirai
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@ class View
|
|||
void update();
|
||||
|
||||
void removeSources();
|
||||
void addSource(const Source &source);
|
||||
void setSources(const std::vector<Source> &sources);
|
||||
void addSource(const source &source);
|
||||
void setSources(const std::vector<source> &sources);
|
||||
void setAllSources();
|
||||
bool isSourceSelected(const Source &source) const;
|
||||
bool isSourceSelected(const source &source) const;
|
||||
|
||||
size_t activeSourceCount() const;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue