From b6f464771937891f120fa8ec635a76f8cd073635 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Jul 2024 11:30:55 +0200 Subject: feat: upgrade infrastructure to simplify code --- include/GFModuleCommonUtils.hpp | 57 ++++++++++++++++++++++++++++++++++++----- include/GFModuleDeclare.h | 47 +++++++++++++++++++++++++++++++++ include/GFModuleDefine.h | 49 +++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 6 deletions(-) create mode 100644 include/GFModuleDeclare.h create mode 100644 include/GFModuleDefine.h (limited to 'include') diff --git a/include/GFModuleCommonUtils.hpp b/include/GFModuleCommonUtils.hpp index d65b356..3176784 100644 --- a/include/GFModuleCommonUtils.hpp +++ b/include/GFModuleCommonUtils.hpp @@ -43,17 +43,41 @@ #define UDUP(v) UnStrDup(v) #define QDUP(v) QStrDup(v) +#define LISTEN(event) GFModuleListenEvent(GFGetModuleID(), DUP(event)); + +#define EXECUTE_MODULE() \ + auto GFExecuteModule(GFModuleEvent* p_event) -> int { \ + auto event = ConvertEventToMap(p_event); + +#define END_EXECUTE_MODULE() } + +#define CB_SUCC(event) \ + CB(event, GFGetModuleID(), {{"ret", "0"}}); \ + return 0; + +#define CB_ERR(event, ret, err) \ + CB(event, GFGetModuleID(), \ + {{"ret", QString::number(ret)}, {"reason", QString(err)}}); \ + return ret; + inline void MLogDebug(const QString& s) { GFModuleLogDebug(s.toUtf8()); } inline void MLogInfo(const QString& s) { GFModuleLogInfo(s.toUtf8()); } inline void MLogWarn(const QString& s) { GFModuleLogWarn(s.toUtf8()); } inline void MLogError(const QString& s) { GFModuleLogError(s.toUtf8()); } -#define MLogDebugS(format, ...) \ - MLogDebug(QString::asprintf(format, __VA_ARGS__)) -#define MLogInfoS(format, ...) MLogInfo(QString::asprintf(format, __VA_ARGS__)) -#define MLogWarnS(format, ...) MLogWarn(QString::asprintf(format, __VA_ARGS__)) -#define MLogErrorS(format, ...) \ - MLogError(QString::asprintf(format, __VA_ARGS__)) +#define LOG_DEBUG(format) MLogDebug(FormatString(QString(format))) +#define LOG_INFO(format) MLogDebug(FormatString(QString(format))) +#define LOG_WARN(format) MLogDebug(FormatString(QString(format))) +#define LOG_ERROR(format) MLogDebug(FormatString(QString(format))) + +#define FLOG_DEBUG(format, ...) \ + MLogDebug(FormatString(QString(format), __VA_ARGS__)) +#define FLOG_INFO(format, ...) \ + MLogInfo(FormatString(QString(format), __VA_ARGS__)) +#define FLOG_WARN(format, ...) \ + MLogWarn(FormatString(QString(format), __VA_ARGS__)) +#define FLOG_ERROR(format, ...) \ + MLogError(FormatString(QString(format), __VA_ARGS__)) inline auto QStrDup(QString str) -> char* { return DUP(str.toUtf8()); } @@ -179,6 +203,12 @@ inline auto ConvertMapToEvent(QMap event_map) return event; } +inline void CB(const QMap& event, const char* module, + const QMap& params) { + GFModuleTriggerModuleEventCallback(ConvertMapToEvent(event), module, + ConvertMapToParams(params)); +} + inline auto AllocBufferAndCopy(const QByteArray& b) -> char* { auto* p = static_cast(GFAllocateMemory(sizeof(char) * b.size())); memcpy(p, b.constData(), b.size()); @@ -261,3 +291,18 @@ inline auto CharArrayToQStringList(char** pl_components, GFFreeMemory(pl_components); return list; } + +template +auto FormatString(const QString& format, Args... args) -> QString { + return FormatStringHelper(format, args...); +} + +template +auto FormatStringHelper(const QString& format, T arg) -> QString { + return format.arg(arg); +} + +template +auto FormatStringHelper(const QString& format, T arg, Args... args) -> QString { + return FormatStringHelper(format.arg(arg), args...); +} \ No newline at end of file diff --git a/include/GFModuleDeclare.h b/include/GFModuleDeclare.h new file mode 100644 index 0000000..ae30c4f --- /dev/null +++ b/include/GFModuleDeclare.h @@ -0,0 +1,47 @@ +/** + * 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 + * + */ + +#pragma once + +#include + +#include "GFModuleExport.h" + +#define GF_MODULE_API_DECLARE \ + extern "C" { \ + auto GF_MODULE_EXPORT GFGetModuleGFSDKVersion() -> const char *; \ + auto GF_MODULE_EXPORT GFGetModuleQtEnvVersion() -> const char *; \ + auto GF_MODULE_EXPORT GFGetModuleID() -> const char *; \ + auto GF_MODULE_EXPORT GFGetModuleVersion() -> const char *; \ + auto GF_MODULE_EXPORT GFGetModuleMetaData() -> GFModuleMetaData *; \ + auto GF_MODULE_EXPORT GFRegisterModule() -> int; \ + auto GF_MODULE_EXPORT GFActiveModule() -> int; \ + auto GF_MODULE_EXPORT GFExecuteModule(GFModuleEvent *) -> int; \ + auto GF_MODULE_EXPORT GFDeactivateModule() -> int; \ + auto GF_MODULE_EXPORT GFUnregisterModule() -> int; \ + }; diff --git a/include/GFModuleDefine.h b/include/GFModuleDefine.h new file mode 100644 index 0000000..594bbc5 --- /dev/null +++ b/include/GFModuleDefine.h @@ -0,0 +1,49 @@ +/** + * 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 + * + */ + +#pragma once + +#include "GFModuleCommonUtils.hpp" +#include "GFSDKBuildInfo.h" + +#define GF_MODULE_API_DEFINE(id, name, ver, desc, author) \ + class GTrC { \ + Q_DECLARE_TR_FUNCTIONS(GTrC) \ + }; \ + auto GFGetModuleGFSDKVersion() -> const char* { \ + return DUP(GF_SDK_VERSION_STR); \ + } \ + auto GFGetModuleQtEnvVersion() -> const char* { \ + return DUP(QT_VERSION_STR); \ + } \ + auto GFGetModuleID() -> const char* { return DUP((id)); } \ + auto GFGetModuleVersion() -> const char* { return DUP((ver)); } \ + auto GFGetModuleMetaData() -> GFModuleMetaData* { \ + return QMapToGFModuleMetaDataList( \ + {{"Name", (name)}, {"Description", (desc)}, {"Author", (author)}}); \ + } -- cgit v1.2.3