From 9f61a1f86ca85da52a13a57290db95655cd5740e Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jul 2024 14:53:16 +0200 Subject: feat: improve the project structure --- src/sdk/GFSDKModule.cpp | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 src/sdk/GFSDKModule.cpp (limited to 'src/sdk/GFSDKModule.cpp') diff --git a/src/sdk/GFSDKModule.cpp b/src/sdk/GFSDKModule.cpp new file mode 100644 index 00000000..00594488 --- /dev/null +++ b/src/sdk/GFSDKModule.cpp @@ -0,0 +1,98 @@ +/** + * Copyright (C) 2021 Saturneric + * + * This file is part of GpgFrontend. + * + * GpgFrontend is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GpgFrontend is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GpgFrontend. If not, see . + * + * The initial version of the source code is inherited from + * the gpg4usb project, which is under GPL-3.0-or-later. + * + * All the source code of GpgFrontend was modified and released by + * Saturneric starting on May 12, 2021. + * + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include "GFSDKModule.h" + +#include +#include + +#include "GFSDKBasic.h" + +void GFModuleListenEvent(const char *module_id, const char *event_id) { + return GpgFrontend::Module::ModuleManager::GetInstance().ListenEvent( + GpgFrontend::GFUnStrDup(module_id).toLower(), + GpgFrontend::GFUnStrDup(event_id).toUpper()); +} + +auto GFModuleRetrieveRTValueOrDefault(const char *namespace_, const char *key, + const char *default_value) -> const + char * { + return GpgFrontend::GFStrDup( + GpgFrontend::Module::RetrieveRTValueTypedOrDefault( + GpgFrontend::GFUnStrDup(namespace_), GpgFrontend::GFUnStrDup(key), + GpgFrontend::GFUnStrDup(default_value))); +} + +void GFModuleUpsertRTValue(const char *namespace_, const char *key, + const char *vaule) { + GpgFrontend::Module::UpsertRTValue( + GpgFrontend::GFUnStrDup(namespace_).toLower(), + GpgFrontend::GFUnStrDup(key).toLower(), GpgFrontend::GFUnStrDup(vaule)); +} + +void GFModuleUpsertRTValueBool(const char *namespace_, const char *key, + int value) { + GpgFrontend::Module::UpsertRTValue( + GpgFrontend::GFUnStrDup(namespace_).toLower(), + GpgFrontend::GFUnStrDup(key).toLower(), value != 0); +} + +auto GFModuleListRTChildKeys(const char *namespace_, const char *key, + char ***child_keys) -> int32_t { + *child_keys = nullptr; + auto keys = GpgFrontend::Module::ListRTChildKeys( + GpgFrontend::GFUnStrDup(namespace_).toLower(), + GpgFrontend::GFUnStrDup(key).toLower()); + + if (keys.empty()) return 0; + + *child_keys = + static_cast(GFAllocateMemory(sizeof(char **) * keys.size())); + + for (int i = 0; i < keys.size(); i++) { + (*child_keys)[i] = GpgFrontend::GFStrDup(keys[i]); + } + + return static_cast(keys.size()); +} + +void GFModuleTriggerModuleEventCallback(GFModuleEvent *module_event, + const char *module_id, int argc, + char **argv) { + auto data_object = GpgFrontend::TransferParams(); + for (int i = 0; i < argc; i++) { + data_object->AppendObject(GpgFrontend::GFUnStrDup(argv[i])); + } + + auto event = GpgFrontend::Module::ModuleManager::GetInstance().SearchEvent( + GpgFrontend::GFUnStrDup(module_event->trigger_id).toLower()); + if (!event) return; + + event.value()->ExecuteCallback(GpgFrontend::GFUnStrDup(module_id), + data_object); +} \ No newline at end of file -- cgit v1.2.3 From d1d6859e2a50a78f57388ebf0a06f0636d4d0910 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jul 2024 20:38:16 +0200 Subject: feat: add some ui apis to sdk --- src/sdk/GFSDKModule.cpp | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'src/sdk/GFSDKModule.cpp') diff --git a/src/sdk/GFSDKModule.cpp b/src/sdk/GFSDKModule.cpp index 00594488..c0215a8b 100644 --- a/src/sdk/GFSDKModule.cpp +++ b/src/sdk/GFSDKModule.cpp @@ -29,45 +29,40 @@ #include "GFSDKModule.h" #include -#include +#include #include "GFSDKBasic.h" void GFModuleListenEvent(const char *module_id, const char *event_id) { return GpgFrontend::Module::ModuleManager::GetInstance().ListenEvent( - GpgFrontend::GFUnStrDup(module_id).toLower(), - GpgFrontend::GFUnStrDup(event_id).toUpper()); + GFUnStrDup(module_id).toLower(), GFUnStrDup(event_id).toUpper()); } auto GFModuleRetrieveRTValueOrDefault(const char *namespace_, const char *key, const char *default_value) -> const char * { - return GpgFrontend::GFStrDup( - GpgFrontend::Module::RetrieveRTValueTypedOrDefault( - GpgFrontend::GFUnStrDup(namespace_), GpgFrontend::GFUnStrDup(key), - GpgFrontend::GFUnStrDup(default_value))); + return GFStrDup(GpgFrontend::Module::RetrieveRTValueTypedOrDefault( + GFUnStrDup(namespace_), GFUnStrDup(key), GFUnStrDup(default_value))); } void GFModuleUpsertRTValue(const char *namespace_, const char *key, const char *vaule) { - GpgFrontend::Module::UpsertRTValue( - GpgFrontend::GFUnStrDup(namespace_).toLower(), - GpgFrontend::GFUnStrDup(key).toLower(), GpgFrontend::GFUnStrDup(vaule)); + GpgFrontend::Module::UpsertRTValue(GFUnStrDup(namespace_).toLower(), + GFUnStrDup(key).toLower(), + GFUnStrDup(vaule)); } void GFModuleUpsertRTValueBool(const char *namespace_, const char *key, int value) { - GpgFrontend::Module::UpsertRTValue( - GpgFrontend::GFUnStrDup(namespace_).toLower(), - GpgFrontend::GFUnStrDup(key).toLower(), value != 0); + GpgFrontend::Module::UpsertRTValue(GFUnStrDup(namespace_).toLower(), + GFUnStrDup(key).toLower(), value != 0); } auto GFModuleListRTChildKeys(const char *namespace_, const char *key, char ***child_keys) -> int32_t { *child_keys = nullptr; auto keys = GpgFrontend::Module::ListRTChildKeys( - GpgFrontend::GFUnStrDup(namespace_).toLower(), - GpgFrontend::GFUnStrDup(key).toLower()); + GFUnStrDup(namespace_).toLower(), GFUnStrDup(key).toLower()); if (keys.empty()) return 0; @@ -75,7 +70,7 @@ auto GFModuleListRTChildKeys(const char *namespace_, const char *key, static_cast(GFAllocateMemory(sizeof(char **) * keys.size())); for (int i = 0; i < keys.size(); i++) { - (*child_keys)[i] = GpgFrontend::GFStrDup(keys[i]); + (*child_keys)[i] = GFStrDup(keys[i]); } return static_cast(keys.size()); @@ -86,13 +81,21 @@ void GFModuleTriggerModuleEventCallback(GFModuleEvent *module_event, char **argv) { auto data_object = GpgFrontend::TransferParams(); for (int i = 0; i < argc; i++) { - data_object->AppendObject(GpgFrontend::GFUnStrDup(argv[i])); + data_object->AppendObject(GFUnStrDup(argv[i])); } auto event = GpgFrontend::Module::ModuleManager::GetInstance().SearchEvent( - GpgFrontend::GFUnStrDup(module_event->trigger_id).toLower()); + GFUnStrDup(module_event->trigger_id).toLower()); if (!event) return; - event.value()->ExecuteCallback(GpgFrontend::GFUnStrDup(module_id), - data_object); -} \ No newline at end of file + event.value()->ExecuteCallback(GFUnStrDup(module_id), data_object); +} + +auto GFModuleRetrieveRTValueOrDefaultBool(const char *namespace_, + const char *key, int default_value) + -> const int { + return static_cast( + GpgFrontend::Module::RetrieveRTValueTypedOrDefault( + GFUnStrDup(namespace_), GFUnStrDup(key), + static_cast(default_value))); +} -- cgit v1.2.3 From 3d84beaf22caaf299a3004032402bd94ee4ab886 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 26 Jul 2024 18:33:09 +0200 Subject: fix: clean up warnings --- src/sdk/GFSDKModule.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sdk/GFSDKModule.cpp') diff --git a/src/sdk/GFSDKModule.cpp b/src/sdk/GFSDKModule.cpp index c0215a8b..ecc4afd1 100644 --- a/src/sdk/GFSDKModule.cpp +++ b/src/sdk/GFSDKModule.cpp @@ -69,7 +69,7 @@ auto GFModuleListRTChildKeys(const char *namespace_, const char *key, *child_keys = static_cast(GFAllocateMemory(sizeof(char **) * keys.size())); - for (int i = 0; i < keys.size(); i++) { + for (decltype(keys.size()) i = 0; i < keys.size(); i++) { (*child_keys)[i] = GFStrDup(keys[i]); } @@ -92,8 +92,8 @@ void GFModuleTriggerModuleEventCallback(GFModuleEvent *module_event, } auto GFModuleRetrieveRTValueOrDefaultBool(const char *namespace_, - const char *key, int default_value) - -> const int { + const char *key, + int default_value) -> const int { return static_cast( GpgFrontend::Module::RetrieveRTValueTypedOrDefault( GFUnStrDup(namespace_), GFUnStrDup(key), -- 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/sdk/GFSDKModule.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/sdk/GFSDKModule.cpp') diff --git a/src/sdk/GFSDKModule.cpp b/src/sdk/GFSDKModule.cpp index ecc4afd1..87c008ea 100644 --- a/src/sdk/GFSDKModule.cpp +++ b/src/sdk/GFSDKModule.cpp @@ -78,17 +78,13 @@ auto GFModuleListRTChildKeys(const char *namespace_, const char *key, void GFModuleTriggerModuleEventCallback(GFModuleEvent *module_event, const char *module_id, int argc, - char **argv) { - auto data_object = GpgFrontend::TransferParams(); - for (int i = 0; i < argc; i++) { - data_object->AppendObject(GFUnStrDup(argv[i])); - } - + GFModuleEventParam *p_argv) { + auto argv = ConvertEventParamsToMap(p_argv); auto event = GpgFrontend::Module::ModuleManager::GetInstance().SearchEvent( GFUnStrDup(module_event->trigger_id).toLower()); if (!event) return; - event.value()->ExecuteCallback(GFUnStrDup(module_id), data_object); + event.value()->ExecuteCallback(GFUnStrDup(module_id), argv); } auto GFModuleRetrieveRTValueOrDefaultBool(const char *namespace_, -- cgit v1.2.3 From 9ee5e37b6e5672f58bc1274d445f8157a5bd1de6 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Jul 2024 17:08:11 +0200 Subject: fix: remove invalid parameters from the SDK --- src/sdk/GFSDKModule.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sdk/GFSDKModule.cpp') diff --git a/src/sdk/GFSDKModule.cpp b/src/sdk/GFSDKModule.cpp index 87c008ea..996c9985 100644 --- a/src/sdk/GFSDKModule.cpp +++ b/src/sdk/GFSDKModule.cpp @@ -77,7 +77,7 @@ auto GFModuleListRTChildKeys(const char *namespace_, const char *key, } void GFModuleTriggerModuleEventCallback(GFModuleEvent *module_event, - const char *module_id, int argc, + const char *module_id, GFModuleEventParam *p_argv) { auto argv = ConvertEventParamsToMap(p_argv); auto event = GpgFrontend::Module::ModuleManager::GetInstance().SearchEvent( -- cgit v1.2.3