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/utils/CommonUtils.cpp | 86 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 src/core/utils/CommonUtils.cpp (limited to 'src/core/utils/CommonUtils.cpp') diff --git a/src/core/utils/CommonUtils.cpp b/src/core/utils/CommonUtils.cpp new file mode 100644 index 00000000..0eb4933e --- /dev/null +++ b/src/core/utils/CommonUtils.cpp @@ -0,0 +1,86 @@ +/** + * 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 "CommonUtils.h" + +#include +#include + +namespace GpgFrontend { + +auto BeautifyFingerprint(BypeArrayConstRef fingerprint) -> std::string { + auto len = fingerprint.size(); + std::stringstream out; + decltype(len) count = 0; + while (count < len) { + if ((count != 0U) && !(count % 5)) out << " "; + out << fingerprint[count]; + count++; + } + return out.str(); +} + +auto CompareSoftwareVersion(const std::string& a, const std::string& b) -> int { + auto remove_prefix = [](const std::string& version) { + return version.front() == 'v' ? version.substr(1) : version; + }; + + std::string real_version_a = remove_prefix(a); + std::string real_version_b = remove_prefix(b); + + std::vector split_a; + std::vector split_b; + boost::split(split_a, real_version_a, boost::is_any_of(".")); + boost::split(split_b, real_version_b, boost::is_any_of(".")); + + const auto min_depth = std::min(split_a.size(), split_b.size()); + + for (auto i = 0U; i < min_depth; ++i) { + int num_a = 0; + int num_b = 0; + + try { + num_a = boost::lexical_cast(split_a[i]); + num_b = boost::lexical_cast(split_b[i]); + } catch (boost::bad_lexical_cast&) { + // Handle exception if needed + return 0; + } + + if (num_a != num_b) { + return (num_a > num_b) ? 1 : -1; + } + } + + if (split_a.size() != split_b.size()) { + return (split_a.size() > split_b.size()) ? 1 : -1; + } + + return 0; +} +} // namespace GpgFrontend \ No newline at end of file -- 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/utils/CommonUtils.cpp | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'src/core/utils/CommonUtils.cpp') diff --git a/src/core/utils/CommonUtils.cpp b/src/core/utils/CommonUtils.cpp index 0eb4933e..0e6eaf64 100644 --- a/src/core/utils/CommonUtils.cpp +++ b/src/core/utils/CommonUtils.cpp @@ -33,44 +33,34 @@ namespace GpgFrontend { -auto BeautifyFingerprint(BypeArrayConstRef fingerprint) -> std::string { +auto BeautifyFingerprint(QString fingerprint) -> QString { auto len = fingerprint.size(); - std::stringstream out; + QTextStream out; decltype(len) count = 0; while (count < len) { if ((count != 0U) && !(count % 5)) out << " "; out << fingerprint[count]; count++; } - return out.str(); + return out.readAll(); } -auto CompareSoftwareVersion(const std::string& a, const std::string& b) -> int { - auto remove_prefix = [](const std::string& version) { - return version.front() == 'v' ? version.substr(1) : version; +auto CompareSoftwareVersion(const QString& a, const QString& b) -> int { + auto remove_prefix = [](const QString& version) { + return version.startsWith('v') ? version.mid(1) : version; }; - std::string real_version_a = remove_prefix(a); - std::string real_version_b = remove_prefix(b); + auto real_version_a = remove_prefix(a); + auto real_version_b = remove_prefix(b); - std::vector split_a; - std::vector split_b; - boost::split(split_a, real_version_a, boost::is_any_of(".")); - boost::split(split_b, real_version_b, boost::is_any_of(".")); + QStringList split_a = real_version_a.split('.'); + QStringList split_b = real_version_b.split('.'); const auto min_depth = std::min(split_a.size(), split_b.size()); - for (auto i = 0U; i < min_depth; ++i) { - int num_a = 0; - int num_b = 0; - - try { - num_a = boost::lexical_cast(split_a[i]); - num_b = boost::lexical_cast(split_b[i]); - } catch (boost::bad_lexical_cast&) { - // Handle exception if needed - return 0; - } + for (int i = 0; i < min_depth; ++i) { + int const num_a = split_a[i].toInt(); + int const num_b = split_b[i].toInt(); if (num_a != num_b) { return (num_a > num_b) ? 1 : -1; -- cgit v1.2.3 From 6983b5c1dd82d159236ebd06cf17f071cc9c1ee9 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 12 Jan 2024 23:08:38 +0800 Subject: refactor: remove boost and use QString instead of std::filesystem::path --- src/core/utils/CommonUtils.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/core/utils/CommonUtils.cpp') diff --git a/src/core/utils/CommonUtils.cpp b/src/core/utils/CommonUtils.cpp index 0e6eaf64..0b182241 100644 --- a/src/core/utils/CommonUtils.cpp +++ b/src/core/utils/CommonUtils.cpp @@ -28,17 +28,15 @@ #include "CommonUtils.h" -#include -#include - namespace GpgFrontend { auto BeautifyFingerprint(QString fingerprint) -> QString { auto len = fingerprint.size(); - QTextStream out; + QString buffer; + QTextStream out(&buffer); decltype(len) count = 0; while (count < len) { - if ((count != 0U) && !(count % 5)) out << " "; + if ((count != 0U) && ((count % 5) == 0)) out << " "; out << fingerprint[count]; count++; } -- cgit v1.2.3