From 95997d27106daf91336847f50efaaa32279b7fc7 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 16 Oct 2023 17:54:05 +0800 Subject: fix: check and update copyright at files --- src/core/function/gpg/GpgUIDOperator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index 7e7a711e..8badb5d2 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2021 Saturneric + * Copyright (C) 2021 Saturneric * * This file is part of GpgFrontend. * @@ -20,7 +20,7 @@ * 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. + * Saturneric starting on May 12, 2021. * * SPDX-License-Identifier: GPL-3.0-or-later * -- cgit v1.2.3 From 5d7b1d5493df8723259eca0613a9ce0af6077289 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 30 Oct 2023 14:52:29 +0800 Subject: style: improve code style of core --- src/core/function/gpg/GpgUIDOperator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index 8badb5d2..d74cea76 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -36,7 +36,7 @@ GpgFrontend::GpgUIDOperator::GpgUIDOperator(int channel) bool GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, const std::string& uid) { auto err = gpgme_op_adduid(ctx_, gpgme_key_t(key), uid.c_str(), 0); - if (check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR) + if (CheckGpgError(err) == GPG_ERR_NO_ERROR) return true; else return false; @@ -45,8 +45,8 @@ bool GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, bool GpgFrontend::GpgUIDOperator::RevUID(const GpgFrontend::GpgKey& key, const std::string& uid) { auto err = - check_gpg_error(gpgme_op_revuid(ctx_, gpgme_key_t(key), uid.c_str(), 0)); - if (check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR) + CheckGpgError(gpgme_op_revuid(ctx_, gpgme_key_t(key), uid.c_str(), 0)); + if (CheckGpgError(err) == GPG_ERR_NO_ERROR) return true; else return false; @@ -54,9 +54,9 @@ bool GpgFrontend::GpgUIDOperator::RevUID(const GpgFrontend::GpgKey& key, bool GpgFrontend::GpgUIDOperator::SetPrimaryUID(const GpgFrontend::GpgKey& key, const std::string& uid) { - auto err = check_gpg_error(gpgme_op_set_uid_flag( + auto err = CheckGpgError(gpgme_op_set_uid_flag( ctx_, gpgme_key_t(key), uid.c_str(), "primary", nullptr)); - if (check_gpg_error_2_err_code(err) == GPG_ERR_NO_ERROR) + if (CheckGpgError(err) == GPG_ERR_NO_ERROR) return true; else return false; -- cgit v1.2.3 From 0251f35c93e3f0e0a6853a50fb5bd82c1b9e4187 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 6 Nov 2023 17:17:47 +0800 Subject: refactor: clean up core's codes --- src/core/function/gpg/GpgUIDOperator.cpp | 41 +++++++++++++------------------- 1 file changed, 17 insertions(+), 24 deletions(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index d74cea76..61e8c54c 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -33,38 +33,31 @@ GpgFrontend::GpgUIDOperator::GpgUIDOperator(int channel) : SingletonFunctionObject(channel) {} -bool GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, - const std::string& uid) { - auto err = gpgme_op_adduid(ctx_, gpgme_key_t(key), uid.c_str(), 0); - if (CheckGpgError(err) == GPG_ERR_NO_ERROR) - return true; - else - return false; +auto GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, + const std::string& uid) -> bool { + auto err = + gpgme_op_adduid(ctx_, static_cast(key), uid.c_str(), 0); + return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -bool GpgFrontend::GpgUIDOperator::RevUID(const GpgFrontend::GpgKey& key, - const std::string& uid) { - auto err = - CheckGpgError(gpgme_op_revuid(ctx_, gpgme_key_t(key), uid.c_str(), 0)); - if (CheckGpgError(err) == GPG_ERR_NO_ERROR) - return true; - else - return false; +auto GpgFrontend::GpgUIDOperator::RevUID(const GpgFrontend::GpgKey& key, + const std::string& uid) -> bool { + auto err = CheckGpgError( + gpgme_op_revuid(ctx_, static_cast(key), uid.c_str(), 0)); + return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -bool GpgFrontend::GpgUIDOperator::SetPrimaryUID(const GpgFrontend::GpgKey& key, - const std::string& uid) { +auto GpgFrontend::GpgUIDOperator::SetPrimaryUID(const GpgFrontend::GpgKey& key, + const std::string& uid) + -> bool { auto err = CheckGpgError(gpgme_op_set_uid_flag( - ctx_, gpgme_key_t(key), uid.c_str(), "primary", nullptr)); - if (CheckGpgError(err) == GPG_ERR_NO_ERROR) - return true; - else - return false; + ctx_, static_cast(key), uid.c_str(), "primary", nullptr)); + return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -bool GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, +auto GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, const std::string& name, const std::string& comment, - const std::string& email) { + const std::string& email) -> bool { SPDLOG_DEBUG("new uuid: {} {} {}", name, comment, email); auto uid = boost::format("%1%(%2%)<%3%>") % name % comment % email; return AddUID(key, uid.str()); -- cgit v1.2.3 From 889cb8092381b073a0f4a0411a4ede04cd7bdd14 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 6 Nov 2023 20:49:44 +0800 Subject: refactor: improve the code structure of core --- src/core/function/gpg/GpgUIDOperator.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index 61e8c54c..2c0445b1 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -28,7 +28,9 @@ #include "GpgUIDOperator.h" -#include "boost/format.hpp" +#include + +#include "core/utils/GpgUtils.h" GpgFrontend::GpgUIDOperator::GpgUIDOperator(int channel) : SingletonFunctionObject(channel) {} -- cgit v1.2.3 From 4dcd2ac8c4f673fc21c4cf0072d6cb648ca64e7e Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 7 Nov 2023 15:57:28 +0800 Subject: refactor: separate typedef and impl --- src/core/function/gpg/GpgUIDOperator.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index 2c0445b1..a614d2ee 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -30,37 +30,38 @@ #include +#include "core/GpgModel.h" #include "core/utils/GpgUtils.h" -GpgFrontend::GpgUIDOperator::GpgUIDOperator(int channel) +namespace GpgFrontend { + +GpgUIDOperator::GpgUIDOperator(int channel) : SingletonFunctionObject(channel) {} -auto GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, - const std::string& uid) -> bool { +auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& uid) -> bool { auto err = gpgme_op_adduid(ctx_, static_cast(key), uid.c_str(), 0); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -auto GpgFrontend::GpgUIDOperator::RevUID(const GpgFrontend::GpgKey& key, - const std::string& uid) -> bool { +auto GpgUIDOperator::RevUID(const GpgKey& key, const std::string& uid) -> bool { auto err = CheckGpgError( gpgme_op_revuid(ctx_, static_cast(key), uid.c_str(), 0)); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -auto GpgFrontend::GpgUIDOperator::SetPrimaryUID(const GpgFrontend::GpgKey& key, - const std::string& uid) +auto GpgUIDOperator::SetPrimaryUID(const GpgKey& key, const std::string& uid) -> bool { auto err = CheckGpgError(gpgme_op_set_uid_flag( ctx_, static_cast(key), uid.c_str(), "primary", nullptr)); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -auto GpgFrontend::GpgUIDOperator::AddUID(const GpgFrontend::GpgKey& key, - const std::string& name, - const std::string& comment, - const std::string& email) -> bool { +auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& name, + const std::string& comment, + const std::string& email) -> bool { SPDLOG_DEBUG("new uuid: {} {} {}", name, comment, email); auto uid = boost::format("%1%(%2%)<%3%>") % name % comment % email; return AddUID(key, uid.str()); } + +} // namespace GpgFrontend -- cgit v1.2.3 From 054e6e28cca2517dda2319ef683314b3318c39a6 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 3 Dec 2023 12:25:21 -0800 Subject: feat: standarized and speed up app env loading process --- src/core/function/gpg/GpgUIDOperator.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index a614d2ee..4610c504 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -39,21 +39,22 @@ GpgUIDOperator::GpgUIDOperator(int channel) : SingletonFunctionObject(channel) {} auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& uid) -> bool { - auto err = - gpgme_op_adduid(ctx_, static_cast(key), uid.c_str(), 0); + auto err = gpgme_op_adduid(ctx_.DefaultContext(), + static_cast(key), uid.c_str(), 0); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } auto GpgUIDOperator::RevUID(const GpgKey& key, const std::string& uid) -> bool { - auto err = CheckGpgError( - gpgme_op_revuid(ctx_, static_cast(key), uid.c_str(), 0)); + auto err = CheckGpgError(gpgme_op_revuid( + ctx_.DefaultContext(), static_cast(key), uid.c_str(), 0)); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } auto GpgUIDOperator::SetPrimaryUID(const GpgKey& key, const std::string& uid) -> bool { auto err = CheckGpgError(gpgme_op_set_uid_flag( - ctx_, static_cast(key), uid.c_str(), "primary", nullptr)); + ctx_.DefaultContext(), static_cast(key), uid.c_str(), + "primary", nullptr)); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& name, -- cgit v1.2.3 From 644aa4397b03dbef73f8bfedc13925b51cad836b Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 5 Jan 2024 20:55:15 +0800 Subject: feat: integrate logging api to core --- src/core/function/gpg/GpgUIDOperator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index 4610c504..63afb40c 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -60,7 +60,7 @@ auto GpgUIDOperator::SetPrimaryUID(const GpgKey& key, const std::string& uid) auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& name, const std::string& comment, const std::string& email) -> bool { - SPDLOG_DEBUG("new uuid: {} {} {}", name, comment, email); + GF_CORE_LOG_DEBUG("new uuid: {} {} {}", name, comment, email); auto uid = boost::format("%1%(%2%)<%3%>") % name % comment % email; return AddUID(key, uid.str()); } -- cgit v1.2.3 From bf538056b24a68b8fd235b1c50991ee8eb46a776 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jan 2024 14:02:37 +0800 Subject: refactor: use QString instead of std::string and improve threading system --- src/core/function/gpg/GpgUIDOperator.cpp | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'src/core/function/gpg/GpgUIDOperator.cpp') diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index 63afb40c..6c0373de 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -28,8 +28,6 @@ #include "GpgUIDOperator.h" -#include - #include "core/GpgModel.h" #include "core/utils/GpgUtils.h" @@ -38,31 +36,30 @@ namespace GpgFrontend { GpgUIDOperator::GpgUIDOperator(int channel) : SingletonFunctionObject(channel) {} -auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& uid) -> bool { +auto GpgUIDOperator::AddUID(const GpgKey& key, const QString& uid) -> bool { auto err = gpgme_op_adduid(ctx_.DefaultContext(), - static_cast(key), uid.c_str(), 0); + static_cast(key), uid.toUtf8(), 0); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -auto GpgUIDOperator::RevUID(const GpgKey& key, const std::string& uid) -> bool { +auto GpgUIDOperator::RevUID(const GpgKey& key, const QString& uid) -> bool { auto err = CheckGpgError(gpgme_op_revuid( - ctx_.DefaultContext(), static_cast(key), uid.c_str(), 0)); + ctx_.DefaultContext(), static_cast(key), uid.toUtf8(), 0)); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -auto GpgUIDOperator::SetPrimaryUID(const GpgKey& key, const std::string& uid) +auto GpgUIDOperator::SetPrimaryUID(const GpgKey& key, const QString& uid) -> bool { auto err = CheckGpgError(gpgme_op_set_uid_flag( - ctx_.DefaultContext(), static_cast(key), uid.c_str(), + ctx_.DefaultContext(), static_cast(key), uid.toUtf8(), "primary", nullptr)); return CheckGpgError(err) == GPG_ERR_NO_ERROR; } -auto GpgUIDOperator::AddUID(const GpgKey& key, const std::string& name, - const std::string& comment, - const std::string& email) -> bool { +auto GpgUIDOperator::AddUID(const GpgKey& key, const QString& name, + const QString& comment, const QString& email) + -> bool { GF_CORE_LOG_DEBUG("new uuid: {} {} {}", name, comment, email); - auto uid = boost::format("%1%(%2%)<%3%>") % name % comment % email; - return AddUID(key, uid.str()); + return AddUID(key, QString("%1(%2)<%3>").arg(name).arg(comment).arg(email)); } } // namespace GpgFrontend -- cgit v1.2.3