aboutsummaryrefslogtreecommitdiffstats
path: root/src/ui/struct/SoftwareVersion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/struct/SoftwareVersion.cpp')
-rw-r--r--src/ui/struct/SoftwareVersion.cpp83
1 files changed, 41 insertions, 42 deletions
diff --git a/src/ui/struct/SoftwareVersion.cpp b/src/ui/struct/SoftwareVersion.cpp
index 0059715a..a0ad594b 100644
--- a/src/ui/struct/SoftwareVersion.cpp
+++ b/src/ui/struct/SoftwareVersion.cpp
@@ -30,55 +30,54 @@
int GpgFrontend::UI::SoftwareVersion::version_compare(const std::string& a,
const std::string& b) {
+ auto temp_a = a, temp_b = b;
- auto temp_a = a, temp_b = b;
+ if (!temp_a.empty() && temp_a.front() == 'v') {
+ temp_a = temp_a.erase(0, 1);
+ SPDLOG_INFO("real version a: {}", temp_a);
+ }
- if (!temp_a.empty() && temp_a.front() == 'v') {
- temp_a = temp_a.erase(0, 1);
- LOG(INFO) << "real version a" << temp_a;
- }
-
- if (!temp_b.empty() && temp_b.front() == 'v') {
- temp_b.erase(0, 1);
- LOG(INFO) << "real version b" << temp_b;
- }
+ if (!temp_b.empty() && temp_b.front() == 'v') {
+ temp_b.erase(0, 1);
+ SPDLOG_INFO("real version b: {}", temp_b);
+ }
- // First, split the string.
- std::vector<std::string> va, vb;
- boost::split(va, temp_a, boost::is_any_of("."));
- boost::split(vb, temp_b, boost::is_any_of("."));
+ // First, split the string.
+ std::vector<std::string> va, vb;
+ boost::split(va, temp_a, boost::is_any_of("."));
+ boost::split(vb, temp_b, boost::is_any_of("."));
- // Compare the numbers step by step, but only as deep as the version
- // with the least elements allows.
- const int depth =
- std::min(static_cast<int>(va.size()), static_cast<int>(vb.size()));
- int ia = 0, ib = 0;
- for (int i = 0; i < depth; ++i) {
- try {
- ia = boost::lexical_cast<int>(va[i]);
- ib = boost::lexical_cast<int>(vb[i]);
- } catch (boost::bad_lexical_cast& ignored) {
- break;
- }
- if (ia != ib) break;
+ // Compare the numbers step by step, but only as deep as the version
+ // with the least elements allows.
+ const int depth =
+ std::min(static_cast<int>(va.size()), static_cast<int>(vb.size()));
+ int ia = 0, ib = 0;
+ for (int i = 0; i < depth; ++i) {
+ try {
+ ia = boost::lexical_cast<int>(va[i]);
+ ib = boost::lexical_cast<int>(vb[i]);
+ } catch (boost::bad_lexical_cast& ignored) {
+ break;
}
+ if (ia != ib) break;
+ }
- // Return the required number.
- if (ia > ib)
- return 1;
- else if (ia < ib)
- return -1;
- else {
- // In case of equal versions, assumes that the version
- // with the most elements is the highest version.
- if (va.size() > vb.size())
- return 1;
- else if (va.size() < vb.size())
- return -1;
- }
+ // Return the required number.
+ if (ia > ib)
+ return 1;
+ else if (ia < ib)
+ return -1;
+ else {
+ // In case of equal versions, assumes that the version
+ // with the most elements is the highest version.
+ if (va.size() > vb.size())
+ return 1;
+ else if (va.size() < vb.size())
+ return -1;
+ }
- // Everything is equal, return 0.
- return 0;
+ // Everything is equal, return 0.
+ return 0;
}
bool GpgFrontend::UI::SoftwareVersion::NeedUpgrade() const {