From 154ebea202d64669143ee6bb33f6327d141343c3 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 3 Mar 2024 02:48:44 +0800 Subject: refactor: reduce core prebuild headers and isolate core to modules --- src/core/module/ModuleInit.cpp | 74 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 src/core/module/ModuleInit.cpp (limited to 'src/core/module/ModuleInit.cpp') diff --git a/src/core/module/ModuleInit.cpp b/src/core/module/ModuleInit.cpp new file mode 100644 index 00000000..d74ea1c4 --- /dev/null +++ b/src/core/module/ModuleInit.cpp @@ -0,0 +1,74 @@ +/** + * 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 "ModuleInit.h" + +#include +#include + +#include "core/module/ModuleManager.h" +#include "core/thread/Task.h" +#include "core/thread/TaskRunnerGetter.h" + +namespace GpgFrontend::Module { + +void LoadGpgFrontendModules(ModuleInitArgs) { + // must init at default thread before core + Thread::TaskRunnerGetter::GetInstance().GetTaskRunner()->PostTask( + new Thread::Task( + [](const DataObjectPtr&) -> int { + GF_CORE_LOG_INFO("loading modules..."); + + auto exec_binary_path = QCoreApplication::applicationDirPath(); + auto mods_path = exec_binary_path + "/mods"; + + if (!QDir(mods_path).exists()) { + GF_CORE_LOG_INFO("module directory not found, abort..."); + return -1; + } + + GF_CORE_LOG_INFO("the path of modules directory: {}", mods_path); + + for (const auto& module_library_name : + QDir(mods_path).entryList(QStringList() << "*.so" + << "*.dll" + << "*.dylib", + QDir::Files)) { + ModuleManager::GetInstance().LoadModule(mods_path + "/" + + module_library_name); + } + + GF_CORE_LOG_INFO("load modules done."); + return 0; + }, + "modules_system_init_task")); +} + +void ShutdownGpgFrontendModules() {} + +} // namespace GpgFrontend::Module \ No newline at end of file -- cgit v1.2.3 From 408eb98f5cc3c4278c04343fbe19e652a629d93d Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 21 Apr 2024 21:47:26 +0200 Subject: feat: adapt linux appimage of modules loading --- src/core/module/ModuleInit.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/core/module/ModuleInit.cpp') diff --git a/src/core/module/ModuleInit.cpp b/src/core/module/ModuleInit.cpp index d74ea1c4..8932c97c 100644 --- a/src/core/module/ModuleInit.cpp +++ b/src/core/module/ModuleInit.cpp @@ -42,18 +42,19 @@ void LoadGpgFrontendModules(ModuleInitArgs) { Thread::TaskRunnerGetter::GetInstance().GetTaskRunner()->PostTask( new Thread::Task( [](const DataObjectPtr&) -> int { - GF_CORE_LOG_INFO("loading modules..."); - auto exec_binary_path = QCoreApplication::applicationDirPath(); auto mods_path = exec_binary_path + "/mods"; + if (!qEnvironmentVariable("APPIMAGE").isEmpty()) { + mods_path = qEnvironmentVariable("APPDIR") + "/usr/lib/mods"; + } + GF_CORE_LOG_DEBUG("try loading modules at path: {} ...", mods_path); if (!QDir(mods_path).exists()) { - GF_CORE_LOG_INFO("module directory not found, abort..."); + GF_CORE_LOG_WARN( + "module directory at path {} not found, abort...", mods_path); return -1; } - GF_CORE_LOG_INFO("the path of modules directory: {}", mods_path); - for (const auto& module_library_name : QDir(mods_path).entryList(QStringList() << "*.so" << "*.dll" @@ -63,7 +64,7 @@ void LoadGpgFrontendModules(ModuleInitArgs) { module_library_name); } - GF_CORE_LOG_INFO("load modules done."); + GF_CORE_LOG_DEBUG("load modules done."); return 0; }, "modules_system_init_task")); -- cgit v1.2.3 From 2af2fff270c32837f8cce133268d96fa285a7b3e Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Apr 2024 19:02:17 +0200 Subject: feat: load both integrated and external modules --- src/core/module/ModuleInit.cpp | 76 +++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 24 deletions(-) (limited to 'src/core/module/ModuleInit.cpp') diff --git a/src/core/module/ModuleInit.cpp b/src/core/module/ModuleInit.cpp index 8932c97c..0fddc16a 100644 --- a/src/core/module/ModuleInit.cpp +++ b/src/core/module/ModuleInit.cpp @@ -31,41 +31,69 @@ #include #include +#include "core/function/GlobalSettingStation.h" #include "core/module/ModuleManager.h" #include "core/thread/Task.h" #include "core/thread/TaskRunnerGetter.h" namespace GpgFrontend::Module { +void LoadModuleFromPath(const QString& mods_path) { + for (const auto& module_library_name : + QDir(mods_path).entryList(QStringList() << "*.so" + << "*.dll" + << "*.dylib", + QDir::Files)) { + ModuleManager::GetInstance().LoadModule(mods_path + "/" + + module_library_name); + } +} + +auto LoadIntegratedMods() -> bool { + auto exec_binary_path = QCoreApplication::applicationDirPath(); + auto mods_path = exec_binary_path + "/mods"; + if (!qEnvironmentVariable("APPIMAGE").isEmpty()) { + mods_path = qEnvironmentVariable("APPDIR") + "/usr/lib/mods"; + } + + GF_CORE_LOG_DEBUG("try loading integrated modules at path: {} ...", + mods_path); + if (!QDir(mods_path).exists()) { + GF_CORE_LOG_WARN( + "integrated module directory at path {} not found, abort...", + mods_path); + return false; + } + + LoadModuleFromPath(mods_path); + + GF_CORE_LOG_DEBUG("load integrated modules done."); + return true; +} + +auto LoadExternalMods() -> bool { + auto mods_path = + GpgFrontend::GlobalSettingStation::GetInstance().GetModulesDir(); + + GF_CORE_LOG_DEBUG("try loading external modules at path: {} ...", mods_path); + if (!QDir(mods_path).exists()) { + GF_CORE_LOG_WARN("external module directory at path {} not found, abort...", + mods_path); + return false; + } + + LoadModuleFromPath(mods_path); + + GF_CORE_LOG_DEBUG("load integrated modules done."); + return true; +} + void LoadGpgFrontendModules(ModuleInitArgs) { // must init at default thread before core Thread::TaskRunnerGetter::GetInstance().GetTaskRunner()->PostTask( new Thread::Task( [](const DataObjectPtr&) -> int { - auto exec_binary_path = QCoreApplication::applicationDirPath(); - auto mods_path = exec_binary_path + "/mods"; - if (!qEnvironmentVariable("APPIMAGE").isEmpty()) { - mods_path = qEnvironmentVariable("APPDIR") + "/usr/lib/mods"; - } - - GF_CORE_LOG_DEBUG("try loading modules at path: {} ...", mods_path); - if (!QDir(mods_path).exists()) { - GF_CORE_LOG_WARN( - "module directory at path {} not found, abort...", mods_path); - return -1; - } - - for (const auto& module_library_name : - QDir(mods_path).entryList(QStringList() << "*.so" - << "*.dll" - << "*.dylib", - QDir::Files)) { - ModuleManager::GetInstance().LoadModule(mods_path + "/" + - module_library_name); - } - - GF_CORE_LOG_DEBUG("load modules done."); - return 0; + return LoadIntegratedMods() && LoadExternalMods() ? 0 : -1; }, "modules_system_init_task")); } -- cgit v1.2.3 From 3d2ab7c349b02740511f0f2113fd80f7f44c8333 Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 30 Apr 2024 16:07:33 +0200 Subject: feat: improve functions and ui on module --- src/core/module/ModuleInit.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'src/core/module/ModuleInit.cpp') diff --git a/src/core/module/ModuleInit.cpp b/src/core/module/ModuleInit.cpp index 0fddc16a..8a7516a1 100644 --- a/src/core/module/ModuleInit.cpp +++ b/src/core/module/ModuleInit.cpp @@ -38,22 +38,34 @@ namespace GpgFrontend::Module { -void LoadModuleFromPath(const QString& mods_path) { +void LoadModuleFromPath(const QString& mods_path, bool integrated) { for (const auto& module_library_name : QDir(mods_path).entryList(QStringList() << "*.so" << "*.dll" << "*.dylib", QDir::Files)) { - ModuleManager::GetInstance().LoadModule(mods_path + "/" + - module_library_name); + ModuleManager::GetInstance().LoadModule( + mods_path + "/" + module_library_name, integrated); } } auto LoadIntegratedMods() -> bool { auto exec_binary_path = QCoreApplication::applicationDirPath(); + +#if defined(MACOS) && defined(RELEASE) + auto mods_path = exec_binary_path + "../PlugIns/mods"; +#else auto mods_path = exec_binary_path + "/mods"; +#endif + + // AppImage if (!qEnvironmentVariable("APPIMAGE").isEmpty()) { - mods_path = qEnvironmentVariable("APPDIR") + "/usr/lib/mods"; + mods_path = qEnvironmentVariable("APPDIR") + "/usr/plugins/mods"; + } + + // Flatpak + if (!qEnvironmentVariable("container").isEmpty()) { + mods_path = "/app/lib/mods"; } GF_CORE_LOG_DEBUG("try loading integrated modules at path: {} ...", @@ -65,7 +77,7 @@ auto LoadIntegratedMods() -> bool { return false; } - LoadModuleFromPath(mods_path); + LoadModuleFromPath(mods_path, true); GF_CORE_LOG_DEBUG("load integrated modules done."); return true; @@ -82,7 +94,7 @@ auto LoadExternalMods() -> bool { return false; } - LoadModuleFromPath(mods_path); + LoadModuleFromPath(mods_path, false); GF_CORE_LOG_DEBUG("load integrated modules done."); return true; -- cgit v1.2.3 From e3df0b8c60ddc75e574344d5e811862fb76e5586 Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 30 Apr 2024 19:13:28 +0200 Subject: fix: can not find mods on macos platform --- src/core/module/ModuleInit.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core/module/ModuleInit.cpp') diff --git a/src/core/module/ModuleInit.cpp b/src/core/module/ModuleInit.cpp index 8a7516a1..ceb5987e 100644 --- a/src/core/module/ModuleInit.cpp +++ b/src/core/module/ModuleInit.cpp @@ -53,8 +53,10 @@ auto LoadIntegratedMods() -> bool { auto exec_binary_path = QCoreApplication::applicationDirPath(); #if defined(MACOS) && defined(RELEASE) - auto mods_path = exec_binary_path + "../PlugIns/mods"; + // App Bundle + auto mods_path = exec_binary_path + "/../PlugIns/mods"; #else + // Debug Or Windows Platform auto mods_path = exec_binary_path + "/mods"; #endif -- cgit v1.2.3