GpgFrontend/GpgFrontend
1
0
Fork 0
Code Actions

feat: improve core init speed and safty.

Browse Source
This commit is contained in:
Saturneric 2023-03-31 17:21:54 +08:00
parent 0920f93dee
commit 4010a5662d
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/core/GpgCoreInit.cpp
View File

@ -36,6 +36,10 @@
#include "core/GpgContext.h" #include "core/GpgContext.h"
#include "core/function/GlobalSettingStation.h" #include "core/function/GlobalSettingStation.h"
#include "function/gpg/GpgAdvancedOperator.h" #include "function/gpg/GpgAdvancedOperator.h"
#include "spdlog/spdlog.h"
#include "thread/Task.h"
#include "thread/TaskRunner.h"
#include "thread/TaskRunnerGetter.h"
namespace GpgFrontend { namespace GpgFrontend {
@ -147,7 +151,7 @@ void init_gpgfrontend_core() {
custom_key_database_path); custom_key_database_path);
// init default channel // init default channel
GpgFrontend::GpgContext::CreateInstance( auto& default_ctx = GpgFrontend::GpgContext::CreateInstance(
GPGFRONTEND_DEFAULT_CHANNEL, [=]() -> std::unique_ptr<ChannelObject> { GPGFRONTEND_DEFAULT_CHANNEL, [=]() -> std::unique_ptr<ChannelObject> {
GpgFrontend::GpgContextInitArgs args; GpgFrontend::GpgContextInitArgs args;
@ -162,22 +166,39 @@ void init_gpgfrontend_core() {
return std::unique_ptr<ChannelObject>(new GpgContext(args)); return std::unique_ptr<ChannelObject>(new GpgContext(args));
}); });
// init non-ascii channel // exit if failed
GpgFrontend::GpgContext::CreateInstance( if (!default_ctx.good()) {
GPGFRONTEND_NON_ASCII_CHANNEL, [=]() -> std::unique_ptr<ChannelObject> { SPDLOG_ERROR("default gpgme context init error, exit.");
GpgFrontend::GpgContextInitArgs args; QCoreApplication::exit();
args.ascii = false; };
// set key database path // async init no-ascii channel
if (use_custom_key_database_path && !custom_key_database_path.empty()) { Thread::TaskRunnerGetter::GetInstance()
args.db_path = custom_key_database_path; .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_GPG)
} ->PostTask(
new Thread::Task([=](Thread::Task::DataObjectPtr data_obj) -> int {
// init non-ascii channel
auto& ctx = GpgFrontend::GpgContext::CreateInstance(
GPGFRONTEND_NON_ASCII_CHANNEL,
[=]() -> std::unique_ptr<ChannelObject> {
GpgFrontend::GpgContextInitArgs args;
args.ascii = false;
args.offline_mode = forbid_all_gnupg_connection; // set key database path
args.auto_import_missing_key = auto_import_missing_key; if (use_custom_key_database_path &&
!custom_key_database_path.empty()) {
args.db_path = custom_key_database_path;
}
return std::unique_ptr<ChannelObject>(new GpgContext(args)); args.offline_mode = forbid_all_gnupg_connection;
}); args.auto_import_missing_key = auto_import_missing_key;
return std::unique_ptr<ChannelObject>(new GpgContext(args));
});
if (!ctx.good()) SPDLOG_ERROR("no-ascii channel init error");
return ctx.good() ? 0 : -1;
}));
// try to restart all components // try to restart all components
GpgFrontend::GpgAdvancedOperator::GetInstance().RestartGpgComponents(); GpgFrontend::GpgAdvancedOperator::GetInstance().RestartGpgComponents();