From 37a62a8d0b590710b902376ca3320cc05e954b63 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 26 Jul 2024 18:24:34 +0200 Subject: feat: remove spdlog and clean up log --- src/core/module/Event.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/core/module/Event.cpp') diff --git a/src/core/module/Event.cpp b/src/core/module/Event.cpp index 4b0b989b..a1fd2fdc 100644 --- a/src/core/module/Event.cpp +++ b/src/core/module/Event.cpp @@ -42,7 +42,6 @@ class Event::Impl { for (const auto& param : params) { AddParameter(param); } - GF_CORE_LOG_DEBUG("create event {}", event_identifier_); } auto operator[](const QString& key) const -> std::optional { @@ -83,20 +82,16 @@ class Event::Impl { void ExecuteCallback(ListenerIdentifier listener_id, const DataObjectPtr& data_object) { - GF_CORE_LOG_DEBUG("try to execute callback for event {} with listener {}", - event_identifier_, listener_id); if (callback_) { - GF_CORE_LOG_DEBUG("executing callback for event {} with listener {}", - event_identifier_, listener_id); if (!QMetaObject::invokeMethod( callback_thread_, [callback = callback_, event_identifier = event_identifier_, listener_id, data_object]() { callback(event_identifier, listener_id, data_object); })) { - GF_CORE_LOG_ERROR( - "failed to invoke callback for event {} with listener {}", - event_identifier_, listener_id); + qCWarning(core) << "failed to invoke callback for event: " + << event_identifier_ + << " with listener:" << listener_id; } } } -- cgit v1.2.3 From 5be04d1602355278814bc86c69ec9f648978be8c Mon Sep 17 00:00:00 2001 From: saturneric Date: Sat, 27 Jul 2024 14:18:26 +0200 Subject: feat: improve sdk api for pinentry module --- src/core/module/Event.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/core/module/Event.cpp') diff --git a/src/core/module/Event.cpp b/src/core/module/Event.cpp index a1fd2fdc..cbffb096 100644 --- a/src/core/module/Event.cpp +++ b/src/core/module/Event.cpp @@ -34,20 +34,17 @@ namespace GpgFrontend::Module { class Event::Impl { public: - Impl(QString event_id, std::initializer_list params, - EventCallback callback) + Impl(QString event_id, Params params, EventCallback callback) : event_identifier_(std::move(event_id)), callback_(std::move(callback)), callback_thread_(QThread::currentThread()) { - for (const auto& param : params) { - AddParameter(param); - } + data_.insert(params); } auto operator[](const QString& key) const -> std::optional { auto it_data = data_.find(key); if (it_data != data_.end()) { - return it_data->second; + return it_data.value(); } return std::nullopt; } @@ -81,7 +78,7 @@ class Event::Impl { } void ExecuteCallback(ListenerIdentifier listener_id, - const DataObjectPtr& data_object) { + const Params& data_object) { if (callback_) { if (!QMetaObject::invokeMethod( callback_thread_, @@ -107,7 +104,7 @@ class Event::Impl { GFModuleEventParam* p_param; int index = 0; - for (const auto& data : data_) { + for (const auto& data : data_.asKeyValueRange()) { p_param = static_cast( SecureMalloc(sizeof(GFModuleEventParam))); if (index++ == 0) event->params = p_param; @@ -126,14 +123,12 @@ class Event::Impl { private: EventIdentifier event_identifier_; EventTriggerIdentifier trigger_uuid_ = QUuid::createUuid().toString(); - std::map data_; + QMap data_; EventCallback callback_; QThread* callback_thread_ = nullptr; ///< }; -Event::Event(const QString& event_id, - std::initializer_list params, - EventCallback callback) +Event::Event(const QString& event_id, Params params, EventCallback callback) : p_(SecureCreateUniqueObject(event_id, params, std::move(callback))) {} @@ -165,8 +160,8 @@ void Event::AddParameter(const QString& key, const QString& value) { p_->AddParameter(key, value); } -void Event::ExecuteCallback(ListenerIdentifier l_id, DataObjectPtr d_o) { - p_->ExecuteCallback(std::move(l_id), d_o); +void Event::ExecuteCallback(ListenerIdentifier l_id, const Params& param) { + p_->ExecuteCallback(std::move(l_id), param); } auto Event::ToModuleEvent() -> GFModuleEvent* { return p_->ToModuleEvent(); } -- cgit v1.2.3 From 3dccd8cff1c3b063110e00112b0878de887daca3 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 29 Jul 2024 03:48:21 +0200 Subject: fix: solve qt5 problems --- src/core/module/Event.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/core/module/Event.cpp') diff --git a/src/core/module/Event.cpp b/src/core/module/Event.cpp index cbffb096..6d39d7ba 100644 --- a/src/core/module/Event.cpp +++ b/src/core/module/Event.cpp @@ -104,6 +104,21 @@ class Event::Impl { GFModuleEventParam* p_param; int index = 0; + +#ifdef QT5_BUILD + for (auto it = data_.keyValueBegin(); it != data_.keyValueEnd(); ++it) { + p_param = static_cast( + SecureMalloc(sizeof(GFModuleEventParam))); + if (index++ == 0) event->params = p_param; + + p_param->name = GFStrDup(it->first); + p_param->value = GFStrDup(it->second); + p_param->next = nullptr; + + if (l_param != nullptr) l_param->next = p_param; + l_param = p_param; + } +#else for (const auto& data : data_.asKeyValueRange()) { p_param = static_cast( SecureMalloc(sizeof(GFModuleEventParam))); @@ -116,6 +131,7 @@ class Event::Impl { if (l_param != nullptr) l_param->next = p_param; l_param = p_param; } +#endif return event; } -- cgit v1.2.3